[arch-commits] Commit in amule/trunk (4 files)

[Antonio Rojas]

    Date: Thursday, June 15, 2017 @ 07:08:01
  Author: arojas
Revision: 237107

Switch to sysusers

Added:
  amule/trunk/amule.sysusers
  amule/trunk/amule.tmpfiles
Modified:
  amule/trunk/PKGBUILD
  amule/trunk/amule.install

----------------+
 PKGBUILD       |   29 +++++++++++++++++------------
 amule.install  |    5 -----
 amule.sysusers |    2 ++
 amule.tmpfiles |    1 +
 4 files changed, 20 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-15 06:52:16 UTC (rev 237106)
+++ PKGBUILD	2017-06-15 07:08:01 UTC (rev 237107)
@@ -1,5 +1,6 @@
 # $Id$
-# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
 # Contributor: Henrik Ronellenfitsch <searinox at web.de>
 # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
 # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
@@ -7,20 +8,21 @@
 
 pkgname=amule
 pkgver=10990
-pkgrel=1
+pkgrel=2
 pkgdesc="An eMule-like client for ed2k p2p network"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://www.amule.org"
-license=('GPL')
-depends=('wxgtk2' 'gd' 'geoip' 'libupnp' 'crypto++' 'boost-libs')
-makedepends=('git' 'ccache' 'boost')
+license=(GPL)
+depends=(wxgtk2 gd geoip libupnp crypto++ boost-libs)
+makedepends=(git ccache boost)
 install=amule.install
 source=("git://repo.or.cz/amule.git#tag=amule-svn-r$pkgver"
-        'amuled.systemd'
-        'amuleweb.systemd')
+        amuled.systemd amuleweb.systemd amule.sysusers amule.tmpfiles)
 sha256sums=('SKIP'
             '527a2cca6d56b8269722aafc77a89734f59a929f946f342bd0f69b256f9c7522'
-            'f4f43b1154ddccc9036a4291a58c6715f097b171fec62ea7aead0c9d9fa654f2')
+            'f4f43b1154ddccc9036a4291a58c6715f097b171fec62ea7aead0c9d9fa654f2'
+            'bb25648a121c85f8b2d9b83ccfa691a5f1f475aeaae4570ecde7581baa3bf0ac'
+            'e9d1b7019c7075b0f8616c6507a767b87de8f899936680e9ff5829d8cbba224d')
 
 build() {
   cd amule
@@ -47,8 +49,11 @@
 package() {
   cd amule
 
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="$pkgdir" install
 
-  install -D -m644 "${srcdir}/amuled.systemd" "${pkgdir}/usr/lib/systemd/system/amuled.service"
-  install -D -m644 "${srcdir}/amuleweb.systemd" "${pkgdir}/usr/lib/systemd/system/amuleweb.service"
+  install -Dm644 "$srcdir"/amuled.systemd "$pkgdir"/usr/lib/systemd/system/amuled.service
+  install -Dm644 "$srcdir"/amuleweb.systemd "$pkgdir"/usr/lib/systemd/system/amuleweb.service
+  install -Dm644 "$srcdir"/amule.sysusers "$pkgdir"/usr/lib/sysusers.d/amule.conf
+  install -Dm644 "$srcdir"/amule.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/amule.conf
+
 }

Modified: amule.install
===================================================================
--- amule.install	2017-06-15 06:52:16 UTC (rev 237106)
+++ amule.install	2017-06-15 07:08:01 UTC (rev 237107)
@@ -1,6 +1,5 @@
 post_install() {
   post_upgrade
-  passwd -l amule &>/dev/null
 }
 
 _config_instructions() {
@@ -12,10 +11,6 @@
 }
 
 post_upgrade() {
-  # create user/group that the daemon will run as by default, do not delete this on uninstall, as it will own files
-  getent group amule >/dev/null || groupadd amule
-  getent passwd amule >/dev/null || useradd --system -c 'aMule Client' -g amule -d '/var/lib/amule' -m -s /bin/false amule
-
   if [ ! -e /var/lib/amule/.aMule/amule.conf ]; then
     _config_instructions
   fi

Added: amule.sysusers
===================================================================
--- amule.sysusers	                        (rev 0)
+++ amule.sysusers	2017-06-15 07:08:01 UTC (rev 237107)
@@ -0,0 +1,2 @@
+u amule - "aMule Client" /var/lib/amule
+g amule -

Added: amule.tmpfiles
===================================================================
--- amule.tmpfiles	                        (rev 0)
+++ amule.tmpfiles	2017-06-15 07:08:01 UTC (rev 237107)
@@ -0,0 +1 @@
+d /var/lib/amule 0750 amule amule