From 68c6bb5016e42b881d25308f40b1a26155e3ac5a Mon Sep 17 00:00:00 2001
From: bgme <i@bgme.me>
Date: Tue, 5 Aug 2025 01:23:59 +0000
Subject: [PATCH 1/2] Squashed 'smartdns/' changes from e547a16..c8a3650

c8a3650 update Makefile

git-subtree-dir: smartdns
git-subtree-split: c8a3650fdaa224b07f42762c344af353dc38da8b
---
 Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 21898ff..e164b36 100644
--- a/Makefile
+++ b/Makefile
@@ -7,17 +7,17 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=smartdns
 PKG_VERSION:=1.2025.46.2
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://www.github.com/pymumu/smartdns.git
-PKG_MIRROR_HASH:=53566766cef4204e2c25d85f55d7e891e4b723b353c3600e4ae5c9c84b78668d
-PKG_SOURCE_VERSION:=9e5980ec06cd831283f8e395a27016cbc858e1fb
+PKG_MIRROR_HASH:=150019a03f1ec2e4b5849740a72badf5ea094d5754bd59dd30119523a3ce9398
+PKG_SOURCE_VERSION:=ea4ea566fb3624baf361c6fb22c33fed1746782b
 
 SMARTDNS_WEBUI_VERSION:=1.0.0
 SMAETDNS_WEBUI_SOURCE_PROTO:=git
 SMARTDNS_WEBUI_SOURCE_URL:=https://github.com/pymumu/smartdns-webui.git
-SMARTDNS_WEBUI_SOURCE_VERSION:=8950449c67783dfc5f027d62849ba9e284d04254
+SMARTDNS_WEBUI_SOURCE_VERSION:=95f5d622fd014713aa2991190cbb62a2d58024b5
 SMARTDNS_WEBUI_FILE:=smartdns-webui-$(SMARTDNS_WEBUI_VERSION).tar.gz
 
 PKG_MAINTAINER:=Nick Peng <pymumu@gmail.com>
@@ -115,7 +115,7 @@ define Download/smartdns-webui
 	FILE:=$(SMARTDNS_WEBUI_FILE)
 	PROTO:=$(SMAETDNS_WEBUI_SOURCE_PROTO)
 	URL:=$(SMARTDNS_WEBUI_SOURCE_URL)
-	MIRROR_HASH:=400a0d5a9d57f24058261d5c6f64502e389e40aac36bc40f62e68dbd7cb4121a
+	MIRROR_HASH:=87830094aab9246debb195c944079e4f8b06f9b2fdbc7a3cdf2934277b6135b3
 	VERSION:=$(SMARTDNS_WEBUI_SOURCE_VERSION)
 	HASH:=$(SMARTDNS_WEBUI_HASH)
 	SUBDIR:=smartdns-webui

From 8d0ffc9f8ec19f776d5baf287e9ef8ed5d94fe71 Mon Sep 17 00:00:00 2001
From: bgme <i@bgme.me>
Date: Tue, 5 Aug 2025 01:24:06 +0000
Subject: [PATCH 2/2] Squashed 'luci-app-smartdns/' changes from
 e634b6f..26e7e29

26e7e29 luci: Fix the issue of logging in for non-IP addresses.

git-subtree-dir: luci-app-smartdns
git-subtree-split: 26e7e2973c21fec8b35266073ef7cf8bc2ac0396
---
 htdocs/luci-static/resources/view/smartdns/smartdns.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/luci-static/resources/view/smartdns/smartdns.js b/htdocs/luci-static/resources/view/smartdns/smartdns.js
index b359947..bea0372 100644
--- a/htdocs/luci-static/resources/view/smartdns/smartdns.js
+++ b/htdocs/luci-static/resources/view/smartdns/smartdns.js
@@ -68,7 +68,9 @@ function smartdnsRenderStatus(res) {
 		renderHTML += "<span style=\"color:green;font-weight:bold\">SmartDNS - " + _("RUNNING") + "</span>";
 
 		if (uiEnable === '1') {
-			var uiLink = "http://" + window.location.hostname + ":" + uiPort + "/";
+			var protocol = window.location.protocol;
+			var hostname = window.location.hostname;
+			var uiLink = protocol + "//" + hostname + ":" + uiPort;
 			renderHTML += "&#160; <a class=\"btn cbi-button\" style=\"margin-left: 10px; background-color: black; color: white; border-color: #333;\" href=\"" + uiLink + "\" target=\"_blank\">" + _("Open the WebUI") + "</a>";
 		}
 	} else {