fullconenat: bump to latest git HEAD

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

package/kernel/fullconenat/Makefile

@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=fullconenat
-PKG_RELEASE:=1
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/Chion82/netfilter-full-cone-nat.git
-PKG_SOURCE_DATE:=2019-10-21
-PKG_SOURCE_VERSION:=0cf3b48fd7d2fa81d0297d1fff12bbd0580fc435
-PKG_MIRROR_HASH:=e7bb77d9916d190b3c02975faf62d1794557d4a4a774cd0cf1f3a6ddb7403e3e
+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_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=LICENSE
@@ -31,9 +31,13 @@ define Package/iptables-mod-fullconenat
   MAINTAINER:=Chion Tang <tech@chionlab.moe>
 endef
 
-define Package/iptables-mod-fullconenat/install
-	$(INSTALL_DIR) $(1)/usr/lib/iptables
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libipt_FULLCONENAT.so $(1)/usr/lib/iptables
+define Package/ip6tables-mod-fullconenat
+  SUBMENU:=Firewall
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=FULLCONENAT ip6tables extension
+  DEPENDS:=+ip6tables +kmod-nf-nat6 +kmod-ipt-fullconenat +ip6tables-mod-nat
+  MAINTAINER:=Chion Tang <tech@chionlab.moe>
 endef
 
 define KernelPackage/ipt-fullconenat
@@ -47,20 +51,21 @@ endef
 
 include $(INCLUDE_DIR)/kernel-defaults.mk
 
-define Build/Prepare
-	$(call Build/Prepare/Default)
-	$(CP) ./files/Makefile $(PKG_BUILD_DIR)/
-endef
-
 define Build/Compile
-	+$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
-        CROSS_COMPILE="$(TARGET_CROSS)" \
-        ARCH="$(LINUX_KARCH)" \
-        M="$(PKG_BUILD_DIR)" \
-        EXTRA_CFLAGS="$(BUILDFLAGS)" \
-        modules
+	+$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)" modules
 	$(call Build/Compile/Default)
 endef
 
+define Package/iptables-mod-fullconenat/install
+	$(INSTALL_DIR) $(1)/usr/lib/iptables
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libipt_FULLCONENAT.so $(1)/usr/lib/iptables
+endef
+
+define Package/ip6tables-mod-fullconenat/install
+	$(INSTALL_DIR) $(1)/usr/lib/iptables
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libip6t_FULLCONENAT.so $(1)/usr/lib/iptables
+endef
+
 $(eval $(call BuildPackage,iptables-mod-fullconenat))
+$(eval $(call BuildPackage,ip6tables-mod-fullconenat))
 $(eval $(call KernelPackage,ipt-fullconenat))

package/kernel/fullconenat/patches/000-printk.patch

@@ -1,17 +1,17 @@
-diff --git a/xt_FULLCONENAT.c b/xt_FULLCONENAT.c
-index 9e52eba..8658c5f 100644
 --- a/xt_FULLCONENAT.c
 +++ b/xt_FULLCONENAT.c
-@@ -697,9 +697,11 @@ static struct xt_target tg_reg[] __read_mostly = {
+@@ -1336,10 +1336,13 @@ static struct xt_target tg_reg[] __read_
  
  static int __init fullconenat_tg_init(void)
  {
 +  printk(KERN_INFO "xt_FULLCONENAT: RFC3489 Full Cone NAT module\n"
-+	"xt_FULLCONENAT: Copyright (C) 2018 Chion Tang <tech@chionlab.moe>\n");
++    "xt_FULLCONENAT: Copyright (C) 2018 Chion Tang <tech@chionlab.moe>\n");
++
+   int ret;
    wq = create_singlethread_workqueue("xt_FULLCONENAT");
    if (wq == NULL) {
 -    printk("xt_FULLCONENAT: warning: failed to create workqueue\n");
 +    printk(KERN_WARNING "xt_FULLCONENAT: warning: failed to create workqueue\n");
    }
  
-   return xt_register_targets(tg_reg, ARRAY_SIZE(tg_reg));
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 2, 0)