update 04-05 20:33

This commit is contained in:
github-actions[bot] 2022-04-05 20:33:29 +08:00
parent 57dbf9f84e
commit 150a4e1685
16 changed files with 556727 additions and 5917 deletions

View File

@ -18,7 +18,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-amlogic
PKG_VERSION:=3.1.75
PKG_VERSION:=3.1.76
PKG_RELEASE:=1
PKG_LICENSE:=GPL-2.0 License

View File

@ -69,6 +69,7 @@ BACKUP_LIST='./etc/AdGuardHome.yaml \
./etc/uhttpd.crt \
./etc/uhttpd.key \
./etc/urandom.seed \
./etc/v2raya/ \
./etc/verysync/ \
./root/.ssh/'

View File

@ -236,6 +236,7 @@ end
-- 刷新检测文件
function refresh_data()
local uci = luci.model.uci.cursor()
local set = luci.http.formvalue('set')
local icount = 0
@ -261,7 +262,8 @@ function refresh_data()
retstring = '-1'
end
elseif set == 'ip_data' then
refresh_cmd = "wget-ssl -O- 'https://ispip.clang.cn/all_cn.txt' > /tmp/china_ssr.txt 2>/dev/null"
local ip_data_url = uci:get("vssr","@socks5_proxy[0]","ip_data_url")
refresh_cmd = "wget-ssl -O- '" .. ip_data_url .. "' > /tmp/china_ssr.txt 2>/dev/null"
sret = luci.sys.call(refresh_cmd)
icount = luci.sys.exec('cat /tmp/china_ssr.txt | wc -l')
if sret == 0 and tonumber(icount) > 1000 then

View File

@ -74,6 +74,10 @@ o.rmempty = false
s = m:section(TypedSection, 'socks5_proxy', translate('Update Setting'))
s.anonymous = true
o = s:option(Value, 'ip_data_url', translate('China ip data URL'))
o.rmempty = true
o.description = translate('China ip data url. You are not recommended to change the value')
o = s:option(Button, 'gfw_data', translate('GFW List Data'))
o.rawhtml = true
o.template = 'vssr/refresh'

View File

@ -108,6 +108,7 @@ o:value('gfw', translate('GFW List Mode'))
o:value('router', translate('IP Route Mode'))
o:value('all', translate('Global Mode'))
o:value('oversea', translate('Oversea Mode'))
o:value('direct', translate('Direct Mode'))
o.default = 'router'
o = s:option(ListValue, 'dports', translate('Proxy Ports'))
o:value('1', translate('All Ports'))

View File

@ -241,6 +241,9 @@ msgstr "全局模式"
msgid "Oversea Mode"
msgstr "海外用户回国模式"
msgid "Direct Mode"
msgstr "直连模式"
msgid "Router Proxy"
msgstr "路由器访问控制"
@ -722,3 +725,9 @@ msgstr "↑ 在上面放置你需要分流的IP列表"
msgid "↑ Put your domain list here"
msgstr "↑ 在上面放置你需要分流的域名列表"
msgid "China ip data URL"
msgstr "【国内IP段】来源地址"
msgid "China ip data url. You are not recommended to change the value"
msgstr "中国大陆IP数据列表地址除非明白原理否则不建议修改"

View File

@ -12,6 +12,7 @@ config global
option switch_try_count '3'
option adblock '0'
option dports '1'
option ip_data_url 'https://ispip.clang.cn/all_cn_cidr.txt'
config socks5_proxy
option enable_server '0'

View File

@ -214,6 +214,7 @@ start_rules() {
router) gfwmode="-r" ;;
oversea) gfwmode="-c" ;;
all) gfwmode="-z" ;;
direct) gfwmode="-d" ;;
esac
local dports=$(uci_get_by_type global dports 1)
@ -583,7 +584,13 @@ start() {
rm -rf /tmp/dnsmasq.oversea
fi
mkdir -p /tmp/dnsmasq.d
if ! [ "$run_mode" = "oversea" ]; then
if [ "$run_mode" = "direct" ]; then
mkdir -p /tmp/dnsmasq.ssr
cp -rf /etc/vssr/ad.conf /tmp/dnsmasq.ssr/
cat >/tmp/dnsmasq.d/dnsmasq-ssr.conf <<EOF
conf-dir=/tmp/dnsmasq.ssr
EOF
elif ! [ "$run_mode" = "oversea" ]; then
mkdir -p /tmp/dnsmasq.ssr
cp -rf /etc/vssr/gfw_list.conf /tmp/dnsmasq.ssr/
cp -rf /etc/vssr/gfw_base.conf /tmp/dnsmasq.ssr/

File diff suppressed because it is too large Load Diff

View File

@ -69,6 +69,7 @@ flush_r() {
ipset -X oversea 2>/dev/null
ipset -X whitelist 2>/dev/null
ipset -X blacklist 2>/dev/null
ipset -X gfwlist 2>/dev/null
[ -n "$FWI" ] && echo '#!/bin/sh' >$FWI
return 0
}
@ -90,7 +91,7 @@ ipset_r() {
$IPT -A SS_SPEC_WAN_AC -m set --match-set china dst -j RETURN
$IPT -A SS_SPEC_WAN_AC -j SS_SPEC_WAN_FW
;;
gfw)
gfw|direct)
ipset -N gfwlist hash:net hashsize 4096 maxelem 1000000 2>/dev/null
$IPT -A SS_SPEC_WAN_AC -m set --match-set gfwlist dst -j SS_SPEC_WAN_FW
$IPT -A SS_SPEC_WAN_AC -m set --match-set gmlan src -m set ! --match-set china dst -j SS_SPEC_WAN_FW
@ -296,7 +297,7 @@ gen_include() {
return 0
}
while getopts ":s:l:S:L:i:e:a:b:w:p:G:D:oOuUfgrczh" arg; do
while getopts ":s:l:S:L:i:e:a:b:w:p:G:D:oOuUfgrczhd" arg; do
case "$arg" in
s)
server=$OPTARG
@ -358,6 +359,9 @@ while getopts ":s:l:S:L:i:e:a:b:w:p:G:D:oOuUfgrczh" arg; do
z)
RUNMODE=all
;;
d)
RUNMODE=direct
;;
f)
flush_r
exit 0

View File

@ -1,4 +1,4 @@
echo "create china hash:net family inet hashsize 1024 maxelem 65536" >/tmp/china.ipset
echo "create china hash:net family inet hashsize 4096 maxelem 1000000" >/tmp/china.ipset
awk '!/^$/&&!/^#/{printf("add china %s'" "'\n",$0)}' /etc/vssr/china_ssr.txt >>/tmp/china.ipset
ipset -! flush china
ipset -! restore </tmp/china.ipset 2>/dev/null

View File

@ -6,15 +6,16 @@ uci_get_by_type() {
echo ${ret:=$3}
}
v2ray_flow=$(uci_get_by_type global v2ray_flow)
run_mode=$(uci_get_by_type global run_mode)
mkdir -p /tmp/dnsmasq.ssr
awk '!/^$/&&!/^#/{printf("ipset=/.%s/'"gfwlist"'\n",$0)}' /etc/vssr/gfw.list >/tmp/dnsmasq.ssr/custom_forward.conf
awk '!/^$/&&!/^#/{printf("server=/.%s/'"127.0.0.1#5335"'\n",$0)}' /etc/vssr/gfw.list >>/tmp/dnsmasq.ssr/custom_forward.conf
if ! [ "$run_mode" = "direct" ]; then
awk '!/^$/&&!/^#/{printf("ipset=/.%s/'"gfwlist"'\n",$0)}' /etc/vssr/gfw.list >/tmp/dnsmasq.ssr/custom_forward.conf
awk '!/^$/&&!/^#/{printf("server=/.%s/'"127.0.0.1#5335"'\n",$0)}' /etc/vssr/gfw.list >>/tmp/dnsmasq.ssr/custom_forward.conf
fi
awk '!/^$/&&!/^#/{printf("ipset=/.%s/'"blacklist"'\n",$0)}' /etc/vssr/black.list >/tmp/dnsmasq.ssr/blacklist_forward.conf
awk '!/^$/&&!/^#/{printf("server=/.%s/'"127.0.0.1#5335"'\n",$0)}' /etc/vssr/black.list >>/tmp/dnsmasq.ssr/blacklist_forward.conf
awk '!/^$/&&!/^#/{printf("ipset=/.%s/'"whitelist"'\n",$0)}' /etc/vssr/white.list >/tmp/dnsmasq.ssr/whitelist_forward.conf
if [ "$v2ray_flow" = "1" ]; then

View File

@ -39,7 +39,8 @@ else
end
log('正在更新【国内IP段】数据库')
refresh_cmd ="wget-ssl -O- 'https://ispip.clang.cn/all_cn.txt' > /tmp/china_ssr.txt 2>/dev/null"
local ip_data_url = ucic:get("vssr","@socks5_proxy[0]","ip_data_url")
refresh_cmd ="wget-ssl -O- '".. ip_data_url .."' > /tmp/china_ssr.txt 2>/dev/null"
sret = luci.sys.call(refresh_cmd)
icount = luci.sys.exec('cat /tmp/china_ssr.txt | wc -l')
if sret == 0 then

View File

@ -5,7 +5,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=naiveproxy
PKG_VERSION:=99.0.4844.51-1
PKG_VERSION:=100.0.4896.60-1
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@ -58,31 +58,31 @@ ifneq ($(CONFIG_CCACHE),)
export naive_ccache_flags=cc_wrapper="$(CCACHE)"
endif
CLANG_VER:=14-init-12719-gc4b45eeb-3
CLANG_VER:=15-init-1995-g5bec1ea7-1
CLANG_FILE:=clang-llvmorg-$(CLANG_VER).tgz
define Download/CLANG
URL:=https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64
URL_FILE:=$(CLANG_FILE)
FILE:=$(CLANG_FILE)
HASH:=f691d2e11a83cd9beed85f6792d16b9688a2dbd7e57eb9b5b6d12565f44d403f
HASH:=c2ccf8e5136661eb7c25bb08ae6e78f7d667b03f0c16dabf2eb1a392b244bd5f
endef
GN_VER:=80a40b07305373617eba2d5878d353532af77da3
GN_VER:=859dde4a7f34a4383179522f8e1061dcffac8691
GN_FILE:=gn-git_revision-$(GN_VER).zip
define Download/GN_TOOL
URL:=https://chrome-infra-packages.appspot.com/dl/gn/gn/linux-amd64/+
URL_FILE:=git_revision:$(GN_VER)
FILE:=$(GN_FILE)
HASH:=46184d633a2b5e659572cbab7da2b66e82aa7642abe47290954b8e5e0d9c7443
HASH:=00691d4576ae52f809145ef6db5e3782e3eb63a80f04a7407168ce4b5ef83990
endef
PGO_VER:=4844-1645865283-f109af6d624d1eac542865359a5743a7256bac10
PGO_VER:=4896-1648230561-717dc24b4ffc1663d1990243de5d49fac8001b06
PGO_FILE:=chrome-linux-$(PGO_VER).profdata
define Download/PGO_PROF
URL:=https://storage.googleapis.com/chromium-optimization-profiles/pgo_profiles
URL_FILE:=$(PGO_FILE)
FILE:=$(PGO_FILE)
HASH:=1ab36777082237f59b2b1be2f66279cd58767539393059644c0ec2968373c619
HASH:=66fcba3f0ca6e97713ffd72c3937230ba63116ae64e9d520c960e368df6c954e
endef
define Build/Prepare

View File

@ -1,5 +1,5 @@
--- a/src/base/memory/tagging.cc
+++ b/src/base/memory/tagging.cc
--- a/src/base/allocator/partition_allocator/tagging.cc
+++ b/src/base/allocator/partition_allocator/tagging.cc
@@ -17,22 +17,25 @@
#define PR_GET_TAGGED_ADDR_CTRL 56
#define PR_TAGGED_ADDR_ENABLE (1UL << 0)

View File

@ -6,7 +6,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=shadowsocks-rust
PKG_VERSION:=1.14.1
PKG_VERSION:=1.14.3
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_HEADER:=shadowsocks-v$(PKG_VERSION)