From b4d9f8e838817acca902d7f7bbb0d1c04f916cd3 Mon Sep 17 00:00:00 2001
From: graysky <graysky@archlinux.us>
Date: Tue, 19 May 2020 05:38:51 -0400
Subject: [PATCH] Update to 0.102.0-2

---
 .SRCINFO            |  8 ++++++--
 AdGuardHome.service |  5 +++--
 PKGBUILD            | 10 +++++++---
 readme.install      | 21 ++++++---------------
 sysusers.conf       |  3 +++
 tmpfiles.conf       |  2 ++
 6 files changed, 27 insertions(+), 22 deletions(-)
 create mode 100644 sysusers.conf
 create mode 100644 tmpfiles.conf

diff --git a/.SRCINFO b/.SRCINFO
index d04209a..29afafe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = adguardhome
 	pkgdesc = Network-wide ads and trackers blocking DNS server
 	pkgver = 0.102.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/AdguardTeam/AdGuardHome
 	install = readme.install
 	arch = x86_64
@@ -11,8 +11,12 @@ pkgbase = adguardhome
 	makedepends = git
 	source = adguardhome-0.102.0.tar.gz::https://github.com/AdguardTeam/AdGuardHome/archive/v0.102.0.tar.gz
 	source = AdGuardHome.service
+	source = sysusers.conf
+	source = tmpfiles.conf
 	sha256sums = ef6f12a0a61c96c82fc0a6a97ffbd6c4fdb827b1959ad3d10f8d52aaf8c51903
-	sha256sums = 6a4d449f4749c5528cd324bb1bfa55090fb43a58dd3038f39f1ca9aed4a1b5ae
+	sha256sums = 3eb76cc878f544bfc276929096c1d7d233e2e3d613886ee9a78b306ac3cd763e
+	sha256sums = e9a50b7004218803ecf44c0be8c7fb28d584e8b7b3a821f26ff3478816ab0afd
+	sha256sums = 7cacae3dad7042f331208a47f7177a27b03a45984659df900ac175d715883aad
 
 pkgname = adguardhome
 
diff --git a/AdGuardHome.service b/AdGuardHome.service
index ec50d3a..f0b19d8 100644
--- a/AdGuardHome.service
+++ b/AdGuardHome.service
@@ -7,16 +7,17 @@ After=syslog.target network-online.target
 User=adguardhome
 Group=adguardhome
 
+AmbientCapabilities=CAP_NET_BIND_SERVICE
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE
 StartLimitInterval=5
 StartLimitBurst=10
-ExecStart=/var/lib/adguardhome/AdGuardHome "-s" "run"
+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
-EnvironmentFile=-/etc/sysconfig/AdGuardHome
 
 [Install]
 WantedBy=multi-user.target
diff --git a/PKGBUILD b/PKGBUILD
index 4a329ef..5326593 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,18 +3,20 @@
 pkgname=adguardhome
 _pkgname=AdGuardHome
 pkgver=0.102.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Network-wide ads and trackers blocking DNS server"
 arch=('x86_64')
 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
+  "$_pkgname.service" sysusers.conf tmpfiles.conf
 )
 makedepends=(go npm git)
 install=readme.install
 sha256sums=('ef6f12a0a61c96c82fc0a6a97ffbd6c4fdb827b1959ad3d10f8d52aaf8c51903'
-            '6a4d449f4749c5528cd324bb1bfa55090fb43a58dd3038f39f1ca9aed4a1b5ae')
+            '3eb76cc878f544bfc276929096c1d7d233e2e3d613886ee9a78b306ac3cd763e'
+            'e9a50b7004218803ecf44c0be8c7fb28d584e8b7b3a821f26ff3478816ab0afd'
+            '7cacae3dad7042f331208a47f7177a27b03a45984659df900ac175d715883aad')
 
 build(){
   cd "$_pkgname-$pkgver"
@@ -24,4 +26,6 @@ build(){
 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"
 }
diff --git a/readme.install b/readme.install
index 092fede..23a1742 100644
--- a/readme.install
+++ b/readme.install
@@ -1,19 +1,10 @@
 post_install() {
-  getent group adguardhome > /dev/null || groupadd -g 555 adguardhome
-  if ! getent passwd adguardhome > /dev/null; then
-    useradd -c 'adguardhome user' -u 555 -g adguardhome \
-      -d /var/lib/adguardhome -s /usr/bin/nologin adguardhome
-    passwd -l adguardhome > /dev/null
-    [[ ! -d /var/lib/adguardhome/ ]] &&
-      mkdir /var/lib/adguardhome/ &&
-      chown -R adguardhome:adguardhome /var/lib/adguardhome/
-  fi
-
-  post_upgrade
-}
-
-post_upgrade() {
-  setcap CAP_NET_BIND_SERVICE=+eip /var/lib/adguardhome/AdGuardHome
+  echo "==>   FIRST TIME SETUP"
+  echo "::  1. First time run as root:  /var/lib/adguardhome/AdGuardHome"
+  echo "::  2. Log in to web interface to create config: http://ip.of.server:3000"
+  echo "::     Stop AdGuardHome with ctrl+c when complete"
+  echo "::  3. Fix permissions:  chown -R adguardhome:adguardhome /var/lib/adguardhome"
+  echo "==>   Now you can start AdGuardHome.service via systemd and run as the unprivileged user"
 }
 
 post_remove() {
diff --git a/sysusers.conf b/sysusers.conf
new file mode 100644
index 0000000..85f7f2e
--- /dev/null
+++ b/sysusers.conf
@@ -0,0 +1,3 @@
+g adguardhome - -
+u adguardhome - "adguardhome user" /var/lib/adguardhome
+m adguardhome adguardhome
diff --git a/tmpfiles.conf b/tmpfiles.conf
new file mode 100644
index 0000000..05500ef
--- /dev/null
+++ b/tmpfiles.conf
@@ -0,0 +1,2 @@
+d /var/lib/adguardhome 0750 adguardhome adguardhome - -
+Z /var/lib/adguardhome - adguardhome adguardhome - -