gentoo auto-resync : 15:07:2023 - 16:40:40

7 files changed, 234 insertions, 29 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 55cdec02d8a9..7f1df3f16797 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 720361d4de5f..626b60d27963 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -8,6 +8,9 @@ AUX nftables.init-r1 2279 BLAKE2B 1c4c28ea5b6a22905b3ec7de8e54726933b579352ecd79
 AUX systemd/nftables-restore.service 394 BLAKE2B 1c1f358eb2eff789e68c051098c971f11a8df6621c3c919e30a1ec1213f6db822c390609c01827fe9fc75c540effa3e3a7b6f93bd24e16ea19841bbfaab796ed SHA512 18da6a770bb3e94fd6b2c9e6f033450aaff9fe886c8846f780d08a21e2fc884ac078652743b50b3d4ea8c9500f92d272bdd27e2881e438c2b223d40816c100a0
 DIST nftables-1.0.7.tar.xz 857140 BLAKE2B 972adbb958f36b300618ce03fbbfc1fdb6fd55a3512227e4bc1fd71365be5cc8d3ee105424e8cc513588100bf00d5e69486310435efb2b0d3f5d464ed6999859 SHA512 063f3a42327fd4dca9214314c7e7bcc7310f2ccbbce4c36f86a291d61d443f94b0f91435ecd04eb757596df8be91a802daeef394ba422c3623a81b2917e01116
 DIST nftables-1.0.7.tar.xz.sig 566 BLAKE2B 53abe2598e9b362912d3e2e94ea6e04352d0484b9d1d645c8f18b6133be53d63a8d71d500e57528a57aededb84dedaf61010236afda560b16e7642db45e2f45c SHA512 b5821aa6939dc5b4d16065d9d7083e4ff40b9f99417354efbcbc95a8ccde43108b99a5b8a75a24086cd3df2291a049cad3adb7b06e2c098f0eb7861f85c5c768
+DIST nftables-1.0.8.tar.xz 882980 BLAKE2B cdf174846cbc3e581993cdee3a24e5ead3fdbb3d6b24d51473ed88affb7fcf70279a8374a4963b31044a9e64cb72ddb28ca1f1686bbaa3101eed4d623fb67d05 SHA512 06053c05a0d7c84a5cc4d22733836dadf9880c3552df3dace6d30aea95c7e1edb5528ea45df8576f282c15bf58f23407e26efb22257bd98a478849a8bdd4f8d5
+DIST nftables-1.0.8.tar.xz.sig 566 BLAKE2B 2f22b9467a55a46ec9e8caf13efe3cd59a6a1a867174602b583549ccaff54576b5f80b5ad9b1cefd208c3f49bc6ce07072626218f479628df369ed7294e1b83b SHA512 0ddd8f29dc5ba891069c63715719f11c0a4745f1e3cd9cd7f9e388ac35835cfbe8f34b371a2ce2a06cbda42384cc72d0bf57746fb02757d68a9b053bbbd67a77
 EBUILD nftables-1.0.7-r1.ebuild 6841 BLAKE2B 01148989852d33aa4165ab04051eed0f2e7041a2f7603bc97312f976fcbf5837b2fea2d48c999a0503a0f1612a84ad5ab8a4538b829b559806e7f9cbb8c1442c SHA512 f77615568550771bba9dba9d2a38c24be692a2f1a329d532cd9adaf7eca3b15473b207ea5b259ad859214275334bc760f25adb456215733c95a1fe95db1333de
-EBUILD nftables-9999.ebuild 6849 BLAKE2B 737eefe13de67cd1b6bb5b535a60db150386075680857e8e8ca749953f7f4b3024f4f9f82924f972fa6bed78310a326ee3338aef947f7212ae497e4cf65077e0 SHA512 b1658bf7bf44a9e2365fa650033da50bc679c3b7f1ca82d00f3fc5466228da1e07a918ca84801b5fb3ec870a910e4e301be3fa0ea8ef66a7402506d28af6dd42
+EBUILD nftables-1.0.8-r1.ebuild 6458 BLAKE2B a9fdd60b6abe84acb1f05c447682c85a2773b71fae8216bbd7c46324be2186ee80da9a323763537b27f51fa008b76aea611d1b347f8d4f883d1b12e6b9096fbd SHA512 7b1ef6ae065e83599c897634699cc29c08577d31d612052caa8a8cc216c9c072843d1a90cbf1a1574b63dd15ad3b27ff9e52b97d86491ff3ab8ca7660b4d22ce
+EBUILD nftables-9999.ebuild 6458 BLAKE2B a9fdd60b6abe84acb1f05c447682c85a2773b71fae8216bbd7c46324be2186ee80da9a323763537b27f51fa008b76aea611d1b347f8d4f883d1b12e6b9096fbd SHA512 7b1ef6ae065e83599c897634699cc29c08577d31d612052caa8a8cc216c9c072843d1a90cbf1a1574b63dd15ad3b27ff9e52b97d86491ff3ab8ca7660b4d22ce
 MISC metadata.xml 933 BLAKE2B 8e76ce489c41dcc01e222d77af40f2ba5cb7ddffc2bc818c6fc8c16e24dc308c125ce4d78db1647e77af96f32c85dd3391f7079e2cee26c129c56557e0c48c8a SHA512 058d38df1dbb2c1d0e611bd992f37498d3977561c3b34846fdf0d569573f2ef93a29a216ab491e583cfc2399c55c839d256dfcf8b1d7aaba63ed6ea90f22df25
diff --git a/net-firewall/nftables/nftables-1.0.8-r1.ebuild b/net-firewall/nftables/nftables-1.0.8-r1.ebuild
new file mode 100644
index 000000000000..6acc2d710064
--- /dev/null
+++ b/net-firewall/nftables/nftables-1.0.8-r1.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+inherit edo linux-info distutils-r1 systemd verify-sig
+
+DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+
+if [[ ${PV} =~ ^[9]{4,}$ ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.netfilter.org/${PN}"
+	BDEPEND="sys-devel/bison"
+else
+	SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.xz
+		verify-sig? ( https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
+fi
+
+# See COPYING: new code is GPL-2+, existing code is GPL-2
+LICENSE="GPL-2 GPL-2+"
+SLOT="0/1"
+IUSE="debug doc +gmp json libedit python +readline static-libs test xtables"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=net-libs/libmnl-1.0.4:=
+	>=net-libs/libnftnl-1.2.6:=
+	gmp? ( dev-libs/gmp:= )
+	json? ( dev-libs/jansson:= )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )
+	xtables? ( >=net-firewall/iptables-1.6.1:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND+="
+	sys-devel/flex
+	virtual/pkgconfig
+	doc? (
+		app-text/asciidoc
+		>=app-text/docbook2X-0.8.8-r4
+	)
+	python? ( ${DISTUTILS_DEPS} )
+"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	libedit? ( !readline )
+"
+
+src_prepare() {
+	default
+
+	if [[ ${PV} =~ ^[9]{4,}$ ]] ; then
+		eautoreconf
+	fi
+
+	if use python; then
+		pushd py >/dev/null || die
+		distutils-r1_src_prepare
+		popd >/dev/null || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		# We handle python separately
+		--disable-python
+		--disable-static
+		--sbindir="${EPREFIX}"/sbin
+		$(use_enable debug)
+		$(use_enable doc man-doc)
+		$(use_with !gmp mini_gmp)
+		$(use_with json)
+		$(use_with libedit cli editline)
+		$(use_with readline cli readline)
+		$(use_enable static-libs static)
+		$(use_with xtables)
+	)
+	econf "${myeconfargs[@]}"
+
+	if use python; then
+		pushd py >/dev/null || die
+		distutils-r1_src_configure
+		popd >/dev/null || die
+	fi
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		pushd py >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+}
+
+src_test() {
+	emake check
+
+	if [[ ${EUID} == 0 ]]; then
+		edo tests/shell/run-tests.sh -v
+	else
+		ewarn "Skipping shell tests (requires root)"
+	fi
+
+	# Need to rig up Python eclass if using this, but it doesn't seem to work
+	# for me anyway.
+	#cd tests/py || die
+	#"${EPYTHON}" nft-test.py || die
+}
+
+src_install() {
+	default
+
+	if ! use doc && [[ ! ${PV} =~ ^[9]{4,}$ ]]; then
+		pushd doc >/dev/null || die
+		doman *.?
+		popd >/dev/null || die
+	fi
+
+	# Do it here instead of in src_prepare to avoid eautoreconf
+	# rmdir lets us catch if more files end up installed in /etc/nftables
+	dodir /usr/share/doc/${PF}/skels/
+	mv "${ED}"/etc/nftables/osf "${ED}"/usr/share/doc/${PF}/skels/osf || die
+	rmdir "${ED}"/etc/nftables || die
+
+	exeinto /usr/libexec/${PN}
+	newexe "${FILESDIR}"/libexec/${PN}-mk.sh ${PN}.sh
+	newconfd "${FILESDIR}"/${PN}-mk.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}-mk.init-r1 ${PN}
+	keepdir /var/lib/nftables
+
+	systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service
+
+	if use python ; then
+		pushd py >/dev/null || die
+		distutils-r1_src_install
+		popd >/dev/null || die
+	fi
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_preinst() {
+	local stderr
+
+	# There's a history of regressions with nftables upgrades. Perform a
+	# safety check to help us spot them earlier. For the check to pass, the
+	# currently loaded ruleset, if any, must be successfully evaluated by
+	# the newly built instance of nft(8).
+	if [[ -n ${ROOT} ]] || [[ ! -d /sys/module/nftables ]] || [[ ! -x /sbin/nft ]]; then
+		# Either nftables isn't yet in use or nft(8) cannot be executed.
+		return
+	elif ! stderr=$(umask 177; /sbin/nft -t list ruleset 2>&1 >"${T}"/ruleset.nft); then
+		# Report errors induced by trying to list the ruleset but don't
+		# treat them as being fatal.
+		printf '%s\n' "${stderr}" >&2
+	elif [[ ${stderr} == *"is managed by iptables-nft"* ]]; then
+		# Rulesets generated by iptables-nft are special in nature and
+		# will not always be printed in a way that constitutes a valid
+		# syntax for ntf(8). Ignore them.
+		return
+	elif set -- "${ED}"/usr/lib*/libnftables.so; ! LD_LIBRARY_PATH=${1%/*} "${ED}"/sbin/nft -c -f -- "${T}"/ruleset.nft; then
+		eerror "Your currently loaded ruleset cannot be parsed by the newly built instance of"
+		eerror "nft. This probably means that there is a regression introduced by v${PV}."
+		eerror "(To make the ebuild fail instead of warning, set NFTABLES_ABORT_ON_RELOAD_FAILURE=1.)"
+		if [[ -n ${NFTABLES_ABORT_ON_RELOAD_FAILURE} ]] ; then
+			die "Aborting because of failed nft reload!"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	local save_file
+	save_file="${EROOT}"/var/lib/nftables/rules-save
+
+	# In order for the nftables-restore systemd service to start
+	# the save_file must exist.
+	if [[ ! -f "${save_file}" ]]; then
+		( umask 177; touch "${save_file}" )
+	elif [[ $(( "$( stat --printf '%05a' "${save_file}" )" & 07177 )) -ne 0 ]]; then
+		ewarn "Your system has dangerous permissions for ${save_file}"
+		ewarn "It is probably affected by bug #691326."
+		ewarn "You may need to fix the permissions of the file. To do so,"
+		ewarn "you can run the command in the line below as root."
+		ewarn "    'chmod 600 \"${save_file}\"'"
+	fi
+
+	if has_version 'sys-apps/systemd'; then
+		elog "If you wish to enable the firewall rules on boot (on systemd) you"
+		elog "will need to enable the nftables-restore service."
+		elog "    'systemctl enable ${PN}-restore.service'"
+		elog
+		elog "If you are creating firewall rules before the next system restart"
+		elog "the nftables-restore service must be manually started in order to"
+		elog "save those rules on shutdown."
+	fi
+
+	if has_version 'sys-apps/openrc'; then
+		elog "If you wish to enable the firewall rules on boot (on openrc) you"
+		elog "will need to enable the nftables service."
+		elog "    'rc-update add ${PN} default'"
+		elog
+		elog "If you are creating or updating the firewall rules and wish to save"
+		elog "them to be loaded on the next restart, use the \"save\" functionality"
+		elog "in the init script."
+		elog "    'rc-service ${PN} save'"
+	fi
+}
diff --git a/net-firewall/nftables/nftables-9999.ebuild b/net-firewall/nftables/nftables-9999.ebuild
index bee5c7fd77bd..6acc2d710064 100644
--- a/net-firewall/nftables/nftables-9999.ebuild
+++ b/net-firewall/nftables/nftables-9999.ebuild
@@ -4,7 +4,8 @@
 EAPI=8
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
 inherit edo linux-info distutils-r1 systemd verify-sig
 
@@ -25,21 +26,19 @@ fi
 # See COPYING: new code is GPL-2+, existing code is GPL-2
 LICENSE="GPL-2 GPL-2+"
 SLOT="0/1"
-IUSE="debug doc +gmp json libedit +modern-kernel python +readline static-libs test xtables"
+IUSE="debug doc +gmp json libedit python +readline static-libs test xtables"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=net-libs/libmnl-1.0.4:=
-	>=net-libs/libnftnl-1.2.5:=
+	>=net-libs/libnftnl-1.2.6:=
 	gmp? ( dev-libs/gmp:= )
 	json? ( dev-libs/jansson:= )
 	python? ( ${PYTHON_DEPS} )
 	readline? ( sys-libs/readline:= )
 	xtables? ( >=net-firewall/iptables-1.6.1:= )
 "
-
 DEPEND="${RDEPEND}"
-
 BDEPEND+="
 	sys-devel/flex
 	virtual/pkgconfig
@@ -47,7 +46,7 @@ BDEPEND+="
 		app-text/asciidoc
 		>=app-text/docbook2X-0.8.8-r4
 	)
-	python? ( ${PYTHON_DEPS} )
+	python? ( ${DISTUTILS_DEPS} )
 "
 
 REQUIRED_USE="
@@ -55,18 +54,6 @@ REQUIRED_USE="
 	libedit? ( !readline )
 "
 
-pkg_setup() {
-	if kernel_is ge 3 13; then
-		if use modern-kernel && kernel_is lt 3 18; then
-			eerror "The modern-kernel USE flag requires kernel version 3.18 or newer to work properly."
-		fi
-		CONFIG_CHECK="~NF_TABLES"
-		linux-info_pkg_setup
-	else
-		eerror "This package requires kernel version 3.13 or newer to work properly."
-	fi
-}
-
 src_prepare() {
 	default
 
@@ -145,12 +132,10 @@ src_install() {
 	mv "${ED}"/etc/nftables/osf "${ED}"/usr/share/doc/${PF}/skels/osf || die
 	rmdir "${ED}"/etc/nftables || die
 
-	local mksuffix="$(usex modern-kernel '-mk' '')"
-
 	exeinto /usr/libexec/${PN}
-	newexe "${FILESDIR}"/libexec/${PN}${mksuffix}.sh ${PN}.sh
-	newconfd "${FILESDIR}"/${PN}${mksuffix}.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}${mksuffix}.init-r1 ${PN}
+	newexe "${FILESDIR}"/libexec/${PN}-mk.sh ${PN}.sh
+	newconfd "${FILESDIR}"/${PN}-mk.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}-mk.init-r1 ${PN}
 	keepdir /var/lib/nftables
 
 	systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service
diff --git a/net-firewall/nftlb/Manifest b/net-firewall/nftlb/Manifest
index a23a8c28d739..6aebad935678 100644
--- a/net-firewall/nftlb/Manifest
+++ b/net-firewall/nftlb/Manifest
@@ -4,6 +4,6 @@ AUX nftlb-1.0.8-musl.patch 1924 BLAKE2B a5a46af3f5f000afa09b3e2d8413385a792b35ae
 AUX nftlb-1.0.8-tests.patch 1073 BLAKE2B e15195c9e67dde666f6450d38c45dee9fcbb499ef66ec5ba7e08a1b4c92a3fd10f5332ccc8f1cf5f9ff48589108ada1fd1b8e9a7a766e7e41eb3acc230b7708e SHA512 cc2b6caa0fb300a524e28d0602fcb287a18244ef98832115dcd6cecab623240ec86f5e95c6f8e74d56b064553723d85bc4cfb97defdbbc4d76e001809dbd5483
 DIST nftlb-1.0.7.tar.gz 201988 BLAKE2B 794778523b3a60a351fd071e6ff129197203ddfb1b80823dd6b05c30cb530040da465a10d2ffbf11cad063c2a453bb9baebd6e689b9166d4fcb0fe9fd17760e8 SHA512 eb1e9847f340e57b75a5b8680774d8208b282faccdef48e316b2bd52b10349eeda70643386e0e899d0f6a2f506964cf1b7a7ec2d86279f83ca87a9afa8f047bc
 DIST nftlb-1.0.8.gh.tar.gz 256936 BLAKE2B 1ab9fb508c8613304ebde7185a8ad8ddabb483d17c8b872cfb7da8a0b0e5a8d40f74a74361d1d5b8304d45c00357eea1f88f2cc39e5afe537791278277462407 SHA512 f612b7065fb5011f1af34cabe0945b7b0c1479241b4673d86e2e97d06bffdfefcc5ca4ec3ad3752faa92862306ed8ad28754838236476fe9db88099bc389cf7c
-EBUILD nftlb-1.0.7.ebuild 1037 BLAKE2B 61b6a5e568945cb063f205b39dc43e36aa4ed1001bdadd592e513f813c376f41eab26309f4a2df4827741fa4eacfa88a8b57c5dfcffae53674fe0a824baf62ff SHA512 43a81b0c731563e4d1cf8a3880b722d9c171d7930b1998cb4251d38f756fcd02bc6860e923db776aca3ca24aff3fd8590c195a009d41399bbe3331c8e7ffed1d
-EBUILD nftlb-1.0.8.ebuild 1137 BLAKE2B 4d1c49b12953a30033462fdfcb38dc63d084faaf67b0c9a79774fc619ad1611d3c670bd4adb11d629039c2e9662bb0c20e91436d6e5386d4d6e36b9ab88bf443 SHA512 46a5c47e0d2e46fb43b21f1b3bb405a5b6e6a977e10ee3187ae9506ddc1f2bc43a2ac82cc3a2b5bc3ee533a7277f48676a546117cd35707e799908273f376bae
+EBUILD nftlb-1.0.7-r1.ebuild 1040 BLAKE2B 8dce56fc972cad17d50ad35103b17cb70bb475dec111d9918d225524190e7c846d694339f61d38cde6b14937d947251ff8881ac2ed5733316e661de368ce04e7 SHA512 72ab199e1b80059bc4a3f4a048c85fa7101a719c3e28dfa288250612bd6d8d06d0080660aac921132069c00aaef4c646b60a07e9180fd18e4178ed390cfffd6e
+EBUILD nftlb-1.0.8-r1.ebuild 1140 BLAKE2B 1d54bf74d1a418db40c5b59722a60fba074c090ebe1aa7262afbe6d96feafed62d6ed6e0e97a0c3322fd371503bbf44135c11c5e6f49ddc7fe90b4ac3e51cec2 SHA512 36a7ce60a0c016c78faa314c4cf0b8cc9a04577960ec326f86a0cb1e70d885599aba8cf53b57b65afcb302c8e8c7aecd39feccdc7528ae1c2f210d78d19bdbef
 MISC metadata.xml 338 BLAKE2B 7ac9c5781a06889e69bbde8ed9ccdc15f5a587eb71c0d8835d365c5856fd9d96b492a8ce1090b5b9a3bf282719ac8f5b7001b7c712daeef656f0b09d0019c903 SHA512 87dea1537335a8012ae31a59f9346039896c407b35ec818bcb245d899a75fa60f2e72713c612f8eb94010fba8869ff7814096d63280cc0e642f5f41d59241c8c
diff --git a/net-firewall/nftlb/nftlb-1.0.7.ebuild b/net-firewall/nftlb/nftlb-1.0.7-r1.ebuild
index f1e9170bcbc4..c1f86a202c02 100644
--- a/net-firewall/nftlb/nftlb-1.0.7.ebuild
+++ b/net-firewall/nftlb/nftlb-1.0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="
-	net-firewall/nftables:=[modern-kernel]
+	net-firewall/nftables:=[modern-kernel(+)]
 	dev-libs/jansson:=
 	dev-libs/libev:=
 "
diff --git a/net-firewall/nftlb/nftlb-1.0.8.ebuild b/net-firewall/nftlb/nftlb-1.0.8-r1.ebuild
index d95684584df6..cff8fa4f0cf6 100644
--- a/net-firewall/nftlb/nftlb-1.0.8.ebuild
+++ b/net-firewall/nftlb/nftlb-1.0.8-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="
-	net-firewall/nftables:=[modern-kernel]
+	net-firewall/nftables:=[modern-kernel(+)]
 	dev-libs/jansson:=
 	dev-libs/libev:=
 "