[arch-commits] Commit in nullmailer/trunk (PKGBUILD nullmailer.install)

[Martin Wimpress]

    Date: Wednesday, February 11, 2015 @ 13:25:53
  Author: flexiondotorg
Revision: 127557

upgpkg: nullmailer 1.13-4 - Do not remove user and group on uninstall.

Modified:
  nullmailer/trunk/PKGBUILD
  nullmailer/trunk/nullmailer.install

--------------------+
 PKGBUILD           |    3 ++-
 nullmailer.install |    9 ---------
 2 files changed, 2 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-11 12:08:16 UTC (rev 127556)
+++ PKGBUILD	2015-02-11 12:25:53 UTC (rev 127557)
@@ -5,7 +5,7 @@
 
 pkgname=nullmailer
 pkgver=1.13
-pkgrel=3
+pkgrel=4
 pkgdesc="Simple relay-only mail transport agent."
 arch=('i686' 'x86_64')
 url="http://www.untroubled.org/nullmailer/"
@@ -13,6 +13,7 @@
 provides=('smtp-forwarder')
 conflicts=('smtp-forwarder' 'smtp-server')
 depends=('gnutls')
+options=(emptydirs)
 install=nullmailer.install
 source=("http://www.untroubled.org/nullmailer/archive/${pkgname}-${pkgver}.tar.gz"
         nullmailer.service)

Modified: nullmailer.install
===================================================================
--- nullmailer.install	2015-02-11 12:08:16 UTC (rev 127556)
+++ nullmailer.install	2015-02-11 12:25:53 UTC (rev 127557)
@@ -1,4 +1,3 @@
-# arg 1: the new package version
 post_install() {
     if ! getent passwd nullmail > /dev/null; then
         echo "==> Creating nullmail user"
@@ -25,20 +24,12 @@
     fi
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
     post_install $1
 }
 
-# arg 1:  the old package version
 pre_remove() {
     systemctl stop nullmailer
     # Leave the 'queue' directory intact
     rm -rf var/service/nullmailer/{tmp,trigger}
-    echo "==> Removing nullmailer user and group"
-    userdel nullmail
-    if getent group nullmail > /dev/null; then
-        groupdel nullmail
-    fi
 }