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

[Gaetan Bisson]

    Date: Thursday, February 14, 2013 @ 01:34:10
  Author: bisson
Revision: 178037

tentative fix for FS#33839

Modified:
  postfix/trunk/PKGBUILD
  postfix/trunk/install

----------+
 PKGBUILD |    2 +-
 install  |   29 +++++++----------------------
 2 files changed, 8 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-13 23:06:32 UTC (rev 178036)
+++ PKGBUILD	2013-02-14 00:34:10 UTC (rev 178037)
@@ -5,7 +5,7 @@
 
 pkgname=postfix
 pkgver=2.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Fast, easy to administer, secure mail server'
 url='http://www.postfix.org/'
 license=('custom')

Modified: install
===================================================================
--- install	2013-02-13 23:06:32 UTC (rev 178036)
+++ install	2013-02-14 00:34:10 UTC (rev 178037)
@@ -1,3 +1,8 @@
+post_upgrade() {
+	/usr/lib/postfix/post-install daemon_directory=/usr/lib/postfix upgrade-package
+	chown postfix var/lib/postfix
+}
+
 post_install() {
 	getent group postdrop &>/dev/null || groupadd -g 75 postdrop >/dev/null
 	getent group postfix  &>/dev/null || groupadd -g 73 postfix  >/dev/null
@@ -2,30 +7,10 @@
 	getent passwd postfix &>/dev/null || useradd -u 73 -d /var/spool/postfix -g postfix -s /bin/false postfix >/dev/null
-
-	cd var/spool/postfix
-	chown postfix active bounce corrupt defer deferred flush hold incoming private public maildrop trace saved
-	chgrp postdrop public maildrop
-	cd ../../../usr/sbin
-	chgrp postdrop postqueue postdrop
-	chmod g+s postqueue postdrop
-	cd ../..
-	chown postfix var/lib/postfix
-
-	newaliases
+	post_upgrade
 }
 
-post_upgrade() {
-	post_install
-
-	if [ `vercmp $2 2.9.0` = -1 ]; then cat <<EOF
-
-==> You must now run "postfix reload" due to inter-daemon protocol change.
-
-EOF
-	fi
-}
-
 pre_remove() {
 	getent passwd postfix &>/dev/null && userdel  postfix  >/dev/null
 	getent group postfix  &>/dev/null && groupdel postfix  >/dev/null
 	getent group postdrop &>/dev/null && groupdel postdrop >/dev/null
+	true
 }