From 5eddccd4e7b3259ef7aed39c167d018d61c604a7 Mon Sep 17 00:00:00 2001
From: actions-user <kenzok8@users.noreply.github.com>
Date: Fri, 24 Oct 2025 02:27:04 +0800
Subject: [PATCH] update 2025-10-24 02:27:04

---
 adguardhome/Makefile                               |  6 +++---
 luci-app-lucky/luci-app-lucky/Makefile             |  2 +-
 .../luci-static/resources/view/lucky/config.js     |  2 +-
 luci-app-lucky/luci-app-lucky/po/zh_Hans/lucky.po  |  2 +-
 luci-app-lucky/lucky/files/lucky.init              | 14 +++++++++++---
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/adguardhome/Makefile b/adguardhome/Makefile
index eef2c1d5..b083b4ce 100644
--- a/adguardhome/Makefile
+++ b/adguardhome/Makefile
@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adguardhome
-PKG_VERSION:=0.107.67
+PKG_VERSION:=0.107.68
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/AdguardTeam/AdGuardHome/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=0d74004fd17c8f185174fa09deb130ad48e2f46e946eb9fa8c66ce186d2af9cf
+PKG_HASH:=349eaf6d91d70d6769486abe9f4ce5b3703c10a9090d140a67fa2297c3abb757
 PKG_BUILD_DIR:=$(BUILD_DIR)/AdGuardHome-$(PKG_VERSION)
 
 PKG_LICENSE:=GPL-3.0-only
@@ -58,7 +58,7 @@ define Download/adguardhome-frontend
 	URL:=https://github.com/AdguardTeam/AdGuardHome/releases/download/v$(PKG_VERSION)/
 	URL_FILE:=AdGuardHome_frontend.tar.gz
 	FILE:=$(FRONTEND_FILE)
-    HASH:=8709396e05f812f3e2085a64074384b6363fe1871b9bbb7e8f9886c1aa64b579
+    HASH:=978e6a2c8ab268a64006133d8082ab332bf42d5c4575125630410e4e7e03e98e
 endef
 
 define Build/Prepare
diff --git a/luci-app-lucky/luci-app-lucky/Makefile b/luci-app-lucky/luci-app-lucky/Makefile
index ec575b01..fc832aab 100644
--- a/luci-app-lucky/luci-app-lucky/Makefile
+++ b/luci-app-lucky/luci-app-lucky/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-lucky
 PKG_VERSION:=3.0.1
-PKG_RELEASE:=12
+PKG_RELEASE:=13
 
 LUCI_TITLE:=LuCI Support for Dynamic lucky Client
 LUCI_DEPENDS:=+lucky
diff --git a/luci-app-lucky/luci-app-lucky/htdocs/luci-static/resources/view/lucky/config.js b/luci-app-lucky/luci-app-lucky/htdocs/luci-static/resources/view/lucky/config.js
index 4e8e553d..37b8cf5c 100644
--- a/luci-app-lucky/luci-app-lucky/htdocs/luci-static/resources/view/lucky/config.js
+++ b/luci-app-lucky/luci-app-lucky/htdocs/luci-static/resources/view/lucky/config.js
@@ -1,4 +1,4 @@
-/*   Copyright (C) 2021-2025 sirpdboy herboy2008@gmail.com https://github.com/sirpdboy/luci-app-lucky */
+//   Copyright (C) 2021-2025 sirpdboy herboy2008@gmail.com https://github.com/sirpdboy/luci-app-lucky 
 
 'use strict';
 'require form';
diff --git a/luci-app-lucky/luci-app-lucky/po/zh_Hans/lucky.po b/luci-app-lucky/luci-app-lucky/po/zh_Hans/lucky.po
index 30ed11b0..a9d93d0c 100644
--- a/luci-app-lucky/luci-app-lucky/po/zh_Hans/lucky.po
+++ b/luci-app-lucky/luci-app-lucky/po/zh_Hans/lucky.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
 msgid "Lucky Configuration"
-msgstr "Lucky参数配置"
+msgstr "Lucky配置"
 
 msgid "Lucky"
 msgstr "Lucky大吉"
diff --git a/luci-app-lucky/lucky/files/lucky.init b/luci-app-lucky/lucky/files/lucky.init
index 8a4e4757..d68f15c9 100644
--- a/luci-app-lucky/lucky/files/lucky.init
+++ b/luci-app-lucky/lucky/files/lucky.init
@@ -41,13 +41,21 @@ start_instance() {
     enabled=$(uci -q get $CONF.$CONF.enabled ) || enabled="0"
     logger=$(uci -q get $CONF.$CONF.logger ) || logger="1"
     port=$(uci -q get $CONF.$CONF.port ) || port="16601"
-    SafeURL=$(uci -q get $CONF.$CONF.safe ) || SafeURL=""
+    SafeURL=$(uci -q get $CONF.$CONF.safe ) || SafeURL=" "
     delay=$(uci -q get $CONF.$CONF.delay ) || delay="5"
+    SafeURL="${SafeURL##*( )}"
+    SafeURL="${SafeURL%%*( )}"
+    
     init_confdir
     [  x$enabled = x1 ] || return 1
-    [ $(awk -F. '{print $1}' /proc/uptime) -lt "120" ] && sleep $delay
+    [ $(awk -F. '{print $1}' /proc/uptime) -lt "120" ] && sleep $delay 
     $(which lucky) -setconf -key AdminWebListenPort -value $port -cd $CONFDIR
-    $(which lucky) -setconf -key SafeURL -value $SafeURL -cd $CONFDIR
+    if [ -z "$SafeURL" ] ; then
+        $(which lucky) -rCancelSafeURL
+    else
+        $(which lucky) -setconf -key SafeURL -value "$SafeURL" -cd $CONFDIR
+    fi
+    
     procd_open_instance
     procd_set_param command $PROG 
     procd_append_param command -cd $CONFDIR