From 3ccc50ee6e79abd7110ed382b9e5b2fc7832c5a3 Mon Sep 17 00:00:00 2001
From: Alex Flierl <shad0w73@freenet.de>
Date: Tue, 27 Jan 2026 19:38:49 +0100
Subject: [PATCH] Remove the sysusers and tmpfiles config files

The adguardhome package now provides its own sysusers config file

The directory in the tmpfiles config file is also created in the init script
---
 .SRCINFO             |  6 +-----
 .gitignore           |  2 --
 PKGBUILD             | 12 +++---------
 adguardhome.sysusers |  1 -
 adguardhome.tmpfiles |  1 -
 5 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 adguardhome.sysusers
 delete mode 100644 adguardhome.tmpfiles

diff --git a/.SRCINFO b/.SRCINFO
index bbf546d532f5..829c5e92eff1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = adguardhome-openrc
 	pkgdesc = OpenRC adguardhome init script
 	pkgver = 20250416
-	pkgrel = 1
+	pkgrel = 2
 	url = https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/testing/adguardhome
 	arch = any
 	license = unknown
@@ -12,11 +12,7 @@ pkgbase = adguardhome-openrc
 	backup = etc/conf.d/adguardhome
 	source = adguardhome.confd::https://gitlab.alpinelinux.org/api/v4/projects/1/repository/files/testing%2Fadguardhome%2Fadguardhome.confd/raw?ref=3be504af77e6a5c639dc6111a4624d2f40f8991f
 	source = adguardhome.initd::https://gitlab.alpinelinux.org/api/v4/projects/1/repository/files/testing%2Fadguardhome%2Fadguardhome.initd/raw?ref=3be504af77e6a5c639dc6111a4624d2f40f8991f
-	source = adguardhome.sysusers
-	source = adguardhome.tmpfiles
 	sha256sums = 2e8de4fe94c4a98e015ab5087670e3a9d406623ef518c57575c7240ded91540d
 	sha256sums = 004274c6ec39c56a21f24281d550f81288db0669e9ea1a9980423059ceeeaf3b
-	sha256sums = cb3089f85a0188255e74c6ec21e1a433e9c4e2ea3cc2920f91fbf384dce56b77
-	sha256sums = d847934161583bd84882c726bd34238524d0f256230fc1f64005e9ec5d699dcb
 
 pkgname = adguardhome-openrc
diff --git a/.gitignore b/.gitignore
index d1d15396f579..bbfa925db5e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,4 @@
 !.SRCINFO
 !.gitignore
 !PKGBUILD
-!adguardhome.sysusers
-!adguardhome.tmpfiles
 *
diff --git a/PKGBUILD b/PKGBUILD
index 89cd6901c3ad..7afae79c43de 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ _gitlab_api_path="${_gitlab}/api/v4/projects/1/repository/files/testing%2Fadguar
 _commit=3be504af77e6a5c639dc6111a4624d2f40f8991f
 pkgname=adguardhome-openrc
 pkgver=20250416
-pkgrel=1
+pkgrel=2
 pkgdesc='OpenRC adguardhome init script'
 arch=('any')
 url="${_gitlab}/alpine/aports/-/tree/master/testing/adguardhome"
@@ -16,17 +16,11 @@ provides=('init-adguardhome')
 conflicts=('init-adguardhome')
 backup=('etc/conf.d/adguardhome')
 source=("adguardhome.confd::${_gitlab_api_path}adguardhome.confd/raw?ref=${_commit}"
-        "adguardhome.initd::${_gitlab_api_path}adguardhome.initd/raw?ref=${_commit}"
-        'adguardhome.sysusers'
-        'adguardhome.tmpfiles')
+        "adguardhome.initd::${_gitlab_api_path}adguardhome.initd/raw?ref=${_commit}")
 sha256sums=('2e8de4fe94c4a98e015ab5087670e3a9d406623ef518c57575c7240ded91540d'
-            '004274c6ec39c56a21f24281d550f81288db0669e9ea1a9980423059ceeeaf3b'
-            'cb3089f85a0188255e74c6ec21e1a433e9c4e2ea3cc2920f91fbf384dce56b77'
-            'd847934161583bd84882c726bd34238524d0f256230fc1f64005e9ec5d699dcb')
+            '004274c6ec39c56a21f24281d550f81288db0669e9ea1a9980423059ceeeaf3b')
 
 package() {
 	install -Dm 644 "${srcdir}"/adguardhome.confd "${pkgdir}"/etc/conf.d/adguardhome
 	install -Dm 755 "${srcdir}"/adguardhome.initd "${pkgdir}"/etc/init.d/adguardhome
-	install -Dm 644 "${srcdir}"/adguardhome.sysusers "${pkgdir}"/usr/lib/sysusers.d/adguardhome.conf
-	install -Dm 644 "${srcdir}"/adguardhome.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/adguardhome.conf
 }
diff --git a/adguardhome.sysusers b/adguardhome.sysusers
deleted file mode 100644
index aa90664657bd..000000000000
--- a/adguardhome.sysusers
+++ /dev/null
@@ -1 +0,0 @@
-u! adguardhome - adguardhome /var/lib/adguardhome
diff --git a/adguardhome.tmpfiles b/adguardhome.tmpfiles
deleted file mode 100644
index 9d3c032274d1..000000000000
--- a/adguardhome.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /var/lib/adguardhome 0700 adguardhome adguardhome - -