🎁 Sync 2024-11-23 09:17

This commit is contained in:
github-actions[bot] 2024-11-23 09:17:17 +08:00
parent 3071848c98
commit a566d93191
5 changed files with 11 additions and 16 deletions

View File

@ -9,9 +9,9 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gn.googlesource.com/gn.git PKG_SOURCE_URL:=https://gn.googlesource.com/gn.git
PKG_SOURCE_DATE:=2024-05-13 PKG_SOURCE_DATE:=2024-11-19
PKG_SOURCE_VERSION:=df98b86690c83b81aedc909ded18857296406159 PKG_SOURCE_VERSION:=24e92acb847233a9c0753c12cb82c98fc084e3db
PKG_MIRROR_HASH:=3c3ce5cb69a8ec210bb6574db84d53745f7f58e1d82442af0423f69f7190c31f PKG_MIRROR_HASH:=d5b18b91286f0029e262fc548e4d9636c195a45d41c211f321b126040e246d1d
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.xz
PKG_LICENSE:=BSD 3-Clause PKG_LICENSE:=BSD 3-Clause

View File

@ -3,7 +3,7 @@
#ifndef OUT_LAST_COMMIT_POSITION_H_ #ifndef OUT_LAST_COMMIT_POSITION_H_
#define OUT_LAST_COMMIT_POSITION_H_ #define OUT_LAST_COMMIT_POSITION_H_
#define LAST_COMMIT_POSITION_NUM 2171 #define LAST_COMMIT_POSITION_NUM 2205
#define LAST_COMMIT_POSITION "2171 (df98b86690c8)" #define LAST_COMMIT_POSITION "2205 (24e92acb8472)"
#endif // OUT_LAST_COMMIT_POSITION_H_ #endif // OUT_LAST_COMMIT_POSITION_H_

View File

@ -121,12 +121,6 @@ msgstr "国内分组名"
msgid "You only need to configure domestic DNS packets in SmartDNS and set it redirect or as Dnsmasq upstream, and fill in the domestic DNS group name here." msgid "You only need to configure domestic DNS packets in SmartDNS and set it redirect or as Dnsmasq upstream, and fill in the domestic DNS group name here."
msgstr "您只需要在SmartDNS配置好国内DNS分组并设置重定向或作为Dnsmasq上游此处填入国内DNS分组名。" msgstr "您只需要在SmartDNS配置好国内DNS分组并设置重定向或作为Dnsmasq上游此处填入国内DNS分组名。"
msgid "Exclude Default Group"
msgstr "从默认服务器组排除"
msgid "Exclude DNS Server from default group."
msgstr "从default默认服务器组中排除"
msgid "Filter Mode" msgid "Filter Mode"
msgstr "过滤模式" msgstr "过滤模式"

View File

@ -120,6 +120,7 @@ if true then
string.gsub(TUN_DNS, '[^' .. "|" .. ']+', function(w) string.gsub(TUN_DNS, '[^' .. "|" .. ']+', function(w)
local server_dns = w local server_dns = w
local server_param = string.format("server %s -group %s -proxy %s", "%s", REMOTE_GROUP, proxy_server_name) local server_param = string.format("server %s -group %s -proxy %s", "%s", REMOTE_GROUP, proxy_server_name)
server_param = server_param .. " -exclude-default-group"
local isHTTPS = w:find("https://") local isHTTPS = w:find("https://")
if isHTTPS and isHTTPS == 1 then if isHTTPS and isHTTPS == 1 then

View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=naiveproxy PKG_NAME:=naiveproxy
PKG_VERSION:=131.0.6778.86-1 PKG_VERSION:=131.0.6778.86
PKG_RELEASE:=1 PKG_RELEASE:=1
ARCH_PREBUILT:=$(ARCH_PACKAGES) ARCH_PREBUILT:=$(ARCH_PACKAGES)
@ -21,8 +21,8 @@ else ifeq ($(ARCH_PREBUILT),riscv64_riscv64)
ARCH_PREBUILT:=riscv64 ARCH_PREBUILT:=riscv64
endif endif
PKG_SOURCE:=naiveproxy-v$(PKG_VERSION)-openwrt-$(ARCH_PREBUILT).tar.xz PKG_SOURCE:=naiveproxy-v$(PKG_VERSION)-$(PKG_RELEASE)-openwrt-$(ARCH_PREBUILT).tar.xz
PKG_SOURCE_URL:=https://github.com/klzgrad/naiveproxy/releases/download/v$(PKG_VERSION)/ PKG_SOURCE_URL:=https://github.com/klzgrad/naiveproxy/releases/download/v$(PKG_VERSION)-$(PKG_RELEASE)/
ifeq ($(ARCH_PREBUILT),aarch64_cortex-a53) ifeq ($(ARCH_PREBUILT),aarch64_cortex-a53)
PKG_HASH:=5cdb9ca045995bfb41d76b5321090255fb8ea7ec22aedd8a72f4aa1cbca1c456 PKG_HASH:=5cdb9ca045995bfb41d76b5321090255fb8ea7ec22aedd8a72f4aa1cbca1c456
@ -74,7 +74,7 @@ PKG_LICENSE:=BSD 3-Clause
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
PKG_MAINTAINER:=sbwml <admin@cooluc.com> PKG_MAINTAINER:=sbwml <admin@cooluc.com>
PKG_BUILD_DIR:=$(BUILD_DIR)/naiveproxy-v$(PKG_VERSION)-openwrt-$(ARCH_PACKAGES) PKG_BUILD_DIR:=$(BUILD_DIR)/naiveproxy-v$(PKG_VERSION)-$(PKG_RELEASE)-openwrt-$(ARCH_PACKAGES)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -98,7 +98,7 @@ define Package/naiveproxy/conffiles
endef endef
define Build/Prepare define Build/Prepare
$(TAR) --strip-components=1 -C $(PKG_BUILD_DIR) -xJf $(DL_DIR)/naiveproxy-v$(PKG_VERSION)-openwrt-$(ARCH_PREBUILT).tar.xz $(TAR) --strip-components=1 -C $(PKG_BUILD_DIR) -xJf $(DL_DIR)/naiveproxy-v$(PKG_VERSION)-$(PKG_RELEASE)-openwrt-$(ARCH_PREBUILT).tar.xz
endef endef
define Build/Compile define Build/Compile