Bump version to v72.20260113

makefile: Fix postinst section
confunc: Fix function restore_all_ipset_cfg
2026-01-27 12:50:35 +03:00 · 2026-01-13 13:50:44 +03:00 · 2026-01-13 13:49:52 +03:00 · 2026-01-13 13:37:06 +03:00 · 2026-01-13 13:34:25 +03:00 · 2026-01-13 13:24:47 +03:00
18 changed files with 1004 additions and 362 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,6 +27,7 @@ on:
        options:
        - true
        - false
+
  push:
    tags:
      - v[0-9]+*
@@ -36,17 +37,19 @@ env:
  FAKE_BUILD: ${{ github.event.inputs.fake_build == 'true' }}
  MAX_SPEED: ${{ github.event.inputs.max_speed != 'false' }}
  TAG_SUFFIX: ${{ github.event.inputs.fake_build == 'true' && '-fake' || github.event.inputs.test_build == 'true' && '-test' || '' }}
+  REPO_NAME: zapret-openwrt
  REPO_URL: https://github.com/remittor/zapret-openwrt
  REPO_LNK: remittor/zapret-openwrt
  REPO_BRANCH: master
-  BUILD_ROOT: ${{ github.workspace }}/builder
+  PKGDIR: ${{ github.workspace }}/zapret-openwrt
+  SDKDIR: /builder
  BUILD_DATE: unknown
  REPO_DATE: unknown
  LUCI_ARCH: aarch64_cortex-a53

 jobs:
  check:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04 
    outputs:
      tag: ${{ steps.gh.outputs.tag }}
      date: ${{ steps.gh.outputs.date }}
@@ -103,14 +106,29 @@ jobs:
          fi
          echo "is_active=$is_active" >> $GITHUB_OUTPUT

+  var:
+    runs-on: ubuntu-24.04 
+    outputs:
+      IPK_BRANCH: ${{ steps.set.outputs.IPK_BRANCH }}
+      APK_BRANCH: ${{ steps.set.outputs.APK_BRANCH }}
+      XXX_BRANCH: ${{ steps.set.outputs.XXX_BRANCH }}
+    steps:
+      - id: set
+        run: |
+          echo "IPK_BRANCH=v24.10.5" >> "$GITHUB_OUTPUT"
+          echo "APK_BRANCH=v25.12.0-rc2" >> "$GITHUB_OUTPUT"
+          echo "XXX_BRANCH=SNAPSHOT" >> "$GITHUB_OUTPUT"
+
  build:
-    needs: check
+    needs: [ check, var ]
    #if: needs.check.outputs.is_active == 'true'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
    strategy:
      fail-fast: false
      matrix:
-        branch: [ openwrt-24.10, SNAPSHOT ]
+        branch:
+          - ${{ needs.var.outputs.IPK_BRANCH }}
+          - ${{ needs.var.outputs.APK_BRANCH }}
        arch:
          - aarch64_cortex-a53
          - aarch64_cortex-a72
@@ -137,40 +155,73 @@ jobs:
          - mipsel_24kc_24kf
          - mipsel_74kc
          - mipsel_mips32
+          - riscv64_riscv64
          - riscv64_generic
          - x86_64
        isTestOrFake:
          - ${{ needs.check.outputs.test_build == 'true' || needs.check.outputs.fake_build == 'true' }}
        exclude:
-          - branch: openwrt-24.10
-            arch: riscv64_generic
-          - branch: SNAPSHOT
+          - branch: ${{ needs.var.outputs.APK_BRANCH }}
            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: openwrt-24.10
+          - branch: ${{ needs.var.outputs.IPK_BRANCH }}
            arch: x86_64
-          - branch: openwrt-24.10
+          - branch: ${{ needs.var.outputs.IPK_BRANCH }}
            arch: aarch64_cortex-a53
-          - branch: SNAPSHOT
+          - branch: ${{ needs.var.outputs.APK_BRANCH }}
            arch: aarch64_cortex-a53
    container:
-      image: openwrt/sdk:${{ matrix.arch }}-${{ matrix.branch }}
+      image: ghcr.io/openwrt/sdk:${{ matrix.arch }}-${{ matrix.branch }}
      options: --user root
+
    outputs:
-      pkgver: ${{ steps.build.outputs.pkgver }}
+      pkgver: ${{ steps.prepare.outputs.pkgver }}
+
    steps:
      - name: Checkout
        uses: actions/checkout@v4
        with:
          repository: ${{ env.REPO_LNK }}
-          path: zapret-openwrt
+          path: ${{ env.REPO_NAME }}
+
+      - name: Fix SDK paths
+        run: |
+          mkdir -p $SDKDIR/shared-workdir
+          rm -rf $SDKDIR/shared-workdir/build
+          ln -sf $SDKDIR $SDKDIR/shared-workdir/build
+
+      - name: Initialization environment
+        working-directory: ${{ env.SDKDIR }}
+        env:
+          DEBIAN_FRONTEND: noninteractive
+          ARCH_TAG: ${{ matrix.arch }}
+          BRANCH: ${{ matrix.branch }}
+          FAKE_BUILD: ${{ env.FAKE_BUILD == 'true' || ( env.TEST_BUILD == 'true' && matrix.branch == needs.var.outputs.APK_BRANCH ) }}
+        run: |
+          if [ "$BRANCH" = "${{ needs.var.outputs.IPK_BRANCH }}" ]; then
+              echo "PKGTYPE=ipk" >> $GITHUB_ENV
+          else
+              echo "PKGTYPE=apk" >> $GITHUB_ENV
+          fi
+          mkdir -p ./logs
+          #echo ============== $SDKDIR ======================
+          #ls -la $SDKDIR
+          #echo ----------------------------------------------
+          echo "FAKE_BUILD=$FAKE_BUILD" >> $GITHUB_ENV
+          echo "ARCH_TAG=$ARCH_TAG" >> $GITHUB_ENV
+          echo "BRANCH=$BRANCH" >> $GITHUB_ENV
+          echo "TZ=UTC" >> $GITHUB_ENV

      - name: Setup OpenWrt SDK
-        working-directory: /builder
-        env:
-          BRANCH: ${{ matrix.branch }}
-        shell: bash
+        if: false
+        working-directory: ${{ env.SDKDIR }}
        run: |
          # gpg --verbose --recv-keys 0x1D53D1877742E911
          # gpg --verbose --import <(wget -qO- 'https://git.openwrt.org/?p=keyring.git;a=blob_plain;f=gpg/0x1D53D1877742E911.asc')
@@ -181,120 +232,120 @@ jobs:
          sed -r -i 's/^rm.+//' setup.sh
          ./setup.sh
          ls -lh
-          if [ "$BRANCH" = "openwrt-24.10" ]; then
-              echo "PKGTYPE=ipk" >> $GITHUB_ENV
-          else
-              echo "PKGTYPE=apk" >> $GITHUB_ENV
-          fi

      - name: Setup ccache
+        if: false
        uses: actions/cache@v4
        with:
-          path: '/builder/.ccache'
+          path: ${{ env.SDKDIR }}/.ccache
          key: ccache-${{ matrix.arch }}-${{ matrix.branch }}-${{ github.run_id }}
          restore-keys: |
            ccache-${{ matrix.arch }}-${{ matrix.branch }}-

-      - name: Init packages
-        id: init
-        working-directory: '/builder'
-        env:
-          FAKE_BUILD: ${{ env.FAKE_BUILD == 'true' || ( env.TEST_BUILD == 'true' && matrix.branch == 'SNAPSHOT' ) }}
-          BUILD_DATE: ${{ needs.check.outputs.build_date }}
-          ARCH: ${{ matrix.arch }}
-          BRANCH: ${{ matrix.branch }}
-          SIGN_KEY: ${{ secrets.SIGN_PRIVATE_KEY }}
-          CCACHE_DIR: '/builder/.ccache'
-        shell: bash
+      - name: Prepare packages
+        id: prepare
+        working-directory: ${{ env.SDKDIR }}
        run: |
-          PKGDIR=$GITHUB_WORKSPACE/zapret-openwrt
-          MKFN=$PKGDIR/luci-app-zapret/Makefile
+          MKFN=$( ls -1 $PKGDIR/luci-app-zapret*/Makefile )
          PKGVER=$( grep -s '^PKG_VERSION:=.*' $MKFN | cut -d'=' -f2 )
          PKGREL=$( grep -s '^PKG_RELEASE:=.*' $MKFN | cut -d'=' -f2 )
          [ "$PKGREL" != "1" ] && PKGVER=$PKGVER-r$PKGREL
          echo "PKG_VERSION = $PKGVER"
-          cp -vr $PKGDIR ./package/zapret-openwrt/
-          
-          mv feeds.conf.default feeds.conf
-          sed -i -e 's|base.*\.git|base https://github.com/openwrt/openwrt.git|' feeds.conf
-          sed -i -e 's|packages.*\.git|packages https://github.com/openwrt/packages.git|' feeds.conf
-          sed -i -e 's|luci.*\.git|luci https://github.com/openwrt/luci.git|' feeds.conf
-          mkdir -p ./logs
-          
-          if [ "$FAKE_BUILD" = "false" ]; then
-              ./scripts/feeds update base packages luci
-              ./scripts/feeds install -a
-          fi
-          echo "FAKE_BUILD=$FAKE_BUILD" >> $GITHUB_ENV
+          cp -vr $PKGDIR ./package/$REPO_NAME/
          echo "PKGVER=$PKGVER" >> $GITHUB_ENV
          echo "pkgver=$PKGVER" >> $GITHUB_OUTPUT
          echo "status=success" >> $GITHUB_OUTPUT

-      - name: Build packages        
-        id: build
-        if: steps.init.outputs.status == 'success'
-        working-directory: '/builder'
-        env:
-          BUILD_DATE: ${{ needs.check.outputs.build_date }}
-          ARCH: ${{ matrix.arch }}
-          BRANCH: ${{ matrix.branch }}
-          SIGN_KEY: ${{ secrets.SIGN_PRIVATE_KEY }}
-          CCACHE_DIR: '/builder/.ccache'
-        shell: bash
+      - name: Init packages
+        id: init
+        if: steps.prepare.outputs.status == 'success'
+        working-directory: ${{ env.SDKDIR }}
        run: |
-          MAKE_JOBS=$(($(nproc)+1))
-          echo "$MAKE_JOBS thread compile"
-          
-          if [ "$FAKE_BUILD" = "false" ]; then
-              make defconfig
-              sed -i 's/CONFIG_LUCI_JSMIN=y/CONFIG_LUCI_JSMIN=n/g' .config
-              echo "------------- .config BEG -------------------"
-              cat .config
-              echo "------------- .config END -------------------"
-              if [ "$ARCH" = "$LUCI_ARCH" ]; then
-                  PKGLIST=`echo package/zapret-openwrt/{zapret,luci-app-zapret}/compile`
-              else
-                  PKGLIST=`echo package/zapret-openwrt/zapret/compile`
-              fi
-              if [ "$MAX_SPEED" = "false" ]; then
-                  make $PKGLIST V=s CONFIG_CCACHE=1 BUILD_LOG=1
-              else
-                  make -j$MAKE_JOBS $PKGLIST CONFIG_CCACHE=1
-              fi
-          else
-              OUT_DIR=./bin/packages/dev_x/base
-              mkdir -p $OUT_DIR
-              touch $OUT_DIR/zapret_$PKGVER-$ARCH.$PKGTYPE
-              touch $OUT_DIR/luci-app-zapret_$PKGVER-all.$PKGTYPE
+          mv feeds.conf.default feeds.conf
+          sed -i -e 's|base.*\.git|base https://github.com/openwrt/openwrt.git|' feeds.conf
+          sed -i -e 's|packages.*\.git|packages https://github.com/openwrt/packages.git|' feeds.conf
+          sed -i -e 's|luci.*\.git|luci https://github.com/openwrt/luci.git|' feeds.conf
+          ./scripts/feeds update base packages luci
+          ./scripts/feeds install -a
+          echo "status=success" >> $GITHUB_OUTPUT
+
+      - name: Init config
+        id: config
+        if: steps.init.outputs.status == 'success'
+        working-directory: ${{ env.SDKDIR }}
+        run: |
+          make defconfig
+          sed -i 's/CONFIG_LUCI_JSMIN=y/CONFIG_LUCI_JSMIN=n/g' .config
+          echo "status=success" >> $GITHUB_OUTPUT
+
+      - name: Show config
+        working-directory: ${{ env.SDKDIR }}
+        run: |
+          cat .config || echo "File .config not found"
+
+      - name: Build packages
+        id: build
+        if: steps.config.outputs.status == 'success' && env.FAKE_BUILD != 'true'
+        working-directory: ${{ env.SDKDIR }}
+        env:
+          ARCH_TAG: ${{ matrix.arch }}
+        run: |
+          PKGLIST="package/zapret-openwrt/zapret/compile"
+          if [ "$ARCH_TAG" = "$LUCI_ARCH" ]; then
+              PKGLIST="$PKGLIST package/zapret-openwrt/luci-app-zapret/compile"
          fi
-          
+          MAKE_JOBS=$(nproc)
+          echo "$MAKE_JOBS thread compile"
+          if [ "$MAX_SPEED" != "true" ]; then
+              make $PKGLIST V=sc BUILD_LOG=1
+          else
+              make $PKGLIST -j$MAKE_JOBS
+          fi
+          echo "status=success" >> $GITHUB_OUTPUT
+
+      - name: Build packages (FAKE)
+        id: build_fake
+        if: env.FAKE_BUILD == 'true'
+        working-directory: ${{ env.SDKDIR }}
+        env:
+          ARCH_TAG: ${{ matrix.arch }}
+        run: |
+          OUT_DIR=./bin/packages/dev_x/base
+          mkdir -p $OUT_DIR
+          touch $OUT_DIR/zapret_$PKGVER-$ARCH_TAG.$PKGTYPE
+          touch $OUT_DIR/luci-app-zapret_$PKGVER-all.$PKGTYPE
+          echo "status=success" >> $GITHUB_OUTPUT
+
+      - name: Install packages
+        id: install
+        if: steps.build.outputs.status == 'success' || steps.build_fake.outputs.status == 'success'
+        working-directory: ${{ env.SDKDIR }}
+        env:
+          ARCH_TAG: ${{ matrix.arch }}
+          SIGN_KEY: ${{ secrets.SIGN_PRIVATE_KEY }}
+        run: |
          find ./bin/packages/*/base -type f ! -regex ".*\(zapret\).*\.[ai]pk$" -delete
-          
          #echo ">>>>>>> build a repository index to make the output directory usable as local OPKG source"
          #ln -s `which usign` staging_dir/host/bin/usign
          #echo "$SIGN_KEY" | base64 -d > key-build
          #make package/index
-          
-          OUTDIR=$GITHUB_WORKSPACE/$PKGTYPE-$ARCH
+          OUTDIR=$GITHUB_WORKSPACE/$PKGTYPE-$ARCH_TAG
          mkdir -p $OUTDIR
          cp -R ./bin/packages/*/base/. $OUTDIR/
-          ./staging_dir/host/bin/ccache --max-size=10M --show-stats
-          
          echo "OUTDIR=$OUTDIR" >> $GITHUB_ENV
-          echo "pkgver=$PKGVER" >> $GITHUB_OUTPUT
          echo "status=success" >> $GITHUB_OUTPUT

      - name: Compress build logs
        if: always()
        env:
-          ARCH: ${{ matrix.arch }}
+          ARCH_TAG: ${{ matrix.arch }}
          BRANCH: ${{ matrix.branch }}
-          LOGS_DIR: '/builder/logs'
+          LOGS_DIR: ${{ env.SDKDIR }}/logs
        run: |
-          tar -cJvf logs-$BRANCH-$ARCH.tar.xz $LOGS_DIR
+          tar -cJvf logs-$BRANCH-$ARCH_TAG.tar.xz $LOGS_DIR

      - name: Upload packages
-        if: steps.build.outcome == 'success'
+        if: steps.install.outcome == 'success'
        uses: actions/upload-artifact@main
        with:
          path: ${{ env.OUTDIR }}
@@ -312,7 +363,7 @@ jobs:
    needs: [ check, build ]
    permissions:
      contents: write
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
    steps:
      - name: Download artifacts
        uses: actions/download-artifact@v4
--- a/.github/workflows/releases.yml
+++ b/.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 }}
--- a/luci-app-zapret/Makefile
+++ b/luci-app-zapret/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=luci-app-zapret
-PKG_VERSION:=72.20260108
+PKG_VERSION:=72.20260113
 PKG_RELEASE:=1
 PKG_LICENSE:=MIT
 PKG_MAINTAINER:=remittor <https://github.com/remittor>
--- a/luci-app-zapret/htdocs/luci-static/resources/view/zapret/diagnost.js
+++ b/luci-app-zapret/htdocs/luci-static/resources/view/zapret/diagnost.js
@@ -0,0 +1,96 @@
+'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 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;
+
+        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' }, [
+                this.logArea,
+            ]),
+            E('div', { 'class': 'right' }, [
+                this.btn_dpicheck,
+                ' ',
+                this.btn_cancel,
+            ])
+        ]);
+    }    
+});
--- a/luci-app-zapret/htdocs/luci-static/resources/view/zapret/dmnlog.js
+++ b/luci-app-zapret/htdocs/luci-static/resources/view/zapret/dmnlog.js
@@ -11,7 +11,7 @@ return view.extend({
    retrieveLog: async function() {
        return Promise.all([
            L.resolveDefault(fs.stat('/bin/cat'), null),
-            fs.exec('/usr/bin/find', [ '/tmp', '-maxdepth', '1', '-type', 'f', '-name', 'zapret+*.log' ]),
+            fs.exec('/usr/bin/find', [ '/tmp', '-maxdepth', '1', '-type', 'f', '-name', tools.appName+'+*.log' ]),
            uci.load(tools.appName),
        ]).then(function(status_array) {
            var filereader = status_array[0] ? status_array[0].path : null;
@@ -64,7 +64,7 @@ return view.extend({
            }).catch(function(e) {
                ui.addNotification(null, E('p', _('Unable to execute or read contents')
                    + ': %s [ %s | %s | %s ]'.format(
-                        e.message, 'retrieveLogData', 'uci.zapret'
+                        e.message, 'retrieveLogData', 'uci.'+tools.appName
                )));
                return null;
            });
@@ -72,7 +72,7 @@ return view.extend({
            const [, lineno, colno] = e.stack.match(/(\d+):(\d+)/);
            ui.addNotification(null, E('p', _('Unable to execute or read contents')
                + ': %s [ lineno: %s | %s | %s | %s ]'.format(
-                    e.message, lineno, 'retrieveLog', 'uci.zapret'
+                    e.message, lineno, 'retrieveLog', 'uci.'+tools.appName
            )));
            return null;
        });
@@ -90,21 +90,21 @@ return view.extend({
                logdate_len = (Array.isArray(logdata)) ? logdata.length : -1;
            }
            let elem_name = elem.getAttribute("name");
-            let founded = false;
+            let found = false;
            if (logdate_len > 0) {
                for (let log_num = 0; log_num < logdate_len; log_num++) {
                    if (logdata[log_num].filename == elem_name) {
                        if (logdata[log_num].data) {
                            elem.value = logdata[log_num].data;
                            elem.rows  = logdata[log_num].rows;
-                            founded = true;
+                            found = true;
                            //console.log('POLL: updated ' + elem_name);
                        }
                        break;
                    }
                }
            }
-            if (!founded) {
+            if (!found) {
                elem.value = '';
                elem.rows  = 0;
            }
@@ -130,7 +130,7 @@ return view.extend({
            return;
        }
        var h2 = E('div', {'class' : 'cbi-title-section'}, [
-            E('h2', {'class': 'cbi-title-field'}, [ _('Zapret') + ' - ' + _('Log Viewer') ]),
+            E('h2', {'class': 'cbi-title-field'}, [ tools.AppName + ' - ' + _('Log Viewer') ]),
        ]);

        var tabs = E('div', {}, E('div'));
@@ -140,7 +140,11 @@ return view.extend({
            var logfn = logdata[log_num].filename;
            let filename = logfn.replace(/.*\//, '');
            let fname = filename.split('.')[0];
-            fname = fname.replace(/^(zapret\+)/, '');
+            if (tools.appName == 'zapret2') {
+                fname = fname.replace(/^(zapret2\+)/, '');
+            } else {
+                fname = fname.replace(/^(zapret\+)/, '');
+            }
            let fn = fname.split('+');
            
            let tabNameText = fname.replace(/\+/g, ' ');
--- a/luci-app-zapret/htdocs/luci-static/resources/view/zapret/env.js
+++ b/luci-app-zapret/htdocs/luci-static/resources/view/zapret/env.js
@@ -0,0 +1,53 @@
+'use strict';
+'require baseclass';
+
+return baseclass.extend({
+    packager          : { },
+    appName           : 'zapret',
+    AppName           : 'Zapret',
+    execPath          : '/etc/init.d/zapret',
+    appDir            : '/opt/zapret',
+    syncCfgPath       : '/opt/zapret/sync_config.sh',
+    defCfgPath        : '/opt/zapret/def-cfg.sh',
+    defaultCfgPath    : '/opt/zapret/restore-def-cfg.sh',
+
+    hostsGoogleFN     : '/opt/zapret/ipset/zapret-hosts-google.txt',
+    hostsUserFN       : '/opt/zapret/ipset/zapret-hosts-user.txt',
+    hostsUserExcludeFN: '/opt/zapret/ipset/zapret-hosts-user-exclude.txt',
+    iplstExcludeFN    : '/opt/zapret/ipset/zapret-ip-exclude.txt',
+    iplstUserFN       : '/opt/zapret/ipset/zapret-ip-user.txt',
+    iplstUserExcludeFN: '/opt/zapret/ipset/zapret-ip-user-exclude.txt',
+    custFileMax       : 4,
+    custFileTemplate  : '/opt/zapret/ipset/cust%s.txt',
+    customdPrefixList : [ 10, 20, 50, 60, 90 ] ,
+    customdFileFormat : '/opt/zapret/init.d/openwrt/custom.d/%s-script.sh',
+    discord_num       : 50,
+    discord_url       : [ 'https://github.com/bol-van/zapret/blob/4e8e3a9ed9dbeb1156db68dfaa7b353051c13797/init.d/custom.d.examples.linux/50-discord',
+                          'https://github.com/bol-van/zapret/blob/b251ea839cc8f04c45090314ef69fce69f2c00f2/init.d/custom.d.examples.linux/50-discord-media',
+                          'https://github.com/bol-van/zapret/blob/b251ea839cc8f04c45090314ef69fce69f2c00f2/init.d/custom.d.examples.linux/50-stun4all',
+                          'https://github.com/bol-van/zapret/tree/master/init.d/custom.d.examples.linux'
+                        ],
+    nfqws_opt_url     : 'https://github.com/remittor/zapret-openwrt/discussions/168',
+
+    autoHostListFN    : '/opt/zapret/ipset/zapret-hosts-auto.txt',
+    autoHostListDbgFN : '/opt/zapret/ipset/zapret-hosts-auto-debug.log',
+
+    load_env: function(dst_obj) {
+        let env_proto = Object.getPrototypeOf(this);
+        Object.getOwnPropertyNames(env_proto).forEach(function(key) {
+            if (key === 'constructor' || key === 'load_env' || key.startsWith('__'))
+                return;
+            dst_obj[key] = env_proto[key];
+        });
+        dst_obj.packager = { };
+        if (L.hasSystemFeature('apk')) {
+            dst_obj.packager.name = 'apk';
+            dst_obj.packager.path = '/usr/bin/apk';
+            dst_obj.packager.args = [ 'list', '-I', '*'+this.appName+'*' ];
+        } else {
+            dst_obj.packager.name = 'opkg';
+            dst_obj.packager.path = '/bin/opkg';
+            dst_obj.packager.args = [ 'list-installed', '*'+this.appName+'*' ];
+        }
+    }
+});
--- a/luci-app-zapret/htdocs/luci-static/resources/view/zapret/service.js
+++ b/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'),
        };
    },
@@ -55,7 +57,7 @@ return view.extend({
        ]).catch(e => {
            ui.addNotification(null, E('p', _('Unable to execute or read contents')
                + ': %s [ %s | %s | %s ]'.format(
-                    e.message, tools.execPath, 'tools.getInitState', 'uci.zapret'
+                    e.message, tools.execPath, 'tools.getInitState', 'uci.'+tools.appName
            )));
        });
    },
@@ -248,8 +250,9 @@ return view.extend({
            let strat = '' + this.nfqws_strat_list[id];
            strat_list.push( E('option', { value: 'strat_' + id }, [ strat ] ) );
        }
+        let label_nfqws = (tools.appName == 'zapret2') ? _('NFQWS2_OPT strategy: ') : _('NFQWS_OPT strategy: ');
        let nfqws_strat = E('label', [
-            _('NFQWS_OPT strategy: '),
+            label_nfqws,
            E('select', { id: 'cfg_nfqws_strat' }, strat_list)
        ]);

@@ -381,6 +384,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 ] );
@@ -393,29 +400,30 @@ 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);

        poll.add(L.bind(this.statusPoll, this));

-        let page_title = _('Zapret');
+        let page_title = tools.AppName;
        let pkgdict = tools.decode_pkg_list(pkg_list.stdout, false);
        page_title += ' &nbsp ';
-        if (pkgdict['zapret'] === undefined || pkgdict['zapret'] == '') {
+        if (pkgdict[tools.appName] === undefined || pkgdict[tools.appName] == '') {
            page_title += 'unknown version';
        } else {
-            page_title += 'v' + pkgdict['zapret'];
+            page_title += 'v' + pkgdict[tools.appName];
        }
        let aux1 = E('em');
        let aux2 = E('em');
-        if (pkgdict['zapret'] != pkgdict['luci-app-zapret']) {
-            let errtxt = 'LuCI APP v' + pkgdict['luci-app-zapret'] + ' [ incorrect version! ]';
+        if (pkgdict[tools.appName] != pkgdict['luci-app-'+tools.appName]) {
+            let errtxt = 'LuCI APP v' + pkgdict['luci-app-'+tools.appName] + ' [ incorrect version! ]';
            aux1 = E('div', { 'class': 'label-status error' }, errtxt);
            aux2 = E('div', { }, '&nbsp');
        }
        
-        let url1 = 'https://github.com/bol-van/zapret';
+        let url1 = 'https://github.com/bol-van/'+tools.appName;
        let url2 = 'https://github.com/remittor/zapret-openwrt';

        return E([
--- a/luci-app-zapret/htdocs/luci-static/resources/view/zapret/settings.js
+++ b/luci-app-zapret/htdocs/luci-static/resources/view/zapret/settings.js
@@ -48,7 +48,7 @@ return view.extend({

        let m, s, o, tabname;

-        m = new form.Map(tools.appName, _('Zapret') + ' - ' + _('Settings'));
+        m = new form.Map(tools.appName, tools.AppName + ' - ' + _('Settings'));

        s = m.section(form.NamedSection, 'config');
        s.anonymous = true;
@@ -107,7 +107,11 @@ return view.extend({
        /* NFQWS_OPT_DESYNC tab */

        tabname = 'nfqws_params';
-        s.tab(tabname, _('NFQWS options'));
+        if (tools.appName == 'zapret2') {
+            s.tab(tabname, _('NFQWS2 options'));
+        } else {
+            s.tab(tabname, _('NFQWS options'));
+        }

        let add_delim = function(sec, url = null) {
            let o = sec.taboption(tabname, form.DummyValue, '_hr');
@@ -154,7 +158,11 @@ return view.extend({
            btn.onclick = () => new tools.longstrEditDialog('config', param, param, desc, rows, multiline).show();
        };

-        o = s.taboption(tabname, form.Flag, 'NFQWS_ENABLE', _('NFQWS_ENABLE'));
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Flag, 'NFQWS2_ENABLE', _('NFQWS2_ENABLE'));
+        } else {
+            o = s.taboption(tabname, form.Flag, 'NFQWS_ENABLE', _('NFQWS_ENABLE'));
+        }
        o.rmempty = false;
        o.default = 1;

@@ -173,41 +181,77 @@ return view.extend({
        o.validate = function(section_id, value) { return true; };
        o.write = function(section_id, value) { return form.Value.prototype.write.call(this, section_id, (value == null || value.trim() == '') ? "\t" : value.trim()); };
        
-        o = s.taboption(tabname, form.Value, 'NFQWS_PORTS_TCP', _('NFQWS_PORTS_TCP'));
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'NFQWS2_PORTS_TCP', _('NFQWS2_PORTS_TCP'));
+        } else {
+            o = s.taboption(tabname, form.Value, 'NFQWS_PORTS_TCP', _('NFQWS_PORTS_TCP'));
+        }
        o.rmempty     = false;
        o.datatype    = 'string';

-        o = s.taboption(tabname, form.Value, 'NFQWS_PORTS_UDP', _('NFQWS_PORTS_UDP'));
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'NFQWS2_PORTS_UDP', _('NFQWS2_PORTS_UDP'));
+        } else {
+            o = s.taboption(tabname, form.Value, 'NFQWS_PORTS_UDP', _('NFQWS_PORTS_UDP'));
+        }
        o.rmempty     = false;
        o.datatype    = 'string';

-        o = s.taboption(tabname, form.Value, 'NFQWS_TCP_PKT_OUT', _('NFQWS_TCP_PKT_OUT'));
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'NFQWS2_TCP_PKT_OUT', _('NFQWS2_TCP_PKT_OUT'));
+        } else {
+            o = s.taboption(tabname, form.Value, 'NFQWS_TCP_PKT_OUT', _('NFQWS_TCP_PKT_OUT'));
+        }
        o.rmempty     = false;
        o.datatype    = 'string';

-        o = s.taboption(tabname, form.Value, 'NFQWS_TCP_PKT_IN', _('NFQWS_TCP_PKT_IN'));
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'NFQWS2_TCP_PKT_IN', _('NFQWS2_TCP_PKT_IN'));
+        } else {
+            o = s.taboption(tabname, form.Value, 'NFQWS_TCP_PKT_IN', _('NFQWS_TCP_PKT_IN'));
+        }
        o.rmempty     = false;
        o.datatype    = 'string';

-        o = s.taboption(tabname, form.Value, 'NFQWS_UDP_PKT_OUT', _('NFQWS_UDP_PKT_OUT'));
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'NFQWS2_UDP_PKT_OUT', _('NFQWS2_UDP_PKT_OUT'));
+        } else {
+            o = s.taboption(tabname, form.Value, 'NFQWS_UDP_PKT_OUT', _('NFQWS_UDP_PKT_OUT'));
+        }
        o.rmempty     = false;
        o.datatype    = 'string';

-        o = s.taboption(tabname, form.Value, 'NFQWS_UDP_PKT_IN', _('NFQWS_UDP_PKT_IN'));
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'NFQWS2_UDP_PKT_IN', _('NFQWS2_UDP_PKT_IN'));
+        } else {
+            o = s.taboption(tabname, form.Value, 'NFQWS_UDP_PKT_IN', _('NFQWS_UDP_PKT_IN'));
+        }
        o.rmempty     = false;
        o.datatype    = 'string';

-        o = s.taboption(tabname, form.Value, 'NFQWS_PORTS_TCP_KEEPALIVE', _('NFQWS_PORTS_TCP_KEEPALIVE'));
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'NFQWS2_PORTS_TCP_KEEPALIVE', _('NFQWS2_PORTS_TCP_KEEPALIVE'));
+        } else {
+            o = s.taboption(tabname, form.Value, 'NFQWS_PORTS_TCP_KEEPALIVE', _('NFQWS_PORTS_TCP_KEEPALIVE'));
+        }
        o.rmempty     = false;
        o.datatype    = 'uinteger';

-        o = s.taboption(tabname, form.Value, 'NFQWS_PORTS_UDP_KEEPALIVE', _('NFQWS_PORTS_UDP_KEEPALIVE'));
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'NFQWS2_PORTS_UDP_KEEPALIVE', _('NFQWS2_PORTS_UDP_KEEPALIVE'));
+        } else {
+            o = s.taboption(tabname, form.Value, 'NFQWS_PORTS_UDP_KEEPALIVE', _('NFQWS_PORTS_UDP_KEEPALIVE'));
+        }
        o.rmempty     = false;
        o.datatype    = 'uinteger';

        add_delim(s, tools.nfqws_opt_url);
-        add_param(s, 'NFQWS_OPT', null, 21, 2);
-
+        if (tools.appName == 'zapret2') {
+            add_param(s, 'NFQWS2_OPT', null, 21, 2);
+        } else {
+            add_param(s, 'NFQWS_OPT', null, 21, 2);
+        }
+        
        /* AutoHostList settings */

        tabname = 'autohostlist_tab'; 
@@ -226,6 +270,16 @@ return view.extend({
        o.write = function(section_id, value) {
            return uci.set(tools.appName, section_id, 'MODE_FILTER', value === '1' ? 'autohostlist' : 'hostlist');
        };
+
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_INCOMING_MAXSEQ', _('INCOMING_MAXSEQ'));
+            o.rmempty     = false;
+            o.datatype    = 'uinteger';
+
+            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_THRESHOLD', _('RETRANS_THRESHOLD'));
        o.rmempty     = false;
@@ -239,6 +293,16 @@ return view.extend({
        o.rmempty     = false;
        o.datatype    = 'uinteger';

+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_UDP_IN', _('UDP_IN'));
+            o.rmempty     = false;
+            o.datatype    = 'uinteger';
+
+            o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_UDP_OUT', _('UDP_OUT'));
+            o.rmempty     = false;
+            o.datatype    = 'uinteger';
+        }
+
        o = s.taboption(tabname, form.Button, '_auto_host_btn', _('Auto host list entries'));
        o.inputtitle = _('Edit');
        o.inputstyle = 'edit btn';
--- a/luci-app-zapret/htdocs/luci-static/resources/view/zapret/tools.js
+++ b/luci-app-zapret/htdocs/luci-static/resources/view/zapret/tools.js
@@ -4,6 +4,7 @@
 'require rpc';
 'require ui';
 'require uci';
+'require view.zapret.env as env_tools';

 document.head.append(E('style', {'type': 'text/css'},
 `
@@ -35,33 +36,11 @@ document.head.append(E('style', {'type': 'text/css'},
 `));

 return baseclass.extend({
-    packager          : null,
-    appName           : 'zapret',
-    execPath          : '/etc/init.d/zapret',
-    syncCfgPath       : '/opt/zapret/sync_config.sh',
-    defCfgPath        : '/opt/zapret/def-cfg.sh',
-    defaultCfgPath    : '/opt/zapret/restore-def-cfg.sh',
-
-    hostsGoogleFN     : '/opt/zapret/ipset/zapret-hosts-google.txt',
-    hostsUserFN       : '/opt/zapret/ipset/zapret-hosts-user.txt',
-    hostsUserExcludeFN: '/opt/zapret/ipset/zapret-hosts-user-exclude.txt',
-    iplstExcludeFN    : '/opt/zapret/ipset/zapret-ip-exclude.txt',
-    iplstUserFN       : '/opt/zapret/ipset/zapret-ip-user.txt',
-    iplstUserExcludeFN: '/opt/zapret/ipset/zapret-ip-user-exclude.txt',
-    custFileMax       : 4,
-    custFileTemplate  : '/opt/zapret/ipset/cust%s.txt',
-    customdPrefixList : [ 10, 20, 50, 60, 90 ] ,
-    customdFileFormat : '/opt/zapret/init.d/openwrt/custom.d/%s-script.sh',
-    discord_num       : 50,
-    discord_url       : [ 'https://github.com/bol-van/zapret/blob/4e8e3a9ed9dbeb1156db68dfaa7b353051c13797/init.d/custom.d.examples.linux/50-discord',
-                          'https://github.com/bol-van/zapret/blob/b251ea839cc8f04c45090314ef69fce69f2c00f2/init.d/custom.d.examples.linux/50-discord-media',
-                          'https://github.com/bol-van/zapret/blob/b251ea839cc8f04c45090314ef69fce69f2c00f2/init.d/custom.d.examples.linux/50-stun4all',
-                          'https://github.com/bol-van/zapret/tree/master/init.d/custom.d.examples.linux'
-                        ],
-    nfqws_opt_url     : 'https://github.com/remittor/zapret-openwrt/discussions/168',
-
-    autoHostListFN    : '/opt/zapret/ipset/zapret-hosts-auto.txt',
-    autoHostListDbgFN : '/opt/zapret/ipset/zapret-hosts-auto-debug.log',
+    __init__() {
+        env_tools.load_env(this);
+        //console.log('appName: ' + this.appName);
+        //console.log('PACKAGER: ' + this.packager.name);
+    }, 

    infoLabelRunning  : '<span class="label-status running">'  + _('Running')  + '</span>',
    infoLabelStarting : '<span class="label-status starting">' + _('Starting') + '</span>',
@@ -100,24 +79,7 @@ return baseclass.extend({
        expect: { result: false }
    }),

-    init_consts: function() {
-        if (!this.packager) {
-            this.packager = { };
-            if (L.hasSystemFeature('apk')) {
-                this.packager.name = 'apk';
-                this.packager.path = '/usr/bin/apk';
-                this.packager.args = [ 'list', '-I', '*zapret*' ];
-            } else {
-                this.packager.name = 'opkg';
-                this.packager.path = '/bin/opkg';
-                this.packager.args = [ 'list-installed', '*zapret*' ];
-            }
-            //console.log('PACKAGER: ' + this.packager.name);
-        }
-    },
-
    getSvcInfo: function(svc_name = null) {
-        this.init_consts();
        let name = (svc_name) ? svc_name : this.appName;
        let verbose = 1;
        return this.callServiceList(name, verbose).then(res => {
@@ -128,7 +90,6 @@ return baseclass.extend({
    },

    getInitState: function(name) {
-        this.init_consts();
        return this.callInitState(name).then(res => {
            if (res) {
                return res[name].enabled ? true : false;
@@ -141,7 +102,6 @@ return baseclass.extend({
    },

    getStratList: function() {
-        this.init_consts();
        let exec_cmd = '/bin/busybox';
        let exec_arg = [ 'awk', '-F', '"', '/if \\[ "\\$strat" = "/ {print $4}', this.defCfgPath ];
        return fs.exec(exec_cmd, exec_arg).then(res => {
@@ -271,9 +231,9 @@ return baseclass.extend({
            return -4;
        }
        let jdata = svc_info;
-        if (typeof(jdata.zapret) == 'object') {
+        if (typeof(jdata[this.appName]) == 'object') {
            result.dmn.inited = true;
-            let dmn_list = jdata.zapret.instances;
+            let dmn_list = jdata[this.appName].instances;
            if (typeof(dmn_list) == 'object') {
                for (const [dmn_name, daemon] of Object.entries(dmn_list)) {
                    result.dmn.total += 1;
@@ -467,10 +427,11 @@ return baseclass.extend({
            this.desc        = desc;
            this.rows        = rows;
            this.multiline   = multiline;
+            env_tools.load_env(this);
        },

        load: function() {
-            let value = uci.get('zapret', this.cfgsec, this.cfgparam);
+            let value = uci.get(this.appName, this.cfgsec, this.cfgparam);
            if (typeof(value) === 'string') {
                value = value.trim();
                if (this.multiline == 2) {
@@ -499,7 +460,7 @@ return baseclass.extend({
                                'class': 'cbi-input-textarea',
                                'style': 'width:100% !important',
                                'rows': this.rows,
-                                'wrap': 'on',
+                                'wrap': 'off',
                                'spellcheck': 'false',
                            },
                            content)
@@ -545,31 +506,29 @@ return baseclass.extend({
            value = value.replace(/˂/g, '<');
            value = value.replace(/˃/g, '>');
            try {
-                let elem2 = null;
-                let elem = document.getElementById("cbi-zapret-" + this.cfgsec + "-_" + this.cfgparam);
+                let elem = document.getElementById("cbi-" + this.appName + "-" + this.cfgsec + "-_" + this.cfgparam);
                if (elem) {
-                    if (!elem2) {
-                        elem2 = elem.querySelector('div');
-                    }
-                    if (!elem2) {
-                        elem2 = elem.querySelector('output');
+                    if (elem.querySelector('div')) {
+                        elem = elem.querySelector('div');
+                    } else {
+                        elem = elem.querySelector('output');
                    }
                }
-                if (elem2) {
+                if (elem) {
                    let val = value.trim();
                    if (this.multiline) {
                        val = val.replace(/</g, '˂');
                        val = val.replace(/>/g, '˃');
                        val = val.replace(/\n/g, '<br/>');
-                        elem2.innerHTML = val;
+                        elem.innerHTML = val;
                    } else {
-                        elem2.textContent = val;
+                        elem.textContent = val;
                    }
                }
            } catch(e) {
-                console.error('ERROR: cannot found elem for ' + this.cfgparam);
+                console.error('ERROR: cannot found elem for ' + this.cfgsec + '.' + this.cfgparam);
            }
-            uci.set('zapret', this.cfgsec, this.cfgparam, value);
+            uci.set(this.appName, this.cfgsec, this.cfgparam, value);
            uci.save().then(ui.hideModal);
        },

@@ -603,4 +562,93 @@ return baseclass.extend({
        },
    }),

+    execAndRead: async function({ cmd = [ ], log = '', logArea = null, callback = null, cbarg = null, hiderow = [ ], rpc_timeout = 5, rpc_root = false } = {})
+    {
+        function appendLog(msg, end = '\n')
+        {
+            logArea.value += msg + end;
+            logArea.scrollTop = logArea.scrollHeight;
+        }
+        function fixLogEnd()
+        {
+            if (logArea.value && logArea.value.slice(-1) != '\n') {
+                appendLog('');
+            }
+        }
+        let hide_rows = Array.isArray(hiderow) ? hiderow : [ hiderow ];
+        let rpc_opt = { "timeout": rpc_timeout*1000 };
+        if (rpc_root) {
+            rpc_opt.uid = 0;  // run under root
+        }
+        const logFile = log;  // file for reading: '/tmp/zapret_pkg_install.log'
+        const rcFile = logFile + '.rc';
+        try {
+            await fs.exec('/bin/busybox', [ 'rm', '-f', logFile + '*' ], null, rpc_opt);
+            appendLog('Output file cleared!');
+        } catch (e) {
+            return callback(cbarg, 500, 'ERROR: Failed to clear output file');
+        }
+        try {
+            let opt_list = [ logFile ];
+            opt_list.push(...cmd);
+            let res = await fs.exec(this.appDir+'/script-exec.sh', opt_list, null, rpc_opt);
+            if (res.code != 0) {
+                return callback(cbarg, 525, 'ERROR: cannot run "' + cmd[0] + '" script! (error = ' + res.code + ')');
+            }
+            appendLog('Process started...');
+        } catch (e) {
+            return callback(cbarg, 520, 'ERROR: Failed on execute process: ' + e.message);
+        }
+        let lastLen = 0;
+        let retCode = -1;
+        let timerBusy = false;
+        let timer = setInterval(async () => {
+            if (timerBusy)
+                return;  // skip iteration
+            timerBusy = true;
+            try {
+                let res = await fs.exec('/bin/cat', [ logFile ], null, rpc_opt);
+                if (res.stdout && res.stdout.length > lastLen) {
+                    let log = res.stdout.slice(lastLen);
+                    hide_rows.forEach(re => {
+                        log = log.replace(re, '');
+                    });                    
+                    appendLog(log, '');
+                    lastLen = res.stdout.length;
+                }
+                if (retCode < 0) {
+                    let rc = await fs.exec('/bin/cat', [ rcFile ], null, rpc_opt);
+                    if (rc.code != 0) {
+                        clearInterval(timer);
+                        fixLogEnd();
+                        return callback(cbarg, 545, 'ERROR: cannot read file "' + rcFile + '"');
+                    }
+                    if (rc.stdout) {
+                        retCode = parseInt(rc.stdout.trim(), 10);
+                    }
+                }
+                if (retCode >= 0) {
+                    clearInterval(timer);
+                    fixLogEnd();
+                    if (retCode == 0 && res.stdout) {
+                        return callback(cbarg, 0, res.stdout);
+                    }
+                    return callback(cbarg, retCode, 'ERROR: Process failed with error ' + retCode);
+                }
+            } catch (e) {
+                if (e.message?.includes('RPC call to file/exec failed with error -32000: Object not found')) {
+                    console.warn('WARN: execAndRead: ' + e.message);
+                    return;  // goto next timer iteration
+                }
+                clearInterval(timer);
+                fixLogEnd();
+                let errtxt = 'ERROR: execAndRead: ' + e.message;
+                errtxt    += 'ERROR: execAndRead: ' + e.stack?.trim().split('\n')[0];
+                return callback(cbarg, 540, errtxt);
+            } finally {
+                timerBusy = false;
+            }
+        }, 500);
+    },
+
 });
--- a/luci-app-zapret/htdocs/luci-static/resources/view/zapret/updater.js
+++ b/luci-app-zapret/htdocs/luci-static/resources/view/zapret/updater.js
@@ -14,22 +14,25 @@ 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_update_pkg_sh   = '/opt/zapret/update-pkg.sh';
+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/',
    
-    appendLog: function(msg, end = '\n') {
+    appendLog: function(msg, end = '\n')
+    {
        this.logArea.value += msg + end;
        this.logArea.scrollTop = this.logArea.scrollHeight;
    },

-    setBtnMode: function(enable) {
+    setBtnMode: function(enable)
+    {
        this.btn_cancel.disabled = enable ? false : true;
        this.btn_action.disabled = (enable == 2) ? false : true;
    },
    
-    setStage: function(stage, btn_flag = true) {
+    setStage: function(stage, btn_flag = true)
+    {
        if (stage == 0) {
            this.btn_action.textContent = _('Check for updates');
            this.btn_action.classList.remove('hidden');
@@ -46,146 +49,94 @@ return baseclass.extend({
        this.stage = stage;
    },
    
-    checkUpdates: function() {
+    checkUpdates: async function()
+    {
+        this._action = 'checkUpdates';
        this.setStage(0);
        this.setBtnMode(0);
        this.pkg_url = null;
        this.appendLog(_('Checking for updates...'));
-        let opt_list = [ '-c' ];  // check for updates
+        let cmd = [ fn_update_pkg_sh, '-c' ];  // check for updates
        if (document.getElementById('cfg_exclude_prereleases').checked == false) {
-            opt_list.push('-p');  // include prereleases ZIP-files 
+            cmd.push('-p');  // include prereleases ZIP-files
        }
-        let forced_reinstall = document.getElementById('cfg_forced_reinstall').checked;
-        let rpc_opt = { timeout: 20*1000 }
-        //rpc_opt.uid = 0;  // run under root
-        let res = fs.exec(fn_update_pkg_sh, opt_list, null, rpc_opt).then(res => {
-            let log = res.stdout.trim();
-            this.appendLog(log);
-            let code = log.match(/^RESULT:\s*\(([^)]+)\)\s+.+$/m);
-            let pkg_url = log.match(/^ZAP_PKG_URL\s*=\s*(.+)$/m);
-            if (res.code == 0 && code && pkg_url) {
-                this.pkg_url = pkg_url[1];
-                code = code[1];
-                if (code == 'E' && !forced_reinstall) {
-                    this.setStage(999);
-                    return 0;
-                }
-                this.setStage(1);
-                this.setBtnMode(2);  // enable all buttons
-            } else {
-                if (res.code != 0) {
-                    this.appendLog('ERROR: Check for updates failed with error ' + res.code);
-                }
-                this.setStage(999);
-            }
-            return res.code;
-        }).catch(e => {
-            this.appendLog('ERROR: ' + _('Updates checking failed'));
-            this.appendLog('ERROR: ' + e);
-            this.setStage(999);
-            return 1;
-        }).finally(() => {
-            this.appendLog('=========================================================');
-        });
+        this.forced_reinstall = document.getElementById('cfg_forced_reinstall').checked;
+        let log = '/tmp/'+tools.appName+'_pkg_check.log';
+        let callback = this.execAndReadCallback;
+        let wnd = this;
+        return tools.execAndRead({ cmd: cmd, log: log, logArea: this.logArea, callback: callback, cbarg: wnd });
    },

-    installUpdates: async function() {
+    installUpdates: async function()
+    {
+        this._action = 'installUpdates';
        this.setStage(1);
        this.setBtnMode(0);
        if (!this.pkg_url || this.pkg_url.length < 10) {
            this.appendLog('ERROR: pkg_url = null');
            this.setStage(999);
-            return 1;
+            return;
        }
        this.appendLog(_('Install updates...'));
-        let opt_list = [ '-u', this.pkg_url ];  // update packages
+        let cmd = [ fn_update_pkg_sh, '-u', this.pkg_url ];  // update packages
        if (document.getElementById('cfg_forced_reinstall').checked == true) {
-            opt_list.push('-f');  // forced reinstall if same version
+            cmd.push('-f');  // forced reinstall if same version
        }
-        let rpc_opt = { timeout: 5*1000 }
-        //rpc_opt.uid = 0;  // run under root
-        const logFile = '/tmp/zapret_pkg_install.log';
-        const rcFile = logFile + '.rc';
-        try {
-            await fs.exec('/bin/busybox', [ 'rm', '-f', logFile + '*' ], null, rpc_opt);
-            this.appendLog('Install log cleared.');
-        } catch (e) {
-            this.appendLog('ERROR: Failed to clear log file');
-            this.setStage(999);
-            return 1;
-        }
-        try {
-            let opt = [ logFile, fn_update_pkg_sh ];
-            //opt.push('-t'); opt.push('0');  // only for testing
-            opt.push(...opt_list);
-            let res = await fs.exec('/opt/zapret/script-exec.sh', opt, null, rpc_opt);
-            if (res.code == 0) {
-                this.appendLog('Process started...');
-            } else {
-                this.appendLog('ERROR: cannot run ' + fn_update_pkg_sh + ' script! (error = ' + res.code + ')');
-                throw new Error('cannot run script');
-            }
-        } catch (e) {
-            this.appendLog('ERROR: Failed to start process: ' + e.message);
-            this.setStage(999);
-            return 1;
-        }
-        let lastLen = 0;
-        let retCode = -1;
-        let timerBusy = false;
-        let timer = setInterval(async () => {
-            if (timerBusy)
-                return;  // skip iteration
-            timerBusy = true;
-            try {
-                let res = await fs.exec('/bin/cat', [ logFile ], null, rpc_opt);
-                if (res.stdout && res.stdout.length > lastLen) {
-                    let log = res.stdout.slice(lastLen);
-                    log = log.replace(/^ \* resolve_conffiles.*(?:\r?\n|$)/gm, '');
-                    this.appendLog(log, '');
-                    lastLen = res.stdout.length;
-                }
-                if (retCode < 0) {
-                    let rc = await fs.exec('/bin/cat', [ rcFile ], null, rpc_opt);
-                    if (rc.code != 0) {
-                        throw new Error('cannot read file "' + rcFile + '"');
-                    }
-                    if (rc.stdout) {
-                        retCode = parseInt(rc.stdout.trim(), 10);
-                    }
-                }
-                if (retCode >= 0) {
-                    clearInterval(timer);
-                    this.appendLog('\n' + 'Process finished.');
-                    if (res.stdout) {
-                        let code = res.stdout.match(/^RESULT:\s*\(([^)]+)\)\s+.+$/m);
-                        if (retCode == 0 && code && code[1] == '+') {
-                            this.stage = 999;
-                            this.btn_action.textContent = _('OK');
-                            this.btn_action.disabled = false;
-                            this.btn_cancel.disabled = true;
-                            return 0;
-                        }
-                    }
-                    this.appendLog('ERROR: Install updates failed with error ' + retCode);
-                    this.setStage(999);
-                }
-            } catch (e) {
-                if (e.message?.includes('RPC call to file/exec failed with error -32000: Object not found')) {
-                    console.warn('WARN: installUpdates: ' + e.message);
-                    return;  // goto next timer iteration
-                }
-                clearInterval(timer);
-                this.appendLog('ERROR: installUpdates: ' + e.message);
-                this.appendLog('ERROR: installUpdates: ' + e.stack?.trim().split('\n')[0]);
-                this.setStage(999);
-            } finally {
-                timerBusy = false;
-            }
-        }, 500);
+        //this._test = 1; cmd.push('-t'); cmd.push('45');  // only for testing
+        let log = '/tmp/'+tools.appName+'_pkg_install.log';
+        let hiderow = /^ \* resolve_conffiles.*(?:\r?\n|$)/gm;
+        let callback = this.execAndReadCallback;
+        let wnd = this;
+        return tools.execAndRead({ cmd: cmd, log: log, logArea: this.logArea, hiderow: hiderow, callback: callback, cbarg: wnd });
    },
-    
-    openUpdateDialog: function(pkg_arch) {
+
+    execAndReadCallback: function(wnd, rc, txt = '')
+    {
+        //console.log('execAndReadCallback = ' + rc + '; _action = ' + wnd._action);
+        if (rc == 0 && txt) {
+            let code = txt.match(/^RESULT:\s*\(([^)]+)\)\s+.+$/m);
+            if (wnd._action == 'checkUpdates') {
+                let pkg_url = txt.match(/^ZAP_PKG_URL\s*=\s*(.+)$/m);
+                if (code && pkg_url) {
+                    wnd.appendLog('=========================================================');
+                    wnd.pkg_url = pkg_url[1];
+                    code = code[1];
+                    if (code == 'E' && !wnd.forced_reinstall) {
+                        wnd.setStage(999);  // install not needed
+                        return;
+                    }
+                    wnd.setStage(1);
+                    wnd.setBtnMode(2);  // enable all buttons
+                    return;  // install allowed
+                }
+            }
+            if (wnd._action == 'installUpdates') {
+                if (wnd._test || (code && code[1] == '+')) {
+                    wnd.stage = 999;
+                    wnd.btn_action.textContent = _('OK');
+                    wnd.btn_action.disabled = false;
+                    wnd.btn_cancel.disabled = true;
+                    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.setStage(999);
+        if (wnd._action == 'checkUpdates') {
+            wnd.appendLog('=========================================================');
+        }
+    },
+
+    openUpdateDialog: function(pkg_arch)
+    {
        this.stage = 0;
        this.pkg_arch = pkg_arch;
        this.pkg_url = null;
@@ -201,8 +152,11 @@ return baseclass.extend({
        ]);

        this.logArea = E('textarea', {
+            'id': 'widget.modal_content',
            'readonly': true,
-            'style': 'width:100%; height:400px; font-family: monospace;'
+            'style': 'width:100% !important; font-family: monospace;',
+            'rows': 20,
+            'wrap': 'off',
        });

        this.btn_cancel = E('button', {
--- a/zapret/Makefile
+++ b/zapret/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=zapret
-PKG_VERSION:=72.20260108
+PKG_VERSION:=72.20260113
 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:=75d2f1195d4beb69eaa614afb117a43e82998518
+PKG_SOURCE_DATE:=2026-01-13

 #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?
@@ -57,10 +57,17 @@ define Build/Compile
 endef

 define Package/$(PKG_NAME)/conffiles
-/etc/config/zapret
 /opt/zapret/config
-/opt/zapret/ipset/
-/opt/zapret/init.d/openwrt/custom.d/
+/opt/zapret/ipset/zapret-hosts-google.txt
+/opt/zapret/ipset/zapret-hosts-user.txt
+/opt/zapret/ipset/zapret-hosts-user-exclude.txt
+/opt/zapret/ipset/zapret-ip-exclude.txt
+/opt/zapret/ipset/zapret-hosts-auto.txt
+/opt/zapret/init.d/openwrt/custom.d/10-script.sh
+/opt/zapret/init.d/openwrt/custom.d/20-script.sh
+/opt/zapret/init.d/openwrt/custom.d/50-script.sh
+/opt/zapret/init.d/openwrt/custom.d/60-script.sh
+/opt/zapret/init.d/openwrt/custom.d/90-script.sh
 endef

 define Package/$(PKG_NAME)/install
@@ -90,6 +97,7 @@ define Package/$(PKG_NAME)/install
 	$(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) ./config.default $(1)/opt/zapret/config
 	$(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
@@ -105,42 +113,96 @@ define Package/$(PKG_NAME)/install
 	$(CP) ./custom.d/* $(1)/opt/zapret/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
+	# install all sh-scripts
+	$(CP) ./*.sh $(1)/opt/zapret/
+	rm -f $(1)/opt/zapret/init.d.sh
+	# Create empty conf files
+	$(INSTALL_DATA) /dev/null $(1)/opt/zapret/ipset/zapret-hosts-auto.txt
+	$(INSTALL_DATA) /dev/null $(1)/opt/zapret/ipset/cust1.txt
+	$(INSTALL_DATA) /dev/null $(1)/opt/zapret/ipset/cust2.txt
+	$(INSTALL_DATA) /dev/null $(1)/opt/zapret/ipset/cust3.txt
+	$(INSTALL_DATA) /dev/null $(1)/opt/zapret/ipset/cust4.txt
+	$(INSTALL_DATA) /dev/null $(1)/opt/zapret/init.d/openwrt/custom.d/10-script.sh
+	$(INSTALL_DATA) /dev/null $(1)/opt/zapret/init.d/openwrt/custom.d/20-script.sh
+	$(INSTALL_DATA) /dev/null $(1)/opt/zapret/init.d/openwrt/custom.d/60-script.sh
+	$(INSTALL_DATA) /dev/null $(1)/opt/zapret/init.d/openwrt/custom.d/90-script.sh
+	# Fix permissions
 	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 644 $(1)/opt/zapret/config*
 	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/*
+	# Disable TPWS in blockcheck
+	grep -q '^SKIP_TPWS=' $(1)/opt/zapret/blockcheck.sh || sed -i '/^NFT_TABLE=blockcheck$$$$/a SKIP_TPWS=$$$${SKIP_TPWS:-1}' $(1)/opt/zapret/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 +219,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 +242,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 +257,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 +274,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 +292,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 +306,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!"
--- a/zapret/comfunc.sh
+++ b/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
--- a/zapret/def-cfg.sh
+++ b/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'
@@ -261,7 +261,7 @@ function set_cfg_nfqws_strat
 				--dpi-desync-split-seqovl=1

 				--new
-				--filter-tcp=443 ˂HOSTLIST˃
+				--filter-tcp=443 <HOSTLIST>
 				--dpi-desync=hostfakesplit
 				--dpi-desync-hostfakesplit-mod=host=rzd.ru
 				--dpi-desync-hostfakesplit-midhost=host-2
@@ -270,7 +270,7 @@ function set_cfg_nfqws_strat
 				--dpi-desync-badseq-increment=0

 				--new
-				--filter-udp=443 ˂HOSTLIST_NOAUTO˃
+				--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
--- a/zapret/dwc.sh
+++ b/zapret/dwc.sh
@@ -0,0 +1,119 @@
+#!/bin/sh
+# Copyright (c) 2026 remittor
+
+. /opt/zapret/comfunc.sh
+
+ZAP_TMP_DIR=/tmp/zapret_dwc
+
+rm -rf $ZAP_TMP_DIR
+
+CURL_TIMEOUT=5
+CURL_RANGETO=65535
+
+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
+
+#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/main.c7b61d59416f714f.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
+
+ID=0
+while IFS='|' read -r TAG 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}')"
+	PROVIDER="$(echo "$PROVIDER" | cut -d' ' -f2-)"
+	URL_NO_PROTO="${URL#*://}"
+	DOMAIN="${URL_NO_PROTO%%/*}"
+	URLPATH="/${URL_NO_PROTO#*/}"
+	[ "$URLPATH" = "/$URL_NO_PROTO" ] && URLPATH="/"
+	#echo "TAG=$TAG , COUNTRY=$COUNTRY , PROVIDER=$PROVIDER , TIMES=$TIMES , URL=$URL"
+	(
+		DST_IP=$( curl -4 -s -o /dev/null -w '%{remote_ip}\n' $DOMAIN )
+		if [ -z "$DST_IP" ]; then
+			DST_IP="$( ping -c1 "$DOMAIN" 2>/dev/null | sed -n '1s/.*(\([0-9.]*\)).*/\1/p')"
+		fi
+		curl -k $URL --resolve $DOMAIN:443:$DST_IP -o /dev/null -s -w '%{size_download}\n' --max-time $CURL_TIMEOUT --range 0-$CURL_RANGETO
+	) >"$ZAP_TMP_DIR/$ID3=$TAG=$PROVIDER.txt" 2>&1 &
+done <<EOF
+$(printf '%s\n' "$TEST_SUITE" | sed -n '
+s/.*id:[[:space:]]*"\([^"]*\)".*provider:[[:space:]]*"\([^"]*\)".*times:[[:space:]]*\([0-9]\+\).*url:[[:space:]]*"\([^"]*\)".*/\1|\2|\3|\4/p
+')
+EOF
+
+wait
+
+printf '%s\n' "$ZAP_TMP_DIR"/*.txt | sort | while IFS= read -r file; do
+	[ -f "$file" ] || continue
+	FNAME="${file##*/}"
+	ID=$( echo "$FNAME" | cut -d= -f1)
+	TAG=$( echo "$FNAME" | cut -d= -f2)
+	PROVIDER=$(echo "$FNAME" | cut -d= -f3 | sed 's/\.txt$//' )
+	res=$( cat "$file" )
+	res=$( trim "$res" )
+	status=
+	case "$res" in
+		''|*[!0-9]*)
+			status="Error (incorrect value)"
+			;;
+	esac
+	if [ -z "$status" ]; then
+		if [ "$res" = 0 ]; then
+			status="Possibly detected"
+		elif [ "$res" -lt $CURL_RANGETO ]; then
+			status="Failed to complete detection"
+		else
+			status="[ OK ]"
+		fi
+	fi
+	printf '%12s / %-13s: %s \n' "$TAG" "$PROVIDER" "$status"
+done
+
+return 0 
--- a/zapret/ipset/zapret-hosts-user-exclude.txt
+++ b/zapret/ipset/zapret-hosts-user-exclude.txt
@@ -14,6 +14,7 @@ gosuslugi.ru
 mos-gorsud.ru
 gov.ru
 sudrf.ru
+ottai.com
 ipstream.one
 #################################### Epicgames
 easy.ac
@@ -253,4 +254,109 @@ vod-secure.twitch.tv
 irc-ws.chat.twitch.tv
 pubsub-edge.twitch.tv
 vod-pop-secure.twitch.tv
+#################################### Valorant
+pvp.net
+vivox.com
+sd-rtn.com
+riotcdn.net
+adobess.com
+valorant.com
+akamaihd.net
+riotgames.com
+playvalorant.com
+#################################### 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
 ####################################
--- a/zapret/sync_config.sh
+++ b/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
--- a/zapret/uci-def-cfg.sh
+++ b/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
 	
--- a/zapret/update-pkg.sh
+++ b/zapret/update-pkg.sh
@@ -32,7 +32,7 @@ if [ "$EXE_DIR" = "/tmp" ]; then
 		opt_forced="true"
 	fi
 else
-	[ -f "$EXE_DIR/comfunc.sh" ] || { echo "ERROR: file $EXE_DIR/comfunc.sh not founded!"; exit 1; }
+	[ -f "$EXE_DIR/comfunc.sh" ] || { echo "ERROR: file $EXE_DIR/comfunc.sh not found!"; exit 1; }
 	. $EXE_DIR/comfunc.sh
 fi

@@ -110,7 +110,7 @@ function pkg_mgr_update
 	if [ "$PKG_MGR" = "opkg" ]; then
 		PKG_TOTAL=$( opkg list | wc -l )
 		PKG_INSTALLED=$( opkg list-installed | wc -l )
-		if [ "$PKG_TOTAL" = "$PKG_INSTALLED" ]; then
+		if [ "$PKG_TOTAL" -le "$PKG_INSTALLED" ] || [[ "$PKG_TOTAL" -le $((PKG_INSTALLED + 100)) ]]; then
 			echo ">>> OPKG update..."
 			opkg update
 			return $?
@@ -336,8 +336,8 @@ function get_actual_release
 		return 0
 	done
 	json_cleanup
-	echo "ERROR: latest release for arch \"$ZAP_CPU_ARCH\" not founded!"
-	return 150  # release not founded
+	echo "ERROR: latest release for arch \"$ZAP_CPU_ARCH\" not found!"
+	return 150  # release not found
 }

 # -------------------------------------------------------------------------------------------------------
@@ -410,7 +410,7 @@ echo "Current installed version: $ZAP_CUR_PKG_VER"
 if [ "$opt_update" = "" ]; then
 	ZAP_PKG_URL="$REL_ACTUAL_URL"
 	if [ "$ZAP_PKG_URL" = "" ]; then
-		echo "ERROR: actual release not founded!"
+		echo "ERROR: actual release not found!"
 		return 199
 	fi
 else
@@ -419,7 +419,7 @@ else
 		ZAP_PKG_URL="$REL_ACTUAL_URL"
 	fi
 	if [ "$opt_update" = "@" -a "$ZAP_PKG_URL" = "" ]; then
-		echo "ERROR: actual release not founded!"
+		echo "ERROR: actual release not found!"
 		return 199
 	fi
 fi
@@ -494,7 +494,7 @@ if [ "$opt_update" != "" ]; then
 	rm -f "$ZAP_PKG_FN" 2>/dev/null
 	if [ "$PKG_MGR" = "apk" ]; then
 		if [ ! -d "$ZAP_PKG_DIR/apk" ]; then
-			echo "ERROR: APK-files not founded"
+			echo "ERROR: APK-files not found"
 			return 221
 		fi
 		rm -f $ZAP_PKG_DIR/*.ipk 2>/dev/null
Author	SHA1	Message	Date
remittor	3c2f472b78	Bump version to v72.20260113	2026-01-13 13:50:44 +03:00
remittor	39c4fd6279	makefile: Fix postinst section	2026-01-13 13:49:52 +03:00
remittor	91ec462bcf	confunc: Fix function restore_all_ipset_cfg	2026-01-13 13:37:06 +03:00
remittor	015bf4befe	luci: Add description for "Diagnostics" button	2026-01-13 13:34:25 +03:00
remittor	75ccdb6a1b	makefile: Fix conffiles section	2026-01-13 13:24:47 +03:00
remittor	98c5d5b0ed	Replace echo to printf for TAB symbol	2026-01-13 12:46:04 +03:00
remittor	cf7661f2b9	config: Fix sync for AUTOHOSTLIST_RETRANS_RESET	2026-01-13 12:24:50 +03:00
remittor	4327f98bb7	Fix uci-def-cfg.sh	2026-01-13 12:19:11 +03:00
remittor	694716a512	github: releases: Add step "Wait for GitHub API consistency"	2026-01-12 22:45:19 +03:00
remittor	be1027dfd7	makefile: Fix preinst section (check for incompatible packages)	2026-01-12 15:15:21 +03:00
remittor	0edcc6c4a0	makefile: Disable TPWS in blockcheck	2026-01-12 13:27:53 +03:00
remittor	a71965b382	diag: Fix bugs in dwc.sh	2026-01-11 19:08:35 +03:00
remittor	d45d07df82	makefile: Add remove packages mdig and ip2net	2026-01-11 18:41:34 +03:00
remittor	f4a68178b7	makefile: skip init.d.sh	2026-01-11 16:09:48 +03:00
remittor	32c6f9cfc3	Bump version to v72.20260111	2026-01-11 15:28:00 +03:00
remittor	6660ea0a20	Add diagnostic button (DPI checker)	2026-01-11 15:27:48 +03:00
remittor	5f470e8f82	ipset: Update zapret-hosts-user-exclude.txt	2026-01-11 15:05:53 +03:00
remittor	d6304e6e24	build: Fix matrix for riscv64 arch	2026-01-11 15:05:10 +03:00
remittor	f0cc13fb38	config: Fix "<" and ">" symbols for v6 strategy	2026-01-11 10:20:27 +03:00
remittor	486475f817	luci: updater: Add new func tools.execAndRead	2026-01-10 20:54:11 +03:00
remittor	969029c0db	luci: Fix update text after edit for NFQWS_OPT	2026-01-10 10:56:47 +03:00
remittor	879ffa217d	luci: Fix js-files for unification	2026-01-09 22:29:47 +03:00
remittor	4f5dd5a019	luci: Splitting file tools.js into two parts (add file env.js)	2026-01-09 22:00:05 +03:00
remittor	349ead377a	build: Rewrite build script (using OpenWrt SDK from github)	2026-01-09 17:42:21 +03:00
remittor	c7616b468b	Replace "founded" to "found"	2026-01-09 17:36:38 +03:00
remittor	bb5647568e	updater: Fix pkg_mgr_update for opkg	2026-01-09 10:31:33 +03:00