From 2d1f5bfcd6d9716aca50f32fea9514b8ec9216b8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 5 Feb 2023 13:20:10 +0800 Subject: [PATCH] update 2023-02-05 13:20:10 --- alist/Makefile | 4 ++-- luci-app-xray/Makefile | 2 +- .../etc/hotplug.d/iface/01-transparent-proxy-ipset.fw4 | 6 ++---- luci-app-xray/root/etc/init.d/xray | 2 +- luci-app-xray/root/usr/share/xray/init.fw4 | 4 ++-- luci-app-xray/root/www/luci-static/resources/view/xray.js | 8 +++++++- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/alist/Makefile b/alist/Makefile index 897dc7b6c..d022c9f7f 100644 --- a/alist/Makefile +++ b/alist/Makefile @@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alist -PKG_VERSION:=3.9.2 +PKG_VERSION:=3.10.1 PKG_WEB_VERSION:=3.9.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/alist-org/alist/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=0e102eea65f6d3b0d247c6c73c97a3ae7d04c71ba9962d3897e04dca8877cf3e +PKG_HASH:=66e77f8e35af6904361a0199dc4b7c3c7cb8b6864d687a793441b3204df53358 PKG_LICENSE:=GPL-3.0 PKG_LICENSE_FILE:=LICENSE diff --git a/luci-app-xray/Makefile b/luci-app-xray/Makefile index dc6770de6..b723b6f2e 100644 --- a/luci-app-xray/Makefile +++ b/luci-app-xray/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-xray -PKG_VERSION:=1.26.1 +PKG_VERSION:=1.26.2 PKG_RELEASE:=1 PKG_LICENSE:=MPLv2 diff --git a/luci-app-xray/root/etc/hotplug.d/iface/01-transparent-proxy-ipset.fw4 b/luci-app-xray/root/etc/hotplug.d/iface/01-transparent-proxy-ipset.fw4 index 47d70d416..c4ec2fb84 100644 --- a/luci-app-xray/root/etc/hotplug.d/iface/01-transparent-proxy-ipset.fw4 +++ b/luci-app-xray/root/etc/hotplug.d/iface/01-transparent-proxy-ipset.fw4 @@ -2,14 +2,12 @@ if [ ! -s /usr/share/xray/ignore_tp_spec_def_gw ] ; then DEFAULT_GATEWAY=$(ip route get 1.1.1.1 | grep -Eoe "src (\d+.\d+.\d+.\d+)" | awk '{print $NF}') if [ -n "$DEFAULT_GATEWAY" ] ; then - logger -st transparent-proxy-ipset[$$] -p6 "default gateway available at $DEFAULT_GATEWAY" nft -f - <<-EOF - add set inet fw4 tp_spec_def_gw { type ipv4_addr; } flush set inet fw4 tp_spec_def_gw add element inet fw4 tp_spec_def_gw { $DEFAULT_GATEWAY } EOF - - else + logger -st transparent-proxy-ipset[$$] -p6 "default gateway available at $DEFAULT_GATEWAY" + else logger -st transparent-proxy-ipset[$$] -p6 "default gateway not available, please wait for interface ready" fi fi diff --git a/luci-app-xray/root/etc/init.d/xray b/luci-app-xray/root/etc/init.d/xray index e4375c341..6a4f2a409 100644 --- a/luci-app-xray/root/etc/init.d/xray +++ b/luci-app-xray/root/etc/init.d/xray @@ -8,7 +8,7 @@ NAME=xray source /usr/share/xray/init.firewall uci_get_by_type() { - local ret=$(uci get ${NAME}.@$1[0].$2 2> /dev/null) + local ret=$(uci get ${NAME}.@$1[0].$2 2>/dev/null) echo ${ret:=$3} } diff --git a/luci-app-xray/root/usr/share/xray/init.fw4 b/luci-app-xray/root/usr/share/xray/init.fw4 index 8a9e8d86a..26392e0c3 100644 --- a/luci-app-xray/root/usr/share/xray/init.fw4 +++ b/luci-app-xray/root/usr/share/xray/init.fw4 @@ -10,7 +10,7 @@ setup_firewall() { /usr/bin/utpl ${FIREWALL_INCLUDE} > /var/etc/xray/firewall_include.nft logger -st xray[$$] -p4 "Triggering firewall4 restart..." - /etc/init.d/firewall restart > /dev/null 2>&1 + /etc/init.d/firewall restart /etc/hotplug.d/iface/01-transparent-proxy-ipset } @@ -24,7 +24,7 @@ flush_firewall() { rm -f /var/etc/xray/firewall_include.nft logger -st xray[$$] -p4 "Triggering firewall4 restart..." - /etc/init.d/firewall restart > /dev/null 2>&1 + /etc/init.d/firewall restart /etc/hotplug.d/iface/01-transparent-proxy-ipset } diff --git a/luci-app-xray/root/www/luci-static/resources/view/xray.js b/luci-app-xray/root/www/luci-static/resources/view/xray.js index d2237564a..33d2b1c6a 100644 --- a/luci-app-xray/root/www/luci-static/resources/view/xray.js +++ b/luci-app-xray/root/www/luci-static/resources/view/xray.js @@ -92,12 +92,18 @@ function add_flow_and_stream_security_conf(s, tab_name, depends_field_name, prot o.rmempty = false o.modalonly = true - o = s.taboption(tab_name, form.ListValue, `${protocol_name}_tls_fingerprint`, _(`[${protocol_name}][tls] Fingerprint`)) + o = s.taboption(tab_name, form.Value, `${protocol_name}_tls_fingerprint`, _(`[${protocol_name}][tls] Fingerprint`)) o.depends(`${protocol_name}_tls`, "tls") o.value("", "(not set)") o.value("chrome", "chrome") o.value("firefox", "firefox") o.value("safari", "safari") + o.value("ios", "ios") + o.value("android", "android") + o.value("edge", "edge") + o.value("360", "360") + o.value("qq", "qq") + o.value("random", "random") o.value("randomized", "randomized") o.rmempty = true o.modalonly = true