update 2023-02-05 13:20:10

This commit is contained in:
github-actions[bot] 2023-02-05 13:20:10 +08:00
parent c49d997b97
commit 2d1f5bfcd6
6 changed files with 15 additions and 11 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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}
}

View File

@ -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
}

View File

@ -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