From d5b090bb4a53d32064401c75695d76ee3004844f Mon Sep 17 00:00:00 2001 From: kenzok8 Date: Wed, 26 Jun 2024 14:14:22 +0800 Subject: [PATCH] update 2024-06-26 14:14:22 --- luci-app-xray/core/root/usr/share/xray/gen_config.uc | 4 ++-- lucky/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/luci-app-xray/core/root/usr/share/xray/gen_config.uc b/luci-app-xray/core/root/usr/share/xray/gen_config.uc index 61a41da89..baa79aabb 100644 --- a/luci-app-xray/core/root/usr/share/xray/gen_config.uc +++ b/luci-app-xray/core/root/usr/share/xray/gen_config.uc @@ -125,7 +125,7 @@ function rules(proxy, bridge, manual_tproxy, extra_inbound, fakedns) { let direct_rules = []; if (geoip_existence) { if (proxy["geoip_direct_code_list"] != null) { - const geoip_direct_code_list = map(proxy["geoip_direct_code_list"] || [], v => "geoip:" + v); + const geoip_direct_code_list = map(proxy["geoip_direct_code_list"] || [], v => index(v, ":") > 0 ? v : `geoip:${v}`); if (length(geoip_direct_code_list) > 0) { push(direct_rules, { type: "field", @@ -134,7 +134,7 @@ function rules(proxy, bridge, manual_tproxy, extra_inbound, fakedns) { ip: geoip_direct_code_list }); } - const geoip_direct_code_list_v6 = map(proxy["geoip_direct_code_list_v6"] || [], v => "geoip:" + v); + const geoip_direct_code_list_v6 = map(proxy["geoip_direct_code_list_v6"] || [], v => index(v, ":") > 0 ? v : `geoip:${v}`); if (length(geoip_direct_code_list_v6) > 0) { push(direct_rules, { type: "field", diff --git a/lucky/Makefile b/lucky/Makefile index 611ac3e6f..b55a51b82 100644 --- a/lucky/Makefile +++ b/lucky/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lucky -PKG_VERSION:=2.8.3 +PKG_VERSION:=2.10.5 PKG_RELEASE:=1 PKGARCH:=all @@ -45,7 +45,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=GDY666 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_HASH:=980073f26732d33c1f95a5503f5472a3822708bf38632adb55ac79adadc8b5e9 +PKG_HASH:=153123213e98c010529fd2767959da8c53432f68f4ab896cf34de5448d8756b4 include $(INCLUDE_DIR)/package.mk