updater: Add flag --force-non-repository for APK

PR #777

.github/ISSUE_TEMPLATE/bug_report_en.yml

@@ -55,7 +55,6 @@ body:
         - **OpenWrt version**: 
         - **Zapret version**: 
         - **Router model**: 
-      render: markdown
     validations:
       required: true
 

.github/ISSUE_TEMPLATE/bug_report_ru.yml

@@ -55,7 +55,6 @@ body:
         - **OpenWrt версия**: 
         - **Zapret версия**: 
         - **Роутер модель**: 
-      render: markdown
     validations:
       required: true
 

.github/ISSUE_TEMPLATE/help_wanted_en.yml

@@ -53,7 +53,6 @@ body:
         - **OpenWrt version**: 
         - **Zapret version**: 
         - **Router model**: 
-      render: markdown
     validations:
       required: true
 

.github/ISSUE_TEMPLATE/help_wanted_ru.yml

@@ -53,7 +53,6 @@ body:
         - **OpenWrt версия**: 
         - **Zapret версия**: 
         - **Роутер модель**: 
-      render: markdown
     validations:
       required: true
 

zapret/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

zapret/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

zapret/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

zapret/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

zapret/update-pkg.sh

@@ -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"