Bump version to v69-20241123

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

.github/workflows/build.yml

@@ -65,8 +65,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        #branch: [ openwrt-22.03, openwrt-23.05 ]
+        branch: [ openwrt-23.05, SNAPSHOT ]
-        branch: [ openwrt-23.05 ]
         arch:
           - aarch64_cortex-a53
           - aarch64_cortex-a72
@@ -94,14 +93,13 @@ jobs:
           - mipsel_74kc
           - mipsel_mips32
           - x86_64
-        #include:
+        include:
-        #  - branch: SNAPSHOT
+          - branch: SNAPSHOT
-        #    arch: x86_64
+            arch: aarch64_cortex-a76
-        #exclude:
+            #arch: riscv64_riscv64
-        #  - branch: openwrt-22.03
+        exclude:
-        #    arch: arm_fa526
+          - branch: SNAPSHOT
-        #  - branch: openwrt-22.03
+            arch: arm_mpcore
-        #    arch: arm_mpcore
     container:
       image: openwrt/sdk:${{ matrix.arch }}-${{ matrix.branch }}
       options: --user root
@@ -119,6 +117,9 @@ jobs:
         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
@@ -163,14 +164,14 @@ jobs:
           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 .
+          tar -C ./bin/packages/*/base -cvf $GITHUB_WORKSPACE/pkg-$BRANCH-$ARCH.tar --transform "s|^\./|${BRANCH/openwrt-}/$ARCH/|" --show-transformed-names .
           ./staging_dir/host/bin/ccache --max-size=10M --show-stats
 
       - name: Compress build logs
@@ -186,8 +187,8 @@ jobs:
         if: steps.build.outcome == 'success'
         uses: actions/upload-artifact@v4
         with:
-          name: ipk-${{ matrix.branch }}-${{ matrix.arch }}
+          name: pkg-${{ matrix.branch }}-${{ matrix.arch }}
-          path: ./**/ipk-${{ matrix.branch }}-${{ matrix.arch }}.tar
+          path: pkg-*.tar
           if-no-files-found: error
 
       - name: Upload build logs
@@ -195,7 +196,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: logs-${{ matrix.branch }}-${{ matrix.arch }}
-          path: ./**/logs-*.tar.xz
+          path: logs-*.tar.xz
 
   release:
     needs: [ check, build ]
@@ -205,22 +206,21 @@ jobs:
     strategy:
       max-parallel: 1
       matrix:
-        #branch: [ '22.03', '23.05' ]
+        branch: [ 'SNAPSHOT', '23.05' ]
-        branch: [ '23.05' ]
     steps:
       - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
-          pattern: ipk-*
+          pattern: pkg-*
 
-      - name: Put ipk into zip
+      - name: Put packages into zip
         env:
           BRANCH: ${{ matrix.branch }}
           TAG: ${{ needs.check.outputs.tag }}
           DATE: ${{ needs.check.outputs.date }}
         run: |
           mkdir -p public
-          find . -name "ipk-openwrt-$BRANCH-*.tar" -exec tar -xvf {} --wildcards '*.ipk' \;
+          find . -name "*-$BRANCH-*.tar" -exec tar -xvf {} --wildcards '*.*pk' \;
           find $BRANCH -mindepth 1 -type d -exec sh -c 'zip -0 ./public/zapret_${TAG}_$(basename {}).zip -j {} {}/*' \;
           ls -lh ./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)
 # 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:=69.20241123
 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
+	[ -f "/sbin/luci-reload" ] && /sbin/luci-reload
-	/etc/init.d/uhttpd 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

@@ -47,7 +47,7 @@ return view.extend({
             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(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/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',
@@ -82,7 +83,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 +132,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 name;
-                let word_list = line.split(' - ');
+            let ver;
-                let name = word_list[0].trim();
+            if (this.packager.name == 'apk') {
-                let ver = word_list[1].trim();
+                let fullname = line.split(' ')[0];
-                pkg_dict[name] = ver;
+                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

@@ -10,6 +10,7 @@
 				"/etc/init.d/zapret*": [ "exec" ],
 				"/bin/ps*": [ "exec" ],
 				"/bin/opkg*": [ "exec" ],
+				"/usr/bin/apk*": [ "exec" ],
 				"/opt/zapret/restore-def-cfg.sh*": [ "exec" ],
 				"/opt/zapret/sync_config.sh*": [ "exec" ]
 			},

zapret-ip2net/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret-ip2net
-PKG_VERSION:=69-20241118
+PKG_VERSION:=69.20241123
 
 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_VERSION:=34199b151c508b3567043394edca058e64ab34f5
-PKG_SOURCE_DATE:=2024-11-18
+PKG_SOURCE_DATE:=2024-11-23
 
 #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:=69.20241123
 
 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_VERSION:=34199b151c508b3567043394edca058e64ab34f5
-PKG_SOURCE_DATE:=2024-11-18
+PKG_SOURCE_DATE:=2024-11-23
 
 #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:=69.20241123
 
 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_VERSION:=34199b151c508b3567043394edca058e64ab34f5
-PKG_SOURCE_DATE:=2024-11-18
+PKG_SOURCE_DATE:=2024-11-23
 
 #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:=69.20241123
 
 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_VERSION:=34199b151c508b3567043394edca058e64ab34f5
-PKG_SOURCE_DATE:=2024-11-18
+PKG_SOURCE_DATE:=2024-11-23
 
 #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>
+			--filter-tcp=443 <HOSTLIST>
-			--dpi-desync=fake,disorder2
+			--dpi-desync=fake,multidisorder
+			--dpi-desync-split-pos=midsld
 			--dpi-desync-repeats=6
-			--dpi-desync-autottl=2
+			--dpi-desync-fooling=badseq,md5sig
-			--dpi-desync-fooling=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