diff --git a/UnblockNeteaseMusic/Makefile b/UnblockNeteaseMusic/Makefile index a4700d591..82cb4548d 100644 --- a/UnblockNeteaseMusic/Makefile +++ b/UnblockNeteaseMusic/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=UnblockNeteaseMusic PKG_BASE_VERSION:=0.27.0-rc.2 -PKG_RELEASE:=44 +PKG_RELEASE:=45 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/UnblockNeteaseMusic/server.git PKG_SOURCE_DATE:=2021-11-27 -PKG_SOURCE_VERSION:=fc76cd994f03f931b6b753fd08ceb976dfc57caf +PKG_SOURCE_VERSION:=1f77f625225c7a36e7c4924bd8e39c978c05c1f5 PKG_MIRROR_HASH:=skip PKG_VERSION:=$(PKG_BASE_VERSION)-$(PKG_SOURCE_DATE)-$(call version_abbrev,$(PKG_SOURCE_VERSION)) diff --git a/adguardhome/Makefile b/adguardhome/Makefile index c0404e199..e66556691 100644 --- a/adguardhome/Makefile +++ b/adguardhome/Makefile @@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adguardhome -PKG_VERSION:=0.107.0-b.15 +PKG_VERSION:=0.107.0-b.16 PKG_RELEASE:= PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=ed868fa46a8e2e0809d6b1c067e934b175bd03b4 +PKG_SOURCE_VERSION:=7ee8142b38603ec4e02b91762061b8778442d22d PKG_SOURCE_URL:=https://github.com/AdguardTeam/AdGuardHome PKG_MIRROR_HASH:=skip diff --git a/luci-app-ipsec-server/Makefile b/luci-app-ipsec-server/Makefile index 05767a4ae..75484a957 100644 --- a/luci-app-ipsec-server/Makefile +++ b/luci-app-ipsec-server/Makefile @@ -6,10 +6,10 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI support for IPSec VPN Server -LUCI_DEPENDS:=+strongswan +strongswan-minimal +strongswan-mod-xauth-generic +xl2tpd +LUCI_DEPENDS:=+strongswan +strongswan-minimal +strongswan-mod-kernel-libipsec +strongswan-mod-xauth-generic +xl2tpd LUCI_PKGARCH:=all -PKG_VERSION:=1 -PKG_RELEASE:=12-20210628 +PKG_VERSION:=20211215 +PKG_RELEASE:=1 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/luci-app-ipsec-server/root/etc/config/luci-app-ipsec-server b/luci-app-ipsec-server/root/etc/config/luci-app-ipsec-server index 4df1ec4c1..6d90a5d69 100644 --- a/luci-app-ipsec-server/root/etc/config/luci-app-ipsec-server +++ b/luci-app-ipsec-server/root/etc/config/luci-app-ipsec-server @@ -3,5 +3,5 @@ config service 'ipsec' option enabled '0' option secret 'ipsec' option clientip '192.168.100.10/24' - option clientdns '223.5.5.5' + diff --git a/luci-app-ipsec-server/root/etc/init.d/luci-app-ipsec-server b/luci-app-ipsec-server/root/etc/init.d/luci-app-ipsec-server index deecc1723..33d047bf6 100755 --- a/luci-app-ipsec-server/root/etc/init.d/luci-app-ipsec-server +++ b/luci-app-ipsec-server/root/etc/init.d/luci-app-ipsec-server @@ -72,9 +72,7 @@ start() { local vt_enabled=$(uci -q get $CONFIG.@service[0].enabled) [ "$vt_enabled" = 0 ] && return 1 - local vt_clientip=$(uci -q get $CONFIG.@service[0].clientip) - local vt_clientdns=$(uci -q get $CONFIG.@service[0].clientdns) - [ -z "$vt_clientdns" ] && local vt_clientdns="8.8.4.4" + local vt_gateway="${vt_clientip%.*}.1" local vt_secret=$(uci -q get $CONFIG.@service[0].secret) local vt_l2tp_enabled=$(uci -q get $CONFIG.@service[0].l2tp_enable) @@ -178,7 +176,7 @@ start() { leftsubnet=0.0.0.0/0 rightsubnet=${vt_clientip} rightsourceip=${vt_clientip} - rightdns=${vt_clientdns} + rightdns=${vt_gateway} ike=aes128-sha1-modp2048,aes128-sha1-modp1024,3des-sha1-modp1024,3des-sha1-modp1536 esp=aes128-sha1,3des-sha1 @@ -214,13 +212,46 @@ start() { /usr/lib/ipsec/starter --daemon charon --nofork > /dev/null 2>&1 & gen_include + + uci -q batch <<-EOF >/dev/null + set network.ipsec_server.ipaddr="${vt_clientip%.*}.1" + commit network + EOF + ifup ipsec_server > /dev/null 2>&1 } stop() { + ifdown ipsec_server > /dev/null 2>&1 sed -i '/l2tp-server/d' $CHAP_SECRETS 2>/dev/null top -bn1 | grep "$L2TP_PATH" | grep -v "grep" | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 rm -rf $L2TP_PATH ps -w | grep "/usr/lib/ipsec" | grep -v "grep" | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 ipt_rule del rm -rf /var/etc/ipsecvpn.include -} \ No newline at end of file +} + +gen_iface_and_firewall() { + uci -q batch <<-EOF >/dev/null + delete network.ipsec_server + set network.ipsec_server=interface + set network.ipsec_server.ifname="ipsec0" + set network.ipsec_server.device="ipsec0" + set network.ipsec_server.proto="static" + set network.ipsec_server.ipaddr="${vt_clientip%.*}.1" + set network.ipsec_server.netmask="255.255.255.0" + commit network + + delete firewall.ipsecserver + set firewall.ipsecserver=zone + set firewall.ipsecserver.name="ipsecserver" + set firewall.ipsecserver.input="ACCEPT" + set firewall.ipsecserver.forward="ACCEPT" + set firewall.ipsecserver.output="ACCEPT" + set firewall.ipsecserver.network="ipsec_server" + commit firewall + EOF +} + +if [ -z "$(uci -q get network.ipsec_server)" ] || [ -z "$(uci -q get firewall.ipsecserver)" ]; then + gen_iface_and_firewall +fi diff --git a/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua b/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua index 7812af156..8a9bb0188 100755 --- a/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua +++ b/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua @@ -441,7 +441,7 @@ local function check_filer(result) -- 检查是否存在过滤关键词 for i, v in pairs(filter_word) do - if result.alias:find(v) then + if tostring(result.alias):find(v) then filter_result = true end end @@ -449,7 +449,7 @@ local function check_filer(result) -- 检查是否打开了保留关键词检查,并且进行过滤 if check_save == true then for i, v in pairs(save_word) do - if result.alias:find(v) then + if tostring(result.alias):find(v) then save_result = false end end