From cf9699e1949460107cb7098bcacafdec646e42e5 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Sun, 3 Nov 2019 11:47:11 +0800 Subject: [PATCH 1/3] fixed r619ac update problem (#1973) * Update platform.sh fixed issue #1957 * Update platform.sh fixed issue #1957 --- target/linux/ipq40xx/base-files/lib/upgrade/platform.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh index e8c98bb8ca..990041c34a 100644 --- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh @@ -162,7 +162,9 @@ platform_do_upgrade() { 8dev,jalapeno) nand_do_upgrade "$ARGV" ;; - p2w,r619ac |\ + p2w,r619ac) + nand_do_upgrade "$1" + ;; asus,map-ac2200) CI_KERNPART="linux" nand_do_upgrade "$1" From 73a49f722545461de3296e5832377f8c33403f17 Mon Sep 17 00:00:00 2001 From: LGA1150 <9155358+LGA1150@users.noreply.github.com> Date: Sun, 3 Nov 2019 11:48:51 +0800 Subject: [PATCH 2/3] luci-app-ssr-plus: list update url (#1967) * luci-app-ssr-plus: update url * ipset-lists: update url --- package/lean/ipset-lists/tools/gen-china-routes.sh | 2 +- package/lean/ipset-lists/tools/gen-gfwlist.sh | 2 +- .../luci-app-ssr-plus/root/usr/share/shadowsocksr/update.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lean/ipset-lists/tools/gen-china-routes.sh b/package/lean/ipset-lists/tools/gen-china-routes.sh index 36fd9ee778..632ddcbdf3 100755 --- a/package/lean/ipset-lists/tools/gen-china-routes.sh +++ b/package/lean/ipset-lists/tools/gen-china-routes.sh @@ -6,7 +6,7 @@ china_routes_ipip() { - [ -f ipip.txt ] || wget -4 https://raw.githubusercontent.com/17mon/china_ip_list/master/china_ip_list.txt -O ipip.txt >&2 || exit 1 + [ -f ipip.txt ] || wget -4 https://cdn.jsdelivr.net/gh/17mon/china_ip_list/china_ip_list.txt -O ipip.txt >&2 || exit 1 cat ipip.txt | xargs netmask | awk '{print $1}' } diff --git a/package/lean/ipset-lists/tools/gen-gfwlist.sh b/package/lean/ipset-lists/tools/gen-gfwlist.sh index 483f6d8b3f..74db4205e6 100755 --- a/package/lean/ipset-lists/tools/gen-gfwlist.sh +++ b/package/lean/ipset-lists/tools/gen-gfwlist.sh @@ -3,7 +3,7 @@ generate_china_banned() { if [ ! -f gfwlist.txt ]; then - wget https://raw.githubusercontent.com/gfwlist/gfwlist/master/gfwlist.txt -O gfwlist.b64 >&2 + wget https://cdn.jsdelivr.net/gh/gfwlist/gfwlist/gfwlist.txt -O gfwlist.b64 >&2 cat gfwlist.b64 | base64 -d > gfwlist.txt rm -f gfwlist.b64 fi diff --git a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/update.sh b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/update.sh index 0ad565a448..d7fb68567f 100755 --- a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/update.sh +++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/update.sh @@ -13,7 +13,7 @@ fi /usr/share/shadowsocksr/chinaipset.sh -wget-ssl --no-check-certificate https://raw.githubusercontent.com/gfwlist/gfwlist/master/gfwlist.txt -O /tmp/gfw.b64 +wget-ssl --no-check-certificate https://cdn.jsdelivr.net/gh/gfwlist/gfwlist/gfwlist.txt -O /tmp/gfw.b64 /usr/bin/ssr-gfw if [ -s "/tmp/gfwnew.txt" ];then @@ -23,4 +23,4 @@ if [ -s "/tmp/gfwnew.txt" ];then fi fi -/etc/init.d/shadowsocksr restart \ No newline at end of file +/etc/init.d/shadowsocksr restart From bacb40fc71e0ad5a4dc5b888747d0c33470adc4f Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Sat, 2 Nov 2019 21:22:59 -0700 Subject: [PATCH 3/3] luci-app-ssr-plus: remove gfwlist form and adjust white/black list rules --- package/lean/luci-app-ssr-plus/Makefile | 2 +- .../luasrc/controller/shadowsocksr.lua | 23 +++++++++---------- .../luci-app-ssr-plus/root/usr/bin/ssr-rules | 7 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile index a4177e30ff..ea45e4c967 100644 --- a/package/lean/luci-app-ssr-plus/Makefile +++ b/package/lean/luci-app-ssr-plus/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ssr-plus PKG_VERSION:=1 -PKG_RELEASE:=123 +PKG_RELEASE:=125 PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray \ diff --git a/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua b/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua index 29a4551a23..7b1f76f98c 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua +++ b/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua @@ -9,20 +9,19 @@ function index() end - entry({"admin", "services", "shadowsocksr"},alias("admin", "services", "shadowsocksr", "client"),_("ShadowSocksR Plus+"), 10).dependent = true + entry({"admin", "services", "shadowsocksr"},alias("admin", "services", "shadowsocksr", "client"),_("ShadowSocksR Plus+"), 10).dependent = true - entry({"admin", "services", "shadowsocksr", "client"},cbi("shadowsocksr/client"),_("SSR Client"), 10).leaf = true + entry({"admin", "services", "shadowsocksr", "client"},cbi("shadowsocksr/client"),_("SSR Client"), 10).leaf = true - entry({"admin", "services", "shadowsocksr", "servers"}, arcombine(cbi("shadowsocksr/servers", { -autoapply=true}), cbi("shadowsocksr/client-config")),_("Severs Nodes"), 20).leaf = true + entry({"admin", "services", "shadowsocksr", "servers"}, arcombine(cbi("shadowsocksr/servers", {autoapply=true}), cbi("shadowsocksr/client-config")),_("Severs Nodes"), 20).leaf = true entry({"admin", "services", "shadowsocksr", "control"},cbi("shadowsocksr/control"),_("Access Control"), 30).leaf = true - entry({"admin", "services", "shadowsocksr", "list"},form("shadowsocksr/list"),_("GFW List"), 40).leaf = true + -- entry({"admin", "services", "shadowsocksr", "list"},form("shadowsocksr/list"),_("GFW List"), 40).leaf = true - entry({"admin", "services", "shadowsocksr", "advanced"},cbi("shadowsocksr/advanced"),_("Advanced Settings"), 50).leaf = true + entry({"admin", "services", "shadowsocksr", "advanced"},cbi("shadowsocksr/advanced"),_("Advanced Settings"), 50).leaf = true - if nixio.fs.access("/usr/bin/ssr-server") then + if nixio.fs.access("/usr/bin/ssr-server") then entry({"admin", "services", "shadowsocksr", "server"},arcombine(cbi("shadowsocksr/server"), cbi("shadowsocksr/server-config")),_("SSR Server"), 60).leaf = true end @@ -48,11 +47,11 @@ function act_status() end function act_ping() - local e={} - e.index=luci.http.formvalue("index") - e.ping=luci.sys.exec("ping -c 1 -W 1 %q 2>&1 | grep -o 'time=[0-9]*.[0-9]' | awk -F '=' '{print$2}'"%luci.http.formvalue("domain")) - luci.http.prepare_content("application/json") - luci.http.write_json(e) + local e={} + e.index=luci.http.formvalue("index") + e.ping=luci.sys.exec("ping -c 1 -W 1 %q 2>&1 | grep -o 'time=[0-9]*.[0-9]' | awk -F '=' '{print$2}'"%luci.http.formvalue("domain")) + luci.http.prepare_content("application/json") + luci.http.write_json(e) end function check_status() diff --git a/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules b/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules index c3f5330201..bad796dd18 100755 --- a/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules +++ b/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules @@ -81,7 +81,6 @@ ipset_r() { ipset -! -R <<-EOF || return 1 create ss_spec_wan_ac hash:net $(gen_iplist | sed -e "s/^/add ss_spec_wan_ac /") - $(for ip in $WAN_FW_IP; do echo "add ss_spec_wan_ac $ip nomatch"; done) EOF ipset -N gfwlist hash:net 2>/dev/null $IPT -N SS_SPEC_WAN_AC @@ -91,7 +90,6 @@ EOF elif [ "$RUNMODE" = "gfw" ] ;then ipset -N gfwlist hash:net 2>/dev/null - for ip in $WAN_FW_IP; do ipset -! add gfwlist $ip ; done $IPT -N SS_SPEC_WAN_AC $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 @@ -122,6 +120,9 @@ EOF $IPT -I SS_SPEC_WAN_AC -m set --match-set blacklist dst -j SS_SPEC_WAN_FW $IPT -I SS_SPEC_WAN_AC -m set --match-set whitelist dst -j RETURN + for ip in $WAN_BP_IP; do ipset -! add whitelist $ip; done + for ip in $WAN_FW_IP; do ipset -! add blacklist $ip; done + return $? } @@ -385,4 +386,4 @@ fi flush_r && fw_rule && ipset_r && ac_rule && tp_rule && gen_include [ "$?" = 0 ] || loger 3 "Start failed!" -exit $? +exit $? \ No newline at end of file