Merge Mainline
This commit is contained in:
CN_SZTL
commit
1ff12a0a42
70
package/ctcgfw/yq/Makefile
Normal file
70
package/ctcgfw/yq/Makefile
Normal file
@ -0,0 +1,70 @@
|
||||
# Copyright (C) 2020 [CTCGFW] Project OpenWrt
|
||||
#
|
||||
# This is a free software, use it under GNU General Public License v3.0.
|
||||
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=yq
|
||||
PKG_VERSION:=3.4.1
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/mikefarah/yq/tar.gz/$(PKG_VERSION)?
|
||||
PKG_HASH:=73259f808d589d11ea7a18e4cd38a2e98b518a6c2c178d1ec57d9c5942277cb1
|
||||
|
||||
PKG_MAINTAINER:=CN_SZTL <cnsztl@project-openwrt.eu.org>
|
||||
PKG_LICENSE:=MIT
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
PKG_BUILD_DEPENDS:=golang/host
|
||||
PKG_BUILD_PARALLEL:=1
|
||||
|
||||
PKG_CONFIG_DEPENDS:= \
|
||||
CONFIG_YQ_COMPRESS_GOPROXY \
|
||||
CONFIG_YQ_COMPRESS_UPX
|
||||
|
||||
GO_PKG:=github.com/mikefarah/yq
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
|
||||
|
||||
define Package/yq
|
||||
SECTION:=utils
|
||||
CATEGORY:=Utilities
|
||||
TITLE:=yq is a portable command-line YAML processor
|
||||
URL:=https://mikefarah.gitbook.io/yq/
|
||||
DEPENDS:=$(GO_ARCH_DEPENDS)
|
||||
endef
|
||||
|
||||
define Package/yq/description
|
||||
The aim of the project is to be the jq or sed of yaml files.
|
||||
endef
|
||||
|
||||
define Package/yq/config
|
||||
config YQ_COMPRESS_GOPROXY
|
||||
bool "Compiling with GOPROXY proxy"
|
||||
default n
|
||||
|
||||
config YQ_COMPRESS_UPX
|
||||
bool "Compress executable files with UPX"
|
||||
default y
|
||||
endef
|
||||
|
||||
ifeq ($(CONFIG_YQ_COMPRESS_GOPROXY),y)
|
||||
export GO111MODULE=on
|
||||
export GOPROXY=https://goproxy.io
|
||||
endif
|
||||
|
||||
define Build/Compile
|
||||
$(call GoPackage/Build/Compile)
|
||||
ifeq ($(CONFIG_YQ_COMPRESS_UPX),y)
|
||||
$(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/yq
|
||||
endif
|
||||
endef
|
||||
|
||||
define Package/yq/install
|
||||
$(INSTALL_DIR) $(1)/usr/bin/
|
||||
$(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/yq $(1)/usr/bin/
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,yq))
|
||||
@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk
|
||||
include $(INCLUDE_DIR)/kernel.mk
|
||||
|
||||
PKG_NAME:=exfat
|
||||
PKG_VERSION:=5.8.7
|
||||
PKG_VERSION:=5.10.1
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/namjaejeon/linux-exfat-oot/tar.gz/$(PKG_VERSION)?
|
||||
PKG_HASH:=20254677bed3f456e89cc9d757c1a47abbadab4d75640eef4a995370a37be3f4
|
||||
PKG_HASH:=0ff77dd7d39eb231d00c3c4909b9fad31ebeeb618bd6fa18fce142becc9c1f98
|
||||
|
||||
PKG_MAINTAINER:=
|
||||
PKG_LICENSE:=GPL-2.0-only
|
||||
|
||||
@ -8,5 +8,5 @@
|
||||
[0;1;30;90m│[0m [0;1;34;94m#[0m [0;37m│[0m
|
||||
[0;1;34;94m│[0m [0;1;34;94m"[0m [0;1;34;94m│[0m
|
||||
[0;1;34;94m│───────────────[0;34m────────────────[0;37m────────────────[0;1;34;94m──│[0m
|
||||
[0;1;34;94m│[0m [0;1;34;94mOpenWrt[0m [0;1;34;94m18.06[0m [0;1;34;94mby[0m [0;1;34;94mLean[0m [0;37m|[0m [0;1;34;94mMod [0;1;34;94m20.10[0m [0;1;34;94mBy[0m [0;1;34;94mCTCGFW[0m [0;1;34;94m│[0m
|
||||
[0;1;34;94m│[0m [0;1;34;94mOpenWrt[0m [0;1;34;94m18.06[0m [0;1;34;94mby[0m [0;1;34;94mLean[0m [0;37m|[0m [0;1;34;94mMod [0;1;34;94m20.11[0m [0;1;34;94mBy[0m [0;1;34;94mCTCGFW[0m [0;1;34;94m│[0m
|
||||
[0;1;34;94m└───────[0;34m────────────────[0;37m────────────────[0;1;30;90m───────[0;1;34;94m───┘[0m
|
||||
|
||||
@ -42,14 +42,14 @@ sed -i '/set wireless.radio${devidx}.disabled/d' /lib/wifi/mac80211.sh
|
||||
|
||||
# NEVER DROP THE EXISTING AUTHORS INFO | 禁止删除现有作者信息
|
||||
sed -i '/DISTRIB_REVISION/d' /etc/openwrt_release
|
||||
echo "DISTRIB_REVISION='| Mod20.10 by CTCGFW'" >> /etc/openwrt_release
|
||||
echo "DISTRIB_REVISION='| Mod 20.11 by CTCGFW'" >> /etc/openwrt_release
|
||||
sed -i '/DISTRIB_DESCRIPTION/d' /etc/openwrt_release
|
||||
echo "DISTRIB_DESCRIPTION='OpenWrt 18.06 by Lean '" >> /etc/openwrt_release
|
||||
|
||||
# NEVER DROP THE EXISTING AUTHORS INFO | 禁止删除现有作者信息
|
||||
sed -i 's/LuCI openwrt-18.06 branch/LuCI 18.06 by Lean/g' /usr/lib/lua/luci/version.lua
|
||||
sed -i '/luciversion/d' /usr/lib/lua/luci/version.lua
|
||||
echo 'luciversion = "Mod20.10 by CTCGFW"' >> /usr/lib/lua/luci/version.lua
|
||||
echo 'luciversion = "Mod 20.11 by CTCGFW"' >> /usr/lib/lua/luci/version.lua
|
||||
|
||||
sed -i '/log-facility/d' /etc/dnsmasq.conf
|
||||
echo "log-facility=/dev/null" >> /etc/dnsmasq.conf
|
||||
|
||||
@ -1,11 +1,16 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=luci-app-ssr-plus
|
||||
PKG_VERSION:=180
|
||||
PKG_RELEASE:=10
|
||||
PKG_VERSION:=181
|
||||
PKG_RELEASE:=1
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
define Package/$(PKG_NAME)/conffiles
|
||||
/etc/config/shadowsocksr
|
||||
/etc/ssr/
|
||||
endef
|
||||
|
||||
define Package/$(PKG_NAME)/config
|
||||
config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_plugin
|
||||
bool "Include Shadowsocks V2ray Plugin"
|
||||
|
||||
@ -56,9 +56,10 @@ o:depends("adblock", "1")
|
||||
o.description = translate("Support AdGuardHome and DNSMASQ format list")
|
||||
|
||||
o = s:option(Value, "gfwlist_url", translate("gfwlist Update url"))
|
||||
o:value("https://cdn.jsdelivr.net/gh/v2fly/domain-list-community@release/gfwlist.txt", translate("v2fly/domain-list-community"))
|
||||
o:value("https://cdn.jsdelivr.net/gh/Loukky/gfwlist-by-loukky/gfwlist.txt", translate("Loukky/gfwlist-by-loukky"))
|
||||
o:value("https://cdn.jsdelivr.net/gh/gfwlist/gfwlist/gfwlist.txt", translate("gfwlist/gfwlist"))
|
||||
o.default = "https://cdn.jsdelivr.net/gh/gfwlist/gfwlist/gfwlist.txt"
|
||||
o.default = "https://cdn.jsdelivr.net/gh/v2fly/domain-list-community@release/gfwlist.txt"
|
||||
|
||||
o = s:option(Value, "chnroute_url", translate("Chnroute Update url"))
|
||||
o:value("https://ispip.clang.cn/all_cn.txt", translate("Clang.CN"))
|
||||
|
||||
@ -380,6 +380,10 @@ o:depends("transport", "kcp")
|
||||
o.default = 2
|
||||
o.rmempty = true
|
||||
|
||||
o = s:option(Value, "seed", translate("Obfuscate password (optional)"))
|
||||
o:depends("transport", "kcp")
|
||||
o.rmempty = true
|
||||
|
||||
o = s:option(Flag, "congestion", translate("Congestion"))
|
||||
o:depends("transport", "kcp")
|
||||
o.rmempty = true
|
||||
|
||||
@ -101,6 +101,7 @@ o:value("114.114.115.115:53", translate("Oversea Mode DNS-2 (114.114.115.115)"))
|
||||
o:depends("pdnsd_enable", "1")
|
||||
o:depends("pdnsd_enable", "2")
|
||||
o.description = translate("Custom DNS Server format as IP:PORT (default: 8.8.4.4:53)")
|
||||
o.default = "8.8.4.4:53"
|
||||
|
||||
return m
|
||||
|
||||
|
||||
@ -24,6 +24,7 @@ o:value("0", translate("Disable"))
|
||||
o:value("w", translate("Allow listed only"))
|
||||
o:value("b", translate("Allow all except listed"))
|
||||
o.rmempty = false
|
||||
o.default = "0"
|
||||
|
||||
o = s:taboption("lan_ac", DynamicList, "lan_ac_ips", translate("LAN Host List"))
|
||||
o.datatype = "ipaddr"
|
||||
|
||||
@ -54,6 +54,7 @@ sec.anonymous = true
|
||||
|
||||
o = sec:option(Flag, "enable_server", translate("Enable Server"))
|
||||
o.rmempty = false
|
||||
o.default = "0"
|
||||
|
||||
-- [[ Server Setting ]]--
|
||||
sec = m:section(TypedSection, "server_config", translate("Server Setting"))
|
||||
|
||||
@ -20,6 +20,7 @@ s.anonymous = true
|
||||
o = s:option(Flag, "auto_update", translate("Auto Update"))
|
||||
o.rmempty = false
|
||||
o.description = translate("Auto Update Server subscription, GFW list and CHN route")
|
||||
o.default = "1"
|
||||
|
||||
|
||||
o = s:option(ListValue, "auto_update_time", translate("Update time (every day)"))
|
||||
@ -35,6 +36,7 @@ o.rmempty = true
|
||||
o = s:option(Value, "filter_words", translate("Subscribe Filter Words"))
|
||||
o.rmempty = true
|
||||
o.description = translate("Filter Words splited by /")
|
||||
o.default = "过期时间/剩余流量/QQ群/官网/防失联地址/回国"
|
||||
|
||||
o = s:option(Button,"update_Sub",translate("Update Subscribe List"))
|
||||
o.inputstyle = "reload"
|
||||
@ -51,6 +53,7 @@ o.default="1"
|
||||
o = s:option(Flag, "proxy", translate("Through proxy update"))
|
||||
o.rmempty = false
|
||||
o.description = translate("Through proxy update list, Not Recommended ")
|
||||
o.default="0"
|
||||
|
||||
|
||||
o = s:option(Button,"subscribe", translate("Update All Subscribe Severs"))
|
||||
|
||||
@ -684,3 +684,6 @@ msgstr "警告！请不要重复使用端口！"
|
||||
|
||||
msgid "Deny Domain List"
|
||||
msgstr "禁止连接的域名"
|
||||
|
||||
msgid "Obfuscate password (optional)"
|
||||
msgstr "混淆密码（可选）"
|
||||
|
||||
@ -1,23 +1,22 @@
|
||||
|
||||
config global
|
||||
option tunnel_forward '8.8.4.4:53'
|
||||
option tunnel_address '0.0.0.0'
|
||||
option global_server 'nil'
|
||||
option netflix_server 'nil'
|
||||
option netflix_proxy '0'
|
||||
option threads '0'
|
||||
option run_mode 'router'
|
||||
option dports '2'
|
||||
option pdnsd_enable '1'
|
||||
option tunnel_forward '8.8.4.4:53'
|
||||
option monitor_enable '1'
|
||||
option enable_switch '1'
|
||||
option switch_timeout '5'
|
||||
option switch_time '667'
|
||||
option switch_timeout '5'
|
||||
option switch_try_count '3'
|
||||
option gfwlist_url 'https://cdn.jsdelivr.net/gh/Loukky/gfwlist-by-loukky/gfwlist.txt'
|
||||
option gfwlist_url 'https://cdn.jsdelivr.net/gh/v2fly/domain-list-community@release/gfwlist.txt'
|
||||
option chnroute_url 'https://ispip.clang.cn/all_cn.txt'
|
||||
option nfip_url 'https://cdn.jsdelivr.net/gh/QiuSimons/Netflix_IP/getflix.txt'
|
||||
option adblock_url 'https://anti-ad.net/anti-ad-for-dnsmasq.conf'
|
||||
option threads '0'
|
||||
option global_server 'disable'
|
||||
option netflix_server 'nil'
|
||||
option netflix_proxy '0'
|
||||
|
||||
config access_control
|
||||
option lan_ac_mode '0'
|
||||
@ -28,16 +27,15 @@ config access_control
|
||||
list wan_fw_ips '91.108.56.0/22'
|
||||
list wan_fw_ips '109.239.140.0/24'
|
||||
|
||||
config socks5_proxy
|
||||
option socks '0'
|
||||
option local_port '1080'
|
||||
option local_address '0.0.0.0'
|
||||
|
||||
config server_global
|
||||
option enable_server '0'
|
||||
|
||||
config server_subscribe
|
||||
option proxy '0'
|
||||
option auto_update_time '2'
|
||||
option auto_update '1'
|
||||
option filter_words '过期时间/剩余流量/QQ群/官网/防失联地址/回国'
|
||||
|
||||
config socks5_proxy
|
||||
option socks '0'
|
||||
option local_port '1080'
|
||||
|
||||
config server_global
|
||||
option enable_server '0'
|
||||
|
||||
@ -187,11 +187,11 @@ gen_config_file() {
|
||||
EOF
|
||||
;;
|
||||
v2ray | vless)
|
||||
lua /usr/share/shadowsocksr/gen${type}config.lua $GLOBAL_SERVER tcp $(uci_get_by_name $1 local_port) >/var/etc/v2-ssr-retcp.json
|
||||
lua /usr/share/shadowsocksr/gen${type}config.lua $GLOBAL_SERVER tcp $3 >/var/etc/v2-ssr-retcp.json
|
||||
sed -i 's/\\//g' /var/etc/v2-ssr-retcp.json
|
||||
;;
|
||||
trojan)
|
||||
lua /usr/share/shadowsocksr/gentrojanconfig.lua $GLOBAL_SERVER nat $(uci_get_by_name $1 local_port) >/var/etc/trojan-ssr-retcp.json
|
||||
lua /usr/share/shadowsocksr/gentrojanconfig.lua $GLOBAL_SERVER nat $3 >/var/etc/trojan-ssr-retcp.json
|
||||
sed -i 's/\\//g' /var/etc/trojan-ssr-retcp.json
|
||||
;;
|
||||
naiveproxy)
|
||||
@ -398,6 +398,7 @@ start_redir_udp() {
|
||||
redir_udp=1
|
||||
local type=$(uci_get_by_name $UDP_RELAY_SERVER type)
|
||||
local bin=$(find_bin $type)
|
||||
local udp_port=1357
|
||||
[ ! -f "$bin" ] && echo "$(date "+%Y-%m-%d %H:%M:%S") UDP TPROXY Relay:Can't find $bin program, can't start!" >>/tmp/ssrplus.log && redir_udp=0 && return 1
|
||||
case "$type" in
|
||||
ss | ssr)
|
||||
@ -407,13 +408,13 @@ start_redir_udp() {
|
||||
esac
|
||||
local name="Shadowsocks"
|
||||
[ "$type" == "ssr" ] && name="ShadowsocksR"
|
||||
gen_config_file $UDP_RELAY_SERVER 1 $(uci_get_by_name $UDP_RELAY_SERVER local_port 1234)
|
||||
gen_config_file $UDP_RELAY_SERVER 1 $udp_port
|
||||
last_config_file=$CONFIG_UDP_FILE
|
||||
$bin -c $last_config_file $ARG_OTA -U -f /var/run/ssr-reudp.pid >/dev/null 2>&1
|
||||
echo "$(date "+%Y-%m-%d %H:%M:%S") UDP TPROXY Relay:$name Started!" >>/tmp/ssrplus.log
|
||||
;;
|
||||
v2ray | vless)
|
||||
lua /usr/share/shadowsocksr/gen${type}config.lua $UDP_RELAY_SERVER udp $(uci_get_by_name $UDP_RELAY_SERVER local_port) >/var/etc/v2-ssr-reudp.json
|
||||
lua /usr/share/shadowsocksr/gen${type}config.lua $UDP_RELAY_SERVER udp $udp_port >/var/etc/v2-ssr-reudp.json
|
||||
sed -i 's/\\//g' /var/etc/v2-ssr-reudp.json
|
||||
$bin -config /var/etc/v2-ssr-reudp.json >/dev/null 2>&1 &
|
||||
echo "$(date "+%Y-%m-%d %H:%M:%S") UDP TPROXY Relay:$($bin -version | head -1) Started!" >>/tmp/ssrplus.log
|
||||
@ -422,7 +423,7 @@ start_redir_udp() {
|
||||
lua /usr/share/shadowsocksr/gentrojanconfig.lua $GLOBAL_SERVER client 10801 >/var/etc/trojan-ssr-reudp.json
|
||||
sed -i 's/\\//g' /var/etc/trojan-ssr-reudp.json
|
||||
$bin --config /var/etc/trojan-ssr-reudp.json >/dev/null 2>&1 &
|
||||
ipt2socks -U -b 0.0.0.0 -4 -s 127.0.0.1 -p 10801 -l $(uci_get_by_name $UDP_RELAY_SERVER local_port) >/dev/null 2>&1 &
|
||||
ipt2socks -U -b 0.0.0.0 -4 -s 127.0.0.1 -p 10801 -l $udp_port >/dev/null 2>&1 &
|
||||
echo "$(date "+%Y-%m-%d %H:%M:%S") UDP TPROXY Relay:$($bin --version 2>&1 | head -1) Started!" >>/tmp/ssrplus.log
|
||||
;;
|
||||
naiveproxy)
|
||||
@ -430,7 +431,7 @@ start_redir_udp() {
|
||||
echo "$(date "+%Y-%m-%d %H:%M:%S") $($bin --version | head -1) UDP TPROXY Relay not supported!" >>/tmp/ssrplus.log
|
||||
;;
|
||||
socks5)
|
||||
/usr/share/shadowsocksr/genred2config.sh "/var/etc/redsocks-ssr-reudp.conf" socks5 udp $(uci_get_by_name $UDP_RELAY_SERVER local_port) \
|
||||
/usr/share/shadowsocksr/genred2config.sh "/var/etc/redsocks-ssr-reudp.conf" socks5 udp $udp_port \
|
||||
$(get_host_ip $(uci_get_by_name $UDP_RELAY_SERVER server)) $(uci_get_by_name $UDP_RELAY_SERVER server_port) \
|
||||
$(uci_get_by_name $UDP_RELAY_SERVER auth_enable 0) $(uci_get_by_name $UDP_RELAY_SERVER username) $(uci_get_by_name $UDP_RELAY_SERVER password)
|
||||
$bin -c /var/etc/redsocks-ssr-reudp.conf >/dev/null 2>&1
|
||||
@ -635,16 +636,21 @@ start_rules() {
|
||||
kcp_server=$server
|
||||
kcp_flag=1
|
||||
fi
|
||||
local local_port=$(uci_get_by_name $GLOBAL_SERVER local_port)
|
||||
local local_port=$(uci_get_by_name $GLOBAL_SERVER local_port 1234)
|
||||
local lan_ac_ips=$(uci_get_by_type access_control lan_ac_ips)
|
||||
local lan_ac_mode=$(uci_get_by_type access_control lan_ac_mode)
|
||||
local router_proxy=$(uci_get_by_type access_control router_proxy)
|
||||
if [ "$GLOBAL_SERVER" == "$UDP_RELAY_SERVER" -a "$kcp_flag" == "0" ]; then
|
||||
ARG_UDP="-u"
|
||||
elif [ -n "$UDP_RELAY_SERVER" ]; then
|
||||
ARG_UDP="-U"
|
||||
local udp_server=$(uci_get_by_name $UDP_RELAY_SERVER server)
|
||||
local udp_local_port=$(uci_get_by_name $UDP_RELAY_SERVER local_port)
|
||||
local ARG_UDP=""
|
||||
if [ -n "$UDP_RELAY_SERVER" ]; then
|
||||
if [ "$kcp_flag" == "0" ]; then
|
||||
local type=$(uci_get_by_name $UDP_RELAY_SERVER type)
|
||||
case "$type" in
|
||||
tun | naiveproxy) ;;
|
||||
*) ARG_UDP="-U";;
|
||||
esac
|
||||
local udp_server=$(uci_get_by_name $UDP_RELAY_SERVER server)
|
||||
local udp_local_port=1357
|
||||
fi
|
||||
fi
|
||||
if [ -n "$lan_ac_ips" ]; then
|
||||
case "$lan_ac_mode" in
|
||||
@ -665,14 +671,14 @@ start_rules() {
|
||||
else
|
||||
proxyport="-m multiport --dports 22,53,587,465,995,993,143,80,443,853"
|
||||
fi
|
||||
if [ "$NETFLIX_SERVER" != "nil" ]; then
|
||||
if [ "$NETFLIX_SERVER" == "nil" ]; then
|
||||
netflix="0"
|
||||
else
|
||||
if [ "$NETFLIX_SERVER" != "$GLOBAL_SERVER" ]; then
|
||||
netflix="1"
|
||||
else
|
||||
netflix="2"
|
||||
fi
|
||||
else
|
||||
netflix="0"
|
||||
fi
|
||||
get_arg_out() {
|
||||
case "$(uci_get_by_type access_control router_proxy 1)" in
|
||||
|
||||
0
package/lean/luci-app-ssr-plus/root/etc/ssr/ad.conf
Normal file
0
package/lean/luci-app-ssr-plus/root/etc/ssr/ad.conf
Normal file
@ -264,6 +264,7 @@
|
||||
42.242.0.0/15
|
||||
42.244.0.0/14
|
||||
42.248.0.0/13
|
||||
43.128.0.0/10
|
||||
43.224.12.0/22
|
||||
43.224.24.0/22
|
||||
43.224.44.0/22
|
||||
@ -953,7 +954,6 @@
|
||||
43.251.232.0/22
|
||||
43.251.236.0/22
|
||||
43.251.244.0/22
|
||||
43.252.40.0/22
|
||||
43.252.48.0/22
|
||||
43.252.56.0/22
|
||||
43.252.224.0/22
|
||||
@ -1112,7 +1112,6 @@
|
||||
45.120.164.0/22
|
||||
45.120.220.0/22
|
||||
45.120.240.0/22
|
||||
45.121.20.0/22
|
||||
45.121.52.0/22
|
||||
45.121.64.0/22
|
||||
45.121.68.0/22
|
||||
@ -1223,7 +1222,6 @@
|
||||
45.125.16.0/22
|
||||
45.125.24.0/22
|
||||
45.125.28.0/22
|
||||
45.125.32.0/22
|
||||
45.125.44.0/22
|
||||
45.125.52.0/22
|
||||
45.125.56.0/22
|
||||
@ -1249,7 +1247,6 @@
|
||||
45.127.12.0/22
|
||||
45.127.96.0/22
|
||||
45.127.116.0/22
|
||||
45.127.124.0/22
|
||||
45.127.128.0/22
|
||||
45.127.144.0/22
|
||||
45.127.148.0/22
|
||||
@ -1289,7 +1286,6 @@
|
||||
45.249.36.0/22
|
||||
45.249.92.0/22
|
||||
45.249.112.0/22
|
||||
45.249.180.0/22
|
||||
45.249.188.0/22
|
||||
45.249.192.0/22
|
||||
45.249.196.0/22
|
||||
@ -1471,8 +1467,6 @@
|
||||
45.253.236.0/22
|
||||
45.253.240.0/22
|
||||
45.253.244.0/22
|
||||
45.253.248.0/22
|
||||
45.253.252.0/22
|
||||
45.254.0.0/22
|
||||
45.254.4.0/22
|
||||
45.254.8.0/22
|
||||
@ -1784,7 +1778,9 @@
|
||||
61.29.128.0/18
|
||||
61.29.192.0/19
|
||||
61.29.224.0/20
|
||||
61.29.240.0/20
|
||||
61.29.240.0/21
|
||||
61.29.248.0/22
|
||||
61.29.254.0/23
|
||||
61.45.128.0/18
|
||||
61.45.224.0/20
|
||||
61.47.128.0/18
|
||||
@ -3774,7 +3770,6 @@
|
||||
103.119.224.0/22
|
||||
103.120.52.0/22
|
||||
103.120.72.0/22
|
||||
103.120.76.0/24
|
||||
103.120.88.0/22
|
||||
103.120.96.0/22
|
||||
103.120.100.0/22
|
||||
@ -3915,7 +3910,6 @@
|
||||
103.141.58.0/23
|
||||
103.141.128.0/23
|
||||
103.141.186.0/23
|
||||
103.141.190.0/23
|
||||
103.141.242.0/23
|
||||
103.142.0.0/23
|
||||
103.142.28.0/23
|
||||
@ -4081,6 +4075,32 @@
|
||||
103.155.16.0/23
|
||||
103.155.34.0/23
|
||||
103.155.48.0/23
|
||||
103.155.76.0/23
|
||||
103.155.100.0/23
|
||||
103.155.110.0/23
|
||||
103.155.120.0/23
|
||||
103.155.214.0/23
|
||||
103.155.248.0/23
|
||||
103.156.24.0/23
|
||||
103.156.28.0/23
|
||||
103.156.68.0/23
|
||||
103.156.78.0/23
|
||||
103.156.104.0/23
|
||||
103.156.158.0/23
|
||||
103.156.166.0/23
|
||||
103.156.174.0/23
|
||||
103.156.186.0/23
|
||||
103.156.228.0/23
|
||||
103.157.30.0/23
|
||||
103.157.138.0/23
|
||||
103.157.174.0/23
|
||||
103.157.212.0/23
|
||||
103.157.234.0/23
|
||||
103.157.254.0/23
|
||||
103.158.0.0/23
|
||||
103.158.8.0/23
|
||||
103.158.13.0/24
|
||||
103.158.16.0/23
|
||||
103.192.0.0/22
|
||||
103.192.4.0/22
|
||||
103.192.8.0/22
|
||||
@ -4117,7 +4137,6 @@
|
||||
103.193.124.0/22
|
||||
103.193.140.0/22
|
||||
103.193.144.0/22
|
||||
103.193.148.0/22
|
||||
103.193.160.0/22
|
||||
103.193.188.0/22
|
||||
103.193.192.0/22
|
||||
@ -4136,8 +4155,6 @@
|
||||
103.195.148.0/22
|
||||
103.195.152.0/22
|
||||
103.195.160.0/22
|
||||
103.195.192.0/22
|
||||
103.196.60.0/22
|
||||
103.196.64.0/22
|
||||
103.196.72.0/22
|
||||
103.196.88.0/22
|
||||
@ -4549,7 +4566,6 @@
|
||||
103.218.84.0/22
|
||||
103.218.88.0/22
|
||||
103.218.92.0/22
|
||||
103.218.184.0/22
|
||||
103.218.192.0/22
|
||||
103.218.196.0/22
|
||||
103.218.200.0/22
|
||||
@ -4797,7 +4813,6 @@
|
||||
103.227.212.0/22
|
||||
103.227.228.0/22
|
||||
103.228.12.0/22
|
||||
103.228.28.0/22
|
||||
103.228.88.0/22
|
||||
103.228.128.0/22
|
||||
103.228.136.0/22
|
||||
@ -5088,7 +5103,6 @@
|
||||
103.251.160.0/22
|
||||
103.251.192.0/22
|
||||
103.251.204.0/22
|
||||
103.251.236.0/22
|
||||
103.251.240.0/22
|
||||
103.252.28.0/22
|
||||
103.252.36.0/22
|
||||
@ -5300,7 +5314,6 @@
|
||||
113.208.128.0/17
|
||||
113.209.0.0/16
|
||||
113.212.0.0/18
|
||||
113.212.64.0/22
|
||||
113.212.88.0/22
|
||||
113.212.100.0/22
|
||||
113.212.184.0/21
|
||||
@ -5328,7 +5341,8 @@
|
||||
114.111.160.0/19
|
||||
114.112.0.0/14
|
||||
114.116.0.0/16
|
||||
114.117.0.0/16
|
||||
114.117.0.0/17
|
||||
114.117.128.0/17
|
||||
114.118.0.0/16
|
||||
114.119.0.0/17
|
||||
114.119.192.0/21
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
57
package/lean/luci-app-ssr-plus/root/etc/uci-defaults/luci-ssr-plus
Executable file → Normal file
57
package/lean/luci-app-ssr-plus/root/etc/uci-defaults/luci-ssr-plus
Executable file → Normal file
@ -11,21 +11,58 @@ set firewall.shadowsocksr.path=/var/etc/shadowsocksr.include
|
||||
set firewall.shadowsocksr.reload=1
|
||||
commit firewall
|
||||
EOF
|
||||
rm -rf /etc/config/shadowsocksr-opkg /etc/ssr/*opkg
|
||||
touch /etc/ssr/china_ssr.txt
|
||||
touch /etc/ssr/deny.list
|
||||
touch /etc/ssr/white.list
|
||||
touch /etc/ssr/black.list
|
||||
touch /etc/ssr/netflix.list
|
||||
touch /etc/ssr/netflixip.list
|
||||
touch /etc/ssr/ad.conf
|
||||
touch /etc/ssr/gfw_base.conf
|
||||
touch /etc/ssr/gfw_list.conf
|
||||
touch /etc/ssr/deny.list
|
||||
#chmod 0755 /etc/init.d/shadowsocksr /usr/bin/ssr-* /usr/share/shadowsocksr/*.sh
|
||||
#chmod 0644 /etc/ssr/* \
|
||||
#/usr/share/shadowsocksr/*.lua \
|
||||
#/usr/share/rpcd/acl.d/luci-app-ssr-plus.json \
|
||||
#/usr/lib/lua/luci/controller/shadowsocksr.lua \
|
||||
#/usr/lib/lua/luci/model/cbi/shadowsocksr/*.lua \
|
||||
#/usr/lib/lua/luci/view/shadowsocksr/*.htm
|
||||
#chmod 0600 /etc/config/shadowsocksr
|
||||
touch /etc/ssr/oversea_list.conf
|
||||
touch /etc/ssr/ad.conf
|
||||
touch /etc/config/shadowsocksr
|
||||
if [ ! -s "/etc/config/shadowsocksr" ] ; then
|
||||
uci -q batch <<-EOF >/dev/null
|
||||
add shadowsocksr global
|
||||
set shadowsocksr.@global[0].global_server='nil'
|
||||
set shadowsocksr.@global[0].netflix_server='nil'
|
||||
set shadowsocksr.@global[0].netflix_proxy='0'
|
||||
set shadowsocksr.@global[0].threads='0'
|
||||
set shadowsocksr.@global[0].run_mode='router'
|
||||
set shadowsocksr.@global[0].dports='2'
|
||||
set shadowsocksr.@global[0].pdnsd_enable='1'
|
||||
set shadowsocksr.@global[0].tunnel_forward='8.8.4.4:53'
|
||||
set shadowsocksr.@global[0].monitor_enable='1'
|
||||
set shadowsocksr.@global[0].enable_switch='1'
|
||||
set shadowsocksr.@global[0].switch_time='667'
|
||||
set shadowsocksr.@global[0].switch_timeout='5'
|
||||
set shadowsocksr.@global[0].switch_try_count='3'
|
||||
set shadowsocksr.@global[0].gfwlist_url='https://cdn.jsdelivr.net/gh/v2fly/domain-list-community@release/gfwlist.txt'
|
||||
set shadowsocksr.@global[0].chnroute_url='https://ispip.clang.cn/all_cn.txt'
|
||||
set shadowsocksr.@global[0].nfip_url='https://cdn.jsdelivr.net/gh/QiuSimons/Netflix_IP/getflix.txt'
|
||||
set shadowsocksr.@global[0].adblock_url='https://anti-ad.net/anti-ad-for-dnsmasq.conf'
|
||||
add shadowsocksr server_subscribe
|
||||
set shadowsocksr.@server_subscribe[0].proxy='0'
|
||||
set shadowsocksr.@server_subscribe[0].auto_update_time='2'
|
||||
set shadowsocksr.@server_subscribe[0].auto_update='1'
|
||||
set shadowsocksr.@server_subscribe[0].filter_words='过期时间/剩余流量/QQ群/官网/防失联地址/回国'
|
||||
add shadowsocksr access_control
|
||||
set shadowsocksr.@access_control[0].lan_ac_mode='0'
|
||||
set shadowsocksr.@access_control[0].router_proxy='1'
|
||||
add_list shadowsocksr.@access_control[0].wan_fw_ips=149.154.160.0/20
|
||||
add_list shadowsocksr.@access_control[0].wan_fw_ips=67.198.55.0/24
|
||||
add_list shadowsocksr.@access_control[0].wan_fw_ips=91.108.4.0/22
|
||||
add_list shadowsocksr.@access_control[0].wan_fw_ips=91.108.56.0/22
|
||||
add_list shadowsocksr.@access_control[0].wan_fw_ips=109.239.140.0/24
|
||||
add shadowsocksr socks5_proxy
|
||||
set shadowsocksr.@socks5_proxy[0].server='nil'
|
||||
set shadowsocksr.@socks5_proxy[0].local_port='1080'
|
||||
add shadowsocksr server_global
|
||||
set shadowsocksr.@server_global[0].enable_server='0'
|
||||
commit shadowsocksr
|
||||
EOF
|
||||
fi
|
||||
rm -rf /tmp/luci-modulecache /tmp/luci-indexcache
|
||||
exit 0
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
/etc/config/shadowsocksr
|
||||
/etc/ssr/china_ssr.txt
|
||||
/etc/ssr/white.list
|
||||
/etc/ssr/black.list
|
||||
/etc/ssr/netflix.list
|
||||
/etc/ssr/netflixip.list
|
||||
/etc/ssr/gfw_list.conf
|
||||
/etc/ssr/ad.conf
|
||||
/etc/ssr/deny.list
|
||||
@ -183,7 +183,7 @@ ac_rule() {
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
IFNAME=$(uci get -P/var/state network.lan.ifname 2>/dev/null)
|
||||
IFNAME=$(uci -P /var/state get network.lan.ifname 2>/dev/null)
|
||||
ipset -! -R <<-EOF || return 1
|
||||
create ss_spec_lan_ac hash:net
|
||||
$(for ip in ${LAN_AC_IP:1}; do echo "add ss_spec_lan_ac $ip"; done)
|
||||
|
||||
@ -78,7 +78,8 @@ outbound = {
|
||||
writeBufferSize = tonumber(server.write_buffer_size),
|
||||
header = {
|
||||
type = server.kcp_guise
|
||||
}
|
||||
},
|
||||
seed = server.seed or nil
|
||||
} or nil,
|
||||
wsSettings = (server.transport == "ws") and (server.ws_path ~= nil or server.ws_host ~= nil) and {
|
||||
path = server.ws_path,
|
||||
|
||||
@ -89,7 +89,8 @@ outbound = {
|
||||
writeBufferSize = tonumber(server.write_buffer_size),
|
||||
header = {
|
||||
type = server.kcp_guise
|
||||
}
|
||||
},
|
||||
seed = server.seed or nil
|
||||
} or nil,
|
||||
wsSettings = (server.transport == "ws") and (server.ws_path ~= nil or server.ws_host ~= nil) and {
|
||||
path = server.ws_path,
|
||||
|
||||
@ -40,7 +40,7 @@ local function update(url, file, type, file2)
|
||||
end
|
||||
|
||||
log("正在更新【GFW列表】数据库")
|
||||
update(uci:get_first("shadowsocksr", "global", "gfwlist_url", "https://cdn.jsdelivr.net/gh/gfwlist/gfwlist/gfwlist.txt"), "/etc/ssr/gfw_list.conf", "gfw_data", "/tmp/dnsmasq.ssr/gfw_list.conf")
|
||||
update(uci:get_first("shadowsocksr", "global", "gfwlist_url", "https://cdn.jsdelivr.net/gh/v2fly/domain-list-community@release/gfwlist.txt"), "/etc/ssr/gfw_list.conf", "gfw_data", "/tmp/dnsmasq.ssr/gfw_list.conf")
|
||||
log("正在更新【国内IP段】数据库")
|
||||
update(uci:get_first("shadowsocksr", "global", "chnroute_url","https://ispip.clang.cn/all_cn.txt"), "/etc/ssr/china_ssr.txt", "cnip")
|
||||
if uci:get_first("shadowsocksr", "global", "adblock","0") == "1" then
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=v2ray
|
||||
PKG_VERSION:=4.31.3
|
||||
PKG_RELEASE:=2
|
||||
PKG_VERSION:=4.32.1
|
||||
PKG_RELEASE:=1
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/v2ray-core-$(PKG_VERSION)
|
||||
|
||||
PKG_SOURCE:=v2ray-core-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)?
|
||||
PKG_HASH:=fcd974e20714c8a84b15c9a457caaf1c6698d53386c1515ebddca3594f35d356
|
||||
PKG_HASH:=f5553ffd04ff226573e8132d9beaa63f4d8f4882eba047225b33620848bc6917
|
||||
|
||||
PKG_LICENSE:=MIT
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
@ -28,7 +28,7 @@ DEFAULT_PACKAGES += \
|
||||
kmod-sound-core kmod-sound-arm-bcm2835 \
|
||||
kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 \
|
||||
partx-utils mkf2fs e2fsprogs \
|
||||
htop autocore-arm
|
||||
htop autocore-arm openssh-sftp-server
|
||||
|
||||
KERNELNAME:=Image dtbs
|
||||
|
||||
|
||||
@ -27,6 +27,7 @@ KERNELNAME:=zImage dtbs
|
||||
DEFAULT_PACKAGES += swconfig nvram \
|
||||
osafeloader oseama otrx \
|
||||
kmod-gpio-button-hotplug \
|
||||
kmod-leds-gpio kmod-ledtrig-default-on kmod-ledtrig-timer
|
||||
kmod-leds-gpio kmod-ledtrig-default-on kmod-ledtrig-timer \
|
||||
autocore-arm openssh-sftp-server
|
||||
|
||||
$(eval $(call BuildTarget))
|
||||
|
||||
@ -20,6 +20,6 @@ DEFAULT_PACKAGES += \
|
||||
kmod-usb3 kmod-usb-dwc3 ath10k-firmware-qca4019 \
|
||||
autocore-arm automount autosamba luci-app-ipsec-vpnd v2ray shadowsocks-libev-ss-redir shadowsocksr-libev-server \
|
||||
luci-app-unblockmusic luci-app-cpufreq luci-app-zerotier ca-certificates \
|
||||
htop fdisk e2fsprogs ethtool
|
||||
htop fdisk e2fsprogs ethtool openssh-sftp-server
|
||||
|
||||
$(eval $(call BuildTarget))
|
||||
|
||||
@ -23,6 +23,7 @@ DEFAULT_PACKAGES += \
|
||||
kmod-phy-qcom-ipq806x-usb kmod-usb3 kmod-usb-dwc3-qcom \
|
||||
kmod-ath10k-ct wpad-openssl uboot-envtools e2fsprogs \
|
||||
automount autosamba v2ray shadowsocks-libev-ss-redir shadowsocksr-libev-server \
|
||||
luci-app-ipsec-vpnd luci-app-unblockmusic luci-app-zerotier ca-certificates
|
||||
luci-app-ipsec-vpnd luci-app-unblockmusic luci-app-zerotier ca-certificates \
|
||||
autocore-arm openssh-sftp-server
|
||||
|
||||
$(eval $(call BuildTarget))
|
||||
|
||||
@ -19,7 +19,7 @@ include $(INCLUDE_DIR)/target.mk
|
||||
|
||||
DEFAULT_PACKAGES += uboot-envtools partx-utils e2fsprogs mkf2fs kmod-gpio-button-hotplug \
|
||||
automount autocore-arm fdisk e2fsprogs ethtool haveged htop lm-sensors \
|
||||
luci-app-zerotier
|
||||
openssh-sftp-server luci-app-zerotier
|
||||
|
||||
KERNELNAME:=Image dtbs
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/target.mk
|
||||
|
||||
DEFAULT_PACKAGES += partx-utils mkf2fs fdisk e2fsprogs wpad kmod-usb-hid kmod-ath5k kmod-ath9k kmod-ath9k-htc kmod-ath10k \
|
||||
kmod-rt2800-usb kmod-e1000e kmod-igb kmod-igbvf kmod-ixgbe kmod-pcnet32 kmod-tulip kmod-vmxnet3 kmod-i40e kmod-iavf kmod-r8125 kmod-r8168 kmod-8139cp kmod-8139too kmod-fs-f2fs \
|
||||
htop lm-sensors autocore-x86 automount autosamba luci-app-ipsec-vpnd luci-proto-bonding luci-app-xlnetacc luci-app-unblockmusic luci-app-zerotier \
|
||||
htop lm-sensors autocore-x86 automount autosamba luci-app-ipsec-vpnd luci-proto-bonding luci-app-xlnetacc luci-app-unblockmusic luci-app-zerotier openssh-sftp-server \
|
||||
ath10k-firmware-qca988x ath10k-firmware-qca9888 ath10k-firmware-qca9984 brcmfmac-firmware-43602a1-pcie ca-certificates ddns-scripts_aliyun ddns-scripts_dnspod \
|
||||
kmod-sound-hda-core kmod-sound-hda-codec-realtek kmod-sound-hda-codec-via kmod-sound-via82xx kmod-sound-hda-intel kmod-sound-hda-codec-hdmi kmod-sound-i8x0 kmod-usb-audio \
|
||||
kmod-usb-net kmod-usb-net-asix kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8150 kmod-usb-net-rtl8152 kmod-mlx4-core kmod-mlx5-core
|
||||
|
||||
Loading…
Reference in New Issue
Block a user