Bump version to v0.9.20260130-r2

.github/workflows/build.yml

@@ -275,8 +275,6 @@ jobs:
           sed -i 's/CONFIG_LUCI_JSMIN=y/CONFIG_LUCI_JSMIN=n/g' .config
           sed -i 's/CONFIG_LUCI_CSSTIDY=y/CONFIG_LUCI_CSSTIDY=n/g' .config
           grep -q '^CONFIG_LUCI_CSSTIDY=' .config || echo 'CONFIG_LUCI_CSSTIDY=n' >> .config
-          sed -i 's/CONFIG_PACKAGE_luajit2=n/CONFIG_PACKAGE_luajit2=y/g' .config
-          grep -q '^CONFIG_PACKAGE_luajit2=' .config || echo 'CONFIG_PACKAGE_luajit2=y' >> .config
           echo "status=success" >> $GITHUB_OUTPUT
 
       - name: Show config
@@ -291,8 +289,7 @@ jobs:
         env:
           ARCH_TAG: ${{ matrix.arch }}
         run: |
-          PKGLIST="package/feeds/packages/luajit2/compile"
+          PKGLIST="package/zapret-openwrt/zapret2/compile"
-          PKGLIST="$PKGLIST package/zapret-openwrt/zapret2/compile"
           if [ "$ARCH_TAG" = "$LUCI_ARCH" ]; then
               PKGLIST="$PKGLIST package/zapret-openwrt/luci-app-zapret2/compile"
           fi

luci-app-zapret2/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-zapret2
 PKG_VERSION:=0.9.20260130
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=MIT
 PKG_MAINTAINER:=remittor <https://github.com/remittor>
 

zapret2/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret2
 PKG_VERSION:=0.9.20260130
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -14,30 +14,45 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret2.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=27c49bcfe473dfbc78dcdd89b4c8d3b5ca0118f8
+PKG_SOURCE_VERSION:=27d387c76dd3a356a284b2875d5787a3b4d3cb4e
 PKG_SOURCE_DATE:=2026-01-30
 
 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret2/archive/refs/tags/v$(PKG_VERSION).tar.gz?
 #PKG_HASH:=skip
 
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
+
 LUA_JIT?=1
 
 ifeq ($(LUA_JIT),1)
-	LUAJIT_VER?=2.1
 	LUA_VER?=5.1
-	LUA_DEPEND:=luajit2
+	LUA_DEPEND:=
-	LUA_INCLUDE:=-I$(STAGING_DIR)/usr/include/luajit-$(LUAJIT_VER)
+	LUAJIT_VER?=2.1
-	LUA_LIBRARY:=-L$(STAGING_DIR)/usr/lib -lluajit-$(LUA_VER)
+	ifeq ($(ARCH),riscv64)
+		LUAJIT_URL:=https://github.com/infiWang/luajit2/archive
+		LAUJIT_BRANCH:=v2.1-20260114-riscv64
+		LUAJIT_COMMIT=4d8cf882a3a4ed3259407ad78614a60b02dd553f
+		LUAJIT_RELEASE:=2.1-20260114-$(LUAJIT_COMMIT)
+		LUAJIT_URL_FILE:=$(LUAJIT_COMMIT).tar.gz
+	else
+		LUAJIT_URL:=https://github.com/openresty/luajit2/archive/refs/tags
+		LUAJIT_RELEASE:=2.1-20250826
+		LUAJIT_URL_FILE:=v$(LUAJIT_RELEASE).tar.gz
+	endif
+	LUAJIT_TGZ:=$(PKG_NAME)-luajit-$(LUAJIT_RELEASE).tar.gz
+	LUASRC_DIR:=$(PKG_BUILD_DIR)/luajit-$(LUAJIT_RELEASE)
+	LUAOUT_DIR:=$(PKG_BUILD_DIR)/luajit-out
+	LUA_INCLUDE:=-I$(LUAOUT_DIR)/include/luajit-$(LUAJIT_VER)
+	LUA_LIBRARY:=-L$(LUAOUT_DIR)/lib -lluajit-$(LUA_VER)
 else
 	LUA_VER?=5.4
-	LUA_DEPEND:=lua$(LUA_VER)
+	LUA_DEPEND:= +lua$(LUA_VER)
 	LUA_INCLUDE:=-I$(STAGING_DIR)/usr/include/lua$(LUA_VER)
 	LUA_LIBRARY:=-L$(STAGING_DIR)/usr/lib -llua$(LUA_VER)
 endif
 
-include $(INCLUDE_DIR)/package.mk
-
 #TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS)
 #TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
 
@@ -49,23 +64,74 @@ define Package/$(PKG_NAME)
 	TITLE:=$(PKG_NAME)
 	SUBMENU:=Zapret2
 	URL:=https://github.com/bol-van/zapret2
-	DEPENDS:= +nftables +curl +gzip +$(LUA_DEPEND)
+	DEPENDS:= +nftables +curl +gzip $(LUA_DEPEND)
 	DEPENDS+= +coreutils +coreutils-sort +coreutils-sleep
 	DEPENDS+= +kmod-nft-nat +kmod-nft-offload +kmod-nft-queue
 	DEPENDS+= +libnetfilter-queue +libmnl +libcap +zlib
 endef
 
+ifeq ($(LUA_JIT),1)
+define Download/$(PKG_NAME)-luajit
+	FILE:=$(LUAJIT_TGZ)
+	URL:=$(LUAJIT_URL)
+	URL_FILE:=$(LUAJIT_URL_FILE)
+	HASH:=skip
+endef
+$(eval $(call Download,$(PKG_NAME)-luajit))
+endif
+
 define Build/Prepare
 	$(Build/Prepare/Default)
 	rm -f $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws2
 	rm -f $(PKG_BUILD_DIR)/ip2net/ip2net
 	rm -f $(PKG_BUILD_DIR)/mdig/mdig
+	if [ "$(LUA_JIT)" = 1 ]; then \
+		if [ ! -f "$(DL_DIR)/$(LUAJIT_TGZ)" ]; then \
+			echo "ERROR: LuaJIT tarball not found:"; \
+			echo "  $(LUAJIT_TGZ)"; \
+			echo "Run: make package/$(PKG_NAME)/download"; \
+			false; \
+		fi ; \
+		rm -rf $(LUASRC_DIR) ; \
+		mkdir -p $(LUASRC_DIR) ; \
+		tar -xzf "$(DL_DIR)/$(LUAJIT_TGZ)" --strip-components=1 -C "$(LUASRC_DIR)" ; \
+		rm -rf $(LUAOUT_DIR) ; \
+	fi
 endef
 
 #define Build/Configure
 #endef
 
+ifeq ($(HOST_ARCH),$(filter $(HOST_ARCH), x86_64 mips64))
+  ifeq ($(CONFIG_ARCH_64BIT),)
+    HOST_BITS := -m32
+  endif
+endif
+
 define Build/Compile
+	if [ "$(LUA_JIT)" = 1 ]; then \
+		$(MAKE) $(PKG_JOBS) -C $(LUASRC_DIR) \
+			HOST_CC="$(HOSTCC) $(HOST_CFLAGS) $(HOST_BITS)" \
+			CROSS="$(TARGET_CROSS)" \
+			XCFLAGS="-DLUAJIT_DISABLE_FFI" \
+			TARGET_CFLAGS="-Os -s -flto=auto $(TARGET_CFLAGS)" \
+			TARGET_AR="$(TARGET_AR) rcus" \
+			BUILDMODE=static \
+			DESTDIR=$(LUAOUT_DIR) \
+			PREFIX= \
+			TARGET_SYS=Linux ; \
+		rm -rf $(LUAOUT_DIR) ; \
+		if [ ! -f $(LUASRC_DIR)/src/libluajit.a ]; then \
+			echo "ERROR: file libluajit.a not found!"; \
+			false; \
+		fi ; \
+		mkdir -p $(LUAOUT_DIR) ; \
+		$(MAKE) -C $(LUASRC_DIR) \
+			DESTDIR=$(LUAOUT_DIR) \
+			PREFIX= \
+			TARGET_SYS=Linux \
+			install ; \
+	fi
 	$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) $(TARGET_CONFIGURE_OPTS) LUA_JIT=$(LUA_JIT) LUA_CFLAGS="$(LUA_INCLUDE)" LUA_LIB="$(LUA_LIBRARY)"
 	$(MAKE) -C $(PKG_BUILD_DIR)/ip2net $(TARGET_CONFIGURE_OPTS)
 	$(MAKE) -C $(PKG_BUILD_DIR)/mdig $(TARGET_CONFIGURE_OPTS)
@@ -214,10 +280,6 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 			exit 55
 		fi
 	fi
-	if $${PKG_CHECK} luajit 2>/dev/null | grep -q . ; then
-		echo "ERROR: conflict package \"luajit\". Required \"luajit2\" package. Please install new package \"zapret2\" manually!"
-		exit 59
-	fi
 	if [ -f "$${ZAPRET_CFG}" ] && ! grep -q "run_on_boot" "$${ZAPRET_CFG}"; then
 		if [ -x "$${ZAPRET_INITD}" ]; then
 			$${ZAPRET_INITD} running && $${ZAPRET_INITD} stop >/dev/null 2>&1

zapret2/update-pkg.sh

@@ -547,23 +547,6 @@ if [ "$opt_update" != "" ]; then
 		echo "Uninstall ip2net..."
 		${PKG_REMOVE} ${ZAPRET_CFG_NAME}-ip2net
 	fi
-	if [ "$ZAPRET_CFG_NAME" = zapret2 -a "$PKG_MGR" = opkg ]; then
-		if [ "$ZAP_CUR_PKG_VER" != "" ]; then
-			ZAP_VER_CMP=$( pkg_version_cmp "$ZAP_CUR_PKG_VER" "0.9.20260129-r1" )
-			if [ "$ZAP_VER_CMP" = "L" ]; then
-				echo "WARN: Detect installed zapret2 with luajit depend."
-				ZAP_DEPENDS=$( opkg whatdepends luajit | awk '/^\s/{print $1}' | grep -q -v -E '^(luajit|zapret2|luci-app-zapret2)$' )
-				if [ "$ZAP_DEPENDS" != "" ]; then
-					echo "ERROR: Cannot remove package luajit! Please install package \"zapret2\" manually!"
-					return 239
-				fi
-				[ -x /etc/init.d/zapret2 ] && /etc/init.d/zapret2 stop
-				sleep 1
-				opkg remove --force-remove --force-depends luajit
-				opkg install --force-reinstall luajit2
-			fi
-		fi
-	fi
 	echo "Install downloaded packages..."
 	if [ "$PKG_MGR" != "apk" ]; then
 		opkg install --force-reinstall "$ZAP_PKG_BASE_FN"