[arch-commits] Commit in fetchmail/trunk (3 files)

[Pierre Schmitz]

    Date: Sunday, January 15, 2017 @ 10:16:20
  Author: pierre
Revision: 286422

upgpkg: fetchmail 6.3.26-5

Use tmpfiles and sysusers hooks

Added:
  fetchmail/trunk/fetchmail.sysusers
Modified:
  fetchmail/trunk/PKGBUILD
Deleted:
  fetchmail/trunk/fetchmail.install

--------------------+
 PKGBUILD           |    8 ++++----
 fetchmail.install  |   19 -------------------
 fetchmail.sysusers |    2 ++
 3 files changed, 6 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-15 10:15:50 UTC (rev 286421)
+++ PKGBUILD	2017-01-15 10:16:20 UTC (rev 286422)
@@ -2,7 +2,7 @@
 
 pkgname=fetchmail
 pkgver=6.3.26
-pkgrel=4
+pkgrel=5
 pkgdesc="A remote-mail retrieval utility"
 arch=('i686' 'x86_64')
 url="http://www.fetchmail.info"
@@ -12,15 +12,14 @@
 optdepends=('tk: for using fetchmailconf'
             'python2: for using fetchmailconf')
 options=('!makeflags')
-install='fetchmail.install'
 source=("http://sourceforge.net/projects/fetchmail/files/branch_6.3/${pkgname}-${pkgver}.tar.xz"
         "http://sourceforge.net/projects/fetchmail/files/branch_6.3/${pkgname}-${pkgver}.tar.xz.asc"
-        'disable-sslv3.patch'
-        'fetchmail.tmpfiles' 'fetchmail.service')
+        'disable-sslv3.patch' 'fetchmail.tmpfiles' 'fetchmail.sysusers' 'fetchmail.service')
 sha1sums=('de8dbe62a8edfa232ee4278257a1fe67aa1c797a'
           'SKIP'
           'dab3bf46b033e8ee7cadc020c1fb4ce325f46693'
           '199ba749c829f22286c34aabcf8b7dd5bbd7c0e6'
+          'b113cb61a866eff53cd8f113d084a99f01bf5d77'
           '0fc1870a33d1e0efb70169ddf1b6adc9d253e076')
 validpgpkeys=('FDD00C436E3307E10758C6A8BE618339052E7D95')
 
@@ -41,5 +40,6 @@
   make DESTDIR="${pkgdir}" install
   install -d -o 90 -g nobody "${pkgdir}/var/lib/fetchmail"
   install -D -m644 ${srcdir}/fetchmail.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/fetchmail.conf
+  install -D -m644 ${srcdir}/fetchmail.sysusers ${pkgdir}/usr/lib/sysusers.d/fetchmail.conf
   install -D -m644 ${srcdir}/fetchmail.service ${pkgdir}/usr/lib/systemd/system/fetchmail.service
 }

Deleted: fetchmail.install
===================================================================
--- fetchmail.install	2017-01-15 10:15:50 UTC (rev 286421)
+++ fetchmail.install	2017-01-15 10:16:20 UTC (rev 286422)
@@ -1,19 +0,0 @@
-post_install() {
-  # /etc/fetchmail must be owned by fetchmail for daemon to work.
-  echo "If you run fetchmail as a daemon and not a cron job"
-  echo "then 'chown fetchmail /etc/fetchmailrc'"
-  getent passwd fetchmail >/dev/null || usr/sbin/useradd -u 90 -g nobody \
-      -d '/var/lib/fetchmail' -c 'Fetchmail daemon' -s /bin/false fetchmail
-  if [[ ! -d run/fetchmail ]]; then
-    usr/bin/systemd-tmpfiles --create fetchmail.conf
-  fi
-}
-
-post_upgrade() {
-  getent passwd fetchmail >/dev/null || usr/sbin/useradd -u 90 -g nobody \
-      -d '/var/lib/fetchmail' -c 'Fetchmail daemon' -s /bin/false fetchmail
-
-  if [[ ! -d run/fetchmail ]]; then
-    usr/bin/systemd-tmpfiles --create fetchmail.conf
-  fi
-}

Added: fetchmail.sysusers
===================================================================
--- fetchmail.sysusers	                        (rev 0)
+++ fetchmail.sysusers	2017-01-15 10:16:20 UTC (rev 286422)
@@ -0,0 +1,2 @@
+u fetchmail 90 "Fetchmail daemon" /var/lib/fetchmail
+m fetchmail nobody