also update the use of nf_conntrack_helper in OpenWrt-added rtsp-conntrack and add a compatibility patch to distinguish between pre-3.6.0 and post-3.6.0 kernels.
Signed-off-by: Daniel Golle <dgo...@allnet.de>
delete mode 100644 net/xtables-addons/patches/003-redundant-bracket.patch
create mode 100644
net/xtables-addons/patches/101-rtsp-conntrack-compatibility.patch
diff --git a/net/xtables-addons/Makefile b/net/xtables-addons/Makefile
index 4d3af54..73570cd 100644
--- a/net/xtables-addons/Makefile
+++ b/net/xtables-addons/Makefile
@@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=xtables-addons
-PKG_VERSION:=1.45
+PKG_VERSION:=2.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_MD5SUM:=802d2f556a5e545f44e4b69937bf8490
+PKG_MD5SUM:=26b1b1dbb4a8faff24597723ebde04c9
PKG_SOURCE_URL:=@SF/xtables-addons
PKG_BUILD_DEPENDS:=iptables
PKG_INSTALL:=1
diff --git a/net/xtables-addons/patches/002-fix-kernel-version-detection.patch
b/net/xtables-addons/patches/002-fix-kernel-version-detection.patch
index 87385fd..8dc6384 100644
--- a/net/xtables-addons/patches/002-fix-kernel-version-detection.patch
+++ b/net/xtables-addons/patches/002-fix-kernel-version-detection.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -11617,7 +11617,7 @@ regular_CFLAGS="-Wall -Waggregate-return
+@@ -11892,7 +11892,7 @@ regular_CFLAGS="-Wall -Waggregate-return
if test -n "$kbuilddir"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel version that
we will build against" >&5
$as_echo_n "checking kernel version that we will build against... " >&6; }
@@ -11,7 +11,7 @@
krel="${krel:${#kmajor}}";
--- a/configure.ac
+++ b/configure.ac
-@@ -43,7 +43,7 @@ regular_CFLAGS="-Wall -Waggregate-return
+@@ -44,7 +44,7 @@ regular_CFLAGS="-Wall -Waggregate-return
if test -n "$kbuilddir"; then
AC_MSG_CHECKING([kernel version that we will build against])
diff --git a/net/xtables-addons/patches/003-redundant-bracket.patch
b/net/xtables-addons/patches/003-redundant-bracket.patch
deleted file mode 100644
index d35c430..0000000
--- a/net/xtables-addons/patches/003-redundant-bracket.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -30,7 +30,7 @@ xtlibdir="$(pkg-config --variable=xtlibd
-
- AC_ARG_WITH([xtlibdir],
- AS_HELP_STRING([--with-xtlibdir=PATH],
-- [Path where to install Xtables extensions [[autodetect]]]]),
-+ [Path where to install Xtables extensions [[autodetect]]]),
- [xtlibdir="$withval"])
- AC_MSG_CHECKING([Xtables module directory])
- AC_MSG_RESULT([$xtlibdir])
diff --git a/net/xtables-addons/patches/100-add-rtsp-conntrack.patch
b/net/xtables-addons/patches/100-add-rtsp-conntrack.patch
index 1e155ce..299a394 100644
--- a/net/xtables-addons/patches/100-add-rtsp-conntrack.patch
+++ b/net/xtables-addons/patches/100-add-rtsp-conntrack.patch
@@ -734,7 +734,7 @@
+ } else {
+ sprintf(tmpname, "rtsp-%d", i);
+ }
-+ hlpr->name = tmpname;
++ strncpy(hlpr->name, tmpname, sizeof(hlpr->name));
+
+ pr_debug("port #%d: %d\n", i, ports[i]);
+
@@ -1327,7 +1327,7 @@
-include ${M}/Kbuild.*
--- a/mconfig
+++ b/mconfig
-@@ -26,3 +26,4 @@ build_lscan=m
+@@ -24,3 +24,4 @@ build_lscan=m
build_pknock=m
build_psd=m
build_quota2=m
diff --git a/net/xtables-addons/patches/101-rtsp-conntrack-compatibility.patch
b/net/xtables-addons/patches/101-rtsp-conntrack-compatibility.patch
new file mode 100644
index 0000000..40fadea
--- /dev/null
+++ b/net/xtables-addons/patches/101-rtsp-conntrack-compatibility.patch
@@ -0,0 +1,14 @@
+--- a/extensions/rtsp/nf_conntrack_rtsp.c
++++ b/extensions/rtsp/nf_conntrack_rtsp.c
+@@ -496,7 +496,11 @@ init(void)
+ } else {
+ sprintf(tmpname, "rtsp-%d", i);
+ }
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
+ strncpy(hlpr->name, tmpname, sizeof(hlpr->name));
++#else
++ hlpr->name = tmpname;
++#endif
+
+ pr_debug("port #%d: %d\n", i, ports[i]);
+
diff --git a/net/xtables-addons/patches/200-add-lua-packetscript.patch
b/net/xtables-addons/patches/200-add-lua-packetscript.patch
index 03fe5fa..c2731b7 100644
--- a/net/xtables-addons/patches/200-add-lua-packetscript.patch
+++ b/net/xtables-addons/patches/200-add-lua-packetscript.patch
@@ -18216,14 +18216,14 @@
-include ${M}/Kbuild.*
--- a/extensions/Mbuild
+++ b/extensions/Mbuild
-@@ -26,3 +26,4 @@ obj-${build_pknock} += pknock/
+@@ -24,3 +24,4 @@ obj-${build_pknock} += pknock/
obj-${build_psd} += libxt_psd.so
obj-${build_quota2} += libxt_quota2.so
obj-${build_gradm} += libxt_gradm.so
+obj-${build_LUA} += LUA/
--- a/mconfig
+++ b/mconfig
-@@ -27,3 +27,4 @@ build_pknock=m
+@@ -25,3 +25,4 @@ build_pknock=m
build_psd=m
build_quota2=m
build_rtsp=m
--
1.8.0
pgpZNcwqAqAGD.pgp
Description: PGP signature
_______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
