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

[Sergej Pupykin]

    Date: Tuesday, February 10, 2015 @ 17:29:55
  Author: spupykin
Revision: 127493

upgpkg: postgrey 1.35-2

upd

Modified:
  postgrey/trunk/PKGBUILD
  postgrey/trunk/postgrey.install

------------------+
 PKGBUILD         |    2 +-
 postgrey.install |   15 +++------------
 2 files changed, 4 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-10 16:15:45 UTC (rev 127492)
+++ PKGBUILD	2015-02-10 16:29:55 UTC (rev 127493)
@@ -4,7 +4,7 @@
 
 pkgname=postgrey
 pkgver=1.35
-pkgrel=1
+pkgrel=2
 pkgdesc="a Postfix policy server implementing greylisting"
 arch=('any')
 url="http://postgrey.schweikert.ch/"

Modified: postgrey.install
===================================================================
--- postgrey.install	2015-02-10 16:15:45 UTC (rev 127492)
+++ postgrey.install	2015-02-10 16:29:55 UTC (rev 127493)
@@ -1,17 +1,13 @@
 post_install() {
     if [ -z "`grep '^postgrey::' /etc/group`" ]; then
-        groupadd -g 314 postgrey >& /dev/null
+        groupadd -r postgrey >& /dev/null
     fi
     if [ -z "`grep '^postgrey:' /etc/passwd`" ]; then
-        useradd -u 314 -d /var/spool/postfix/postgrey -g postgrey -s /bin/false postgrey
-    else
-        # (postgrey should have no shell, but may have been added by others in the past)
-        usermod -s /bin/false postgrey
+        useradd -r -d /var/spool/postfix/postgrey -g postgrey -s /bin/false postgrey
     fi
 
+    mkdir -p var/run/postgrey
     chown postgrey:postgrey /var/spool/postfix/postgrey
-
-    mkdir -p var/run/postgrey
     chown postgrey:postgrey var/run/postgrey
 }
 
@@ -18,8 +14,3 @@
 post_upgrade() {
     post_install $1
 }
-
-pre_remove() {
-    userdel postgrey &> /dev/null
-    groupdel postgrey &> /dev/null
-}