diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 19 | ||||
| -rw-r--r-- | gnunet-system.service (renamed from gnunet.service) | 4 | ||||
| -rw-r--r-- | gnunet-user.service | 11 |
4 files changed, 31 insertions, 13 deletions
@@ -1,6 +1,6 @@ pkgbase = gnunet-git pkgdesc = A framework for secure peer-to-peer networking - pkgver = 0.15.0.r29765.ea901fb49 + pkgver = 0.15.1.r29771.1fe3ee789 pkgrel = 1 url = http://gnunet.org arch = i686 @@ -33,7 +33,7 @@ pkgbase = gnunet-git 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 @@ -47,11 +47,13 @@ pkgbase = gnunet-git options = !makeflags backup = etc/gnunet.conf source = git+https://gnunet.org/git/gnunet.git - source = gnunet.service + source = gnunet-system.service + source = gnunet-user.service source = gnunet.sysusers source = gnunet.tmpfiles sha256sums = SKIP - sha256sums = 81310f5df1790d9e4d806ac2ed9fe761b13eeafdae584eb59ec2e8a52b088485 + sha256sums = ef221a4cbdc2270d7a1b1447e6e8a498653ec16d2f73fa57a7c6888980af4dfb + sha256sums = 13760ecc1523a9acd030df34e6a90edcd2971271766c8e159c9e66341a9168c4 sha256sums = 66299dbbdd0219d2f5f0520e69fc094f38f789724d973c2f63a421257ea4f755 sha256sums = 4e3f8015dcc83ea4efb913abb9eb7d8d15ba3a5834218634ee2f350b903ef77b @@ -6,7 +6,7 @@ _appname='gnunet' pkgname="${_appname}-git" -pkgver='0.15.0.r29765.ea901fb49' +pkgver='0.15.1.r29771.1fe3ee789' pkgrel=1 pkgdesc='A framework for secure peer-to-peer networking' arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ depends=('bash' 'which' 'gnutls' 'gnurl' 'libgcrypt' 'libunistring' 'libidn2' makedepends=('gettext' 'pkgconfig' 'libtool' 'bluez-libs' 'python' 'libpulse' 'git' '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' @@ -31,20 +31,22 @@ optdepends=('bluez: for bluetooth transport' backup=("etc/${_appname}.conf") options=('!makeflags') source=("git+https://${_appname}.org/git/${_appname}.git" - "${_appname}.service" + "${_appname}-system.service" + "${_appname}-user.service" "${_appname}.sysusers" "${_appname}.tmpfiles") sha256sums=('SKIP' - '81310f5df1790d9e4d806ac2ed9fe761b13eeafdae584eb59ec2e8a52b088485' + 'ef221a4cbdc2270d7a1b1447e6e8a498653ec16d2f73fa57a7c6888980af4dfb' + '13760ecc1523a9acd030df34e6a90edcd2971271766c8e159c9e66341a9168c4' '66299dbbdd0219d2f5f0520e69fc094f38f789724d973c2f63a421257ea4f755' '4e3f8015dcc83ea4efb913abb9eb7d8d15ba3a5834218634ee2f350b903ef77b') pkgver() { - cd "${_appname}" + cd "${_appname}" > /dev/null 2>&1 printf "'%s.r%s.%s'" \ - "$(grep 'AC_INIT' configure.ac | grep -o '[0-9]\(\.[0-9]\+\)\+')" \ + "$(grep 'AC_INIT' 'configure.ac' | grep -o '[0-9]\(\.[0-9]\+\)\+')" \ "$(git rev-list --count HEAD)" \ "$(git rev-parse --short HEAD)" @@ -77,7 +79,10 @@ package() { make DESTDIR="${pkgdir}" -C contrib install install -dm755 "${pkgdir}/usr/lib/systemd/system" - install -Dm644 "${srcdir}/${_appname}.service" "${pkgdir}/usr/lib/systemd/system/${_appname}.service" + install -Dm644 "${srcdir}/${_appname}-system.service" "${pkgdir}/usr/lib/systemd/system/${_appname}.service" + + install -dm755 "${pkgdir}/usr/lib/systemd/user" + install -Dm0644 "${srcdir}/${_appname}-user.service" "${pkgdir}/usr/lib/systemd/user/${_appname}.service" install -dm755 "${pkgdir}/usr/lib/sysusers.d" install -Dm644 "${srcdir}/${_appname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${_appname}.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 |