aboutsummaryrefslogtreecommitdiff
path: root/net/xtables-addons
Commit message (Collapse)AuthorAge
* xtables-addons: fix broken compile with external ToolchainChristian Marangi2024-04-22
| | | | | | | | | | | | | | | | | | | | | | | Fix broken compile with external Toolchain. Commit 32aaaaa7d379 ("xtables-addons: pass correct flags to compile and install") simplified and dropped the custom Compile/Install in favor of the default one. Problem is that it dropped DESTDIR resulting in the package having problem on finishing install. The commit then was reworked with c83b8787a5f8 ("xtables-addons: adapt build to EXTERNAL_TOOLCHAIN" that reintroduced DESTDIR and also introduced a useless custom flag to fix wrong ARCH. ARCH is fixed by kernel.mk and doesn't depend on external Toolchain or not. For ARCH that require fixing, kernel.mk should be fixed instead of adding custom function to packages Makefile. Drop the custom ARCH handling and use Compile/Install everytime. Fixes: 32aaaaa7d379 ("xtables-addons: pass correct flags to compile and install") Fixes: c83b8787a5f8 ("xtables-addons: adapt build to EXTERNAL_TOOLCHAIN") Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
* xtables-addons: add packaging for xt_asn, et alPhilip Prindeville2023-08-08
| | | | Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
* xtables-addons: add MaxMind versions of xt_geoip_dl, etc.Philip Prindeville2023-08-08
| | | | Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
* xtables-addons: fix compilation error on kernel 6.1Christian Marangi2023-06-11
| | | | | | | | | | | | | | | | | | | | | | Fix compilation error on kernel 6.1. Fix compilation error: In file included from /mnt/Data/Sources/openwrt/x-wrt/build_dir/target-aarch64_cortex-a72_musl/linux-bcm27xx_bcm2711/xtables-addons-3.24/extensions/LUA/controller.h:24, from /mnt/Data/Sources/openwrt/x-wrt/build_dir/target-aarch64_cortex-a72_musl/linux-bcm27xx_bcm2711/xtables-addons-3.24/extensions/LUA/xt_LUA_target.c:27: /mnt/Data/Sources/openwrt/x-wrt/build_dir/target-aarch64_cortex-a72_musl/linux-bcm27xx_bcm2711/xtables-addons-3.24/extensions/LUA/lua/lua.h:12:10: fatal error: stddef.h: No such file or directory 12 | #include <stddef.h> | ^~~~~~~~~~ compilation terminated. The error is caused by commit 04e85bbf71c9 ("isystem: delete global -isystem compile option") present upstream from kernel 5.16. This commit dropped the inclusion of system headers by default and caused error on LUA module. Following what is done in the commit for the required code, modify the LUA Kbuild to include these header and restore correct compilation of the LUA module. Fixes: #21294 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
* xtables-addons: bump to 3.24Georgi Valkov2023-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | 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 <gvalkov@gmail.com> [ add changelog from 3.21 to 3.24 ] Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
* xtables-addons: fix build warnings treated as errors since b2d1eb7Georgi Valkov2023-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use kcalloc and remove conflicting #include <stdarg.h> 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 <ptpt52@gmail.com> Co-developed-by: Christian Marangi <ansuelsmth@gmail.com> Signed-off-by: Chen Minqiang <ptpt52@gmail.com> Signed-off-by: Christian Marangi <ansuelsmth@gmail.com> Signed-off-by: Georgi Valkov <gvalkov@gmail.com>
* treewide: remove AUTORELEASEPaul Fertser2023-04-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatically compute and substitute current values for all $(AUTORELEASE) instances as this feature is deprecated and shouldn't be used. The following temporary change was made to the core: diff --git a/rules.mk b/rules.mk index 57d7995d4fa8..f16367de87a8 100644 --- a/rules.mk +++ b/rules.mk @@ -429,7 +429,7 @@ endef abi_version_str = $(subst -,,$(subst _,,$(subst .,,$(1)))) COMMITCOUNT = $(if $(DUMP),0,$(call commitcount)) -AUTORELEASE = $(if $(DUMP),0,$(call commitcount,1)) +AUTORELEASE = $(if $(DUMP),0,$(shell sed -i "s/\$$(AUTORELEASE)/$(call commitcount,1)/" $(CURDIR)/Makefile)) all: FORCE: ; And this command used to fix affected packages: for i in $(cd feeds/packages; git grep -l PKG_RELEASE:=.*AUTORELEASE | \ sed 's^.*/\([^/]*\)/Makefile^\1^';); do make package/$i/download done Signed-off-by: Paul Fertser <fercerpav@gmail.com>
* xtables-addons: update to 3.21Ivan Pavlov2022-06-22
| | | | | | updated to kernel 5.10.121+ changes Signed-off-by: Ivan Pavlov <AuthorReflex@gmail.com>
* xtables-addons: update to 3.20Nick Hainke2022-06-09
| | | | | | | | | | 866bc7f Xtables-addons 3.20 aa70669 doc: move changelog to rST d7de2a9 doc: remove old changelog entries d7e49a8 build: bump supported kernel version to 5.17 966fa43 extensions: replace PDE_DATA Signed-off-by: Nick Hainke <vincent@systemli.org>
* xtables-addons: add PKG_LICENSE_FILES and use SPDXNick Hainke2022-06-09
| | | | | | Add PKG_LICENSE_FILES. Use SPDX. Signed-off-by: Nick Hainke <vincent@systemli.org>
* xtables-addons: fix various warning in lua patchRosen Penev2022-04-05
| | | | | | These will become errors in the next LTS kernel. Signed-off-by: Rosen Penev <rosenp@gmail.com>
* xtables-addons: update to 3.19Rosen Penev2022-04-05
| | | | | | | | Fixes compilation with kernel 5.15. Fixed changed binary name. Signed-off-by: Rosen Penev <rosenp@gmail.com>
* treewide: Run refresh on all packagesIlya Lipnitskiy2021-02-20
| | | | | | | | | The crude loop I wrote to come up with this changeset: find -L package/feeds/packages/ -name patches | \ sed 's/patches$/refresh/' | sort | xargs make Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
* xtables-addons: iptgeoip: preserve database across sysupgradePhilip Prindeville2020-12-05
| | | | | | | | | | Updating the system image or the package should not obliterate the downloaded/unpacked geolocation database. If you use xt_geoip in /etc/firewall.user you don't want the database disappearing when sysupgrade runs and then reboots your system as you'll be left exposed. Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
* xtables-addons: fix package installationRosen Penev2020-11-29
| | | | | | Install directory is missing. Signed-off-by: Rosen Penev <rosenp@gmail.com>
* xtables-addons: include xt_geoip_fetch utilityPhilip Prindeville2020-11-25
| | | | | | | It's useful to be able to dump sections of the database by country for scripting or just plain sanity checking. Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
* xtables-addons: update to 3.13Xiaoli Chan2020-11-23
| | | | Signed-off-by: Xiaoli Chan <2209553467@qq.com>
* xtables-addons: update for 3.10Philip Prindeville2020-08-04
| | | | Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
* Merge pull request #12338 from alinnastac/rtsp-pb_disconRosen Penev2020-07-04
|\ | | | | xtables-addons: fix RTSP helper support for client_port=x/y Transport…
| * xtables-addons: fix RTSP helper support for client_port=x/y Transport attributeAlin Nastac2020-05-27
| | | | | | | | Signed-off-by: Alin Nastac <alin.nastac@gmail.com>
* | xtables-addons: FreeBSD build fixRozhuk Ivan2020-06-24
|/ | | | Signed-off-by: Rozhuk Ivan <rozhuk.im@gmail.com>
* xtables-addons: ipt_geoip scripts require wget-sslPhilip Prindeville2020-04-21
| | | | Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
* xtables-addons: iptgeoip requires wget-ssl and zcatPhilip Prindeville2020-04-19
| | | | Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
* xtables-addons: update to 3.9DENG Qingfang2020-03-01
| | | | Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
* xtables-addons: fix packetscript build with 5.3DENG Qingfang2020-03-01
| | | | | | Use skb_ensure_writable instead Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
* xtables-addons: update rtsp extensionDENG Qingfang2020-03-01
| | | | | | | 57394bc Fix build with Linux 5.3 b95d68c Use uint for module parameter type for setup_timeout, remove -ve check Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
* xtables-addons: Support IPTV TimeshiftJose Olivera2020-01-13
| | | | | | | | Solves Issue #10373 and PR #10428 Signed-off-by: Jose Olivera <oliverajeo@gmail.com> (bumped PKG_RELEASE) Signed-off-by: Rosen Penev <rosenp@gmail.com>
* xtables-addons: update to 3.7DENG Qingfang2020-01-09
| | | | | | | Update xtables-addons to 3.7 Remove linux 4.9 compatible patch as OpenWrt master no longer supports it Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
* xtables-addons: disable ASLR PIEMartin Schiller2019-11-14
| | | | | | | This package uses ld for linking and therefor does not support the -specs option. Signed-off-by: Martin Schiller <ms@dev.tdt.de>
* xtables-addons: update to 3.5DENG Qingfang2019-09-14
| | | | | | Add xt_PROTO target. Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
* xtables-addons: update to 3.3Deng Qingfang2019-06-02
| | | | | | Version 3.3 supports GeoLite2 database Signed-off-by: Deng Qingfang <dengqf6@mail2.sysu.edu.cn>
* xtables-addons: adapt build to EXTERNAL_TOOLCHAINEneas U de Queiroz2019-05-29
| | | | | | | | | | | Commit 32aaaaa led to failures when openwrt ARCH did not match kernel ARCH, and this may not be its only side-effect. This restores the previous Build/Compile and Build/Install, using the default ones only when using external toolchain; in this case, ARCH is set to LINUX_KARCH. Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
* xtables-addons: pass correct flags to compile and installSébastien Blin2019-05-21
| | | | | | | | | The Makefile currently redefine the Compile and Install functions. This is not working when using an external toolchain because some flags are not interpreted, like CROSS_COMPILE. It is possible to override the MAKE_FLAGS and MAKE_INSTALL_FLAGS instead. Signed-off-by: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
* xtables-addons: fix build on 4.19 for xt_DNETMAP and xt_pknockDeng Qingfang2019-02-19
| | | | | | | | Backport 2 commits to fix build on 4.19: https://github.com/nawawi/xtables-addons/commit/3ea761a1ed338241fbc79bef8e433307e108b6cd https://github.com/nawawi/xtables-addons/commit/2b76b68c65c97fc11409088c3c30993324df8500 Signed-off-by: Deng Qingfang <dengqf6@mail2.sysu.edu.cn>
* xtables-addons: fix compile error on kernel 4.18+Deng Qingfang2018-12-18
| | | | | | Use `struct nf_nat_range2` for kernel 4.18+ Signed-off-by: Deng Qingfang <dengqf6@mail2.sysu.edu.cn>
* xtables-addons: rtsp: support destination format address:portHans Dedecker2018-08-06
| | | | | | | | | | | | RFC2326 specifies the attribute client_port as the RTP/RTCP port pair on which the client has chosen to receive media data and control info; however some clients (mostly STBs) embed the client_port value in the destination attribute in the form of destination=<address:port> without specifying the client_port attribute in the SETUP message. To support such clients check if the destination attribute contains a port value and use it as port value for the expected RTP connection. Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
* xtables-addons: rtsp: fix compile warning/issueHans Dedecker2018-08-06
| | | | | | | | | | | | | | | Fix compile issue with Werror: nf_conntrack_rtsp.c:667:39: error: implicit declaration of function 'nf_ct_zone' [-Werror=implicit-function-declaration] exp_ct = nf_ct_expect_find_get(net, nf_ct_zone(ct), &t); Fix compile warning: nf_conntrack_rtsp.c:474:2: warning: enumeration value 'IP_CT_DIR_MAX' not handled in switch [-Wswitch] switch (CTINFO2DIR(ctinfo)) { ^~~~~~ Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
* xtables-addons: rtsp: update source in expected RTP connectionHans Dedecker2018-04-27
| | | | | | | Update source IP of the expected RTP connection according to the SOURCE attribute value if present in the RTSP SETUP REPLY message. Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
* xtables-addons: rstp: use specific source in expected RTP connectionHans Dedecker2018-04-18
| | | | | | | | | | Instead of passing a wildcard source to the expected RTP data connection; use the server IP address of the RTSP SETUP packet or the RTP media source from the SETUP URI contained in the SETUP packet. This guarantees RTP data is only accepted from the expected source. Signed-off-by: Alin Nastac <alin.nastac@gmail.com> Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
* xtables-addons: don't forget database dirPhilip Prindeville2018-02-01
| | | | | | Don't /usr/share/xt_geoip/ which is needed to build database into. Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
* xtables-addons: add package for geoip scriptsPhilip Prindeville2018-01-16
| | | | | | | | | | | The iptables-mod-geoip is usually used in conjunction with some wrapper scripts which manipulate the GeoIP database and then kick out one or more iptables rules. This package contains (1) the script to download the most recent version of the MaxMind freemium database and (2) another script which mangles the database into sets up iptables rules. Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
* xtables-addons: import from OpenWrt basePhilip Prindeville2018-01-16
This commit moves xtables-addons from https://github.com/openwrt/openwrt/tree/master/package/network/utils/xtables-addons into the package feed repository to allow for dependencies on other feed packages, such as Perl. Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com> [fix commit message] Signed-off-by: Jo-Philipp Wich <jo@mein.io> Signed-off-by: Jo-Philipp Wich <jo@mein.io>