From 95b3b801e031eb94114c070b95ac0b087a8bc6c9 Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Fri, 20 May 2022 23:07:02 +0800
Subject: [PATCH] fullconenat: move to network

---
 ...1-fix-nf_conntrack_register_notifier.patch | 25 -------------------
 .../services/fullconenat}/Makefile            | 22 ++++++----------
 .../services/fullconenat/src}/Makefile        |  0
 3 files changed, 8 insertions(+), 39 deletions(-)
 delete mode 100644 package/lean/openwrt-fullconenat/patches/0001-fix-nf_conntrack_register_notifier.patch
 rename package/{lean/openwrt-fullconenat => network/services/fullconenat}/Makefile (80%)
 rename package/{lean/openwrt-fullconenat/files => network/services/fullconenat/src}/Makefile (100%)

diff --git a/package/lean/openwrt-fullconenat/patches/0001-fix-nf_conntrack_register_notifier.patch b/package/lean/openwrt-fullconenat/patches/0001-fix-nf_conntrack_register_notifier.patch
deleted file mode 100644
index 4ff41f5e1..000000000
--- a/package/lean/openwrt-fullconenat/patches/0001-fix-nf_conntrack_register_notifier.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ea9e2477624adaa40e8a553ef876f60ec8d3150c Mon Sep 17 00:00:00 2001
-From: W_Y_CPP <383152993@qq.com>
-Date: Fri, 18 Feb 2022 00:53:12 -0500
-Subject: [PATCH] refresh
-
----
- xt_FULLCONENAT.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/xt_FULLCONENAT.c b/xt_FULLCONENAT.c
-index f96cfd8a3..237666039 100644
---- a/xt_FULLCONENAT.c
-+++ b/xt_FULLCONENAT.c
-@@ -1258,8 +1258,7 @@ static int fullconenat_tg_check(const struct xt_tgchk_param *par)
- #endif
- 
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0) && !defined(CONFIG_NF_CONNTRACK_CHAIN_EVENTS)
--    if (!READ_ONCE(par->net->ct.nf_conntrack_event_cb)) {
--      nf_conntrack_register_notifier(par->net, &ct_event_notifier);
-+    if (!READ_ONCE(par->net->ct.nf_conntrack_event_cb)&&(nf_conntrack_register_notifier(par->net, &ct_event_notifier)==0)) {
- #else
-     if (nf_conntrack_register_notifier(par->net, &ct_event_notifier) == 0) {
- #endif
--- 
-2.17.1
diff --git a/package/lean/openwrt-fullconenat/Makefile b/package/network/services/fullconenat/Makefile
similarity index 80%
rename from package/lean/openwrt-fullconenat/Makefile
rename to package/network/services/fullconenat/Makefile
index 3036baf24..00080b80b 100644
--- a/package/lean/openwrt-fullconenat/Makefile
+++ b/package/network/services/fullconenat/Makefile
@@ -6,7 +6,6 @@
 #
 
 include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=fullconenat
 PKG_RELEASE:=6
@@ -19,7 +18,9 @@ PKG_MIRROR_HASH:=00d749235271dee194dcd23c22e6e85207ea90192a62a110b2af0b4e4de1971
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=LICENSE
+PKG_MAINTAINER:=Chion Tang <tech@chionlab.moe>
 
+include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/iptables-mod-fullconenat
@@ -28,7 +29,6 @@ define Package/iptables-mod-fullconenat
   CATEGORY:=Network
   TITLE:=FULLCONENAT iptables extension
   DEPENDS:=+iptables +kmod-ipt-fullconenat
-  MAINTAINER:=Chion Tang <tech@chionlab.moe>
 endef
 
 define Package/iptables-mod-fullconenat/install
@@ -40,7 +40,6 @@ define KernelPackage/ipt-fullconenat
   SUBMENU:=Netfilter Extensions
   TITLE:=FULLCONENAT netfilter module
   DEPENDS:=+kmod-nf-ipt +kmod-nf-nat
-  MAINTAINER:=Chion Tang <tech@chionlab.moe>
   KCONFIG:=  \
 	CONFIG_NF_CONNTRACK_EVENTS=y \
 	CONFIG_NF_CONNTRACK_CHAIN_EVENTS=y
@@ -49,20 +48,15 @@ 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
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		ARCH="$(LINUX_KARCH)" \
+		M="$(PKG_BUILD_DIR)" \
+		EXTRA_CFLAGS="$(BUILDFLAGS)" \
+		modules
 	$(call Build/Compile/Default)
 endef
 
-$(eval $(call BuildPackage,iptables-mod-fullconenat))
 $(eval $(call KernelPackage,ipt-fullconenat))
+$(eval $(call BuildPackage,iptables-mod-fullconenat))
diff --git a/package/lean/openwrt-fullconenat/files/Makefile b/package/network/services/fullconenat/src/Makefile
similarity index 100%
rename from package/lean/openwrt-fullconenat/files/Makefile
rename to package/network/services/fullconenat/src/Makefile