Fixed upstream typo in `gnunet.tmpfiles`; avoided forking in `gnunet-system.service` and `gnunet-user.service`

5 files changed, 18 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2e818ad6a243..758d28c3ba20 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gnunet
 	pkgdesc = A framework for secure peer-to-peer networking
 	pkgver = 0.15.2
-	pkgrel = 2
+	pkgrel = 3
 	url = http://gnunet.org
 	arch = i686
 	arch = x86_64
@@ -52,9 +52,9 @@ pkgbase = gnunet
 	validpgpkeys = D8423BCB326C7907033929C7939E6BE1E29FC3CC
 	sha256sums = 23e6af170bb47aacb15d27bbe244d871dbc4d0523b1139bd2f12f4b42b65102e
 	sha256sums = SKIP
-	sha256sums = ef221a4cbdc2270d7a1b1447e6e8a498653ec16d2f73fa57a7c6888980af4dfb
-	sha256sums = 13760ecc1523a9acd030df34e6a90edcd2971271766c8e159c9e66341a9168c4
+	sha256sums = ada52dea6cbade99f671ca006ffdb27a8094884eb273ebc492c533b499dc0f2c
+	sha256sums = 60caee20b53bcc69522556b35ac3d35d89e28c49b9a22a2ed5121df4a2c33be5
 	sha256sums = 66299dbbdd0219d2f5f0520e69fc094f38f789724d973c2f63a421257ea4f755
-	sha256sums = e6db3d48757ee4a95970cc63606e5da86a01776a2c6ffddb8a099dde8bf20f63
+	sha256sums = 842d800e06bf4e32398f7edf429d3e078c7fdee231f646df5209cfe0a1caacf9
 
 pkgname = gnunet
diff --git a/PKGBUILD b/PKGBUILD
index 783f57ad39ff..b47dd73e0cd6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname='gnunet'
 pkgver='0.15.2'
-pkgrel=2
+pkgrel=3
 pkgdesc='A framework for secure peer-to-peer networking'
 arch=('i686' 'x86_64')
 url="http://${pkgname}.org"
@@ -35,10 +35,10 @@ source=("ftp://ftp.gnu.org/gnu/gnunet/${pkgname}-${pkgver}.tar.gz"{,.sig}
 validpgpkeys=('D8423BCB326C7907033929C7939E6BE1E29FC3CC')
 sha256sums=('23e6af170bb47aacb15d27bbe244d871dbc4d0523b1139bd2f12f4b42b65102e'
             'SKIP'
-            'ef221a4cbdc2270d7a1b1447e6e8a498653ec16d2f73fa57a7c6888980af4dfb'
-            '13760ecc1523a9acd030df34e6a90edcd2971271766c8e159c9e66341a9168c4'
+            'ada52dea6cbade99f671ca006ffdb27a8094884eb273ebc492c533b499dc0f2c'
+            '60caee20b53bcc69522556b35ac3d35d89e28c49b9a22a2ed5121df4a2c33be5'
             '66299dbbdd0219d2f5f0520e69fc094f38f789724d973c2f63a421257ea4f755'
-            'e6db3d48757ee4a95970cc63606e5da86a01776a2c6ffddb8a099dde8bf20f63')
+            '842d800e06bf4e32398f7edf429d3e078c7fdee231f646df5209cfe0a1caacf9')
 
 prepare() {
 
diff --git a/gnunet-system.service b/gnunet-system.service
index 63cbd717f1b3..b538802c46e0 100644
--- a/gnunet-system.service
+++ b/gnunet-system.service
@@ -1,13 +1,12 @@
 [Unit]
-Description=A framework for secure peer-to-peer networking
+Description=GNUnet system service
+After=network.target
 
 [Service]
+Type=simple
 User=gnunet
-Type=forking
-ExecStart=/usr/bin/gnunet-arm -c /etc/gnunet.conf -s
-ExecStop=/usr/bin/gnunet-arm -c /etc/gnunet.conf -e
+ExecStart=/usr/lib/gnunet/libexec/gnunet-service-arm -c /etc/gnunet.conf
 StateDirectory=gnunet
-GuessMainPID=no
 
 [Install]
 WantedBy=multi-user.target
diff --git a/gnunet-user.service b/gnunet-user.service
index 14546a02eba0..ae9f0d4f5ad7 100644
--- a/gnunet-user.service
+++ b/gnunet-user.service
@@ -1,11 +1,10 @@
 [Unit]
-Description=A framework for secure peer-to-peer networking
+Description=GNUnet user service
+After=network.target
 
 [Service]
-Type=forking
-ExecStart=gnunet-arm -c ~/.config/gnunet.conf -s
-ExecStop=gnunet-arm -c ~/.config/gnunet.conf -e
-GuessMainPID=no
+Type=simple
+ExecStart=/usr/lib/gnunet/libexec/gnunet-service-arm -c ~/.config/gnunet.conf
 
 [Install]
 WantedBy=multi-user.target
diff --git a/gnunet.tmpfiles b/gnunet.tmpfiles
index c10be2b366ef..d59948495928 100644
--- a/gnunet.tmpfiles
+++ b/gnunet.tmpfiles
@@ -1,5 +1,6 @@
 d /var/lib/gnunet 0700 gnunet gnunet - -
-z /usr/lib/gnunet/gnunet-helper-dns 2750 gnunet gnunetdns - -
+z /usr/lib/gnunet/gnunet-helper-dns 4750 root gnunetdns - -
+z /usr/lib/gnunet/gnunet-service-dns 2750 gnunet gnunetdns - -
 z /usr/lib/gnunet/libexec/gnunet-helper-vpn 4750 root root - -
 z /usr/lib/gnunet/libexec/gnunet-helper-transport-wlan 4750 root root - -
 z /usr/lib/gnunet/libexec/gnunet-helper-transport-bluetooth 4750 root root - -