Bump version to v72.20260116

PR: ad6b23f4aa

.github/workflows/build.yml

@@ -155,6 +155,7 @@ jobs:
           - mipsel_24kc_24kf
           - mipsel_74kc
           - mipsel_mips32
+          - riscv64_riscv64
           - riscv64_generic
           - x86_64
         isTestOrFake:
@@ -164,6 +165,10 @@ jobs:
             arch: arm_cortex-a9_vfpv3-d16
           - branch: ${{ needs.var.outputs.APK_BRANCH }}
             arch: mips_4kec
+          - branch: ${{ needs.var.outputs.APK_BRANCH }}
+            arch: riscv64_riscv64
+          - branch: ${{ needs.var.outputs.IPK_BRANCH }}
+            arch: riscv64_generic
           - { isTestOrFake: true }
         include:
           - branch: ${{ needs.var.outputs.IPK_BRANCH }}
@@ -271,6 +276,8 @@ jobs:
         run: |
           make defconfig
           sed -i 's/CONFIG_LUCI_JSMIN=y/CONFIG_LUCI_JSMIN=n/g' .config
+          sed -i 's/CONFIG_LUCI_CSSMIN=y/CONFIG_LUCI_CSSMIN=n/g' .config
+          grep -q '^CONFIG_LUCI_CSSMIN=' .config || echo 'CONFIG_LUCI_CSSMIN=n' >> .config
           echo "status=success" >> $GITHUB_OUTPUT
 
       - name: Show config

.github/workflows/releases.yml

@@ -5,7 +5,7 @@ on:
     workflows: ["build"]
     types: [completed]
   release:
-    types: [published, created, edited]
+    types: [published, unpublished, created, edited, deleted, prereleased]
 
 permissions:
   contents: write
@@ -25,6 +25,62 @@ jobs:
           ref: gh-pages
         continue-on-error: true
 
+      - name: Wait for GitHub API consistency (release events)
+        if: github.event_name == 'release'
+        env:
+          REPO: ${{ github.repository }}
+          ACTION: ${{ github.event.action }}
+          TARGET_ID: ${{ github.event.release.id }}
+          TARGET_NAME: ${{ github.event.release.name }}
+        run: |
+          set -e
+          echo "Release action: $ACTION"
+          echo "Target release id: $TARGET_ID"
+          max=10
+          delay=6
+          check() {
+            curl -s https://api.github.com/repos/$REPO/releases
+          }
+          for iter in $(seq 1 $max); do
+            case "$ACTION" in
+              created)
+                echo "Release created (draft). No API wait needed."
+                exit 0
+                ;;
+              published|prereleased)
+                if check | jq "any(.[]; .id == $TARGET_ID)"; then
+                  echo "Release appeared in API"
+                  exit 0
+                fi
+                ;;
+              deleted)
+                if ! check | jq "any(.[]; .id == $TARGET_ID)"; then
+                  echo "Release disappeared from API"
+                  exit 0
+                fi
+                ;;
+              unpublished)
+                if check | jq "any(.[]; .id == $TARGET_ID and .draft == true)"; then
+                  echo "Release is now draft"
+                  exit 0
+                fi
+                ;;
+              edited)
+                if check | jq "any(.[]; .id == $TARGET_ID and .name == \"$TARGET_NAME\")"; then
+                  echo "Release updated"
+                  exit 0
+                fi
+                ;;
+              *)
+                echo "No consistency wait needed for action: $ACTION"
+                exit 0
+                ;;
+            esac
+            echo "Retry $iter/$max..."
+            sleep "$delay"
+          done
+          echo "WARNING: API consistency timeout for action $ACTION"
+    
       - name: Save FULL releases.json
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

luci-app-zapret/Makefile

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

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

@@ -0,0 +1,130 @@
+'use strict';
+'require baseclass';
+'require fs';
+'require poll';
+'require uci';
+'require ui';
+'require view';
+'require view.zapret.tools as tools';
+
+const btn_style_neutral  = 'btn';
+const btn_style_action   = 'btn cbi-button-action';
+const btn_style_positive = 'btn cbi-button-save important';
+const btn_style_negative = 'btn cbi-button-reset important';
+const btn_style_warning  = 'btn cbi-button-negative';
+const btn_style_success  = 'btn cbi-button-success important';
+
+const fn_dwc_sh   = '/opt/'+tools.appName+'/dwc.sh';
+
+return baseclass.extend({
+    appendLog: function(msg, end = '\n')
+    {
+        this.logArea.value += msg + end;
+        this.logArea.scrollTop = this.logArea.scrollHeight;
+    },
+
+    dpiCheck: async function()
+    {
+        this._action = 'dpiCheck';
+        this.appendLog('DPI check [tcp 16-20]...');
+        this.appendLog('Original sources: https://github.com/hyperion-cs/dpi-checkers');
+        this.appendLog('WEB-version: https://hyperion-cs.github.io/dpi-checkers/ru/tcp-16-20/');
+        let cmd = [ fn_dwc_sh ];
+        let resolve_dns = document.getElementById('cfg_resolve_dns');
+        let dns_ip = resolve_dns.options[resolve_dns.selectedIndex].text;
+        if (dns_ip && dns_ip != 'default') {
+            cmd.push(...[ '-d', dns_ip.trim() ]);
+        }
+        cmd.push('-R');  // show recommendations
+        let log = '/tmp/'+tools.appName+'_dwc.log';
+        let callback = this.execAndReadCallback;
+        let wnd = this;
+        return tools.execAndRead({ cmd: cmd, log: log, logArea: this.logArea, callback: callback, cbarg: wnd });
+    },
+
+    execAndReadCallback: function(wnd, rc, txt = '')
+    {
+        if (rc == 0 && txt) {
+            if (wnd._action == 'dpiCheck') {
+                wnd.appendLog('=========================================================');
+                return;
+            }
+        }
+        if (rc >= 500) {
+            if (txt) {
+                wnd.appendLog(txt.startsWith('ERROR') ? txt : 'ERROR: ' + txt);
+            } else {
+                wnd.appendLog('ERROR: ' + wnd._action + ': Terminated with error code = ' + rc);
+            }
+        } else {
+            wnd.appendLog('ERROR: Process finished with retcode = ' + rc);
+        }
+        wnd.appendLog('=========================================================');
+    },
+
+    openDiagnostDialog: function(pkg_arch)
+    {
+        this.pkg_arch = pkg_arch;
+
+        let DNS_LIST = [
+            '8.8.8.8',          // Google
+            '8.8.4.4',          // Google
+            '1.1.1.1',          // Cloudflare
+            '1.0.0.1',          // Cloudflare
+            '9.9.9.9',          // Quad9
+            '149.112.112.112',  // Quad9
+            '208.67.222.222',   // OpenDNS
+            '208.67.220.220',   // OpenDNS
+            '8.26.56.26',       // Comodo
+            '8.20.247.20',      // Comodo
+            '64.6.64.6',        // Verisign
+            '64.6.65.6',        // Verisign
+        ];
+        let dns_list = [ ];
+        dns_list.push( E('option', { value: 'dns_default' }, [ 'default' ] ) );
+        for (let id = 0; id < DNS_LIST.length; id++) {
+            let dns_ipaddr = '' + DNS_LIST[id];
+            let val = 'dns_' + dns_ipaddr.replace(/\./g, "_");
+            dns_list.push( E('option', { value: val }, [ dns_ipaddr ] ));
+        } 
+        let resolve_dns = E('label', [
+            _('Resolve IP-Addr via') + ': ',
+            E('select', { id: 'cfg_resolve_dns' }, dns_list)
+        ]);
+ 
+        this.logArea = E('textarea', {
+            'id': 'widget.modal_content',
+            'readonly': true,
+            'style': 'width:100% !important; font-family: monospace;',
+            'rows': 26,
+            'wrap': 'off',
+        });
+
+        this.btn_cancel = E('button', {
+            'id': 'btn_cancel',
+            'name': 'btn_cancel',
+            'class': btn_style_warning,
+        }, _('Cancel'));
+        this.btn_cancel.onclick = ui.hideModal;
+
+        this.btn_dpicheck = E('button', {
+            'id': 'btn_dpicheck',
+            'name': 'btn_dpicheck',
+            'class': btn_style_action,
+        }, _('DPI check [tcp 16-20]'));
+        this.btn_dpicheck.onclick = ui.createHandlerFn(this, () => { this.dpiCheck() });
+        
+        ui.showModal(_('Diagnostics'), [
+            E('div', { 'class': 'cbi-section' }, [
+                resolve_dns,
+                E('br'), E('br'),
+                this.logArea,
+            ]),
+            E('div', { 'class': 'right' }, [
+                this.btn_dpicheck,
+                ' ',
+                this.btn_cancel,
+            ])
+        ]);
+    }    
+});

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

@@ -5,6 +5,7 @@
 'require ui';
 'require view';
 'require view.zapret.tools as tools';
+'require view.zapret.diagnost as diagnost';
 'require view.zapret.updater as updater';
 
 const btn_style_neutral  = 'btn';
@@ -23,6 +24,7 @@ return view.extend({
             restart : elems.btn_restart || document.getElementById('btn_restart'),
             stop    : elems.btn_stop    || document.getElementById('btn_stop'),
             reset   : elems.btn_reset   || document.getElementById('btn_reset'),
+            diag    : elems.btn_diag    || document.getElementById('btn_diag'),
             update  : elems.btn_update  || document.getElementById('btn_update'),
         };
     },
@@ -242,8 +244,18 @@ return view.extend({
             ' ', _('Set AutoHostList mode')
         ]);
 
+        let erase_autohostlist = E('label', [
+            E('input', { type: 'checkbox', id: 'cfg_erase_autohostlist' }),
+            ' ', _('Erase AutoHostList (ipset)')
+        ]);
+
+        let enable_custom_d = E('label', [
+            E('input', { type: 'checkbox', id: 'cfg_enable_custom_d' }),
+            ' ', _('Enable use  custom.d scripts')
+        ]);
+
         let strat_list = [ ];
-        strat_list.push( E('option', { value: 'strat__skip__' }, [ '-' ] ) );
+        strat_list.push( E('option', { value: 'strat__skip__' }, [ 'not change' ] ) );
         for (let id = 0; id < this.nfqws_strat_list.length; id++) {
             let strat = '' + this.nfqws_strat_list[id];
             strat_list.push( E('option', { value: 'strat_' + id }, [ strat ] ) );
@@ -274,10 +286,19 @@ return view.extend({
             if (document.getElementById('cfg_autohostlist').checked) {
                 opt_flags += '(set_mode_autohostlist)';
             };
+            if (document.getElementById('cfg_erase_autohostlist').checked) {
+                opt_flags += '(erase_autohostlist)';
+            };
+            if (document.getElementById('cfg_enable_custom_d').checked) {
+                opt_flags += '(enable_custom_d)';
+            };
             //console.log('RESET: opt_flags = ' + opt_flags);
             let sel_strat = document.getElementById('cfg_nfqws_strat');
             let opt_strat = sel_strat.options[sel_strat.selectedIndex].text;
             //console.log('RESET: strat = ' + opt_strat);
+            if (opt_strat == 'not change') {
+                opt_strat = '-';
+            }
             opt_flags += '(sync)';
             let args = [ opt_flags, opt_strat ];
             return this.serviceActionEx('reset', resetcfg_btn, args, true);
@@ -291,6 +312,10 @@ return view.extend({
                 E('br'), E('br'),
                 set_autohostlist,
                 E('br'), E('br'),
+                erase_autohostlist,
+                E('br'), E('br'),
+                enable_custom_d,
+                E('br'), E('br'),
                 nfqws_strat,
                 E('br'), E('br')
             ]),
@@ -382,6 +407,10 @@ return view.extend({
         btn_reset.onclick   = L.bind(this.dialogResetCfg, this);
         layout_append(_('Reset settings to default'), null, [ btn_reset ] );
 
+        let btn_diag        = create_btn('btn_diag',  btn_style_action, _('Diagnostics'));
+        btn_diag.onclick    = ui.createHandlerFn(this, () => { diagnost.openDiagnostDialog(this.pkg_arch) });
+        layout_append('Diagnostic tools', null, [ btn_diag ] );
+
         let btn_update      = create_btn('btn_update',  btn_style_action, _('Update'));
         btn_update.onclick  = ui.createHandlerFn(this, () => { updater.openUpdateDialog(this.pkg_arch) });
         layout_append(_('Update package'), null, [ btn_update ] );
@@ -394,6 +423,7 @@ return view.extend({
             "btn_restart": btn_restart,
             "btn_stop": btn_stop,
             "btn_reset": btn_reset,
+            "btn_diag": btn_diag,
             "btn_update": btn_update,
         };
         this.setAppStatus(status_array, elems);

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

@@ -7,6 +7,11 @@
 'require view';
 'require view.zapret.tools as tools';
 
+document.head.appendChild(E('link', {
+    rel: 'stylesheet',
+    href: L.resource('view/zapret/styles.css')
+}));
+
 return view.extend({
     parsers: { },
 
@@ -128,8 +133,10 @@ return view.extend({
             let btn = sec.taboption(tabname, form.Button, '_' + param + '_btn', locname);
             btn.inputtitle = _('Edit');
             btn.inputstyle = 'edit btn';
-            let val = sec.taboption(tabname, form.DummyValue, '_' + param);
-            val.rawhtml = multiline ? true : false;
+            let val = sec.taboption(tabname, form.TextValue, '_' + param);
+            val.readonly = true;
+            val.rows = rows + 5;
+            val.wrap = false;
             val.cfgvalue = function(section_id) {
                 let value = uci.get(tools.appName, section_id, param);
                 if (value == null) {
@@ -141,15 +148,10 @@ return view.extend({
                     value = value.replace(/\n --/g, "\n--");
                     value = value.replace(/ --/g, "\n--");
                 }
-                if (val.rawhtml) {
-                    value = value.replace(/</g, '˂');
-                    value = value.replace(/>/g, '˃');
-                    value = value.replace(/\n/g, '<br/>');
-                }
                 return value;
             };
             val.validate = function(section_id, value) {
-                return (value) ? value.trim() : "";
+                return true;
             };
             let desc = locname;
             if (multiline == 2) {
@@ -279,6 +281,10 @@ return view.extend({
             o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_RETRANS_MAXSEQ', _('RETRANS_MAXSEQ'));
             o.rmempty     = false;
             o.datatype    = 'uinteger';
+
+            o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_RETRANS_RESET', _('RETRANS_RESET'));
+            o.rmempty     = false;
+            o.datatype    = 'uinteger';
         }
         
         o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_RETRANS_THRESHOLD', _('RETRANS_THRESHOLD'));

luci-app-zapret/htdocs/luci-static/resources/view/zapret/styles.css

@@ -0,0 +1,6 @@
+textarea, .cbi-value textarea
+{
+    white-space: pre;
+    overflow-x: auto;
+    font-family: monospace;
+}

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

@@ -370,11 +370,46 @@ return baseclass.extend({
             ]);
         },
 
-        handleSaveAdv: function(ev) {
-            let txt = document.getElementById('widget.modal_content');
-            let value = txt.value.trim().replace(/\r\n/g, '\n') + '\n';
+        writeAdv: async function(fileName, data, chunkSize = 8000)
+        {
+            let tmpFile = fileName + '.tmp';
+            try {
+                for (let wsize = 0; wsize <= data.length; wsize += chunkSize) {
+                    let chunk = data.slice(wsize, wsize + chunkSize);
+                    if (wsize > 0 && chunk.length == 0) {
+                        break;  // EOF
+                    }
+                    chunk = chunk.replace(/'/g, `'\"'\"'`);
+                    let teeArg = (wsize === 0) ? '' : '-a';
+                    let cmd = `printf %s '${chunk}' | tee ${teeArg} '${tmpFile}'`;
+                    let res = await fs.exec('/bin/busybox', [ 'sh', '-c', cmd ]);
+                    if (res.code !== 0) {
+                        throw new Error('tee failed, rc = ' + res.code);
+                    }
+                }
+                let res = await fs.exec('/bin/busybox', [ 'mv', '-f', tmpFile, fileName ]);
+                if (res.code != 0) {
+                    throw new Error('mv failed, rc = ' + res.code);
+                }
+            } catch(e) {
+                try {
+                    await fs.exec('/bin/busybox', [ 'rm', '-f', tmpFile ]);
+                } catch(e2) {
+                    // nothing
+                }
+                throw e;
+            }
+            return fs.stat(fileName);
+        },
 
-            return fs.write(this.file, value).then(async rc => {
+        handleSaveAdv: async function(ev)
+        {
+            let txt = document.getElementById('widget.modal_content');
+            let value = txt.value.trim().replace(/\r\n/g, '\n');
+            if (value.length > 0) {
+                value += '\n';
+            }
+            return this.writeAdv(this.file, value).then(async rc => {
                 txt.value = value;
                 ui.addNotification(null, E('p', _('Contents have been saved.')), 'info');
                 if (this.callback) {
@@ -506,24 +541,10 @@ return baseclass.extend({
             value = value.replace(/˂/g, '<');
             value = value.replace(/˃/g, '>');
             try {
-                let elem = document.getElementById("cbi-" + this.appName + "-" + this.cfgsec + "-_" + this.cfgparam);
-                if (elem) {
-                    if (elem.querySelector('div')) {
-                        elem = elem.querySelector('div');
-                    } else {
-                        elem = elem.querySelector('output');
-                    }
-                }
+                let elem = document.getElementById("widget.cbid." + this.appName + ".config._" + this.cfgparam);
                 if (elem) {
                     let val = value.trim();
-                    if (this.multiline) {
-                        val = val.replace(/</g, '˂');
-                        val = val.replace(/>/g, '˃');
-                        val = val.replace(/\n/g, '<br/>');
-                        elem.innerHTML = val;
-                    } else {
-                        elem.textContent = val;
-                    }
+                    elem.textContent = val;
                 }
             } catch(e) {
                 console.error('ERROR: cannot found elem for ' + this.cfgsec + '.' + this.cfgparam);

zapret/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret
-PKG_VERSION:=72.20260108
+PKG_VERSION:=72.20260116
 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/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=16ac0587a4c7d823be4d947d2bbebdbf445d770c
-PKG_SOURCE_DATE:=2026-01-08
+PKG_SOURCE_VERSION:=c849e55ef0f1c244206f5a05ff7b1ab41a3824ee
+PKG_SOURCE_DATE:=2026-01-16
 
 #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?
@@ -56,91 +56,165 @@ define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR)/mdig $(TARGET_CONFIGURE_OPTS)
 endef
 
+ZAPRET_DIR := /opt/zapret
+
+define ZAPRET_CONFFILES_LIST
+$(ZAPRET_DIR)/config
+$(ZAPRET_DIR)/ipset/zapret-hosts-google.txt
+$(ZAPRET_DIR)/ipset/zapret-hosts-user.txt
+$(ZAPRET_DIR)/ipset/zapret-hosts-user-exclude.txt
+$(ZAPRET_DIR)/ipset/zapret-ip-exclude.txt
+$(ZAPRET_DIR)/ipset/zapret-hosts-auto.txt
+$(ZAPRET_DIR)/ipset/cust1.txt
+$(ZAPRET_DIR)/ipset/cust2.txt
+$(ZAPRET_DIR)/ipset/cust3.txt
+$(ZAPRET_DIR)/ipset/cust4.txt
+$(ZAPRET_DIR)/init.d/openwrt/custom.d/10-script.sh
+$(ZAPRET_DIR)/init.d/openwrt/custom.d/20-script.sh
+$(ZAPRET_DIR)/init.d/openwrt/custom.d/50-script.sh
+$(ZAPRET_DIR)/init.d/openwrt/custom.d/60-script.sh
+$(ZAPRET_DIR)/init.d/openwrt/custom.d/90-script.sh
+endef
+
+$(eval ZAPRET_CONFFILES := $(foreach file,$(ZAPRET_CONFFILES_LIST),$(strip $(file))))
+
 define Package/$(PKG_NAME)/conffiles
-/etc/config/zapret
-/opt/zapret/config
-/opt/zapret/ipset/
-/opt/zapret/init.d/openwrt/custom.d/
+$(ZAPRET_CONFFILES_LIST)
 endef
 
 define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/opt/zapret
-	$(INSTALL_DIR) $(1)/opt/zapret/$(MAKE_PATH)
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws $(1)/opt/zapret/$(MAKE_PATH)/
-	$(INSTALL_DIR) $(1)/opt/zapret/ip2net
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ip2net/ip2net $(1)/opt/zapret/ip2net/
-	$(INSTALL_DIR) $(1)/opt/zapret/mdig
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mdig/mdig $(1)/opt/zapret/mdig/
-	$(INSTALL_DIR) $(1)/opt/zapret/common
-	$(CP) $(PKG_BUILD_DIR)/common/* $(1)/opt/zapret/common/
-	#$(INSTALL_DIR) $(1)/opt/zapret/docs
-	#$(CP) $(PKG_BUILD_DIR)/docs/* $(1)/opt/zapret/docs/
-	$(INSTALL_DIR) $(1)/opt/zapret/files
-	$(CP) $(PKG_BUILD_DIR)/files/* $(1)/opt/zapret/files/
-	$(CP)                ./files/* $(1)/opt/zapret/files/
-	$(INSTALL_DIR) $(1)/opt/zapret/ipset
-	$(CP) $(PKG_BUILD_DIR)/ipset/* $(1)/opt/zapret/ipset/
-	$(INSTALL_BIN)  $(PKG_BUILD_DIR)/blockcheck.sh  $(1)/opt/zapret/blockcheck.sh
-	#$(INSTALL_DATA) $(PKG_BUILD_DIR)/config.default $(1)/opt/zapret/config.default
-	$(INSTALL_DIR) $(1)/opt/zapret/tmp
-	$(INSTALL_DIR) $(1)/opt/zapret/init.d/openwrt
-	$(CP) $(PKG_BUILD_DIR)/init.d/openwrt/* $(1)/opt/zapret/init.d/openwrt/
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/$(MAKE_PATH)
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws $(1)$(ZAPRET_DIR)/$(MAKE_PATH)/
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/ip2net
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ip2net/ip2net $(1)$(ZAPRET_DIR)/ip2net/
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/mdig
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mdig/mdig $(1)$(ZAPRET_DIR)/mdig/
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/common
+	$(CP) $(PKG_BUILD_DIR)/common/* $(1)$(ZAPRET_DIR)/common/
+	#$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/docs
+	#$(CP) $(PKG_BUILD_DIR)/docs/* $(1)$(ZAPRET_DIR)/docs/
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/files
+	$(CP) $(PKG_BUILD_DIR)/files/* $(1)$(ZAPRET_DIR)/files/
+	$(CP)                ./files/* $(1)$(ZAPRET_DIR)/files/
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/ipset
+	$(CP) $(PKG_BUILD_DIR)/ipset/* $(1)$(ZAPRET_DIR)/ipset/
+	$(INSTALL_BIN)  $(PKG_BUILD_DIR)/blockcheck.sh  $(1)$(ZAPRET_DIR)/blockcheck.sh
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/tmp
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/init.d/openwrt
+	$(CP) $(PKG_BUILD_DIR)/init.d/openwrt/* $(1)$(ZAPRET_DIR)/init.d/openwrt/
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init.d/openwrt/90-zapret $(1)/etc/hotplug.d/iface/90-zapret
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./init.d.sh $(1)/etc/init.d/zapret
-	$(INSTALL_DATA) ./config.default $(1)/opt/zapret/config.default
-	$(INSTALL_DATA) ./ipset/zapret-hosts-google.txt       $(1)/opt/zapret/ipset/zapret-hosts-google.txt
-	$(INSTALL_DATA) ./ipset/zapret-hosts-user.txt         $(1)/opt/zapret/ipset/zapret-hosts-user.txt
-	$(INSTALL_DATA) ./ipset/zapret-hosts-user-exclude.txt $(1)/opt/zapret/ipset/zapret-hosts-user-exclude.txt
-	$(INSTALL_DATA) ./ipset/zapret-ip-exclude.txt         $(1)/opt/zapret/ipset/zapret-ip-exclude.txt
-	$(INSTALL_DIR) $(1)/opt/zapret/ipset_def
-	$(INSTALL_DATA) ./ipset/zapret-hosts-google.txt       $(1)/opt/zapret/ipset_def/zapret-hosts-google.txt
-	$(INSTALL_DATA) ./ipset/zapret-hosts-user.txt         $(1)/opt/zapret/ipset_def/zapret-hosts-user.txt
-	$(INSTALL_DATA) ./ipset/zapret-hosts-user-exclude.txt $(1)/opt/zapret/ipset_def/zapret-hosts-user-exclude.txt
-	$(INSTALL_DATA) ./ipset/zapret-ip-exclude.txt         $(1)/opt/zapret/ipset_def/zapret-ip-exclude.txt
-	$(INSTALL_DIR) $(1)/opt/zapret/init.d
-	$(INSTALL_DIR) $(1)/opt/zapret/init.d/openwrt
-	$(INSTALL_DIR) $(1)/opt/zapret/init.d/openwrt/custom.d
-	$(CP) ./custom.d/* $(1)/opt/zapret/init.d/openwrt/custom.d/
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/init.d
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/init.d/openwrt
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/init.d/openwrt/custom.d
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) ./uci-def-cfg.sh     $(1)/etc/uci-defaults/zapret-uci-def-cfg.sh
-	$(INSTALL_BIN) ./uci-def-cfg.sh     $(1)/opt/zapret/uci-def-cfg.sh
-	$(INSTALL_BIN) ./comfunc.sh         $(1)/opt/zapret/comfunc.sh
-	$(INSTALL_BIN) ./def-cfg.sh         $(1)/opt/zapret/def-cfg.sh
-	$(INSTALL_BIN) ./renew-cfg.sh       $(1)/opt/zapret/renew-cfg.sh
-	$(INSTALL_BIN) ./restore-def-cfg.sh $(1)/opt/zapret/restore-def-cfg.sh
-	$(INSTALL_BIN) ./sync_config.sh     $(1)/opt/zapret/sync_config.sh
-	$(INSTALL_BIN) ./script-exec.sh     $(1)/opt/zapret/script-exec.sh
-	$(INSTALL_BIN) ./update-pkg.sh      $(1)/opt/zapret/update-pkg.sh
-	# Fix permisions
-	chmod 644 $(1)/opt/zapret/ipset/*.txt
-	chmod 644 $(1)/opt/zapret/ipset_def/*.txt
-	chmod 644 $(1)/opt/zapret/init.d/openwrt/custom.d/*.sh
-	chmod 644 $(1)/opt/zapret/config.default
-	chmod 755 $(1)/opt/zapret/*.sh
-	chmod 755 $(1)/opt/zapret/$(MAKE_PATH)/*
-	chmod 755 $(1)/opt/zapret/ip2net/*
-	chmod 755 $(1)/opt/zapret/mdig/*
+	# install all sh-scripts
+	$(CP) ./*.sh $(1)$(ZAPRET_DIR)/
+	rm -f $(1)$(ZAPRET_DIR)/init.d.sh
+	# Install conf files
+	$(foreach cfg,$(ZAPRET_CONFFILES), \
+		rel="$(cfg:$(ZAPRET_DIR)/%=%)"; \
+		src="./$$$$rel"; \
+		if echo "$$$$rel" | grep -q "/custom.d/"; then \
+			src="./custom.d/$$$$(basename $$$$rel)"; \
+		fi; \
+		dst="$(1)$(cfg)"; \
+		mkdir -p "$(1)$(dir $(cfg))"; \
+		rm -f "$$$${dst}"; \
+		if [ -f "$$$${src}" ]; then \
+			$(INSTALL_DATA) "$$$${src}" "$$$${dst}"; \
+		else \
+			$(INSTALL_DATA) /dev/null "$$$${dst}"; \
+		fi; \
+	)
+	# Fix main config file
+	rm -f $(1)$(ZAPRET_DIR)/config
+	$(INSTALL_DATA) ./config.default $(1)$(ZAPRET_DIR)/config
+	$(INSTALL_DATA) ./config.default $(1)$(ZAPRET_DIR)/config.default
+	# Install def conf files
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/ipset_def
+	$(CP) ./ipset/zapret*.txt  $(1)$(ZAPRET_DIR)/ipset_def/
+	# Fix permissions
+	chmod 644 $(1)$(ZAPRET_DIR)/ipset/*.txt
+	chmod 644 $(1)$(ZAPRET_DIR)/ipset_def/*.txt
+	chmod 644 $(1)$(ZAPRET_DIR)/init.d/openwrt/custom.d/*.sh
+	chmod 644 $(1)$(ZAPRET_DIR)/config*
+	chmod 755 $(1)$(ZAPRET_DIR)/*.sh
+	chmod 755 $(1)$(ZAPRET_DIR)/$(MAKE_PATH)/*
+	chmod 755 $(1)$(ZAPRET_DIR)/ip2net/*
+	chmod 755 $(1)$(ZAPRET_DIR)/mdig/*
+	# Disable TPWS in blockcheck
+	grep -q '^SKIP_TPWS=' $(1)$(ZAPRET_DIR)/blockcheck.sh || sed -i '/^NFT_TABLE=blockcheck$$$$/a SKIP_TPWS=$$$${SKIP_TPWS:-1}' $(1)$(ZAPRET_DIR)/blockcheck.sh
 endef
 
 define Package/$(PKG_NAME)/preinst
 #!/bin/sh
 # check if we are on real system
 if [ -z "$${IPKG_INSTROOT}" ]; then
-	if [ -f "/etc/init.d/zapret" ]; then
-		SCRIPT=$$( readlink /etc/init.d/zapret )
+	ZAPRET_DIR=/opt/zapret
+	ZAPRET_INITD=/etc/init.d/zapret
+	ZAPRET_CFG=/etc/config/zapret
+	if [ -f "$${ZAPRET_INITD}" ]; then
+		SCRIPT=$$( readlink "$${ZAPRET_INITD}" )
 		if [ -n "$${SCRIPT}" ]; then
-			echo "Please uninstall original zapret utility!"
+			echo "Please uninstall incompatible \"zapret\" service!"
 			exit 44
 		fi
 	fi
+	if command -v apk >/dev/null; then
+		PKG_MGR="apk"
+		PKG_CHECK="apk info -e "
+		PKG_REMOVE="apk del --force "
+	else
+		PKG_MGR="opkg"
+		PKG_CHECK="opkg status "
+		PKG_REMOVE="opkg remove --force-remove "
+	fi
 	if [ "$${PKG_UPGRADE}" = "1" ]; then
 		# stop service if PKG_UPGRADE
-		if [ -x "/etc/init.d/zapret" ]; then
-			/etc/init.d/zapret running && /etc/init.d/zapret stop >/dev/null 2>&1
+		if [ -x "$${ZAPRET_INITD}" ]; then
+			$${ZAPRET_INITD} running && $${ZAPRET_INITD} stop >/dev/null 2>&1
 		fi
 	fi
+	if $${PKG_CHECK} zapret >/dev/null 2>&1; then
+		if [ ! -f "/opt/zapret/sync_config.sh" ]; then
+			echo "Please uninstall incompatible \"zapret\" package!"
+			exit 47
+		fi
+		if [ -f "$${ZAPRET_CFG}" ] && ! grep -q "run_on_boot" "$${ZAPRET_CFG}"; then
+			echo "Please uninstall incompatible \"zapret\" package!"
+			exit 48
+		fi
+	fi
+	if $${PKG_CHECK} luci-app-zapret >/dev/null 2>&1; then
+		SVC_FILE=/www/luci-static/resources/view/zapret/service.js
+		if [ ! -f "$${SVC_FILE}" ] || ! grep -Fq "/remittor/zapret-openwrt" "$${SVC_FILE}"; then
+			echo "Please uninstall incompatible \"luci-app-zapret\" package!"
+			exit 55
+		fi
+	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
+		fi
+		rm -f $${ZAPRET_CFG}
+		rm -f $${ZAPRET_INITD}
+		[ -d "$${ZAPRET_DIR}" ] && rm -rf $${ZAPRET_DIR}
+		echo "All files of the previously installed package have been removed!"
+	fi
+	if $${PKG_CHECK} zapret-mdig >/dev/null 2>&1; then
+		$${PKG_REMOVE} zapret-mdig
+	fi
+	if $${PKG_CHECK} zapret-ip2net >/dev/null 2>&1; then
+		$${PKG_REMOVE} zapret-ip2net
+	fi
+	if [ ! -d "$${ZAPRET_DIR}" ]; then
+		mkdir -p $${ZAPRET_DIR}
+	fi
 	if [ ! -f "/opt/zapret/ipset/zapret-hosts-google.txt" ]; then
 		if [ -f "/opt/zapret/ipset/zapret-hosts-user.txt" ]; then
 			CFGLISTHASH=$$( md5sum "/opt/zapret/ipset/zapret-hosts-user.txt" | awk '{print $$1;}' )
@@ -157,8 +231,17 @@ define Package/$(PKG_NAME)/postinst
 #!/bin/sh
 # check if we are on real system
 if [ -z "$${IPKG_INSTROOT}" ]; then
+	ZAPRET_DIR=/opt/zapret
+	ZAPRET_INITD=/etc/init.d/zapret
+	ZAPRET_CFG=/etc/config/zapret
 	ZAPRET_CONFIG=/opt/zapret/config
 	ZAPRET_CONFIG_DEF="/opt/zapret/config.default"
+	# Fix permissions
+	chmod 644 $${ZAPRET_CFG} >/dev/null 2>&1
+	chmod 644 $${ZAPRET_DIR}/ipset/*.txt >/dev/null 2>&1
+	chmod 644 $${ZAPRET_DIR}/ipset_def/*.txt >/dev/null 2>&1
+	chmod 644 $${ZAPRET_DIR}/init.d/openwrt/custom.d/*.sh >/dev/null 2>&1
+	chmod 644 $${ZAPRET_DIR}/config* >/dev/null 2>&1
 	# creating main config if its not exists
 	if [ ! -f "$${ZAPRET_CONFIG}" ]; then
 		cp -f "$${ZAPRET_CONFIG_DEF}" "$${ZAPRET_CONFIG}"
@@ -171,8 +254,10 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 		echo "Current file $${ZAPRET_CONFIG} backuped to $${ZAPRET_CONFIG_BACKUP}"
 		cp -f "$${ZAPRET_CONFIG_DEF}" "$${ZAPRET_CONFIG}"
 	fi
+	# remove fake uci-config
+	[ -f "$${ZAPRET_CFG}" ] && [ ! -s "$${ZAPRET_CFG}" ] && rm -f "$${ZAPRET_CFG}"
 	# check existing uci-config
-	[ -f "/etc/config/zapret" ] && ZAPRET_CFG_EXISTS=1 || ZAPRET_CFG_EXISTS=0
+	[ -f "$${ZAPRET_CFG}" ] && ZAPRET_CFG_EXISTS=1 || ZAPRET_CFG_EXISTS=0
 	# create or merge uci-config
 	/opt/zapret/uci-def-cfg.sh
 	[ "$${ZAPRET_CFG_EXISTS}" = "1" ] && echo "Config /etc/config/zapret merged with default uci-config"
@@ -184,13 +269,13 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 	sh -n "$${ZAPRET_CONFIG}" 2>/dev/null || cp -f "$${ZAPRET_CONFIG_DEF}" "$${ZAPRET_CONFIG}"
 	sh -n "$${ZAPRET_CONFIG}" 2>/dev/null || exit 58
 	# enable main service
-	/etc/init.d/zapret enable
+	$${ZAPRET_INITD} enable
 	# stop all
-	/etc/init.d/zapret stop_fw
-	/etc/init.d/zapret stop_daemons
+	$${ZAPRET_INITD} stop_fw >/dev/null 2>&1
+	$${ZAPRET_INITD} stop_daemons >/dev/null 2>&1
 	ps w | grep '/opt/zapret/nfq/nfqws' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
 	# start main service
-	/etc/init.d/zapret start
+	$${ZAPRET_INITD} start
 	# restart firewall
 	[ -x /sbin/fw4 ] && fw4 -q restart || fw3 -q restart
 fi
@@ -201,8 +286,10 @@ define Package/$(PKG_NAME)/prerm
 #!/bin/sh
 # check if we are on real system
 if [ -z "$${IPKG_INSTROOT}" ]; then
-	EXEDIR=/opt/zapret
+	ZAPRET_DIR=/opt/zapret
 	ZAPRET_BASE=/opt/zapret
+	ZAPRET_INITD=/etc/init.d/zapret
+	ZAPRET_CFG=/etc/config/zapret
 	ZAPRET_CONFIG=/opt/zapret/config
 	ZAPRET_CONFIG_DEF="/opt/zapret/config.default"
 	OPENWRT_FW_INCLUDE=/etc/firewall.zapret
@@ -217,8 +304,8 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 	. "$${ZAPRET_BASE}/common/fwtype.sh"
 	. "$${ZAPRET_BASE}/common/nft.sh"
 	. "$${ZAPRET_BASE}/common/installer.sh"
-	/etc/init.d/zapret running && /etc/init.d/zapret stop
-	/etc/init.d/zapret disable
+	$${ZAPRET_INITD} running && $${ZAPRET_INITD} stop >/dev/null 2>&1
+	$${ZAPRET_INITD} disable >/dev/null 2>&1
 	ps w | grep '/opt/zapret/nfq/nfqws' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
 	remove_openwrt_firewall
 	nft_del_table
@@ -231,7 +318,9 @@ define Package/$(PKG_NAME)/postrm
 #!/bin/sh
 # check if we are on real system
 if [ -z "$${IPKG_INSTROOT}" ]; then
-	[ -f "/etc/config/zapret-opkg" ] && rm -f "/etc/config/zapret-opkg"
+	rm -f /etc/config/zapret-opkg*
+	rm -f /etc/config/zapret.opkg*
+	rm -f /etc/config/zapret.apk*
 	[ -f "/opt/zapret/config" ] && cp -f /opt/zapret/config "/opt/zapret/config.backup"
 	#rm -rf /opt/zapret
 	#echo "Directory /opt/zapret removed!"

zapret/comfunc.sh

@@ -130,7 +130,7 @@ function restore_all_ipset_cfg
 	restore_ipset_txt zapret-hosts-google.txt
 	restore_ipset_txt zapret-hosts-user.txt
 	restore_ipset_txt zapret-hosts-user-exclude.txt
-	restore_ipset_txt zapret-ip-exclude.txt.txt
+	restore_ipset_txt zapret-ip-exclude.txt
 }
 
 function create_default_cfg
@@ -179,7 +179,7 @@ function insert_cron_task_logs
 {
 	[ ! -f "$CRONTAB_FILE" ] && touch "$CRONTAB_FILE"
 	[ ! -f "$CRONTAB_FILE" ] && return 1
-	if ! grep -q -e "-name '$ZAPRET_CFG_NAME\*\.log' -size \+" "$CRONTAB_FILE"; then
+	if ! grep -q -e "-name '$ZAPRET_CFG_NAME+\*\.log' -size \+" "$CRONTAB_FILE"; then
 		echo "*/2 * * * * /usr/bin/find /tmp -maxdepth 1 -type f -name '$ZAPRET_CFG_NAME+*.log' -size +2600k -exec rm -f {} \;" >> "$CRONTAB_FILE"
 		/etc/init.d/cron restart 2> /dev/null
 	fi

zapret/def-cfg.sh

@@ -4,7 +4,7 @@
 function set_cfg_reset_values
 {
 	local cfgname=${1:-$ZAPRET_CFG_NAME}
-	local TAB="$( echo -n -e '\t' )"
+	local TAB="$( printf '\t' )"
 	uci batch <<-EOF
 		set $cfgname.config.run_on_boot='0'
 		# settings for zapret service
@@ -47,7 +47,7 @@ function set_cfg_reset_values
 function clear_nfqws_strat
 {
 	local cfgname=${1:-$ZAPRET_CFG_NAME}
-	local TAB="$( echo -n -e '\t' )"
+	local TAB="$( printf '\t' )"
 	uci batch <<-EOF
 		set $cfgname.config.MODE_FILTER='hostlist'
 		set $cfgname.config.NFQWS_PORTS_TCP='80,443'
@@ -61,7 +61,7 @@ function set_cfg_nfqws_strat
 {
 	local strat=${1:--}
 	local cfgname=${2:-$ZAPRET_CFG_NAME}
-	local TAB="$( echo -n -e '\t' )"
+	local TAB="$( printf '\t' )"
     
 	uci batch <<-EOF
 		set $cfgname.config.MODE_FILTER='hostlist'
@@ -292,6 +292,57 @@ function set_cfg_nfqws_strat
 			commit $cfgname
 		EOF
 	fi
+	if [ "$strat" = "v7_by_StressOzz" ]; then
+		uci batch <<-EOF
+			set $cfgname.config.NFQWS_PORTS_TCP='80,443,2053,2083,2087,2096,8443'
+			set $cfgname.config.NFQWS_PORTS_UDP='443,19294-19344,50000-50100'
+			set $cfgname.config.NFQWS_OPT="
+				# Strategy $strat
+				
+				--filter-tcp=443
+				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
+				--dpi-desync=fake,multisplit
+				--dpi-desync-split-pos=2,sld
+				--dpi-desync-fake-tls=0x0F0F0F0F
+				--dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
+				--dpi-desync-fake-tls-mod=rnd,dupsid,sni=ggpht.com
+				--dpi-desync-split-seqovl=620
+				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
+				--dpi-desync-fooling=badsum,badseq
+
+				--new
+				--filter-tcp=443 <HOSTLIST>
+				--dpi-desync=fake,multisplit
+				--dpi-desync-split-seqovl=654
+				--dpi-desync-split-pos=1
+				--dpi-desync-fooling=ts
+				--dpi-desync-repeats=8
+				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/max.bin
+				--dpi-desync-fake-tls=/opt/zapret/files/fake/max.bin
+
+				--new
+				--filter-udp=443 <HOSTLIST_NOAUTO>
+				--dpi-desync=fake
+				--dpi-desync-repeats=6
+				--dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin
+
+				--new
+				--filter-udp=19294-19344,50000-50100
+				--filter-l7=discord,stun
+				--dpi-desync=fake
+				--dpi-desync-repeats=6
+
+				--new
+				--filter-tcp=2053,2083,2087,2096,8443
+				--hostlist-domains=discord.media
+				--dpi-desync=multisplit
+				--dpi-desync-split-seqovl=652
+				--dpi-desync-split-pos=2
+				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
+			"
+			commit $cfgname
+		EOF
+	fi
 	if [ "$strat" = "ALT7_by_Flowseal" ]; then
 		uci batch <<-EOF
 			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
@@ -391,5 +442,17 @@ function set_cfg_default_values
 			commit $cfgname
 		EOF
 	fi
+	if echo "$opt_flags" | grep -q "(enable_custom_d)"; then
+		uci batch <<-EOF
+			set $cfgname.config.DISABLE_CUSTOM='0'
+			commit $cfgname
+		EOF
+	fi
+	if echo "$opt_flags" | grep -q "(disable_custom_d)"; then
+		uci batch <<-EOF
+			set $cfgname.config.DISABLE_CUSTOM='1'
+			commit $cfgname
+		EOF
+	fi
 	return 0
 }

zapret/dwc.sh

@@ -0,0 +1,234 @@
+#!/bin/sh
+# Copyright (c) 2026 remittor
+
+ZAP_TMP_DIR=/tmp/zapret_dwc
+
+opt_dig=
+opt_recom=
+opt_tmp_dir=
+opt_test=
+
+while getopts "d:RT:t" opt; do
+	case $opt in
+		d) opt_dig="$OPTARG";;
+		R) opt_recom="true";;     # Recommendations
+		T) opt_tmp_dir="$OPTARG";;
+		t) opt_test="true";;
+	esac
+done 
+
+[ "$opt_tmp_dir" != "" ] && ZAP_TMP_DIR="$opt_tmp_dir"
+
+TARGET_LIST_FILE="$ZAP_TMP_DIR/targets"
+
+[ -f "$TARGET_LIST_FILE" ] && rm -rf "$ZAP_TMP_DIR"
+[ -f "$TARGET_LIST_FILE" ] && exit 3
+
+CURL_TIMEOUT=5
+CURL_RANGETO=65535
+CURL_NOCACHE='cache-control: no-cache'
+CURL_NOCACHE2='pragma: no-cache'
+CURL_USERAGENT='Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36'
+
+if ! command -v curl >/dev/null 2>&1; then
+	echo "ERROR: package \"curl\" not installed!"
+	return 10
+fi
+CURL_INFO=$( curl -V )
+if ! echo "$CURL_INFO" | grep -q 'https'; then
+	echo "------- package curl"
+	echo "$CURL_INFO"
+	echo "-------"
+	echo "ERROR: package \"curl\" not supported HTTPS protocol!"
+	echo "NOTE: Please install package \"curl-ssl\""
+	return 11
+fi
+
+if [ "$opt_dig" != "" ]; then
+	if ! command -v dig >/dev/null 2>&1; then
+		echo "ERROR: package \"bind-dig\" not installed!"
+		return 12
+	fi
+	OPT_DIG_DNS="@$opt_dig"
+	[ "$opt_dig" = "@"  ] && OPT_DIG_DNS=''
+	[ "$opt_dig" = "8"  ] && OPT_DIG_DNS='@8.8.8.8'
+	[ "$opt_dig" = "1"  ] && OPT_DIG_DNS='@1.1.1.1'
+	[ "$opt_dig" = "9"  ] && OPT_DIG_DNS='@9.9.9.9'
+fi
+
+if [ -f /etc/openwrt_release ]; then
+	CA_CERTS=/etc/ssl/certs/ca-certificates.crt
+	if [ ! -f $CA_CERTS ]; then
+		echo "ERROR: package \"ca-bundle\" not installed!"
+		return 15
+	fi
+fi
+ 
+#echo 'Original sources: https://github.com/hyperion-cs/dpi-checkers'
+#echo 'WEB-version: https://hyperion-cs.github.io/dpi-checkers/ru/tcp-16-20/'
+
+TEST_SUITE='[
+  { id: "US.CF-01", provider: "🇺🇸 Cloudflare", times: 1, url: "https://img.wzstats.gg/cleaver/gunFullDisplay" },
+  { id: "US.CF-02", provider: "🇺🇸 Cloudflare", times: 1, url: "https://genshin.jmp.blue/characters/all#" },
+  { id: "US.CF-03", provider: "🇺🇸 Cloudflare", times: 1, url: "https://api.frankfurter.dev/v1/2000-01-01..2002-12-31" },
+  { id: "US.CF-04", provider: "🇨🇦 Cloudflare", times: 1, url: "https://www.bigcartel.com/" },
+  { id: "US.DO-01", provider: "🇺🇸 DigitalOcean", times: 2, url: "https://genderize.io/" },
+  { id: "DE.HE-01", provider: "🇩🇪 Hetzner", times: 1, url: "https://j.dejure.org/jcg/doctrine/doctrine_banner.webp" },
+  { id: "DE.HE-02", provider: "🇩🇪 Hetzner", times: 1, url: "https://maps.gnosis.earth/ogcapi/api/swagger-ui/swagger-ui-standalone-preset.js#" },
+  { id: "FI.HE-01", provider: "🇫🇮 Hetzner", times: 1, url: "https://251b5cd9.nip.io/1MB.bin" },
+  { id: "FI.HE-02", provider: "🇫🇮 Hetzner", times: 1, url: "https://5fd8c176.nip.io/1MB.bin" },
+  { id: "FI.HE-03", provider: "🇫🇮 Hetzner", times: 1, url: "https://5fd8bdae.nip.io/1MB.bin" },
+  { id: "FI.HE-04", provider: "🇫🇮 Hetzner", times: 1, url: "https://5fd8bca5.nip.io/1MB.bin" },
+  { id: "FR.OVH-01", provider: "🇫🇷 OVH", times: 1, url: "https://eu.api.ovh.com/console/rapidoc-min.js" },
+  { id: "FR.OVH-02", provider: "🇫🇷 OVH", times: 1, url: "https://ovh.sfx.ovh/10M.bin" },
+  { id: "SE.OR-01", provider: "🇸🇪 Oracle", times: 1, url: "https://oracle.sfx.ovh/10M.bin" },
+  { id: "DE.AWS-01", provider: "🇩🇪 AWS", times: 1, url: "https://www.getscope.com/assets/fonts/fa-solid-900.woff2" },
+  { id: "US.AWS-01", provider: "🇺🇸 AWS", times: 1, url: "https://corp.kaltura.com/wp-content/cache/min/1/wp-content/themes/airfleet/dist/styles/theme.css" },
+  { id: "US.GC-01", provider: "🇺🇸 Google Cloud", times: 1, url: "https://api.usercentrics.eu/gvl/v3/en.json" },
+  { id: "US.FST-01", provider: "🇺🇸 Fastly", times: 1, url: "https://www.jetblue.com/footer/footer-element-es2015.js" },
+  { id: "CA.FST-01", provider: "🇨🇦 Fastly", times: 1, url: "https://www.cnn10.com/" },
+  { id: "US.AKM-01", provider: "🇺🇸 Akamai", times: 1, url: "https://www.roxio.com/static/roxio/images/products/creator/nxt9/call-action-footer-bg.jpg" },
+  { id: "PL.AKM-01", provider: "🇵🇱 Akamai", times: 1, url: "https://media-assets.stryker.com/is/image/stryker/gateway_1?$max_width_1410$" },
+  { id: "US.CDN77-01", provider: "🇺🇸 CDN77", times: 1, url: "https://cdn.eso.org/images/banner1920/eso2520a.jpg" },
+  { id: "FR.CNTB-01", provider: "🇫🇷 Contabo", times: 1, url: "https://airsea.no/images/main_logo.png" },
+  { id: "NL.SW-01", provider: "🇳🇱 Scaleway", times: 1, url: "https://www.velivole.fr/img/header.jpg" },
+  { id: "US.CNST-01", provider: "🇺🇸 Constant", times: 1, url: "https://cdn.xuansiwei.com/common/lib/font-awesome/4.7.0/fontawesome-webfont.woff2?v=4.7.0" }
+]'
+
+function trim
+{
+	echo "$1" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//'
+}
+
+mkdir -p "$ZAP_TMP_DIR"
+
+: > "$TARGET_LIST_FILE"
+IDX=0
+while IFS= read -r line; do
+	case "$line" in
+		*id:*provider:*url:*)
+			IDX=$((IDX + 1))
+			TAG=$( printf '%s\n' "$line" | cut -d'"' -f2 )
+			COUNTRY="${TAG%%.*}"
+			PROVIDER_RAW=$( printf '%s\n' "$line" | cut -d'"' -f4 )
+			PROVIDER="${PROVIDER_RAW#* }"
+			TIMES=$( printf '%s\n' "$line" | cut -d':' -f4 | cut -d',' -f1 | tr -d ' ')
+			URL=$( printf '%s\n' "$line" | cut -d'"' -f6 )
+			echo "${IDX}|${TAG}|${COUNTRY}|${PROVIDER}|${TIMES}|${URL}" >> "$TARGET_LIST_FILE"
+		;;
+	esac
+done <<EOF
+$TEST_SUITE
+EOF
+
+CURL_CON_TIMEOUT=$((CURL_TIMEOUT-2))
+CURL_SPEED_TIME=$((CURL_TIMEOUT-2))
+CURL_SPEED_LIMIT=1
+
+while IFS='|' read -r ID TAG COUNTRY PROVIDER TIMES URL; do
+	[ -z "$TAG" ] && continue
+	ID=$((ID+1))
+	ID3=$( printf '%03d' "$ID" )
+	COUNTRY=$( echo "$TAG" | cut -d. -f1 )
+	CNTFLAG=$( echo "$PROVIDER" | awk '{print $1}' )
+	URL_NO_PROTO="${URL#*://}"
+	DOMAIN="${URL_NO_PROTO%%/*}"
+	URLPATH="/${URL_NO_PROTO#*/}"
+	[ "$URLPATH" = "/$URL_NO_PROTO" ] && URLPATH="/"
+	#echo "TAG=$TAG , COUNTRY=$COUNTRY , PROVIDER=$PROVIDER , DOMAIN=$DOMAIN , URL=$URL"
+	FNAME="$ZAP_TMP_DIR/$ID3=$TAG=$PROVIDER"
+	(
+		DST_IP=
+		RESOLVE_OPT=
+		if [ "$opt_dig" != "" ]; then
+			DST_IP=$( dig +time=2 +retry=1 $OPT_DIG_DNS +short "$DOMAIN" 2>/dev/null | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$' | head -n1 )
+		else
+			CURL_TIMEOUTS="--connect-timeout 2 --max-time 3 --speed-time 3 --speed-limit 1"
+			DST_IP=$( curl -4 -I -s $CURL_TIMEOUTS -o /dev/null -w '%{remote_ip}\n' "$URL" )
+			if [ -z "$DST_IP" ]; then
+				DST_IP=$( curl -4 -s $CURL_TIMEOUTS -o /dev/null -r 0-0 -w '%{remote_ip}\n' "$URL" )
+			fi
+		fi
+		if [ "$DST_IP" = "" ]; then
+			DST_IP=$( ping -c1 "$DOMAIN" 2>/dev/null | sed -n '1s/.*(\([0-9.]*\)).*/\1/p' )
+		fi
+		[ "$DST_IP" != "" ] && RESOLVE_OPT="--resolve $DOMAIN:443:$DST_IP"
+		echo "$DST_IP" > "$FNAME.ip"
+		echo "$URL" > "$FNAME.url"
+		curl "$URL" \
+			$RESOLVE_OPT \
+			--connect-timeout $CURL_CON_TIMEOUT \
+			--max-time $CURL_TIMEOUT \
+			--speed-time $CURL_SPEED_TIME \
+			--speed-limit $CURL_SPEED_LIMIT	\
+			--range 0-$CURL_RANGETO \
+			-A "$CURL_USERAGENT" \
+			-D "$FNAME.hdr" \
+			-o "$FNAME.body"
+	) > "$FNAME.log" 2>&1 &
+done < "$TARGET_LIST_FILE"
+
+wait
+
+FAIL_URL_LIST="$ZAP_TMP_DIR/FAIL_URL_LIST.txt"
+rm -f "$FAIL_URL_LIST"
+
+printf '%s\n' "$ZAP_TMP_DIR"/*.log | sort | while IFS= read -r file; do
+	[ -f "$file" ] || continue
+	FILENAME="${file##*/}"
+	FILENAME="${FILENAME%.log}"
+	ID=$( echo "$FILENAME" | cut -d= -f1)
+	TAG=$( echo "$FILENAME" | cut -d= -f2)
+	PROVIDER=$(echo "$FILENAME" | cut -d= -f3 )
+	FNAME="$ZAP_TMP_DIR/$FILENAME"
+	BODY_SIZE=0
+	[ -f "$FNAME.body" ] && BODY_SIZE=$( wc -c < "$FNAME.body" )
+	IPADDR="x.x.x.x"
+	[ -s "$FNAME.ip" ] && IPADDR=$( cat "$FNAME.ip" )
+	res=0
+	status=
+	if [ ! -f "$FNAME.hdr" ]; then
+		status="ERROR: cannot Get Headers"
+	elif [ ! -s "$FNAME.hdr" ]; then
+		status="ERROR: cannot get headers"
+	elif [ ! -f "$FNAME.body" ]; then
+		status="Possibly detected*"
+	elif [ ! -s "$FNAME.body" ]; then
+		status="Possibly detected"
+	else
+		if [ "$BODY_SIZE" -le $CURL_RANGETO ]; then
+			status="Failed (recv $BODY_SIZE bytes)"
+			res=5
+		else
+			status="[ OK ]"
+			res=100
+		fi
+	fi
+	printf '%12s / %-15s / %-13s: %s \n' "$TAG" "$IPADDR" "$PROVIDER" "$status"
+	echo "$BODY_SIZE" > "$FNAME.size"
+	if [ $res != 100 ]; then
+		URL=$( cat "$FNAME.url" )
+		echo "$FILENAME : $URL" >> "$FAIL_URL_LIST"
+	fi
+done
+
+rm -f "$ZAP_TMP_DIR"/*.body >/dev/null 2>&1
+
+[ "$opt_recom" != "true" ] && return 0
+
+[ ! -f "$FAIL_URL_LIST" ] && return 0
+
+echo "==================================================="
+echo "Recommendations:"
+echo "Try adding the specified domains to the \"zapret-hosts-user.txt\" file:"
+
+while IFS=' : ' read -r FILENAME URL; do
+	[ -z "$FILENAME" ] && continue
+	URL_NO_PROTO="${URL#*://}"
+	DOMAIN="${URL_NO_PROTO%%/*}"
+	URLPATH="/${URL_NO_PROTO#*/}"
+	[ "$URLPATH" = "/$URL_NO_PROTO" ] && URLPATH="/"
+	echo "$DOMAIN"
+done < "$FAIL_URL_LIST"
+
+return 0 

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

@@ -14,7 +14,10 @@ gosuslugi.ru
 mos-gorsud.ru
 gov.ru
 sudrf.ru
+ottai.com
 ipstream.one
+vkusvill.ru
+kinopoisk.ru
 #################################### Epicgames
 easy.ac
 fab.com
@@ -36,45 +39,14 @@ cubicmotion.com
 playparagon.com
 realityscan.com
 epicgamescdn.com
-et.epicgames.com
-ol.epicgames.com
 radgametools.com
 unrealengine.com
-api.epicgames.dev
 easyanticheat.net
 shadowcomplex.com
 battlebreakers.com
-store.epicgames.com
 capturingreality.com
 unrealtournament.com
-cdn1.unrealengine.com
-cdn2.unrealengine.com
-accounts.epicgames.com
-download.epicgames.com
-tracking.epicgames.com
-download2.epicgames.com
-download3.epicgames.com
-download4.epicgames.com
-metrics.ol.epicgames.com
-datarouter.ol.epicgames.com
-fastly-download.epicgames.com
-store-content.ak.epicgames.com
-static-assets-prod.epicgames.com
 epicgames-download1.akamaized.net
-launcher-website-prod07.ol.epicgames.com
-ut-public-service-prod10.ol.epicgames.com
-store-site-backend-static.ak.epicgames.com
-library-service.live.use1a.on.epicgames.com
-accountportal-website-prod07.ol.epicgames.com
-account-public-service-prod03.ol.epicgames.com
-catalog-public-service-prod06.ol.epicgames.com
-friends-public-service-prod06.ol.epicgames.com
-launcher-public-service-prod06.ol.epicgames.com
-entitlement-public-service-prod08.ol.epicgames.com
-lightswitch-public-service-prod06.ol.epicgames.com
-orderprocessor-public-service-ecomprod01.ol.epicgames.com
-launcherwaitingroom-public-service-prod06.ol.epicgames.com
-datastorage-public-service-liveegs.live.use1a.on.epicgames.com
 #################################### Steam
 s.team
 steam.tv
@@ -102,99 +74,49 @@ valvesoftware.net
 steam.cdn.webra.ru
 steambroadcast.com
 steamcommunity.com
-cdn.steamstatic.com
-cs.steampowered.com
 dl.steam.clngaa.com
 steam.ru.qtlglb.com
-api.steampowered.com
 steam.eca.qtlglb.com
 steamusercontent.com
-help.steampowered.com
 steam.apac.qtlglb.com
 steam.naeu.qtlglb.com
 cdn.steamcommunity.com
 gstore.val.manlaxy.com
-login.steampowered.com
-media.steampowered.com
 partner.steamgames.com
-shared.steamstatic.com
 steam.cdn.orcon.net.nz
-store.steampowered.com
 steamcdn-a.akamaihd.net
 steampipe.akamaized.net
-partner.steampowered.com
 steamcdn-a.akamaized.net
 steamdeckusercontent.com
-support.steampowered.com
-checkout.steampowered.com
-community.steamstatic.com
 steam.cdn.slingshot.co.nz
 steammobile.akamaized.net
 steamstatic.akamaized.net
 steamstore-a.akamaihd.net
 steamvideo-a.akamaihd.net
-workshop.steampowered.com
-cdn.akamai.steamstatic.com
-cdn.fastly.steamstatic.com
 client-update.queniuqe.com
-community.steampowered.com
 steamdeckcdn.akamaized.net
 steampipe-kr.akamaized.net
-clan.fastly.steamstatic.com
 steamcontent-a.akamaihd.net
 steambroadcast.akamaized.net
 steamcommunity.akamaized.net
-store.akamai.steamstatic.com
-store.fastly.steamstatic.com
 scontent.steamusercontent.com
-shared.fastly.steamstatic.com
 steamcommunity-a.akamaihd.net
-avatars.fastly.steamstatic.com
-cdn.cloudflare.steamstatic.com
 edge.steam-dns.top.comcast.net
 steamcommunity-a.akamaized.net
 steamuserimages-a.akamaihd.net
 steampipe-partner.akamaized.net
 steamusercontent-a.akamaihd.net
-client-download.steampowered.com
-community.fastly.steamstatic.com
-store.cloudflare.steamstatic.com
-community.cloudflare.steamstatic.com
 steamcdn-a.akamaihd.net.edgesuite.net
 steamcloudsweden.blob.core.windows.net
-steamcommunity.cloudflare.steamstatic.com
 steamcommunity-a.akamaihd.net.edgesuite.net
 #################################### OpenWRT
-github.com
 openwrt.org
-gh.openwrt.org
-cdn.openwrt.org
-dev.openwrt.org
-git.openwrt.org
 lede-project.org
-wiki.openwrt.org
-forum.openwrt.org
-lists.openwrt.org
-openwrt.gitlab.io
-archive.openwrt.org
-downloads.openwrt.org
-fwdownloads.openwrt.org
-mirror-01.infra.openwrt.org
-mirror-02.infra.openwrt.org
-mirror-03.infra.openwrt.org
-mirror-04.infra.openwrt.org
 #################################### UbisoftConnect
 ubi.com
 ubisoft.com
-store.ubi.com
 ubisoftconnect.com
-connect.ubisoft.com
-drops-register.ubi.com
-public-ubiservices.ubi.com
-ubisoftconnect.cdn.ubi.com
-uplaypc-s-ubisoft.cdn.ubi.com
-uplaypc-s-ubisoft-ww.cdn.ubi.com
-ubisoft-orbit-savegames.s3.amazonaws.com
+connect.ubisoft.comubisoft-orbit-savegames.s3.amazonaws.com
 ubisoft-uplay-savegames.s3.amazonaws.com
 #################################### Aliexpress
 ae.com
@@ -214,43 +136,152 @@ playstation.net
 playstation.com
 account.sony.com
 psremoteplay.com
-ps4.playstation.com
-ps5.playstation.com
 playstationcloud.com
-psapi.playstation.net
-store.playstation.com
-media.playstation.com
-auth.np.ac.playstation.net
 sonyentertainmentnetwork.com
-np.community.playstation.net
-id.sonyentertainmentnetwork.com
 #################################### Twitch
 twitch.tv
 ttvnw.net
 jtvnw.net
-twimg.com
-m.twitch.tv
-id.twitch.tv
-www.twitch.tv
 twitchcdn.net
 ext-twitch.tv
 twitchsvc.net
-api.twitch.tv
-gql.twitch.tv
-dev.twitch.tv
 live-video.net
 twitch.a2z.com
-chat.twitch.tv
-help.twitch.tv
-assets.twitch.tv
 twitch-shadow.net
-passport.twitch.tv
-irc.chat.twitch.tv
-vod-metro.twitch.tv
 twitchcdn-shadow.net
-static.twitchcdn.net
-vod-secure.twitch.tv
-irc-ws.chat.twitch.tv
-pubsub-edge.twitch.tv
-vod-pop-secure.twitch.tv
+#################################### Valorant
+qq.com
+pvp.net
+vivox.com
+sd-rtn.com
+adjust.com
+riotcdn.net
+adobess.com
+valorant.com
+akamaihd.net
+myqcloud.com
+riotgames.com
+playvalorant.com
+wildrift-na.akamaized.net
+#################################### TikTok
+musical.ly
+tiktok.com
+tiktokv.eu
+tiktokv.us
+tiktokw.eu
+tiktokw.us
+muscdn.com
+tiktokd.net
+tiktokd.org
+tiktokv.com
+tiktokcdn.com
+ibytedtos.com
+ttwstatic.com
+tik-tokapi.com
+tiktok-row.net
+tiktokminis.us
+byteoversea.com
+tiktok-minis.com
+tiktokcdn-eu.com
+tiktokcdn-us.com
+tiktokeu-cdn.com
+tiktokrow-cdn.com
+tiktokglobalshopv.com
+tiktokcdn.com.akamaized.net
+tiktokcdn.com.edgesuite.net
+tiktokcdn-us.com.edgesuite.net
+#################################### Hoyoverse
+hoyo.link
+hoyolab.com
+yuanshen.com
+hoyoverse.com
+genshinimpact.com
+zenlesszonezero.com
+#################################### Xiaomi
+mi.com
+miui.com
+wali.com
+c.mi.com
+mgslb.com
+mifile.cn
+xiaomi.cn
+mipay.com
+youpin.cn
+zmifi.com
+mi-idc.com
+mi-img.com
+mijia.tech
+mitvos.com
+miwifi.com
+xiaomi.com
+xiaomi.net
+duokan.com
+saxyit.com
+mi-fan.com
+mihome.com
+xiaomisa.cn
+migames.com
+miaibox.com
+mi-home.com
+xiaomicp.com
+xiaomidns.cn
+xiaomiev.com
+xiaomiinc.cn
+xiaominr.com
+xiaomisa.com
+xiaomisa.net
+xiaomisa.org
+roborock.com
+mi-robot.com
+yeelight.com
+miot-spec.cn
+xiaomidns.com
+xiaomidns.net
+xiaomiinc.com
+xiaomiinc.net
+duokanbox.com
+youpin.com.cn
+miot-spec.org
+miot-spec.com
+xiaomiwear.com
+xiaomimimo.com
+dreamehome.com
+xiaomiprint.com
+xiaomidns.com.cn
+xiaomiinc.com.cn
+xiaomimobile.com
+xiaomixiaoai.com
+xiaomiyoupin.com
+xiaoaiassist.com
+xiaomi-mijia.com
+xiaomifactory.com
+airstarfinance.net
+dreame-technology.cn
+dreame-technology.com
+#################################### Picooc
+picoocru.com
+picooc-g.com
+picooc-int.com
+#################################### Huawei
+hc-cdn.cn
+huawei.ru
+huawei.com
+hc-cdn.com
+huawei.net
+dbankcdn.ru
+hicloud.com
+dbankcdn.com
+dbankcloud.ru
+dbankcloud.cn
+dbankcloud.com
+huaweicloud.com
+huaweistatic.com
+hwclouds-dns.com
+hwclouds-dns.net
+myhuaweicloud.cn
+myhuaweicloud.com
+huaweicloud-dns.cn
+huaweicloud-dns.ru
+huaweicloud-dns.com
+huaweicloud-dns.org
 ####################################

zapret/restore-def-cfg.sh

@@ -13,6 +13,11 @@ opt_strat=$2
 if echo "$opt_flags" | grep -q "(reset_ipset)"; then
 	restore_all_ipset_cfg
 fi
+
+if echo "$opt_flags" | grep -q "(erase_autohostlist)"; then
+	: > $ZAPRET_BASE/ipset/zapret-hosts-auto.txt
+	: > $ZAPRET_BASE/ipset/zapret-hosts-auto-debug.log
+fi
 	
 create_default_cfg "$opt_flags" "$opt_strat"
 

zapret/sync_config.sh

@@ -46,7 +46,7 @@ function sync_param
 	local value="$( uci -q get $ZAPRET_CFG_SEC.$param )"
 	uncomment_param $param
 	append_param $param
-	local TAB="$( echo -n -e '\t' )"
+	local TAB="$( printf '\t' )"
 	if [ "$value" = "$TAB" ]; then
 		value=""
 	fi
@@ -101,6 +101,7 @@ sync_param AUTOHOSTLIST_FAIL_TIME
 if [ $ZAPRET_CFG_NAME = "zapret2" ]; then
 	sync_param AUTOHOSTLIST_INCOMING_MAXSEQ
 	sync_param AUTOHOSTLIST_RETRANS_MAXSEQ
+	sync_param AUTOHOSTLIST_RETRANS_RESET
 	sync_param AUTOHOSTLIST_UDP_IN
 	sync_param AUTOHOSTLIST_UDP_OUT
 fi

zapret/uci-def-cfg.sh

@@ -1,11 +1,15 @@
 #!/bin/sh
 # Copyright (c) 2024 remittor
 
+[ ! -f /opt/zapret/comfunc.sh ] && exit 0
+
 . /opt/zapret/comfunc.sh
 
+mkdir -p $ZAPRET_BASE/ipset
+
 # create empty txt files into ipset directory
 [ ! -f "$ZAPRET_BASE/ipset/zapret-hosts-google.txt"     ] && touch "$ZAPRET_BASE/ipset/zapret-hosts-google.txt"
-#[ ! -f "$ZAPRET_BASE/ipset/zapret-hosts-auto.txt"      ] && touch "$ZAPRET_BASE/ipset/zapret-hosts-auto.txt"
+[ ! -f "$ZAPRET_BASE/ipset/zapret-hosts-auto.txt"       ] && touch "$ZAPRET_BASE/ipset/zapret-hosts-auto.txt"
 [ ! -f "$ZAPRET_BASE/ipset/zapret-hosts-user.txt"       ] && touch "$ZAPRET_BASE/ipset/zapret-hosts-user.txt"
 [ ! -f "$ZAPRET_BASE/ipset/zapret-hosts-user-ipban.txt" ] && touch "$ZAPRET_BASE/ipset/zapret-hosts-user-ipban.txt"
 #[ ! -f "$ZAPRET_BASE/ipset/zapret-ip.txt"              ] && touch "$ZAPRET_BASE/ipset/zapret-ip.txt"
@@ -14,5 +18,6 @@
 [ ! -f "$ZAPRET_BASE/ipset/zapret-ip-user-ipban.txt"    ] && touch "$ZAPRET_BASE/ipset/zapret-ip-user-ipban.txt"
 
 # create or merge uci-config
+[ ! -f "$ZAPRET_BASE/renew-cfg.sh" ] && exit 0
 $ZAPRET_BASE/renew-cfg.sh
 	

zapret/update-pkg.sh

@@ -75,9 +75,13 @@ ZAP_PKG_URL=
 if command -v apk >/dev/null; then
 	PKG_MGR=apk
 	ZAP_PKG_EXT=apk
+	PKG_CHECK="apk info -e "
+	PKG_REMOVE="apk del --force "
 elif command -v opkg >/dev/null; then
 	PKG_MGR=opkg
 	ZAP_PKG_EXT=ipk
+	PKG_CHECK="opkg status "
+	PKG_REMOVE="opkg remove --force-remove "
 else
 	echo "ERROR: No package manager found"
 	return 1
@@ -487,7 +491,7 @@ if [ "$opt_update" != "" ]; then
 		fi
 	fi
 	if ! command -v unzip >/dev/null 2>&1; then
-		echo "ERROR: package \"upzip\" not installed!"
+		echo "ERROR: package \"unzip\" not installed!"
 		return 218
 	fi
 	unzip -q "$ZAP_PKG_FN" -d $ZAP_PKG_DIR
@@ -525,6 +529,14 @@ 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
+		echo "Uninstall mdig..."
+		${PKG_REMOVE} ${ZAPRET_CFG_NAME}-mdig
+	fi
+	if ${PKG_CHECK} ${ZAPRET_CFG_NAME}-ip2net >/dev/null 2>&1; then
+		echo "Uninstall ip2net..."
+		${PKG_REMOVE} ${ZAPRET_CFG_NAME}-ip2net
+	fi
 	echo "Install downloaded packages..."
 	if [ "$PKG_MGR" != "apk" ]; then
 		opkg install --force-reinstall "$ZAP_PKG_BASE_FN"