From 2c54b7637ea5035995e1e4caabd2105b395492ba Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Thu, 11 May 2023 15:42:33 +0800 Subject: [PATCH 1/6] python-incremental: Add missing host build dependencies Fixes: 8d81b6732757 ("python-incremental: Update to 22.10.0, redo patch, add host build") Signed-off-by: Jeffery To --- lang/python/python-incremental/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lang/python/python-incremental/Makefile b/lang/python/python-incremental/Makefile index 31d88c9df..0cfbe6b29 100644 --- a/lang/python/python-incremental/Makefile +++ b/lang/python/python-incremental/Makefile @@ -18,6 +18,8 @@ PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=Jeffery To +HOST_BUILD_DEPENDS:=python3/host python-build/host python-installer/host python-wheel/host + include ../pypi.mk include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk From a2a61f1d52d2ed6bc131811551ba20694ffc00f2 Mon Sep 17 00:00:00 2001 From: Georgi Valkov Date: Sun, 14 May 2023 03:18:11 +0300 Subject: [PATCH 2/6] xtables-addons: fix build warnings treated as errors since b2d1eb7 Use kcalloc and remove conflicting #include to fix the following build warnings treated as errors since b2d1eb7: error: ISO C90 forbids variable length array 'buf' [-Werror=vla] error: "va_start" redefined [-Werror] error: "va_arg" redefined [-Werror] error: "va_copy" redefined [-Werror] getstr(s)==NULL is always false /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/byte_array.c: In function 'byte_array_to_string': /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/byte_array.c:110:9: error: ISO C90 forbids variable length array 'buf' [-Werror=vla] 110 | uint8_t buf[(array->length * 3) + 255]; | ^~~~~~~ /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/byte_array.c:112:9: error: ISO C90 forbids variable length array 'res' [-Werror=vla] 112 | char res[255 + (array->length * 3)]; /* make sure the buffer is big enough*/ | ^~~~ cc1: all warnings being treated as errors In file included from ./include/linux/string.h:9, from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/include/string.h:1, from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/ldebug.c:10: ./include/linux/stdarg.h:6: error: "va_start" redefined [-Werror] 6 | #define va_start(v, l) __builtin_va_start(v, l) | CC [M] /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lstrlib.o In file included from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/ldebug.c:8: /home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:47: note: this is the location of the previous definition 47 | #define va_start(v,l) __builtin_va_start(v,l) | ./include/linux/stdarg.h:8: error: "va_arg" redefined [-Werror] 8 | #define va_arg(v, T) __builtin_va_arg(v, T) | /home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:49: note: this is the location of the previous definition 49 | #define va_arg(v,l) __builtin_va_arg(v,l) | ./include/linux/stdarg.h:9: error: "va_copy" redefined [-Werror] 9 | #define va_copy(d, s) __builtin_va_copy(d, s) | /home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:52: note: this is the location of the previous definition 52 | #define va_copy(d,s) __builtin_va_copy(d,s) | CC [M] /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/ltable.o In file included from ./include/linux/kernel.h:5, from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/luaconf.h:16, from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lua.h:15, from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/ldump.c:12: ./include/linux/stdarg.h:6: error: "va_start" redefined [-Werror] 6 | #define va_start(v, l) __builtin_va_start(v, l) | In file included from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lua.h:12: /home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:47: note: this is the location of the previous definition 47 | #define va_start(v,l) __builtin_va_start(v,l) | ./include/linux/stdarg.h:8: error: "va_arg" redefined [-Werror] 8 | #define va_arg(v, T) __builtin_va_arg(v, T) | /home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:49: note: this is the location of the previous definition 49 | #define va_arg(v,l) __builtin_va_arg(v,l) | ./include/linux/stdarg.h:9: error: "va_copy" redefined [-Werror] 9 | #define va_copy(d, s) __builtin_va_copy(d, s) | /home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:52: note: this is the location of the previous definition 52 | #define va_copy(d,s) __builtin_va_copy(d,s) | In file included from ./include/linux/kernel.h:5, from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/luaconf.h:16, from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lua.h:15, from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lfunc.c:13: ./include/linux/stdarg.h:6: error: "va_start" redefined [-Werror] 6 | #define va_start(v, l) __builtin_va_start(v, l) | In file included from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lua.h:12: /home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:47: note: this is the location of the previous definition 47 | #define va_start(v,l) __builtin_va_start(v,l) | ./include/linux/stdarg.h:8: error: "va_arg" redefined [-Werror] 8 | #define va_arg(v, T) __builtin_va_arg(v, T) | /home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:49: note: this is the location of the previous definition 49 | #define va_arg(v,l) __builtin_va_arg(v,l) | ./include/linux/stdarg.h:9: error: "va_copy" redefined [-Werror] 9 | #define va_copy(d, s) __builtin_va_copy(d, s) | /home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:52: note: this is the location of the previous definition 52 | #define va_copy(d,s) __builtin_va_copy(d,s) | In file included from ./include/linux/kernel.h:5, from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/luaconf.h:16, from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lua.h:15, from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lmem.c:13: ./include/linux/stdarg.h:6: error: "va_start" redefined [-Werror] 6 | #define va_start(v, l) __builtin_va_start(v, l) | In file included from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lua.h:12: /home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:47: note: this is the location of the previous definition 47 | #define va_start(v,l) __builtin_va_start(v,l) | ./include/linux/stdarg.h:8: error: "va_arg" redefined [-Werror] 8 | #define va_arg(v, T) __builtin_va_arg(v, T) | /home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:49: note: this is the location of the previous definition 49 | #define va_arg(v,l) __builtin_va_arg(v,l) | ./include/linux/stdarg.h:9: error: "va_copy" redefined [-Werror] 9 | #define va_copy(d, s) __builtin_va_copy(d, s) | /home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:52: note: this is the location of the previous definition 52 | #define va_copy(d,s) __builtin_va_copy(d,s) | In file included from ./include/linux/kernel.h:5, from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/include/stdio.h:1, from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lobject.c:10: ./include/linux/stdarg.h:6: error: "va_start" redefined [-Werror] 6 | #define va_start(v, l) __builtin_va_start(v, l) | In file included from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lobject.c:7: /home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:47: note: this is the location of the previous definition 47 | #define va_start(v,l) __builtin_va_start(v,l) | ./include/linux/stdarg.h:8: error: "va_arg" redefined [-Werror] 8 | #define va_arg(v, T) __builtin_va_arg(v, T) | /home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:49: note: this is the location of the previous definition 49 | #define va_arg(v,l) __builtin_va_arg(v,l) | ./include/linux/stdarg.h:9: error: "va_copy" redefined [-Werror] 9 | #define va_copy(d, s) __builtin_va_copy(d, s) | /home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:52: note: this is the location of the previous definition 52 | #define va_copy(d,s) __builtin_va_copy(d,s) | In file included from ./include/linux/kernel.h:5, from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/luaconf.h:16, from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lua.h:15, from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/llimits.h:12, from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lopcodes.h:10, from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lopcodes.c:11: ./include/linux/stdarg.h:6: error: "va_start" redefined [-Werror] 6 | #define va_start(v, l) __builtin_va_start(v, l) | In file included from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lua.h:12: /home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:47: note: this is the location of the previous definition 47 | #define va_start(v,l) __builtin_va_start(v,l) | ./include/linux/stdarg.h:8: error: "va_arg" redefined [-Werror] 8 | #define va_arg(v, T) __builtin_va_arg(v, T) | /home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:49: note: this is the location of the previous definition 49 | #define va_arg(v,l) __builtin_va_arg(v,l) | ./include/linux/stdarg.h:9: error: "va_copy" redefined [-Werror] 9 | #define va_copy(d, s) __builtin_va_copy(d, s) | /home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:52: note: this is the location of the previous definition 52 | #define va_copy(d,s) __builtin_va_copy(d,s) | In file included from ./include/linux/kernel.h:5, from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/luaconf.h:16, from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lua.h:15, from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lstate.c:13: ./include/linux/stdarg.h:6: error: "va_start" redefined [-Werror] 6 | #define va_start(v, l) __builtin_va_start(v, l) | In file included from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/lua.h:12: /home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:47: note: this is the location of the previous definition 47 | #define va_start(v,l) __builtin_va_start(v,l) | ./include/linux/stdarg.h:8: error: "va_arg" redefined [-Werror] 8 | #define va_arg(v, T) __builtin_va_arg(v, T) | /home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:49: note: this is the location of the previous definition 49 | #define va_arg(v,l) __builtin_va_arg(v,l) | ./include/linux/stdarg.h:9: error: "va_copy" redefined [-Werror] 9 | #define va_copy(d, s) __builtin_va_copy(d, s) | /home/ansuel/openwrt-ansuel/openwrt/staging_dir/toolchain-aarch64_cortex-a53_gcc-12.2.0_musl/lib/gcc/aarch64-openwrt-linux-musl/12.2.0/include/stdarg.h:52: note: this is the location of the previous definition 52 | #define va_copy(d,s) __builtin_va_copy(d,s) | /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/ldump.c: In function 'DumpString': /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/xtables-addons-3.21/extensions/LUA/lua/ldump.c:63:26: error: the comparison will always evaluate as 'false' for the pointer operand in 's + 24' must not be NULL [-Werror=address] 63 | if (s==NULL || getstr(s)==NULL) | ^~ cc1: all warnings being treated as errors Fixes: #20993 Fixes: #21006 Co-developed-by: Chen Minqiang Co-developed-by: Christian Marangi Signed-off-by: Chen Minqiang Signed-off-by: Christian Marangi Signed-off-by: Georgi Valkov --- net/xtables-addons/Makefile | 2 +- .../patches/200-add-lua-packetscript.patch | 38 ++++++++++++------- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/net/xtables-addons/Makefile b/net/xtables-addons/Makefile index ce0b9236c..ccae83f40 100644 --- a/net/xtables-addons/Makefile +++ b/net/xtables-addons/Makefile @@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=xtables-addons PKG_VERSION:=3.21 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_HASH:=2e09ac129a14f5e9c23b115ebcdfff4aa84e2aeba1268dbdf39b2d752bd71e19 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz diff --git a/net/xtables-addons/patches/200-add-lua-packetscript.patch b/net/xtables-addons/patches/200-add-lua-packetscript.patch index c815e1a6a..71b17b660 100644 --- a/net/xtables-addons/patches/200-add-lua-packetscript.patch +++ b/net/xtables-addons/patches/200-add-lua-packetscript.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/extensions/LUA/byte_array.c -@@ -0,0 +1,145 @@ +@@ -0,0 +1,161 @@ +/* + * Copyright (C) 2010 University of Basel + * by Andre Graf @@ -110,12 +110,26 @@ +static int32_t byte_array_to_string(lua_State *L) +{ + lua_packet_segment * array = checkbytearray(L, 1); -+ uint8_t buf[(array->length * 3) + 255]; + uint8_t hexval[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; -+ char res[255 + (array->length * 3)]; /* make sure the buffer is big enough*/ ++ uint8_t * buf; ++ char * res; + int32_t i, n; + uint8_t *ptr = array->start + array->offset; + ++ buf = kcalloc((array->length * 3) + 255, sizeof(*buf), GFP_KERNEL); ++ ++ if (!buf) { ++ return luaL_error(L, "byte_array_to_string, failed alloc buf buffer"); ++ } ++ ++ /* make sure the buffer is big enough*/ ++ res = kcalloc((array->length * 3) + 255, sizeof(*res), GFP_KERNEL); ++ ++ if (!res) { ++ kfree(buf); ++ return luaL_error(L, "byte_array_to_string, failed alloc res buffer"); ++ } ++ + for (i = 0; i < array->length; i++) { + buf[i * 3] = hexval[(ptr[i] >> 4) & 0xF]; + buf[(i * 3) + 1] = hexval[ptr[i] & 0x0F]; @@ -126,6 +140,8 @@ + n = sprintf(res, "byte_array: length: %d value: %s", array->length, buf); + + lua_pushlstring(L, res, n); ++ kfree(res); ++ kfree(buf); + + return 1; +} @@ -2453,15 +2469,13 @@ +#endif --- /dev/null +++ b/extensions/LUA/lua/lauxlib.c -@@ -0,0 +1,674 @@ +@@ -0,0 +1,672 @@ +/* +** $Id: lauxlib.c,v 1.159.1.3 2008/01/21 13:20:51 roberto Exp $ +** Auxiliary functions for building Lua libraries +** See Copyright Notice in lua.h +*/ + -+#include -+ +#if !defined(__KERNEL__) +#include +#include @@ -4887,7 +4901,7 @@ +#endif --- /dev/null +++ b/extensions/LUA/lua/ldebug.c -@@ -0,0 +1,637 @@ +@@ -0,0 +1,636 @@ +/* +** $Id: ldebug.c,v 2.29.1.6 2008/05/08 16:56:26 roberto Exp $ +** Debug Interface @@ -4895,7 +4909,6 @@ +*/ + + -+#include +#include +#include + @@ -6204,7 +6217,7 @@ + +static void DumpString(const TString* s, DumpState* D) +{ -+ if (s==NULL || getstr(s)==NULL) ++ if (s==NULL) + { + size_t size=0; + DumpVar(size,D); @@ -8165,15 +8178,13 @@ + --- /dev/null +++ b/extensions/LUA/lua/lobject.c -@@ -0,0 +1,215 @@ +@@ -0,0 +1,213 @@ +/* +** $Id: lobject.c,v 2.22.1.1 2007/12/27 13:02:25 roberto Exp $ +** Some generic functions over Lua objects +** See Copyright Notice in lua.h +*/ + -+#include -+ +#include +#include +#include @@ -13851,7 +13862,7 @@ + --- /dev/null +++ b/extensions/LUA/lua/lua.h -@@ -0,0 +1,387 @@ +@@ -0,0 +1,386 @@ +/* +** $Id: lua.h,v 1.218.1.5 2008/08/06 13:30:12 roberto Exp $ +** Lua - An Extensible Extension Language @@ -13863,7 +13874,6 @@ +#ifndef lua_h +#define lua_h + -+#include +#include + +#include "luaconf.h" From 216ac068ce2b89580f85d2d6c56ea131ab8327de Mon Sep 17 00:00:00 2001 From: Georgi Valkov Date: Sun, 14 May 2023 18:33:03 +0300 Subject: [PATCH 3/6] xtables-addons: bump to 3.24 fa35c29 Xtables-addons 3.24 9db4d8d DHCPMAC: resolve cppcheck warnings 4599c30 ipv4options: resolve cppcheck warnings 5a714b6 geoip: set autoflush on stdout f16ed5c geoip: Use stdout for output and stderr for errors/diag a711985 build: resolve compiler warnings with gcc-13 97181e3 doc, src: improve spelling 30ddb4f doc, src: improve spelling f3f8155 xt_geoip: bump number of territories per rule e426ad9 Xtables-addons 3.23 51761c3 build: support for Linux 6.2 409cb5a build: replace `AC_DISABLE_STATIC` macro with an argument to `LT_INIT` 0454ff6 build: replace obsolete `AC_PROG_LIBTOOL` macro with `LT_INIT` 5b3fae8 Xtables-addons 3.22 71396f9 build: support for Linux 6.1 7ad55ad build: eliminate geoip/ make recursion b950dae build: fix failure to recurse into asn/ cd77880 xt_asn: new module Signed-off-by: Georgi Valkov [ add changelog from 3.21 to 3.24 ] Signed-off-by: Christian Marangi --- net/xtables-addons/Makefile | 6 +++--- .../patches/001-fix-kernel-version-detection.patch | 2 +- net/xtables-addons/patches/100-add-rtsp-conntrack.patch | 4 ++-- net/xtables-addons/patches/200-add-lua-packetscript.patch | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/net/xtables-addons/Makefile b/net/xtables-addons/Makefile index ccae83f40..cb678ac9c 100644 --- a/net/xtables-addons/Makefile +++ b/net/xtables-addons/Makefile @@ -7,9 +7,9 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=xtables-addons -PKG_VERSION:=3.21 -PKG_RELEASE:=2 -PKG_HASH:=2e09ac129a14f5e9c23b115ebcdfff4aa84e2aeba1268dbdf39b2d752bd71e19 +PKG_VERSION:=3.24 +PKG_RELEASE:=1 +PKG_HASH:=3e823f71720519ced31c4c7d2bfaf7120d9c01c59a0843dfcbe93c95c64d81c1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://inai.de/files/xtables-addons/ diff --git a/net/xtables-addons/patches/001-fix-kernel-version-detection.patch b/net/xtables-addons/patches/001-fix-kernel-version-detection.patch index 624fa4d9b..e29b3925c 100644 --- a/net/xtables-addons/patches/001-fix-kernel-version-detection.patch +++ b/net/xtables-addons/patches/001-fix-kernel-version-detection.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -42,7 +42,7 @@ regular_CFLAGS="-Wall -Waggregate-return +@@ -41,7 +41,7 @@ regular_CFLAGS="-Wall -Waggregate-return AS_IF([test -n "$kbuilddir"], [ AC_MSG_CHECKING([kernel version that we will build against]) diff --git a/net/xtables-addons/patches/100-add-rtsp-conntrack.patch b/net/xtables-addons/patches/100-add-rtsp-conntrack.patch index dbdc52e94..befcd06a3 100644 --- a/net/xtables-addons/patches/100-add-rtsp-conntrack.patch +++ b/net/xtables-addons/patches/100-add-rtsp-conntrack.patch @@ -1725,7 +1725,7 @@ +module_exit(fini); --- a/extensions/Kbuild +++ b/extensions/Kbuild -@@ -27,6 +27,7 @@ obj-${build_lscan} += xt_lscan.o +@@ -28,6 +28,7 @@ obj-${build_lscan} += xt_lscan.o obj-${build_pknock} += pknock/ obj-${build_psd} += xt_psd.o obj-${build_quota2} += xt_quota2.o @@ -1735,7 +1735,7 @@ -include ${M}/Kbuild.* --- a/mconfig +++ b/mconfig -@@ -23,3 +23,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/200-add-lua-packetscript.patch b/net/xtables-addons/patches/200-add-lua-packetscript.patch index 71b17b660..2a97f54d7 100644 --- a/net/xtables-addons/patches/200-add-lua-packetscript.patch +++ b/net/xtables-addons/patches/200-add-lua-packetscript.patch @@ -18144,7 +18144,7 @@ + --- a/extensions/Kbuild +++ b/extensions/Kbuild -@@ -28,6 +28,7 @@ obj-${build_pknock} += pknock/ +@@ -29,6 +29,7 @@ obj-${build_pknock} += pknock/ obj-${build_psd} += xt_psd.o obj-${build_quota2} += xt_quota2.o obj-${build_rtsp} += rtsp/ @@ -18154,14 +18154,14 @@ -include ${M}/Kbuild.* --- a/extensions/Mbuild +++ b/extensions/Mbuild -@@ -23,3 +23,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 -@@ -24,3 +24,4 @@ build_pknock=m +@@ -25,3 +25,4 @@ build_pknock=m build_psd=m build_quota2=m build_rtsp=m From 89731e6f4dd47290ca057b5c9bdd6542e4a8e7e9 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Mon, 15 May 2023 00:28:56 +0200 Subject: [PATCH 4/6] jool: fix compilation warning Add patch fixing compilation warning due to wrong cast. Fix compilation warning: /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/xlator.c: In function 'offset_equals': /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/xlator.c:878:32: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] 878 | return (offset->ns == ((__u64)instance->jool.ns & 0xFFFFFFFF)) | ^ cc1: all warnings being treated as errors In file included from ./include/linux/kernel.h:19, from ./include/linux/skbuff.h:13, from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/../../mod/common/skbuff.h:4, from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/skbuff.c:1: /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/skbuff.c: In function 'print_skb_fields': ./include/linux/kern_levels.h:5:25: error: format '%ld' expects argument of type 'long int', but argument 2 has type 'int' [-Werror=format=] 5 | #define KERN_SOH "\001" /* ASCII Start Of Header */ | ^~~~~~ ./include/linux/printk.h:422:25: note: in definition of macro 'printk_index_wrap' 422 | _p_func(_fmt, ##__VA_ARGS__); \ | ^~~~ ./include/linux/printk.h:535:9: note: in expansion of macro 'printk' 535 | printk(KERN_CONT fmt, ##__VA_ARGS__) | ^~~~~~ ./include/linux/kern_levels.h:24:25: note: in expansion of macro 'KERN_SOH' 24 | #define KERN_CONT KERN_SOH "c" | ^~~~~~~~ ./include/linux/printk.h:535:16: note: in expansion of macro 'KERN_CONT' 535 | printk(KERN_CONT fmt, ##__VA_ARGS__) | ^~~~~~~~~ /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/skbuff.c:38:17: note: in expansion of macro 'pr_cont' 38 | pr_cont(text "\n", ##__VA_ARGS__); \ | ^~~~~~~ /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/skbuff.c:112:9: note: in expansion of macro 'print' 112 | print(tabs, "data:%ld", skb->data - skb->head); | ^~~~~ ./include/linux/kern_levels.h:5:25: error: format '%u' expects argument of type 'unsigned int', but argument 2 has type 'sk_buff_data_t' {aka 'unsigned char *'} [-Werror=format=] 5 | #define KERN_SOH "\001" /* ASCII Start Of Header */ | ^~~~~~ ./include/linux/printk.h:422:25: note: in definition of macro 'printk_index_wrap' 422 | _p_func(_fmt, ##__VA_ARGS__); \ | ^~~~ ./include/linux/printk.h:535:9: note: in expansion of macro 'printk' 535 | printk(KERN_CONT fmt, ##__VA_ARGS__) | ^~~~~~ ./include/linux/kern_levels.h:24:25: note: in expansion of macro 'KERN_SOH' 24 | #define KERN_CONT KERN_SOH "c" | ^~~~~~~~ ./include/linux/printk.h:535:16: note: in expansion of macro 'KERN_CONT' 535 | printk(KERN_CONT fmt, ##__VA_ARGS__) | ^~~~~~~~~ /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/skbuff.c:38:17: note: in expansion of macro 'pr_cont' 38 | pr_cont(text "\n", ##__VA_ARGS__); \ | ^~~~~~~ /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/skbuff.c:113:9: note: in expansion of macro 'print' 113 | print(tabs, "tail:%u", skb->tail); | ^~~~~ ./include/linux/kern_levels.h:5:25: error: format '%u' expects argument of type 'unsigned int', but argument 2 has type 'sk_buff_data_t' {aka 'unsigned char *'} [-Werror=format=] 5 | #define KERN_SOH "\001" /* ASCII Start Of Header */ | ^~~~~~ ./include/linux/printk.h:422:25: note: in definition of macro 'printk_index_wrap' 422 | _p_func(_fmt, ##__VA_ARGS__); \ | ^~~~ ./include/linux/printk.h:535:9: note: in expansion of macro 'printk' 535 | printk(KERN_CONT fmt, ##__VA_ARGS__) | ^~~~~~ ./include/linux/kern_levels.h:24:25: note: in expansion of macro 'KERN_SOH' 24 | #define KERN_CONT KERN_SOH "c" | ^~~~~~~~ ./include/linux/printk.h:535:16: note: in expansion of macro 'KERN_CONT' 535 | printk(KERN_CONT fmt, ##__VA_ARGS__) | ^~~~~~~~~ /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/skbuff.c:38:17: note: in expansion of macro 'pr_cont' 38 | pr_cont(text "\n", ##__VA_ARGS__); \ | ^~~~~~~ /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/skbuff.c:114:9: note: in expansion of macro 'print' 114 | print(tabs, "end:%u", skb->end); | ^~~~~ cc1: all warnings being treated as errors /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/nl/instance.c: In function 'serialize_instance': /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_xrx200/jool-4.1.8/src/mod/common/nl/instance.c:40:46: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] 40 | error = nla_put_u32(skb, JNLAIE_NS, ((__u64)entry->ns) & 0xFFFFFFFF); | ^ cc1: all warnings being treated as errors Signed-off-by: Christian Marangi --- ...0-fix-compilation-warning-simple-fix.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 net/jool/patches/100-fix-compilation-warning-simple-fix.patch diff --git a/net/jool/patches/100-fix-compilation-warning-simple-fix.patch b/net/jool/patches/100-fix-compilation-warning-simple-fix.patch new file mode 100644 index 000000000..b695d19bb --- /dev/null +++ b/net/jool/patches/100-fix-compilation-warning-simple-fix.patch @@ -0,0 +1,37 @@ +--- a/src/mod/common/skbuff.c ++++ b/src/mod/common/skbuff.c +@@ -109,9 +109,9 @@ static void print_skb_fields(struct sk_buff *skb, unsigned int tabs) + print(tabs, "network_header:%u", skb->network_header); + print(tabs, "mac_header:%u", skb->mac_header); + print(tabs, "head:%p", skb->head); +- print(tabs, "data:%ld", skb->data - skb->head); +- print(tabs, "tail:%u", skb->tail); +- print(tabs, "end:%u", skb->end); ++ print(tabs, "data:%ld", (long int)(skb->data - skb->head)); ++ print(tabs, "tail:%u", (unsigned int)skb->tail); ++ print(tabs, "end:%u", (unsigned int)skb->end); + } + + static int truncated(unsigned int tabs) +--- a/src/mod/common/xlator.c ++++ b/src/mod/common/xlator.c +@@ -875,7 +875,7 @@ void xlator_put(struct xlator *jool) + static bool offset_equals(struct instance_entry_usr *offset, + struct jool_instance *instance) + { +- return (offset->ns == ((__u64)instance->jool.ns & 0xFFFFFFFF)) ++ return (offset->ns == ((uintptr_t)instance->jool.ns & 0xFFFFFFFF)) + && (strcmp(offset->iname, instance->jool.iname) == 0); + } + +--- a/src/mod/common/nl/instance.c ++++ b/src/mod/common/nl/instance.c +@@ -37,7 +37,7 @@ static int serialize_instance(struct xlator *entry, void *arg) + if (!root) + return 1; + +- error = nla_put_u32(skb, JNLAIE_NS, ((__u64)entry->ns) & 0xFFFFFFFF); ++ error = nla_put_u32(skb, JNLAIE_NS, ((uintptr_t)entry->ns) & 0xFFFFFFFF); + if (error) + goto cancel; + error = nla_put_u8(skb, JNLAIE_XF, xlator_flags2xf(entry->flags)); From f6c43e7c5ad86685f6e5c892b0b412fbd8831200 Mon Sep 17 00:00:00 2001 From: Andrew Sim Date: Mon, 15 May 2023 07:12:06 +0200 Subject: [PATCH 5/6] transmission: Update to v4.03 Update transmission to latest stable v4.0.3 release Changelog: https://github.com/transmission/transmission/releases/tag/4.0.3 Signed-off-by: Andrew Sim --- net/transmission/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/transmission/Makefile b/net/transmission/Makefile index 7cec51794..a000d6b61 100644 --- a/net/transmission/Makefile +++ b/net/transmission/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=transmission -PKG_VERSION:=4.0.2 +PKG_VERSION:=4.0.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/transmission/transmission/releases/download/$(PKG_VERSION)/ -PKG_HASH:=39bf7a104a722805a9dc089cdaaffe33bf90b82230a7ea7f340cae59f00a2ee8 +PKG_HASH:=b6b01fd58e42bb14f7aba0253db932ced050fcd2bba5d9f8469d77ddd8ad545a PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=GPL-2.0-or-later From 60077281fe5ec6db351247b9186278ad2e78014a Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Mon, 15 May 2023 22:58:42 +0800 Subject: [PATCH 6/6] libunistring: remove package It's merged into core now [1], so remove it here. 1. https://git.openwrt.org/?p=openwrt/openwrt.git;a=commit;h=d3c3b79c1e46c49cfa5de9df6a740d5fcda46471 Signed-off-by: Tianling Shen --- libs/libunistring/Makefile | 59 -------------------------------------- 1 file changed, 59 deletions(-) delete mode 100644 libs/libunistring/Makefile diff --git a/libs/libunistring/Makefile b/libs/libunistring/Makefile deleted file mode 100644 index 595b5308f..000000000 --- a/libs/libunistring/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# -# Copyright (C) 2006-2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libunistring -PKG_VERSION:=1.1 -PKG_RELEASE:=1 -PKG_HASH:=827c1eb9cb6e7c738b171745dac0888aa58c5924df2e59239318383de0729b98 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=@GNU/libunistring -PKG_BUILD_PARALLEL:=1 -PKG_INSTALL:=1 - -PKG_MAINTAINER:=Espen Jürgensen -PKG_LICENSE:=GPL-3.0 -PKG_LICENSE_FILES:=COPYING - -include $(INCLUDE_DIR)/package.mk - -define Package/libunistring - SECTION:=libs - CATEGORY:=Libraries - TITLE:=libunistring - URL:=http://www.gnu.org/software/libunistring/ -endef - -define Package/libunistring/description - This library provides functions for manipulating Unicode strings and for manipulating C strings according to the Unicode standard. -endef - -TARGET_CFLAGS += $(FPIC) - -CONFIGURE_ARGS += \ - --enable-shared \ - --enable-static \ - --without-libiconv-prefix \ - --without-libpth-prefix - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/include/unistring - $(CP) $(PKG_INSTALL_DIR)/usr/include/unistring/*.h $(1)/usr/include/unistring/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libunistring.{a,so*} $(1)/usr/lib/ -endef - -define Package/libunistring/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libunistring.so.* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libunistring))