[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/, net-firewall/ipt_netflow/files/

[Sergey Popov]

commit: a5debd13910f26e1a5c3e1d025f3bb79b3d52613
Author: Sergey Popov  gentoo  org>
AuthorDate: Fri Jan 19 12:20:57 2024 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Fri Jan 19 12:22:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5debd13

net-firewall/ipt_netflow: fix build with kernel 6.4

Closes: https://bugs.gentoo.org/921589
Reported-by: Aurelien Minet  free.fr>
Signed-off-by: Sergey Popov  gentoo.org>

 .../files/ipt_netflow-2.6-kernel-6.4.patch | 66 ++
 net-firewall/ipt_netflow/ipt_netflow-2.6-r1.ebuild |  4 +-
 2 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.6-kernel-6.4.patch 
b/net-firewall/ipt_netflow/files/ipt_netflow-2.6-kernel-6.4.patch
new file mode 100644
index ..cfbca8823d79
--- /dev/null
+++ b/net-firewall/ipt_netflow/files/ipt_netflow-2.6-kernel-6.4.patch
@@ -0,0 +1,66 @@
+From 0eb2092e930c78fc726d5d05abbcc81aa6c41b89 Mon Sep 17 00:00:00 2001
+From: ABC 
+Date: Mon, 26 Jun 2023 16:29:58 -0300
+Subject: [PATCH] Build compatibility with v6.4 (register_sysctl_paths)
+
+'register_sysctl_paths' is missed from v6.4 due to 0199849acd07
+("sysctl: remove register_sysctl_paths()").
+
+Signed-off-by: ABC 
+
+Slightly modified to fit on 2.6 release
+---
+ gen_compat_def |  2 ++
+ ipt_NETFLOW.c  | 10 --
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/gen_compat_def b/gen_compat_def
+index 396fdb9..a9cb95e 100755
+--- a/gen_compat_def
 b/gen_compat_def
+@@ -87,6 +87,8 @@
+ kbuild_test_symbol nf_bridge_info_get linux/netfilter_bridge.h
+ # Stumbled on 5.9
+ kbuild_test_struct vlan_dev_priv linux/if_vlan.h
++# 6.4: 0199849acd07 ("sysctl: remove register_sysctl_paths()")
++kbuild_test_symbol register_sysctl_paths linux/sysctl.h
+ 
+ echo "// End of compat_def.h"
+ 
+diff --git a/ipt_NETFLOW.c b/ipt_NETFLOW.c
+index b3c2c99..eee8074 100644
+--- a/ipt_NETFLOW.c
 b/ipt_NETFLOW.c
+@@ -1929,16 +1929,18 @@ static ctl_table netflow_net_table[] = {
+   { }
+ };
+ #else /* >= 2.6.25 */
++# ifdef HAVE_REGISTER_SYSCTL_PATHS
+ static struct ctl_path netflow_sysctl_path[] = {
+   {
+   .procname = "net",
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
++#  if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
+   .ctl_name = CTL_NET
+-#endif
++#  endif
+   },
+   { .procname = "netflow" },
+   { }
+ };
++# endif
+ #endif /* 2.6.25 */
+ #endif /* CONFIG_SYSCTL */
+ 
+@@ -5666,7 +5668,11 @@ static int __init ipt_netflow_init(void)
+ #endif
+ );
+ #else /* 2.6.25 */
++# ifdef HAVE_REGISTER_SYSCTL_PATHS
+   netflow_sysctl_header = register_sysctl_paths(netflow_sysctl_path, 
netflow_sysctl_table);
++# else
++  netflow_sysctl_header = register_sysctl("net/netflow", 
netflow_sysctl_table);
++# endif
+ #endif
+   if (!netflow_sysctl_header) {
+   printk(KERN_ERR "netflow: can't register to sysctl\n");

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.6-r1.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.6-r1.ebuild
index 5cbcfb78c715..08997f3178c2 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.6-r1.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,7 +33,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.6-gentoo.patch"
"${FILESDIR}/${P}-ref_module_fix.patch" # bug #781014
"${FILESDIR}/${P}-fix-linux-headers-5.14.patch" # bug #813993
-
+   "${FILESDIR}/${P}-kernel-6.4.patch" # bug #921589
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Sergey Popov]

commit: 42d6201de79953fa33403d2b68ee34165bf95f9d
Author: Sergey Popov  gentoo  org>
AuthorDate: Fri Sep  8 07:34:59 2023 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Fri Sep  8 07:34:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42d6201d

net-firewall/ipt_netflow: drop old version

Signed-off-by: Sergey Popov  gentoo.org>

 net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild | 111 
 1 file changed, 111 deletions(-)

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild
deleted file mode 100644
index a26ec1f4b629..
--- a/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2022 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="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() {
-   linux-info_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
-
-   BUILD_TARGETS="all"
-   MODULE_NAMES="ipt_NETFLOW(ipt_netflow)"
-   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 natevents && echo '--enable-natevents') \
-   $(use snmp && echo '--enable-snmp-rules' || echo 
'--disable-snmp-agent')
-}
-
-src_compile() {
-   emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" LD="$(tc-getLD)" 
OBJDUMP="$(tc-getOBJDUMP)" all
-}
-
-src_install() {
-   linux-mod_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
-   dodoc README*
-}

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Sergey Popov]

commit: 2bbe2ff88fa946b30dac6e8395960acc5c365d63
Author: Sergey Popov  gentoo  org>
AuthorDate: Fri Sep  8 07:34:07 2023 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Fri Sep  8 07:34:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bbe2ff8

net-firewall/ipt_netflow-2.6-r1: stable on amd64/x86

Closes: https://bugs.gentoo.org/913837
Signed-off-by: Sergey Popov  gentoo.org>

 net-firewall/ipt_netflow/ipt_netflow-2.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.6-r1.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.6-r1.ebuild
index 63f30e67a15b..5cbcfb78c715 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.6-r1.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.6-r1.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/aabc/ipt-netflow/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="natevents snmp"
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Sergey Popov]

commit: eb100ed1cba3a85817402eda31cec24181546b67
Author: Sergey Popov  gentoo  org>
AuthorDate: Tue Jun 27 09:10:33 2023 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Tue Jun 27 09:12:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb100ed1

net-firewall/ipt_netflow: remove obsolete USE="debug"

Reported-by: Agostino Sarubbo  gentoo.org>
Closes: https://bugs.gentoo.org/831306
Signed-off-by: Sergey Popov  gentoo.org>

 net-firewall/ipt_netflow/ipt_netflow-2.6-r1.ebuild | 4 +---
 net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild| 4 +---
 net-firewall/ipt_netflow/ipt_netflow-.ebuild   | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.6-r1.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.6-r1.ebuild
index ed681389901d..63f30e67a15b 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.6-r1.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.6-r1.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=
@@ -38,7 +38,6 @@ PATCHES=(
 
 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
@@ -88,7 +87,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-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-.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-.ebuild
index 2ea5558fb6e6..5c63a5984557 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-.ebuild
@@ -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=
@@ -33,7 +33,6 @@ PATCHES=(
 
 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
@@ -82,7 +81,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')
 }

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/, net-firewall/ipt_netflow/files/

[Sergey Popov]

commit: 7c8a3effadf1997628b137b7855a1f4e1fe5f969
Author: Sergey Popov  gentoo  org>
AuthorDate: Tue Jun 27 08:55:47 2023 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Tue Jun 27 08:58:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c8a3eff

net-firewall/ipt_netflow: revision bump

Bump EAPI to 8. Migrate to linux-mod-r1 eclass
Sync live ebuild
Add missing remote-id in metadata.xml

Signed-off-by: Sergey Popov  gentoo.org>

 .../files/ipt_netflow--gentoo.patch| 15 -
 ...tflow-.ebuild => ipt_netflow-2.6-r1.ebuild} | 36 --
 net-firewall/ipt_netflow/ipt_netflow-.ebuild   | 18 +--
 net-firewall/ipt_netflow/metadata.xml  |  1 +
 4 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/net-firewall/ipt_netflow/files/ipt_netflow--gentoo.patch 
b/net-firewall/ipt_netflow/files/ipt_netflow--gentoo.patch
index 675e8b16f725..de797495f0fd 100644
--- a/net-firewall/ipt_netflow/files/ipt_netflow--gentoo.patch
+++ b/net-firewall/ipt_netflow/files/ipt_netflow--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-.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.6-r1.ebuild
similarity index 78%
copy from net-firewall/ipt_netflow/ipt_netflow-.ebuild
copy to net-firewall/ipt_netflow/ipt_netflow-2.6-r1.ebuild
index 986e6de1d7a8..ed681389901d 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.6-r1.ebuild
@@ -1,19 +1,21 @@
-# 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 linux-mod-r1 toolchain-funcs
 
 DESCRIPTION="Netflow iptables module"
 HOMEPAGE="
https://sourceforge.net/projects/ipt-netflow
https://github.com/aabc/ipt-netflow
 "
-EGIT_REPO_URI="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="
@@ -28,12 +30,13 @@ BDEPEND="
 
 PATCHES=(
"${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
-   "${FILESDIR}/${PN}--gentoo.patch"
+   "${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() {
-   linux-info_pkg_setup
-
local CONFIG_CHECK="BRIDGE_NETFILTER ~IP_NF_IPTABLES VLAN_8021Q"
use debug && CONFIG_CHECK+=" ~DEBUG_FS"
if use natevents; then
@@ -45,21 +48,19 @@ pkg_setup() {
fi
fi
 
-   BUILD_TARGETS="all"
-   MODULE_NAMES="ipt_NETFLOW(ipt_netflow)"
IPT_LIB="/usr/$(get_libdir)/xtables"
+   linux-mod-r1_pkg_setup
+}
 
-   linux-mod_pkg_setup
+src_unpack() {
+   default
+
+   mv "${WORKDIR}"/${PN/_/-}-* "${WORKDIR}"/${P} || die
 }
 
 src_prepare() {
default
 
-   # Fix incorrect module version in sources
-   sed -i \
-   -e '/IPT_NETFLOW_VERSION/s#"[0-9.]*"#"'${PV}'"#' \
-   ipt_NETFLOW.c || die
-
# Checking for directory is enough
sed -i \
-e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' \
@@ -93,11 +94,13 @@ src_configure() {
 }
 
 src_compile() {
+   local modlist=( ipt_NETFLOW=ipt_netflow )
+   linux-mod-r1_src_compile

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Sergey Popov]

commit: 2a6af3f75b74e2e70da89a2a334fba5b97af04de
Author: Sergey Popov  gentoo  org>
AuthorDate: Mon Mar 28 07:29:07 2022 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Mon Mar 28 07:30:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a6af3f7

net-firewall/ipt_netflow: remove redunant ${S} variable from pkg_setup

Closes: https://bugs.gentoo.org/836083
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Sergey Popov  gentoo.org>

 net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild  | 4 ++--
 net-firewall/ipt_netflow/ipt_netflow-.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild
index 4665d475be3d..2340a8abfae7 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -51,7 +51,7 @@ pkg_setup() {
fi
 
BUILD_TARGETS="all"
-   MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
+   MODULE_NAMES="ipt_NETFLOW(ipt_netflow)"
IPT_LIB="/usr/$(get_libdir)/xtables"
 
linux-mod_pkg_setup

diff --git a/net-firewall/ipt_netflow/ipt_netflow-.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-.ebuild
index 55047faefa34..986e6de1d7a8 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -46,7 +46,7 @@ pkg_setup() {
fi
 
BUILD_TARGETS="all"
-   MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
+   MODULE_NAMES="ipt_NETFLOW(ipt_netflow)"
IPT_LIB="/usr/$(get_libdir)/xtables"
 
linux-mod_pkg_setup

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/files/, net-firewall/ipt_netflow/

[Sam James]

commit: 47dba6226b616c192fd3fb9d0f37ec2945498f60
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 16 22:36:56 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 16 22:37:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47dba622

net-firewall/ipt_netflow: fix build with linux-headers-5.14

Closes: https://bugs.gentoo.org/813993
Signed-off-by: Sam James  gentoo.org>

 .../ipt_netflow-2.6-fix-linux-headers-5.14.patch   | 29 ++
 net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild|  2 ++
 2 files changed, 31 insertions(+)

diff --git 
a/net-firewall/ipt_netflow/files/ipt_netflow-2.6-fix-linux-headers-5.14.patch 
b/net-firewall/ipt_netflow/files/ipt_netflow-2.6-fix-linux-headers-5.14.patch
new file mode 100644
index ..0f52b68d5235
--- /dev/null
+++ 
b/net-firewall/ipt_netflow/files/ipt_netflow-2.6-fix-linux-headers-5.14.patch
@@ -0,0 +1,29 @@
+https://github.com/aabc/ipt-netflow/commit/66e4304101010108892376866334ec9317b427d8.patch
+https://bugs.gentoo.org/813993
+
+From: ABC 
+Date: Wed, 14 Jul 2021 15:39:42 +0300
+Subject: [PATCH] Namespace sk_error_report
+
+sk_error_report is introduced in v5.14-rc1: e3ae2365efc14 ("net: sock:
+introduce sk_error_report").
+--- a/ipt_NETFLOW.c
 b/ipt_NETFLOW.c
+@@ -1943,7 +1943,7 @@ static struct ctl_path netflow_sysctl_path[] = {
+ #endif /* CONFIG_SYSCTL */
+ 
+ /* socket code */
+-static void sk_error_report(struct sock *sk)
++static void netflow_sk_error_report(struct sock *sk)
+ {
+   struct ipt_netflow_sock *usock;
+ 
+@@ -1974,7 +1974,7 @@ static struct socket *usock_open_sock(struct 
ipt_netflow_sock *usock)
+   }
+   sock->sk->sk_allocation = GFP_ATOMIC;
+   sock->sk->sk_prot->unhash(sock->sk); /* hidden from input */
+-  sock->sk->sk_error_report = _error_report; /* clear ECONNREFUSED */
++  sock->sk->sk_error_report = _sk_error_report; /* clear 
ECONNREFUSED */
+   sock->sk->sk_user_data = usock;
+   sock->sk->sk_reuse = SK_CAN_REUSE;
+ 

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild
index 35009fb8ac17..4665d475be3d 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild
@@ -32,6 +32,8 @@ 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() {

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/files/, net-firewall/ipt_netflow/

[Sergey Popov]

commit: 205596a0f676638bc1fa3a4f6b552b984c98a5d4
Author: Sergey Popov  gentoo  org>
AuthorDate: Mon Jul  5 14:20:50 2021 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Mon Jul  5 14:21:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=205596a0

net-firewall/ipt_netflow: backport fix regarding obsolete ref_module call

Closes: https://bugs.gentoo.org/781014
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Sergey Popov  gentoo.org>

 .../files/ipt_netflow-2.6-ref_module_fix.patch | 60 ++
 net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild|  1 +
 2 files changed, 61 insertions(+)

diff --git 
a/net-firewall/ipt_netflow/files/ipt_netflow-2.6-ref_module_fix.patch 
b/net-firewall/ipt_netflow/files/ipt_netflow-2.6-ref_module_fix.patch
new file mode 100644
index 000..21d64719070
--- /dev/null
+++ b/net-firewall/ipt_netflow/files/ipt_netflow-2.6-ref_module_fix.patch
@@ -0,0 +1,60 @@
+commit 352cdb28eecbb57de3509b18dfc37dcce0455c01
+Author: ABC 
+Date:   Tue Jun 22 19:07:02 2021 +0300
+
+Fix compile for stable kernels by not using 'ref_module'
+
+`ref_module' unexport in 7ef5264de7732 ("modules: mark ref_module
+static") is back-ported into stable kernels making old `#if
+LINUX_VERSION_CODE' checks irrelevant or too complicated to update.
+
+Do not use `ref_module' API at all since `try_module_get' is ancient
+enough to use always.
+
+Reported-by: https://github.com/xtaran
+Fixes: https://github.com/aabc/ipt-netflow/issues/177
+
+diff --git a/compat.h b/compat.h
+index 99edf91..30f1d8f 100644
+--- a/compat.h
 b/compat.h
+@@ -170,10 +170,6 @@ static int __ethtool_get_settings(struct net_device *dev, 
struct ethtool_cmd *cm
+ # define CHECK_OK 0
+ #endif
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)
+-# define use_module   ref_module
+-#endif
+-
+ #ifndef NF_IP_LOCAL_IN /* 2.6.25 */
+ # define NF_IP_PRE_ROUTINGNF_INET_PRE_ROUTING
+ # define NF_IP_LOCAL_IN   NF_INET_LOCAL_IN
+diff --git a/ipt_NETFLOW.c b/ipt_NETFLOW.c
+index d3d3901..c4c049d 100644
+--- a/ipt_NETFLOW.c
 b/ipt_NETFLOW.c
+@@ -5494,12 +5494,8 @@ static void register_ct_events(void)
+   }
+   /* Reference netlink module to prevent it's unsafe unload before us. */
+   if (!netlink_m && (netlink_m = find_module(NETLINK_M))) {
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(5,9,0)
+-  use_module(THIS_MODULE, netlink_m);
+-#else
+   if (!try_module_get(netlink_m))
+   netlink_m = NULL;
+-#endif
+   }
+ 
+   /* Register ct events callback. */
+@@ -5527,10 +5523,9 @@ static void unregister_ct_events(void)
+ #else /* < v3.2 */
+   unset_notifier_cb();
+ #endif /* v3.2 */
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0)
+   module_put(netlink_m);
+   netlink_m = NULL;
+-#endif
++
+   rcu_assign_pointer(saved_event_cb, NULL);
+ #else /* < v2.6.31 */
+   nf_conntrack_unregister_notifier(_notifier);

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild
index 29ed265510f..35009fb8ac1 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild
@@ -31,6 +31,7 @@ BDEPEND="
 PATCHES=(
"${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
"${FILESDIR}/${PN}-2.6-gentoo.patch"
+   "${FILESDIR}/${P}-ref_module_fix.patch" # bug #781014
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/, net-firewall/ipt_netflow/files/

[Sergey Popov]

commit: 646844f1f2373014a76b78442bb66f244aa23aa5
Author: Sergey Popov  gentoo  org>
AuthorDate: Mon Jul  5 14:12:59 2021 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Mon Jul  5 14:15:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=646844f1

net-firewall/ipt_netflow-2.6: stable on amd64/x86

Drop old version

Bug: https://bugs.gentoo.org/791598
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Sergey Popov  gentoo.org>

 net-firewall/ipt_netflow/Manifest  |   1 -
 .../ipt_netflow/files/ipt_netflow-2.5-gentoo.patch |  61 ---
 .../files/ipt_netflow-2.5.1-vlan_dev_priv.patch|  32 --
 .../ipt_netflow/ipt_netflow-2.5.1-r1.ebuild| 111 -
 net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild|   2 +-
 5 files changed, 1 insertion(+), 206 deletions(-)

diff --git a/net-firewall/ipt_netflow/Manifest 
b/net-firewall/ipt_netflow/Manifest
index a779559db91..8d7eda97792 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1,2 +1 @@
-DIST ipt_netflow-2.5.1.tar.gz 94627 BLAKE2B 
440daed1f0c02e4700c6d4a97da08abc7bf51c73cd824a67fd2b7b9394b47d493ca7acfea34467d93cdce6dded2c5b24b4a2600b9f717aa54561d1f88a123dbc
 SHA512 
dd0bde358f788f2d62ace6a0b1529128f0a686f9b776deeae3502d45d06d13971e8ea249d2647d00b00e73625c515bc12a4b7bd8d34fafd5f3b32f290d48cdce
 DIST ipt_netflow-2.6.tar.gz 95752 BLAKE2B 
088c7030addd34d9d889cfa705aa060d0793e33be957deb3b703daea4229afc24f7268285ce336e425a024dc9d8139633a5206ff9d769c95cf71c156acbd4f25
 SHA512 
0ccea556e25dc6bc2d8c7648ed1b4ab366097baf5b06f167ccd19d2adb0a195ad652635181573785f9e9fa208d163f22b6527310eb939455d7ee3bc141cbeed5

diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.5-gentoo.patch 
b/net-firewall/ipt_netflow/files/ipt_netflow-2.5-gentoo.patch
deleted file mode 100644
index 508be107795..000
--- a/net-firewall/ipt_netflow/files/ipt_netflow-2.5-gentoo.patch
+++ /dev/null
@@ -1,61 +0,0 @@
 a/Makefile.in
-+++ b/Makefile.in
-@@ -11,7 +11,7 @@
- SNMPTGSO = /usr/lib/snmp/dlmod/snmp_NETFLOW.so
- SNMPCONF = /etc/snmp/snmpd.conf
- SNMPLINE = dlmod netflow $(SNMPTGSO)
--CC = gcc
-+CC ?= gcc
- 
- # https://www.kernel.org/doc/Documentation/kbuild/modules.txt
- # https://www.kernel.org/doc/Documentation/kbuild/makefiles.txt
-@@ -22,31 +22,31 @@
- 
- 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
-   @touch $@
- compat_def.h: gen_compat_def
-   ./gen_compat_def > $@
- 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)
--  make -C $(KDIR) M=$(CURDIR) modules C=1
-+  $(MAKE) -C $(KDIR) M=$(CURDIR) modules C=1
-   @touch ipt_NETFLOW.ko
- coverity:
-   coverity-submit -v
- 
- minstall: | ipt_NETFLOW.ko
-   @echo " *"
--  make -C $(KDIR) M=$(CURDIR) modules_install INSTALL_MOD_PATH=$(DESTDIR)
-+  $(MAKE) -C $(KDIR) M=$(CURDIR) modules_install 
INSTALL_MOD_PATH=$(DESTDIR)
-   $(DEPMOD)
- mclean:
--  make -C $(KDIR) M=$(CURDIR) clean
-+  $(MAKE) -C $(KDIR) M=$(CURDIR) clean
- lclean:
-   -rm -f *.so *_sh.o
- clean: mclean lclean
-   -rm -f *.so *.o modules.order version.h compat_def.h
- 
- snmp_NETFLOW.so: snmp_NETFLOW.c
--  $(CC) -fPIC -shared -o $@ $< -lnetsnmp
-+  $(CC) $(CFLAGS) $(LDFLAGS) -fPIC -shared -o $@ $< -lnetsnmp
- 
- sinstall: | snmp_NETFLOW.so IPT-NETFLOW-MIB.my
-   @echo " *"
-@@ -66,10 +66,10 @@
-   fi
- 
- %_sh.o: libipt_NETFLOW.c
--  $(CC) $(CFLAGS) -O2 -Wall -Wunused $(IPTABLES_CFLAGS) -fPIC -o $@ -c 
libipt_NETFLOW.c
-+  $(CC) $(CFLAGS) -Wall -Wunused $(IPTABLES_CFLAGS) -fPIC -o $@ -c 
libipt_NETFLOW.c
- 
- %.so: %_sh.o
--  $(CC) -shared -o $@ $<
-+  $(CC) $(LDFLAGS) -shared -o $@ $<
- 
- version.h: ipt_NETFLOW.c ipt_NETFLOW.h compat.h Makefile
-   @./version.sh --define > version.h

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
deleted file mode 100644
index 49721e547fd..000
--- a/net-firewall/ipt_netflow/files/ipt_netflow-2.5.1-vlan_dev_priv.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 1153f73f038205dc17303e6e6c45556191f7
-Author: ABC 
-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
-+# 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/, net-firewall/ipt_netflow/files/

[Sergey Popov]

commit: 490a3ecbbc4e4e43a7e1b4d2253490f1ca169212
Author: Sergey Popov  gentoo  org>
AuthorDate: Thu May 27 10:01:51 2021 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Thu May 27 10:01:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=490a3ecb

net-firewall/ipt_netflow: version bump

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Sergey Popov  gentoo.org>

 net-firewall/ipt_netflow/Manifest  |   1 +
 .../ipt_netflow/files/ipt_netflow-2.6-gentoo.patch |  61 
 net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild| 110 +
 3 files changed, 172 insertions(+)

diff --git a/net-firewall/ipt_netflow/Manifest 
b/net-firewall/ipt_netflow/Manifest
index 595c50a16e3..a779559db91 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1 +1,2 @@
 DIST ipt_netflow-2.5.1.tar.gz 94627 BLAKE2B 
440daed1f0c02e4700c6d4a97da08abc7bf51c73cd824a67fd2b7b9394b47d493ca7acfea34467d93cdce6dded2c5b24b4a2600b9f717aa54561d1f88a123dbc
 SHA512 
dd0bde358f788f2d62ace6a0b1529128f0a686f9b776deeae3502d45d06d13971e8ea249d2647d00b00e73625c515bc12a4b7bd8d34fafd5f3b32f290d48cdce
+DIST ipt_netflow-2.6.tar.gz 95752 BLAKE2B 
088c7030addd34d9d889cfa705aa060d0793e33be957deb3b703daea4229afc24f7268285ce336e425a024dc9d8139633a5206ff9d769c95cf71c156acbd4f25
 SHA512 
0ccea556e25dc6bc2d8c7648ed1b4ab366097baf5b06f167ccd19d2adb0a195ad652635181573785f9e9fa208d163f22b6527310eb939455d7ee3bc141cbeed5

diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.6-gentoo.patch 
b/net-firewall/ipt_netflow/files/ipt_netflow-2.6-gentoo.patch
new file mode 100644
index 000..44dcfdec6d7
--- /dev/null
+++ b/net-firewall/ipt_netflow/files/ipt_netflow-2.6-gentoo.patch
@@ -0,0 +1,61 @@
+--- a/Makefile.in  2021-05-27 12:57:29.600377496 +0300
 b/Makefile.in  2021-05-27 12:58:55.111381725 +0300
+@@ -13,7 +13,7 @@
+ SNMPTGSO = /usr/lib/snmp/dlmod/snmp_NETFLOW.so
+ SNMPCONF = /etc/snmp/snmpd.conf
+ SNMPLINE = dlmod netflow $(SNMPTGSO)
+-CC = gcc
++CC ?= gcc
+ 
+ # https://www.kernel.org/doc/Documentation/kbuild/modules.txt
+ # https://www.kernel.org/doc/Documentation/kbuild/makefiles.txt
+@@ -24,31 +24,31 @@
+ 
+ ipt_NETFLOW.ko: version.h ipt_NETFLOW.c ipt_NETFLOW.h compat_def.h compat.h 
Makefile
+   @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 > $@
+ 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)
+-  make -C $(KDIR) M=$(CURDIR) modules C=1
++  $(MAKE) -C $(KDIR) M=$(CURDIR) modules C=1
+   @touch ipt_NETFLOW.ko
+ coverity:
+   coverity-submit -v
+ 
+ minstall: | ipt_NETFLOW.ko
+   @echo " *"
+-  make -C $(KDIR) M=$(CURDIR) modules_install INSTALL_MOD_PATH=$(DESTDIR)
++  $(MAKE) -C $(KDIR) M=$(CURDIR) modules_install 
INSTALL_MOD_PATH=$(DESTDIR)
+   $(DEPMOD)
+ mclean:
+-  make -C $(KDIR) M=$(CURDIR) clean
++  $(MAKE) -C $(KDIR) M=$(CURDIR) clean
+ lclean:
+   -rm -f *.so *_sh.o
+ clean: mclean lclean
+   -rm -f *.so *.o modules.order version.h compat_def.h
+ 
+ snmp_NETFLOW.so: snmp_NETFLOW.c
+-  $(CC) -fPIC -shared -o $@ $< -lnetsnmp
++  $(CC) $(CFLAGS) $(LDFLAGS) -fPIC -shared -o $@ $< -lnetsnmp
+ 
+ sinstall: | snmp_NETFLOW.so IPT-NETFLOW-MIB.my
+   @echo " *"
+@@ -68,10 +68,10 @@
+   fi
+ 
+ %_sh.o: libipt_NETFLOW.c
+-  $(CC) $(CFLAGS) -O2 -Wall -Wunused $(IPTABLES_CFLAGS) -fPIC -o $@ -c 
libipt_NETFLOW.c
++  $(CC) $(CFLAGS) -Wall -Wunused $(IPTABLES_CFLAGS) -fPIC -o $@ -c 
libipt_NETFLOW.c
+ 
+ %.so: %_sh.o
+-  $(CC) -shared -o $@ $<
++  $(CC) $(LDFLAGS) -shared -o $@ $<
+ 
+ version.h: ipt_NETFLOW.c ipt_NETFLOW.h compat.h Makefile
+   @./version.sh --define > version.h

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild
new file mode 100644
index 000..97fce443ce9
--- /dev/null
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2021 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}"
+BDEPEND="
+   virtual/linux-sources
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.0-configure.patch" # bug 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Sam James]

commit: 4a82baeb81975640ef3840783cf979b94a178a99
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 10 01:17:28 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 10 01:17:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a82baeb

net-firewall/ipt_netflow: BDEPEND for EAPI 7

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild | 7 +--
 net-firewall/ipt_netflow/ipt_netflow-.ebuild | 9 +
 2 files changed, 10 insertions(+), 6 deletions(-)

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 d64a581002f..bf18a5d0083 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
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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"
@@ -21,10 +22,12 @@ RDEPEND="
net-firewall/iptables:0=
snmp? ( net-analyzer/net-snmp )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/linux-sources
virtual/pkgconfig
 "
+
 PATCHES=(
"${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
"${FILESDIR}/${PN}-2.5-gentoo.patch"

diff --git a/net-firewall/ipt_netflow/ipt_netflow-.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-.ebuild
index d4305e2fc5c..55047faefa3 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit git-r3 linux-info linux-mod toolchain-funcs
 
 DESCRIPTION="Netflow iptables module"
@@ -13,18 +14,18 @@ EGIT_REPO_URI="https://github.com/aabc/ipt-netflow;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-
 IUSE="debug natevents snmp"
 
 RDEPEND="
net-firewall/iptables:0=
snmp? ( net-analyzer/net-snmp )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/linux-sources
virtual/pkgconfig
 "
+
 PATCHES=(
"${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
"${FILESDIR}/${PN}--gentoo.patch"

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Sergey Popov]

commit: 33617ac933a94e65104c236d48dca071753256a7
Author: Sergey Popov  gentoo  org>
AuthorDate: Wed Dec  2 07:17:16 2020 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Wed Dec  2 07:19:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33617ac9

net-firewall/ipt_netflow-2.5.1-r1: stable for amd64/x86

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sergey Popov  gentoo.org>

 net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 8fa83402ada..d64a581002f 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
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/aabc/ipt-netflow/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="debug natevents snmp"
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/, net-firewall/ipt_netflow/files/

[Sergey Popov]

commit: 36ff33603222f02db016a4a184e676f1e5b5c745
Author: Sergey Popov  gentoo  org>
AuthorDate: Wed Dec  2 07:17:57 2020 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Wed Dec  2 07:19:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36ff3360

net-firewall/ipt_netflow: drop old version

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sergey Popov  gentoo.org>

 net-firewall/ipt_netflow/Manifest  |   1 -
 .../ipt_netflow/files/ipt_netflow-2.3-flags.patch  |  55 ---
 .../files/ipt_netflow-2.4-bridge_netfilter.patch   |  61 
 net-firewall/ipt_netflow/ipt_netflow-2.4-r1.ebuild | 105 -
 4 files changed, 222 deletions(-)

diff --git a/net-firewall/ipt_netflow/Manifest 
b/net-firewall/ipt_netflow/Manifest
index 592cc2926c3..595c50a16e3 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1,2 +1 @@
-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

diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.3-flags.patch 
b/net-firewall/ipt_netflow/files/ipt_netflow-2.3-flags.patch
deleted file mode 100644
index 0d89e5ba90a..000
--- a/net-firewall/ipt_netflow/files/ipt_netflow-2.3-flags.patch
+++ /dev/null
@@ -1,55 +0,0 @@
 a/Makefile.in
-+++ b/Makefile.in
-@@ -11,7 +11,7 @@
- SNMPTGSO = /usr/lib/snmp/dlmod/snmp_NETFLOW.so
- SNMPCONF = /etc/snmp/snmpd.conf
- SNMPLINE = dlmod netflow $(SNMPTGSO)
--CC = gcc
-+$(CC) ?= gcc
- 
- # https://www.kernel.org/doc/Documentation/kbuild/modules.txt
- # https://www.kernel.org/doc/Documentation/kbuild/makefiles.txt
-@@ -22,29 +22,29 @@
- 
- ipt_NETFLOW.ko: version.h ipt_NETFLOW.c ipt_NETFLOW.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
-   @touch $@
- 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)
--  make -C $(KDIR) M=$(CURDIR) modules C=1
-+  $(MAKE) -C $(KDIR) M=$(CURDIR) modules C=1
-   @touch ipt_NETFLOW.ko
- coverity:
-   coverity-submit -v
- 
- minstall: | ipt_NETFLOW.ko
-   @echo " *"
--  make -C $(KDIR) M=$(CURDIR) modules_install INSTALL_MOD_PATH=$(DESTDIR)
-+  $(MAKE) -C $(KDIR) M=$(CURDIR) modules_install 
INSTALL_MOD_PATH=$(DESTDIR)
-   $(DEPMOD)
- mclean:
--  make -C $(KDIR) M=$(CURDIR) clean
-+  $(MAKE) -C $(KDIR) M=$(CURDIR) clean
- lclean:
-   -rm -f *.so *_sh.o
- clean: mclean lclean
-   -rm -f *.so *.o modules.order version.h
- 
- snmp_NETFLOW.so: snmp_NETFLOW.c
--  $(CC) -fPIC -shared -o $@ $< -lnetsnmp
-+  $(CC) $(CFLAGS) $(LDFLAGS) -fPIC -shared -o $@ $< -lnetsnmp
- 
- sinstall: | snmp_NETFLOW.so IPT-NETFLOW-MIB.my
-   @echo " *"
-@@ -64,7 +64,7 @@
-   fi
- 
- %_sh.o: libipt_NETFLOW.c
--  $(CC) $(CFLAGS) -O2 -Wall -Wunused $(IPTABLES_CFLAGS) -fPIC -o $@ -c 
libipt_NETFLOW.c
-+  $(CC) $(CFLAGS) $(LDFLAGS) -Wall -Wunused $(IPTABLES_CFLAGS) -fPIC -o 
$@ -c libipt_NETFLOW.c
- 
- %.so: %_sh.o
-   $(CC) -shared -o $@ $<

diff --git 
a/net-firewall/ipt_netflow/files/ipt_netflow-2.4-bridge_netfilter.patch 
b/net-firewall/ipt_netflow/files/ipt_netflow-2.4-bridge_netfilter.patch
deleted file mode 100644
index cde23bc9fe7..000
--- a/net-firewall/ipt_netflow/files/ipt_netflow-2.4-bridge_netfilter.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 9288e30f493d252ee85b492a894f78073e4f6d41 Mon Sep 17 00:00:00 2001
-From: ABC 
-Date: Sat, 28 Sep 2019 23:29:40 +0300
-Subject: [PATCH] Don't compile physdev-override if BRIDGE_NETFILTER is
- disabled.
-
-Fixes #120 "Compile error nf_bridge / nf_trace" reported by DocMAX.
-
-Fixes: 51bdc2b ("Use nf_bridge_info_get() instead of skb->nf_bridge").

- compat.h  | 2 ++
- configure | 1 +
- ipt_NETFLOW.c | 5 +
- 3 files changed, 8 insertions(+)
-
-diff --git a/compat.h b/compat.h
-index 0f9896b..66e224b 100644
 a/compat.h
-+++ b/compat.h
-@@ -680,11 +680,13 @@ static inline int is_vlan_dev(struct net_device *dev)
- #endif
- 
- #if LINUX_VERSION_CODE < KERNEL_VERSION(5,0,0)
-+# ifdef CONFIG_BRIDGE_NETFILTER
- static inline struct nf_bridge_info *
- nf_bridge_info_get(const struct sk_buff *skb)
- {
-   return skb->nf_bridge;
- }
-+# endif
- #endif
- 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/, net-firewall/ipt_netflow/files/

[Sergey Popov]

commit: 13a3eb076dd1b4ebd058333275c0363c7632f761
Author: Sergey Popov  gentoo  org>
AuthorDate: Sun Nov 15 15:26:44 2020 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Sun Nov 15 15:26:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13a3eb07

net-firewall/ipt_netflow: backport some fixes for recent kernels

Reported-by: Agostino Sarubbo  gentoo.org>
Closes: https://bugs.gentoo.org/738062
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sergey Popov  gentoo.org>

 .../files/ipt_netflow-2.5.1-vlan_dev_priv.patch| 32 ++
 .../ipt_netflow/ipt_netflow-2.5.1-r1.ebuild|  1 +
 2 files changed, 33 insertions(+)

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 000..49721e547fd
--- /dev/null
+++ b/net-firewall/ipt_netflow/files/ipt_netflow-2.5.1-vlan_dev_priv.patch
@@ -0,0 +1,32 @@
+commit 1153f73f038205dc17303e6e6c45556191f7
+Author: ABC 
+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.5.1-r1.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild
index 8fd0b2ad8ee..8fa83402ada 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() {

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Sergey Popov]

commit: ba1bdfda1888a6ac7effd5fe5fad995ae9ec8a43
Author: Sergey Popov  gentoo  org>
AuthorDate: Sun Nov 15 14:57:16 2020 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Sun Nov 15 15:05:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba1bdfda

net-firewall/ipt_netflow: drop old

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sergey Popov  gentoo.org>

 net-firewall/ipt_netflow/Manifest  |   1 -
 net-firewall/ipt_netflow/ipt_netflow-2.5-r1.ebuild | 104 -
 net-firewall/ipt_netflow/ipt_netflow-2.5.1.ebuild  | 104 -
 3 files changed, 209 deletions(-)

diff --git a/net-firewall/ipt_netflow/Manifest 
b/net-firewall/ipt_netflow/Manifest
index 12f9308d049..592cc2926c3 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1,3 +1,2 @@
 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

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 2c7d537f291..000
--- 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 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Sergey Popov]

commit: d68a0171e98ec09a53dd65f3385d9cf408d6dedc
Author: Sergey Popov  gentoo  org>
AuthorDate: Sun Nov 15 14:58:59 2020 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Sun Nov 15 15:05:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d68a0171

net-firewall/ipt_netflow: respect OBJDUMP and LD variables

Repoted-by: Agostino Sarubbo  gentoo.org>
Closes: https://bugs.gentoo.org/738060
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sergey Popov  gentoo.org>

 net-firewall/ipt_netflow/ipt_netflow-2.4-r1.ebuild   | 2 +-
 net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild | 2 +-
 net-firewall/ipt_netflow/ipt_netflow-.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 c3bec366b46..e36de51a30c 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.1-r1.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild
index 637824868f6..8fd0b2ad8ee 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
@@ -91,7 +91,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-.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-.ebuild
index 74ad5f1c71d..d4305e2fc5c 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-.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() {

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Jeroen Roovers]

commit: 4d679ab1fa2373d13ef13d6ad644af512ceaef02
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Aug 19 08:36:47 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Aug 19 08:38:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d679ab1

net-firewall/ipt_netflow: Install libip6t_NETFLOW.so

Package-Manager: Portage-3.0.3, Repoman-3.0.0
Closes: https://bugs.gentoo.org/737950
Signed-off-by: Jeroen Roovers  gentoo.org>

 ...low-.ebuild => ipt_netflow-2.5.1-r1.ebuild} | 30 --
 net-firewall/ipt_netflow/ipt_netflow-.ebuild   |  7 +++--
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/net-firewall/ipt_netflow/ipt_netflow-.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild
similarity index 83%
copy from net-firewall/ipt_netflow/ipt_netflow-.ebuild
copy to net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild
index d24c48cebca..637824868f6 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild
@@ -2,18 +2,18 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 linux-info linux-mod toolchain-funcs
+inherit linux-info linux-mod toolchain-funcs
 
 DESCRIPTION="Netflow iptables module"
 HOMEPAGE="
https://sourceforge.net/projects/ipt-netflow
https://github.com/aabc/ipt-netflow
 "
-EGIT_REPO_URI="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=""
+KEYWORDS="~amd64 ~x86"
 
 IUSE="debug natevents snmp"
 
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 "
 PATCHES=(
"${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
-   "${FILESDIR}/${PN}--gentoo.patch"
+   "${FILESDIR}/${PN}-2.5-gentoo.patch"
 )
 
 pkg_setup() {
@@ -51,18 +51,17 @@ pkg_setup() {
linux-mod_pkg_setup
 }
 
-src_prepare() {
+src_unpack() {
default
 
-   # Fix incorrect module version in sources
-   sed -i \
-   -e '/IPT_NETFLOW_VERSION/s#"[0-9.]*"#"'${PV}'"#' \
-   ipt_NETFLOW.c || die
+   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
+   sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die
 }
 
 do_conf() {
@@ -97,9 +96,12 @@ src_compile() {
 
 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
+
+   exeinto "${IPT_LIB}"
+   doexe libip{,6}t_NETFLOW.so
+
doheader ipt_NETFLOW.h
dodoc README*
 }

diff --git a/net-firewall/ipt_netflow/ipt_netflow-.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-.ebuild
index d24c48cebca..74ad5f1c71d 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-.ebuild
@@ -97,9 +97,12 @@ src_compile() {
 
 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
+
+   exeinto "${IPT_LIB}"
+   doexe libip{,6}t_NETFLOW.so
+
doheader ipt_NETFLOW.h
dodoc README*
 }

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Jeroen Roovers]

commit: a51b90f0a49d6de02cdecf021b2534b5ea69
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Aug 12 06:47:21 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Aug 12 06:47:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a51b90f0

net-firewall/ipt_netflow: Version 2.5.1

Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-firewall/ipt_netflow/Manifest |   1 +
 net-firewall/ipt_netflow/ipt_netflow-2.5.1.ebuild | 104 ++
 2 files changed, 105 insertions(+)

diff --git a/net-firewall/ipt_netflow/Manifest 
b/net-firewall/ipt_netflow/Manifest
index 79bf94164a9..12f9308d049 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.5.1.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.5.1.ebuild
new file mode 100644
index 000..2c7d537f291
--- /dev/null
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.5.1.ebuild
@@ -0,0 +1,104 @@
+# 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*
+}

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Jeroen Roovers]

commit: 4c780ad1a74d71eabb0d47044014ef3ac386e176
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Apr 25 08:32:11 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Apr 25 08:32:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c780ad1

net-firewall/ipt_netflow: Check for CONFIG_BRIDGE_NETFILTER

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-firewall/ipt_netflow/ipt_netflow-2.5.ebuild  | 2 +-
 net-firewall/ipt_netflow/ipt_netflow-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.5.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.5.ebuild
index d5ba624302b..2c7d537f291 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.5.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.5.ebuild
@@ -33,7 +33,7 @@ PATCHES=(
 pkg_setup() {
linux-info_pkg_setup
 
-   local CONFIG_CHECK="~IP_NF_IPTABLES VLAN_8021Q"
+   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"

diff --git a/net-firewall/ipt_netflow/ipt_netflow-.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-.ebuild
index b0382acd22d..d24c48cebca 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-.ebuild
@@ -33,7 +33,7 @@ PATCHES=(
 pkg_setup() {
linux-info_pkg_setup
 
-   local CONFIG_CHECK="~IP_NF_IPTABLES VLAN_8021Q"
+   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"

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/, net-firewall/ipt_netflow/files/

[Jeroen Roovers]

commit: 357b104bd4dc416b7ef367785ed41d92d015e2fb
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Apr 24 07:34:25 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Apr 24 07:35:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=357b104b

net-firewall/ipt_netflow: Rename patch

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Jeroen Roovers  gentoo.org>

 .../{ipt_netflow--flags.patch => ipt_netflow--gentoo.patch}   | 0
 net-firewall/ipt_netflow/ipt_netflow-.ebuild  | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/ipt_netflow/files/ipt_netflow--flags.patch 
b/net-firewall/ipt_netflow/files/ipt_netflow--gentoo.patch
similarity index 100%
rename from net-firewall/ipt_netflow/files/ipt_netflow--flags.patch
rename to net-firewall/ipt_netflow/files/ipt_netflow--gentoo.patch

diff --git a/net-firewall/ipt_netflow/ipt_netflow-.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-.ebuild
index 06411e1ae6d..b0382acd22d 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 "
 PATCHES=(
"${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
-   "${FILESDIR}/${PN}--flags.patch"
+   "${FILESDIR}/${PN}--gentoo.patch"
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/files/, net-firewall/ipt_netflow/

[Jeroen Roovers]

commit: d7addd0edb9627481cf77288ad6edbcdbed86d1e
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Apr 24 07:25:07 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Apr 24 07:35:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7addd0e

net-firewall/ipt_netflow: Version 2.5

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-firewall/ipt_netflow/Manifest  |   1 +
 .../ipt_netflow/files/ipt_netflow-2.5-gentoo.patch |  61 
 net-firewall/ipt_netflow/ipt_netflow-2.5.ebuild| 104 +
 3 files changed, 166 insertions(+)

diff --git a/net-firewall/ipt_netflow/Manifest 
b/net-firewall/ipt_netflow/Manifest
index ee990a70dbd..79bf94164a9 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1 +1,2 @@
 DIST ipt_netflow-2.4.tar.gz 92580 BLAKE2B 
0197e7e5cdd9c94c7b80b38cb4e2879343139592421922bf73aeaac70ac3af54ea25934bb1474ff455a9f58eab2368995591542f46be48b5c8491a3b6a192f56
 SHA512 
3c80d02cfda996fbde8d258875df8795000fd8390b5a6f8296771a992067e153eca48f7f4602421529948beaf3030e164adfc2ffe5b528042fbdc15ffb56aa74
+DIST ipt_netflow-2.5.tar.gz 94097 BLAKE2B 
5ca8d686e08f6fb0cdb1d502572afc71f146e2633ccf5fc7cb9ad21420fb62e88a2cb393e83ee4f5646200fa964d46a16ef58831958799449a4a59e2da6c9337
 SHA512 
8cd1bc46ef6e975964e5ddc290ed999f7076b63a9363f1a1f31b5d8db875d4e564ed5f0d5185c29dcf8a86793fe4badf63325b79ba1abbc264088b1ca94a9dad

diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.5-gentoo.patch 
b/net-firewall/ipt_netflow/files/ipt_netflow-2.5-gentoo.patch
new file mode 100644
index 000..508be107795
--- /dev/null
+++ b/net-firewall/ipt_netflow/files/ipt_netflow-2.5-gentoo.patch
@@ -0,0 +1,61 @@
+--- a/Makefile.in
 b/Makefile.in
+@@ -11,7 +11,7 @@
+ SNMPTGSO = /usr/lib/snmp/dlmod/snmp_NETFLOW.so
+ SNMPCONF = /etc/snmp/snmpd.conf
+ SNMPLINE = dlmod netflow $(SNMPTGSO)
+-CC = gcc
++CC ?= gcc
+ 
+ # https://www.kernel.org/doc/Documentation/kbuild/modules.txt
+ # https://www.kernel.org/doc/Documentation/kbuild/makefiles.txt
+@@ -22,31 +22,31 @@
+ 
+ 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
+   @touch $@
+ compat_def.h: gen_compat_def
+   ./gen_compat_def > $@
+ 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)
+-  make -C $(KDIR) M=$(CURDIR) modules C=1
++  $(MAKE) -C $(KDIR) M=$(CURDIR) modules C=1
+   @touch ipt_NETFLOW.ko
+ coverity:
+   coverity-submit -v
+ 
+ minstall: | ipt_NETFLOW.ko
+   @echo " *"
+-  make -C $(KDIR) M=$(CURDIR) modules_install INSTALL_MOD_PATH=$(DESTDIR)
++  $(MAKE) -C $(KDIR) M=$(CURDIR) modules_install 
INSTALL_MOD_PATH=$(DESTDIR)
+   $(DEPMOD)
+ mclean:
+-  make -C $(KDIR) M=$(CURDIR) clean
++  $(MAKE) -C $(KDIR) M=$(CURDIR) clean
+ lclean:
+   -rm -f *.so *_sh.o
+ clean: mclean lclean
+   -rm -f *.so *.o modules.order version.h compat_def.h
+ 
+ snmp_NETFLOW.so: snmp_NETFLOW.c
+-  $(CC) -fPIC -shared -o $@ $< -lnetsnmp
++  $(CC) $(CFLAGS) $(LDFLAGS) -fPIC -shared -o $@ $< -lnetsnmp
+ 
+ sinstall: | snmp_NETFLOW.so IPT-NETFLOW-MIB.my
+   @echo " *"
+@@ -66,10 +66,10 @@
+   fi
+ 
+ %_sh.o: libipt_NETFLOW.c
+-  $(CC) $(CFLAGS) -O2 -Wall -Wunused $(IPTABLES_CFLAGS) -fPIC -o $@ -c 
libipt_NETFLOW.c
++  $(CC) $(CFLAGS) -Wall -Wunused $(IPTABLES_CFLAGS) -fPIC -o $@ -c 
libipt_NETFLOW.c
+ 
+ %.so: %_sh.o
+-  $(CC) -shared -o $@ $<
++  $(CC) $(LDFLAGS) -shared -o $@ $<
+ 
+ version.h: ipt_NETFLOW.c ipt_NETFLOW.h compat.h Makefile
+   @./version.sh --define > version.h

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.5.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.5.ebuild
new file mode 100644
index 000..d5ba624302b
--- /dev/null
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.5.ebuild
@@ -0,0 +1,104 @@
+# 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() {
+   

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/, net-firewall/ipt_netflow/files/

[Sergey Popov]

commit: a0bd2ac5ca14b0b670df2b0934fea96b1b89a1fc
Author: Sergey Popov  gentoo  org>
AuthorDate: Tue Jan 28 09:21:28 2020 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Tue Jan 28 09:22:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0bd2ac5

net-firewall/ipt_netflow-2.4: build-time fixes

Fix building with kernel where CONFIG_BRIDGE_NETFILTER is not set

Signed-off-by: Sergey Popov  gentoo.org>
Package-Manager: Portage-2.3.84, Repoman-2.3.11

 .../files/ipt_netflow-2.4-bridge_netfilter.patch   | 61 ++
 net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild|  3 +-
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git 
a/net-firewall/ipt_netflow/files/ipt_netflow-2.4-bridge_netfilter.patch 
b/net-firewall/ipt_netflow/files/ipt_netflow-2.4-bridge_netfilter.patch
new file mode 100644
index 000..cde23bc9fe7
--- /dev/null
+++ b/net-firewall/ipt_netflow/files/ipt_netflow-2.4-bridge_netfilter.patch
@@ -0,0 +1,61 @@
+From 9288e30f493d252ee85b492a894f78073e4f6d41 Mon Sep 17 00:00:00 2001
+From: ABC 
+Date: Sat, 28 Sep 2019 23:29:40 +0300
+Subject: [PATCH] Don't compile physdev-override if BRIDGE_NETFILTER is
+ disabled.
+
+Fixes #120 "Compile error nf_bridge / nf_trace" reported by DocMAX.
+
+Fixes: 51bdc2b ("Use nf_bridge_info_get() instead of skb->nf_bridge").
+---
+ compat.h  | 2 ++
+ configure | 1 +
+ ipt_NETFLOW.c | 5 +
+ 3 files changed, 8 insertions(+)
+
+diff --git a/compat.h b/compat.h
+index 0f9896b..66e224b 100644
+--- a/compat.h
 b/compat.h
+@@ -680,11 +680,13 @@ static inline int is_vlan_dev(struct net_device *dev)
+ #endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(5,0,0)
++# ifdef CONFIG_BRIDGE_NETFILTER
+ static inline struct nf_bridge_info *
+ nf_bridge_info_get(const struct sk_buff *skb)
+ {
+   return skb->nf_bridge;
+ }
++# endif
+ #endif
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0)
+diff --git a/configure b/configure
+index 74eece5..8aae8bf 100755
+--- a/configure
 b/configure
+@@ -470,6 +470,7 @@ kernel_check_config() {
+   kconfig CONFIG_NF_CONNTRACK_EVENTS  "natevents"
+   kconfig CONFIG_IPV6 "IPv6"
+   kconfig CONFIG_IP6_NF_IPTABLES  "ip6tables target"
++  kconfig CONFIG_BRIDGE_NETFILTER "physdev override"
+ }
+ 
+ kernel_check_include() {
+diff --git a/ipt_NETFLOW.c b/ipt_NETFLOW.c
+index fe25655..064de6c 100644
+--- a/ipt_NETFLOW.c
 b/ipt_NETFLOW.c
+@@ -83,6 +83,11 @@
+ #if defined(CONFIG_NF_NAT_NEEDED) && LINUX_VERSION_CODE >= 
KERNEL_VERSION(2,6,39)
+ # include 
+ #endif
++#ifdef ENABLE_PHYSDEV_OVER
++# ifndef CONFIG_BRIDGE_NETFILTER
++#  undef ENABLE_PHYSDEV_OVER
++# endif
++#endif
+ 
+ #define IPT_NETFLOW_VERSION "2.4"   /* Note that if you are using git, you
+  will see version in other format. */

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild
index 8db277d79e5..c3bec366b46 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,6 +28,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
"${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
"${FILESDIR}/${PN}-2.3-flags.patch"
+   "${FILESDIR}/${P}-bridge_netfilter.patch"
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Jeroen Roovers]

commit: fac0c38880319604baead2e643e9bdc3f99e2232
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Dec 29 13:20:58 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Dec 29 13:21:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fac0c388

net-firewall/ipt_netflow: Old

Package-Manager: Portage-2.3.84, Repoman-2.3.20

Closes: https://bugs.gentoo.org/678788
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-firewall/ipt_netflow/Manifest   |   1 -
 net-firewall/ipt_netflow/ipt_netflow-2.3.ebuild | 100 
 2 files changed, 101 deletions(-)

diff --git a/net-firewall/ipt_netflow/Manifest 
b/net-firewall/ipt_netflow/Manifest
index 45893db3a07..ee990a70dbd 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1,2 +1 @@
-DIST ipt_netflow-2.3.tar.gz 90987 BLAKE2B 
fbe46583e58e75e3cfe5cc5ad4e8b40d5040d6642f850c560c3e8aa831effa43cba8f25907d32b3b66721f4d5d5bb8579bafa82e4b8d1c9a2225a5c748d08dd9
 SHA512 
e5ba66da9cae6fb9652e5532383233d433dd30dd16634734860f7e6910e46080e562e2d72c74584a86ead31156cffd4c5c44b438f617a9e5b3e5fdc1470045fc
 DIST ipt_netflow-2.4.tar.gz 92580 BLAKE2B 
0197e7e5cdd9c94c7b80b38cb4e2879343139592421922bf73aeaac70ac3af54ea25934bb1474ff455a9f58eab2368995591542f46be48b5c8491a3b6a192f56
 SHA512 
3c80d02cfda996fbde8d258875df8795000fd8390b5a6f8296771a992067e153eca48f7f4602421529948beaf3030e164adfc2ffe5b528042fbdc15ffb56aa74

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.3.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.3.ebuild
deleted file mode 100644
index 04f6abd7769..000
--- a/net-firewall/ipt_netflow/ipt_netflow-2.3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MY_PN="${PN/_/-}"
-MY_P="${MY_PN}-${PV}"
-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
-"
-
-# set S before MODULE_NAMES
-S="${WORKDIR}/${MY_P}"
-PATCHES=(
-   # bug #455984
-   "${FILESDIR}/${PN}-2.0-configure.patch"
-)
-
-pkg_setup() {
-   BUILD_TARGETS="all"
-   MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
-   IPT_LIB="/usr/$(get_libdir)/xtables"
-   local CONFIG_CHECK="~IP_NF_IPTABLES"
-   use debug && CONFIG_CHECK+=" ~DEBUG_FS"
-   use natevents && CONFIG_CHECK+=" NF_CONNTRACK_EVENTS NF_NAT_NEEDED"
-   linux-mod_pkg_setup
-}
-
-src_prepare() {
-   sed -i \
-   -e 's:make -C:$(MAKE) -C:g' \
-   -e 's:gcc -O2:$(CC) $(CFLAGS) $(LDFLAGS):' \
-   -e 's:gcc:$(CC) $(CFLAGS) $(LDFLAGS):' \
-   Makefile.in || die
-
-   # Fix incorrect module version in sources
-   sed -i -e "/IPT_NETFLOW_VERSION/s/2.2/${PV}/" ipt_NETFLOW.c || die
-
-   # Checking for directory is enough
-   sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die
-
-   default
-}
-
-do_conf() {
-   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*
-}

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/, net-firewall/ipt_netflow/files/

[Jeroen Roovers]

commit: d689f34b6a0bd248867c5e0f43df76f4326daaf3
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Dec 27 19:17:42 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Dec 27 19:20:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d689f34b

net-firewall/ipt_netflow: Update live ebuild

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jeroen Roovers  gentoo.org>

 .../ipt_netflow/files/ipt_netflow--flags.patch | 57 ++
 net-firewall/ipt_netflow/ipt_netflow-.ebuild   | 10 ++--
 2 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/net-firewall/ipt_netflow/files/ipt_netflow--flags.patch 
b/net-firewall/ipt_netflow/files/ipt_netflow--flags.patch
new file mode 100644
index 000..675e8b16f72
--- /dev/null
+++ b/net-firewall/ipt_netflow/files/ipt_netflow--flags.patch
@@ -0,0 +1,57 @@
+--- a/Makefile.in
 b/Makefile.in
+@@ -11,7 +11,7 @@ CARGS = @CARGS@
+ SNMPTGSO = /usr/lib/snmp/dlmod/snmp_NETFLOW.so
+ SNMPCONF = /etc/snmp/snmpd.conf
+ SNMPLINE = dlmod netflow $(SNMPTGSO)
+-CC = gcc
++$(CC) ?= gcc
+ 
+ # 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@
+ 
+ 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
+   @touch $@
+ compat_def.h: gen_compat_def
+   ./gen_compat_def > $@
+ 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)
+-  make -C $(KDIR) M=$(CURDIR) modules C=1
++  $(MAKE) -C $(KDIR) M=$(CURDIR) modules C=1
+   @touch ipt_NETFLOW.ko
+ coverity:
+   coverity-submit -v
+ 
+ minstall: | ipt_NETFLOW.ko
+   @echo " *"
+-  make -C $(KDIR) M=$(CURDIR) modules_install INSTALL_MOD_PATH=$(DESTDIR)
++  $(MAKE) -C $(KDIR) M=$(CURDIR) modules_install 
INSTALL_MOD_PATH=$(DESTDIR)
+   $(DEPMOD)
+ mclean:
+-  make -C $(KDIR) M=$(CURDIR) clean
++  $(MAKE) -C $(KDIR) M=$(CURDIR) clean
+ lclean:
+   -rm -f *.so *_sh.o
+ clean: mclean lclean
+   -rm -f *.so *.o modules.order version.h compat_def.h
+ 
+ snmp_NETFLOW.so: snmp_NETFLOW.c
+-  $(CC) -fPIC -shared -o $@ $< -lnetsnmp
++  $(CC) $(CFLAGS) $(LDFLAGS) -fPIC -shared -o $@ $< -lnetsnmp
+ 
+ sinstall: | snmp_NETFLOW.so IPT-NETFLOW-MIB.my
+   @echo " *"
+@@ -66,7 +66,7 @@ sinstall: | snmp_NETFLOW.so IPT-NETFLOW-MIB.my
+   fi
+ 
+ %_sh.o: libipt_NETFLOW.c
+-  $(CC) $(CFLAGS) -O2 -Wall -Wunused $(IPTABLES_CFLAGS) -fPIC -o $@ -c 
libipt_NETFLOW.c
++  $(CC) $(CFLAGS) $(LDFLAGS) -Wall -Wunused $(IPTABLES_CFLAGS) -fPIC -o 
$@ -c libipt_NETFLOW.c
+ 
+ %.so: %_sh.o
+   $(CC) -shared -o $@ $<

diff --git a/net-firewall/ipt_netflow/ipt_netflow-.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-.ebuild
index 7414800f8c3..06411e1ae6d 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-.ebuild
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 "
 PATCHES=(
"${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
-   "${FILESDIR}/${PN}-2.3-flags.patch"
+   "${FILESDIR}/${PN}--flags.patch"
 )
 
 pkg_setup() {
@@ -55,10 +55,14 @@ src_prepare() {
default
 
# Fix incorrect module version in sources
-   sed -i -e "/IPT_NETFLOW_VERSION/s/2.2/${PV}/" ipt_NETFLOW.c || die
+   sed -i \
+   -e '/IPT_NETFLOW_VERSION/s#"[0-9.]*"#"'${PV}'"#' \
+   ipt_NETFLOW.c || die
 
# Checking for directory is enough
-   sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die
+   sed -i \
+   -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' \
+   configure || die
 }
 
 do_conf() {

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Jeroen Roovers]

commit: b23e2cd1aefb1b2ff49da3d12c1fb96f2cf361c0
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Dec 27 18:48:23 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Dec 27 18:51:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b23e2cd1

net-firewall/ipt_netflow: Check for NF_NAT in kernel >=5.2

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild  | 17 ++---
 net-firewall/ipt_netflow/ipt_netflow-.ebuild | 17 ++---
 2 files changed, 28 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 88d6cef84f3..b8e3956550b 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild
@@ -31,12 +31,23 @@ PATCHES=(
 )
 
 pkg_setup() {
+   linux-info_pkg_setup
+
+   local CONFIG_CHECK="~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"
-   local CONFIG_CHECK="~IP_NF_IPTABLES VLAN_8021Q"
-   use debug && CONFIG_CHECK+=" ~DEBUG_FS"
-   use natevents && CONFIG_CHECK+=" NF_CONNTRACK_EVENTS NF_NAT_NEEDED"
+
linux-mod_pkg_setup
 }
 

diff --git a/net-firewall/ipt_netflow/ipt_netflow-.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-.ebuild
index 71ba1b74afb..7414800f8c3 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-.ebuild
@@ -31,12 +31,23 @@ PATCHES=(
 )
 
 pkg_setup() {
+   linux-info_pkg_setup
+
+   local CONFIG_CHECK="~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"
-   local CONFIG_CHECK="~IP_NF_IPTABLES VLAN_8021Q"
-   use debug && CONFIG_CHECK+=" ~DEBUG_FS"
-   use natevents && CONFIG_CHECK+=" NF_CONNTRACK_EVENTS NF_NAT_NEEDED"
+
linux-mod_pkg_setup
 }
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Jeroen Roovers]

commit: 34f70c17dbb515c22d3590b0b37dc987f014ebc6
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Dec 27 18:50:34 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Dec 27 18:51:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34f70c17

net-firewall/ipt_netflow: Stable for amd64 x86 too

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Closes: https://bugs.gentoo.org/659266
Closes: https://bugs.gentoo.org/660936
Closes: https://bugs.gentoo.org/678788
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild
index b8e3956550b..8db277d79e5 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/aabc/ipt-netflow/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="debug natevents snmp"
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Jeroen Roovers]

commit: 2b295b40a2aba896525fe4e1d5fbae5161ca464c
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Jun 23 13:36:13 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Jun 23 13:38:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b295b40

net-firewall/ipt_netflow: Version 2.4

Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-firewall/ipt_netflow/Manifest   |  1 +
 net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild | 93 +
 2 files changed, 94 insertions(+)

diff --git a/net-firewall/ipt_netflow/Manifest 
b/net-firewall/ipt_netflow/Manifest
index d143b4e57bc..0f3902c5810 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1,2 +1,3 @@
 DIST ipt_netflow-2.3.tar.gz 90987 BLAKE2B 
fbe46583e58e75e3cfe5cc5ad4e8b40d5040d6642f850c560c3e8aa831effa43cba8f25907d32b3b66721f4d5d5bb8579bafa82e4b8d1c9a2225a5c748d08dd9
 SHA512 
e5ba66da9cae6fb9652e5532383233d433dd30dd16634734860f7e6910e46080e562e2d72c74584a86ead31156cffd4c5c44b438f617a9e5b3e5fdc1470045fc
 DIST ipt_netflow-2.3_p20190619.tar.gz 92615 BLAKE2B 
f6fb8e33d847a050e81edd33cc11b2088e59a838924f6f371489e219d7207afefa6211ac7d55aa54d8d1579fe95d9ec5302bb533a7cf11bdb3df8e2e7a2e5633
 SHA512 
0ac101d660bc37eab05bf079321edd9578f2fd3b09627f329fab4940c8e2d554a449673d557603dc33897fdd3f8a7b054ff2ceb7cc338b86176b3630f2b50cba
+DIST ipt_netflow-2.4.tar.gz 92580 BLAKE2B 
0197e7e5cdd9c94c7b80b38cb4e2879343139592421922bf73aeaac70ac3af54ea25934bb1474ff455a9f58eab2368995591542f46be48b5c8491a3b6a192f56
 SHA512 
3c80d02cfda996fbde8d258875df8795000fd8390b5a6f8296771a992067e153eca48f7f4602421529948beaf3030e164adfc2ffe5b528042fbdc15ffb56aa74

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild
new file mode 100644
index 000..88d6cef84f3
--- /dev/null
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 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.3-flags.patch"
+)
+
+pkg_setup() {
+   BUILD_TARGETS="all"
+   MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
+   IPT_LIB="/usr/$(get_libdir)/xtables"
+   local CONFIG_CHECK="~IP_NF_IPTABLES VLAN_8021Q"
+   use debug && CONFIG_CHECK+=" ~DEBUG_FS"
+   use natevents && CONFIG_CHECK+=" NF_CONNTRACK_EVENTS NF_NAT_NEEDED"
+   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*
+}

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Jeroen Roovers]

commit: 241cf6f81f8f531d86d7546e207bc133ad333964
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Jun 23 13:37:51 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Jun 23 13:38:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=241cf6f8

net-firewall/ipt_netflow: Old

Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-firewall/ipt_netflow/Manifest  |  1 -
 .../ipt_netflow/ipt_netflow-2.3_p20190619.ebuild   | 96 --
 2 files changed, 97 deletions(-)

diff --git a/net-firewall/ipt_netflow/Manifest 
b/net-firewall/ipt_netflow/Manifest
index 0f3902c5810..45893db3a07 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1,3 +1,2 @@
 DIST ipt_netflow-2.3.tar.gz 90987 BLAKE2B 
fbe46583e58e75e3cfe5cc5ad4e8b40d5040d6642f850c560c3e8aa831effa43cba8f25907d32b3b66721f4d5d5bb8579bafa82e4b8d1c9a2225a5c748d08dd9
 SHA512 
e5ba66da9cae6fb9652e5532383233d433dd30dd16634734860f7e6910e46080e562e2d72c74584a86ead31156cffd4c5c44b438f617a9e5b3e5fdc1470045fc
-DIST ipt_netflow-2.3_p20190619.tar.gz 92615 BLAKE2B 
f6fb8e33d847a050e81edd33cc11b2088e59a838924f6f371489e219d7207afefa6211ac7d55aa54d8d1579fe95d9ec5302bb533a7cf11bdb3df8e2e7a2e5633
 SHA512 
0ac101d660bc37eab05bf079321edd9578f2fd3b09627f329fab4940c8e2d554a449673d557603dc33897fdd3f8a7b054ff2ceb7cc338b86176b3630f2b50cba
 DIST ipt_netflow-2.4.tar.gz 92580 BLAKE2B 
0197e7e5cdd9c94c7b80b38cb4e2879343139592421922bf73aeaac70ac3af54ea25934bb1474ff455a9f58eab2368995591542f46be48b5c8491a3b6a192f56
 SHA512 
3c80d02cfda996fbde8d258875df8795000fd8390b5a6f8296771a992067e153eca48f7f4602421529948beaf3030e164adfc2ffe5b528042fbdc15ffb56aa74

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.3_p20190619.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.3_p20190619.ebuild
deleted file mode 100644
index 5f49f78b07d..000
--- a/net-firewall/ipt_netflow/ipt_netflow-2.3_p20190619.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2019 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/0e5af37bf63681ff4ee95b98466ee26fa3e4df13.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.3-flags.patch"
-)
-
-pkg_setup() {
-   BUILD_TARGETS="all"
-   MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
-   IPT_LIB="/usr/$(get_libdir)/xtables"
-   local CONFIG_CHECK="~IP_NF_IPTABLES VLAN_8021Q"
-   use debug && CONFIG_CHECK+=" ~DEBUG_FS"
-   use natevents && CONFIG_CHECK+=" NF_CONNTRACK_EVENTS NF_NAT_NEEDED"
-   linux-mod_pkg_setup
-}
-
-src_unpack() {
-   default
-
-   mv "${WORKDIR}"/${PN/_/-}-* "${WORKDIR}"/${P} || die
-}
-
-src_prepare() {
-   default
-
-   # Fix incorrect module version in sources
-   sed -i -e "/IPT_NETFLOW_VERSION/s/2.3/${PV}/" ipt_NETFLOW.c || die
-
-   # 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*
-}

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Jeroen Roovers]

commit: 6fadca0db3a2d81c22ee031b640dad57515469c4
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Jun 20 07:08:17 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Jun 20 07:10:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fadca0d

net-firewall/ipt_netflow: Check for CONFIG_VLAN_8021Q

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Fixes: https://bugs.gentoo.org/688362
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-firewall/ipt_netflow/ipt_netflow-2.3_p20190619.ebuild | 4 ++--
 net-firewall/ipt_netflow/ipt_netflow-.ebuild  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.3_p20190619.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.3_p20190619.ebuild
index 3a1ad78c15f..5f49f78b07d 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.3_p20190619.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.3_p20190619.ebuild
@@ -34,7 +34,7 @@ pkg_setup() {
BUILD_TARGETS="all"
MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
IPT_LIB="/usr/$(get_libdir)/xtables"
-   local CONFIG_CHECK="~IP_NF_IPTABLES"
+   local CONFIG_CHECK="~IP_NF_IPTABLES VLAN_8021Q"
use debug && CONFIG_CHECK+=" ~DEBUG_FS"
use natevents && CONFIG_CHECK+=" NF_CONNTRACK_EVENTS NF_NAT_NEEDED"
linux-mod_pkg_setup
@@ -50,7 +50,7 @@ src_prepare() {
default
 
# Fix incorrect module version in sources
-   sed -i -e "/IPT_NETFLOW_VERSION/s/2.2/${PV}/" ipt_NETFLOW.c || die
+   sed -i -e "/IPT_NETFLOW_VERSION/s/2.3/${PV}/" ipt_NETFLOW.c || die
 
# Checking for directory is enough
sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die

diff --git a/net-firewall/ipt_netflow/ipt_netflow-.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-.ebuild
index 2a4bba4304b..71ba1b74afb 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-.ebuild
@@ -34,7 +34,7 @@ pkg_setup() {
BUILD_TARGETS="all"
MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
IPT_LIB="/usr/$(get_libdir)/xtables"
-   local CONFIG_CHECK="~IP_NF_IPTABLES"
+   local CONFIG_CHECK="~IP_NF_IPTABLES VLAN_8021Q"
use debug && CONFIG_CHECK+=" ~DEBUG_FS"
use natevents && CONFIG_CHECK+=" NF_CONNTRACK_EVENTS NF_NAT_NEEDED"
linux-mod_pkg_setup

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/files/, net-firewall/ipt_netflow/

[Jeroen Roovers]

commit: 5ec2dcfdfa639c7daffc1d068af45ed67cb0a58f
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Jun 19 06:11:57 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Jun 19 06:12:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ec2dcfd

net-firewall/ipt_netflow: Fix USE=snmp

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Jeroen Roovers  gentoo.org>

 .../ipt_netflow/files/ipt_netflow-2.3-flags.patch  | 55 ++
 .../ipt_netflow/ipt_netflow-2.3_p20190619.ebuild   | 11 +
 net-firewall/ipt_netflow/ipt_netflow-.ebuild   | 11 +
 3 files changed, 59 insertions(+), 18 deletions(-)

diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.3-flags.patch 
b/net-firewall/ipt_netflow/files/ipt_netflow-2.3-flags.patch
new file mode 100644
index 000..0d89e5ba90a
--- /dev/null
+++ b/net-firewall/ipt_netflow/files/ipt_netflow-2.3-flags.patch
@@ -0,0 +1,55 @@
+--- a/Makefile.in
 b/Makefile.in
+@@ -11,7 +11,7 @@
+ SNMPTGSO = /usr/lib/snmp/dlmod/snmp_NETFLOW.so
+ SNMPCONF = /etc/snmp/snmpd.conf
+ SNMPLINE = dlmod netflow $(SNMPTGSO)
+-CC = gcc
++$(CC) ?= gcc
+ 
+ # https://www.kernel.org/doc/Documentation/kbuild/modules.txt
+ # https://www.kernel.org/doc/Documentation/kbuild/makefiles.txt
+@@ -22,29 +22,29 @@
+ 
+ ipt_NETFLOW.ko: version.h ipt_NETFLOW.c ipt_NETFLOW.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
+   @touch $@
+ 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)
+-  make -C $(KDIR) M=$(CURDIR) modules C=1
++  $(MAKE) -C $(KDIR) M=$(CURDIR) modules C=1
+   @touch ipt_NETFLOW.ko
+ coverity:
+   coverity-submit -v
+ 
+ minstall: | ipt_NETFLOW.ko
+   @echo " *"
+-  make -C $(KDIR) M=$(CURDIR) modules_install INSTALL_MOD_PATH=$(DESTDIR)
++  $(MAKE) -C $(KDIR) M=$(CURDIR) modules_install 
INSTALL_MOD_PATH=$(DESTDIR)
+   $(DEPMOD)
+ mclean:
+-  make -C $(KDIR) M=$(CURDIR) clean
++  $(MAKE) -C $(KDIR) M=$(CURDIR) clean
+ lclean:
+   -rm -f *.so *_sh.o
+ clean: mclean lclean
+   -rm -f *.so *.o modules.order version.h
+ 
+ snmp_NETFLOW.so: snmp_NETFLOW.c
+-  $(CC) -fPIC -shared -o $@ $< -lnetsnmp
++  $(CC) $(CFLAGS) $(LDFLAGS) -fPIC -shared -o $@ $< -lnetsnmp
+ 
+ sinstall: | snmp_NETFLOW.so IPT-NETFLOW-MIB.my
+   @echo " *"
+@@ -64,7 +64,7 @@
+   fi
+ 
+ %_sh.o: libipt_NETFLOW.c
+-  $(CC) $(CFLAGS) -O2 -Wall -Wunused $(IPTABLES_CFLAGS) -fPIC -o $@ -c 
libipt_NETFLOW.c
++  $(CC) $(CFLAGS) $(LDFLAGS) -Wall -Wunused $(IPTABLES_CFLAGS) -fPIC -o 
$@ -c libipt_NETFLOW.c
+ 
+ %.so: %_sh.o
+   $(CC) -shared -o $@ $<

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.3_p20190619.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.3_p20190619.ebuild
index 07ddf25ef1d..3a1ad78c15f 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.3_p20190619.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.3_p20190619.ebuild
@@ -25,10 +25,9 @@ DEPEND="${RDEPEND}
virtual/linux-sources
virtual/pkgconfig
 "
-
-# set S before MODULE_NAMES
 PATCHES=(
"${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
+   "${FILESDIR}/${PN}-2.3-flags.patch"
 )
 
 pkg_setup() {
@@ -48,19 +47,13 @@ src_unpack() {
 }
 
 src_prepare() {
-   sed -i \
-   -e 's:make -C:$(MAKE) -C:g' \
-   -e 's:gcc -O2:$(CC) $(CFLAGS) $(LDFLAGS):' \
-   -e 's:gcc:$(CC) $(CFLAGS) $(LDFLAGS):' \
-   Makefile.in || die
+   default
 
# Fix incorrect module version in sources
sed -i -e "/IPT_NETFLOW_VERSION/s/2.2/${PV}/" ipt_NETFLOW.c || die
 
# Checking for directory is enough
sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die
-
-   default
 }
 
 do_conf() {

diff --git a/net-firewall/ipt_netflow/ipt_netflow-.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-.ebuild
index 6d8feeb6e0a..2a4bba4304b 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-.ebuild
@@ -25,10 +25,9 @@ DEPEND="${RDEPEND}
virtual/linux-sources
virtual/pkgconfig
 "
-
-# set S before MODULE_NAMES
 PATCHES=(
"${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
+   "${FILESDIR}/${PN}-2.3-flags.patch"
 )
 
 pkg_setup() {
@@ -42,19 +41,13 @@ pkg_setup() {
 }
 
 src_prepare() {
-   sed -i \
-   -e 's:make -C:$(MAKE) -C:g' \
-   -e 's:gcc -O2:$(CC) $(CFLAGS) $(LDFLAGS):' \
-   -e 's:gcc:$(CC) $(CFLAGS) $(LDFLAGS):' \
-   Makefile.in || die
+   default
 
# Fix incorrect module version in sources
sed -i -e "/IPT_NETFLOW_VERSION/s/2.2/${PV}/" ipt_NETFLOW.c || die
 
# Checking 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Jeroen Roovers]

commit: 360337d3df4eac17326a827f9ab5914de26dbfd9
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Jun 19 05:34:35 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Jun 19 05:35:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=360337d3

net-firewall/ipt_netflow: Version 2.3_p20190619

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Bug: https://bugs.gentoo.org/show_bug.cgi?id=678788
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-firewall/ipt_netflow/Manifest  |   1 +
 .../ipt_netflow/ipt_netflow-2.3_p20190619.ebuild   | 103 +
 2 files changed, 104 insertions(+)

diff --git a/net-firewall/ipt_netflow/Manifest 
b/net-firewall/ipt_netflow/Manifest
index 804ced3b34f..d143b4e57bc 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1 +1,2 @@
 DIST ipt_netflow-2.3.tar.gz 90987 BLAKE2B 
fbe46583e58e75e3cfe5cc5ad4e8b40d5040d6642f850c560c3e8aa831effa43cba8f25907d32b3b66721f4d5d5bb8579bafa82e4b8d1c9a2225a5c748d08dd9
 SHA512 
e5ba66da9cae6fb9652e5532383233d433dd30dd16634734860f7e6910e46080e562e2d72c74584a86ead31156cffd4c5c44b438f617a9e5b3e5fdc1470045fc
+DIST ipt_netflow-2.3_p20190619.tar.gz 92615 BLAKE2B 
f6fb8e33d847a050e81edd33cc11b2088e59a838924f6f371489e219d7207afefa6211ac7d55aa54d8d1579fe95d9ec5302bb533a7cf11bdb3df8e2e7a2e5633
 SHA512 
0ac101d660bc37eab05bf079321edd9578f2fd3b09627f329fab4940c8e2d554a449673d557603dc33897fdd3f8a7b054ff2ceb7cc338b86176b3630f2b50cba

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.3_p20190619.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.3_p20190619.ebuild
new file mode 100644
index 000..07ddf25ef1d
--- /dev/null
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.3_p20190619.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2019 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/0e5af37bf63681ff4ee95b98466ee26fa3e4df13.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
+"
+
+# set S before MODULE_NAMES
+PATCHES=(
+   "${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
+)
+
+pkg_setup() {
+   BUILD_TARGETS="all"
+   MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
+   IPT_LIB="/usr/$(get_libdir)/xtables"
+   local CONFIG_CHECK="~IP_NF_IPTABLES"
+   use debug && CONFIG_CHECK+=" ~DEBUG_FS"
+   use natevents && CONFIG_CHECK+=" NF_CONNTRACK_EVENTS NF_NAT_NEEDED"
+   linux-mod_pkg_setup
+}
+
+src_unpack() {
+   default
+
+   mv "${WORKDIR}"/${PN/_/-}-* "${WORKDIR}"/${P} || die
+}
+
+src_prepare() {
+   sed -i \
+   -e 's:make -C:$(MAKE) -C:g' \
+   -e 's:gcc -O2:$(CC) $(CFLAGS) $(LDFLAGS):' \
+   -e 's:gcc:$(CC) $(CFLAGS) $(LDFLAGS):' \
+   Makefile.in || die
+
+   # Fix incorrect module version in sources
+   sed -i -e "/IPT_NETFLOW_VERSION/s/2.2/${PV}/" ipt_NETFLOW.c || die
+
+   # Checking for directory is enough
+   sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die
+
+   default
+}
+
+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*
+}

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Jeroen Roovers]

commit: c3b5709d77f815d30b6dd1f6076abd1cd3f30d52
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Jun  3 09:10:16 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Jun  3 09:10:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3b5709d

net-firewall/ipt_netflow: Export CC

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-firewall/ipt_netflow/ipt_netflow-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-firewall/ipt_netflow/ipt_netflow-.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-.ebuild
index a40ff34ae21..6d8feeb6e0a 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-.ebuild
@@ -58,6 +58,7 @@ src_prepare() {
 }
 
 do_conf() {
+   tc-export CC
echo ./configure $*
./configure $* ${EXTRA_ECONF} || die 'configure failed'
 }

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Jeroen Roovers]

commit: 2c9b6f7f3d620333ebeb6cdd7f9a121715f42b76
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Feb 25 19:18:05 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Feb 25 19:19:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c9b6f7f

net-firewall/ipt_netflow: Add live ebuild

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Jeroen Roovers  gentoo.org>

 net-firewall/ipt_netflow/ipt_netflow-.ebuild | 96 
 1 file changed, 96 insertions(+)

diff --git a/net-firewall/ipt_netflow/ipt_netflow-.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-.ebuild
new file mode 100644
index 000..a40ff34ae21
--- /dev/null
+++ b/net-firewall/ipt_netflow/ipt_netflow-.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit git-r3 linux-info linux-mod toolchain-funcs
+
+DESCRIPTION="Netflow iptables module"
+HOMEPAGE="
+   https://sourceforge.net/projects/ipt-netflow
+   https://github.com/aabc/ipt-netflow
+"
+EGIT_REPO_URI="https://github.com/aabc/ipt-netflow;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+
+IUSE="debug natevents snmp"
+
+RDEPEND="
+   net-firewall/iptables:0=
+   snmp? ( net-analyzer/net-snmp )
+"
+DEPEND="${RDEPEND}
+   virtual/linux-sources
+   virtual/pkgconfig
+"
+
+# set S before MODULE_NAMES
+PATCHES=(
+   "${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
+)
+
+pkg_setup() {
+   BUILD_TARGETS="all"
+   MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
+   IPT_LIB="/usr/$(get_libdir)/xtables"
+   local CONFIG_CHECK="~IP_NF_IPTABLES"
+   use debug && CONFIG_CHECK+=" ~DEBUG_FS"
+   use natevents && CONFIG_CHECK+=" NF_CONNTRACK_EVENTS NF_NAT_NEEDED"
+   linux-mod_pkg_setup
+}
+
+src_prepare() {
+   sed -i \
+   -e 's:make -C:$(MAKE) -C:g' \
+   -e 's:gcc -O2:$(CC) $(CFLAGS) $(LDFLAGS):' \
+   -e 's:gcc:$(CC) $(CFLAGS) $(LDFLAGS):' \
+   Makefile.in || die
+
+   # Fix incorrect module version in sources
+   sed -i -e "/IPT_NETFLOW_VERSION/s/2.2/${PV}/" ipt_NETFLOW.c || die
+
+   # Checking for directory is enough
+   sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die
+
+   default
+}
+
+do_conf() {
+   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*
+}

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/, net-firewall/ipt_netflow/files/

[Sergey Popov]

commit: c660433b8bc48e33d10235252f8e28f3ca835db2
Author: Sergey Popov  gentoo  org>
AuthorDate: Fri Jun 15 15:59:17 2018 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Fri Jun 15 16:01:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c660433b

net-firewall/ipt_netflow: drop old

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 net-firewall/ipt_netflow/Manifest  |   1 -
 .../files/ipt_netflow-2.2-linux-4.10.patch | 137 -
 .../files/ipt_netflow-2.2-linux-4.13.patch |  63 --
 .../files/ipt_netflow-2.2-linux-4.15.patch |  26 
 .../files/ipt_netflow-2.2-linux-4.6.patch  |  61 -
 net-firewall/ipt_netflow/ipt_netflow-2.2-r2.ebuild | 105 
 net-firewall/ipt_netflow/ipt_netflow-2.2-r3.ebuild | 105 
 7 files changed, 498 deletions(-)

diff --git a/net-firewall/ipt_netflow/Manifest 
b/net-firewall/ipt_netflow/Manifest
index b87114ce096..804ced3b34f 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1,2 +1 @@
-DIST ipt-netflow-2.2.tgz 96697 BLAKE2B 
996ad539b6a6a5198a1e4a4a1a51f0610d97fb45740ad9c92e19854f2928eb697ca8fe14625054a05b106eebc345dfe6c235cdf375d1360ef44ff6cf0b03f34a
 SHA512 
a406ab9bd18616414d8c99f427382a075bdb8000d8c40959f5b6d6e577d7eb4dfc7f8b773664a516ec2228d15590f21c3fbd6aa3d4302f6cdf03810e1702af74
 DIST ipt_netflow-2.3.tar.gz 90987 BLAKE2B 
fbe46583e58e75e3cfe5cc5ad4e8b40d5040d6642f850c560c3e8aa831effa43cba8f25907d32b3b66721f4d5d5bb8579bafa82e4b8d1c9a2225a5c748d08dd9
 SHA512 
e5ba66da9cae6fb9652e5532383233d433dd30dd16634734860f7e6910e46080e562e2d72c74584a86ead31156cffd4c5c44b438f617a9e5b3e5fdc1470045fc

diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.2-linux-4.10.patch 
b/net-firewall/ipt_netflow/files/ipt_netflow-2.2-linux-4.10.patch
deleted file mode 100644
index 7e8f62840a9..000
--- a/net-firewall/ipt_netflow/files/ipt_netflow-2.2-linux-4.10.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-commit 5d71c94c400d91633f6d3c3be9e785bb23d4ca1a
-Author: ABC 
-Date:   Sun Mar 5 11:27:39 2017 +0300
-
-Compilation compatibility with kernel 4.10.
-
-Fixes #70.
-Resolves incompatibilities introduced by
- 2456e855354415bfaeb7badaa14e11b3e02c8466 and
- 613dbd95723aee7abd16860745691b6c7bda20dc for kernel 4.10.
-
-diff --git a/compat.h b/compat.h
-index 3f27977..47176ef 100644
 a/compat.h
-+++ b/compat.h
-@@ -600,4 +600,29 @@ out:
- # define __GNUC_PREREQ(maj, min) 0
- #endif
- 
-+/* ktime is not union anymore, since 2456e855354415bfaeb7badaa14e11b3e02c8466 
*/
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,10,0)
-+# define first_tv64   first.tv64
-+# define last_tv64last.tv64
-+#else
-+# define first_tv64   first
-+# define last_tv64last
-+#endif
-+
-+/* Offset changes made in 613dbd95723aee7abd16860745691b6c7bda20dc */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) && LINUX_VERSION_CODE < 
KERNEL_VERSION(4,10,0)
-+static inline u_int8_t xt_family(const struct xt_action_param *par)
-+{
-+  return par->family;
-+}
-+static inline const struct net_device *xt_in(const struct xt_action_param 
*par)
-+{
-+  return par->in;
-+}
-+static inline const struct net_device *xt_out(const struct xt_action_param 
*par)
-+{
-+  return par->out;
-+}
-+#endif
-+
- #endif /* COMPAT_NETFLOW_H */
-diff --git a/ipt_NETFLOW.c b/ipt_NETFLOW.c
-index 781b284..0d1ac55 100644
 a/ipt_NETFLOW.c
-+++ b/ipt_NETFLOW.c
-@@ -3863,10 +3863,10 @@ static void netflow_export_stats(void)
-   t.pkts_selected += st->pkts_selected;
-   t.pkts_observed += st->pkts_observed;
- #endif
--  t.drop.first.tv64 = min_not_zero(t.drop.first.tv64, 
st->drop.first.tv64);
--  t.drop.last.tv64  = max(t.drop.last.tv64, st->drop.last.tv64);
--  t.lost.first.tv64 = min_not_zero(t.lost.first.tv64, 
st->lost.first.tv64);
--  t.lost.last.tv64  = max(t.lost.last.tv64, st->lost.last.tv64);
-+  t.drop.first_tv64 = min_not_zero(t.drop.first_tv64, 
st->drop.first_tv64);
-+  t.drop.last_tv64  = max(t.drop.last_tv64, st->drop.last_tv64);
-+  t.lost.first_tv64 = min_not_zero(t.lost.first_tv64, 
st->lost.first_tv64);
-+  t.lost.last_tv64  = max(t.lost.last_tv64, st->lost.last_tv64);
-   }
- 
-   export_stat_st(OTPL_MPSTAT, );
-@@ -4781,8 +4781,8 @@ static unsigned int netflow_target(
-  const void *targinfo
- # endif
- #else /* since 2.6.28 */
--# define if_in  par->in
--# define if_out par->out
-+# define if_in  xt_in(par)
-+# define if_out xt_out(par)
- # if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)
-  const struct xt_target_param *par
- # else
-@@ -4809,7 +4809,7 @@ static unsigned int netflow_target(
- #ifdef ENABLE_DIRECTION
-   const int hooknum = par->hooknum;
- #endif
--  const int family = par->family;
-+  const int family = 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Sergey Popov]

commit: 6bf1bdd00b976aabbdf37802daae42a88d2aeb0a
Author: Sergey Popov  gentoo  org>
AuthorDate: Fri Jun 15 15:58:13 2018 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Fri Jun 15 16:01:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bf1bdd0

net-firewall/ipt_netflow-2.3: stable on amd64 and x86

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 net-firewall/ipt_netflow/ipt_netflow-2.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.3.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.3.ebuild
index e5345962d7d..04f6abd7769 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.3.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.3.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/aabc/ipt-netflow/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="debug natevents snmp"
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Sergey Popov]

commit: 378a5a00455245d79a60b65bea7bdd83b4bdb2fb
Author: Sergey Popov  gentoo  org>
AuthorDate: Tue Mar 20 13:51:38 2018 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Tue Mar 20 13:51:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=378a5a00

net-firewall/ipt_netflow: version bump

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-firewall/ipt_netflow/Manifest   |   1 +
 net-firewall/ipt_netflow/ipt_netflow-2.3.ebuild | 100 
 2 files changed, 101 insertions(+)

diff --git a/net-firewall/ipt_netflow/Manifest 
b/net-firewall/ipt_netflow/Manifest
index d2fd5f95a46..b87114ce096 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1 +1,2 @@
 DIST ipt-netflow-2.2.tgz 96697 BLAKE2B 
996ad539b6a6a5198a1e4a4a1a51f0610d97fb45740ad9c92e19854f2928eb697ca8fe14625054a05b106eebc345dfe6c235cdf375d1360ef44ff6cf0b03f34a
 SHA512 
a406ab9bd18616414d8c99f427382a075bdb8000d8c40959f5b6d6e577d7eb4dfc7f8b773664a516ec2228d15590f21c3fbd6aa3d4302f6cdf03810e1702af74
+DIST ipt_netflow-2.3.tar.gz 90987 BLAKE2B 
fbe46583e58e75e3cfe5cc5ad4e8b40d5040d6642f850c560c3e8aa831effa43cba8f25907d32b3b66721f4d5d5bb8579bafa82e4b8d1c9a2225a5c748d08dd9
 SHA512 
e5ba66da9cae6fb9652e5532383233d433dd30dd16634734860f7e6910e46080e562e2d72c74584a86ead31156cffd4c5c44b438f617a9e5b3e5fdc1470045fc

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.3.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.3.ebuild
new file mode 100644
index 000..e5345962d7d
--- /dev/null
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MY_PN="${PN/_/-}"
+MY_P="${MY_PN}-${PV}"
+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
+"
+
+# set S before MODULE_NAMES
+S="${WORKDIR}/${MY_P}"
+PATCHES=(
+   # bug #455984
+   "${FILESDIR}/${PN}-2.0-configure.patch"
+)
+
+pkg_setup() {
+   BUILD_TARGETS="all"
+   MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
+   IPT_LIB="/usr/$(get_libdir)/xtables"
+   local CONFIG_CHECK="~IP_NF_IPTABLES"
+   use debug && CONFIG_CHECK+=" ~DEBUG_FS"
+   use natevents && CONFIG_CHECK+=" NF_CONNTRACK_EVENTS NF_NAT_NEEDED"
+   linux-mod_pkg_setup
+}
+
+src_prepare() {
+   sed -i \
+   -e 's:make -C:$(MAKE) -C:g' \
+   -e 's:gcc -O2:$(CC) $(CFLAGS) $(LDFLAGS):' \
+   -e 's:gcc:$(CC) $(CFLAGS) $(LDFLAGS):' \
+   Makefile.in || die
+
+   # Fix incorrect module version in sources
+   sed -i -e "/IPT_NETFLOW_VERSION/s/2.2/${PV}/" ipt_NETFLOW.c || die
+
+   # Checking for directory is enough
+   sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die
+
+   default
+}
+
+do_conf() {
+   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*
+}

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Jeroen Roovers]

commit: 872b65ae316beb7b02c326e1c0155bf6b25544ce
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Feb 13 10:59:30 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Feb 13 10:59:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=872b65ae

net-firewall/ipt_netflow: Add Github HOMEPAGE.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-firewall/ipt_netflow/ipt_netflow-2.2-r2.ebuild | 7 +--
 net-firewall/ipt_netflow/ipt_netflow-2.2-r3.ebuild | 5 -
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.2-r2.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.2-r2.ebuild
index c4a7b8bba0c..256b146cb88 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.2-r2.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,10 @@ MY_P="${MY_PN}-${PV}"
 inherit linux-info linux-mod toolchain-funcs
 
 DESCRIPTION="Netflow iptables module"
-HOMEPAGE="https://sourceforge.net/projects/ipt-netflow;
+HOMEPAGE="
+   https://sourceforge.net/projects/ipt-netflow
+   https://github.com/aabc/ipt-netflow
+"
 SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2"

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.2-r3.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.2-r3.ebuild
index b2bda0e5889..eb772b4d9b2 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.2-r3.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.2-r3.ebuild
@@ -7,7 +7,10 @@ MY_P="${MY_PN}-${PV}"
 inherit linux-info linux-mod toolchain-funcs
 
 DESCRIPTION="Netflow iptables module"
-HOMEPAGE="https://sourceforge.net/projects/ipt-netflow;
+HOMEPAGE="
+   https://sourceforge.net/projects/ipt-netflow
+   https://github.com/aabc/ipt-netflow
+"
 SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/, net-firewall/ipt_netflow/files/

[Jeroen Roovers]

commit: e67466e42c6fc3c2775258cad58e1803b352e3bf
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Feb 10 11:21:57 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Feb 10 11:22:08 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e67466e4

net-firewall/ipt_netflow: Fix kernel 4.15 compatibility (bug #646798).

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../files/ipt_netflow-2.2-linux-4.15.patch |  26 ++
 net-firewall/ipt_netflow/ipt_netflow-2.2-r3.ebuild | 102 +
 2 files changed, 128 insertions(+)

diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.2-linux-4.15.patch 
b/net-firewall/ipt_netflow/files/ipt_netflow-2.2-linux-4.15.patch
new file mode 100644
index 000..aa5feef3279
--- /dev/null
+++ b/net-firewall/ipt_netflow/files/ipt_netflow-2.2-linux-4.15.patch
@@ -0,0 +1,26 @@
+--- a/ipt_NETFLOW.c
 b/ipt_NETFLOW.c
+@@ -4357,7 +4357,11 @@
+ #define CALC_RATE(ewma, cur, minutes) ewma += _A(cur - ewma, minutes)
+ 
+ // calculate EWMA throughput rate for whole module
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)
++static void rate_timer_calc(struct timer_list *t)
++#else
+ static void rate_timer_calc(unsigned long dummy)
++#endif
+ {
+   static u64 old_pkt_total = 0;
+   static u64 old_traf_total = 0;
+@@ -5525,7 +5525,11 @@
+ 
+   netflow_switch_version(protocol);
+   _schedule_scan_worker(0);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)
++  timer_setup(_timer, rate_timer_calc, 0);
++#else
+   setup_timer(_timer, rate_timer_calc, 0);
++#endif
+   mod_timer(_timer, jiffies + (HZ * SAMPLERATE));
+ 
+   peakflows_at = jiffies;

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.2-r3.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.2-r3.ebuild
new file mode 100644
index 000..b2bda0e5889
--- /dev/null
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.2-r3.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MY_PN="${PN/_/-}"
+MY_P="${MY_PN}-${PV}"
+inherit linux-info linux-mod toolchain-funcs
+
+DESCRIPTION="Netflow iptables module"
+HOMEPAGE="https://sourceforge.net/projects/ipt-netflow;
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug natevents snmp"
+
+RDEPEND="
+   net-firewall/iptables
+   snmp? ( net-analyzer/net-snmp )
+"
+DEPEND="${RDEPEND}
+   virtual/linux-sources
+   virtual/pkgconfig
+"
+
+# set S before MODULE_NAMES
+S="${WORKDIR}/${MY_P}"
+PATCHES=(
+   # bug #455984
+   "${FILESDIR}/${PN}-2.0-configure.patch"
+   # Compatibility with kernel 4.6
+   "${FILESDIR}/${P}-linux-4.6.patch"
+   # Compatibility with kernel 4.10, bug #617484
+   "${FILESDIR}/${P}-linux-4.10.patch"
+   # Compatibility with kernel 4.13, bug #630446
+   "${FILESDIR}/${P}-linux-4.13.patch"
+   # Compatibility with kernel 4.15, bug #646798
+   "${FILESDIR}/${P}-linux-4.15.patch"
+)
+
+pkg_setup() {
+   BUILD_TARGETS="all"
+   MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
+   IPT_LIB="/usr/$(get_libdir)/xtables"
+   local CONFIG_CHECK="~IP_NF_IPTABLES"
+   use debug && CONFIG_CHECK+=" ~DEBUG_FS"
+   use natevents && CONFIG_CHECK+=" NF_CONNTRACK_EVENTS NF_NAT_NEEDED"
+   linux-mod_pkg_setup
+}
+
+src_prepare() {
+   sed -i \
+   -e 's:make -C:$(MAKE) -C:g' \
+   -e 's:gcc -O2:$(CC) $(CFLAGS) $(LDFLAGS):' \
+   -e 's:gcc:$(CC) $(CFLAGS) $(LDFLAGS):' \
+   Makefile.in || die
+
+   # Checking for directory is enough
+   sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die
+
+   default
+}
+
+do_conf() {
+   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}" 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Sergey Popov]

commit: f2d52e7ee3ae0762d7c01f07c904036f56ee9462
Author: Sergey Popov  gentoo  org>
AuthorDate: Mon Oct 16 08:56:07 2017 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Mon Oct 16 08:56:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2d52e7e

net-firewall/ipt_netflow: drop old revision

Package-Manager: Portage-2.3.10, Repoman-2.3.1

 net-firewall/ipt_netflow/ipt_netflow-2.2-r1.ebuild | 96 --
 1 file changed, 96 deletions(-)

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.2-r1.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.2-r1.ebuild
deleted file mode 100644
index f82263fe40c..000
--- a/net-firewall/ipt_netflow/ipt_netflow-2.2-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MY_PN="${PN/_/-}"
-MY_P="${MY_PN}-${PV}"
-inherit linux-info linux-mod toolchain-funcs
-
-DESCRIPTION="Netflow iptables module"
-HOMEPAGE="https://sourceforge.net/projects/ipt-netflow;
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="debug snmp"
-
-RDEPEND="
-   net-firewall/iptables
-   snmp? ( net-analyzer/net-snmp )
-"
-DEPEND="${RDEPEND}
-   virtual/linux-sources
-   virtual/pkgconfig
-"
-
-# set S before MODULE_NAMES
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-   BUILD_TARGETS="all"
-   MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
-   IPT_LIB="/usr/$(get_libdir)/xtables"
-   local CONFIG_CHECK="~IP_NF_IPTABLES"
-   use debug && CONFIG_CHECK+=" ~DEBUG_FS"
-   linux-mod_pkg_setup
-}
-
-src_prepare() {
-   sed -i \
-   -e 's:make -C:$(MAKE) -C:g' \
-   -e 's:gcc -O2:$(CC) $(CFLAGS) $(LDFLAGS):' \
-   -e 's:gcc:$(CC) $(CFLAGS) $(LDFLAGS):' \
-   Makefile.in || die
-
-   # Checking for directory is enough
-   sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die
-
-   # bug #455984
-   eapply "${FILESDIR}/${PN}-2.0-configure.patch"
-
-   # Compatibility with kernel 4.6
-   eapply "${FILESDIR}/${P}-linux-4.6.patch"
-
-   # Compatibility with kernel 4.10, bug #617484
-   eapply "${FILESDIR}/${P}-linux-4.10.patch"
-
-   # Compatibility with kernel 4.13, bug #630446
-   eapply "${FILESDIR}/${P}-linux-4.13.patch"
-
-   eapply_user
-}
-
-do_conf() {
-   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 \
-   --ipt-lib="${IPT_LIB}" \
-   --ipt-src="/usr/" \
-   --ipt-ver="${IPT_VERSION}" \
-   --kdir="${KV_DIR}" \
-   --kver="${KV_FULL}" \
-   $(use debug && echo '--enable-debugfs') \
-   $(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*
-}

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Sergey Popov]

commit: 14fa9b04fd909074a5e427ca9be7a1656a00146d
Author: Sergey Popov  gentoo  org>
AuthorDate: Mon Oct 16 08:55:34 2017 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Mon Oct 16 08:56:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14fa9b04

net-firewall/ipt_netflow: stable for amd64/x86

Package-Manager: Portage-2.3.10, Repoman-2.3.1

 net-firewall/ipt_netflow/ipt_netflow-2.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.2-r2.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.2-r2.ebuild
index c2ed5f6f427..c4a7b8bba0c 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.2-r2.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="debug natevents snmp"
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Sergey Popov]

commit: 3a2b5088d321100df65ea1946ace26faf35be07c
Author: Sergey Popov  gentoo  org>
AuthorDate: Tue Oct  3 08:15:16 2017 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Tue Oct  3 08:15:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a2b5088

net-firewall/ipt_netflow: fix incorrect handling of natevents configure option

Reported-by: Toralf Förster  gentoo.org>
Closes: https://bugs.gentoo.org/632472

Package-Manager: Portage-2.3.10, Repoman-2.3.1

 net-firewall/ipt_netflow/ipt_netflow-2.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.2-r2.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.2-r2.ebuild
index 9fa1da5e448..c2ed5f6f427 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.2-r2.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.2-r2.ebuild
@@ -84,7 +84,7 @@ src_configure() {
--kdir="${KV_DIR}" \
--kver="${KV_FULL}" \
$(use debug && echo '--enable-debugfs') \
-   $(use_enable natevents) \
+   $(use natevents && echo '--enable-natevents') \
$(use snmp && echo '--enable-snmp-rules' || echo 
'--disable-snmp-agent')
 }
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Sergey Popov]

commit: 3f098e0602aaaca4b711af00a8f4db8c53206b54
Author: Sergey Popov  gentoo  org>
AuthorDate: Fri Sep 29 14:50:32 2017 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Fri Sep 29 14:50:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f098e06

net-firewall/ipt_netflow: revision bump

Add NAT translation events support via dedicated
USE-flag. Add some other upstream features
(aggregation, VLAN and MAC address info in packets),
which does not required specific kernel features
and thus - enabled by default.

Package-Manager: Portage-2.3.10, Repoman-2.3.1

 net-firewall/ipt_netflow/ipt_netflow-2.2-r2.ebuild | 102 +
 net-firewall/ipt_netflow/metadata.xml  |   3 +
 2 files changed, 105 insertions(+)

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.2-r2.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.2-r2.ebuild
new file mode 100644
index 000..9fa1da5e448
--- /dev/null
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.2-r2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MY_PN="${PN/_/-}"
+MY_P="${MY_PN}-${PV}"
+inherit linux-info linux-mod toolchain-funcs
+
+DESCRIPTION="Netflow iptables module"
+HOMEPAGE="https://sourceforge.net/projects/ipt-netflow;
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug natevents snmp"
+
+RDEPEND="
+   net-firewall/iptables
+   snmp? ( net-analyzer/net-snmp )
+"
+DEPEND="${RDEPEND}
+   virtual/linux-sources
+   virtual/pkgconfig
+"
+
+# set S before MODULE_NAMES
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+   BUILD_TARGETS="all"
+   MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
+   IPT_LIB="/usr/$(get_libdir)/xtables"
+   local CONFIG_CHECK="~IP_NF_IPTABLES"
+   use debug && CONFIG_CHECK+=" ~DEBUG_FS"
+   use natevents && CONFIG_CHECK+=" NF_CONNTRACK_EVENTS NF_NAT_NEEDED"
+   linux-mod_pkg_setup
+}
+
+src_prepare() {
+   sed -i \
+   -e 's:make -C:$(MAKE) -C:g' \
+   -e 's:gcc -O2:$(CC) $(CFLAGS) $(LDFLAGS):' \
+   -e 's:gcc:$(CC) $(CFLAGS) $(LDFLAGS):' \
+   Makefile.in || die
+
+   # Checking for directory is enough
+   sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die
+
+   # bug #455984
+   eapply "${FILESDIR}/${PN}-2.0-configure.patch"
+
+   # Compatibility with kernel 4.6
+   eapply "${FILESDIR}/${P}-linux-4.6.patch"
+
+   # Compatibility with kernel 4.10, bug #617484
+   eapply "${FILESDIR}/${P}-linux-4.10.patch"
+
+   # Compatibility with kernel 4.13, bug #630446
+   eapply "${FILESDIR}/${P}-linux-4.13.patch"
+
+   eapply_user
+}
+
+do_conf() {
+   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_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/metadata.xml 
b/net-firewall/ipt_netflow/metadata.xml
index 2405d92f746..76cfd517551 100644
--- a/net-firewall/ipt_netflow/metadata.xml
+++ b/net-firewall/ipt_netflow/metadata.xml
@@ -9,6 +9,9 @@
net...@gentoo.org
Gentoo network monitoring and analysis project

+   
+   Netflow NAT translation events (NEL) 
support
+   

ipt-netflow

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/files/, net-firewall/ipt_netflow/

[Sergey Popov]

commit: 3c5c24508b5a3faed392e546e2acdd684e28fdd1
Author: Sergey Popov  gentoo  org>
AuthorDate: Mon Sep 11 09:32:01 2017 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Mon Sep 11 09:33:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c5c2450

net-firewall/ipt_netflow: backport fix for building with kernel 4.13

Reported-by: Toralf Förster  gentoo.org>
Closes: https://bugs.gentoo.org/630446

Package-Manager: Portage-2.3.7, Repoman-2.3.1

 .../files/ipt_netflow-2.2-linux-4.13.patch | 63 ++
 net-firewall/ipt_netflow/ipt_netflow-2.2-r1.ebuild |  3 ++
 2 files changed, 66 insertions(+)

diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.2-linux-4.13.patch 
b/net-firewall/ipt_netflow/files/ipt_netflow-2.2-linux-4.13.patch
new file mode 100644
index 000..10e8b552afb
--- /dev/null
+++ b/net-firewall/ipt_netflow/files/ipt_netflow-2.2-linux-4.13.patch
@@ -0,0 +1,63 @@
+commit 53a556cb4a705f4eae2bcb49552b6427b231378a
+Author: ABC 
+Date:   Mon Aug 14 22:55:25 2017 +0300
+
+Compatibility with kernel 4.13.
+
+Offset patch torvalds/linux@14afee4b6092fde451ee17604e5f5c89da33e71e
+
+diff --git a/compat.h b/compat.h
+index 061eb57..275ff58 100644
+--- a/compat.h
 b/compat.h
+@@ -636,4 +636,10 @@ static inline unsigned int xt_hooknum(const struct 
xt_action_param *par)
+ # define SK_CAN_REUSE   1
+ #endif
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,13,0)
++# define compat_refcount_read atomic_read
++#else
++# define compat_refcount_read refcount_read
++#endif
++
+ #endif /* COMPAT_NETFLOW_H */
+diff --git a/ipt_NETFLOW.c b/ipt_NETFLOW.c
+index 494ea74..9365325 100644
+--- a/ipt_NETFLOW.c
 b/ipt_NETFLOW.c
+@@ -622,7 +622,7 @@ static int snmp_seq_show(struct seq_file *seq, void *v)
+ 
+   seq_printf(seq, " %u %u %u\n",
+   sk->sk_sndbuf,
+-  atomic_read(>sk_wmem_alloc),
++  compat_refcount_read(>sk_wmem_alloc),
+   wmem_peak);
+   } else
+   seq_printf(seq, " 0 0 %u\n", wmem_peak);
+@@ -864,7 +864,7 @@ static int nf_seq_show(struct seq_file *seq, void *v)
+   seq_printf(seq, ", sndbuf %u, filled %u, peak %u;"
+   " err: sndbuf reached %u, connect %u, cberr %u, 
other %u\n",
+   sk->sk_sndbuf,
+-  atomic_read(>sk_wmem_alloc),
++  compat_refcount_read(>sk_wmem_alloc),
+   atomic_read(>wmem_peak),
+   usock->err_full,
+   usock->err_connect,
+@@ -2031,7 +2031,7 @@ static void netflow_sendmsg(void *buffer, const int len)
+   printk(KERN_INFO "netflow_sendmsg: sendmsg(%d, %d) [%u 
%u]\n",
+  snum,
+  len,
+- atomic_read(>sock->sk->sk_wmem_alloc),
++ 
compat_refcount_read(>sock->sk->sk_wmem_alloc),
+  usock->sock->sk->sk_sndbuf);
+   ret = kernel_sendmsg(usock->sock, , , 1, (size_t)len);
+   if (ret < 0) {
+@@ -2054,7 +2054,7 @@ static void netflow_sendmsg(void *buffer, const int len)
+   printk(KERN_ERR "ipt_NETFLOW: sendmsg[%d] error %d: 
data loss %llu pkt, %llu bytes%s\n",
+  snum, ret, pdu_packets, pdu_traf, suggestion);
+   } else {
+-  unsigned int wmem = 
atomic_read(>sock->sk->sk_wmem_alloc);
++  unsigned int wmem = 
compat_refcount_read(>sock->sk->sk_wmem_alloc);
+   if (wmem > atomic_read(>wmem_peak))
+   atomic_set(>wmem_peak, wmem);
+   NETFLOW_STAT_INC(exported_pkt);

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.2-r1.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.2-r1.ebuild
index d7f364065e3..f82263fe40c 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.2-r1.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.2-r1.ebuild
@@ -56,6 +56,9 @@ src_prepare() {
# Compatibility with kernel 4.10, bug #617484
eapply "${FILESDIR}/${P}-linux-4.10.patch"
 
+   # Compatibility with kernel 4.13, bug #630446
+   eapply "${FILESDIR}/${P}-linux-4.13.patch"
+
eapply_user
 }
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/, net-firewall/ipt_netflow/files/

[Sergey Popov]

commit: 2839798db8f159e92e64a37d83b9899e1570926c
Author: Sergey Popov  gentoo  org>
AuthorDate: Tue May 16 16:18:31 2017 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Tue May 16 16:18:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2839798d

net-firewall/ipt_netflow: backport upstream fix for building with kernel 4.10

Reported-by: Toralf Förster  gmx.de>
Gentoo-Bug: 617484

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 .../files/ipt_netflow-2.2-linux-4.10.patch | 137 +
 net-firewall/ipt_netflow/ipt_netflow-2.2-r1.ebuild |   5 +-
 2 files changed, 141 insertions(+), 1 deletion(-)

diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.2-linux-4.10.patch 
b/net-firewall/ipt_netflow/files/ipt_netflow-2.2-linux-4.10.patch
new file mode 100644
index 000..7e8f62840a9
--- /dev/null
+++ b/net-firewall/ipt_netflow/files/ipt_netflow-2.2-linux-4.10.patch
@@ -0,0 +1,137 @@
+commit 5d71c94c400d91633f6d3c3be9e785bb23d4ca1a
+Author: ABC 
+Date:   Sun Mar 5 11:27:39 2017 +0300
+
+Compilation compatibility with kernel 4.10.
+
+Fixes #70.
+Resolves incompatibilities introduced by
+ 2456e855354415bfaeb7badaa14e11b3e02c8466 and
+ 613dbd95723aee7abd16860745691b6c7bda20dc for kernel 4.10.
+
+diff --git a/compat.h b/compat.h
+index 3f27977..47176ef 100644
+--- a/compat.h
 b/compat.h
+@@ -600,4 +600,29 @@ out:
+ # define __GNUC_PREREQ(maj, min) 0
+ #endif
+ 
++/* ktime is not union anymore, since 2456e855354415bfaeb7badaa14e11b3e02c8466 
*/
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,10,0)
++# define first_tv64   first.tv64
++# define last_tv64last.tv64
++#else
++# define first_tv64   first
++# define last_tv64last
++#endif
++
++/* Offset changes made in 613dbd95723aee7abd16860745691b6c7bda20dc */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) && LINUX_VERSION_CODE < 
KERNEL_VERSION(4,10,0)
++static inline u_int8_t xt_family(const struct xt_action_param *par)
++{
++  return par->family;
++}
++static inline const struct net_device *xt_in(const struct xt_action_param 
*par)
++{
++  return par->in;
++}
++static inline const struct net_device *xt_out(const struct xt_action_param 
*par)
++{
++  return par->out;
++}
++#endif
++
+ #endif /* COMPAT_NETFLOW_H */
+diff --git a/ipt_NETFLOW.c b/ipt_NETFLOW.c
+index 781b284..0d1ac55 100644
+--- a/ipt_NETFLOW.c
 b/ipt_NETFLOW.c
+@@ -3863,10 +3863,10 @@ static void netflow_export_stats(void)
+   t.pkts_selected += st->pkts_selected;
+   t.pkts_observed += st->pkts_observed;
+ #endif
+-  t.drop.first.tv64 = min_not_zero(t.drop.first.tv64, 
st->drop.first.tv64);
+-  t.drop.last.tv64  = max(t.drop.last.tv64, st->drop.last.tv64);
+-  t.lost.first.tv64 = min_not_zero(t.lost.first.tv64, 
st->lost.first.tv64);
+-  t.lost.last.tv64  = max(t.lost.last.tv64, st->lost.last.tv64);
++  t.drop.first_tv64 = min_not_zero(t.drop.first_tv64, 
st->drop.first_tv64);
++  t.drop.last_tv64  = max(t.drop.last_tv64, st->drop.last_tv64);
++  t.lost.first_tv64 = min_not_zero(t.lost.first_tv64, 
st->lost.first_tv64);
++  t.lost.last_tv64  = max(t.lost.last_tv64, st->lost.last_tv64);
+   }
+ 
+   export_stat_st(OTPL_MPSTAT, );
+@@ -4781,8 +4781,8 @@ static unsigned int netflow_target(
+  const void *targinfo
+ # endif
+ #else /* since 2.6.28 */
+-# define if_in  par->in
+-# define if_out par->out
++# define if_in  xt_in(par)
++# define if_out xt_out(par)
+ # if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)
+  const struct xt_target_param *par
+ # else
+@@ -4809,7 +4809,7 @@ static unsigned int netflow_target(
+ #ifdef ENABLE_DIRECTION
+   const int hooknum = par->hooknum;
+ #endif
+-  const int family = par->family;
++  const int family = xt_family(par);
+ #endif
+   struct ipt_netflow_tuple tuple;
+   struct ipt_netflow *nf;
+diff --git a/ipt_NETFLOW.h b/ipt_NETFLOW.h
+index eb00e94..3ee44a8 100644
+--- a/ipt_NETFLOW.h
 b/ipt_NETFLOW.h
+@@ -414,7 +414,7 @@ struct netflow_aggr_p {
+ #define NETFLOW_STAT_TS(count)
 \
+   do {
 \
+   ktime_t kts = ktime_get_real(); 
 \
+-  if (!(__get_cpu_var(ipt_netflow_stat)).count.first.tv64)
 \
++  if (!(__get_cpu_var(ipt_netflow_stat)).count.first_tv64)
 \
+   __get_cpu_var(ipt_netflow_stat).count.first = kts;  
 \
+   __get_cpu_var(ipt_netflow_stat).count.last = kts;   
 \
+   } while (0);
+commit 5dec6355f151a5c9fa4393c43388b22d9c720fae
+Author: ABC 
+Date:   Tue Mar 14 21:55:29 2017 +0300
+
+More compatibility with kernel 4.10.
+
+Thanks 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Sergey Popov]

commit: 81fe138dae97a6e357c772383bd7394bf9408f25
Author: Sergey Popov  gentoo  org>
AuthorDate: Thu Sep 22 05:15:53 2016 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Thu Sep 22 05:15:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81fe138d

net-firewall/ipt_netflow: stable for amd64/x86

Package-Manager: portage-2.2.28

 net-firewall/ipt_netflow/ipt_netflow-2.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.2-r1.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.2-r1.ebuild
index 0dc6ba1..5602e8e 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.2-r1.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="debug snmp"
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Sergey Popov]

commit: 10032067bd0f0fec45b52ef293d142888d6db230
Author: Sergey Popov  gentoo  org>
AuthorDate: Thu Sep 22 05:16:19 2016 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Thu Sep 22 05:16:19 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10032067

net-firewall/ipt_netflow: drop old revision

Package-Manager: portage-2.2.28

 net-firewall/ipt_netflow/ipt_netflow-2.2.ebuild | 88 -
 1 file changed, 88 deletions(-)

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.2.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.2.ebuild
deleted file mode 100644
index 8efa369..
--- a/net-firewall/ipt_netflow/ipt_netflow-2.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-MY_PN="${PN/_/-}"
-MY_P="${MY_PN}-${PV}"
-inherit linux-info linux-mod toolchain-funcs
-
-DESCRIPTION="Netflow iptables module"
-HOMEPAGE="https://sourceforge.net/projects/ipt-netflow;
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="debug snmp"
-
-RDEPEND="
-   net-firewall/iptables
-   snmp? ( net-analyzer/net-snmp )
-"
-DEPEND="${RDEPEND}
-   virtual/linux-sources
-   virtual/pkgconfig
-"
-
-# set S before MODULE_NAMES
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-   BUILD_TARGETS="all"
-   MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
-   IPT_LIB="/usr/$(get_libdir)/xtables"
-   local CONFIG_CHECK="~IP_NF_IPTABLES"
-   use debug && CONFIG_CHECK+=" ~DEBUG_FS"
-   linux-mod_pkg_setup
-}
-
-src_prepare() {
-   sed -i \
-   -e 's:make -C:$(MAKE) -C:g' \
-   -e 's:gcc -O2:$(CC) $(CFLAGS) $(LDFLAGS):' \
-   -e 's:gcc:$(CC) $(CFLAGS) $(LDFLAGS):' \
-   Makefile.in || die
-
-   # Checking for directory is enough
-   sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die
-
-   # bug #455984
-   eapply "${FILESDIR}/${PN}-2.0-configure.patch"
-
-   eapply_user
-}
-
-do_conf() {
-   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 \
-   --ipt-lib="${IPT_LIB}" \
-   --ipt-src="/usr/" \
-   --ipt-ver="${IPT_VERSION}" \
-   --kdir="${KV_DIR}" \
-   --kver="${KV_FULL}" \
-   $(use debug && echo '--enable-debugfs') \
-   $(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*
-}

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/files/, net-firewall/ipt_netflow/

[Sergey Popov]

commit: d45e06d1e8292e123fa7e7420dd6c7b387da9383
Author: Sergey Popov  gentoo  org>
AuthorDate: Tue Jul 19 09:12:41 2016 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Tue Jul 19 09:12:41 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d45e06d1

net-firewall/ipt_netflow: drop old version

Package-Manager: portage-2.2.28

 net-firewall/ipt_netflow/Manifest  |  1 -
 .../files/ipt_netflow-2.1-linux-3.19.patch | 45 ---
 .../ipt_netflow/ipt_netflow-2.1_p20160119.ebuild   | 88 --
 3 files changed, 134 deletions(-)

diff --git a/net-firewall/ipt_netflow/Manifest 
b/net-firewall/ipt_netflow/Manifest
index 1dba461..65a6cfc 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1,2 +1 @@
-DIST ipt-netflow-2.1_p20160119.tgz 86892 SHA256 
9afb3f122f0f2b140d81b331d4500f8ad475898579fb5901ed1090d80783a4e5 SHA512 
7f30683240d7516df01a4b4a37ea738980def764741c658c86e9c28ca638592a40e0b2458164105d76f88c90f780f058f5c17a0c60ffaeb775d7cdb38dbb4fe1
 WHIRLPOOL 
fdb1a0bebeb8a2840005abd86cbd0fcbc241b4acaae2138d66d0a463807392a3076113b61d8d091ba0aa8f995ab9cc21a1f1f8e33bd9cd11bc1700b8392791d9
 DIST ipt-netflow-2.2.tgz 96697 SHA256 
81be0a334f74894756d022aee2c87b36c89a7aeca6ff1c91ef6b4f3458793198 SHA512 
a406ab9bd18616414d8c99f427382a075bdb8000d8c40959f5b6d6e577d7eb4dfc7f8b773664a516ec2228d15590f21c3fbd6aa3d4302f6cdf03810e1702af74
 WHIRLPOOL 
e9c5f13a3efa346b75ec47ceb033e83099744fa90d575d62135225a88f0093b1de556354d972772f13e7ea895659cd58e6e9a3c08817f62fd902336cc8771928

diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.1-linux-3.19.patch 
b/net-firewall/ipt_netflow/files/ipt_netflow-2.1-linux-3.19.patch
deleted file mode 100644
index 47fec4f..000
--- a/net-firewall/ipt_netflow/files/ipt_netflow-2.1-linux-3.19.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit 582fd497a5f0f5ae5dce24cba042d856d63bfbe1
-Author: ABC 
-Date:   Mon Feb 16 21:53:54 2015 +0400
-
-Compatibility of __get_cpu_var with linux 3.19.
-
-Fixes #28, thanks boyarsh@github.
-
-diff --git a/ipt_NETFLOW.h b/ipt_NETFLOW.h
-index bc2734f..5548e57 100644
 a/ipt_NETFLOW.h
-+++ b/ipt_NETFLOW.h
-@@ -396,6 +396,9 @@ struct netflow_aggr_p {
-   __u16 aggr_port;
- };
- 
-+#ifndef __get_cpu_var
-+#define __get_cpu_var(var)(*this_cpu_ptr(&(var)))
-+#endif
- #define NETFLOW_STAT_INC(count) (__get_cpu_var(ipt_netflow_stat).count++)
- #define NETFLOW_STAT_ADD(count, val) (__get_cpu_var(ipt_netflow_stat).count 
+= (unsigned long long)val)
- #define NETFLOW_STAT_SET(count, val) (__get_cpu_var(ipt_netflow_stat).count = 
(unsigned long long)val)
-diff --git a/testing.sh b/testing.sh
-index b465c8d..caa4f03 100755
 a/testing.sh
-+++ b/testing.sh
-@@ -6,7 +6,7 @@ if [ "$1" = "" ]; then
-   echo Maintainer only tool.
-   exit 1
- elif [ "$1" = all ]; then
--  exec bash $0 linux-2.6.18 centos5 linux-3.11.2 centos6 linux-3.4.66 
linux-3.9.11 centos7 linux-3.14 linux-3.17
-+  exec bash $0 linux-2.6.18 centos5 linux-3.11.2 centos6 linux-3.4.66 
linux-3.9.11 centos7 linux-3.14 linux-3.17 linux-3.19
-   exit 1
- fi
- 
-@@ -33,6 +33,9 @@ readarray -t opts 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/, net-firewall/ipt_netflow/files/

[Sergey Popov]

commit: 2ad5de1938d063ff68d5ea9c254cf2158bdf0c71
Author: Sergey Popov  gentoo  org>
AuthorDate: Tue Jul 19 09:13:50 2016 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Tue Jul 19 09:13:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ad5de19

net-firewall/ipt_netflow: revision bump

Backport compatibility patch for Linux kernel 4.6

Package-Manager: portage-2.2.28

 .../files/ipt_netflow-2.2-linux-4.6.patch  | 61 +++
 net-firewall/ipt_netflow/ipt_netflow-2.2-r1.ebuild | 91 ++
 2 files changed, 152 insertions(+)

diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.2-linux-4.6.patch 
b/net-firewall/ipt_netflow/files/ipt_netflow-2.2-linux-4.6.patch
new file mode 100644
index 000..bd9bedd
--- /dev/null
+++ b/net-firewall/ipt_netflow/files/ipt_netflow-2.2-linux-4.6.patch
@@ -0,0 +1,61 @@
+commit c16ffc6cb679b3377a0d4a30a6bbcf5e2f3d0214
+Author: ABC 
+Date:   Sun May 22 22:07:14 2016 +0300
+
+Support ETHTOOL_xLINKSETTINGS API (new in linux 4.6).
+
+Thus, making support for 4.6 kernels.
+Reference to linux commit:
+  https://github.com/torvalds/linux/commit/3f1ac7a700d
+
+Fixes #56, thanks karel-un.
+
+diff --git a/ipt_NETFLOW.c b/ipt_NETFLOW.c
+index 067fd50..d27eea2 100644
+--- a/ipt_NETFLOW.c
 b/ipt_NETFLOW.c
+@@ -3904,7 +3904,13 @@ static int ethtool_drvinfo(unsigned char *ptr, size_t 
size, struct net_device *d
+ {
+   struct ethtool_drvinfo info = { 0 };
+   const struct ethtool_ops *ops = dev->ethtool_ops;
++#ifndef ETHTOOL_GLINKSETTINGS
+   struct ethtool_cmd ecmd;
++#define _KSETTINGS(x, y) (x)
++#else
++  struct ethtool_link_ksettings ekmd;
++#define _KSETTINGS(x, y) (y)
++#endif
+   int len = size;
+   int n;
+ 
+@@ -3933,11 +3939,11 @@ static int ethtool_drvinfo(unsigned char *ptr, size_t 
size, struct net_device *d
+   /* only get_settings for running devices to not trigger link 
negotiation */
+   if (dev->flags & IFF_UP &&
+   dev->flags & IFF_RUNNING &&
+-  !__ethtool_get_settings(dev, )) {
++  !_KSETTINGS(__ethtool_get_settings(dev, ), 
__ethtool_get_link_ksettings(dev, ))) {
+   char *s, *p;
+ 
+   /* append basic parameters: speed and port */
+-  switch (ethtool_cmd_speed()) {
++  switch (_KSETTINGS(ethtool_cmd_speed(), ekmd.base.speed)) {
+   case SPEED_1: s = "10Gb"; break;
+   case SPEED_2500:  s = "2.5Gb"; break;
+   case SPEED_1000:  s = "1Gb"; break;
+@@ -3945,7 +3951,7 @@ static int ethtool_drvinfo(unsigned char *ptr, size_t 
size, struct net_device *d
+   case SPEED_10:s = "10Mb"; break;
+   default:  s = "";
+   }
+-  switch (ecmd.port) {
++  switch (_KSETTINGS(ecmd.port, ekmd.base.port)) {
+   case PORT_TP: p = "tp"; break;
+   case PORT_AUI:p = "aui"; break;
+   case PORT_MII:p = "mii"; break;
+@@ -3964,6 +3970,7 @@ ret:
+   ops->complete(dev);
+   return size - len;
+ }
++#undef _KSETTINGS
+ 
+ static const unsigned short netdev_type[] =
+ {ARPHRD_NETROM, ARPHRD_ETHER, ARPHRD_AX25,

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.2-r1.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.2-r1.ebuild
new file mode 100644
index 000..a141c1a
--- /dev/null
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.2-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+MY_PN="${PN/_/-}"
+MY_P="${MY_PN}-${PV}"
+inherit linux-info linux-mod toolchain-funcs
+
+DESCRIPTION="Netflow iptables module"
+HOMEPAGE="http://sourceforge.net/projects/ipt-netflow;
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug snmp"
+
+RDEPEND="
+   net-firewall/iptables
+   snmp? ( net-analyzer/net-snmp )
+"
+DEPEND="${RDEPEND}
+   virtual/linux-sources
+   virtual/pkgconfig
+"
+
+# set S before MODULE_NAMES
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+   BUILD_TARGETS="all"
+   MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
+   IPT_LIB="/usr/$(get_libdir)/xtables"
+   local CONFIG_CHECK="~IP_NF_IPTABLES"
+   use debug && CONFIG_CHECK+=" ~DEBUG_FS"
+   linux-mod_pkg_setup
+}
+
+src_prepare() {
+   sed -i \
+   -e 's:make -C:$(MAKE) -C:g' \
+   -e 's:gcc -O2:$(CC) $(CFLAGS) $(LDFLAGS):' \
+   -e 's:gcc:$(CC) $(CFLAGS) $(LDFLAGS):' \
+   Makefile.in || die
+
+   # Checking for directory is enough
+   sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die
+
+   # bug #455984
+   eapply "${FILESDIR}/${PN}-2.0-configure.patch"
+
+   # Compatibility with kernel 4.6
+   eapply "${FILESDIR}/${P}-linux-4.6.patch"
+
+  

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Sergey Popov]

commit: a0d1c336446c135c021d430e162b3a55166da5c0
Author: Sergey Popov  gentoo  org>
AuthorDate: Thu May 12 09:50:44 2016 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Thu May 12 09:50:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0d1c336

net-firewall/ipt_netflow: drop old version

Package-Manager: portage-2.2.28

 net-firewall/ipt_netflow/Manifest   |  1 -
 net-firewall/ipt_netflow/ipt_netflow-2.1.ebuild | 93 -
 2 files changed, 94 deletions(-)

diff --git a/net-firewall/ipt_netflow/Manifest 
b/net-firewall/ipt_netflow/Manifest
index c2d5f0a..1dba461 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1,3 +1,2 @@
-DIST ipt-netflow-2.1.tgz 87872 SHA256 
1cc1ee518ecd6c7d8d792ea79c0f69d03ce450c10fefd37f053c43aac92e9931 SHA512 
0055ebb1846077f94c1fbf701af8a07a432058c8e86e31c6f420d5c00c96b45012abdcdeef3c5b1ead7d20c7efd51ac65d000b6cb931d878f528f52de0ab9c21
 WHIRLPOOL 
e46ffe69f58293cca0fc26c2ff13ee30e68e2a60a4b198c89fdb24ebc45a4376877285358d4e72019c811d70d0a77194dbc0d46f44c8076923fc626cfe2e7488
 DIST ipt-netflow-2.1_p20160119.tgz 86892 SHA256 
9afb3f122f0f2b140d81b331d4500f8ad475898579fb5901ed1090d80783a4e5 SHA512 
7f30683240d7516df01a4b4a37ea738980def764741c658c86e9c28ca638592a40e0b2458164105d76f88c90f780f058f5c17a0c60ffaeb775d7cdb38dbb4fe1
 WHIRLPOOL 
fdb1a0bebeb8a2840005abd86cbd0fcbc241b4acaae2138d66d0a463807392a3076113b61d8d091ba0aa8f995ab9cc21a1f1f8e33bd9cd11bc1700b8392791d9
 DIST ipt-netflow-2.2.tgz 96697 SHA256 
81be0a334f74894756d022aee2c87b36c89a7aeca6ff1c91ef6b4f3458793198 SHA512 
a406ab9bd18616414d8c99f427382a075bdb8000d8c40959f5b6d6e577d7eb4dfc7f8b773664a516ec2228d15590f21c3fbd6aa3d4302f6cdf03810e1702af74
 WHIRLPOOL 
e9c5f13a3efa346b75ec47ceb033e83099744fa90d575d62135225a88f0093b1de556354d972772f13e7ea895659cd58e6e9a3c08817f62fd902336cc8771928

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.1.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.1.ebuild
deleted file mode 100644
index af6bc1f..000
--- a/net-firewall/ipt_netflow/ipt_netflow-2.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-MY_PN="${PN/_/-}"
-MY_P="${MY_PN}-${PV}"
-inherit eutils linux-info linux-mod multilib toolchain-funcs
-
-DESCRIPTION="Netflow iptables module"
-HOMEPAGE="http://sourceforge.net/projects/ipt-netflow;
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="debug snmp"
-
-RDEPEND="
-   net-firewall/iptables
-   snmp? ( net-analyzer/net-snmp )
-"
-DEPEND="${RDEPEND}
-   virtual/linux-sources
-   virtual/pkgconfig
-"
-
-# set S before MODULE_NAMES
-S="${WORKDIR}/${MY_P}"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
-
-IPT_LIB="/usr/$(get_libdir)/xtables"
-
-pkg_setup() {
-   local CONFIG_CHECK="~IP_NF_IPTABLES"
-   use debug && CONFIG_CHECK+=" ~DEBUG_FS"
-   linux-mod_pkg_setup
-}
-
-src_prepare() {
-   sed -i \
-   -e 's:make -C:$(MAKE) -C:g' \
-   -e 's:gcc -O2:$(CC) $(CFLAGS) $(LDFLAGS):' \
-   -e 's:gcc:$(CC) $(CFLAGS) $(LDFLAGS):' \
-   Makefile.in || die
-
-   # Checking for directory is enough
-   sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die
-
-   # bug #455984
-   epatch "${FILESDIR}/${PN}-2.0-configure.patch"
-
-   # bug #552476
-   epatch "${FILESDIR}/${PN}-2.1-linux-3.19.patch"
-
-   epatch_user
-}
-
-do_conf() {
-   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 \
-   --ipt-lib="${IPT_LIB}" \
-   --ipt-src="/usr/" \
-   --ipt-ver="${IPT_VERSION}" \
-   --kdir="${KV_DIR}" \
-   --kver="${KV_FULL}" \
-   $(use debug && echo '--enable-debugfs') \
-   $(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*
-}

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Sergey Popov]

commit: 482103467a8ed2914b5b96b4821d5cae289c06dc
Author: Sergey Popov  gentoo  org>
AuthorDate: Thu May 12 09:50:21 2016 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Thu May 12 09:50:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48210346

net-firewall/ipt_netflow-2.2: stable on amd64 and x86

Package-Manager: portage-2.2.28

 net-firewall/ipt_netflow/ipt_netflow-2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.2.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.2.ebuild
index c8c320f..25500ff0 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.2.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="debug snmp"
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Sergey Popov]

commit: be750918b03fc59eb0d3c48a9057b454660547a7
Author: Sergey Popov  gentoo  org>
AuthorDate: Wed Mar  2 08:12:15 2016 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Wed Mar  2 08:12:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be750918

net-firewall/ipt_netflow: version bump

Package-Manager: portage-2.2.26

 net-firewall/ipt_netflow/Manifest   |  1 +
 net-firewall/ipt_netflow/ipt_netflow-2.2.ebuild | 88 +
 2 files changed, 89 insertions(+)

diff --git a/net-firewall/ipt_netflow/Manifest 
b/net-firewall/ipt_netflow/Manifest
index c56278c..c2d5f0a 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1,2 +1,3 @@
 DIST ipt-netflow-2.1.tgz 87872 SHA256 
1cc1ee518ecd6c7d8d792ea79c0f69d03ce450c10fefd37f053c43aac92e9931 SHA512 
0055ebb1846077f94c1fbf701af8a07a432058c8e86e31c6f420d5c00c96b45012abdcdeef3c5b1ead7d20c7efd51ac65d000b6cb931d878f528f52de0ab9c21
 WHIRLPOOL 
e46ffe69f58293cca0fc26c2ff13ee30e68e2a60a4b198c89fdb24ebc45a4376877285358d4e72019c811d70d0a77194dbc0d46f44c8076923fc626cfe2e7488
 DIST ipt-netflow-2.1_p20160119.tgz 86892 SHA256 
9afb3f122f0f2b140d81b331d4500f8ad475898579fb5901ed1090d80783a4e5 SHA512 
7f30683240d7516df01a4b4a37ea738980def764741c658c86e9c28ca638592a40e0b2458164105d76f88c90f780f058f5c17a0c60ffaeb775d7cdb38dbb4fe1
 WHIRLPOOL 
fdb1a0bebeb8a2840005abd86cbd0fcbc241b4acaae2138d66d0a463807392a3076113b61d8d091ba0aa8f995ab9cc21a1f1f8e33bd9cd11bc1700b8392791d9
+DIST ipt-netflow-2.2.tgz 96697 SHA256 
81be0a334f74894756d022aee2c87b36c89a7aeca6ff1c91ef6b4f3458793198 SHA512 
a406ab9bd18616414d8c99f427382a075bdb8000d8c40959f5b6d6e577d7eb4dfc7f8b773664a516ec2228d15590f21c3fbd6aa3d4302f6cdf03810e1702af74
 WHIRLPOOL 
e9c5f13a3efa346b75ec47ceb033e83099744fa90d575d62135225a88f0093b1de556354d972772f13e7ea895659cd58e6e9a3c08817f62fd902336cc8771928

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.2.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.2.ebuild
new file mode 100644
index 000..c8c320f
--- /dev/null
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+MY_PN="${PN/_/-}"
+MY_P="${MY_PN}-${PV}"
+inherit linux-info linux-mod toolchain-funcs
+
+DESCRIPTION="Netflow iptables module"
+HOMEPAGE="http://sourceforge.net/projects/ipt-netflow;
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug snmp"
+
+RDEPEND="
+   net-firewall/iptables
+   snmp? ( net-analyzer/net-snmp )
+"
+DEPEND="${RDEPEND}
+   virtual/linux-sources
+   virtual/pkgconfig
+"
+
+# set S before MODULE_NAMES
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+   BUILD_TARGETS="all"
+   MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
+   IPT_LIB="/usr/$(get_libdir)/xtables"
+   local CONFIG_CHECK="~IP_NF_IPTABLES"
+   use debug && CONFIG_CHECK+=" ~DEBUG_FS"
+   linux-mod_pkg_setup
+}
+
+src_prepare() {
+   sed -i \
+   -e 's:make -C:$(MAKE) -C:g' \
+   -e 's:gcc -O2:$(CC) $(CFLAGS) $(LDFLAGS):' \
+   -e 's:gcc:$(CC) $(CFLAGS) $(LDFLAGS):' \
+   Makefile.in || die
+
+   # Checking for directory is enough
+   sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die
+
+   # bug #455984
+   eapply "${FILESDIR}/${PN}-2.0-configure.patch"
+
+   eapply_user
+}
+
+do_conf() {
+   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 \
+   --ipt-lib="${IPT_LIB}" \
+   --ipt-src="/usr/" \
+   --ipt-ver="${IPT_VERSION}" \
+   --kdir="${KV_DIR}" \
+   --kver="${KV_FULL}" \
+   $(use debug && echo '--enable-debugfs') \
+   $(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*
+}

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Sergey Popov]

commit: 284ad1e754a9886e48b77f65467f02047b6306a0
Author: Sergey Popov  gentoo  org>
AuthorDate: Wed Mar  2 07:55:15 2016 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Wed Mar  2 07:56:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=284ad1e7

net-firewall/ipt_netflow-2.1_p20160119: stable on amd64 and x86

Package-Manager: portage-2.2.26

 net-firewall/ipt_netflow/ipt_netflow-2.1_p20160119.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.1_p20160119.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.1_p20160119.ebuild
index 8e5bdb4..ecd1942 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.1_p20160119.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.1_p20160119.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="http://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${MY_P}.tgz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="debug snmp"
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/

[Sergey Popov]

commit: a03b2106df232156be639e91cac97cb6c2cf3605
Author: Sergey Popov  gentoo  org>
AuthorDate: Thu Jan 28 19:34:46 2016 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Thu Jan 28 19:40:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a03b2106

net-firewall/ipt_netflow: version bump

Package-Manager: portage-2.2.27

 net-firewall/ipt_netflow/Manifest  |  1 +
 .../ipt_netflow/ipt_netflow-2.1_p20160119.ebuild   | 88 ++
 2 files changed, 89 insertions(+)

diff --git a/net-firewall/ipt_netflow/Manifest 
b/net-firewall/ipt_netflow/Manifest
index c0b5d1d..c56278c 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1 +1,2 @@
 DIST ipt-netflow-2.1.tgz 87872 SHA256 
1cc1ee518ecd6c7d8d792ea79c0f69d03ce450c10fefd37f053c43aac92e9931 SHA512 
0055ebb1846077f94c1fbf701af8a07a432058c8e86e31c6f420d5c00c96b45012abdcdeef3c5b1ead7d20c7efd51ac65d000b6cb931d878f528f52de0ab9c21
 WHIRLPOOL 
e46ffe69f58293cca0fc26c2ff13ee30e68e2a60a4b198c89fdb24ebc45a4376877285358d4e72019c811d70d0a77194dbc0d46f44c8076923fc626cfe2e7488
+DIST ipt-netflow-2.1_p20160119.tgz 86892 SHA256 
9afb3f122f0f2b140d81b331d4500f8ad475898579fb5901ed1090d80783a4e5 SHA512 
7f30683240d7516df01a4b4a37ea738980def764741c658c86e9c28ca638592a40e0b2458164105d76f88c90f780f058f5c17a0c60ffaeb775d7cdb38dbb4fe1
 WHIRLPOOL 
fdb1a0bebeb8a2840005abd86cbd0fcbc241b4acaae2138d66d0a463807392a3076113b61d8d091ba0aa8f995ab9cc21a1f1f8e33bd9cd11bc1700b8392791d9

diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.1_p20160119.ebuild 
b/net-firewall/ipt_netflow/ipt_netflow-2.1_p20160119.ebuild
new file mode 100644
index 000..8e5bdb4
--- /dev/null
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.1_p20160119.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+MY_PN="${PN/_/-}"
+MY_P="${MY_PN}-${PV}"
+inherit linux-info linux-mod toolchain-funcs
+
+DESCRIPTION="Netflow iptables module"
+HOMEPAGE="http://sourceforge.net/projects/ipt-netflow;
+SRC_URI="http://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${MY_P}.tgz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug snmp"
+
+RDEPEND="
+   net-firewall/iptables
+   snmp? ( net-analyzer/net-snmp )
+"
+DEPEND="${RDEPEND}
+   virtual/linux-sources
+   virtual/pkgconfig
+"
+
+# set S before MODULE_NAMES
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+   BUILD_TARGETS="all"
+   MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
+   IPT_LIB="/usr/$(get_libdir)/xtables"
+   local CONFIG_CHECK="~IP_NF_IPTABLES"
+   use debug && CONFIG_CHECK+=" ~DEBUG_FS"
+   linux-mod_pkg_setup
+}
+
+src_prepare() {
+   sed -i \
+   -e 's:make -C:$(MAKE) -C:g' \
+   -e 's:gcc -O2:$(CC) $(CFLAGS) $(LDFLAGS):' \
+   -e 's:gcc:$(CC) $(CFLAGS) $(LDFLAGS):' \
+   Makefile.in || die
+
+   # Checking for directory is enough
+   sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die
+
+   # bug #455984
+   eapply "${FILESDIR}/${PN}-2.0-configure.patch"
+
+   eapply_user
+}
+
+do_conf() {
+   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 \
+   --ipt-lib="${IPT_LIB}" \
+   --ipt-src="/usr/" \
+   --ipt-ver="${IPT_VERSION}" \
+   --kdir="${KV_DIR}" \
+   --kver="${KV_FULL}" \
+   $(use debug && echo '--enable-debugfs') \
+   $(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*
+}