Bump version to v70-20250109

luci: Forced use busybox ps
Bump version to v69-20241206
2026-01-04 07:38:50 +03:00 · 2025-01-09 12:33:23 +03:00 · 2024-12-13 21:32:55 +03:00 · 2024-12-06 21:27:16 +03:00 · 2024-12-06 21:26:50 +03:00 · 2024-11-23 20:44:17 +03:00
9 changed files with 19 additions and 15 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -100,6 +100,8 @@ jobs:
        exclude:
          - branch: SNAPSHOT
            arch: arm_mpcore
+          - branch: SNAPSHOT
+            arch: arm_cortex-a9_vfpv3-d16
    container:
      image: openwrt/sdk:${{ matrix.arch }}-${{ matrix.branch }}
      options: --user root
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 [![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)
--- 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:=69.20241121
+PKG_VERSION:=70.20250109
 PKG_LICENSE:=MIT
 PKG_MAINTAINER:=remittor <https://github.com/remittor>

--- a/luci-app-zapret/htdocs/luci-static/resources/view/zapret/service.js
+++ b/luci-app-zapret/htdocs/luci-static/resources/view/zapret/service.js
@@ -46,7 +46,7 @@ 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/busybox', [ 'ps' ]),      // process list
            fs.exec(tools.packager.path, tools.packager.args),  // installed packages
            uci.load(tools.appName),              // config
        ]).catch(e => {
--- a/luci-app-zapret/root/usr/share/rpcd/acl.d/luci-app-zapret.json
+++ b/luci-app-zapret/root/usr/share/rpcd/acl.d/luci-app-zapret.json
@@ -8,7 +8,7 @@
 				"/opt/zapret/ipset/*": [ "read" ],
 				"/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" ],
--- a/zapret-ip2net/Makefile
+++ b/zapret-ip2net/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=zapret-ip2net
-PKG_VERSION:=69.20241121
+PKG_VERSION:=70.20250109

 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:=62b081e9fbbb6be8b7ea457fd5367cdd7a62acc9
-PKG_SOURCE_DATE:=2024-11-21
+PKG_SOURCE_VERSION:=f21bd0c63c4997cad7d792c29053a2a7556663e8
+PKG_SOURCE_DATE:=2025-01-09

 #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?
--- a/zapret-mdig/Makefile
+++ b/zapret-mdig/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=zapret-mdig
-PKG_VERSION:=69.20241121
+PKG_VERSION:=70.20250109

 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:=62b081e9fbbb6be8b7ea457fd5367cdd7a62acc9
-PKG_SOURCE_DATE:=2024-11-21
+PKG_SOURCE_VERSION:=f21bd0c63c4997cad7d792c29053a2a7556663e8
+PKG_SOURCE_DATE:=2025-01-09

 #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?
--- a/zapret-tpws/Makefile
+++ b/zapret-tpws/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=zapret-tpws
-PKG_VERSION:=69.20241121
+PKG_VERSION:=70.20250109

 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:=62b081e9fbbb6be8b7ea457fd5367cdd7a62acc9
-PKG_SOURCE_DATE:=2024-11-21
+PKG_SOURCE_VERSION:=f21bd0c63c4997cad7d792c29053a2a7556663e8
+PKG_SOURCE_DATE:=2025-01-09

 #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?
--- a/zapret/Makefile
+++ b/zapret/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=zapret
-PKG_VERSION:=69.20241121
+PKG_VERSION:=70.20250109

 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:=62b081e9fbbb6be8b7ea457fd5367cdd7a62acc9
-PKG_SOURCE_DATE:=2024-11-21
+PKG_SOURCE_VERSION:=f21bd0c63c4997cad7d792c29053a2a7556663e8
+PKG_SOURCE_DATE:=2025-01-09

 #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?
Author	SHA1	Message	Date
remittor	e0fd21187b	Bump version to v70-20250109	2025-01-09 12:33:23 +03:00
remittor	47822364d5	luci: Forced use busybox ps	2024-12-13 21:32:55 +03:00
remittor	72d1ac6d7a	Bump version to v69-20241206	2024-12-06 21:27:16 +03:00
remittor	b1c289c397	github: Exclude arch arm_cortex-a9_vfpv3-d16	2024-12-06 21:26:50 +03:00
remittor	ce1563dc7d	Bump version to v69-20241123	2024-11-23 20:44:17 +03:00
remittor	566f3376ae	readme: Add about of tool	2024-11-21 18:11:40 +03:00