network/AdGuardHome: Updated for version 0.107.54.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 25 insertions, 10 deletions

diff --git a/network/AdGuardHome/AdGuardHome.SlackBuild b/network/AdGuardHome/AdGuardHome.SlackBuild
index 846029c4ef7ea..b9e3d993a33c5 100644
--- a/network/AdGuardHome/AdGuardHome.SlackBuild
+++ b/network/AdGuardHome/AdGuardHome.SlackBuild
@@ -23,10 +23,12 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20241128 46and2: readme updates and fixes to help with initial configuration
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=AdGuardHome
-VERSION=${VERSION:-0.107.52}
+VERSION=${VERSION:-0.107.54}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -66,9 +68,9 @@ cd $PRGNAM
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 mkdir -p $PKG/usr/sbin $PKG/etc/rc.d
 install -m 0755 -o root -g root AdGuardHome $PKG/usr/sbin
diff --git a/network/AdGuardHome/AdGuardHome.info b/network/AdGuardHome/AdGuardHome.info
index 32b6bd470316b..9bad53eaa7bd1 100644
--- a/network/AdGuardHome/AdGuardHome.info
+++ b/network/AdGuardHome/AdGuardHome.info
@@ -1,10 +1,10 @@
 PRGNAM="AdGuardHome"
-VERSION="0.107.52"
+VERSION="0.107.54"
 HOMEPAGE="https://adguard.com/adguard-home.html"
-DOWNLOAD="https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.52/AdGuardHome_linux_386.tar.gz"
-MD5SUM="2633ecf9fe11dd3caa0ac63ef1935fbc"
-DOWNLOAD_x86_64="https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.52/AdGuardHome_linux_amd64.tar.gz"
-MD5SUM_x86_64="7d77564dbb2a8ad7de1312b8b4e4d457"
+DOWNLOAD="https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.54/AdGuardHome_linux_386.tar.gz"
+MD5SUM="8d120893559c7a82e3b2b97e8bd0dba9"
+DOWNLOAD_x86_64="https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.54/AdGuardHome_linux_amd64.tar.gz"
+MD5SUM_x86_64="098d5ace382e544de12431669c1e0bc3"
 REQUIRES=""
 MAINTAINER="fourtysixandtwo"
 EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/network/AdGuardHome/README b/network/AdGuardHome/README
index 9247b190c1efd..57212601ba0d3 100644
--- a/network/AdGuardHome/README
+++ b/network/AdGuardHome/README
@@ -30,3 +30,5 @@ If the user dnsproxy does not exist, then the script
 
 Also, the script /etc/rc.d/rc.AdGuardHome assumes that the configuration
 file location is /etc/AdGuardHome/AdGuardHome.yaml
+
+See README.SBo for more first run and config details.
diff --git a/network/AdGuardHome/README.SBo b/network/AdGuardHome/README.SBo
index 843901ae42847..ceea66862d782 100644
--- a/network/AdGuardHome/README.SBo
+++ b/network/AdGuardHome/README.SBo
@@ -4,7 +4,12 @@ AdGuard Home as a daemon.
 After first install, run
 # chmod +x /etc/rc.d/rc.AdGuardHome
 # /etc/rc.d/rc.AdGuardHome start
-Then go to the initial configuration wizard at http://localhost:3000
+If no config file exists, this will start in the foreground as root.
+Now go to the initial configuration wizard at http://localhost:3000
+  -after you are done with the intial config, ctrl-c to exit
+
+To run as dnsproxy on a web or dns port below 1024 run the following
+# setcap 'CAP_NET_BIND_SERVICE=+eip CAP_NET_RAW=+eip' /usr/sbin/AdGuardHome
 
 To start AdGuard Home automatically at system start, add the following
 to /etc/rc.d/rc.local:
diff --git a/network/AdGuardHome/rc.AdGuardHome b/network/AdGuardHome/rc.AdGuardHome
index f5f5b0d9bfb99..3c52405ce986c 100644
--- a/network/AdGuardHome/rc.AdGuardHome
+++ b/network/AdGuardHome/rc.AdGuardHome
@@ -4,11 +4,14 @@
 name="AdGuardHome"
 user="dnsproxy"
 workdir=/var/lib/"$name"
+configdir=/etc/"$name"
 pidfiles=/run/"$name"
-mkdir -p $pidfiles
+mkdir -p $pidfiles $workdir $configdir
+chmod 0700 $pidfiles $workdir
 if /bin/id "$user" &>/dev/null; then
   chown $user:$user $pidfiles
   chown -R $user:$user $workdir
+  chown -R $user:$user $configdir
   daemon="/usr/bin/daemon --name=$name --pidfiles=$pidfiles --user=$user"
 else
   daemon="/usr/bin/daemon --name=$name --pidfiles=$pidfiles"
@@ -17,6 +20,9 @@ fi
 start_AdGuardHome() {
 if $daemon --running; then
   echo "$name is already running"
+elif [ ! -f /etc/AdGuardHome/AdGuardHome.yaml ];then
+  /usr/sbin/AdGuardHome --config /etc/AdGuardHome/AdGuardHome.yaml \
+    --work-dir $workdir
 else
   echo "Starting $name..."
   $daemon -- /usr/sbin/AdGuardHome --config /etc/AdGuardHome/AdGuardHome.yaml \