From 60a04c09d5a63240de8c74167bc77257da143eaa Mon Sep 17 00:00:00 2001
From: sirpdboy <sirpdboy@qq.com>
Date: Sat, 24 Apr 2021 16:16:15 +0800
Subject: [PATCH] up adguardhome16

---
 luci-app-adguardhome/Makefile                         |  2 +-
 luci-app-adguardhome/root/etc/config/AdGuardHome      |  2 +-
 .../root/usr/share/AdGuardHome/gfw2adg.sh             |  2 +-
 .../root/usr/share/AdGuardHome/update_core.sh         |  2 +-
 .../usr/share/rpcd/acl.d/luci-app-adguardhome.json    | 11 +++++++++++
 luci-app-advanced/Makefile                            |  2 +-
 6 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 luci-app-adguardhome/root/usr/share/rpcd/acl.d/luci-app-adguardhome.json

diff --git a/luci-app-adguardhome/Makefile b/luci-app-adguardhome/Makefile
index 656805c..f72ef33 100644
--- a/luci-app-adguardhome/Makefile
+++ b/luci-app-adguardhome/Makefile
@@ -17,7 +17,7 @@ define Package/luci-app-adguardhome
 	TITLE:=LuCI app for adguardhome
 	PKG_MAINTAINER:=<https://github.com/rufengsuixing/luci-app-adguardhome>
 	PKGARCH:=all
-	DEPENDS:=+!wget&&!curl:wget
+	DEPENDS:=+!wget-ssl&&!curl:wget-ssl
 endef
 
 define Package/luci-app-adguardhome/description
diff --git a/luci-app-adguardhome/root/etc/config/AdGuardHome b/luci-app-adguardhome/root/etc/config/AdGuardHome
index 3857bac..c5d0b02 100644
--- a/luci-app-adguardhome/root/etc/config/AdGuardHome
+++ b/luci-app-adguardhome/root/etc/config/AdGuardHome
@@ -3,7 +3,7 @@ config AdGuardHome 'AdGuardHome'
 	option httpport '3000'
 	option redirect 'none'
 	option configpath '/etc/AdGuardHome.yaml'
-	option workdir '/usr/bin/AdGuardHome'
+	option workdir '/tmp/AdGuardHome'
 	option logfile '/tmp/AdGuardHome.log'
 	option verbose '0'
 	option binpath '/usr/bin/AdGuardHome/AdGuardHome'
diff --git a/luci-app-adguardhome/root/usr/share/AdGuardHome/gfw2adg.sh b/luci-app-adguardhome/root/usr/share/AdGuardHome/gfw2adg.sh
index 386d430..83ca229 100644
--- a/luci-app-adguardhome/root/usr/share/AdGuardHome/gfw2adg.sh
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/gfw2adg.sh
@@ -20,7 +20,7 @@ if [ ! -f "$configpath" ]; then
 	echo "please make a config first"
 	exit 1
 fi
-wget-ssl --no-check-certificate https://cdn.jsdelivr.net/gh/gfwlist/gfwlist/gfwlist.txt -O- | base64 -d > /tmp/gfwlist.txt
+wget --no-check-certificate https://cdn.jsdelivr.net/gh/gfwlist/gfwlist/gfwlist.txt -O- | base64 -d > /tmp/gfwlist.txt
 cat /tmp/gfwlist.txt | awk -v upst="$gfwupstream" 'BEGIN{getline;}{
 s1=substr($0,1,1);
 if (s1=="!")
diff --git a/luci-app-adguardhome/root/usr/share/AdGuardHome/update_core.sh b/luci-app-adguardhome/root/usr/share/AdGuardHome/update_core.sh
index 2469919..70de6ff 100644
--- a/luci-app-adguardhome/root/usr/share/AdGuardHome/update_core.sh
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/update_core.sh
@@ -15,7 +15,7 @@ check_if_already_running(){
 
 check_wgetcurl(){
 	which curl && downloader="curl -L -k --retry 2 --connect-timeout 20 -o" && return
-	which wget-ssl && downloader="wget-ssl --no-check-certificate -t 2 -T 20 -O" && return
+	which wget && downloader="wget --no-check-certificate -t 2 -T 20 -O" && return
 	[ -z "$1" ] && opkg update || (echo error opkg && EXIT 1)
 	[ -z "$1" ] && (opkg remove wget wget-nossl --force-depends ; opkg install wget ; check_wgetcurl 1 ;return)
 	[ "$1" == "1" ] && (opkg install curl ; check_wgetcurl 2 ; return)
diff --git a/luci-app-adguardhome/root/usr/share/rpcd/acl.d/luci-app-adguardhome.json b/luci-app-adguardhome/root/usr/share/rpcd/acl.d/luci-app-adguardhome.json
new file mode 100644
index 0000000..485aa62
--- /dev/null
+++ b/luci-app-adguardhome/root/usr/share/rpcd/acl.d/luci-app-adguardhome.json
@@ -0,0 +1,11 @@
+{
+	"luci-app-adguardhome": {
+		"description": "Grant UCI access for luci-app-adguardhome",
+		"read": {
+			"uci": [ "AdGuardHome" ]
+		},
+		"write": {
+			"uci": [ "AdGuardHome" ]
+		}
+	}
+}
diff --git a/luci-app-advanced/Makefile b/luci-app-advanced/Makefile
index b49465a..b9e314f 100644
--- a/luci-app-advanced/Makefile
+++ b/luci-app-advanced/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/package.mk
 
 PKG_NAME:=luci-app-advanced
 PKG_VERSION:=1.9
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 define Package/$(PKG_NAME)
   SECTION:=luci
   CATEGORY:=LuCI