From 78f5284510248f05b18605bcb7a9650123ba405c Mon Sep 17 00:00:00 2001
From: suyuan168 <175338101@qq.com>
Date: Tue, 12 Apr 2022 21:48:57 +0800
Subject: [PATCH] Revert "update xtable"

This reverts commit 672162e5cebb6dc4de7506f08d07a0fbf4a4f0b1.
---
 xtables-addons/Makefile                              |  8 ++++----
 .../patches/001-fix-kernel-version-detection.patch   |  4 ++--
 xtables-addons/patches/100-add-rtsp-conntrack.patch  |  0
 .../patches/200-add-lua-packetscript.patch           | 12 ++++++------
 .../patches/201-fix-lua-packetscript.patch           |  0
 xtables-addons/patches/210-freebsd-build-fix.patch   |  0
 6 files changed, 12 insertions(+), 12 deletions(-)
 mode change 100644 => 100755 xtables-addons/Makefile
 mode change 100644 => 100755 xtables-addons/patches/001-fix-kernel-version-detection.patch
 mode change 100644 => 100755 xtables-addons/patches/100-add-rtsp-conntrack.patch
 mode change 100644 => 100755 xtables-addons/patches/200-add-lua-packetscript.patch
 mode change 100644 => 100755 xtables-addons/patches/201-fix-lua-packetscript.patch
 mode change 100644 => 100755 xtables-addons/patches/210-freebsd-build-fix.patch

diff --git a/xtables-addons/Makefile b/xtables-addons/Makefile
old mode 100644
new mode 100755
index 789082703..fa7587589
--- a/xtables-addons/Makefile
+++ b/xtables-addons/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=xtables-addons
-PKG_VERSION:=3.19
-PKG_RELEASE:=$(AUTORELEASE)
-PKG_HASH:=5e36ea027ab15a84d9af1f3f8e84a78b80a617093657f08089bd44657722f661
+PKG_VERSION:=3.18
+PKG_RELEASE:=4
+PKG_HASH:=a77914a483ff381663f52120577e5e9355ca07cca73958b038e09d91247458d5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://inai.de/files/xtables-addons/
@@ -162,7 +162,7 @@ define Package/iptgeoip/install
 		$(1)/usr/lib/xtables-addons/
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/bin/xt_geoip_query \
+		$(PKG_INSTALL_DIR)/usr/bin/xt_geoip_fetch \
 		$(1)/usr/bin/
 	$(INSTALL_DIR) $(1)/usr/share/xt_geoip
 	touch $(1)/usr/share/xt_geoip/.keep
diff --git a/xtables-addons/patches/001-fix-kernel-version-detection.patch b/xtables-addons/patches/001-fix-kernel-version-detection.patch
old mode 100644
new mode 100755
index 624fa4d9b..775ccf657
--- a/xtables-addons/patches/001-fix-kernel-version-detection.patch
+++ b/xtables-addons/patches/001-fix-kernel-version-detection.patch
@@ -1,8 +1,8 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -42,7 +42,7 @@ regular_CFLAGS="-Wall -Waggregate-return
+@@ -44,7 +44,7 @@ regular_CFLAGS="-Wall -Waggregate-return
  
- AS_IF([test -n "$kbuilddir"], [
+ if test -n "$kbuilddir"; then
  	AC_MSG_CHECKING([kernel version that we will build against])
 -	krel="$(make -sC "$kbuilddir" M=$PWD kernelrelease | $AWK -v 'FS=[[^0-9.]]' '{print $1; exit}')"
 +	krel="$(make -sC "$kbuilddir" M=$PWD kernelversion | $AWK -v 'FS=[[^0-9.]]' '{print $1; exit}')"
diff --git a/xtables-addons/patches/100-add-rtsp-conntrack.patch b/xtables-addons/patches/100-add-rtsp-conntrack.patch
old mode 100644
new mode 100755
diff --git a/xtables-addons/patches/200-add-lua-packetscript.patch b/xtables-addons/patches/200-add-lua-packetscript.patch
old mode 100644
new mode 100755
index c815e1a6a..8dd926712
--- a/xtables-addons/patches/200-add-lua-packetscript.patch
+++ b/xtables-addons/patches/200-add-lua-packetscript.patch
@@ -1137,7 +1137,7 @@
 +	struct xt_lua_tginfo *info = (void *)target->data;
 +
 +	info->state_id = 0;
-+	strcpy(info->function, "process_packet\0");
++	strncpy(info->function, "process_packet\0", sizeof("process_packet\0"));
 +}
 +
 +static int
@@ -5301,7 +5301,7 @@
 +      case OP_FORLOOP:
 +      case OP_FORPREP:
 +        checkreg(pt, a+3);
-+        fallthrough;
++        /* go through */
 +      case OP_JMP: {
 +        int dest = pc+1+b;
 +        /* not full check and jump is forward and do not skip `lastpc'? */
@@ -7716,7 +7716,6 @@
 +        }
 +        else if (sep == -1) return '[';
 +        else luaX_lexerror(ls, "invalid long string delimiter", TK_STRING);
-+        fallthrough;
 +      }
 +      case '=': {
 +        next(ls);
@@ -7810,6 +7809,7 @@
 +  lua_assert(ls->lookahead.token == TK_EOS);
 +  ls->lookahead.token = llex(ls, &ls->lookahead.seminfo);
 +}
++
 --- /dev/null
 +++ b/extensions/LUA/lua/llex.h
 @@ -0,0 +1,81 @@
@@ -12471,7 +12471,7 @@
 +      lua_number2int(k, n);
 +      if (luai_numeq(cast_num(k), nvalue(key))) /* index is int? */
 +        return luaH_getnum(t, k);  /* use specialized version */
-+      fallthrough;
++      /* else go through */
 +    }
 +    default: {
 +      Node *n = mainposition(t, key);
@@ -12766,7 +12766,7 @@
 +  if (!lua_isstring(L, -1))
 +    luaL_error(L, "invalid value (%s) at index %d in table for "
 +                  LUA_QL("concat"), luaL_typename(L, -1), i);
-+  luaL_addvalue(b);
++    luaL_addvalue(b);
 +}
 +
 +
@@ -17984,7 +17984,7 @@
 +	int32_t ret;
 +	struct lua_env * env = kmalloc(sizeof(struct lua_env), GFP_KERNEL);
 +
-+	if (!script_size) {
++	if (!script_size > 0) {
 +		pr_debug("LUA [%d]: script_size %lu < 0\n", state_id, script_size);
 +		return false;
 +	}
diff --git a/xtables-addons/patches/201-fix-lua-packetscript.patch b/xtables-addons/patches/201-fix-lua-packetscript.patch
old mode 100644
new mode 100755
diff --git a/xtables-addons/patches/210-freebsd-build-fix.patch b/xtables-addons/patches/210-freebsd-build-fix.patch
old mode 100644
new mode 100755