gentoo auto-resync : 25:09:2022 - 05:33:00

5 files changed, 72 insertions, 32 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 06c4cfc65be1..b9fdad7e6888 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index 8872191f88f9..8b5ecd50604e 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -1,7 +1,6 @@
 AUX hydra-9.2-respect-cflags-more.patch 1072 BLAKE2B 4361f339a0cd9ea3a32a9671bb1a31f2775dceb6b2b305885a2a3e72a2329c5337221c895ab49129e920c36941d5b34101877ebf0d35f10f46d601de58981c21 SHA512 b00112c17f025b657111c93decdecc5ee4a10f388e259929ed2f55ca08888d24fb2fac1892df017d00602943ba93a72dcbbb4cf00fa808c2bc05ed1b95cb428a
 AUX hydra-9.3-pcre2.patch 3854 BLAKE2B 3338fcae138b913008857db9e1678977d5809380e5e916b6b9f022b5e3c88f3030d401702fd0e59297916915ab9869e62113464e2a36b91e66605ea15d9b6cba SHA512 7cd1af834d6ad7fc120d600996bf13a8d6feca571b44bbf6194c4a0205e243b489aa8f80be4a21a5dbe19930b933fdeb56e76075649c1827384a1aeb2d46a977
 AUX hydra-9.4-implicit-func-decl.patch 1325 BLAKE2B 55f9c8fed3dd32e7049cdc59e592901ee40442d7ec71a00a7214ce6bc0543077711da7481345b8b112be5a52102cf42967f3b432f600db5818aec8c936bf5ca4 SHA512 50d09d1c2a2698303bd051143437c3c582418129ba589c23488707b1fbe7cbb36ee8e6295d1c2c71cf4ea43d94d97326166e4ada2af5a2d82b94799d60e84b75
-AUX hydra-9999999-respect-cflags-more.patch 1241 BLAKE2B 6f0cab7a763d0eb1cee2e20ab5dc8889e45c3ada5ba1dd9be79a029f2d22ec8d027af18cb61ca22418f1662ba68d7bbf7dad2fcdffc05ce0471f06b7db14fa49 SHA512 b01bd45cecc90984bb1c97749d4c333973d72fea75719f9f1a7d848ce9fba1933a1cb8ff3b452699fad64b5ae716e6e1bc872b077fa2dcb36363de802c0b59b7
 DIST hydra-9.1.tar.gz 611846 BLAKE2B 9a5b6dc52b5f4069bf326e86728ebaf8c1fe018536f3943b83493de934703bff6770ae3f7a9a223ee00b5f52f7bd10ee4ddc272e1bbad00c399aa19cc0c083ba SHA512 863176375fe1aae4c0a2b74c11aba297682d66e522c98c926c539348309b0af4e407e460b4cb803d2c83c008787c73f7f1e56ac6aca9791351e1b596c2e4fbb2
 DIST hydra-9.2.tar.gz 614176 BLAKE2B 102c744fbdd3702c624b1c8339178883b689db093d9f1c66d8e04816327eb8095f3e3133f889b2a6ee6dcabb9e5af0c71ec8470731b4b174021fbd79741d05e7 SHA512 ee8ecd854b61ac9d708098c8a0d9a128d8b80b38db1a2ba8eb06de6fbbc6865135d994620ade8e3742fb993899274ed9d8fd0e95bed7a9fbeb1ca9e182540322
 DIST hydra-9.3.tar.gz 829856 BLAKE2B 5ae1ab77f64d2bc17bd8389acf8a47201d84455a82f5ae28ab740594571a13ab145f5981efdfb09ddab3d6cc443e171e4664bff08c1a6b2f08169dea4f87ba54 SHA512 06d2ed61492c76d16ff3b2fbbde3938f79d6038c979a2af949f9b4d116a1506943e0a3a246da4d1bc8848cf440097e6175962e3fdf3e7644dd36ad7c2f6b2ce4
diff --git a/net-analyzer/hydra/files/hydra-9999999-respect-cflags-more.patch b/net-analyzer/hydra/files/hydra-9999999-respect-cflags-more.patch
deleted file mode 100644
index 0fe5753ec8af..000000000000
--- a/net-analyzer/hydra/files/hydra-9999999-respect-cflags-more.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Don't inject hardening CFLAGS. We already have these by default in Gentoo.
---- a/configure
-+++ b/configure
-@@ -1380,27 +1380,6 @@ if [ -n "$CRYPTO_PATH" ]; then
-   echo "                                  ... RSA_generate_key()$RSA found"
- fi
-
--echo "Checking for secure compile option support in $CC ..."
--GCCSEC="no"
--LDSEC="no"
--GCCSECOPT="-fstack-protector-all --param ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
--echo '#include <stdio.h>' > $TMPC.c
--echo 'int main() { printf(""); return 0; }' >> $TMPC.c
--$CC -pie -fPIE $GCCSEPOPT -o $TMPC $TMPC.c > /dev/null 2> $TMPC.c.err
--test -x $TMPC && GCCSEC="yes"
--grep -q fPI $TMPC.c.err || GCCSECOPT="-pie -fPIE $GCCSECOPT"
--rm -f "$TMPC"
--$CC $GCCSECOPT -Wl,-z,now -Wl,-z,relro -o $TMPC $TMPC.c > /dev/null 2> $TMPC.c.err
--test -x $TMPC && { LDSEC="yes" ; GCCSECOPT="$GCCSECOPT -Wl,-z,now -Wl,-z,relro" ; }
--rm -f $TMPC $TMPC.c $TMPC.c.err
--echo "                                                  Compiling... $GCCSEC"
--echo "                                                  Linking... $LDSEC"
--
--echo "Checking for --allow-multiple-definition linker option ... $WALLOW"
--if [ "$WALLOW" = "yes" ]; then
--  GCCSECOPT="$GCCSECOPT -Wl,--allow-multiple-definition"
--fi
--
- echo
- XDEFINES=""
- XLIBS=""
\ No newline at end of file
diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest
index c6fb1927a8db..05249630cbf6 100644
--- a/net-analyzer/openbsd-netcat/Manifest
+++ b/net-analyzer/openbsd-netcat/Manifest
@@ -6,7 +6,10 @@ DIST netcat-openbsd_1.190-2.debian.tar.xz 34836 BLAKE2B 3ff4390c07d05e8d1a19c869
 DIST netcat-openbsd_1.190.orig.tar.gz 22384 BLAKE2B c3e83106f53a0214f71c805b1dfe6b66718dfca217f713a0d7016cb0a3c75c78580fbdd277bd7b5324371145c4b986ebb867e6f779cd61ffecb8e732ebabcb84 SHA512 32310813391f63b8283dc4a63e52821e464ecbfcd0ea995e8e15047c6252a86b31eb4725dc69b778594c43d6ce0cc081aa0f00d7cda0587c91941f20b93a33fe
 DIST netcat-openbsd_1.195-2.debian.tar.xz 35984 BLAKE2B eedac24eedc243ad1d58576be76f4f98392e1f455863fa3cdc06bde2714612819b7dfa98dd45c1739a65680469460410f5e4b2f4144f4c24fea04b59dda4d0da SHA512 2a5cc6d04112fdde007be4b9adb3aee44060570c0cb2ae0e33e54af3d37c0b2ff4d6c96edf1f16047365106c7c3720195b38417af3c332226c9be81d49caa552
 DIST netcat-openbsd_1.195.orig.tar.gz 22480 BLAKE2B 53c750c168d7ea5dc2ca653598e42700e2b3ee888d946a09503a22fa3bcbc2c73658f38787314bef628d609ad370223f6889b7019760bf51817f73fc570e1dcc SHA512 ea95cda028f2759835ea8832db0174c178b002d5a917f4c51594445a5377a30d6114ac261071eea98d3d0b60ae1ec72102609db1625dbc5a6e57c67e28d2ff51
+DIST netcat-openbsd_1.218-5.debian.tar.xz 52052 BLAKE2B 38ccde34bfa6f1873a8e38fa7355f94bc74cdeb125fd4081fd68819a685d49a4c8a6cc7ed243d49df2d38c7536f4ac680d598bd4c28a938bc4750c89376d2961 SHA512 a230eb143e32fe80ee108325bb81c4e163d48982b484bf4a93ef266e9eed12890e7e294c2fe3dd2ce91fe5aec7de2f1407bf25dc938c2565bfb3e0759555dddc
+DIST netcat-openbsd_1.218.orig.tar.gz 22964 BLAKE2B 2dba29cc93ef5295ec24db7632454564fa640fba139116d2732aff465c9a4b37238f65d51ad727f9b29d304b73ce05282b82ec468444c63f5611a90a1384ac62 SHA512 a830f0e3efdff01ba1bb0b344f49d545b9c184001cd641e523a6d24670b97d52dc723318660a5ec8f3215cb57ebe62ca4c06387000b6c8b6495a5c653a4206c6
 EBUILD openbsd-netcat-1.190.ebuild 1518 BLAKE2B 901b4c5b0f4c58c6b542667e0740d3058a7e22003805a3520555f7f1b843d5e1338a47db60900db527acc47cb91c3b99d292e34a768fa75dcb44a7f3fc229f2b SHA512 1c26caaa2c5978ddb0348e1c6c2e2855736f8df3517020930ee3dfeb6e24edd08b88e665258a80aeb38d845b6aac5bf20c085edea6450e600c1027a1e836ccd7
 EBUILD openbsd-netcat-1.195-r1.ebuild 1726 BLAKE2B 7a39b11ed5c6b50e934df489464e56fc10fdeb84ddd95bdf5fadf2d7c7046163b1295f5fe369fc6c837a6de57fd03ee6d1ed00bf207ed9ae0611abe291042a1b SHA512 949579a7edd220a4584b76d0179ae1d43b3fa69cd04f8915d4caa36c3390639773ee98faa094d16ae98df53ad9c7ad4991cb6f9b3bdb58bae921801bfe18dbd8
 EBUILD openbsd-netcat-1.195.ebuild 1524 BLAKE2B e0d11d336a9a2d3ab6bd67c5eb30106a0a58b80f4f0c656853f6f1826167dfc94c62f291b5029a4cf5707ea61547c458916bbfc40f5fbb767ac0f8028bad237e SHA512 2b76e272f75e54a52a30b1debda6aaab7df03be3f054cf3d17234c04bdd881a720c9c74f1c2dde61c1da9c445c2826124d735b909f8d5f2ccb159c6f30b60f3f
+EBUILD openbsd-netcat-1.218_p5.ebuild 1765 BLAKE2B 9b04d309b48eaa0b459af986ce5bbf9fc6a9fc1fb5a77b7702a77c4640ac227369e8f26a297e294dec339d1ffe427e279867dfa89fa1a9bfcab169d58414d9d9 SHA512 7c21a778d9bcccc461b7c27d8c07d99c983dce8d6845fc8e96ae3c61671e021d2964739c2c15aba259cba6c7cf73e1cb9c9cfbf9f9e77c00d6aa993b90023883
 MISC metadata.xml 245 BLAKE2B ac72ef778f5d556deab2ebcf80116f69791bc0590fea00ad21d361df28a3d1b96fb42db2de7f7545ad6f38137b9c26510efa2a2a251ca5646f77476dfb27d339 SHA512 ad4d8a54ad37031eaf3e1f1a06d53b85f504bdeeda433eee0a6101c2ccbc5b8da2d33725c9b0dfd013c3c5ad218171f6010722f443f81124086bc8c54a216b06
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild
new file mode 100644
index 000000000000..e877bbe04ee7
--- /dev/null
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PV=$(ver_cut 1-2)
+DESCRIPTION="The OpenBSD network swiss army knife"
+HOMEPAGE="https://cvsweb.openbsd.org/src/usr.bin/nc/ https://salsa.debian.org/debian/netcat-openbsd"
+SRC_URI="
+	mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${MY_PV}.orig.tar.gz
+	mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${MY_PV}-$(ver_cut 4).debian.tar.xz
+"
+S="${WORKDIR}"/netcat-openbsd-${MY_PV}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+
+RDEPEND="
+	!net-analyzer/netcat
+	!net-analyzer/netcat6
+	!elibc_Darwin? ( dev-libs/libbsd )
+"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	local i
+	for i in $(<"${WORKDIR}"/debian/patches/series) ; do
+		PATCHES+=( "${WORKDIR}"/debian/patches/${i} )
+	done
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# This undoes some of the Debian/Linux changes
+		PATCHES+=( "${FILESDIR}"/${PN}-1.195-darwin.patch )
+
+		if [[ ${CHOST##*-darwin} -lt 20 ]] ; then
+			PATCHES+=( "${FILESDIR}"/${PN}-1.190-darwin13.patch )
+		fi
+	fi
+
+	if use elibc_musl ; then
+		PATCHES+=( "${FILESDIR}"/${PN}-1.105-musl-b64_ntop.patch )
+	fi
+
+	default
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin nc
+	doman nc.1
+
+	cd "${WORKDIR}"/debian || die
+	newdoc netcat-openbsd.README.Debian README
+	dodoc -r examples
+}
+
+pkg_postinst() {
+	if use kernel_linux ; then
+		ewarn "SO_REUSEPORT is introduced in linux 3.9. If your running kernel is older"
+		ewarn "and kernel header is newer, nc will not listen correctly. Matching the header"
+		ewarn "to the running kernel will do. See bug #490246 for details."
+	fi
+}