projects / feed / packages.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
jool: remove iptables support and update templates
[feed/packages.git] / net / jool / Makefile
diff --git a/net/jool/Makefile b/net/jool/Makefile
index cdb811897e7d016d4d40a872e19b2bfe4837bf97..99d140ac0612eb41d706197c0963c3e72b86a59c 100644 (file)
--- a/net/jool/Makefile
+++ b/net/jool/Makefile
@@ -8,21 +8,26 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=jool
-PKG_VERSION:=4.1.6
+PKG_VERSION:=2022-01-20
 PKG_RELEASE:=$(AUTORELEASE)
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/NICMx/Jool/releases/download/v$(PKG_VERSION)
-PKG_HASH:=dccfde88e3b97a7d1c44c53b6541b74873a04f50bb8cfd187eb399d5ae8d2c81
-
-PKG_MAINTAINER:=
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=COPYING
 
-PKG_INSTALL:=1
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/NICMx/Jool.git
+PKG_SOURCE_VERSION:=04ef98dd6c7528fc25f68bef304fb74c59cb7083
+PKG_MIRROR_HASH:=f17551f8ab80a75b6d7f4b5d9208013a4a8101298b80ae9adaa2892db30ac385
+
+PKG_BUILD_DIR=$(KERNEL_BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
 PKG_BUILD_PARALLEL:=1
 PKG_BUILD_DEPENDS:=!USE_GLIBC:argp-standalone
 
+PKG_FIXUP:=autoreconf
+
+MAKE_PATH:=src/usr
+CONFIGURE_PATH:=src/usr
+
 include $(INCLUDE_DIR)/package.mk
 
 define Build/Compile
@@ -32,12 +37,14 @@ define Build/Compile
                CROSS_COMPILE="$(TARGET_CROSS)" \
                M="$(PKG_BUILD_DIR)/src/mod/common" \
                V="$(V)" \
+               CFLAGS_MODULE=$(NOXTABLES) \
                modules
        $(MAKE) -C "$(LINUX_DIR)" \
                KERNEL_DIR="$(LINUX_DIR)" \
                ARCH="$(LINUX_KARCH)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
                M="$(PKG_BUILD_DIR)/src/mod/nat64" \
+               CFLAGS_MODULE=$(NOXTABLES) \
                V="$(V)" \
                modules
        $(MAKE) -C "$(LINUX_DIR)" \
@@ -45,11 +52,17 @@ define Build/Compile
                ARCH="$(LINUX_KARCH)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
                M="$(PKG_BUILD_DIR)/src/mod/siit" \
+               CFLAGS_MODULE=$(NOXTABLES) \
                V="$(V)" \
                modules
        $(call Build/Compile/Default)
 endef
 
+define Build/Configure
+       (cd $(PKG_BUILD_DIR); ./autogen.sh );
+       $(call Build/Configure/Default, --with-xtables=no)
+endef
+
 
 define Package/jool/Default
   SECTION:=net
@@ -62,72 +75,59 @@ define Package/jool/Default/description
 endef
 
 
-define KernelPackage/jool
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Support
-  TITLE:=Jool kernel module
-  DEPENDS:= \
-    @IPV6 \
-    +kmod-crypto-md5 \
-    +kmod-nf-conntrack \
-    +kmod-nf-conntrack6 \
-    +kmod-nf-ipt
-  FILES:= \
-    $(PKG_BUILD_DIR)/src/mod/common/jool_common.$(LINUX_KMOD_SUFFIX) \
-    $(PKG_BUILD_DIR)/src/mod/nat64/jool.$(LINUX_KMOD_SUFFIX) \
-    $(PKG_BUILD_DIR)/src/mod/siit/jool_siit.$(LINUX_KMOD_SUFFIX)
-  JOOL_AUTOLOAD:= \
-    jool \
-    jool_siit
-  AUTOLOAD:=$(call AutoLoad,46,jool_common)
-  AUTOLOAD:=$(call AutoLoad,48,$(JOOL_AUTOLOAD))
+define KernelPackage/jool-netfilter
+       SECTION:=kernel
+       CATEGORY:=Kernel modules
+       SUBMENU:=Network Support
+       TITLE:=Jool kernel module
+       DEPENDS:= \
+               @IPV6 \
+               +kmod-crypto-md5 \
+               +kmod-nf-conntrack \
+               +kmod-nf-conntrack6
+       FILES:= \
+               $(PKG_BUILD_DIR)/src/mod/common/jool_common.$(LINUX_KMOD_SUFFIX) \
+               $(PKG_BUILD_DIR)/src/mod/nat64/jool.$(LINUX_KMOD_SUFFIX) \
+               $(PKG_BUILD_DIR)/src/mod/siit/jool_siit.$(LINUX_KMOD_SUFFIX)
+       AUTOLOAD:=$(call AutoLoad,48,$(JOOL_AUTOLOAD))
 endef
 
-define KernelPackage/jool/description
+define KernelPackage/jool-netfilter/description
   $(call Package/jool/Default/description)
 
-  This package provides the kernel module for Jool.
+  This package provides the kernel module for Jool with netfilter API Only.
 endef
 
 
-define Package/jool-tools
+define Package/jool-tools-netfilter
   $(call Package/jool/Default)
   TITLE:=Jool userspace control programs
-  DEPENDS:=+kmod-jool +libnl +libxtables
+  DEPENDS:=+libnl +kmod-jool-netfilter
 endef
 
-define Package/jool-tools/description
+define Package/jool-tools-netfilter/description
   $(call Package/jool/Default/description)
 
   This package provides the userspace control programs for Jool.
 endef
 
-
-CONFIGURE_ARGS += \
-       --disable-shared \
-       --without-bash-completion-dir
-
-CONFIGURE_VARS += \
-       ac_cv_func_memset=yes \
-       ac_cv_func_strcasecmp=yes
-
 JOOL_AUTOLOAD:= \
-       jool_common \
        jool \
        jool_siit
 
-define Package/jool-tools/install
-       $(INSTALL_DIR) $(1)/usr/bin/
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/jool          $(1)/usr/bin/
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/joold         $(1)/usr/bin/
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/jool_siit     $(1)/usr/bin/
+NOXTABLES:=-DXTABLES_DISABLED
 
-       $(INSTALL_DIR) $(1)/usr/lib/iptables
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/iptables/libxt_JOOL_SIIT.so \
-               $(1)/usr/lib/iptables
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/iptables/libxt_JOOL.so \
-               $(1)/usr/lib/iptables
+define Package/jool-tools-netfilter/conffiles
+/etc/config/jool
+/etc/jool/jool-nat64.conf.json
+/etc/jool/jool-siit.conf.json
+endef
+
+define Package/jool-tools-netfilter/install
+       $(INSTALL_DIR) $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/usr/nat64/jool              $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/usr/joold/joold             $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/usr/siit/jool_siit  $(1)/usr/bin/
 
        $(INSTALL_DIR) $(1)/etc/config
        $(INSTALL_CONF) ./files/jool.config $(1)/etc/config/jool
@@ -136,10 +136,10 @@ define Package/jool-tools/install
        $(INSTALL_BIN) ./files/jool.init $(1)/etc/init.d/jool
 
        $(INSTALL_DIR) $(1)/etc/jool
-       $(INSTALL_DATA) ./files/jool-nat64.conf.json $(1)/etc/jool/jool-nat64.conf.json.default
-       $(INSTALL_DATA) ./files/jool-siit.conf.json $(1)/etc/jool/jool-siit.conf.json.default
+       $(INSTALL_CONF) ./files/jool-nat64.conf.json $(1)/etc/jool/jool-nat64.conf.json
+       $(INSTALL_CONF) ./files/jool-siit.conf.json $(1)/etc/jool/jool-siit.conf.json
        $(INSTALL_DATA) ./files/readme.md $(1)/etc/jool/readme.md
 endef
 
-$(eval $(call KernelPackage,jool))
-$(eval $(call BuildPackage,jool-tools))
+$(eval $(call KernelPackage,jool-netfilter))
+$(eval $(call BuildPackage,jool-tools-netfilter))
Mirror of packages feed