Update zapret to 8c9aa18 (v70.1)

NOFEXtreme · Jan 29, 2025 · 8acafb8 · 8acafb8
1 parent b202158
commit 8acafb8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/zapret-build.yml b/.github/workflows/zapret-build.yml
@@ -345,11 +345,12 @@ jobs:
       - name: Build
         env:
           ABI: ${{ matrix.abi }}
+          API: 21
           TARGET: ${{ matrix.target }}
+          GH_TOKEN: ${{ github.token }}
         run: |
           DEPS_DIR=$GITHUB_WORKSPACE/deps
           export TOOLCHAIN=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64
-          export API=21
           export CC="$TOOLCHAIN/bin/clang --target=$TARGET$API"
           export AR=$TOOLCHAIN/bin/llvm-ar
           export AS=$CC
@@ -363,7 +364,7 @@ jobs:
           wget -qO- https://www.netfilter.org/pub/libmnl/libmnl-1.0.5.tar.bz2 | tar -xj
           wget -qO- https://www.netfilter.org/pub/libnetfilter_queue/libnetfilter_queue-1.0.5.tar.bz2 | tar -xj
           patch -p1 -d libnetfilter_queue-* -i ${{ env.zapret_dir }}/.github/workflows/libnetfilter_queue-android.patch
-          
+
           for i in libmnl libnfnetlink libnetfilter_queue ; do
             (
               cd $i-*
@@ -378,6 +379,12 @@ jobs:
           CFLAGS="-DZAPRET_GH_VER=${{ github.ref_name }} -DZAPRET_GH_HASH=${{ github.sha }} -I$DEPS_DIR/include" \
           LDFLAGS="-L$DEPS_DIR/lib" \
           make -C ${{ env.zapret_dir }} android -j$(nproc)
+
+          # strip unwanted ELF sections to prevent warnings on old Android versions
+          gh api repos/termux/termux-elf-cleaner/releases/latest --jq '.tag_name' |\
+            xargs -I{} wget -O elf-cleaner https://github.com/termux/termux-elf-cleaner/releases/download/{}/termux-elf-cleaner
+          chmod +x elf-cleaner
+          ./elf-cleaner --api-level $API ${{ env.zapret_dir }}/binaries/my/*
           zip zapret-android-$ABI.zip -j ${{ env.zapret_dir }}/binaries/my/*
 
       - name: Upload artifacts

diff --git a/core/zapret b/core/zapret
diff --git a/zapret-config.default b/zapret-config.default
@@ -107,7 +107,7 @@ ${NFQWS_PORTS_UDP_DISCORD:+"--new --filter-udp=$NFQWS_PORTS_UDP_DISCORD --dpi-de
 # none,ipset,hostlist,autohostlist
 MODE_FILTER=hostlist
 
-# openwrt only : donttouch,none,software,hardware
+# donttouch,none,software,hardware
 FLOWOFFLOAD=donttouch
 
 # openwrt: specify networks to be treated as LAN. default is "lan"
+1 −0		.github/ISSUE_TEMPLATE/config.yml
+11 −2		.github/ISSUE_TEMPLATE/issue-warning.md
+8 −1		.github/workflows/build.yml
+6 −3		blockcheck.sh
+15 −24		common/installer.sh
+1 −1		config.default
+8 −0		docs/changes.txt
+21 −2		docs/readme.en.md
+53 −22		docs/readme.md
+12 −0		ipset/def.sh
+2 −0		ipset/get_antizapret_domains.sh
+2 −0		ipset/get_reestr_hostlist.sh
+2 −0		ipset/get_reestr_resolvable_domains.sh
+2 −0		ipset/get_refilter_domains.sh
+51 −12		nfq/desync.c
+12 −0		nfq/helpers.c
+16 −0		nfq/helpers.h
+4 −4		nfq/hostlist.c
+2 −0		nfq/hostlist.h
+4 −4		nfq/ipset.c
+2 −0		nfq/ipset.h
+251 −82		nfq/nfqws.c
+1 −1		nfq/params.c
+14 −2		nfq/params.h
+16 −3		nfq/pools.c
+4 −2		nfq/pools.h
+34 −5		nfq/protocol.c
+3 −0		nfq/protocol.h
+12 −0		tpws/helpers.c
+8 −0		tpws/helpers.h
+4 −4		tpws/hostlist.c
+2 −0		tpws/hostlist.h
+4 −4		tpws/ipset.c
+2 −0		tpws/ipset.h
+16 −2		tpws/pools.c
+4 −2		tpws/pools.h
+2 −1		tpws/tamper.c
+22 −1		tpws/tpws.c
+1 −1		tpws/tpws.h
+2 −0		tpws/tpws_conn.c