From 5e221cc8409b148e468a7181130f6dcc9ee1645b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Feb 2023 23:38:22 +0800 Subject: [PATCH] update 2023-02-23 23:38:22 --- alist/Makefile | 8 ++++---- ...isable-delete-of-temp-directory-at-startup.patch | 2 +- homeproxy/Makefile | 1 + .../luci-static/resources/view/homeproxy/node.js | 4 ++-- .../root/etc/homeproxy/scripts/generate_sing-box.uc | 13 ++++++++----- v2ray-geodata/Makefile | 8 ++++---- 6 files changed, 20 insertions(+), 16 deletions(-) diff --git a/alist/Makefile b/alist/Makefile index 19388f102..c0d196b21 100644 --- a/alist/Makefile +++ b/alist/Makefile @@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alist -PKG_VERSION:=3.11.0 -PKG_WEB_VERSION:=3.11.0 +PKG_VERSION:=3.12.0 +PKG_WEB_VERSION:=3.12.0 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:=9bc62db1210191b416acfb2fc86a336e5bf30ee60fd1ea4af44c750661f9333b +PKG_HASH:=ce0e65e9f81d7c17f33082399bb070d1afcb7c59ddaefe6056a44786d6586265 PKG_LICENSE:=GPL-3.0 PKG_LICENSE_FILE:=LICENSE @@ -23,7 +23,7 @@ define Download/$(PKG_NAME)-web FILE:=$(PKG_NAME)-web-$(PKG_WEB_VERSION).tar.gz URL_FILE:=dist.tar.gz URL:=https://github.com/alist-org/alist-web/releases/download/$(PKG_WEB_VERSION)/ - HASH:=aa4465ec7a18a968bf2bbf71b5a0d1b757c8f29e204d7826bf45198920ff382d + HASH:=afb1d48df042baea25c5f2f18cf1da9b032d291cd43c5e5ab3ee4cb050302dce endef PKG_CONFIG_DEPENDS:= \ diff --git a/alist/patches/001-disable-delete-of-temp-directory-at-startup.patch b/alist/patches/001-disable-delete-of-temp-directory-at-startup.patch index 19561747a..3c5c97802 100644 --- a/alist/patches/001-disable-delete-of-temp-directory-at-startup.patch +++ b/alist/patches/001-disable-delete-of-temp-directory-at-startup.patch @@ -1,6 +1,6 @@ --- a/internal/bootstrap/config.go +++ b/internal/bootstrap/config.go -@@ -67,11 +67,7 @@ func InitConfig() { +@@ -69,11 +69,7 @@ func InitConfig() { } conf.Conf.TempDir = absPath } diff --git a/homeproxy/Makefile b/homeproxy/Makefile index 8537e8f24..1dd5db561 100644 --- a/homeproxy/Makefile +++ b/homeproxy/Makefile @@ -18,6 +18,7 @@ LUCI_DEPENDS:= \ define Package/luci-app-homeproxy/conffiles /etc/config/homeproxy /etc/homeproxy/certs/ +/etc/homeproxy/resources/ endef include $(TOPDIR)/feeds/luci/luci.mk diff --git a/homeproxy/htdocs/luci-static/resources/view/homeproxy/node.js b/homeproxy/htdocs/luci-static/resources/view/homeproxy/node.js index 9208d8cb2..e06c73262 100644 --- a/homeproxy/htdocs/luci-static/resources/view/homeproxy/node.js +++ b/homeproxy/htdocs/luci-static/resources/view/homeproxy/node.js @@ -796,7 +796,7 @@ return view.extend({ so = ss.option(form.ListValue, 'packet_encoding', _('Packet encoding')); so.value('', _('none')); - so.value('packet', _('packet (v2ray-core v5+)')); + so.value('packetaddr', _('packet addr (v2ray-core v5+)')); so.value('xudp', _('Xudp (Xray-core)')); so.default = 'xudp'; so.depends('type', 'vless'); @@ -1076,7 +1076,7 @@ return view.extend({ o = s.taboption('subscription', form.ListValue, 'packet_encoding', _('Default packet encoding')); o.value('', _('none')); - o.value('packet', _('packet (v2ray-core v5+)')); + o.value('packetaddr', _('packet addr (v2ray-core v5+)')); o.value('xudp', _('Xudp (Xray-core)')); o.default = 'xudp'; diff --git a/homeproxy/root/etc/homeproxy/scripts/generate_sing-box.uc b/homeproxy/root/etc/homeproxy/scripts/generate_sing-box.uc index dde6706f1..03d2b7ede 100755 --- a/homeproxy/root/etc/homeproxy/scripts/generate_sing-box.uc +++ b/homeproxy/root/etc/homeproxy/scripts/generate_sing-box.uc @@ -175,9 +175,9 @@ function generate_outbound(node) { multiplex: (node.multiplex === '1') ? { enabled: true, protocol: node.multiplex_protocol, - max_connections: node.multiplex_max_connections, - min_streams: node.multiplex_min_streams, - max_streams: node.multiplex_max_streams + max_connections: strToInt(node.multiplex_max_connections), + min_streams: strToInt(node.multiplex_min_streams), + max_streams: strToInt(node.multiplex_max_streams) } : null, tls: (node.tls === '1') ? { enabled: true, @@ -204,7 +204,7 @@ function generate_outbound(node) { host: node.http_host || node.ws_host, path: node.http_path || node.ws_path, method: node.http_method, - max_early_data: node.websocket_early_data, + max_early_data: strToInt(node.websocket_early_data), early_data_header_name: node.websocket_early_data_header, service_name: node.grpc_servicename } : null, @@ -507,8 +507,11 @@ if (server_enabled === '1') transport: !isEmpty(cfg.transport) ? { type: cfg.transport, - host: cfg.http_host || cfg.ws_host, + host: cfg.http_host, path: cfg.http_path || cfg.ws_path, + headers: cfg.ws_host ? { + Host: cfg.ws_host + } : null, method: cfg.http_method, max_early_data: cfg.websocket_early_data, early_data_header_name: cfg.websocket_early_data_header, diff --git a/v2ray-geodata/Makefile b/v2ray-geodata/Makefile index b71c7732d..f988d4885 100644 --- a/v2ray-geodata/Makefile +++ b/v2ray-geodata/Makefile @@ -12,22 +12,22 @@ PKG_MAINTAINER:=Tianling Shen include $(INCLUDE_DIR)/package.mk -GEOIP_VER:=202302200325 +GEOIP_VER:=202302230047 GEOIP_FILE:=geoip.dat.$(GEOIP_VER) define Download/geoip URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/ URL_FILE:=geoip.dat FILE:=$(GEOIP_FILE) - HASH:=b68b2e532c39089518e93629abcedd8871fbc8c88d2090b9a460a7af05c16dd8 + HASH:=958b34017682aa28d2bf7f0368cdb62934c5623bf405d96ab12e54e320adfea0 endef -GEOSITE_VER:=20230222033725 +GEOSITE_VER:=20230223064004 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER) define Download/geosite URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/ URL_FILE:=dlc.dat FILE:=$(GEOSITE_FILE) - HASH:=bbe88e721976fd13a3c5d29f2296119f6fac93ae1c9200f62515d753884e3397 + HASH:=40e34b30913798af6fc9fe0ed4d051f914de1c67d4e8f0d24522673c1759f1bc endef define Package/v2ray-geodata/template