Bump version to v72.20251219

luci-app-zapret/Makefile

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

zapret-ip2net/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret-ip2net
-PKG_VERSION:=72.20251218
+PKG_VERSION:=72.20251219
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=bol-van
@@ -11,7 +11,7 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=994e9c34883ddc95e51c8285f134bd01fd6b6732
-PKG_SOURCE_DATE:=2025-12-18
+PKG_SOURCE_DATE:=2025-12-19
 
 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret/archive/refs/tags/v$(PKG_VERSION).tar.gz?

zapret-mdig/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret-mdig
-PKG_VERSION:=72.20251218
+PKG_VERSION:=72.20251219
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=bol-van
@@ -11,7 +11,7 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=994e9c34883ddc95e51c8285f134bd01fd6b6732
-PKG_SOURCE_DATE:=2025-12-18
+PKG_SOURCE_DATE:=2025-12-19
 
 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret/archive/refs/tags/v$(PKG_VERSION).tar.gz?

zapret-tpws/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret-tpws
-PKG_VERSION:=72.20251218
+PKG_VERSION:=72.20251219
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=bol-van
@@ -11,7 +11,7 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=994e9c34883ddc95e51c8285f134bd01fd6b6732
-PKG_SOURCE_DATE:=2025-12-18
+PKG_SOURCE_DATE:=2025-12-19
 
 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret/archive/refs/tags/v$(PKG_VERSION).tar.gz?

zapret/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret
-PKG_VERSION:=72.20251218
+PKG_VERSION:=72.20251219
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=bol-van
@@ -15,7 +15,7 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=994e9c34883ddc95e51c8285f134bd01fd6b6732
-PKG_SOURCE_DATE:=2025-12-18
+PKG_SOURCE_DATE:=2025-12-19
 
 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret/archive/refs/tags/v$(PKG_VERSION).tar.gz?

zapret/update-pkg.sh

@@ -72,7 +72,7 @@ function download_json
 function get_pkg_version
 {
 	local pkg_name="$1"
-	local ver line pkg_prefix
+	local ver line base
 	if [ "$PKG_MGR" = opkg ]; then
 		ver=$( opkg list-installed "$pkg_name" 2>/dev/null | awk -F' - ' '{print $2}' | tr -d '\r' )
 		if [ -n "$ver" ]; then
@@ -83,16 +83,16 @@ function get_pkg_version
 	if [ "$PKG_MGR" = apk ]; then
 		line=$( apk info -e "$pkg_name" 2>/dev/null || true )
 		if [ -n "$line" ]; then
-			pkg_prefix="${pkg_name}-"
+			base=${line%-r[0-9]*}
+			ver=${base##*-}
 			case "$line" in
-				"$pkg_prefix"*)
+				*-r[0-9]*)
-					ver=${line#"$pkg_prefix"}
+					echo -n "$ver${line#$base}"
 					;;
 				*)
-					ver=${line##*-}
+					echo -n "$ver"
 					;;
 			esac
-			echo -n "$ver"
 			return 0
 		fi
 	fi
@@ -106,7 +106,7 @@ function normalize_version
 	local base
 	local major minor rel
 	case "$ver" in
-		*-r*)
+		*-r[0-9]*)
 			rel="${ver##*-r}"
 			base="${ver%-r*}"
 			;;
@@ -356,6 +356,10 @@ if [ "$opt_update" != "" ]; then
 		echo "ERROR: downloaded package is incorrect! (size = $ZAP_PKG_SZ)"
 		return 216
 	fi
+	if ! command -v unzip >/dev/null 2>&1; then
+		echo "ERROR: package \"upzip\" not installed!"
+		return 218
+	fi
 	unzip -q "$ZAP_PKG_FN" -d $ZAP_PKG_DIR
 	rm -f "$ZAP_PKG_FN"
 	if [ "$PKG_MGR" = "apk" ]; then