gentoo auto-resync : 19:01:2023 - 05:58:31

6 files changed, 75 insertions, 117 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 728924b06901..35db46ad1e56 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest
index 05249630cbf6..b3108aae5dd3 100644
--- a/net-analyzer/openbsd-netcat/Manifest
+++ b/net-analyzer/openbsd-netcat/Manifest
@@ -2,14 +2,13 @@ AUX openbsd-netcat-1.105-musl-b64_ntop.patch 12296 BLAKE2B 6c67948bc99aebe60e43d
 AUX openbsd-netcat-1.190-darwin.patch 2045 BLAKE2B d2e0633b38eeb19d6e8dd3dfc6c11fc5b9e47898a5bd1a7793a29a19eff32eb2aa389d8056eb41749a2a75f9254c1bc39b19d29798eea0b9eb85a6a0cf828284 SHA512 527ec082c617e81aaa48e648d07437eddfb65f7dd8ba6e69042c53e00921ddeec53298e85421e847046bcfd7a93425deca5fccf6a9ff2d31b1bcddce3012ce40
 AUX openbsd-netcat-1.190-darwin13.patch 1055 BLAKE2B 9aa8cd60a0d36f58a2c10476e6a754c5961375bc3747dceb7ad7a000fa423f9d139be8f9e78986b15a72fbe20c0f48409e461719cff1a27f4fa1867466cf8941 SHA512 ccdafb9dc20e7f03dd54967d1abf9b0840a5c9dfe54bb33342eb8f70c41dea588a00d6a4b423663a83e26e87c685bc32c711587a53b76a53ec4eb45c361a4071
 AUX openbsd-netcat-1.195-darwin.patch 2312 BLAKE2B 3f3f463b7e438772522e6e8e64dda8be6feeb674b424326e2b3d4eac1031d455544d7c047336c4a64a9ab4c5982eae8d6269d0d8901f7f10df326cbe324847ba SHA512 31f3dd9713daad1844a96f3bb5691d6dfaaf69e81a8c6a67b985e65868365e3e4b8b7b67798d8a82e64f3c1f53a21c7cd7b4df6d94062bcf90022c741b1dad66
-DIST netcat-openbsd_1.190-2.debian.tar.xz 34836 BLAKE2B 3ff4390c07d05e8d1a19c8696da12bdc6bba07c6e88281b04cd7915509f44a14dda66462128da768b255d92f3a02d008750a860db9290f9f8e0e0bb9dd66e01b SHA512 c33510ad6761627e0b7e564747f6ae82c7569157bdc91f6a282a97b038b2b0917c27fdfba137462c7c34d84fcfdfe8b6393204884d153e3d200a86f5c6657a9a
-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
+DIST netcat-openbsd_1.219-1.debian.tar.xz 52048 BLAKE2B 62c2e4a6446fbdb01ea34a70c10dc72a980e62b4d8e06e4564f05932b9fb291be73558a1b8c11f448c509b0fc3c5fe42381a1a9f0a14bba0c2e087dd1e6da9f1 SHA512 badc1afbe8a467c068fa1d3bf12817d568eae5bb9774f9f11d3b30c065eb3a8b39724bb456329d7153ea3160cd10fab159a6756f7eeafd9bfc8c5d78114f7da6
+DIST netcat-openbsd_1.219.orig.tar.gz 22940 BLAKE2B 4e871124a22fec2ba572f2a614b7eb5134565acd5d952973f7e7f76ead6b22d0811efcc916726da1e7719c5d3014f94ea53ad09804a77b55c4b15fc571bf0e95 SHA512 9f6d531d33410457b8f1e6a3eb0d105dbd819d5e4fe9753d32d7fd4583680ceba102a60307a8b5ef26b47047492b207388742b725da3708d30d360d4a196f115
 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
+EBUILD openbsd-netcat-1.218_p5.ebuild 1761 BLAKE2B b4a16c5f9abdbce151c6acbc093d98f38e047af5af44a1b90db220b50216450eac71dd0055533f64828d6da5bda4364254ba8c7ddb93bb3cd9bcd644bbc5ca3b SHA512 00debb58166901d4b4221cfe44c857ea4fe1738aae36856632948d7d517d6209d825c9e2261276a53deb7177f30a25472310409a620c831a3fa91b054ae93317
+EBUILD openbsd-netcat-1.219_p1.ebuild 1765 BLAKE2B 584a9965815a6cc85b9b37f200eef3958b7b0624dfab7c9832855305bcd52a29bc811fde22d94aa4d29d54df7f9c3f0bb4e31a84458a772fda4270dc18422690 SHA512 9eb7914ea552ec8c148b046f6eee6ea59691ee479e81a8e3f6e3177ac21c14042d9ace05fb7e6255aaaf8e53560adc551dcd49e6596db564fa8699f6ae88e148
 MISC metadata.xml 245 BLAKE2B ac72ef778f5d556deab2ebcf80116f69791bc0590fea00ad21d361df28a3d1b96fb42db2de7f7545ad6f38137b9c26510efa2a2a251ca5646f77476dfb27d339 SHA512 ad4d8a54ad37031eaf3e1f1a06d53b85f504bdeeda433eee0a6101c2ccbc5b8da2d33725c9b0dfd013c3c5ad218171f6010722f443f81124086bc8c54a216b06
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild
deleted file mode 100644
index 70a973b584c8..000000000000
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-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="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz
-	http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-2.debian.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x64-macos"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
-	!net-analyzer/netcat
-	!net-analyzer/netcat6
-"
-
-S=${WORKDIR}/netcat-openbsd-${PV}
-
-src_prepare() {
-	for i_patch in $(<"${WORKDIR}"/debian/patches/series); do
-		eapply "${WORKDIR}"/debian/patches/"${i_patch}"
-	done
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# this undoes some of the Debian/Linux changes
-		eapply "${FILESDIR}"/${P}-darwin.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 [[ ${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
-}
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild
deleted file mode 100644
index d82b685da2a0..000000000000
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-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="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz
-	http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-2.debian.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x64-macos"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
-	!net-analyzer/netcat
-	!net-analyzer/netcat6
-"
-
-S=${WORKDIR}/netcat-openbsd-${PV}
-
-src_prepare() {
-	for i_patch in $(<"${WORKDIR}"/debian/patches/series); do
-		eapply "${WORKDIR}"/debian/patches/"${i_patch}"
-	done
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# this undoes some of the Debian/Linux changes
-		eapply "${FILESDIR}"/${PN}-1.190-darwin.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 [[ ${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
-}
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild
index e877bbe04ee7..b60dcaa1673f 100644
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}"/netcat-openbsd-${MY_PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
 
 RDEPEND="
 	!net-analyzer/netcat
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild
new file mode 100644
index 000000000000..df4845a47877
--- /dev/null
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 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
+}