update-01.10

UnblockNeteaseMusic/Makefile

@@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=UnblockNeteaseMusic
 PKG_BASE_VERSION:=0.27.0-rc.4
-PKG_RELEASE:=64
+PKG_RELEASE:=65
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/UnblockNeteaseMusic/server.git
 PKG_SOURCE_DATE:=2021-12-21
-PKG_SOURCE_VERSION:=9b73cf919bc839c31942e5b9622237f7acc98b9a
+PKG_SOURCE_VERSION:=3cf97804c2b3e846168c5282fbddf01db52e18e5
 PKG_MIRROR_HASH:=skip
 
 PKG_VERSION:=$(PKG_BASE_VERSION)-$(PKG_SOURCE_DATE)-$(call version_abbrev,$(PKG_SOURCE_VERSION))

adguardhome/patches/version.patch

@@ -0,0 +1,9 @@
+--- a/client/src/helpers/version.js
++++ b/client/src/helpers/version.js
+@@ -13,5 +13,5 @@ export const areEqualVersions = (left, right) => {
+ 
+     const leftVersion = left.replace(/^v/, '');
+     const rightVersion = right.replace(/^v/, '');
+-    return leftVersion === rightVersion;
++    return leftVersion < rightVersion;
+ };

luci-app-adguardhome/luasrc/view/AdGuardHome/log.htm

@@ -83,12 +83,13 @@ XHR.poll(3, '<%=url([[admin]], [[services]], [[AdGuardHome]], [[getlog]])%>', nu
 		if (x.responseText && lv) {
 			if (isutc2local)
 			{
-				var lines=line_tolocal(x.responseText);
+				var lines=line_toUTC(x.responseText);
 				if (islogreverse){
 					lv.innerHTML = lines.reverse().join('\n')+lv.innerHTML;
 				}else{
 					lv.innerHTML += lines.join('\n');
 				}
+			lv.innerHTML=line_tolocal(lv.innerHTML).join('\n');
 			}else{
 				if (islogreverse){
 					lv.innerHTML = x.responseText.split('\n').reverse().join('\n')+lv.innerHTML;

luci-app-adguardhome/root/etc/init.d/AdGuardHome

@@ -231,6 +231,9 @@ _do_redirect()
 	fi
 	config_get configpath $CONFIGURATION configpath "/etc/AdGuardHome.yaml"
 	AdGuardHome_PORT=$(config_editor "dns.port" "" "$configpath" "1")
+	if [ ! -s "$configpath" ]; then
+		cp -f /usr/share/AdGuardHome/AdGuardHome_template.yaml $configpath
+	fi
 	if [ -z "$AdGuardHome_PORT" ]; then
 		AdGuardHome_PORT="0"
 	fi
@@ -504,7 +507,7 @@ start_service() {
 	if [[ "`uci get bypass.@global[0].global_server 2>/dev/null`" && "`uci get bypass.@global[0].adguardhome 2>/dev/null`" == 1 && "$(uci get dhcp.@dnsmasq[0].port)" == "53" ]]; then
 	 uci -q set AdGuardHome.AdGuardHome.redirect='exchange'
 	 uci commit AdGuardHome
-	 _do_redirect 1
+	 do_redirect 1
 	fi
 }
 

luci-app-adguardhome/root/usr/share/AdGuardHome/AdGuardHome_template.yaml

@@ -13,7 +13,7 @@ web_session_ttl: 720
 dns:
   bind_hosts:
   - 0.0.0.0
-  port: 5553
+  port: 1745
   statistics_interval: 30
   querylog_enabled: true
   querylog_file_enabled: true