testing/ipt-netflow: upgrade to 2.0

2 files changed, 56 insertions, 47 deletions

diff --git a/testing/ipt-netflow/APKBUILD b/testing/ipt-netflow/APKBUILD
index 2adb8e03ae..c6eecb08e2 100644
--- a/testing/ipt-netflow/APKBUILD
+++ b/testing/ipt-netflow/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Rush Future <rush.zlo@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ipt-netflow
-pkgver=1.8_git20140103
+pkgver=2.0
 _ver=${pkgver%_git*}
 pkgrel=0
 pkgdesc="Kernel netflow sensor"
@@ -10,7 +10,6 @@ arch="all"
 license="GPL3+"
 makedepends="iptables-dev bash"
 source="$pkgname-$_ver.tar.gz::https://github.com/aabc/ipt-netflow/archive/v$_ver.tar.gz
-	git.patch
 	kernel-vs-userspace.patch
 	"
 
@@ -38,12 +37,9 @@ package() {
 	make linstall DESTDIR=$pkgdir || return 1
 }
 
-md5sums="922a7d9dd17f28a2c3551a1c5e9849eb  ipt-netflow-1.8.tar.gz
-77875a5979589bca8c49a8331e7cc22b  git.patch
-59adcee5cd4cec4e09f432f567ff8243  kernel-vs-userspace.patch"
-sha256sums="eefe766eda6d4d918e4cc919b5d5acd2b681a258246017ab7948b80f0cb95112  ipt-netflow-1.8.tar.gz
-75ea3afe9532699d4fd1bef7f198dfaa97b3a310234a86b48371522ae0704a60  git.patch
-a897d88212b56c3d06645f8fc9fe7ce5b7accfa1d45b96917b3ba747605a82bc  kernel-vs-userspace.patch"
-sha512sums="c413515deeac1d604e36a53b39edcf340d6c3f78c29e53979fede8aa013e324ada4622b571ac5270f7495ab6982096cd2bd9e9283c9cc2cc7360aa5c3954792d  ipt-netflow-1.8.tar.gz
-3fade2ceb00ddae15dd6b1eacebc36480efe0c5c2d050e050e0aef37382ad72ca454f4d23080b7263ab2f078f72db4572e2514d3faca113d8e437437f7c3afcf  git.patch
-dfc37ccc010559994a94290aee99dbc75c47732cbc06492366bff081bafced7bccc5144b5119dc8f0ad8dea1392684ef7f592d15131da2fa1227516dc7d8d3ce  kernel-vs-userspace.patch"
+md5sums="d1b40ee12b563edc4faae5e3234c3436  ipt-netflow-2.0.tar.gz
+1056dd9b4d28b306f45028d2960469eb  kernel-vs-userspace.patch"
+sha256sums="547ca6c2e8d82fc7d3d113d2ab3f602106d1efa7739167f8c7850a43e5bbe46e  ipt-netflow-2.0.tar.gz
+9f376ee65e14a3dd5d59547d2f6480061217bf05d4effa4ce34f4d4496c75619  kernel-vs-userspace.patch"
+sha512sums="7bf330ac665180218ea4cc42fe6ac6d365b45632039ff9601559f7a4675738c409853433b15dd431dba68cfe36269d6992754154411e2761041fec021e19bf8d  ipt-netflow-2.0.tar.gz
+eb5c5bcbacfa87ba61753a8d6bd092a296d948fc91d34825f6f461b39f180b7a06a7ee7cef061c947822c170743db05389dace9bed13f3f93da0593cc1187307  kernel-vs-userspace.patch"
diff --git a/testing/ipt-netflow/kernel-vs-userspace.patch b/testing/ipt-netflow/kernel-vs-userspace.patch
index 8f9857fa8b..ce551e5bd3 100644
--- a/testing/ipt-netflow/kernel-vs-userspace.patch
+++ b/testing/ipt-netflow/kernel-vs-userspace.patch
@@ -1,18 +1,31 @@
-diff --git a/configure b/configure
-index 3f10e2a..b43f024 100755
---- a/configure
-+++ b/configure
-@@ -256,6 +256,8 @@ do
-     --ipt-inc=*) IPTINC="$ac_optarg" ;;
-     --kver=*)  KVERSION="$ac_optarg" ;;
-     --kdir=*)      KDIR="$ac_optarg" ;;
-+    --disable-kernel) NOKERNEL=1;;
-+    --disable-ipt) NOIPT=1;;
+--- ipt-netflow-2.0.orig/configure
++++ ipt-netflow-2.0/configure
+@@ -258,9 +258,13 @@
+   echo "  --enable-vlan          enables VLAN Ids for v9/IPFIX"
+   echo "  --enable-direction     enables flowDirection(61) Element"
+   echo "  --disable-aggregation  disables aggregation rules"
++  echo "  --disable-kernel       disable kernel module"
++  echo "  --disable-ipt          disable ipt"
+   exit 0
+ }
+ 
++BUILD_MODULE=true
++BUILD_IPT=true
+ CARGS="$@"
+ for ac_option
+ do
+@@ -284,7 +288,8 @@
+     --enable-mac*)   KOPTS="$KOPTS -DENABLE_MAC" ;;
+     --enable-vlan*)  KOPTS="$KOPTS -DENABLE_VLAN" ;;
+     --enable-direc*) KOPTS="$KOPTS -DENABLE_DIRECTION" ;;
+-    --disable-aggr*) KOPTS="$KOPTS -DDISABLE_AGGR" ;;
++    --disable-kernel) BUILD_MODULE=false ;;
++    --disable-ipt) BUILD_IPT=false ;;
      --make) echo called from make ;;
-     --help) show_help ;;
-     -*) echo Invalid option: $ac_option; exit 1 ;;
-@@ -353,22 +355,26 @@ kernel_check_config() {
-   kconfig CONFIG_IP6_NF_IPTABLES	"ip6tables target"
+     -Werror) KOPTS="$KOPTS -Werror" ;;
+     --help|-h) show_help ;;
+@@ -407,23 +412,27 @@
+   kernel_check_include include/linux/llist.h -DHAVE_LLIST
  }
  
 -kernel_find_version	#KVERSION
@@ -22,35 +35,35 @@ index 3f10e2a..b43f024 100755
 -echo "Kernel sources: $KDIR ($KSHOW)"
 -kernel_check_consistency
 -kernel_check_config
--
+-kernel_check_features
++if $BUILD_MODULE; then
++  kernel_find_version	#KVERSION
++  test "$KLIBMOD" || KLIBMOD=$KVERSION
++  echo "Kernel version: $KVERSION ($KHOW)"
++  kernel_find_source	#KDIR
++  echo "Kernel sources: $KDIR ($KSHOW)"
++  kernel_check_consistency
++  kernel_check_config
++  kernel_check_features
++fi
+ 
 -test "$IPTBIN" || IPTBIN=`which iptables`
--
++if $BUILD_IPT; then
++  test "$IPTBIN" || IPTBIN=`which iptables`
+ 
 -iptables_find_version	#IPTVER
 -iptables_try_pkgconfig	#try to configure from pkg-config
 -iptables_find_src	#IPTSRC
 -iptables_src_version	#check that IPTSRC match to IPTVER
 -iptables_inc		#IPTINC
 -iptables_modules	#IPTLIB
-+if ! test "$NOKERNEL"; then
-+	kernel_find_version	#KVERSION
-+	test "$KLIBMOD" || KLIBMOD=$KVERSION
-+	echo "Kernel version: $KVERSION ($KHOW)"
-+	kernel_find_source	#KDIR
-+	echo "Kernel sources: $KDIR ($KSHOW)"
-+	kernel_check_consistency
-+	kernel_check_config
-+fi
-+
-+if ! test "$NOIPT"; then
-+	test "$IPTBIN" || IPTBIN=`which iptables`
-+
-+	iptables_find_version	#IPTVER
-+	iptables_try_pkgconfig	#try to configure from pkg-config
-+	iptables_find_src	#IPTSRC
-+	iptables_src_version	#check that IPTSRC match to IPTVER
-+	iptables_inc		#IPTINC
-+	iptables_modules	#IPTLIB
++  iptables_find_version	#IPTVER
++  iptables_try_pkgconfig	#try to configure from pkg-config
++  iptables_find_src	#IPTSRC
++  iptables_src_version	#check that IPTSRC match to IPTVER
++  iptables_inc		#IPTINC
++  iptables_modules	#IPTLIB
 +fi
  
  REPLACE="\
- s!@KVERSION@!$KVERSION!;\
+ s!@CARGS@!$CARGS!;\