Bump version to v0.9.20260130

luci-app-zapret2/Makefile

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

zapret2/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret2
-PKG_VERSION:=0.9.20260129
+PKG_VERSION:=0.9.20260130
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=bol-van
@@ -14,8 +14,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret2.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=4253b7b4086778226d2698c7e66f54422ee2143e
+PKG_SOURCE_VERSION:=27c49bcfe473dfbc78dcdd89b4c8d3b5ca0118f8
-PKG_SOURCE_DATE:=2026-01-29
+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?
@@ -52,7 +52,7 @@ define Package/$(PKG_NAME)
 	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 +libcap +zlib
+	DEPENDS+= +libnetfilter-queue +libmnl +libcap +zlib
 endef
 
 define Build/Prepare
@@ -197,7 +197,7 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 			$${ZAPRET_INITD} running && $${ZAPRET_INITD} stop >/dev/null 2>&1
 		fi
 	fi
-	if $${PKG_CHECK} zapret2 >/dev/null 2>&1; then
+	if $${PKG_CHECK} zapret2 2>/dev/null | grep -q . ; then
 		if [ ! -f "/opt/zapret2/sync_config.sh" ]; then
 			echo "Please uninstall incompatible \"zapret2\" package!"
 			exit 47
@@ -207,13 +207,17 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 			exit 48
 		fi
 	fi
-	if $${PKG_CHECK} luci-app-zapret2 >/dev/null 2>&1; then
+	if $${PKG_CHECK} luci-app-zapret2 2>/dev/null | grep -q . ; then
 		SVC_FILE=/www/luci-static/resources/view/zapret2/service.js
 		if [ ! -f "$${SVC_FILE}" ] || ! grep -Fq "/remittor/zapret-openwrt" "$${SVC_FILE}"; then
 			echo "Please uninstall incompatible \"luci-app-zapret2\" package!"
 			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
@@ -223,10 +227,10 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 		[ -d "$${ZAPRET_DIR}" ] && rm -rf $${ZAPRET_DIR}
 		echo "All files of the previously installed package have been removed!"
 	fi
-	if $${PKG_CHECK} zapret2-mdig >/dev/null 2>&1; then
+	if $${PKG_CHECK} zapret2-mdig 2>/dev/null | grep -q . ; then
 		$${PKG_REMOVE} zapret2-mdig
 	fi
-	if $${PKG_CHECK} zapret2-ip2net >/dev/null 2>&1; then
+	if $${PKG_CHECK} zapret2-ip2net 2>/dev/null | grep -q . ; then
 		$${PKG_REMOVE} zapret2-ip2net
 	fi
 	if [ ! -d "$${ZAPRET_DIR}" ]; then

zapret2/update-pkg.sh

@@ -89,6 +89,16 @@ fi
 
 # -------------------------------------------------------------------------------------------------------
 
+function check_pkg_installed
+{
+	local pkg_name="$1"
+	if [ "$PKG_MGR" = apk ]; then
+		apk info -e "$pkg_name" >/dev/null 2>&1; 
+	else
+		opkg status "$pkg_name" 2>/dev/null | grep -q .
+	fi
+}
+
 function get_distrib_param
 {
 	local parname=$1
@@ -475,7 +485,7 @@ if [ "$opt_update" != "" ]; then
 	mkdir $ZAP_PKG_DIR
 	ZAP_PKG_FN="$ZAP_PKG_DIR/${ZAP_PKG_URL##*/}"
 	echo "Download ZIP-file..."
-	curl -s -L --max-time 15 -H "$CURL_HEADER2" "$ZAP_PKG_URL" -o "$ZAP_PKG_FN"
+	curl -s -L --retry 5 --retry-delay 1 --retry-max-time 55 --retry-all-errors --max-time 30 -H "$CURL_HEADER2" "$ZAP_PKG_URL" -o "$ZAP_PKG_FN"
 	if [ $? -ne 0 ]; then
 		echo "ERROR: cannot download package!"
 		return 215
@@ -529,14 +539,31 @@ if [ "$opt_update" != "" ]; then
 	if [ "$opt_forced" = true ]; then
 		pkg_mgr_update
 	fi
-	if ${PKG_CHECK} ${ZAPRET_CFG_NAME}-mdig >/dev/null 2>&1; then
+	if check_pkg_installed ${ZAPRET_CFG_NAME}-mdig; then
 		echo "Uninstall mdig..."
 		${PKG_REMOVE} ${ZAPRET_CFG_NAME}-mdig
 	fi
-	if ${PKG_CHECK} ${ZAPRET_CFG_NAME}-ip2net >/dev/null 2>&1; then
+	if check_pkg_installed ${ZAPRET_CFG_NAME}-ip2net; 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"