From 088f3949960e82eb59af9ce4302428beea0039ad Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sun, 16 Feb 2020 20:03:31 +0800 Subject: [PATCH] Merge Lean's source --- package/lean/ddns-scripts_aliyun/Makefile | 4 ++-- .../ddns-scripts_aliyun/update_aliyun_com.sh | 2 +- package/lean/ddns-scripts_dnspod/Makefile | 4 ++-- .../ddns-scripts_dnspod/update_dnspod_cn.sh | 2 +- .../ddns-scripts_dnspod/update_dnspod_com.sh | 2 +- .../root/usr/share/shadowsocksr/subscribe.lua | 24 +++++++++---------- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/package/lean/ddns-scripts_aliyun/Makefile b/package/lean/ddns-scripts_aliyun/Makefile index db13f949a7..c6c92b0ca9 100644 --- a/package/lean/ddns-scripts_aliyun/Makefile +++ b/package/lean/ddns-scripts_aliyun/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ddns-scripts_aliyun -PKG_VERSION:=1.0.0 -PKG_RELEASE:=2 +PKG_VERSION:=1.0.3 +PKG_RELEASE:=1 PKG_LICENSE:=GPLv2 PKG_MAINTAINER:=Sense diff --git a/package/lean/ddns-scripts_aliyun/update_aliyun_com.sh b/package/lean/ddns-scripts_aliyun/update_aliyun_com.sh index a80cf29edf..ff763fca92 100755 --- a/package/lean/ddns-scripts_aliyun/update_aliyun_com.sh +++ b/package/lean/ddns-scripts_aliyun/update_aliyun_com.sh @@ -41,7 +41,7 @@ __DOMAIN="${domain#*@}" # 构造基本通信命令 build_command() { - __CMDBASE="$WGET_SSL -nv -t 1 -O $DATFILE -o $ERRFILE" + __CMDBASE="$WGET_SSL --no-hsts -nv -t 1 -O $DATFILE -o $ERRFILE" # 绑定用于通信的主机/IP if [ -n "$bind_network" ]; then local bind_ip run_prog diff --git a/package/lean/ddns-scripts_dnspod/Makefile b/package/lean/ddns-scripts_dnspod/Makefile index db94d661fd..630643b2cb 100644 --- a/package/lean/ddns-scripts_dnspod/Makefile +++ b/package/lean/ddns-scripts_dnspod/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ddns-scripts_dnspod -PKG_VERSION:=1.0.1 -PKG_RELEASE:=2 +PKG_VERSION:=1.0.2 +PKG_RELEASE:=1 PKG_LICENSE:=GPLv2 PKG_MAINTAINER:=Small_5 diff --git a/package/lean/ddns-scripts_dnspod/update_dnspod_cn.sh b/package/lean/ddns-scripts_dnspod/update_dnspod_cn.sh index 9438d4b601..493536527a 100644 --- a/package/lean/ddns-scripts_dnspod/update_dnspod_cn.sh +++ b/package/lean/ddns-scripts_dnspod/update_dnspod_cn.sh @@ -23,7 +23,7 @@ __DOMAIN="${domain#*@}" # 构造基本通信命令 build_command() { - __CMDBASE="$WGET_SSL -nv -t 1 -O $DATFILE -o $ERRFILE" + __CMDBASE="$WGET_SSL --no-hsts -nv -t 1 -O $DATFILE -o $ERRFILE" # 绑定用于通信的主机/IP if [ -n "$bind_network" ]; then local bind_ip run_prog diff --git a/package/lean/ddns-scripts_dnspod/update_dnspod_com.sh b/package/lean/ddns-scripts_dnspod/update_dnspod_com.sh index be71d6356c..ece86d8a61 100644 --- a/package/lean/ddns-scripts_dnspod/update_dnspod_com.sh +++ b/package/lean/ddns-scripts_dnspod/update_dnspod_com.sh @@ -23,7 +23,7 @@ __DOMAIN="${domain#*@}" # 构造基本通信命令 build_command() { - __CMDBASE="$WGET_SSL -nv -t 1 -O $DATFILE -o $ERRFILE" + __CMDBASE="$WGET_SSL --no-hsts -nv -t 1 -O $DATFILE -o $ERRFILE" # 绑定用于通信的主机/IP if [ -n "$bind_network" ]; then local bind_ip run_prog diff --git a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua index 96ca3dd5ff..5661de3b6a 100644 --- a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua +++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua @@ -31,7 +31,7 @@ local function split(full, sep) full = full:gsub("%z", "") -- 这里不是很清楚 有时候结尾带个\0 local off, result = 1, {} while true do - local nEnd = full:find(sep, off) + local nStart, nEnd = full:find(sep, off) if not nEnd then local res = ssub(full, off, slen(full)) if #res > 0 then -- 过滤掉 \0 @@ -39,8 +39,8 @@ local function split(full, sep) end break else - tinsert(result, ssub(full, off, nEnd - 1)) - off = nEnd + slen(sep) + tinsert(result, ssub(full, off, nStart - 1)) + off = nEnd + 1 end end return result @@ -106,7 +106,7 @@ local function processData(szType, content) kcp_param = '--nocomp' } if szType == 'ssr' then - local dat = split(content, "/\\?") + local dat = split(content, "/%?") local hostInfo = split(dat[1], ':') result.server = hostInfo[1] result.server_port = hostInfo[2] @@ -119,7 +119,7 @@ local function processData(szType, content) local t = split(v, '=') params[t[1]] = t[2] end - result.obfs_param = base64Decode(params.bfsparam) + result.obfs_param = base64Decode(params.obfsparam) result.protocol_param = base64Decode(params.protoparam) local group = base64Decode(params.group) if group then @@ -189,22 +189,22 @@ local function processData(szType, content) result.alias = UrlDecode(alias) result.type = "ss" result.server = host[1] - if host[2]:find("/\\?") then - local query = split(host[2], "/\\?") + if host[2]:find("/%?") then + local query = split(host[2], "/%?") result.server_port = query[1] local params = {} for _, v in pairs(split(query[2], '&')) do local t = split(v, '=') params[t[1]] = t[2] end - if params.lugin then - local plugin_info = UrlDecode(params.lugin) + if params.plugin then + local plugin_info = UrlDecode(params.plugin) local idx_pn = plugin_info:find(";") if idx_pn then - result.plugin = plugin_info:sub(1, idx_pn - 1) - result.plugin_opts = plugin_info:sub(idx_pn + 1, #plugin_info) + result.plugin = plugin_info:sub(1, idx_pn - 1) + result.plugin_opts = plugin_info:sub(idx_pn + 1, #plugin_info) else - result.plugin = plugin_info + result.plugin = plugin_info end end else