gentoo resync : 25.11.2020

7 files changed, 40 insertions, 217 deletions

diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest
index af5c56b45ca5..feb7542d320b 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -2,13 +2,11 @@ AUX ipt_netflow-2.0-configure.patch 276 BLAKE2B a7c4d51d9c0f5d6d60200cebc74dc022
 AUX ipt_netflow-2.3-flags.patch 1743 BLAKE2B 5c2cf2b603aae5017e685fbfcb76bf0a5be29b0e3f1299d2e72a516d80cd5479b92c463d4bb4ab192b9cd7b59ef59eeef673c12696a79d6517ec7346dbbe3b5c SHA512 b8a74b0f9daf0e532a8015b576b59e13948684bee8d22a2a62cd8d2a11e4d8d5a2d4b257842dab4df379c3549bdb39d9814bebe24573714e3bff2d2d765021ad
 AUX ipt_netflow-2.4-bridge_netfilter.patch 1785 BLAKE2B 45b3e9124bbf17a3e38da1777951db2516abf18988426920f40d56b8c5083c369f52c36f605849590fef06884a566e1573bd6612b62da8e1333be40a7e913734 SHA512 bae60dd8fe7e50eb8e1061e007f2e603b23e04ca45ce60530b85ed626acaa4eeb44d061d48d2e90cc5409c3d7976030ec0a0683a6bd4723379315c4bf0e09730
 AUX ipt_netflow-2.5-gentoo.patch 1944 BLAKE2B 0acb66305cd7f337a271b356f65c2984b445fc245d4de5668ccdff54ef7bb5095fc27148be978f13bc84dfc92be58abda897dacf053a31b10b44caffb5cbabb7 SHA512 781c4286889b2e39f2276de02970306b76f859c87565dff5235cfb1fedd0e7f6cc2a5f1263899f7505317ce22fd73c724a4a1273114adcc6ad2c3cc84069d47d
+AUX ipt_netflow-2.5.1-vlan_dev_priv.patch 1182 BLAKE2B f5522a888133b5411cb6b3e43e2cc2d0457b521a46e26b3f3d6826a84dc016dd8b58195317601ebf49de81031faf9100f95dd547adbda81a9b4814a75c3e147b SHA512 d1d23794871237338102ed148b94a6d0f92997675f6e059fc0f1e94b54aed894dd4325721d8427edcaf6747bd063338b7f94b4ab51904bf76bd98c8380d4e5e2
 AUX ipt_netflow-9999-gentoo.patch 1956 BLAKE2B 4595118518958c379a33e0fd7b6e3769fe764a633876cb46b76517ccec9fe6430fd4441b5509019699003b07966e1b09b257d302d3a1f29c4b437f90bce1c211 SHA512 bf8a723d0cf5a57b49231d444d6e0926b2aa667a5ac8aebdedd92b8271be30e5cbfd330e03ed63969d37a5fb694038378468ae1d4b2483b087785734214d00bd
 DIST ipt_netflow-2.4.tar.gz 92580 BLAKE2B 0197e7e5cdd9c94c7b80b38cb4e2879343139592421922bf73aeaac70ac3af54ea25934bb1474ff455a9f58eab2368995591542f46be48b5c8491a3b6a192f56 SHA512 3c80d02cfda996fbde8d258875df8795000fd8390b5a6f8296771a992067e153eca48f7f4602421529948beaf3030e164adfc2ffe5b528042fbdc15ffb56aa74
 DIST ipt_netflow-2.5.1.tar.gz 94627 BLAKE2B 440daed1f0c02e4700c6d4a97da08abc7bf51c73cd824a67fd2b7b9394b47d493ca7acfea34467d93cdce6dded2c5b24b4a2600b9f717aa54561d1f88a123dbc SHA512 dd0bde358f788f2d62ace6a0b1529128f0a686f9b776deeae3502d45d06d13971e8ea249d2647d00b00e73625c515bc12a4b7bd8d34fafd5f3b32f290d48cdce
-DIST ipt_netflow-2.5.tar.gz 94097 BLAKE2B 5ca8d686e08f6fb0cdb1d502572afc71f146e2633ccf5fc7cb9ad21420fb62e88a2cb393e83ee4f5646200fa964d46a16ef58831958799449a4a59e2da6c9337 SHA512 8cd1bc46ef6e975964e5ddc290ed999f7076b63a9363f1a1f31b5d8db875d4e564ed5f0d5185c29dcf8a86793fe4badf63325b79ba1abbc264088b1ca94a9dad
-EBUILD ipt_netflow-2.4-r1.ebuild 2383 BLAKE2B 961e4ef35da8c6bc4111bb9a9ed8e4be4e05c24e9262e6fb6b7b55fc0ea8ce084e7830b3d8ec8b317a4afc89d242cd2f3ecd5a6dd8e9463f2a574aa80bf22b8e SHA512 6da791363ee57e08680722864203134a0fb89bf3079ab12e34ed02bfa2178606f1a65356ec727c615ce105c5ce0fd6fd91ad7c26554792f64abec8b765c2a6ec
-EBUILD ipt_netflow-2.5-r1.ebuild 2360 BLAKE2B 2309e1fd12f41326ba0071909ceabd6ccab1f8ae6e70520fdfdc5d239b46b424390b3dae2f34dc6d055d38b7209a77666841e0df73e6530b0100a7ba9eb417fc SHA512 39d13df5d3b49e0dcd941f3429589b8213b998c3edc639f47f579d9f4c639a851fcdab09b61ef57b3b05cffa487d32d36950e9081063decddb66aebb5e269bd9
-EBUILD ipt_netflow-2.5.1-r1.ebuild 2367 BLAKE2B 967715b3ccdbffd2d4ed88c1a6dcf351b7aefc1229c207babfc9dd65578df6cbc366ad0ff9a192200106faebc3916e8633e3c9c1248badf52ca80d5d4c7f4ce1 SHA512 dacad16472e8f700b4fac67c5f592c6fe83e0150cdff0127fae33fcd531170bdfe9ac62ba982e47d8d26761f5e274544965321dec73d471b48dde7ade4e5f3ed
-EBUILD ipt_netflow-2.5.1.ebuild 2360 BLAKE2B 2309e1fd12f41326ba0071909ceabd6ccab1f8ae6e70520fdfdc5d239b46b424390b3dae2f34dc6d055d38b7209a77666841e0df73e6530b0100a7ba9eb417fc SHA512 39d13df5d3b49e0dcd941f3429589b8213b998c3edc639f47f579d9f4c639a851fcdab09b61ef57b3b05cffa487d32d36950e9081063decddb66aebb5e269bd9
-EBUILD ipt_netflow-9999.ebuild 2389 BLAKE2B fa2aceaf3a3f47a849a8f67e9b23b95e1b1f212d858ae19ebb2bfaa4bb69619cb845583dd3ee44f1bab2212e0ee12a1db3fce49d083bcaa5d707c04bb6e38e71 SHA512 b0579ddb9303d78bbf5bac6a412497e200f4b190031a362ef2d576eb126deb03c3f9fbed22742d2b503df339dcc9ea6b2a80a3349e0beca68c2293f76d87e24c
+EBUILD ipt_netflow-2.4-r1.ebuild 2427 BLAKE2B 38ee77ea29ed5c32ebd13ec4cf4dc956a05441345e97b0ba732a52f8ecc3e85a9bb87290afa9fe4047c3caa60d40138ae2780b28cfc37c153e8d8cac9a48dfd1 SHA512 5f76b3bc90706f990f6cfa86463cf72a69198a525c7ad60805b7d812611dbf3817f72318cdd07ed280ec0f7035c6d5d980148352c905d6475e0f1059424d6950
+EBUILD ipt_netflow-2.5.1-r1.ebuild 2451 BLAKE2B bb93e5dbb140612d2638e5b93c2e2b965214c5a65fc2b5e29854668dfaeb25205c76ff2c07f7b11a4598a0cab42815267249d526789e49e9fade766c42ecb568 SHA512 cad2cf3860d7fe157f5305edb55d663315066f5c7f4dca44ae97f129c7d91774933f514fadd4950b4aee530305260930b9d8052bf12ff329996e2d5216cc7f77
+EBUILD ipt_netflow-9999.ebuild 2433 BLAKE2B 5bc455a234b42e8b53be0f100a0d826cd6092fc037132793d63a46467bed0c42f65683c0d83d1f155662fafc25ba731c3430935867e5efcc8dc2bb8e9f451fe1 SHA512 577a38067db83c0d7c67ba80178b7b6519d8342c61febf9d0bc0de288b6aa94d05bdeaf3fb3d59a20ccfff67efb15cd70bfbcf0a6f1639a19d41147d6a6c1551
 MISC metadata.xml 561 BLAKE2B 8b2d48273d5c27a1996089236e3981c7eff8546e73671136baa8a9ed0c18fb26a56be261b3162e4563878bf54487a0b26e389861a9dbc80af35783491564c7d3 SHA512 6cd4feab99315acfcf34f34fccd9ecb6b00b23efecef622cc638902a4ec62240f3d9f87d1f349a84ec7c4985a90f8632ffcfa9f403b42c26ce9d923ca9e01bc5
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.5.1-vlan_dev_priv.patch b/net-firewall/ipt_netflow/files/ipt_netflow-2.5.1-vlan_dev_priv.patch
new file mode 100644
index 000000000000..49721e547fd7
--- /dev/null
+++ b/net-firewall/ipt_netflow/files/ipt_netflow-2.5.1-vlan_dev_priv.patch
@@ -0,0 +1,32 @@
+commit 1153f73f038205dc17303e6e6c455bbbb56191f7
+Author: ABC <abc@openwall.com>
+Date:   Wed Oct 14 15:35:57 2020 +0300
+
+    gen_compat_def: Check for vlan_dev_priv instead of version if
+
+diff --git a/gen_compat_def b/gen_compat_def
+index c0f20f6..3965e94 100755
+--- a/gen_compat_def
++++ b/gen_compat_def
+@@ -85,6 +85,8 @@ kbuild_test_struct proc_ops linux/proc_fs.h
+ kbuild_test_struct proc_ops linux/proc_fs.h
+ # No since v5.1, but present in CentOS-8's 4.18.0-227
+ kbuild_test_symbol synchronize_sched linux/rcupdate.h
++# Stumbled on 5.9
++kbuild_test_struct vlan_dev_priv linux/if_vlan.h
+ 
+ echo "// End of compat_def.h"
+ 
+diff --git a/ipt_NETFLOW.c b/ipt_NETFLOW.c
+index 01055df..6f95166 100644
+--- a/ipt_NETFLOW.c
++++ b/ipt_NETFLOW.c
+@@ -4874,7 +4874,7 @@ static void parse_l2_header(const struct sk_buff *skb, struct ipt_netflow_tuple
+ 		tuple->tag[tag_num++] = htons(vlan_tx_tag_get(skb));
+ 	else if (skb->dev && is_vlan_dev(skb->dev)) {
+ 		struct net_device *vlan_dev = skb->dev;
+-# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
++# ifdef HAVE_VLAN_DEV_PRIV
+ 		struct vlan_dev_priv *vlan = vlan_dev_priv(vlan_dev);
+ 
+ 		/* `if` condition is `#if`ed intentionally, and this is
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.4-r1.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.4-r1.ebuild
index c3bec366b466..e36de51a30c8 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.4-r1.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.4-r1.ebuild
@@ -92,7 +92,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" all
+	emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" LD="$(tc-getLD)" OBJDUMP="$(tc-getOBJDUMP)" all
 }
 
 src_install() {
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.5-r1.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.5-r1.ebuild
deleted file mode 100644
index 2c7d537f291b..000000000000
--- a/net-firewall/ipt_netflow/ipt_netflow-2.5-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit linux-info linux-mod 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="debug natevents snmp"
-
-RDEPEND="
-	net-firewall/iptables:0=
-	snmp? ( net-analyzer/net-snmp )
-"
-DEPEND="${RDEPEND}
-	virtual/linux-sources
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
-	"${FILESDIR}/${PN}-2.5-gentoo.patch"
-)
-
-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
-			CONFIG_CHECK+=" NF_NAT_NEEDED"
-		else
-			CONFIG_CHECK+=" NF_NAT"
-		fi
-	fi
-
-	BUILD_TARGETS="all"
-	MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
-	IPT_LIB="/usr/$(get_libdir)/xtables"
-
-	linux-mod_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 debug && echo '--enable-debugfs') \
-		$(use natevents && echo '--enable-natevents') \
-		$(use snmp && echo '--enable-snmp-rules' || echo '--disable-snmp-agent')
-}
-
-src_compile() {
-	emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" all
-}
-
-src_install() {
-	linux-mod_src_install
-	exeinto "${IPT_LIB}"
-	doexe libipt_NETFLOW.so
-	use snmp && emake DESTDIR="${D}" SNMPTGSO="/usr/$(get_libdir)/snmp/dlmod/snmp_NETFLOW.so" sinstall
-	doheader ipt_NETFLOW.h
-	dodoc README*
-}
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild
index 637824868f6f..8fa83402adaa 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild
@@ -28,6 +28,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
 	"${FILESDIR}/${PN}-2.5-gentoo.patch"
+	"${FILESDIR}/${P}-vlan_dev_priv.patch"
 )
 
 pkg_setup() {
@@ -91,7 +92,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" all
+	emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" LD="$(tc-getLD)" OBJDUMP="$(tc-getOBJDUMP)" all
 }
 
 src_install() {
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.5.1.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.5.1.ebuild
deleted file mode 100644
index 2c7d537f291b..000000000000
--- a/net-firewall/ipt_netflow/ipt_netflow-2.5.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit linux-info linux-mod 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="debug natevents snmp"
-
-RDEPEND="
-	net-firewall/iptables:0=
-	snmp? ( net-analyzer/net-snmp )
-"
-DEPEND="${RDEPEND}
-	virtual/linux-sources
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
-	"${FILESDIR}/${PN}-2.5-gentoo.patch"
-)
-
-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
-			CONFIG_CHECK+=" NF_NAT_NEEDED"
-		else
-			CONFIG_CHECK+=" NF_NAT"
-		fi
-	fi
-
-	BUILD_TARGETS="all"
-	MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
-	IPT_LIB="/usr/$(get_libdir)/xtables"
-
-	linux-mod_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 debug && echo '--enable-debugfs') \
-		$(use natevents && echo '--enable-natevents') \
-		$(use snmp && echo '--enable-snmp-rules' || echo '--disable-snmp-agent')
-}
-
-src_compile() {
-	emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" all
-}
-
-src_install() {
-	linux-mod_src_install
-	exeinto "${IPT_LIB}"
-	doexe libipt_NETFLOW.so
-	use snmp && emake DESTDIR="${D}" SNMPTGSO="/usr/$(get_libdir)/snmp/dlmod/snmp_NETFLOW.so" sinstall
-	doheader ipt_NETFLOW.h
-	dodoc README*
-}
diff --git a/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild b/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild
index 74ad5f1c71d8..d4305e2fc5c5 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild
@@ -92,7 +92,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" all
+	emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" LD="$(tc-getLD)" OBJDUMP="$(tc-getOBJDUMP)" all
 }
 
 src_install() {