OpenWrt
/
small-package
mirror of https://github.com/kenzok8/small-package
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
alist/Makefile
View File

@ -7,13 +7,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=alist PKG_NAME:=alist
PKG_VERSION:=3.9.2 PKG_VERSION:=3.10.1
PKG_WEB_VERSION:=3.9.2 PKG_WEB_VERSION:=3.9.2
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/alist-org/alist/tar.gz/v$(PKG_VERSION)? 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:=GPL-3.0
PKG_LICENSE_FILE:=LICENSE PKG_LICENSE_FILE:=LICENSE

2
luci-app-xray/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-xray PKG_NAME:=luci-app-xray
PKG_VERSION:=1.26.1 PKG_VERSION:=1.26.2
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_LICENSE:=MPLv2 PKG_LICENSE:=MPLv2

4
luci-app-xray/root/etc/hotplug.d/iface/01-transparent-proxy-ipset.fw4
View File

@ -2,13 +2,11 @@
if [ ! -s /usr/share/xray/ignore_tp_spec_def_gw ] ; then 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}') DEFAULT_GATEWAY=$(ip route get 1.1.1.1 | grep -Eoe "src (\d+.\d+.\d+.\d+)" | awk '{print $NF}')
if [ -n "$DEFAULT_GATEWAY" ] ; then if [ -n "$DEFAULT_GATEWAY" ] ; then
logger -st transparent-proxy-ipset[$$] -p6 "default gateway available at $DEFAULT_GATEWAY"
nft -f - <<-EOF nft -f - <<-EOF
add set inet fw4 tp_spec_def_gw { type ipv4_addr; }
flush set inet fw4 tp_spec_def_gw flush set inet fw4 tp_spec_def_gw
add element inet fw4 tp_spec_def_gw { $DEFAULT_GATEWAY } add element inet fw4 tp_spec_def_gw { $DEFAULT_GATEWAY }
EOF EOF
logger -st transparent-proxy-ipset[$$] -p6 "default gateway available at $DEFAULT_GATEWAY"
else else
logger -st transparent-proxy-ipset[$$] -p6 "default gateway not available, please wait for interface ready" logger -st transparent-proxy-ipset[$$] -p6 "default gateway not available, please wait for interface ready"
fi fi

4
luci-app-xray/root/usr/share/xray/init.fw4
View File

@ -10,7 +10,7 @@ setup_firewall() {
/usr/bin/utpl ${FIREWALL_INCLUDE} > /var/etc/xray/firewall_include.nft /usr/bin/utpl ${FIREWALL_INCLUDE} > /var/etc/xray/firewall_include.nft
logger -st xray[$$] -p4 "Triggering firewall4 restart..." 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 /etc/hotplug.d/iface/01-transparent-proxy-ipset
} }
@ -24,7 +24,7 @@ flush_firewall() {
rm -f /var/etc/xray/firewall_include.nft rm -f /var/etc/xray/firewall_include.nft
logger -st xray[$$] -p4 "Triggering firewall4 restart..." 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 /etc/hotplug.d/iface/01-transparent-proxy-ipset
} }

8
luci-app-xray/root/www/luci-static/resources/view/xray.js
View File

@ -92,12 +92,18 @@ function add_flow_and_stream_security_conf(s, tab_name, depends_field_name, prot
o.rmempty = false o.rmempty = false
o.modalonly = true 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.depends(`${protocol_name}_tls`, "tls")
o.value("", "(not set)") o.value("", "(not set)")
o.value("chrome", "chrome") o.value("chrome", "chrome")
o.value("firefox", "firefox") o.value("firefox", "firefox")
o.value("safari", "safari") 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.value("randomized", "randomized")
o.rmempty = true o.rmempty = true
o.modalonly = true o.modalonly = true