Bump version to v70.20250323

.github/workflows/build.yml

@@ -110,10 +110,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: [ openwrt-23.05, SNAPSHOT ]
+        branch: [ openwrt-24.10, SNAPSHOT ]
         arch:
           - aarch64_cortex-a53
           - aarch64_cortex-a72
+          - aarch64_cortex-a76
           - aarch64_generic
           - arm_arm1176jzf-s_vfp
           - arm_arm926ej-s
@@ -127,7 +128,6 @@ jobs:
           - arm_cortex-a9_neon
           - arm_cortex-a9_vfpv3-d16
           - arm_fa526
-          - arm_mpcore
           - arm_xscale
           - mips64_octeonplus
           - mips_24kc
@@ -141,20 +141,18 @@ jobs:
         isTestOrFake:
           - ${{ needs.check.outputs.test_build == 'true' || needs.check.outputs.fake_build == 'true' }}
         exclude:
-          - branch: SNAPSHOT
+          - branch: openwrt-24.10
-            arch: arm_mpcore
+            arch: arm_cortex-a7_neon-vfpv4
           - branch: SNAPSHOT
             arch: arm_cortex-a9_vfpv3-d16
           - { isTestOrFake: true }
         include:
-          - branch: openwrt-23.05
+          - branch: openwrt-24.10
             arch: x86_64
-          - branch: openwrt-23.05
+          - branch: openwrt-24.10
             arch: aarch64_cortex-a53
           - branch: SNAPSHOT
             arch: aarch64_cortex-a53
-          - branch: SNAPSHOT
-            arch: aarch64_cortex-a76
     container:
       image: openwrt/sdk:${{ matrix.arch }}-${{ matrix.branch }}
       options: --user root
@@ -181,7 +179,7 @@ jobs:
           sed -r -i 's/^rm.+//' setup.sh
           ./setup.sh
           ls -lh
-          if [ "$BRANCH" = "openwrt-23.05" ]; then
+          if [ "$BRANCH" = "openwrt-24.10" ]; then
               echo "PKGTYPE=ipk" >> $GITHUB_ENV
           else
               echo "PKGTYPE=apk" >> $GITHUB_ENV

luci-app-zapret/Makefile

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

luci-app-zapret/htdocs/luci-static/resources/view/zapret/tools.js

@@ -161,6 +161,11 @@ return baseclass.extend({
                 if (spos > 0) {
                     ver = ver.substring(0, spos);
                 }
+                let mpos = ver.lastIndexOf("-");
+                if (mpos > 0 && ver.substring(mpos+1, mpos+2) == 'r') {
+                    // release number
+                    ver = ver.substring(0, mpos);
+                }
             }
             pkg_dict[name] = ver;
         }

zapret-ip2net/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret-ip2net
-PKG_VERSION:=70.20250213
+PKG_VERSION:=70.20250323
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -9,8 +9,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f62b289cb5e0566633aa51f163651c656f9e1cc1
+PKG_SOURCE_VERSION:=77df43b9cba68a82ca884cd56238e89f9851da47
-PKG_SOURCE_DATE:=2025-02-13
+PKG_SOURCE_DATE:=2025-03-23
 
 #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:=70.20250213
+PKG_VERSION:=70.20250323
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -9,8 +9,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f62b289cb5e0566633aa51f163651c656f9e1cc1
+PKG_SOURCE_VERSION:=77df43b9cba68a82ca884cd56238e89f9851da47
-PKG_SOURCE_DATE:=2025-02-13
+PKG_SOURCE_DATE:=2025-03-23
 
 #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:=70.20250213
+PKG_VERSION:=70.20250323
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -9,8 +9,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f62b289cb5e0566633aa51f163651c656f9e1cc1
+PKG_SOURCE_VERSION:=77df43b9cba68a82ca884cd56238e89f9851da47
-PKG_SOURCE_DATE:=2025-02-13
+PKG_SOURCE_DATE:=2025-03-23
 
 #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:=70.20250213
+PKG_VERSION:=70.20250323
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -13,8 +13,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f62b289cb5e0566633aa51f163651c656f9e1cc1
+PKG_SOURCE_VERSION:=77df43b9cba68a82ca884cd56238e89f9851da47
-PKG_SOURCE_DATE:=2025-02-13
+PKG_SOURCE_DATE:=2025-03-23
 
 #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/comfunc.sh

@@ -145,6 +145,12 @@ function insert_cron_task_logs
 function init_before_start
 {
 	local DAEMON_LOG_ENABLE=$1
+	local HOSTLIST_FN="$ZAPRET_BASE/ipset/zapret-hosts-user.txt"
+	[ ! -f "$HOSTLIST_FN" ] && touch "$HOSTLIST_FN"
+	local HOSTLIST_SZ=$( wc -c < "$HOSTLIST_FN" )
+	if [ "$HOSTLIST_SZ" -le 3 ]; then
+		echo "abra-cadabra.com" > "$HOSTLIST_FN"
+	fi
 	chmod 644 $ZAPRET_BASE/ipset/*.txt
 	chmod 666 $ZAPRET_BASE/ipset/*.log
 	rm -f /tmp/zapret*.log

zapret/ipset/zapret-hosts-user-exclude.txt

@@ -1,6 +1,20 @@
+127.0.0.0/8
 10.0.0.0/8
 172.16.0.0/12
 192.168.0.0/16
 169.254.0.0/16
+::1
 fc00::/7
 fe80::/10
+play.google.com
+android.com
+google-analytics.com
+googleusercontent.com
+gstatic.com
+gvt1.com
+ggpht.com
+dl.google.com
+dl-ssl.google.com
+android.clients.google.com
+gvt2.com
+gvt3.com