2024-11-29 21:40:52 +03:00
59 changed files with 19 additions and 9 deletions
--- a/binaries/aarch64/ip2net
+++ b/binaries/aarch64/ip2net
--- a/binaries/aarch64/mdig
+++ b/binaries/aarch64/mdig
--- a/binaries/aarch64/nfqws
+++ b/binaries/aarch64/nfqws
--- a/binaries/aarch64/tpws
+++ b/binaries/aarch64/tpws
--- a/binaries/arm/ip2net
+++ b/binaries/arm/ip2net
--- a/binaries/arm/mdig
+++ b/binaries/arm/mdig
--- a/binaries/arm/nfqws
+++ b/binaries/arm/nfqws
--- a/binaries/arm/tpws
+++ b/binaries/arm/tpws
--- a/binaries/freebsd-x64/dvtws
+++ b/binaries/freebsd-x64/dvtws
--- a/binaries/freebsd-x64/ip2net
+++ b/binaries/freebsd-x64/ip2net
--- a/binaries/freebsd-x64/mdig
+++ b/binaries/freebsd-x64/mdig
--- a/binaries/freebsd-x64/tpws
+++ b/binaries/freebsd-x64/tpws
--- a/binaries/mac64/ip2net
+++ b/binaries/mac64/ip2net
--- a/binaries/mac64/mdig
+++ b/binaries/mac64/mdig
--- a/binaries/mac64/tpws
+++ b/binaries/mac64/tpws
--- a/binaries/mips32r1-lsb/ip2net
+++ b/binaries/mips32r1-lsb/ip2net
--- a/binaries/mips32r1-lsb/mdig
+++ b/binaries/mips32r1-lsb/mdig
--- a/binaries/mips32r1-lsb/nfqws
+++ b/binaries/mips32r1-lsb/nfqws
--- a/binaries/mips32r1-lsb/tpws
+++ b/binaries/mips32r1-lsb/tpws
--- a/binaries/mips32r1-msb/ip2net
+++ b/binaries/mips32r1-msb/ip2net
--- a/binaries/mips32r1-msb/mdig
+++ b/binaries/mips32r1-msb/mdig
--- a/binaries/mips32r1-msb/nfqws
+++ b/binaries/mips32r1-msb/nfqws
--- a/binaries/mips32r1-msb/tpws
+++ b/binaries/mips32r1-msb/tpws
--- a/binaries/mips64r2-msb/ip2net
+++ b/binaries/mips64r2-msb/ip2net
--- a/binaries/mips64r2-msb/mdig
+++ b/binaries/mips64r2-msb/mdig
--- a/binaries/mips64r2-msb/nfqws
+++ b/binaries/mips64r2-msb/nfqws
--- a/binaries/mips64r2-msb/tpws
+++ b/binaries/mips64r2-msb/tpws
--- a/binaries/ppc/ip2net
+++ b/binaries/ppc/ip2net
--- a/binaries/ppc/mdig
+++ b/binaries/ppc/mdig
--- a/binaries/ppc/nfqws
+++ b/binaries/ppc/nfqws
--- a/binaries/ppc/tpws
+++ b/binaries/ppc/tpws
--- a/binaries/win32/WinDivert.dll
+++ b/binaries/win32/WinDivert.dll
--- a/binaries/win32/WinDivert32.sys
+++ b/binaries/win32/WinDivert32.sys
--- a/binaries/win32/cygwin1.dll
+++ b/binaries/win32/cygwin1.dll
--- a/binaries/win32/ip2net.exe
+++ b/binaries/win32/ip2net.exe
--- a/binaries/win32/killall.exe
+++ b/binaries/win32/killall.exe
--- a/binaries/win32/mdig.exe
+++ b/binaries/win32/mdig.exe
--- a/binaries/win32/readme.txt
+++ b/binaries/win32/readme.txt
@ -0,0 +1,8 @@
+From this folder winws can be started only standalone.
+To run from cygwin shell delete, rename or move cygwin1.dll.
+Cygwin refuses to start winws if a copy of cygwin1.dll is present !
+
+How to get win7 and winws compatible version of cygwin :
+
+curl -O https://www.cygwin.com/setup-x86_64.exe
+setup-x86_64.exe --allow-unsupported-windows --no-verify --site http://ctm.crouchingtigerhiddenfruitbat.org/pub/cygwin/circa/64bit/2024/01/30/231215
--- a/binaries/win32/winws.exe
+++ b/binaries/win32/winws.exe
--- a/binaries/win64/WinDivert.dll
+++ b/binaries/win64/WinDivert.dll
--- a/binaries/win64/WinDivert64.sys
+++ b/binaries/win64/WinDivert64.sys
--- a/binaries/win64/cygwin1.dll
+++ b/binaries/win64/cygwin1.dll
--- a/binaries/win64/ip2net.exe
+++ b/binaries/win64/ip2net.exe
--- a/binaries/win64/mdig.exe
+++ b/binaries/win64/mdig.exe
--- a/binaries/win64/readme.txt
+++ b/binaries/win64/readme.txt
@ -0,0 +1,8 @@
+From this folder winws can be started only standalone.
+To run from cygwin shell delete, rename or move cygwin1.dll.
+Cygwin refuses to start winws if a copy of cygwin1.dll is present !
+
+How to get win7 and winws compatible version of cygwin :
+
+curl -O https://www.cygwin.com/setup-x86_64.exe
+setup-x86_64.exe --allow-unsupported-windows --no-verify --site http://ctm.crouchingtigerhiddenfruitbat.org/pub/cygwin/circa/64bit/2024/01/30/231215
--- a/binaries/win64/winws.exe
+++ b/binaries/win64/winws.exe
--- a/binaries/x86/ip2net
+++ b/binaries/x86/ip2net
--- a/binaries/x86/mdig
+++ b/binaries/x86/mdig
--- a/binaries/x86/nfqws
+++ b/binaries/x86/nfqws
--- a/binaries/x86/tpws
+++ b/binaries/x86/tpws
--- a/binaries/x86_64/ip2net
+++ b/binaries/x86_64/ip2net
--- a/binaries/x86_64/mdig
+++ b/binaries/x86_64/mdig
--- a/binaries/x86_64/nfqws
+++ b/binaries/x86_64/nfqws
--- a/binaries/x86_64/tpws
+++ b/binaries/x86_64/tpws
--- a/binaries/x86_64/tpws_wsl.tgz
+++ b/binaries/x86_64/tpws_wsl.tgz
--- a/docs/changes.txt
+++ b/docs/changes.txt
@ -358,7 +358,7 @@ blockcheck: do not require root if SKIP_PKTWS=1

 v68:

-docs : move russian version to markdown
+readme.md : move russian version to markdown
 nfqws,tpws: use alternate $ sign for $<config_file>
 repo: binaries removed from repo. git actions binaries build in releases.
 uninstall_easy.sh: offer to remove dependencies in openwrt
--- a/docs/quick_start.md
+++ b/docs/quick_start.md
@ -235,8 +235,6 @@
 8. На все остальные вопросы `install_easy.sh` отвечайте согласно выводимой
   аннотации.

-9. Удалите директорию из /tmp, откуда производилась установка.
-

 ## Итог
 Это минимальная инструкция, чтобы быстро сориентироваться с чего начать.
--- a/docs/readme.md
+++ b/docs/readme.md
@ -1,4 +1,4 @@
-# zapret v.68
+# zapret v.67

 # Multilanguage README

--- a/install_bin.sh
+++ b/install_bin.sh
@ -25,11 +25,7 @@ check_dir()
 				# find does not use its own shell exec
 				# it uses execvp(). in musl libc it does not call shell, in glibc it DOES call /bin/sh
 				# that's why prefer bash or zsh if present. otherwise it's our last chance
-				local FIND=find
-				if ! exists find && exists busybox; then
-					FIND="busybox find"
-				fi
-				out=$(echo 0.0.0.0 | $FIND "$dir" -maxdepth 1 -name ip2net -exec {} \; 2>/dev/null)
+				out=$(echo 0.0.0.0 | find "$dir" -maxdepth 1 -name ip2net -exec {} \; 2>/dev/null)
 			fi
 			[ -n "$out" ]
 		else