netcat: upgraded package to upstream
Upgraded net-analyzer/netcat to version 110.20180111 on amd64, arm
Tried passing oak+elm to the tool for aarch64, but it considered them
to be arm.
BUG=chromium:774573,b:72841386
TEST=used reef's netcat; no FORTIFY crash observed. emerges on all of
reef, oak, veyron_jaq, daisy, elm
Change-Id: I8dd4dba42172d3696083373d9917de978ab8f84b
Reviewed-on: https://chromium-review.googlesource.com/877842
Commit-Ready: George Burgess <gbiv@chromium.org>
Tested-by: George Burgess <gbiv@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
(cherry picked from commit c8b5aaf9a61d168b4623d207c6306b4809d3b195)
Reviewed-on: https://chromium-review.googlesource.com/903269
Commit-Queue: Daniel Wang <wonderfly@google.com>
Tested-by: Daniel Wang <wonderfly@google.com>
diff --git a/metadata/md5-cache/net-analyzer/netcat-110-r9 b/metadata/md5-cache/net-analyzer/netcat-110-r9
deleted file mode 100644
index a13933d..0000000
--- a/metadata/md5-cache/net-analyzer/netcat-110-r9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=!static? ( crypt? ( dev-libs/libmix ) ) static? ( crypt? ( dev-libs/libmix[static-libs(+)] ) )
-DESCRIPTION=the network swiss army knife
-EAPI=5
-HOMEPAGE=http://nc110.sourceforge.net/
-IUSE=crypt ipv6 static
-KEYWORDS=*
-LICENSE=netcat
-RDEPEND=!static? ( crypt? ( dev-libs/libmix ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/nc110/nc110.tgz ftp://sith.mimuw.edu.pl/pub/users/baggins/IPv6/nc-v6-20000918.patch.gz mirror://gentoo/netcat-110-patches-1.0.tar.bz2
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=659a8c266dc67b02ae31ce4dbb57abcc
diff --git a/metadata/md5-cache/net-analyzer/netcat-110.20180111 b/metadata/md5-cache/net-analyzer/netcat-110.20180111
new file mode 100644
index 0000000..9bf422d
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/netcat-110.20180111
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=the network swiss army knife
+EAPI=5
+HOMEPAGE=http://nc110.sourceforge.net/
+IUSE=ipv6 static
+KEYWORDS=*
+LICENSE=netcat
+SLOT=0
+SRC_URI=mirror://sourceforge/nc110/nc110.20180111.tar.xz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 6198c04daba0e1307bd844df7d37f423
+_md5_=6889e56cea5f9a1a86361ab86ac30f11
diff --git a/net-analyzer/netcat/Manifest b/net-analyzer/netcat/Manifest
index 697b211..56c6755 100644
--- a/net-analyzer/netcat/Manifest
+++ b/net-analyzer/netcat/Manifest
@@ -1,3 +1 @@
-DIST nc-v6-20000918.patch.gz 8740 SHA256 7f0d5d05f4ed98f61f7efb167ef29cb25aa71e0df42c1f0cc8472e1ed660cb9a SHA512 56326fc7c40ea676173f150842367ea1782e700de682d790bb0f2c0df86e72a30f4c3ea0d937deb9d92f5eed47d2d4cb53edaca7dd23eb394a498b2f424bb2fe WHIRLPOOL 15fcbb4797900eab97e49b29a2a7a3e29ae449079a52c8bccf2b515c35fe22247105bbdb935c216925d184523e91b9d4d0c49d25c88a911b22bebdfba51135c7
-DIST nc110.tgz 75267 SHA256 5b3fda14e972d908896a605293f4634a72e2968278117410e12d8b3faf9a3976 SHA512 c9a7f5045f76d9ffef4e83fcc3e82f69ac4eb05e061686db51e9367949bfe0b90226b290a059dc68dcf3bf2040b95b5c78545199674da57a7c73e2f9145cf812 WHIRLPOOL 55c941d5996f3069fb5e76c6abedc9cd361dd44d404ddadf63422d3c5611c3b7e9459c58186a5b69aead7306f0842904005c08d0fb815bfbb452fc0f2c9b2b65
-DIST netcat-110-patches-1.0.tar.bz2 25751 SHA256 809517592616b4ca81c7b49541faa6a252ceb93384886d99b83163e9feeca96c SHA512 b9e7e35aa7e26d30f0115d87aff34fd0cadfad99fdb77cc5aa3ba51bec331f632e180484927c4368172ee9cc6c996b8691bd19bad8806912d8820158a98eab46 WHIRLPOOL 3e86f5bb92a905a1347c8af38db76e9c68d72757488dc153e4d1715cf825c4f1ecb74c67138238de4b31fbfe240511b81e495af3d7059fdf9c93c8ae731f476c
+DIST nc110.20180111.tar.xz 69984 SHA256 9c223f2472fc5b0d77c29a88536913e6573217cbc028dd276c30e689feeb182d SHA512 4413849c07c6ec5aae07c6e2baa1ba9a99721fa6ac08cf9e7d15379937a207246eb4f4299dd8c049445a72eac9cfe0a3633a87e4e01e21036db1217ea7a1e330 WHIRLPOOL c31cb58a4529aa50d3d8a86180c564672af6e6bc6af06109a0ae1bbc3536719b174888bf92f6971f08c3b6bf390a0a6bb8059eb60d241d960b3f7b5c31a257c9
diff --git a/net-analyzer/netcat/metadata.xml b/net-analyzer/netcat/metadata.xml
index 1b0803d..2881780 100644
--- a/net-analyzer/netcat/metadata.xml
+++ b/net-analyzer/netcat/metadata.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>vapier@gentoo.org</email>
- </maintainer>
<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
diff --git a/net-analyzer/netcat/netcat-110-r9.ebuild b/net-analyzer/netcat/netcat-110-r9.ebuild
deleted file mode 100644
index 793de47..0000000
--- a/net-analyzer/netcat/netcat-110-r9.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs flag-o-matic
-
-PATCH_VER="1.0"
-MY_P=nc${PV}
-DESCRIPTION="the network swiss army knife"
-HOMEPAGE="http://nc110.sourceforge.net/"
-SRC_URI="mirror://sourceforge/nc110/${MY_P}.tgz
- ftp://sith.mimuw.edu.pl/pub/users/baggins/IPv6/nc-v6-20000918.patch.gz
- mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
-
-LICENSE="netcat"
-SLOT="0"
-KEYWORDS="*"
-IUSE="crypt ipv6 static"
-
-LIB_DEPEND="crypt? ( dev-libs/libmix[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-
-S=${WORKDIR}
-
-src_prepare() {
- epatch "${DISTDIR}"/nc-v6-20000918.patch.gz patch
- sed -i 's:#define HAVE_BIND:#undef HAVE_BIND:' netcat.c
- sed -i 's:#define FD_SETSIZE 16:#define FD_SETSIZE 1024:' netcat.c #34250
- [[ ${CHOST} == *-solaris* ]] && \
- sed -i 's:gethostbyname2(\([^)]\+\)):getipnodebyname(\1, AI_DEFAULT, NULL):' netcat.c
-}
-
-src_compile() {
- export XLIBS=""
- export XFLAGS="-DLINUX -DTELNET -DGAPING_SECURITY_HOLE"
- use ipv6 && XFLAGS="${XFLAGS} -DINET6"
- use static && export STATIC="-static"
- use crypt && XFLAGS="${XFLAGS} -DAESCRYPT" && XLIBS="${XLIBS} -lmix"
- [[ ${CHOST} == *-solaris* ]] && XLIBS="${XLIBS} -lnsl -lsocket"
- emake -e CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" nc
-}
-
-src_install() {
- dobin nc
- dodoc README* netcat.blurb debian-*
- doman nc.1
- docinto scripts
- dodoc scripts/*
-}
diff --git a/net-analyzer/netcat/netcat-110.20180111.ebuild b/net-analyzer/netcat/netcat-110.20180111.ebuild
new file mode 100644
index 0000000..4b77a90
--- /dev/null
+++ b/net-analyzer/netcat/netcat-110.20180111.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit toolchain-funcs flag-o-matic
+
+MY_P="nc${PV}"
+DESCRIPTION="the network swiss army knife"
+HOMEPAGE="http://nc110.sourceforge.net/"
+SRC_URI="mirror://sourceforge/nc110/${MY_P}.tar.xz"
+
+LICENSE="netcat"
+SLOT="0"
+KEYWORDS="*"
+IUSE="ipv6 static"
+
+S=${WORKDIR}/nc110
+
+src_prepare() {
+ sed -i \
+ -e '/#define HAVE_BIND/s:#define:#undef:' \
+ -e '/#define FD_SETSIZE 16/s:16:1024: #34250' \
+ netcat.c || die
+ [[ ${CHOST} == *-solaris* ]] && \
+ sed -i 's:gethostbyname2 *(\([^)]\+\)):getipnodebyname (\1, AI_DEFAULT, NULL):' netcat.c
+}
+
+src_configure() {
+ use ipv6 || sed -i '/#define INET6/d' generic.h
+ append-cppflags -DTELNET -DGAPING_SECURITY_HOLE
+}
+
+src_compile() {
+ local xlibs
+ [[ ${CHOST} == *-solaris* ]] && xlibs+=" -lnsl -lsocket"
+ emake \
+ LD="$(tc-getCC) ${LDFLAGS}" \
+ DFLAGS="${CPPFLAGS}" \
+ XFLAGS="${CFLAGS}" \
+ STATIC=$(usex static '-static' '') \
+ XLIBS="${xlibs}" \
+ nc
+}
+
+src_install() {
+ dobin nc
+ dodoc README* netcat.blurb
+ doman nc.1
+ docinto scripts
+ dodoc scripts/*
+}
