gentoo auto-resync : 27:06:2023 - 13:35:02

7 files changed, 132 insertions, 28 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 6eda38b0e551..e1fd5016b638 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest
index 02fd751d7f36..c84f2b868ac3 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -2,8 +2,9 @@ AUX ipt_netflow-2.0-configure.patch 276 BLAKE2B a7c4d51d9c0f5d6d60200cebc74dc022
 AUX ipt_netflow-2.6-fix-linux-headers-5.14.patch 1058 BLAKE2B 8370b02a09d9f08b083ecb6f51e9f0788616fba7f02ccf10d55f64898a6f37a87a2c0b48464ba99b11d6e8fe13381873319dbf0dc2e8c2c1bc09ba06c65b2d2d SHA512 6c4010a4c38822a7ffdd3a5c78aeedda8e86ec4c4060be87e5b65c892948aa3ae54311769667db2cd67494c3df459f1fbe19d0b134b34e6952cb045d976173ba
 AUX ipt_netflow-2.6-gentoo.patch 1998 BLAKE2B b4da947e83bc7c80f91a489858a9a7fdf461f29c331822c1c417bc233af18d7b89517aa443d7ac0bd0212ace6fa8707528254930ca78fceef24e8e1c90109bac SHA512 71a39f75860e1112d900ab8f86c36cbd6bf7908f0caca9d7e3cf257accdd6d08c51d3584129cdf4b145123e67510bf3792fc8c330036e26af441f115241623d9
 AUX ipt_netflow-2.6-ref_module_fix.patch 1908 BLAKE2B 2f59dbf1e5986549a67319c478ba831eb4c835d52aa16cdc216d4cb893f99560ea3a15936489cdf809b9e886aab888095fb66dca9acb467a44da6bbb5acec6ae SHA512 5e76e4f2982fe3f4ca961f93bdb4b20865d5e2fbd600001798457eafb561057a6beb3da75fffa91265429ed145220b9f25a1facb4447405ba9990c90289f4ae4
-AUX ipt_netflow-9999-gentoo.patch 1956 BLAKE2B 4595118518958c379a33e0fd7b6e3769fe764a633876cb46b76517ccec9fe6430fd4441b5509019699003b07966e1b09b257d302d3a1f29c4b437f90bce1c211 SHA512 bf8a723d0cf5a57b49231d444d6e0926b2aa667a5ac8aebdedd92b8271be30e5cbfd330e03ed63969d37a5fb694038378468ae1d4b2483b087785734214d00bd
+AUX ipt_netflow-9999-gentoo.patch 1840 BLAKE2B f5f7481e812f40596a089c168eba13bbba1c3b94b8efa292dd9835e2e4221f9d8b05c5482d998139f02a564a18bd6cc70f3a7b24cd10ca1ad41b00a4ce761b67 SHA512 fc11824637ee471f5ede8a4cecf667596bd3ad6b458da119c7028701c236bf634381b275fce0d4abd0fe8a13bf5392d32dc8fdc23fcb7e1ab50bcc61d71a82d5
 DIST ipt_netflow-2.6.tar.gz 95752 BLAKE2B 088c7030addd34d9d889cfa705aa060d0793e33be957deb3b703daea4229afc24f7268285ce336e425a024dc9d8139633a5206ff9d769c95cf71c156acbd4f25 SHA512 0ccea556e25dc6bc2d8c7648ed1b4ab366097baf5b06f167ccd19d2adb0a195ad652635181573785f9e9fa208d163f22b6527310eb939455d7ee3bc141cbeed5
-EBUILD ipt_netflow-2.6.ebuild 2536 BLAKE2B 914560f88182e30209734153899e51403faeca61db591381260e08c79fdd082bda1951ee56c6520a08c2b303899935e5c8431a9fcd61f6f74e392d2e3783a740 SHA512 6548a5ecdd1668a5950e2bc4261bd2839a4c41998de2c696018c2f43616829309663b2830dc3fa8de401794bb41c2709224495d9166cc41300129354997326e9
-EBUILD ipt_netflow-9999.ebuild 2428 BLAKE2B 1dc77a7e114fb94a870a5bd516845ca87f495ba0a044a9ae4b98eb17c49724fd23c29f59a7a68eb50da622c499d266e4c65043f129fa89f9d7a8dda6d365d10e SHA512 5c70872bf7f741e2a9319bf436e05e0ec286a320bfd4866d4cf85336c3e49a2d6ad65bd83e55ecc8c7196badf76712eb7e413366de43602e4c97edafd8049e35
-MISC metadata.xml 562 BLAKE2B 8a89449e2645318547b32a578e3705c962c4ae0f57be7a6818c30bffa950af6c886528418c3cb909e0a75f080b2e6d2f4410bea79f360cc3bf48afcc0ea0479e SHA512 9852a65e8db5b7c12f6476c0cf6d45aebb1de2ce238864e87a5b94b57226af7668c4cc9c552313bae79d90b4c42eaae82073d6dd4cda18375e8f8745f63d10a5
+EBUILD ipt_netflow-2.6-r1.ebuild 2421 BLAKE2B 5c3581f13ff1799910f73b09d8b7a52b5d02d270f1a8b4ff3b3391e0566d7bd0f65b2530001fc48765dfc4a956f3c67e56d69d363f21103bc3d39ad2479efbcf SHA512 7d04fd0cb237420257161f574255bf7c502624e7924a171b6d784c1af43688429c9000b73d5a1c71288f453acd655f561c4b084680fc752a7ed642ddf9090ca6
+EBUILD ipt_netflow-2.6.ebuild 2445 BLAKE2B 4ee244f7901e566aa7e322aa48221d8320be810b38ffc5a3942170fa176a125dd62dcbdbe7e9a3a6e00845a7310ca13d43458f63ba2d6b69a9d43b62d85155f4 SHA512 68f3fed5a7719f59e8b76ea90b78f2ab902eee6e6e9aa87fcd087790bdd7e7df7497297ae2900434572ad617a565b29f7684774cb6e108f99b597a066ed27919
+EBUILD ipt_netflow-9999.ebuild 2303 BLAKE2B c6f6f15eae8f8e7837b2e0d14658c4c7cccec3441f55fe96edc25440cc78526b4a7cb737de06be9842ac904047ba96af40d447d91f6b29f461b278c5e0d469ff SHA512 e5da85534c11907e415896afa39658c9f4fdc2d6c7699244d4a10f736b4cc51de3c85167c486ddcc2af1cf48854277dfc215a1e1f16112cc82a96fed2d86a480
+MISC metadata.xml 618 BLAKE2B e2a825f374a432c7d1abe90ab4ac3af148428db80fb28117dd2865bc7b80cc05af5dff3343b95ce0a60ab92fd4ccbc1061d61442f3f03249d8bff2e85b471408 SHA512 0aae1d806aee7b372d9faa2788c51726e44fd0b1784a8118a3a36fdbbbc2cdc85abd9a5f71be78abc13483b0a5d6f6a067f72f9f8c89b1dd97f63f6921f92263
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-9999-gentoo.patch b/net-firewall/ipt_netflow/files/ipt_netflow-9999-gentoo.patch
index 675e8b16f725..de797495f0fd 100644
--- a/net-firewall/ipt_netflow/files/ipt_netflow-9999-gentoo.patch
+++ b/net-firewall/ipt_netflow/files/ipt_netflow-9999-gentoo.patch
@@ -1,6 +1,6 @@
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -11,7 +11,7 @@ CARGS = @CARGS@
+@@ -13,7 +13,7 @@ CARGS = @CARGS@
  SNMPTGSO = /usr/lib/snmp/dlmod/snmp_NETFLOW.so
  SNMPCONF = /etc/snmp/snmpd.conf
  SNMPLINE = dlmod netflow $(SNMPTGSO)
@@ -9,15 +9,16 @@
  
  # https://www.kernel.org/doc/Documentation/kbuild/modules.txt
  # https://www.kernel.org/doc/Documentation/kbuild/makefiles.txt
-@@ -22,31 +22,31 @@ all: ipt_NETFLOW.ko libipt_NETFLOW.so libip6t_NETFLOW.so @SNMPTARGET@
+@@ -24,7 +24,7 @@
  
  ipt_NETFLOW.ko: version.h ipt_NETFLOW.c ipt_NETFLOW.h compat_def.h compat.h Makefile
- 	@echo Compiling for kernel $(KVERSION)
--	make -C $(KDIR) M=$(CURDIR) modules CONFIG_DEBUG_INFO=y
-+	$(MAKE) -C $(KDIR) M=$(CURDIR) modules CONFIG_DEBUG_INFO=y
+ 	@echo Compiling $(shell ./version.sh) for kernel $(KVERSION)
+-	make -C $(KDIR) M=$(CURDIR) modules
++	$(MAKE) -C $(KDIR) M=$(CURDIR) modules
  	@touch $@
  compat_def.h: gen_compat_def
- 	./gen_compat_def > $@
+ 	./gen_compat_def > $@-
+@@ -32,24 +32,24 @@
  sparse: | version.h ipt_NETFLOW.c ipt_NETFLOW.h compat.h Makefile
  	@rm -f ipt_NETFLOW.ko ipt_NETFLOW.o
  	@echo Compiling for kernel $(KVERSION)
@@ -46,7 +47,7 @@
  
  sinstall: | snmp_NETFLOW.so IPT-NETFLOW-MIB.my
  	@echo " *"
-@@ -66,7 +66,7 @@ sinstall: | snmp_NETFLOW.so IPT-NETFLOW-MIB.my
+@@ -69,7 +69,7 @@
  	fi
  
  %_sh.o: libipt_NETFLOW.c
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.6-r1.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.6-r1.ebuild
new file mode 100644
index 000000000000..63f30e67a15b
--- /dev/null
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.6-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-mod-r1 toolchain-funcs
+
+DESCRIPTION="Netflow iptables module"
+HOMEPAGE="
+	https://sourceforge.net/projects/ipt-netflow
+	https://github.com/aabc/ipt-netflow
+"
+SRC_URI="https://github.com/aabc/ipt-netflow/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="natevents snmp"
+
+RDEPEND="
+	net-firewall/iptables:0=
+	snmp? ( net-analyzer/net-snmp )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/linux-sources
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
+	"${FILESDIR}/${PN}-2.6-gentoo.patch"
+	"${FILESDIR}/${P}-ref_module_fix.patch" # bug #781014
+	"${FILESDIR}/${P}-fix-linux-headers-5.14.patch" # bug #813993
+
+)
+
+pkg_setup() {
+	local CONFIG_CHECK="BRIDGE_NETFILTER ~IP_NF_IPTABLES VLAN_8021Q"
+	if use natevents; then
+		CONFIG_CHECK+=" NF_CONNTRACK_EVENTS"
+		if kernel_is lt 5 2; then
+			CONFIG_CHECK+=" NF_NAT_NEEDED"
+		else
+			CONFIG_CHECK+=" NF_NAT"
+		fi
+	fi
+
+	IPT_LIB="/usr/$(get_libdir)/xtables"
+	linux-mod-r1_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	mv "${WORKDIR}"/${PN/_/-}-* "${WORKDIR}"/${P} || die
+}
+
+src_prepare() {
+	default
+
+	# Checking for directory is enough
+	sed -i \
+		-e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' \
+		configure || die
+}
+
+do_conf() {
+	tc-export CC
+	echo ./configure $*
+	./configure $* ${EXTRA_ECONF} || die 'configure failed'
+}
+
+src_configure() {
+	local IPT_VERSION="$($(tc-getPKG_CONFIG) --modversion xtables)"
+	# this configure script is not based on autotools
+	# ipt-src need to be defined, see bug #455984
+	do_conf \
+		--disable-dkms \
+		--enable-aggregation \
+		--enable-direction \
+		--enable-macaddress \
+		--enable-vlan \
+		--ipt-lib="${IPT_LIB}" \
+		--ipt-src="/usr/" \
+		--ipt-ver="${IPT_VERSION}" \
+		--kdir="${KV_DIR}" \
+		--kver="${KV_FULL}" \
+		$(use natevents && echo '--enable-natevents') \
+		$(use snmp && echo '--enable-snmp-rules' || echo '--disable-snmp-agent')
+}
+
+src_compile() {
+	local modlist=( ipt_NETFLOW=ipt_netflow )
+	linux-mod-r1_src_compile
+	emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" LD="$(tc-getLD)" OBJDUMP="$(tc-getOBJDUMP)" all
+}
+
+src_install() {
+	linux-mod-r1_src_install
+
+	use snmp && emake DESTDIR="${D}" SNMPTGSO="/usr/$(get_libdir)/snmp/dlmod/snmp_NETFLOW.so" sinstall
+
+	exeinto "${IPT_LIB}"
+	doexe libip{,6}t_NETFLOW.so
+
+	doheader ipt_NETFLOW.h
+}
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild
index 2340a8abfae7..a26ec1f4b629 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-IUSE="debug natevents snmp"
+IUSE="natevents snmp"
 
 RDEPEND="
 	net-firewall/iptables:0=
@@ -40,7 +40,6 @@ pkg_setup() {
 	linux-info_pkg_setup
 
 	local CONFIG_CHECK="BRIDGE_NETFILTER ~IP_NF_IPTABLES VLAN_8021Q"
-	use debug && CONFIG_CHECK+=" ~DEBUG_FS"
 	if use natevents; then
 		CONFIG_CHECK+=" NF_CONNTRACK_EVENTS"
 		if kernel_is lt 5 2; then
@@ -91,7 +90,6 @@ src_configure() {
 		--ipt-ver="${IPT_VERSION}" \
 		--kdir="${KV_DIR}" \
 		--kver="${KV_FULL}" \
-		$(use debug && echo '--enable-debugfs') \
 		$(use natevents && echo '--enable-natevents') \
 		$(use snmp && echo '--enable-snmp-rules' || echo '--disable-snmp-agent')
 }
diff --git a/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild b/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild
index 986e6de1d7a8..5c63a5984557 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit git-r3 linux-info linux-mod toolchain-funcs
+inherit git-r3 linux-mod-r1 toolchain-funcs
 
 DESCRIPTION="Netflow iptables module"
 HOMEPAGE="
@@ -14,7 +14,7 @@ EGIT_REPO_URI="https://github.com/aabc/ipt-netflow"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug natevents snmp"
+IUSE="natevents snmp"
 
 RDEPEND="
 	net-firewall/iptables:0=
@@ -32,10 +32,7 @@ PATCHES=(
 )
 
 pkg_setup() {
-	linux-info_pkg_setup
-
 	local CONFIG_CHECK="BRIDGE_NETFILTER ~IP_NF_IPTABLES VLAN_8021Q"
-	use debug && CONFIG_CHECK+=" ~DEBUG_FS"
 	if use natevents; then
 		CONFIG_CHECK+=" NF_CONNTRACK_EVENTS"
 		if kernel_is lt 5 2; then
@@ -45,11 +42,8 @@ pkg_setup() {
 		fi
 	fi
 
-	BUILD_TARGETS="all"
-	MODULE_NAMES="ipt_NETFLOW(ipt_netflow)"
 	IPT_LIB="/usr/$(get_libdir)/xtables"
-
-	linux-mod_pkg_setup
+	linux-mod-r1_pkg_setup
 }
 
 src_prepare() {
@@ -87,17 +81,18 @@ src_configure() {
 		--ipt-ver="${IPT_VERSION}" \
 		--kdir="${KV_DIR}" \
 		--kver="${KV_FULL}" \
-		$(use debug && echo '--enable-debugfs') \
 		$(use natevents && echo '--enable-natevents') \
 		$(use snmp && echo '--enable-snmp-rules' || echo '--disable-snmp-agent')
 }
 
 src_compile() {
+	local modlist=( ipt_NETFLOW=ipt_netflow )
+	linux-mod-r1_src_compile
 	emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" LD="$(tc-getLD)" OBJDUMP="$(tc-getOBJDUMP)" all
 }
 
 src_install() {
-	linux-mod_src_install
+	linux-mod-r1_src_install
 
 	use snmp && emake DESTDIR="${D}" SNMPTGSO="/usr/$(get_libdir)/snmp/dlmod/snmp_NETFLOW.so" sinstall
 
@@ -105,5 +100,4 @@ src_install() {
 	doexe libip{,6}t_NETFLOW.so
 
 	doheader ipt_NETFLOW.h
-	dodoc README*
 }
diff --git a/net-firewall/ipt_netflow/metadata.xml b/net-firewall/ipt_netflow/metadata.xml
index 288dfc140e2d..1c60427303d3 100644
--- a/net-firewall/ipt_netflow/metadata.xml
+++ b/net-firewall/ipt_netflow/metadata.xml
@@ -14,5 +14,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">ipt-netflow</remote-id>
+		<remote-id type="github">aabc/ipt-netflow</remote-id>
 	</upstream>
 </pkgmetadata>