mirror: replace github.com → uralgit.ru for RF access

PR #777

.github/workflows/build.yml

@@ -116,7 +116,7 @@ jobs:
       - id: set
         run: |
           echo "IPK_BRANCH=v24.10.5" >> "$GITHUB_OUTPUT"
-          echo "APK_BRANCH=v25.12.0-rc2" >> "$GITHUB_OUTPUT"
+          echo "APK_BRANCH=v25.12.0" >> "$GITHUB_OUTPUT"
           echo "XXX_BRANCH=SNAPSHOT" >> "$GITHUB_OUTPUT"
 
   build:

luci-app-zapret2/Makefile

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

luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/env.js

@@ -26,7 +26,7 @@ return baseclass.extend({
                           'https://github.com/bol-van/zapret2/blob/master/init.d/custom.d.examples.linux/50-stun4all',
                           'https://github.com/bol-van/zapret2/tree/master/init.d/custom.d.examples.linux'
                         ],
-    nfqws_opt_url     : 'https://github.com/remittor/zapret-openwrt/discussions/',
+    nfqws_opt_url     : 'https://uralgit.ru/ural/zapret-openwrt/discussions/',
 
     autoHostListFN    : '/opt/zapret2/ipset/zapret-hosts-auto.txt',
     autoHostListDbgFN : '/opt/zapret2/ipset/zapret-hosts-auto-debug.log',

luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/service.js

@@ -416,7 +416,7 @@ return view.extend({
         }
         
         let url1 = 'https://github.com/bol-van/'+tools.appName;
-        let url2 = 'https://github.com/remittor/zapret-openwrt';
+        let url2 = 'https://uralgit.ru/ural/zapret-openwrt';
 
         return E([
             E('h2', { 'class': 'fade-in' }, page_title),

luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/updater.js

@@ -17,7 +17,7 @@ const btn_style_success  = 'btn cbi-button-success important';
 const fn_update_pkg_sh   = '/opt/'+tools.appName+'/update-pkg.sh';
 
 return baseclass.extend({
-    releasesUrlPrefix : 'https://raw.githubusercontent.com/remittor/zapret-openwrt/gh-pages/releases/',
+    releasesUrlPrefix : 'https://uralgit.ru/ural/zapret-openwrt/raw/branch/gh-pages/releases/',
     
     appendLog: function(msg, end = '\n')
     {

zapret2/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret2
-PKG_VERSION:=0.9.20260226
+PKG_VERSION:=0.9.20260307
 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:=697f9fc986ebdd05af05f5c058f096baf613748c
-PKG_SOURCE_DATE:=2026-02-26
+PKG_SOURCE_VERSION:=d3b3011000f103c5af161cc4e3167e80fd6928a2
+PKG_SOURCE_DATE:=2026-03-07
 
 #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?

zapret2/dwc.sh

@@ -209,17 +209,17 @@ while IFS='|' read -r ID TAG COUNTRY PROVIDER TSIZE URL; do
 		if [ "$opt_dig" != "" ]; then
 			RESP=$( dig +time=2 +retry=1 $OPT_DIG_DNS +short "$DOMAIN" 2>&1 )
 			echo "$RESP"
-			DST_IP=$( echo "$RESP" | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$' | head -n1 )
+			DST_IP=$( echo "$RESP" | grep -Eo '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$' | head -n1 )
 		else
 			CURL_TIMEOUTS="--connect-timeout 3 --max-time 4 --speed-time 4 --speed-limit 1"
 			RESP=$( curl -4 -I --no-progress-meter $CURL_TIMEOUTS -w '%{remote_ip}\n' "$URL" 2>&1 )
 			echo "$RESP"
-			DST_IP=$( echo "$RESP" | grep -E '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | tail -1 )
+			DST_IP=$( echo "$RESP" | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | tail -1 )
 			if [ -z "$DST_IP" ]; then
 				echo "----------------------------------"
 				RESP=$( curl -4 --no-progress-meter $CURL_TIMEOUTS -r 0-0 -w '%{remote_ip}\n' "$URL" 2>&1 )
 				echo "$RESP"
-				DST_IP=$( echo "$RESP" | grep -E '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | tail -1 )
+				DST_IP=$( echo "$RESP" | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | tail -1 )
 			fi
 		fi
 		if [ "$DST_IP" = "" ]; then

zapret2/init.d.sh

@@ -1,6 +1,10 @@
 #!/bin/sh /etc/rc.common
 # Copyright (c) 2024 remittor
 
+# check if script is running during the image creation process (Image Builder).
+# $IPKG_INSTROOT is used by opkg, $ROOT is used by apk:
+[ -n "$IPKG_INSTROOT" ] || [ -n "$ROOT" ] && exit 0
+
 USE_PROCD=1
 # after network
 START=21

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

@@ -23,6 +23,13 @@ vk.ru
 vk.com
 yandex.ru
 ya.ru
+####################################
+max.ru
+web.max.ru
+st.max.ru
+calls.okcdn.ru
+i.oneme.ru
+ws-api.oneme.ru
 #################################### Epicgames
 easy.ac
 fab.com

zapret2/ipset/zapret-ip-exclude.txt

@@ -1,4 +1,9 @@
+127.0.0.0/8
 10.0.0.0/8
-169.254.0.0/16
 172.16.0.0/12
 192.168.0.0/16
+169.254.0.0/16
+100.64.0.0/10
+::1
+fc00::/7
+fe80::/10

zapret2/update-pkg.sh

@@ -54,10 +54,10 @@ fi
 ZAP_CPU_ARCH="$DISTRIB_ARCH"
 
 if [ $ZAPRET_CFG_NAME = "zapret" ]; then
-	ZAP_REL_URL="https://raw.githubusercontent.com/remittor/zapret-openwrt/gh-pages/releases/releases_zap1_$ZAP_CPU_ARCH.json"
+	ZAP_REL_URL="https://uralgit.ru/ural/zapret-openwrt/raw/branch/gh-pages/releases/releases_zap1_$ZAP_CPU_ARCH.json"
 fi
 if [ $ZAPRET_CFG_NAME = "zapret2" ]; then
-	ZAP_REL_URL="https://raw.githubusercontent.com/remittor/zapret-openwrt/gh-pages/releases/releases_zap2_$ZAP_CPU_ARCH.json"
+	ZAP_REL_URL="https://uralgit.ru/ural/zapret-openwrt/raw/branch/gh-pages/releases/releases_zap2_$ZAP_CPU_ARCH.json"
 fi
 CURL_TIMEOUT=5
 CURL_HEADER1="Accept: application/json"
@@ -551,7 +551,7 @@ if [ "$opt_update" != "" ]; then
 	if [ "$PKG_MGR" != "apk" ]; then
 		opkg install --force-reinstall "$ZAP_PKG_BASE_FN"
 	else
-		apk add --allow-untrusted --upgrade "$ZAP_PKG_BASE_FN"
+		apk add --allow-untrusted --upgrade --force-non-repository "$ZAP_PKG_BASE_FN"
 	fi
 	if [ $? -ne 0 ]; then
 		echo "ERROR: Failed to install package $ZAP_PKG_BASE_FN"
@@ -560,7 +560,7 @@ if [ "$opt_update" != "" ]; then
 	if [ "$PKG_MGR" != "apk" ]; then
 		opkg install --force-reinstall "$ZAP_PKG_LUCI_FN"
 	else
-		apk add --allow-untrusted --upgrade "$ZAP_PKG_LUCI_FN"
+		apk add --allow-untrusted --upgrade --force-non-repository "$ZAP_PKG_LUCI_FN"
 	fi
 	if [ $? -ne 0 ]; then
 		echo "ERROR: Failed to install package $ZAP_PKG_LUCI_FN"