Bump version to v70.20250116

Source: https://github.com/bol-van/zapret-win-bundle/blob/master/zapret-winws/preset_russia.cmd

.github/workflows/build.yml

@@ -2,10 +2,38 @@ name: build
 
 on:
   workflow_dispatch:
+    inputs:
+      fake_build:
+        description: 'Fake build'
+        required: false
+        default: 'false'
+        type: choice
+        options:
+        - true
+        - false
+      max_speed:
+        description: 'Build with max speed'
+        required: false
+        default: 'true'
+        type: choice
+        options:
+        - true
+        - false
   push:
     tags:
       - v[0-9]+*
 
+env:
+  FAKE_BUILD: ${{ github.event.inputs.fake_build == 'true' }}
+  SUFFIX: ${{ github.event.inputs.fake_build == 'true' && '-fake' || '' }}
+  REPO_URL: https://github.com/remittor/zapret-openwrt
+  REPO_LNK: remittor/zapret-openwrt
+  REPO_BRANCH: master
+  BUILD_ROOT: ${{ github.workspace }}/builder
+  BUILD_DATE: unknown
+  REPO_DATE: unknown
+  LUCI_ARCH: aarch64_cortex-a53
+
 jobs:
   check:
     runs-on: ubuntu-latest
@@ -15,38 +43,43 @@ jobs:
       sha: ${{ steps.gh.outputs.sha }}
       url: ${{ steps.gh.outputs.url }}
       message: ${{ steps.gh.outputs.message }}
+      build_date: ${{ steps.gh.outputs.build_date }}
+      fw_date: ${{ steps.gh.outputs.fw_date }}
       is_active: ${{ steps.activity.outputs.is_active }}
     steps:
       - name: Get repo data via GH API
         id: gh
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          REPO: 'remittor/zapret-openwrt'
         run: |
           echo "Tag name from GITHUB_REF_NAME: $GITHUB_REF_NAME"
           echo "Tag name from github.ref_name: ${{ github.ref_name }}"
-          BRANCH=$(gh api repos/$REPO --jq '.default_branch')
-          DATE=$(gh api repos/$REPO/commits/$BRANCH --jq '.commit.committer.date')
+          BRANCH=$(gh api repos/$REPO_LNK --jq '.default_branch')
+          REPO_DATE=$(gh api repos/$REPO_LNK/commits/$BRANCH --jq '.commit.committer.date')
+          BUILD_DATE=$( date --utc +'%Y%m%d' )
+          FW_DATE=$( date --utc +'%Y-%m-%d' )
           {
             echo "tag=$GITHUB_REF_NAME"
-            echo "date=$(date --utc -d $DATE +%Y%m%d)"
-            echo "sha=$(gh api repos/$REPO/commits/$BRANCH --jq '.sha[0:7]')"
-            echo "url=$(gh api repos/$REPO/commits/$BRANCH --jq '.html_url')"
+            echo "date=$(date --utc -d $REPO_DATE +%Y%m%d)"
+            echo "sha=$(gh api repos/$REPO_LNK/commits/$BRANCH --jq '.sha[0:7]')"
+            echo "url=$(gh api repos/$REPO_LNK/commits/$BRANCH --jq '.html_url')"
             echo "message<<EOF"
-            gh api repos/$REPO/commits/$BRANCH --jq '.commit.message'
+            gh api repos/$REPO_LNK/commits/$BRANCH --jq '.commit.message'
             echo EOF
+            echo "build_date=$BUILD_DATE"
+            echo "fw_date=$FW_DATE"
           } >> $GITHUB_OUTPUT
-          echo "DATE=$DATE" >> $GITHUB_ENV
+          echo "REPO_DATE=$REPO_DATE" >> $GITHUB_ENV
 
       - name: Check for repo activity
         id: activity
         env:
-          DATE: ${{ env.DATE }}
+          REPO_DATE: ${{ env.REPO_DATE }}
           URL: ${{ steps.gh.outputs.url }}
         run: |
-          TIMESTAMP=$(date --utc -d $DATE +%s)
+          TIMESTAMP=$(date --utc -d $REPO_DATE +%s)
           DAYS=$(( ( $(date --utc +%s) - $TIMESTAMP ) / 86400 ))
-          echo "Repository activity: $(date --utc -d $DATE)"
+          echo "Repository activity: $(date --utc -d $REPO_DATE)"
           echo "Commit: $URL"
           if [ "${{ github.event_name }}" != "schedule" ]; then
             is_active=true
@@ -65,8 +98,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        #branch: [ openwrt-22.03, openwrt-23.05 ]
-        branch: [ openwrt-23.05 ]
+        branch: [ openwrt-23.05, SNAPSHOT ]
         arch:
           - aarch64_cortex-a53
           - aarch64_cortex-a72
@@ -94,146 +126,198 @@ jobs:
           - mipsel_74kc
           - mipsel_mips32
           - x86_64
-        #include:
-        #  - branch: SNAPSHOT
-        #    arch: x86_64
-        #exclude:
-        #  - branch: openwrt-22.03
-        #    arch: arm_fa526
-        #  - branch: openwrt-22.03
-        #    arch: arm_mpcore
+        isFake:
+          - ${{ github.event.inputs.fake_build == 'true' }}        
+        exclude:
+          - branch: SNAPSHOT
+            arch: arm_mpcore
+          - branch: SNAPSHOT
+            arch: arm_cortex-a9_vfpv3-d16
+          - { isFake: true }
+        include:
+          - branch: openwrt-23.05
+            arch: x86_64
+          - branch: openwrt-23.05
+            arch: aarch64_cortex-a53
+          - branch: SNAPSHOT
+            arch: aarch64_cortex-a53
+          - branch: SNAPSHOT
+            arch: aarch64_cortex-a76
     container:
       image: openwrt/sdk:${{ matrix.arch }}-${{ matrix.branch }}
       options: --user root
+    outputs:
+      pkgver: ${{ steps.build.outputs.pkgver }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          repository: 'remittor/zapret-openwrt'
+          repository: ${{ env.REPO_LNK }}
           path: zapret-openwrt
 
       - name: Setup OpenWrt SDK
-        if: ${{ matrix.branch == 'openwrt-23.05' || matrix.branch == 'SNAPSHOT' }}
         working-directory: /builder
+        env:
+          BRANCH: ${{ matrix.branch }}
         shell: bash
         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')
+          # disable check signatures
+          sed -i 's/gpg --/#gpg --/g' setup.sh
+          # disable cleanup keys
           sed -r -i 's/^rm.+//' setup.sh
           ./setup.sh
           ls -lh
+          if [ "$BRANCH" = "openwrt-23.05" ]; then
+              echo "PKGTYPE=ipk" >> $GITHUB_ENV
+          else
+              echo "PKGTYPE=apk" >> $GITHUB_ENV
+          fi
 
       - name: Setup ccache
         uses: actions/cache@v4
         with:
-          path: ${{ matrix.branch == 'openwrt-19.07' && '/home/build/openwrt/.ccache' || '/builder/.ccache' }}
+          path: '/builder/.ccache'
           key: ccache-${{ matrix.arch }}-${{ matrix.branch }}-${{ github.run_id }}
           restore-keys: |
             ccache-${{ matrix.arch }}-${{ matrix.branch }}-
 
       - name: Build packages
         id: build
-        working-directory: ${{ matrix.branch == 'openwrt-19.07' && '/home/build/openwrt' || '/builder' }}
+        working-directory: '/builder'
         env:
+          MAX_SPEED: ${{ github.event.inputs.max_speed != 'false' }}
+          BUILD_DATE: ${{ needs.check.outputs.build_date }}
           DATE: ${{ needs.check.outputs.date }}
           SHA: ${{ needs.check.outputs.sha }}
           ARCH: ${{ matrix.arch }}
           BRANCH: ${{ matrix.branch }}
           SIGN_KEY: ${{ secrets.SIGN_PRIVATE_KEY }}
-          CCACHE_DIR: ${{ matrix.branch == 'openwrt-19.07' && '/home/build/openwrt/.ccache' || '/builder/.ccache' }}
+          CCACHE_DIR: '/builder/.ccache'
         shell: bash
         run: |
-          #export PKG_VERSION=$(date --utc -d $DATE +%Y%m%d)
-          #find $GITHUB_WORKSPACE/zapret-openwrt -type d -path '*/package/zapret' -exec cp -vr {} ./package \;
-          cp -vr $GITHUB_WORKSPACE/zapret-openwrt ./package/zapret-openwrt/
+          MAKE_JOBS=$(($(nproc)+1))
+          echo "$MAKE_JOBS thread compile"
+          PKGDIR=$GITHUB_WORKSPACE/zapret-openwrt
+          MKFN=$PKGDIR/luci-app-zapret/Makefile
+          PKGVER=$( grep -s '^PKG_VERSION:=.*' $MKFN | cut -d'=' -f2 )
+          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
           
-          ./scripts/feeds update base packages luci
-          ./scripts/feeds install -a
+          if [ "$FAKE_BUILD" != "true" ]; then
+              ./scripts/feeds update base packages luci
+              ./scripts/feeds install -a
+              make defconfig
+              echo "------------- .config BEG -------------------"
+              cat .config
+              echo "------------- .config END -------------------"
+              if [ "$ARCH" = "$LUCI_ARCH" ]; then
+                  PKGLIST=`echo package/zapret-openwrt/{zapret,zapret-tpws,zapret-mdig,zapret-ip2net,luci-app-zapret}/compile`
+              else
+                  PKGLIST=`echo package/zapret-openwrt/{zapret,zapret-tpws,zapret-mdig,zapret-ip2net}/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
+          fi
           
-          make defconfig
-          echo "------------- .config BEG -------------------"
-          cat .config
-          echo "------------- .config END -------------------"
-          
-          PKGLIST=`echo package/zapret-openwrt/{zapret,zapret-tpws,zapret-mdig,zapret-ip2net,luci-app-zapret}/compile`
-          make $PKGLIST V=s CONFIG_CCACHE=1 BUILD_LOG=1
-          
-          find ./bin/packages/*/base -type f ! -regex ".*\(zapret\).*\.ipk$" -delete
+          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
           
-          tar -C ./bin/packages/*/base -cvf $GITHUB_WORKSPACE/ipk-$BRANCH-$ARCH.tar --transform "s|^\./|${BRANCH/openwrt-}/$ARCH/|" --show-transformed-names .
+          OUTDIR=$GITHUB_WORKSPACE/$PKGTYPE-$ARCH
+          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_ENV
+          echo "pkgver=$PKGVER" >> $GITHUB_OUTPUT
 
       - name: Compress build logs
         if: always()
         env:
           ARCH: ${{ matrix.arch }}
           BRANCH: ${{ matrix.branch }}
-          LOGS_DIR: ${{ matrix.branch == 'openwrt-19.07' && '/home/build/openwrt/logs' || '/builder/logs' }}
+          LOGS_DIR: '/builder/logs'
         run: |
           tar -cJvf logs-$BRANCH-$ARCH.tar.xz $LOGS_DIR
 
       - name: Upload packages
         if: steps.build.outcome == 'success'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@main
         with:
-          name: ipk-${{ matrix.branch }}-${{ matrix.arch }}
-          path: ./**/ipk-${{ matrix.branch }}-${{ matrix.arch }}.tar
+          path: ${{ env.OUTDIR }}
+          name: zapret,${{ env.PKGTYPE }},${{ matrix.arch }}
           if-no-files-found: error
 
       - name: Upload build logs
         if: always()
         uses: actions/upload-artifact@v4
         with:
+          path: logs-*.tar.xz
           name: logs-${{ matrix.branch }}-${{ matrix.arch }}
-          path: ./**/logs-*.tar.xz
 
   release:
     needs: [ check, build ]
     permissions:
       contents: write
     runs-on: ubuntu-latest
-    strategy:
-      max-parallel: 1
-      matrix:
-        #branch: [ '22.03', '23.05' ]
-        branch: [ '23.05' ]
     steps:
       - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
-          pattern: ipk-*
+          pattern: zapret,*
 
-      - name: Put ipk into zip
+      - name: Put packages into zip
         env:
-          BRANCH: ${{ matrix.branch }}
           TAG: ${{ needs.check.outputs.tag }}
           DATE: ${{ needs.check.outputs.date }}
+          BUILD_DATE: ${{ needs.check.outputs.build_date }}
+          PKGVER: ${{ needs.build.outputs.pkgver }}
         run: |
+          echo "------------- DIR BEG -------------------"
+          ls -la
+          echo "------------- DIR END -------------------"
+          mkdir -p sorted
+          find . -maxdepth 1 -type d -name "zapret,ipk,*" -exec sh -c 'mkdir -p sorted/$(basename "{}" | cut -d, -f3)' \;
+          find . -maxdepth 1 -type d -name "zapret,apk,*" -exec sh -c 'mkdir -p sorted/$(basename "{}" | cut -d, -f3)/apk' \;
+          find . -maxdepth 1 -type d -name "zapret,ipk,*" -exec sh -c 'cp -R "{}/." sorted/$(basename "{}" | cut -d, -f3)' \;
+          find . -maxdepth 1 -type d -name "zapret,apk,*" -exec sh -c 'cp -R "{}/." sorted/$(basename "{}" | cut -d, -f3)/apk' \;
+          LUCI_IPK=$( find . -type f -path "*/zapret,ipk,*/luci-app-zapret*.ipk" -print | head -n 1 )
+          LUCI_APK=$( find . -type f -path "*/zapret,apk,*/luci-app-zapret*.apk" -print | head -n 1 )
+          find ./sorted -mindepth 1 -maxdepth 1 -type d -exec cp -f "$LUCI_IPK" "{}/" \;
+          find ./sorted -mindepth 2 -maxdepth 2 -type d -name "apk" -exec cp -f "$LUCI_APK" "{}/" \;
           mkdir -p public
-          find . -name "ipk-openwrt-$BRANCH-*.tar" -exec tar -xvf {} --wildcards '*.ipk' \;
-          find $BRANCH -mindepth 1 -type d -exec sh -c 'zip -0 ./public/zapret_${TAG}_$(basename {}).zip -j {} {}/*' \;
+          find ./sorted -mindepth 1 -maxdepth 1 -type d -exec sh -c '7z a ./public/zapret_v${PKGVER}_$(basename "{}" | cut -d, -f3).zip {}/*' \;
           ls -lh ./public/*.zip
 
       - name: Upload assets
         uses: andelf/nightly-release@main
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BRANCH: ${{ matrix.branch }}
           TAG: ${{ needs.check.outputs.tag }}
         with:
-          prerelease: false
-          tag_name: ${{ needs.check.outputs.tag }}-${{ matrix.branch }}
-          name: '${{ needs.check.outputs.tag }} for OpenWrt ${{ matrix.branch }}'
+          prerelease: ${{ github.event.inputs.fake_build == 'true' }}
+          tag_name: v${{ needs.build.outputs.pkgver }}${{ github.event.inputs.fake_build == 'true' && '-fake' || '' }}
+          name: zapret v${{ needs.build.outputs.pkgver }}
           body: |
-            ${{ needs.check.outputs.url }}: ${{ needs.check.outputs.message }}
+            zapret v${{ needs.build.outputs.pkgver }} for OpenWrt
           files: ./public/*.zip

README.md

@@ -1,11 +1,19 @@
-[![build](https://github.com/remittor/zapret-openwrt/actions/workflows/build.yml/badge.svg)](https://github.com/remittor/zapret-openwrt/actions/workflows/build.yml)
+[![build](https://github.com/remittor/zapret-openwrt/actions/workflows/build.yml/badge.svg)](https://github.com/remittor/zapret-openwrt/releases)  [![Github All Releases](https://img.shields.io/github/downloads/remittor/zapret-openwrt/total.svg)](https://github.com/remittor/zapret-openwrt/releases)
 # zapret-openwrt
 
+Zapret is not a VPN! Zapret is an Anti-DPI utility!
+
 [Instructions for installing](https://github.com/remittor/zapret-openwrt/wiki/Installing-zapret‐openwrt-package)
 
 [Download page](https://github.com/remittor/zapret-openwrt/releases)
 
-Screenshot:
+## Screenshots
 
 ![image](https://github.com/user-attachments/assets/b79940b3-6a0d-4310-bd58-e461be004397)
 
+## Donations
+
+<img src=https://cdn-icons-png.flaticon.com/16/14446/14446252.png alt="USDT" style="vertical-align: middle;"/> USDT (ethereum network)
+```
+0x840E78D3E47A7ed4987bc36b4A4f0C5240bd7DE8
+```

luci-app-zapret/Makefile

@@ -5,8 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-zapret
-PKG_VERSION:=69-20241118
+PKG_VERSION:=70.20250116
 PKG_LICENSE:=MIT
+PKG_MAINTAINER:=remittor <https://github.com/remittor>
 
 LUCI_TITLE:=LuCI support for zapret
 LUCI_DEPENDS:=+zapret
@@ -19,8 +20,8 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 	rm -rf /tmp/luci-modulecache/
 	#killall -HUP rpcd 2>/dev/null
 	/etc/init.d/rpcd reload
-	/sbin/luci-reload
-	/etc/init.d/uhttpd reload
+	[ -f "/sbin/luci-reload" ] && /sbin/luci-reload
+	[ -f "/etc/init.d/uhttpd" ] && /etc/init.d/uhttpd reload
 fi
 exit 0
 endef

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

@@ -46,8 +46,8 @@ return view.extend({
             tools.getInitState(tools.appName),      // svc_boot
             fs.exec(tools.execPath, [ 'enabled' ]), // svc_en
             fs.exec(tools.execPath, [ 'info' ]),    // svc_info
-            fs.exec('/bin/ps'),                     // process list
-            fs.exec('/bin/opkg', [ 'list-installed', '*zapret*' ]),  // installed packages
+            fs.exec('/bin/busybox', [ 'ps' ]),      // process list
+            fs.exec(tools.packager.path, tools.packager.args),  // installed packages
             uci.load(tools.appName),              // config
         ]).catch(e => {
             ui.addNotification(null, E('p', _('Unable to execute or read contents')
@@ -72,7 +72,7 @@ return view.extend({
         let proc_list = status_array[3];   // stdout: multiline text
         let pkg_list  = status_array[4];   // stdout: installed packages
         
-        console.log('svc_en: ' + svc_en.code);
+        //console.log('svc_en: ' + svc_en.code);
         svc_en = (svc_en.code == 0) ? true : false;
         
         if (svc_info.code != 0) {

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

@@ -320,6 +320,23 @@ return view.extend({
             o.onclick = () => new tools.fileEditDialog(fn, name, '', '', 15).show();
         }
 
+        /* custom.d files */
+
+        tabname = 'custom_d_tab'; 
+        s.tab(tabname, 'custom.d');
+        
+        for (let i = 0; i < tools.customdPrefixList.length; i++) {
+            let num = tools.customdPrefixList[i];
+            let fn = tools.customdFileFormat.format(num.toString());
+            let name = _('custom.d script #' + num);
+            o = s.taboption(tabname, form.Button, '_customd_file%d_btn'.format(num), name);
+            o.inputtitle = _('Edit');
+            o.inputstyle = 'edit btn';
+            o.description = fn;
+            let desc = (num == tools.discord_num) ? _('Example') + ': <a href=%s>%s</a>'.format(tools.discord_url) : '';
+            o.onclick = () => new tools.fileEditDialog(fn, name, desc, '', 15).show();
+        }
+
         let map_promise = m.render();
         map_promise.then(node => node.classList.add('fade-in'));
         return map_promise;

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

@@ -35,6 +35,7 @@ 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',
@@ -48,6 +49,10 @@ return baseclass.extend({
     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/master/init.d/custom.d.examples.linux/50-discord',
 
     autoHostListFN    : '/opt/zapret/ipset/zapret-hosts-auto.txt',
     autoHostListDbgFN : '/opt/zapret/ipset/zapret-hosts-auto-debug.log',
@@ -82,7 +87,24 @@ 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);
+        }
+    },
+
     getInitState: function(name) {
+        this.init_consts();
         return this.callInitState(name).then(res => {
             if (res) {
                 return res[name].enabled ? true : false;
@@ -114,12 +136,33 @@ return baseclass.extend({
         let lines = pkg_list.trim().split('\n');
         for (let i = 0; i < lines.length; i++) {
             let line = lines[i].trim();
-            if (line.length >= 4) {
-                let word_list = line.split(' - ');
-                let name = word_list[0].trim();
-                let ver = word_list[1].trim();
-                pkg_dict[name] = ver;
+            let name;
+            let ver;
+            if (this.packager.name == 'apk') {
+                let fullname = line.split(' ')[0];
+                let mpos = fullname.lastIndexOf("-");
+                if (mpos <= 0)
+                    continue;
+                if (fullname.substring(mpos+1, mpos+2) == 'r') {
+                    // release number
+                    fullname = fullname.substring(0, mpos);
+                }
+                mpos = fullname.lastIndexOf("-");
+                if (mpos <= 0)
+                    continue;
+                name = fullname.substring(0, mpos).trim();
+                ver = fullname.substring(mpos+1).trim();
+            } else {
+                if (!line.includes(' - '))
+                    continue;
+                name = line.split(' - ')[0].trim();
+                ver  = line.split(' - ')[1].trim();
+                let spos = ver.indexOf(" ");
+                if (spos > 0) {
+                    ver = ver.substring(0, spos);
+                }
             }
+            pkg_dict[name] = ver;
         }
         return pkg_dict;
     },

luci-app-zapret/root/usr/share/rpcd/acl.d/luci-app-zapret.json

@@ -9,7 +9,9 @@
 				"/etc/crontabs/root": [ "read" ],
 				"/etc/init.d/zapret*": [ "exec" ],
 				"/bin/ps*": [ "exec" ],
+				"/bin/busybox*": [ "exec" ],
 				"/bin/opkg*": [ "exec" ],
+				"/usr/bin/apk*": [ "exec" ],
 				"/opt/zapret/restore-def-cfg.sh*": [ "exec" ],
 				"/opt/zapret/sync_config.sh*": [ "exec" ]
 			},
@@ -21,7 +23,8 @@
 		"write": {
 			"file": {
 				"/opt/zapret/config": [ "write" ],
-				"/opt/zapret/ipset/*.txt": [ "write" ],
+				"/opt/zapret/ipset/*": [ "write" ],
+				"/opt/zapret/init.d/openwrt/custom.d/*": [ "write" ],
 				"/etc/crontabs/root": [ "write" ]
 			},
 			"uci": [ "zapret" ]

zapret-ip2net/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret-ip2net
-PKG_VERSION:=69-20241118
+PKG_VERSION:=70.20250116
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -9,8 +9,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=256c2d7e50de0f91fdec8439a08c8e22c3b3b115
-PKG_SOURCE_DATE:=2024-11-18
+PKG_SOURCE_VERSION:=29ab747e5b2e9ee414c7c31974c3ad73d2b256a5
+PKG_SOURCE_DATE:=2025-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?

zapret-mdig/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret-mdig
-PKG_VERSION:=69-20241118
+PKG_VERSION:=70.20250116
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -9,8 +9,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=256c2d7e50de0f91fdec8439a08c8e22c3b3b115
-PKG_SOURCE_DATE:=2024-11-18
+PKG_SOURCE_VERSION:=29ab747e5b2e9ee414c7c31974c3ad73d2b256a5
+PKG_SOURCE_DATE:=2025-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?

zapret-tpws/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret-tpws
-PKG_VERSION:=69-20241118
+PKG_VERSION:=70.20250116
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -9,8 +9,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=256c2d7e50de0f91fdec8439a08c8e22c3b3b115
-PKG_SOURCE_DATE:=2024-11-18
+PKG_SOURCE_VERSION:=29ab747e5b2e9ee414c7c31974c3ad73d2b256a5
+PKG_SOURCE_DATE:=2025-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?

zapret/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret
-PKG_VERSION:=69-20241118
+PKG_VERSION:=70.20250116
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -13,8 +13,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=256c2d7e50de0f91fdec8439a08c8e22c3b3b115
-PKG_SOURCE_DATE:=2024-11-18
+PKG_SOURCE_VERSION:=29ab747e5b2e9ee414c7c31974c3ad73d2b256a5
+PKG_SOURCE_DATE:=2025-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?

zapret/config.default

@@ -93,7 +93,7 @@ NFQWS_PORTS_UDP_KEEPALIVE=0
 # use <HOSTLIST> and <HOSTLIST_NOAUTO> placeholders to engage standard hostlists and autohostlist in ipset dir
 # hostlist markers are replaced to empty string if MODE_FILTER does not satisfy
 # <HOSTLIST_NOAUTO> appends ipset/zapret-hosts-auto.txt as normal list
-NFQWS_OPT="--filter-tcp=80 <HOSTLIST> --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new --filter-tcp=443 --hostlist=/opt/zapret/ipset/zapret-hosts-google.txt --dpi-desync=fake,split2 --dpi-desync-repeats=11 --dpi-desync-fooling=md5sig --dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin --new --filter-udp=443 --hostlist=/opt/zapret/ipset/zapret-hosts-google.txt --dpi-desync=fake --dpi-desync-repeats=11 --dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin --new --filter-udp=443 <HOSTLIST_NOAUTO> --dpi-desync=fake --dpi-desync-repeats=11 --new --filter-tcp=80,443 <HOSTLIST> --dpi-desync=fake,disorder2 --dpi-desync-repeats=6 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig"
+NFQWS_OPT="--filter-tcp=80 <HOSTLIST> --dpi-desync=fake,fakedsplit --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new --filter-tcp=443 --hostlist=/opt/zapret/ipset/zapret-hosts-google.txt --dpi-desync=fake,multidisorder --dpi-desync-split-pos=1,midsld --dpi-desync-repeats=11 --dpi-desync-fooling=md5sig --dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin --new --filter-udp=443 --hostlist=/opt/zapret/ipset/zapret-hosts-google.txt --dpi-desync=fake --dpi-desync-repeats=11 --dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin --new --filter-udp=443 <HOSTLIST_NOAUTO> --dpi-desync=fake --dpi-desync-repeats=11 --new --filter-tcp=443 <HOSTLIST> --dpi-desync=fake,multidisorder --dpi-desync-split-pos=midsld --dpi-desync-repeats=6 --dpi-desync-fooling=badseq,md5sig"
 
 
 # FlowOffload mode : donttouch,none,software,hardware

zapret/def-cfg.sh

@@ -34,12 +34,13 @@ function set_cfg_default_values
 		set $cfgname.config.NFQWS_PORTS_UDP_KEEPALIVE='0'
 		set $cfgname.config.NFQWS_OPT="
 			--filter-tcp=80 <HOSTLIST>
-			--dpi-desync=fake,split2
+			--dpi-desync=fake,fakedsplit
 			--dpi-desync-autottl=2
 			--dpi-desync-fooling=md5sig
 			--new
 			--filter-tcp=443 --hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
-			--dpi-desync=fake,split2
+			--dpi-desync=fake,multidisorder
+			--dpi-desync-split-pos=1,midsld
 			--dpi-desync-repeats=11
 			--dpi-desync-fooling=md5sig
 			--dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
@@ -53,11 +54,11 @@ function set_cfg_default_values
 			--dpi-desync=fake
 			--dpi-desync-repeats=11
 			--new
-			--filter-tcp=80,443 <HOSTLIST>
-			--dpi-desync=fake,disorder2
+			--filter-tcp=443 <HOSTLIST>
+			--dpi-desync=fake,multidisorder
+			--dpi-desync-split-pos=midsld
 			--dpi-desync-repeats=6
-			--dpi-desync-autottl=2
-			--dpi-desync-fooling=md5sig
+			--dpi-desync-fooling=badseq,md5sig
 		"
 		# save changes
 		commit $cfgname

zapret/restore-def-cfg.sh

@@ -3,8 +3,15 @@
 
 . /opt/zapret/comfunc.sh
 
+cfg_run_on_boot="$( uci -q get zapret.config.run_on_boot )"
+
 create_default_cfg
 
+if [ "$cfg_run_on_boot" = "1" ]; then
+	uci set zapret.config.run_on_boot=1
+	uci commit
+fi
+
 if [ "$1" = "sync" ]; then
 	# renew main config
 	/opt/zapret/sync_config.sh