upgpkg: adguardhome 1:0.107.5-2

8 files changed, 41 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 306055851f38..cf350e0c7173 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,9 @@
 pkgbase = adguardhome
 	pkgdesc = Network-wide ads and trackers blocking DNS server
 	pkgver = 0.107.5
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 1
 	url = https://github.com/AdguardTeam/AdGuardHome
-	install = readme.install
 	arch = x86_64
 	arch = aarch64
 	arch = armv7h
@@ -16,12 +15,10 @@ pkgbase = adguardhome
 	makedepends = yarn
 	makedepends = git
 	source = adguardhome-0.107.5.tar.gz::https://github.com/AdguardTeam/AdGuardHome/archive/v0.107.5.tar.gz
-	source = AdGuardHome.service
-	source = sysusers.conf
-	source = tmpfiles.conf
+	source = adguardhome.service
+	source = adguardhome.defaults
 	b2sums = 92b7027296622862715479b265b79b7147afd69beef6cbb7bf02409ab288965f5bf77d87390ddd9068e0c061247a5071e43ad65e3337b919985964792fbc5ed1
-	b2sums = 6221c78867c502db943e74104ade432ba11ea779bb431eb642ee0d8c5f84e73d01dfac2aea4babd1dcce181d68f92f7fb7976f16db43f7effd718a46a83ed403
-	b2sums = ae0b990800fbf1468c261def013a1d06cc6185dd2bb85cf1a6f7a6834f3ba29c390f052b8871f2a49b2a83f297a565772c4de73649b24bdc94efd87946ef88a2
-	b2sums = 430f32020a6077951fc98f8375fffed3b304645f398de4f5ce38ef2233439e23a1e3919fa9e7c93472eb2da75629c7d7ccaae9fe2c48dfe42315020c524a4053
+	b2sums = 0e45eb3b76d00110d53caeebb4ced95b97895d8b2b4934d3bd7bdac3a572690a6c5dc176d70b5e1d9ac5f8e358e192dbd32681e01df92b404286103475bd22ba
+	b2sums = ec3a3cd8debae4dcb4a723ef2ba31960aa1f897e2f8c857fcf9861bc7959072b22fed3091c0d07084c280be0755d03bf6ca4fef5f2d08ae20397378e13cf9c9b
 
 pkgname = adguardhome
diff --git a/AdGuardHome.service b/AdGuardHome.service
deleted file mode 100644
index 6b5bdc4f2ebf..000000000000
--- a/AdGuardHome.service
+++ /dev/null
@@ -1,23 +0,0 @@
-[Unit]
-Description=AdGuard Home: Network-level blocker
-ConditionFileIsExecutable=/var/lib/adguardhome/AdGuardHome
-After=syslog.target network-online.target
-
-[Service]
-User=adguardhome
-Group=adguardhome
-
-AmbientCapabilities=CAP_NET_BIND_SERVICE CAP_NET_RAW
-CapabilityBoundingSet=CAP_NET_BIND_SERVICE CAP_NET_RAW
-StartLimitInterval=5
-StartLimitBurst=10
-ExecStart=/var/lib/adguardhome/AdGuardHome -s run
-
-WorkingDirectory=/var/lib/adguardhome
-StandardOutput=file:/var/lib/adguardhome/AdGuardHome.out
-StandardError=file:/var/lib/adguardhome/AdGuardHome.err
-Restart=always
-RestartSec=10
-
-[Install]
-WantedBy=multi-user.target
diff --git a/PKGBUILD b/PKGBUILD
index 98c555b0af2f..e215ab78bc6d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,36 @@
-# Maintainer Pavers_Career <pavers_career_0d AT ícloud DOT com>
+# Maintainer: Giovanni Harting <539@idlegandalf.com>
+# Contributor: Pavers_Career <pavers_career_0d AT ícloud DOT com>
 
 pkgname=adguardhome
 _pkgname=AdGuardHome
 pkgver=0.107.5
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="Network-wide ads and trackers blocking DNS server"
 arch=(x86_64 aarch64 armv7h armv6h)
 url="https://github.com/AdguardTeam/AdGuardHome"
 license=('GPL')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/AdguardTeam/AdGuardHome/archive/v$pkgver.tar.gz"
-  "$_pkgname.service" sysusers.conf tmpfiles.conf
+        "$pkgname.service"
+        "$pkgname.defaults"
 )
 makedepends=(go 'nodejs<17.0.0' npm yarn git)
-install=readme.install
 b2sums=('92b7027296622862715479b265b79b7147afd69beef6cbb7bf02409ab288965f5bf77d87390ddd9068e0c061247a5071e43ad65e3337b919985964792fbc5ed1'
-        '6221c78867c502db943e74104ade432ba11ea779bb431eb642ee0d8c5f84e73d01dfac2aea4babd1dcce181d68f92f7fb7976f16db43f7effd718a46a83ed403'
-        'ae0b990800fbf1468c261def013a1d06cc6185dd2bb85cf1a6f7a6834f3ba29c390f052b8871f2a49b2a83f297a565772c4de73649b24bdc94efd87946ef88a2'
-        '430f32020a6077951fc98f8375fffed3b304645f398de4f5ce38ef2233439e23a1e3919fa9e7c93472eb2da75629c7d7ccaae9fe2c48dfe42315020c524a4053')
+        '0e45eb3b76d00110d53caeebb4ced95b97895d8b2b4934d3bd7bdac3a572690a6c5dc176d70b5e1d9ac5f8e358e192dbd32681e01df92b404286103475bd22ba'
+        'ec3a3cd8debae4dcb4a723ef2ba31960aa1f897e2f8c857fcf9861bc7959072b22fed3091c0d07084c280be0755d03bf6ca4fef5f2d08ae20397378e13cf9c9b')
 
-build(){
+prepare() {
+  cd "$_pkgname-$pkgver"
+  go get github.com/lucas-clemente/quic-go@9c8cadba9e359c2339372071e4f4fb0bd6c2f75b
+}
+
+build() {
   cd "$_pkgname-$pkgver"
   make -j1 CHANNEL=release VERBOSE=1 VERSION=v$pkgver
 }
 
 package() {
-  install -Dm755 "$_pkgname-$pkgver/$_pkgname" "$pkgdir/var/lib/adguardhome/$_pkgname"
-  install -Dm644 "$_pkgname.service" "$pkgdir/usr/lib/systemd/system/$_pkgname.service"
-  install -Dm644 "$srcdir"/sysusers.conf "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
-  install -Dm644 "$srcdir"/tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
+  install -Dm755 "$_pkgname-$pkgver/$_pkgname" "$pkgdir/usr/bin/$pkgname"
+  install -Dm644 "$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+  install -Dm644 "$srcdir"/$pkgname.defaults "$pkgdir/etc/defaults/$pkgname"
 }
diff --git a/adguardhome.defaults b/adguardhome.defaults
new file mode 100644
index 000000000000..5b7fbc75bc18
--- /dev/null
+++ b/adguardhome.defaults
@@ -0,0 +1,5 @@
+# host and port for webinterface only
+HOST=127.0.0.1
+PORT=3000
+# addititonal arguments
+ARGS=""
diff --git a/adguardhome.service b/adguardhome.service
new file mode 100644
index 000000000000..9ef8e0d4869d
--- /dev/null
+++ b/adguardhome.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=AdGuard Home: Network-level blocker
+After=syslog.target network-online.target
+
+[Service]
+DynamicUser=true
+StateDirectory=adguardhome
+EnvironmentFile=/etc/default/adguardhome
+AmbientCapabilities=CAP_NET_BIND_SERVICE CAP_NET_RAW
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE CAP_NET_RAW
+ExecStart=/usr/bin/adguardhome -h $HOST -p $PORT $ARGS
+WorkingDirectory=/var/lib/adguardhome
+
+[Install]
+WantedBy=multi-user.target
diff --git a/readme.install b/readme.install
deleted file mode 100644
index 2f0cd06b9e79..000000000000
--- a/readme.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_remove() {
-  cat <<END
-
->>> Optionally delete the adguardhome user and its home directory if you are
-    certain no processes are running under it:
-    rm -rf /var/lib/adguardhome
-
-END
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/sysusers.conf b/sysusers.conf
deleted file mode 100644
index 85f7f2eac916..000000000000
--- a/sysusers.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-g adguardhome - -
-u adguardhome - "adguardhome user" /var/lib/adguardhome
-m adguardhome adguardhome
diff --git a/tmpfiles.conf b/tmpfiles.conf
deleted file mode 100644
index 05500ef1171a..000000000000
--- a/tmpfiles.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-d /var/lib/adguardhome 0750 adguardhome adguardhome - -
-Z /var/lib/adguardhome - adguardhome adguardhome - -