From 1e784309861c12a4c5f74e6fba107336f9ad8f03 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@project-openwrt.eu.org>
Date: Fri, 30 Oct 2020 15:04:46 +0800
Subject: [PATCH 1/2] AdGuardHome: bump to 0.104.0

---
 package/ntlf9t/AdGuardHome/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/ntlf9t/AdGuardHome/Makefile b/package/ntlf9t/AdGuardHome/Makefile
index 3d21af0391..fdb68b7787 100644
--- a/package/ntlf9t/AdGuardHome/Makefile
+++ b/package/ntlf9t/AdGuardHome/Makefile
@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=AdGuardHome
-PKG_VERSION:=0.103.3
+PKG_VERSION:=0.104.0
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=v$(PKG_VERSION)
 PKG_SOURCE_URL:=https://github.com/AdguardTeam/AdGuardHome
-PKG_MIRROR_HASH:=11ffc493604c10c6c22c973bc69e5697738c12b05219dd123597cadfd174d2af
+PKG_MIRROR_HASH:=852861f83c3788a3913cb953b2eb0e2a94c27e2e158feae8c7485480c1481257
 
 PKG_LICENSE:=GPL-3.0-only
 PKG_LICENSE_FILES:=LICENSE.txt
@@ -59,7 +59,7 @@ endef
 
 ifeq ($(CONFIG_ADGUARDHOME_COMPRESS_GOPROXY),y)
 export GO111MODULE=on
-export GOPROXY=https://goproxy.cn
+export GOPROXY=https://goproxy.io
 endif
 
 define Build/Compile

From 714aac5fcad7ecfb652922bf2a37f573ae69e89c Mon Sep 17 00:00:00 2001
From: EdiTurn <yyxstter@gmail.com>
Date: Fri, 6 Nov 2020 15:08:09 +0800
Subject: [PATCH 2/2] luci-app-adguardhome: use new extra_command function
 definition

---
 package/ctcgfw/luci-app-adguardhome/Makefile        |  2 +-
 .../root/etc/init.d/AdGuardHome                     | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/package/ctcgfw/luci-app-adguardhome/Makefile b/package/ctcgfw/luci-app-adguardhome/Makefile
index e5ed3f946c..f1546e51d9 100644
--- a/package/ctcgfw/luci-app-adguardhome/Makefile
+++ b/package/ctcgfw/luci-app-adguardhome/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-adguardhome
 PKG_VERSION:=1.8
-PKG_RELEASE:=11
+PKG_RELEASE:=12
 PKG_MAINTAINER:=<https://github.com/rufengsuixing/luci-app-adguardhome>
 
 LUCI_TITLE:=LuCI app for AdGuardHome
diff --git a/package/ctcgfw/luci-app-adguardhome/root/etc/init.d/AdGuardHome b/package/ctcgfw/luci-app-adguardhome/root/etc/init.d/AdGuardHome
index 5a66043248..ff8ce4afd7 100755
--- a/package/ctcgfw/luci-app-adguardhome/root/etc/init.d/AdGuardHome
+++ b/package/ctcgfw/luci-app-adguardhome/root/etc/init.d/AdGuardHome
@@ -7,12 +7,13 @@ STOP=01
 
 CONFIGURATION=AdGuardHome
 CRON_FILE=/etc/crontabs/root
-EXTRA_COMMANDS="do_redirect testbackup test_crontab force_reload isrunning"
-EXTRA_HELP="        do_redirect 0 or 1\
-        testbackup backup or restore\
-		test_crontab
-		force_reload
-		isrunning"
+
+extra_command "do_redirect" "0 or 1"
+extra_command "testbackup" "backup or restore"
+extra_command "test_crontab"
+extra_command "force_reload"
+extra_command "isrunning"
+
 set_forward_dnsmasq()
 {
 	local PORT="$1"