drygdryg/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2025-04-21 06:22:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: drygdryg:212a1480d97de877917eef014c6b3f1cc32d7b66
Branches Tags
drygdryg:master
drygdryg:v70.6
drygdryg:v70.5
drygdryg:v70.4
drygdryg:v70.3
drygdryg:v70
drygdryg:v69.9
drygdryg:v69.8
drygdryg:v69.7
drygdryg:v69.6
drygdryg:v69.5
drygdryg:v69.4
drygdryg:v69.3
drygdryg:v69.2
drygdryg:v69.1
drygdryg:v69
drygdryg:v68
drygdryg:v67
drygdryg:v66
drygdryg:v65
drygdryg:v64
...
compare: drygdryg:7a46d26096531613ac36664c1277aefa74b55b34
Branches Tags
drygdryg:master
drygdryg:v70.6
drygdryg:v70.5
drygdryg:v70.4
drygdryg:v70.3
drygdryg:v70
drygdryg:v69.9
drygdryg:v69.8
drygdryg:v69.7
drygdryg:v69.6
drygdryg:v69.5
drygdryg:v69.4
drygdryg:v69.3
drygdryg:v69.2
drygdryg:v69.1
drygdryg:v69
drygdryg:v68
drygdryg:v67
drygdryg:v66
drygdryg:v65
drygdryg:v64

5 Commits
212a1480d9 ... 7a46d26096

Author SHA1 Message Date
Lorekin
7a46d26096
Merge 92ba6b439e6aed8557a315ebfcd350016159be52 into bc463930aa26705c356a6e1d630ce97aa1266cfa 2024-12-24 19:58:08 +03:00
bol-van
bc463930aa
Merge pull request #989 from Hi-Angel/march=native 
Use `-march=native` when building from install_easy.sh
 2024-12-24 19:29:10 +03:00
Konstantin Kharlamov
6fe9471077 Use -march=native when building from install_easy.sh 
install_easy.sh is used for local installation, which implies that if
it invokes make, the binaries are not being cross-compiled. That
allows us to pass `-march=native` to make sure the binaries are
optimized for the current CPU.

We prepend `-march=native` to CFLAGS to make sure that if a user sets
CFLAGS with a distinct `-march` option, ours will get overwritten.
 2024-12-24 18:42:16 +03:00
Konstantin Kharlamov
884213f7ac install_easy.sh: remove trailing whitespaces 2024-12-24 18:40:44 +03:00
Lorekin
92ba6b439e
Add script to get antifilter domains 2024-11-27 23:58:54 +03:00
2 changed files with 45 additions and 6 deletions
Show Stats Expand all files Collapse all files

11
install_easy.sh
View File

@ -70,7 +70,7 @@ check_bins()
elif [ -f "$EXEDIR/Makefile" ] && exists make; then elif [ -f "$EXEDIR/Makefile" ] && exists make; then
echo trying to compile echo trying to compile
[ "$SYSTEM" = "macos" ] && make_target=mac [ "$SYSTEM" = "macos" ] && make_target=mac
make -C "$EXEDIR" $make_target || { CFLAGS="-march=native ${CFLAGS}" make -C "$EXEDIR" $make_target || {
echo could not compile echo could not compile
make -C "$EXEDIR" clean make -C "$EXEDIR" clean
exitp 8 exitp 8
@ -292,7 +292,7 @@ ask_config_tmpdir()
echo default tmpfs has size of 50% RAM echo default tmpfs has size of 50% RAM
echo "RAM : $(get_ram_mb) Mb" echo "RAM : $(get_ram_mb) Mb"
echo "DISK : $(get_free_space_mb) Mb" echo "DISK : $(get_free_space_mb) Mb"
echo select temp file location echo select temp file location
[ -z "$TMPDIR" ] && TMPDIR=/tmp [ -z "$TMPDIR" ] && TMPDIR=/tmp
ask_list TMPDIR "/tmp $EXEDIR/tmp" && { ask_list TMPDIR "/tmp $EXEDIR/tmp" && {
[ "$TMPDIR" = "/tmp" ] && TMPDIR= [ "$TMPDIR" = "/tmp" ] && TMPDIR=
@ -388,7 +388,7 @@ copy_openwrt()
local ARCH="$(get_bin_arch)" local ARCH="$(get_bin_arch)"
local BINDIR="$1/binaries/$ARCH" local BINDIR="$1/binaries/$ARCH"
local file local file
[ -d "$2" ] || mkdir -p "$2" [ -d "$2" ] || mkdir -p "$2"
mkdir "$2/tpws" "$2/nfq" "$2/ip2net" "$2/mdig" "$2/binaries" "$2/binaries/$ARCH" "$2/init.d" "$2/tmp" "$2/files" mkdir "$2/tpws" "$2/nfq" "$2/ip2net" "$2/mdig" "$2/binaries" "$2/binaries/$ARCH" "$2/init.d" "$2/tmp" "$2/files"
@ -482,7 +482,7 @@ _restore_settings()
[ -z "$f" -o "$f" = "/" ] && continue [ -z "$f" -o "$f" = "/" ] && continue
[ -f "/tmp/zapret-bkp-$i" ] && { [ -f "/tmp/zapret-bkp-$i" ] && {
mv -f "/tmp/zapret-bkp-$i" "$ZAPRET_TARGET/$f" || rm -f "/tmp/zapret-bkp-$i" mv -f "/tmp/zapret-bkp-$i" "$ZAPRET_TARGET/$f" || rm -f "/tmp/zapret-bkp-$i"
} }
[ -d "/tmp/zapret-bkp-$i" ] && { [ -d "/tmp/zapret-bkp-$i" ] && {
[ -d "$ZAPRET_TARGET/$f" ] && rm -r "$ZAPRET_TARGET/$f" [ -d "$ZAPRET_TARGET/$f" ] && rm -r "$ZAPRET_TARGET/$f"
@ -724,7 +724,7 @@ install_linux()
crontab_del_quiet crontab_del_quiet
# desktop system. more likely up at daytime # desktop system. more likely up at daytime
crontab_add 10 22 crontab_add 10 22
echo echo
echo '!!! WARNING. YOUR SETUP IS INCOMPLETE !!!' echo '!!! WARNING. YOUR SETUP IS INCOMPLETE !!!'
echo you must manually add to auto start : $INIT_SCRIPT_SRC start echo you must manually add to auto start : $INIT_SCRIPT_SRC start
@ -772,7 +772,6 @@ deoffload_openwrt_firewall()
else else
echo system wide software flow offloading disabled. ok echo system wide software flow offloading disabled. ok
fi fi
} }

40
ipset/get_antifilter_domains.sh Normal file
View File

@ -0,0 +1,40 @@
#!/bin/sh
IPSET_DIR="$(dirname "$0")"
IPSET_DIR="$(cd "$IPSET_DIR"; pwd)"
. "$IPSET_DIR/def.sh"
TMPLIST="$TMPDIR/list.txt"
URL="https://antifilter.download/list/domains.lst"
dl()
{
# $1 - url
# $2 - file
# $3 - minsize
# $4 - maxsize
curl -L -H "Accept-Encoding: gzip" -k --fail --max-time 60 --connect-timeout 10 --retry 4 --max-filesize 251658240 -o "$TMPLIST" "$1" ||
{
echo list download failed : $1
exit 2
}
dlsize=$(LANG=C wc -c "$TMPLIST" | xargs | cut -f 1 -d ' ')
if test $dlsize -lt $3; then
echo list is too small : $dlsize bytes. can be bad.
exit 2
fi
zzcat "$TMPLIST" | tr -d '\015' | zz "$2"
rm -f "$TMPLIST"
}
# useful in case ipban set is used in custom scripts
FAIL=
getipban || FAIL=1
"$IPSET_DIR/create_ipset.sh"
[ -n "$FAIL" ] && exit
dl "$URL" "$ZHOSTLIST" 32768 4194304
exit 0