From de527d593fed51b0fb351c37b1e6062c3537fc78 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 26 Aug 2026 01:45:13 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Sync=202026-08-26=2001:45:13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- luci-app-passwall/Makefile | 4 ++-- .../root/usr/share/passwall/app.sh | 1 + .../usr/share/passwall/helper_dnsmasq.lua | 1 + transmission-web-control/Makefile | 2 +- .../patches/001-remove-ui-original-link.patch | 24 ------------------- 5 files changed, 5 insertions(+), 27 deletions(-) delete mode 100644 transmission-web-control/patches/001-remove-ui-original-link.patch diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index d672a69d..2f1c768a 100644 --- a/luci-app-passwall/Makefile +++ b/luci-app-passwall/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall -PKG_VERSION:=26.8.19 -PKG_RELEASE:=243 +PKG_VERSION:=26.8.26 +PKG_RELEASE:=244 PKG_PO_VERSION:=$(PKG_VERSION) PKG_CONFIG_DEPENDS:= \ diff --git a/luci-app-passwall/root/usr/share/passwall/app.sh b/luci-app-passwall/root/usr/share/passwall/app.sh index d586d056..40007bd9 100755 --- a/luci-app-passwall/root/usr/share/passwall/app.sh +++ b/luci-app-passwall/root/usr/share/passwall/app.sh @@ -1306,6 +1306,7 @@ start_dns() { -USE_DIRECT_LIST "${USE_DIRECT_LIST}" -USE_PROXY_LIST "${USE_PROXY_LIST}" -USE_BLOCK_LIST "${USE_BLOCK_LIST}" -USE_GFW_LIST "${USE_GFW_LIST}" -CHN_LIST "${CHN_LIST}" \ -NODE ${NODE} -DEFAULT_PROXY_MODE ${TCP_PROXY_MODE} -NO_PROXY_IPV6 ${DNSMASQ_FILTER_PROXY_IPV6:-0} -NFTFLAG ${nftflag:-0} \ -NO_LOGIC_LOG ${NO_LOGIC_LOG:-0} + uci -q delete dhcp.@dnsmasq[0].min_cache_ttl uci -q add_list dhcp.@dnsmasq[0].addnmount=${GLOBAL_DNSMASQ_CONF_PATH} uci -q commit dhcp lua $APP_PATH/helper_dnsmasq.lua logic_restart -LOG 1 diff --git a/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq.lua b/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq.lua index f85274db..67ab0e1a 100644 --- a/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq.lua +++ b/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq.lua @@ -125,6 +125,7 @@ function copy_instance(var) if line:find("dhcp") then filter = true end if line:find("server=") == 1 then filter = true end if line:find("port=") == 1 then filter = true end + if line:find("min%-cache%-ttl") == 1 then filter = true end if line:find("conf%-dir=") == 1 then filter = true if TMP_DNSMASQ_PATH then diff --git a/transmission-web-control/Makefile b/transmission-web-control/Makefile index eff0a619..55de07ca 100644 --- a/transmission-web-control/Makefile +++ b/transmission-web-control/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=transmission-web-control -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/Youngv/transmission-web-control diff --git a/transmission-web-control/patches/001-remove-ui-original-link.patch b/transmission-web-control/patches/001-remove-ui-original-link.patch deleted file mode 100644 index a8854985..00000000 --- a/transmission-web-control/patches/001-remove-ui-original-link.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/src/index.html -+++ b/src/index.html -@@ -66,11 +66,6 @@ - data-options="iconCls:'icon-mobile',plain:true" system-tip-lang="toolbar.tip['ui-mobile']"> - | -- -- -- | - - -
  • UI
    • -
    • --
    • - -