From bbe997ba2ad4da9342981c9783df03ad0e08b8e4 Mon Sep 17 00:00:00 2001
From: Alarig Le Lay <alarig@swordarmor.fr>
Date: Sun, 24 May 2020 14:33:29 +0200
Subject: [PATCH] net-firewall/ipt_netflow: Add IPv6/dot1q patch to all
 versions

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alarig Le Lay <alarig@swordarmor.fr>
---
 net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild  | 3 ++-
 net-firewall/ipt_netflow/ipt_netflow-2.5.ebuild  | 8 +++++---
 net-firewall/ipt_netflow/ipt_netflow-9999.ebuild | 6 ++++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild
index a2a39fc..d167b5e 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild
@@ -34,8 +34,9 @@ PATCHES=(
 pkg_setup() {
 	linux-info_pkg_setup
 
-	use dot1q && local CONFIG_CHECK="~IP_NF_IPTABLES VLAN_8021Q"
+	local CONFIG_CHECK="~IP_NF_IPTABLES"
 	use debug && CONFIG_CHECK+=" ~DEBUG_FS"
+	use dot1q && CONFIG_CHECK+=" VLAN_8021Q"
 	if use natevents; then
 		CONFIG_CHECK+=" NF_CONNTRACK_EVENTS"
 		if kernel_is lt 5 2; then
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.5.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.5.ebuild
index 2c7d537..b426de2 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.5.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.5.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="debug natevents snmp"
+IUSE="debug dot1q natevents snmp"
 
 RDEPEND="
 	net-firewall/iptables:0=
@@ -33,8 +33,9 @@ PATCHES=(
 pkg_setup() {
 	linux-info_pkg_setup
 
-	local CONFIG_CHECK="BRIDGE_NETFILTER ~IP_NF_IPTABLES VLAN_8021Q"
+	local CONFIG_CHECK="BRIDGE_NETFILTER ~IP_NF_IPTABLES"
 	use debug && CONFIG_CHECK+=" ~DEBUG_FS"
+	use dot1q && CONFIG_CHECK+=" VLAN_8021Q"
 	if use natevents; then
 		CONFIG_CHECK+=" NF_CONNTRACK_EVENTS"
 		if kernel_is lt 5 2; then
@@ -79,13 +80,13 @@ src_configure() {
 		--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 dot1q && echo '--enable-vlan') \
 		$(use natevents && echo '--enable-natevents') \
 		$(use snmp && echo '--enable-snmp-rules' || echo '--disable-snmp-agent')
 }
@@ -98,6 +99,7 @@ src_install() {
 	linux-mod_src_install
 	exeinto "${IPT_LIB}"
 	doexe libipt_NETFLOW.so
+	doexe libip6t_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 d24c48c..d4eb288 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild
@@ -33,8 +33,9 @@ PATCHES=(
 pkg_setup() {
 	linux-info_pkg_setup
 
-	local CONFIG_CHECK="BRIDGE_NETFILTER ~IP_NF_IPTABLES VLAN_8021Q"
+	local CONFIG_CHECK="BRIDGE_NETFILTER ~IP_NF_IPTABLES"
 	use debug && CONFIG_CHECK+=" ~DEBUG_FS"
+	use dot1q && CONFIG_CHECK+=" VLAN_8021Q"
 	if use natevents; then
 		CONFIG_CHECK+=" NF_CONNTRACK_EVENTS"
 		if kernel_is lt 5 2; then
@@ -80,13 +81,13 @@ src_configure() {
 		--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 dot1q && echo '--enable-vlan') \
 		$(use natevents && echo '--enable-natevents') \
 		$(use snmp && echo '--enable-snmp-rules' || echo '--disable-snmp-agent')
 }
@@ -99,6 +100,7 @@ src_install() {
 	linux-mod_src_install
 	exeinto "${IPT_LIB}"
 	doexe libipt_NETFLOW.so
+	doexe libip6t_NETFLOW.so
 	use snmp && emake DESTDIR="${D}" SNMPTGSO="/usr/$(get_libdir)/snmp/dlmod/snmp_NETFLOW.so" sinstall
 	doheader ipt_NETFLOW.h
 	dodoc README*