From ab114f70c01a20cb2163a0beef5bee2b61ddd70d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 30 Dec 2021 20:32:57 +0800
Subject: [PATCH] update-12.30

---
 UnblockNeteaseMusic/Makefile           |  4 ++--
 adguardhome/Makefile                   | 16 ++++++++--------
 adguardhome/files/adguardhome.config   |  1 +
 adguardhome/files/adguardhome.init     |  2 ++
 autoshare-ksmbd/files/20-smb-ksmbd     | 11 +++++------
 autoshare-samba/files/20-smb           | 10 +++++-----
 linkease/Makefile                      |  2 +-
 luci-app-bypass/root/etc/init.d/bypass |  2 +-
 luci-app-mosdns/root/etc/init.d/mosdns |  4 +---
 9 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/UnblockNeteaseMusic/Makefile b/UnblockNeteaseMusic/Makefile
index 77c8d9816..3d702ba0e 100644
--- a/UnblockNeteaseMusic/Makefile
+++ b/UnblockNeteaseMusic/Makefile
@@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=UnblockNeteaseMusic
 PKG_BASE_VERSION:=0.27.0-rc.4
-PKG_RELEASE:=60
+PKG_RELEASE:=61
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/UnblockNeteaseMusic/server.git
 PKG_SOURCE_DATE:=2021-12-21
-PKG_SOURCE_VERSION:=426da69abdfdc93a7381243ac5e343d8d67b016a
+PKG_SOURCE_VERSION:=4bf5802cc0f56f2c9b1103d1e42cd0d4306dee03
 PKG_MIRROR_HASH:=skip
 
 PKG_VERSION:=$(PKG_BASE_VERSION)-$(PKG_SOURCE_DATE)-$(call version_abbrev,$(PKG_SOURCE_VERSION))
diff --git a/adguardhome/Makefile b/adguardhome/Makefile
index b1b0df18b..63fa7371b 100644
--- a/adguardhome/Makefile
+++ b/adguardhome/Makefile
@@ -75,14 +75,14 @@ define Build/Compile
 	)
 endef
 
-#define Package/adguardhome/install
-#	$(call GoPackage/Package/Install/Bin,$(1))
-#	$(INSTALL_DIR) $(1)/etc/init.d
-#	$(INSTALL_BIN) ./files/adguardhome.init $(1)/etc/init.d/adguardhome
-#
-#	$(INSTALL_DIR) $(1)/etc/config
-#	$(INSTALL_DATA) ./files/adguardhome.config $(1)/etc/config/adguardhome
-#endef
+define Package/adguardhome/install
+	$(call GoPackage/Package/Install/Bin,$(1))
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/adguardhome.init $(1)/etc/init.d/adguardhome
+
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DATA) ./files/adguardhome.config $(1)/etc/config/adguardhome
+endef
 
 $(eval $(call GoBinPackage,adguardhome))
 $(eval $(call BuildPackage,adguardhome))
diff --git a/adguardhome/files/adguardhome.config b/adguardhome/files/adguardhome.config
index 9f4934875..a9558020b 100644
--- a/adguardhome/files/adguardhome.config
+++ b/adguardhome/files/adguardhome.config
@@ -1,3 +1,4 @@
 config adguardhome config
+	option enabled '0'
 	# Where to store persistent data by AdGuard Home
 	option workdir /var/adguardhome
diff --git a/adguardhome/files/adguardhome.init b/adguardhome/files/adguardhome.init
index b26abbfbf..67cc06886 100644
--- a/adguardhome/files/adguardhome.init
+++ b/adguardhome/files/adguardhome.init
@@ -11,8 +11,10 @@ STOP=89
 
 start_service() {
   config_load adguardhome
+  config_get_bool enabled config enabled
   config_get WORK_DIR config workdir
 
+  [ "$enabled" -eq "1" ] || exit 2
   [ -d "$WORK_DIR" ] || mkdir -m 0755 -p "$WORK_DIR"
 
   procd_open_instance
diff --git a/autoshare-ksmbd/files/20-smb-ksmbd b/autoshare-ksmbd/files/20-smb-ksmbd
index 4504b249e..06de8508d 100644
--- a/autoshare-ksmbd/files/20-smb-ksmbd
+++ b/autoshare-ksmbd/files/20-smb-ksmbd
@@ -7,12 +7,6 @@
 # 警告:对着屏幕的哥们,我们允许你使用此脚本，但不允许你抹去作者的信息,请保留这段话。
 #
 
-/etc/init.d/ksmbd reload
-[ "$(uci -q get ksmbd.@globals[0].autoshare)" == "1" ] && {
-/etc/init.d/ksmbd restart
-exit 0;
-}
-
 . /lib/functions.sh
 . /lib/functions/service.sh
 
@@ -68,6 +62,11 @@ case "$ACTION" in
 
 	wait_for_init
 
+	[ "$(uci -q get ksmbd.@globals[0].autoshare)" == "1" ] && {
+		/etc/init.d/ksmbd restart
+		exit 0;
+	}
+
 	cat /proc/mounts | grep -v '/boot\|/opt' | while read j
 	do
 		str=${j%% *}
diff --git a/autoshare-samba/files/20-smb b/autoshare-samba/files/20-smb
index 8e7c3b8d8..1e2d3bec3 100644
--- a/autoshare-samba/files/20-smb
+++ b/autoshare-samba/files/20-smb
@@ -7,11 +7,6 @@
 # 警告:对着屏幕的哥们,我们允许你使用此脚本，但不允许你抹去作者的信息,请保留这段话。
 #
 
-[ "$(uci -q get samba4.@samba[0].autoshare)" == "1" ] && {
-/etc/init.d/samba4 restart
-exit 0;
-}
-
 . /lib/functions.sh
 . /lib/functions/service.sh
 
@@ -68,6 +63,11 @@ case "$ACTION" in
 
 	wait_for_init
 
+	[ "$(uci -q get samba4.@samba[0].autoshare)" == "1" ] && {
+		/etc/init.d/samba4 restart
+		exit 0;
+	}
+
 	cat /proc/mounts | grep -v '/boot\|/opt' | while read j
 	do
 		str=${j%% *}
diff --git a/linkease/Makefile b/linkease/Makefile
index 2c8bd454f..c1c8cd907 100644
--- a/linkease/Makefile
+++ b/linkease/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_ARCH_LINKEASE:=$(ARCH)
 
 PKG_NAME:=linkease
-PKG_VERSION:=0.5.1
+PKG_VERSION:=0.5.2
 PKG_RELEASE:=2
 PKG_SOURCE:=$(PKG_NAME)-binary-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://fw.koolcenter.com/binary/LinkEase/LinuxStorage/
diff --git a/luci-app-bypass/root/etc/init.d/bypass b/luci-app-bypass/root/etc/init.d/bypass
index 999d45a0a..c298a404f 100755
--- a/luci-app-bypass/root/etc/init.d/bypass
+++ b/luci-app-bypass/root/etc/init.d/bypass
@@ -193,7 +193,7 @@ start_dns(){
 		service_start $(which chinadns-ng) -l 5337 -c '127.0.0.1#5336' -t '127.0.0.1#5335' -4 china_v4 -6 china_v6 -f -n $([ $gfw_mode = 1 ] && echo -g $K/gfw.list)
 		log "ChinaDNS : Start ChinaDNS-NG successful!"
 	fi
-	if [[ "$(uci -q get dhcp.@dnsmasq[0].cachesize)" == "0" ]]; then
+	if [[ "$(uci -q get dhcp.@dnsmasq[0].cachesize)" == "0" && $adguardhome == 0 ]]; then
 		uci -q set dhcp.@dnsmasq[0].cachesize='1500'
 		uci commit dhcp
 	fi
diff --git a/luci-app-mosdns/root/etc/init.d/mosdns b/luci-app-mosdns/root/etc/init.d/mosdns
index d894867ae..32736f9a5 100755
--- a/luci-app-mosdns/root/etc/init.d/mosdns
+++ b/luci-app-mosdns/root/etc/init.d/mosdns
@@ -20,14 +20,11 @@ service_triggers() {
 }
 
 restore_setting() {
-  redirect=$(uci -q get mosdns.mosdns.redirect)
-  if [ $redirect -eq 1 ]; then
     sed -i "/list server/d" /etc/config/dhcp
     uci set dhcp.@dnsmasq[0].noresolv='0'
     uci del dhcp.@dnsmasq[0].cachesize
     uci set dhcp.@dnsmasq[0].filter_aaaa='1'
     uci commit dhcp
-  fi
 }
 
 prepare_setting() {
@@ -92,6 +89,7 @@ start_service() {
   procd_set_param respawn "${respawn_threshold:-3600}" "${respawn_timeout:-5}" "${respawn_retry:-5}"
   procd_close_instance mosdns
 
+  restore_setting
   prepare_setting
   restart_others