From 1df4ac8be835c37ec7441f71e68881697b3898c0 Mon Sep 17 00:00:00 2001 From: Ryan Keane Date: Sun, 22 Dec 2024 06:08:43 -0800 Subject: [PATCH 1/2] adguardhome: Bump to 0.107.55 Bump version to 0.107.55, change log in links below. Use tarballs from upstream tags instead of a Git repo. Link: https://github.com/AdguardTeam/AdGuardHome/milestone/90?closed=1 Signed-off-by: Ryan Keane --- net/adguardhome/Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/net/adguardhome/Makefile b/net/adguardhome/Makefile index 4b7bd1b2c59cd..10b7a22120ad9 100644 --- a/net/adguardhome/Makefile +++ b/net/adguardhome/Makefile @@ -6,13 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adguardhome -PKG_VERSION:=0.107.53 +PKG_VERSION:=0.107.55 PKG_RELEASE:=1 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=v$(PKG_VERSION) -PKG_SOURCE_URL:=https://github.com/AdguardTeam/AdGuardHome -PKG_MIRROR_HASH:=d74702bc4f8b82bda64a0a937a98e73ee602c21b9361c0c683671212e03e9316 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/AdguardTeam/AdGuardHome/tar.gz/v$(PKG_VERSION)? +PKG_HASH:=557bfd8bae53361ba453ba2703a47f1b23fcf0a2141a96c0802d283c183073b2 PKG_LICENSE:=GPL-3.0-only PKG_LICENSE_FILES:=LICENSE.txt From ea9420a082603b766b9530042c31107092dad19c Mon Sep 17 00:00:00 2001 From: Ryan Keane Date: Sun, 22 Dec 2024 06:12:04 -0800 Subject: [PATCH 2/2] adguardhome: Update init files Move working directory from `/var/adguardhome` to `/var/lib/adguardhome`, according to Linux FHS. Add option to store PID file, defaulting to `/run/adguardhome.pid`. Signed-off-by: Ryan Keane --- net/adguardhome/files/adguardhome.config | 5 +++-- net/adguardhome/files/adguardhome.init | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/net/adguardhome/files/adguardhome.config b/net/adguardhome/files/adguardhome.config index 0c2aeac0ab207..7a8a417d04afb 100644 --- a/net/adguardhome/files/adguardhome.config +++ b/net/adguardhome/files/adguardhome.config @@ -1,4 +1,5 @@ config adguardhome config - # Where to store persistent data by AdGuard Home - option workdir /var/adguardhome option config /etc/adguardhome.yaml + # Where to store persistent data by AdGuard Home + option workdir /var/lib/adguardhome + option pidfile /run/adguardhome.pid diff --git a/net/adguardhome/files/adguardhome.init b/net/adguardhome/files/adguardhome.init index ffdae9c43d87d..328ce693d085b 100644 --- a/net/adguardhome/files/adguardhome.init +++ b/net/adguardhome/files/adguardhome.init @@ -21,13 +21,14 @@ start_service() { fi config_load adguardhome - config_get WORK_DIR config workdir config_get CONFIG_FILE config config "/etc/adguardhome.yaml" + config_get PID_FILE config pidfile "/run/adguardhome.pid" + config_get WORK_DIR config workdir "/var/lib/adguardhome" [ -d "$WORK_DIR" ] || mkdir -m 0755 -p "$WORK_DIR" procd_open_instance - procd_set_param command "$PROG" -c "$CONFIG_FILE" -w "$WORK_DIR" --no-check-update + procd_set_param command "$PROG" -c "$CONFIG_FILE" -w "$WORK_DIR" --pidfile "$PID_FILE" --no-check-update procd_set_param stdout 1 procd_set_param stderr 1 procd_close_instance