diff --git a/package/network/utils/fullconenat/Makefile b/package/network/utils/fullconenat/Makefile index 1573fc5861..c206b06fbc 100644 --- a/package/network/utils/fullconenat/Makefile +++ b/package/network/utils/fullconenat/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=fullconenat -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/llccd/netfilter-full-cone-nat.git -PKG_SOURCE_DATE:=2022-02-13 -PKG_SOURCE_VERSION:=108a36cbdca17e68c9e6e7fd5e26156a88f738e8 -PKG_MIRROR_HASH:=00d749235271dee194dcd23c22e6e85207ea90192a62a110b2af0b4e4de1971f +PKG_SOURCE_DATE:=2023-01-01 +PKG_SOURCE_VERSION:=74c5e6f3c7faaf33ece451697537c81781781c20 +PKG_MIRROR_HASH:=3c254f1edba28eafdccac9cf95eb550fd2b05eeaaec8a02c73e1dcd2f98f9d93 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=LICENSE diff --git a/package/network/utils/fullconenat/patches/000-printk.patch b/package/network/utils/fullconenat/patches/000-printk.patch index 817ce14e83..2d8dbe6e4f 100644 --- a/package/network/utils/fullconenat/patches/000-printk.patch +++ b/package/network/utils/fullconenat/patches/000-printk.patch @@ -1,6 +1,6 @@ --- a/xt_FULLCONENAT.c +++ b/xt_FULLCONENAT.c -@@ -1336,10 +1336,13 @@ static struct xt_target tg_reg[] __read_ +@@ -1344,10 +1344,13 @@ static struct xt_target tg_reg[] __read_ static int __init fullconenat_tg_init(void) { diff --git a/package/network/utils/fullconenat/patches/001-fix-init-Repeat-definition.patch b/package/network/utils/fullconenat/patches/001-fix-init-Repeat-definition.patch deleted file mode 100644 index 67c9332c84..0000000000 --- a/package/network/utils/fullconenat/patches/001-fix-init-Repeat-definition.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/libip6t_FULLCONENAT.c -+++ b/libip6t_FULLCONENAT.c -@@ -214,6 +214,7 @@ static struct xtables_target fullconenat_tg_reg = { - .x6_options = FULLCONENAT_opts, - }; - -+#define _init __attribute__((constructor)) _INIT - void _init(void) - { - xtables_register_target(&fullconenat_tg_reg); ---- a/libipt_FULLCONENAT.c -+++ b/libipt_FULLCONENAT.c -@@ -235,6 +235,7 @@ static struct xtables_target fullconenat_tg_reg = { - .x6_options = FULLCONENAT_opts, - }; - -+#define _init __attribute__((constructor)) _INIT - void _init(void) - { - xtables_register_target(&fullconenat_tg_reg); diff --git a/package/network/utils/fullconenat/src/Makefile b/package/network/utils/fullconenat/src/Makefile index 0c3dc675e9..a48a513daf 100644 --- a/package/network/utils/fullconenat/src/Makefile +++ b/package/network/utils/fullconenat/src/Makefile @@ -3,10 +3,10 @@ all: libipt_FULLCONENAT.so libip6t_FULLCONENAT.so libipt_FULLCONENAT.so: libipt_FULLCONENAT.o $(CC) -shared -lxtables -o $@ $^; libipt_FULLCONENAT.o: libipt_FULLCONENAT.c - $(CC) ${CFLAGS} -fPIC -D_INIT=$*_init -c -o $@ $<; + $(CC) ${CFLAGS} -fPIC -c -o $@ $<; libip6t_FULLCONENAT.so: libip6t_FULLCONENAT.o $(CC) -shared -lxtables -o $@ $^; libip6t_FULLCONENAT.o: libip6t_FULLCONENAT.c - $(CC) ${CFLAGS} -fPIC -D_INIT=$*_init -c -o $@ $<; + $(CC) ${CFLAGS} -fPIC -c -o $@ $<; obj-m += xt_FULLCONENAT.o