diff --git a/package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/argon/sysauth.htm b/package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/argon/sysauth.htm index f526fb8d2e..f4ec24ab2e 100644 --- a/package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/argon/sysauth.htm +++ b/package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/argon/sysauth.htm @@ -65,7 +65,7 @@ local currentBg = {} local bgs = {} local theme_dir = media .. "/background/" - local bing_background = fs.access('/etc/config/argon') and uci:get_first('argon', 'global', 'bing_background') or 0 + local bing_background = fs.access('/etc/config/argon') and uci:get_first('argon', 'global', 'bing_background') or "0" bgs,bgcount=fetchMedia("/www" .. theme_dir .. "*") %>
diff --git a/package/lean/UnblockNeteaseMusic-Go/Makefile b/package/lean/UnblockNeteaseMusic-Go/Makefile index 38209e2c66..4d097aca0e 100644 --- a/package/lean/UnblockNeteaseMusic-Go/Makefile +++ b/package/lean/UnblockNeteaseMusic-Go/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=UnblockNeteaseMusic-Go -PKG_VERSION:=0.2.7 -PKG_RELEASE:=2 +PKG_VERSION:=0.2.9 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GHCODELOAD/cnsilvan/UnblockNeteaseMusic/tar.gz/$(PKG_VERSION)? -PKG_HASH:=779a45272ee1d88674caaf792883c6f47619f37ec202082d38d15e090a7a2db9 +PKG_HASH:=9d352a0080c33e75e39586c531f9b3b88eea1d8a9d49c9e95c19d6a7d29f1419 PKG_LICENSE:=GPL-3.0 PKG_LICENSE_FILE:=LICENSE diff --git a/package/lean/luci-app-n2n_v2/Makefile b/package/lean/luci-app-n2n_v2/Makefile index 5ce0746511..9f06c75267 100644 --- a/package/lean/luci-app-n2n_v2/Makefile +++ b/package/lean/luci-app-n2n_v2/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=n2n_v2 VPN Configuration module LUCI_DEPENDS:=+n2n-edge +n2n-supernode LUCI_PKGARCH:=all -PKG_VERSION:=2.8.0 +PKG_VERSION:=2.8.1 PKG_RELEASE:=2 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-n2n_v2/luasrc/model/cbi/n2n_v2.lua b/package/lean/luci-app-n2n_v2/luasrc/model/cbi/n2n_v2.lua index 22ee684346..c9085ffcc0 100644 --- a/package/lean/luci-app-n2n_v2/luasrc/model/cbi/n2n_v2.lua +++ b/package/lean/luci-app-n2n_v2/luasrc/model/cbi/n2n_v2.lua @@ -5,21 +5,6 @@ local fs = require "nixio.fs" function get_mask(v) - v:value("1 ", "128.0.0.0(1)") - v:value("2 ", "192.0.0.0(2)") - v:value("3 ", "224.0.0.0(3)") - v:value("4 ", "240.0.0.0(4)") - v:value("5 ", "248.0.0.0(5)") - v:value("6 ", "252.0.0.0(6)") - v:value("7 ", "254.0.0.0(7)") - v:value("8 ", "255.0.0.0(8)") - v:value("9 ", "255.128.0.0(9)") - v:value("10", "255.192.0.0(10)") - v:value("11", "255.224.0.0(11)") - v:value("12", "255.240.0.0(12)") - v:value("13", "255.248.0.0(13)") - v:value("14", "255.252.0.0(14)") - v:value("15", "255.254.0.0(15)") v:value("16", "255.255.0.0(16)") v:value("17", "255.255.128.0(17)") v:value("18", "255.255.192.0(18)") @@ -35,8 +20,6 @@ function get_mask(v) v:value("28", "255.255.255.240(28)") v:value("29", "255.255.255.248(29)") v:value("30", "255.255.255.252(30)") - v:value("31", "255.255.255.254(31)") - v:value("32", "255.255.255.255(32)") end m = Map("n2n_v2", translate("N2N v2 VPN"), translatef( @@ -131,4 +114,8 @@ o.optional = false o.datatype = "ip4addr" o.rmempty = false +---- Description +o = s:option(Value, "desc", translate("Description")) +o.optional = false + return m diff --git a/package/lean/luci-app-n2n_v2/po/zh-cn/n2n_v2.po b/package/lean/luci-app-n2n_v2/po/zh-cn/n2n_v2.po index c5d5a637c2..d4f5508fef 100644 --- a/package/lean/luci-app-n2n_v2/po/zh-cn/n2n_v2.po +++ b/package/lean/luci-app-n2n_v2/po/zh-cn/n2n_v2.po @@ -72,4 +72,7 @@ msgid "Mask" msgstr "掩码" msgid "Gateway" -msgstr "网关" \ No newline at end of file +msgstr "网关" + +msgid "Description" +msgstr "描述" diff --git a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr index 4140f06c46..7cefa6b24b 100755 --- a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr +++ b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr @@ -340,8 +340,8 @@ start_udp() { ss | ssr) gen_config_file $UDP_RELAY_SERVER $type 2 $tmp_udp_port ss_program="$(first_type ${type}local ${type}-redir)" - [ "$(printf '%s' "$ss_program" | awk -F '/' '{print $NF}')" = "${type}local" ] && \ - ss_extra_arg="--protocol redir -u" || ss_extra_arg="-U" + [ "$(printf '%s' "$ss_program" | awk -F '/' '{print $NF}')" = "${type}local" ] && + local ss_extra_arg="--protocol redir -u" || local ss_extra_arg="-U" ln_start_bin $ss_program ${type}-redir -c $udp_config_file $ss_extra_arg echolog "UDP TPROXY Relay:$(get_name $type) Started!" ;; @@ -384,7 +384,7 @@ start_shunt() { ss | ssr) gen_config_file $SHUNT_SERVER $type 3 $tmp_shunt_port ss_program="$(first_type ${type}local ${type}-redir)" - [ "$(printf '%s' "$ss_program" | awk -F '/' '{print $NF}')" = "${type}local" ] && ss_extra_arg="--protocol redir" + [ "$(printf '%s' "$ss_program" | awk -F '/' '{print $NF}')" = "${type}local" ] && local ss_extra_arg="--protocol redir" ln_start_bin $ss_program ${type}-redir -c $shunt_config_file $ss_extra_arg if [ -n "$tmp_local_port" ]; then local tmp_port=$tmp_local_port @@ -471,8 +471,8 @@ start_local() { ss | ssr) gen_config_file $LOCAL_SERVER $type 4 $local_port ss_program="$(first_type ${type}local ${type}-local)" - [ "$(printf '%s' "$ss_program" | awk -F '/' '{print $NF}')" = "${type}local" ] && \ - ss_extra_arg="-U" || ss_extra_arg="-u" + [ "$(printf '%s' "$ss_program" | awk -F '/' '{print $NF}')" = "${type}local" ] && + local ss_extra_arg="-U" || local ss_extra_arg="-u" ln_start_bin $ss_program ${type}-local -c $local_config_file $ss_extra_arg echolog "Global_Socks5:$(get_name $type) Started!" ;; @@ -534,8 +534,11 @@ Start_Run() { ss | ssr) gen_config_file $GLOBAL_SERVER $type 1 $tcp_port ss_program="$(first_type ${type}local ${type}-redir)" - [ "$(printf '%s' "$ss_program" | awk -F '/' '{print $NF}')" = "${type}local" ] && \ - { ss_extra_arg="--protocol redir"; case ${ARG_OTA} in '-u') ARG_OTA='-U';; '-U') ARG_OTA='-u';; esac; } + [ "$(printf '%s' "$ss_program" | awk -F '/' '{print $NF}')" = "${type}local" ] && + { + local ss_extra_arg="--protocol redir" + case ${ARG_OTA} in '-u') ARG_OTA='-U' ;; esac + } for i in $(seq 1 $threads); do ln_start_bin "$ss_program" ${type}-redir -c $tcp_config_file $ARG_OTA $ss_extra_arg done diff --git a/package/lean/luci-app-unblockmusic/Makefile b/package/lean/luci-app-unblockmusic/Makefile index 9ae5e44279..0a176e29d5 100644 --- a/package/lean/luci-app-unblockmusic/Makefile +++ b/package/lean/luci-app-unblockmusic/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-unblockmusic PKG_VERSION:=2.3.5 -PKG_RELEASE:=10 +PKG_RELEASE:=11 PKG_CONFIG_DEPENDS := \ CONFIG_UnblockNeteaseMusic_Go \ diff --git a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua index 6d77bba41a..3a04a03627 100644 --- a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua +++ b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua @@ -1,7 +1,7 @@ local fs = require "nixio.fs" mp = Map("unblockmusic", translate("解锁网易云灰色歌曲")) -mp.description = translate("采用 [QQ/虾米/百度/酷狗/酷我/咪咕/JOOX]等音源，替换网易云变灰歌曲链接") +mp.description = translate("采用 [QQ/百度/酷狗/酷我/咪咕/JOOX]等音源，替换网易云变灰歌曲链接") mp:section(SimpleSection).template = "unblockmusic/unblockmusic_status" @@ -27,7 +27,6 @@ speedtype = s:option(Value, "musicapptype", translate("音源选择")) speedtype:value("default", translate("默认")) speedtype:value("netease", translate("网易云音乐")) speedtype:value("qq", translate("QQ音乐")) -speedtype:value("xiami", translate("虾米音乐")) speedtype:value("baidu", translate("百度音乐")) speedtype:value("kugou", translate("酷狗音乐")) speedtype:value("kuwo", translate("酷我音乐")) diff --git a/package/lean/n2n_v2/files/n2n_v2.init b/package/lean/n2n_v2/files/n2n_v2.init index 31b0fce59a..c1d7fa8a5f 100755 --- a/package/lean/n2n_v2/files/n2n_v2.init +++ b/package/lean/n2n_v2/files/n2n_v2.init @@ -29,6 +29,10 @@ start_instance() { eval "$(ipcalc.sh "$ipaddr/$prefix")" netmask="$NETMASK" /usr/bin/edge -u 0 -g 0 -d $tunname -a ${mode}:${address} -s $netmask -c $community $([ -n "$key" ] && echo -k $key) -l ${supernode}:${port} $args $mtu + sleep 1 + iptables -I FORWARD -i "$tunname" -j ACCEPT + iptables -I FORWARD -o "$tunname" -j ACCEPT + iptables -t nat -I POSTROUTING -o "$tunname" -j MASQUERADE ;; supernode) config_get_bool enabled "$cfg" 'enabled' '0' @@ -54,6 +58,10 @@ stop_instance() { case "$type" in edge) + config_get tunname "$cfg" 'tunname' + iptables -D FORWARD -i "$tunname" -j ACCEPT 2>/dev/null + iptables -D FORWARD -o "$tunname" -j ACCEPT 2>/dev/null + iptables -t nat -D POSTROUTING -o "$tunname" -j MASQUERADE 2>/dev/null killall -9 edge ;; supernode) @@ -72,6 +80,6 @@ start() { stop() { config_load 'n2n_v2' - killall -9 edge + config_foreach stop_instance 'edge' ps | grep supernode | grep -v grep 2>&1 >/dev/null && killall -9 supernode } diff --git a/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/link_add_node.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/link_add_node.htm index ec47ae025a..69f9688df0 100644 --- a/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/link_add_node.htm +++ b/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/link_add_node.htm @@ -5,16 +5,16 @@ local api = require "luci.model.cbi.passwall.api.api" @@ -83,11 +83,11 @@ local api = require "luci.model.cbi.passwall.api.api" function add_node() { var nodes_link = document.getElementById("nodes_link").value; if (nodes_link.trim() != "") { - if (nodes_link.indexOf("ss://") == 0 || nodes_link.indexOf("ssr://") == 0 || nodes_link.indexOf("vmess://") == 0 || nodes_link.indexOf("trojan://") == 0 || nodes_link.indexOf("trojan-go://") == 0) { + if (nodes_link.indexOf("ss://") == 0 || nodes_link.indexOf("ssr://") == 0 || nodes_link.indexOf("vmess://") == 0 || nodes_link.indexOf("vless://") == 0 || nodes_link.indexOf("trojan://") == 0 || nodes_link.indexOf("trojan-go://") == 0) { ajax_add_node(nodes_link); } else { - alert("<%:Please enter the correct link, ss:// ssr:// vmess:// trojan://%>"); + alert("<%:Please enter the correct link, ss:// ssr:// vmess:// vless:// trojan://%>"); } } else { @@ -114,16 +114,16 @@ local api = require "luci.model.cbi.passwall.api.api"