From 685fe876beebd47db619f57a66afc08a2585a9f0 Mon Sep 17 00:00:00 2001 From: DENG Qingfang Date: Sat, 14 Sep 2019 17:31:56 +0800 Subject: [PATCH] xtables-addons: update to 3.5 Add xt_PROTO target. Signed-off-by: DENG Qingfang --- net/xtables-addons/Makefile | 5 +++-- .../patches/002-restore-support-for-Linux-4.14.patch | 6 +++--- .../patches/003-restore-support-for-Linux-4.9.patch | 12 ++++++------ .../patches/100-add-rtsp-conntrack.patch | 4 ++-- .../patches/200-add-lua-packetscript.patch | 6 +++--- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/net/xtables-addons/Makefile b/net/xtables-addons/Makefile index 44ca19518..bc0fc0120 100644 --- a/net/xtables-addons/Makefile +++ b/net/xtables-addons/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=xtables-addons -PKG_VERSION:=3.3 +PKG_VERSION:=3.5 PKG_RELEASE:=1 -PKG_HASH:=efa62c7df6cd3b82d7195105bf6fe177b605f91f3522e4114d2f4e0ad54320d6 +PKG_HASH:=189ff57a0b8960969bd99141a6c79c345efa67e4461f450e2f162c9bd3d17da6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@SF/xtables-addons @@ -170,6 +170,7 @@ $(eval $(call BuildTemplate,length2,length2,xt_length2,xt_length2,+kmod-ipt-comp $(eval $(call BuildTemplate,logmark,LOGMARK,xt_LOGMARK,xt_LOGMARK,+kmod-ipt-compat-xtables)) $(eval $(call BuildTemplate,lscan,lscan,xt_lscan,xt_lscan,)) $(eval $(call BuildTemplate,lua,Lua PacketScript,xt_LUA,LUA/xt_LUA,+kmod-ipt-conntrack-extra)) +$(eval $(call BuildTemplate,proto,PROTO,xt_PROTO,xt_PROTO,)) $(eval $(call BuildTemplate,psd,psd,xt_psd,xt_psd,)) $(eval $(call BuildTemplate,quota2,quota2,xt_quota2,xt_quota2,)) $(eval $(call BuildTemplate,sysrq,SYSRQ,xt_SYSRQ,xt_SYSRQ,+kmod-ipt-compat-xtables +kmod-crypto-hash)) diff --git a/net/xtables-addons/patches/002-restore-support-for-Linux-4.14.patch b/net/xtables-addons/patches/002-restore-support-for-Linux-4.14.patch index f51c84e60..930687a5b 100644 --- a/net/xtables-addons/patches/002-restore-support-for-Linux-4.14.patch +++ b/net/xtables-addons/patches/002-restore-support-for-Linux-4.14.patch @@ -10,10 +10,10 @@ diff --git a/configure.ac b/configure.ac index 7631f6b..0d3aa72 100644 --- a/configure.ac +++ b/configure.ac -@@ -59,7 +59,7 @@ if test -n "$kbuilddir"; then - echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir"; - if test "$kmajor" -gt 5 -o "$kmajor" -eq 5 -a "$kminor" -gt 0; then +@@ -61,7 +61,7 @@ if test -n "$kbuilddir"; then echo "WARNING: That kernel version is not officially supported yet. Continue at own luck."; + elif test "$kmajor" -eq 5 -a "$kminor" -ge 0; then + : - elif test "$kmajor" -eq 4 -a "$kminor" -ge 18; then + elif test "$kmajor" -eq 4 -a "$kminor" -ge 14; then : diff --git a/net/xtables-addons/patches/003-restore-support-for-Linux-4.9.patch b/net/xtables-addons/patches/003-restore-support-for-Linux-4.9.patch index 9828f1aa7..3e7e34a52 100644 --- a/net/xtables-addons/patches/003-restore-support-for-Linux-4.9.patch +++ b/net/xtables-addons/patches/003-restore-support-for-Linux-4.9.patch @@ -23,10 +23,10 @@ diff --git a/configure.ac b/configure.ac index 0d3aa72..1cea354 100644 --- a/configure.ac +++ b/configure.ac -@@ -59,7 +59,7 @@ if test -n "$kbuilddir"; then - echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir"; - if test "$kmajor" -gt 5 -o "$kmajor" -eq 5 -a "$kminor" -gt 0; then +@@ -61,7 +61,7 @@ if test -n "$kbuilddir"; then echo "WARNING: That kernel version is not officially supported yet. Continue at own luck."; + elif test "$kmajor" -eq 5 -a "$kminor" -ge 0; then + : - elif test "$kmajor" -eq 4 -a "$kminor" -ge 14; then + elif test "$kmajor" -eq 4 -a "$kminor" -ge 9; then : @@ -141,7 +141,7 @@ diff --git a/extensions/xt_DELUDE.c b/extensions/xt_DELUDE.c index 618de5e..221f342 100644 --- a/extensions/xt_DELUDE.c +++ b/extensions/xt_DELUDE.c -@@ -146,7 +146,13 @@ delude_tg(struct sk_buff *skb, const struct xt_action_param *par) +@@ -151,7 +151,13 @@ delude_tg(struct sk_buff *skb, const struct xt_action_param *par) * a problem, as that is supported since Linux 2.6.35. But since we do not * actually want to have a connection open, we are still going to drop it. */ @@ -243,7 +243,7 @@ diff --git a/extensions/xt_TARPIT.c b/extensions/xt_TARPIT.c index cb98e9e..b78683c 100644 --- a/extensions/xt_TARPIT.c +++ b/extensions/xt_TARPIT.c -@@ -431,7 +431,12 @@ tarpit_tg4(struct sk_buff *skb, const struct xt_action_param *par) +@@ -436,7 +436,12 @@ tarpit_tg4(struct sk_buff *skb, const struct xt_action_param *par) /* We are not interested in fragments */ if (iph->frag_off & htons(IP_OFFSET)) return NF_DROP; @@ -256,7 +256,7 @@ index cb98e9e..b78683c 100644 return NF_DROP; } -@@ -472,7 +477,12 @@ tarpit_tg6(struct sk_buff *skb, const struct xt_action_param *par) +@@ -477,7 +482,12 @@ tarpit_tg6(struct sk_buff *skb, const struct xt_action_param *par) pr_debug("addr is not unicast.\n"); return NF_DROP; } diff --git a/net/xtables-addons/patches/100-add-rtsp-conntrack.patch b/net/xtables-addons/patches/100-add-rtsp-conntrack.patch index 4666ea79b..c78b03e13 100644 --- a/net/xtables-addons/patches/100-add-rtsp-conntrack.patch +++ b/net/xtables-addons/patches/100-add-rtsp-conntrack.patch @@ -1715,7 +1715,7 @@ +module_exit(fini); --- a/extensions/Kbuild +++ b/extensions/Kbuild -@@ -26,6 +26,7 @@ obj-${build_lscan} += xt_lscan.o +@@ -27,6 +27,7 @@ obj-${build_lscan} += xt_lscan.o obj-${build_pknock} += pknock/ obj-${build_psd} += xt_psd.o obj-${build_quota2} += xt_quota2.o @@ -1725,7 +1725,7 @@ -include ${M}/Kbuild.* --- a/mconfig +++ b/mconfig -@@ -22,3 +22,4 @@ build_lscan=m +@@ -23,3 +23,4 @@ build_lscan=m build_pknock=m build_psd=m build_quota2=m diff --git a/net/xtables-addons/patches/200-add-lua-packetscript.patch b/net/xtables-addons/patches/200-add-lua-packetscript.patch index 33d0d7481..8dd926712 100644 --- a/net/xtables-addons/patches/200-add-lua-packetscript.patch +++ b/net/xtables-addons/patches/200-add-lua-packetscript.patch @@ -18134,7 +18134,7 @@ + --- a/extensions/Kbuild +++ b/extensions/Kbuild -@@ -27,6 +27,7 @@ obj-${build_pknock} += pknock/ +@@ -28,6 +28,7 @@ obj-${build_pknock} += pknock/ obj-${build_psd} += xt_psd.o obj-${build_quota2} += xt_quota2.o obj-${build_rtsp} += rtsp/ @@ -18144,14 +18144,14 @@ -include ${M}/Kbuild.* --- a/extensions/Mbuild +++ b/extensions/Mbuild -@@ -22,3 +22,4 @@ obj-${build_pknock} += pknock/ +@@ -23,3 +23,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 -@@ -23,3 +23,4 @@ build_pknock=m +@@ -24,3 +24,4 @@ build_pknock=m build_psd=m build_quota2=m build_rtsp=m