From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 15 Nov 2015 21:33:07 +0000 (+0000)
Subject: xtables-addons: update to 2.9
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=124b8c653f96fd6fa81e5d7ce6100daf4c4c6453;p=openwrt%2Fstaging%2Fblocktrron.git

xtables-addons: update to 2.9

Fixes compilation with Linux 4.3. Runtime tested on Ubiquiti EdgeRouter
Lite with Linux 3.18, 4.1 and 4.3.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>

SVN-Revision: 47470
---

diff --git a/package/network/utils/xtables-addons/Makefile b/package/network/utils/xtables-addons/Makefile
index ff6466fe9f..5cfe7b5e2d 100644
--- a/package/network/utils/xtables-addons/Makefile
+++ b/package/network/utils/xtables-addons/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=xtables-addons
-PKG_VERSION:=2.7
+PKG_VERSION:=2.9
 PKG_RELEASE:=1
-PKG_MD5SUM:=81bd7ba82e5f7bfd1458fc97ddf72e1d
+PKG_MD5SUM:=87df49f3804036eccd4619f566d26bb3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@SF/xtables-addons
diff --git a/package/network/utils/xtables-addons/patches/100-add-rtsp-conntrack.patch b/package/network/utils/xtables-addons/patches/100-add-rtsp-conntrack.patch
index 6c169ee82c..bd49d92de6 100644
--- a/package/network/utils/xtables-addons/patches/100-add-rtsp-conntrack.patch
+++ b/package/network/utils/xtables-addons/patches/100-add-rtsp-conntrack.patch
@@ -1509,7 +1509,7 @@
 +module_exit(fini);
 --- a/extensions/Kbuild
 +++ b/extensions/Kbuild
-@@ -28,6 +28,7 @@ obj-${build_lscan}       += xt_lscan.o
+@@ -26,6 +26,7 @@ obj-${build_lscan}       += xt_lscan.o
  obj-${build_pknock}      += pknock/
  obj-${build_psd}         += xt_psd.o
  obj-${build_quota2}      += xt_quota2.o
diff --git a/package/network/utils/xtables-addons/patches/200-add-lua-packetscript.patch b/package/network/utils/xtables-addons/patches/200-add-lua-packetscript.patch
index 8bc30a7ae0..33d0d74814 100644
--- a/package/network/utils/xtables-addons/patches/200-add-lua-packetscript.patch
+++ b/package/network/utils/xtables-addons/patches/200-add-lua-packetscript.patch
@@ -18134,7 +18134,7 @@
 +
 --- a/extensions/Kbuild
 +++ b/extensions/Kbuild
-@@ -29,6 +29,7 @@ obj-${build_pknock}      += pknock/
+@@ -27,6 +27,7 @@ obj-${build_pknock}      += pknock/
  obj-${build_psd}         += xt_psd.o
  obj-${build_quota2}      += xt_quota2.o
  obj-${build_rtsp}        += rtsp/
diff --git a/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch b/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch
index 966d29dfab..06a4a1739a 100644
--- a/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch
+++ b/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch
@@ -78,7 +78,7 @@
  #define UCHAR_MAX	255
  #define SHRT_MAX        32767
  #define BUFSIZ 		8192
-@@ -637,6 +641,8 @@ union luai_Cast { double l_d; long l_l; 
+@@ -637,6 +641,8 @@ union luai_Cast { double l_d; long l_l;
  */
  #if defined(__KERNEL__)
  #undef LUA_USE_ULONGJMP