Added `systemd/user` service and updated `$optdepends`

4 files changed, 29 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9fd245f627ba..d305db3ab001 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gnunet
 	pkgdesc = A framework for secure peer-to-peer networking
 	pkgver = 0.15.0
-	pkgrel = 11
+	pkgrel = 12
 	url = http://gnunet.org
 	arch = i686
 	arch = x86_64
@@ -31,7 +31,7 @@ pkgbase = gnunet
 	depends = brotli
 	depends = gettext
 	optdepends = bluez: for bluetooth transport
-	optdepends = libzbar: for reading/writing GNUnet URIs from/to QR codes using gnunet-qr
+	optdepends = zbar: for reading/writing GNUnet URIs from/to QR codes using gnunet-qr
 	optdepends = texlive-core: for generating GNS business cards via gnunet-bcd
 	optdepends = miniupnpc: for NAT uPnP support
 	optdepends = libpulse: for conversation service
@@ -45,14 +45,16 @@ pkgbase = gnunet
 	backup = etc/gnunet.conf
 	source = http://ftpmirror.gnu.org/gnunet/gnunet-0.15.0.tar.gz
 	source = http://ftpmirror.gnu.org/gnunet/gnunet-0.15.0.tar.gz.sig
-	source = gnunet.service
+	source = gnunet-system.service
+	source = gnunet-user.service
 	source = gnunet.sysusers
 	source = gnunet.tmpfiles
 	validpgpkeys = 19647543F7861D3BF4E64FF7BF60708B48426C7E
 	validpgpkeys = 3D11063C10F98D14BD24D1470B0998EF86F59B6A
 	sha256sums = cca23d6fb40890a5eb2ccae4b8f7e74c8e4e84d3fca2f419d775cb4a58dd9a67
 	sha256sums = SKIP
-	sha256sums = 81310f5df1790d9e4d806ac2ed9fe761b13eeafdae584eb59ec2e8a52b088485
+	sha256sums = ef221a4cbdc2270d7a1b1447e6e8a498653ec16d2f73fa57a7c6888980af4dfb
+	sha256sums = 13760ecc1523a9acd030df34e6a90edcd2971271766c8e159c9e66341a9168c4
 	sha256sums = 66299dbbdd0219d2f5f0520e69fc094f38f789724d973c2f63a421257ea4f755
 	sha256sums = 4e3f8015dcc83ea4efb913abb9eb7d8d15ba3a5834218634ee2f350b903ef77b
 
diff --git a/PKGBUILD b/PKGBUILD
index 20acfa2ca646..85af46c7d5e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname='gnunet'
 pkgver='0.15.0'
-pkgrel=11
+pkgrel=12
 pkgdesc='A framework for secure peer-to-peer networking'
 arch=('i686' 'x86_64')
 url="http://${pkgname}.org"
@@ -18,7 +18,7 @@ depends=('bash' 'which' 'gnutls' 'gnurl' 'libgcrypt' 'libunistring' 'libidn2'
 makedepends=('pkgconfig' 'libtool' 'bluez-libs' 'python' 'libpulse'
              'opus')
 optdepends=('bluez: for bluetooth transport'
-            'libzbar: for reading/writing GNUnet URIs from/to QR codes using gnunet-qr'
+            'zbar: for reading/writing GNUnet URIs from/to QR codes using gnunet-qr'
             'texlive-core: for generating GNS business cards via gnunet-bcd'
             'miniupnpc: for NAT uPnP support'
 	    'libpulse: for conversation service'
@@ -29,14 +29,16 @@ optdepends=('bluez: for bluetooth transport'
 backup=("etc/${pkgname}.conf")
 options=('!makeflags')
 source=("http://ftpmirror.gnu.org/gnunet/${pkgname}-${pkgver}.tar.gz"{,.sig}
-        "${pkgname}.service"
+        "${pkgname}-system.service"
+        "${pkgname}-user.service"
         "${pkgname}.sysusers"
         "${pkgname}.tmpfiles")
 validpgpkeys=('19647543F7861D3BF4E64FF7BF60708B48426C7E'
               '3D11063C10F98D14BD24D1470B0998EF86F59B6A')
 sha256sums=('cca23d6fb40890a5eb2ccae4b8f7e74c8e4e84d3fca2f419d775cb4a58dd9a67'
             'SKIP'
-            '81310f5df1790d9e4d806ac2ed9fe761b13eeafdae584eb59ec2e8a52b088485'
+            'ef221a4cbdc2270d7a1b1447e6e8a498653ec16d2f73fa57a7c6888980af4dfb'
+            '13760ecc1523a9acd030df34e6a90edcd2971271766c8e159c9e66341a9168c4'
             '66299dbbdd0219d2f5f0520e69fc094f38f789724d973c2f63a421257ea4f755'
             '4e3f8015dcc83ea4efb913abb9eb7d8d15ba3a5834218634ee2f350b903ef77b')
 
@@ -66,7 +68,10 @@ package() {
 	make DESTDIR="${pkgdir}" -C contrib install
 
 	install -dm755 "${pkgdir}/usr/lib/systemd/system"
-	install -Dm644 "${srcdir}/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
+	install -Dm644 "${srcdir}/${pkgname}-system.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
+
+	install -dm755 "${pkgdir}/usr/lib/systemd/user"
+	install -Dm0644 "${srcdir}/${pkgname}-user.service" "${pkgdir}/usr/lib/systemd/user/${pkgname}.service"
 
 	install -dm755 "${pkgdir}/usr/lib/sysusers.d"
 	install -Dm644 "${srcdir}/${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
diff --git a/gnunet.service b/gnunet-system.service
index 24c95f6bef2a..63cbd717f1b3 100644
--- a/gnunet.service
+++ b/gnunet-system.service
@@ -4,8 +4,8 @@ Description=A framework for secure peer-to-peer networking
 [Service]
 User=gnunet
 Type=forking
-ExecStart=/usr/bin/gnunet-arm -s -c /etc/gnunet.conf
-ExecStop=/usr/bin/gnunet-arm -e -c /etc/gnunet.conf
+ExecStart=/usr/bin/gnunet-arm -c /etc/gnunet.conf -s
+ExecStop=/usr/bin/gnunet-arm -c /etc/gnunet.conf -e
 StateDirectory=gnunet
 GuessMainPID=no
 
diff --git a/gnunet-user.service b/gnunet-user.service
new file mode 100644
index 000000000000..14546a02eba0
--- /dev/null
+++ b/gnunet-user.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=A framework for secure peer-to-peer networking
+
+[Service]
+Type=forking
+ExecStart=gnunet-arm -c ~/.config/gnunet.conf -s
+ExecStop=gnunet-arm -c ~/.config/gnunet.conf -e
+GuessMainPID=no
+
+[Install]
+WantedBy=multi-user.target