gentoo auto-resync : 30:05:2023 - 15:21:06

3 files changed, 108 insertions, 0 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 3ee51f4cb0f1..9948e21f0b5f 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest
index 3cc6030a20c0..c7418eafa2ba 100644
--- a/net-firewall/xtables-addons/Manifest
+++ b/net-firewall/xtables-addons/Manifest
@@ -1,5 +1,6 @@
 DIST xtables-addons-3.23.tar.xz 335776 BLAKE2B 9251a2b9707d93dae294dda24bac4f08b69b44486a5235c248f0f64d0ccac78bd6978c98ad9f83de53da1af75d4788b56ce3285a44c738346560ecfc64f8565b SHA512 f798ad74db6068ee50cae662f3de331cbc8654f0ab2b1d59ce3f7818795213e771702078e495f526a212ce8b9ba7920c04670cd5fb3ff51e693bf0161d2e2486
 DIST xtables-addons-3.24.tar.xz 335724 BLAKE2B c086616c0366346bd87813ae0fc561bdb8f892eecea19ef88c65afef5318ac6f75fec658e0c6595de5c620c965b2bd7f10e45ff3ec55ffb9ddf8e85643190e7e SHA512 08c3b87617e0124aef99a3953fc5e03e8d98be50ce70771e352509ec64263d5256f744489f10f39879630d9dc8d28f3c91173b4739c95bbd8d5ad56e33138eb4
 EBUILD xtables-addons-3.23.ebuild 5533 BLAKE2B ded00caedf05de0cbea3d2be455247304b368545520504897108efad78352560e60af8510b37c2833de1ff3d90e01f444376efe1ef710d7919b8fefa4100cd85 SHA512 cbbeabd5cf2a57a79898f8602cb12df1fdabeaaaf3bfee5b1abf117b45af622b6dac3711728b4e2a8848d797e9ea68a9f2f1f29fb2bd75a880a48c699c7f6d5a
+EBUILD xtables-addons-3.24-r1.ebuild 2738 BLAKE2B c40a849beaaf791cf288b7c31cc8ad7d671ec19d6257d340ca0b493532f6d0e1f335cc5313f4d60ab7e5554e6bf941d7584f589e35d885e5d56f52350a43a3ed SHA512 4be5d748a811c17165a5cdb69253bc240787df815317d8c749d517da2ad4c72c50abe32560a3231ed8b30d912f4a252efa8ee1160e549d200b7bb4c35c7f65dc
 EBUILD xtables-addons-3.24.ebuild 5535 BLAKE2B c6a2f10c61b1e467443be459a4f30d9a7fea1e99d5393c68dad0db96a3624e92bae69f2c63b4b03b389bac0c5e19cf4ed70f094d136309f8494229790ee21751 SHA512 621b436f0c32261588e8b8da3c8741064bde2afb5cf58cb896e0aa2dc2bc6e064ab084b85f061078c65973b56d436611d293d828d4d8e3539d24bdd751064b69
 MISC metadata.xml 698 BLAKE2B 64bcff2bb22f8b71b1acd94386eb10067dfd7be07d829f6e7e75a77da09b5999b8a53da6b9a1aca727dc7d32518fd11cd447ad19aeaec97f1eddfd9107b3d8e9 SHA512 99851425f9be6f3aa906d8d1d908a64a1354bc5b9d0ff771a016cc6b2c31ceb107a01ead4287db7cbaf20bb4661b372ee5454881b00ca5c01ef3b4b81073f9e3
diff --git a/net-firewall/xtables-addons/xtables-addons-3.24-r1.ebuild b/net-firewall/xtables-addons/xtables-addons-3.24-r1.ebuild
new file mode 100644
index 000000000000..2dda3fb4d224
--- /dev/null
+++ b/net-firewall/xtables-addons/xtables-addons-3.24-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MODULES_OPTIONAL_IUSE="+modules"
+inherit flag-o-matic linux-mod-r1
+
+XTABLES_MODULES=(
+	account chaos delude dhcpmac dnetmap echo ipmark logmark
+	proto sysrq tarpit asn condition fuzzy geoip gradm iface
+	ipp2p ipv4options length2 lscan pknock psd quota2
+)
+
+MODULES_KERNEL_MIN=4.15
+
+DESCRIPTION="iptables extensions not yet accepted in the main kernel"
+HOMEPAGE="
+	https://inai.de/projects/xtables-addons/
+	https://codeberg.org/jengelh/xtables-addons/
+"
+SRC_URI="https://inai.de/files/xtables-addons/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="${XTABLES_MODULES[*]/#/xtables_addons_}"
+
+XTABLES_SCRIPTS_DEPEND="
+	app-arch/unzip
+	dev-perl/Net-CIDR-Lite
+	dev-perl/Text-CSV_XS
+	virtual/perl-Getopt-Long
+"
+DEPEND="net-firewall/iptables:="
+RDEPEND="
+	${DEPEND}
+	xtables_addons_asn? ( ${XTABLES_SCRIPTS_DEPEND} )
+	xtables_addons_geoip? ( ${XTABLES_SCRIPTS_DEPEND} )
+"
+
+pkg_setup() {
+	local CONFIG_CHECK="NF_CONNTRACK NF_CONNTRACK_MARK"
+
+	if use xtables_addons_pknock; then
+		CONFIG_CHECK+=" ~CONNECTOR"
+		local ERROR_CONNECTOR="CONFIG_CONNECTOR: is not set but is needed to receive userspace
+		notifications from pknock through netlink/connector"
+	fi
+
+	linux-mod-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	local mod modules
+	mapfile -t modules < <(sed -En 's/^build_(.+)=.*/\L\1/p' mconfig || die)
+	[[ ${modules[*]} == "${XTABLES_MODULES[*]}" ]] ||
+		die "XTABLES_MODULES needs to be updated to: '${modules[*]}'"
+
+	for mod in "${modules[@]}"; do
+		use xtables_addons_${mod} || sed -i "/^build_${mod}=/Id" mconfig || die
+	done
+}
+
+src_configure() {
+	# Uses CFLAGS for tools, and it may mismatch with the kernel's CC
+	# FIXME?: ideally would want to build tools with normal CC
+	use modules && CC=${KERNEL_CC} strip-unsupported-flags
+
+	local econfargs=(
+		# TODO?: should move to ${EPREFIX}/usr + use default libexecdir by now
+		# (matching documentation), but could be a disruptive change for users
+		# with xt_asn/geoip_* paths they may have hardcoded in scripts
+		--prefix="${EPREFIX:-/}"
+		--libexecdir="${EPREFIX}"/$(get_libdir)
+		$(usex modules --with-kbuild="${KV_OUT_DIR}" --without-kbuild)
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_compile() {
+	use modules || MODULES_MAKEARGS=()
+
+	emake "${MODULES_MAKEARGS[@]}"
+}
+
+src_install() {
+	MODULES_MAKEARGS+=(
+		DESTDIR="${D}"
+		INSTALL_MOD_DIR=xtables_addons
+	)
+
+	emake "${MODULES_MAKEARGS[@]}" install
+	modules_post_process
+
+	dodoc -r README.rst doc/.
+
+	use xtables_addons_asn ||
+		find "${ED}" -type f -name '*_asn*' -delete || die
+	use xtables_addons_geoip ||
+		find "${ED}" -type f -name '*_geoip*' -delete || die
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}