From 9debc5067c1c6be36681e3d66faf151c27dacd41 Mon Sep 17 00:00:00 2001
From: jakob <jakob@openbsd.org>
Date: Sun, 15 Mar 2009 19:38:05 +0000
Subject: [PATCH] fix postfix upgraade by ensuring the binaries have the proper
 permissions; from brad

---
 mail/postfix/snapshot/Makefile              | 3 ++-
 mail/postfix/snapshot/files/postfix-install | 8 +++++---
 mail/postfix/snapshot/pkg/PLIST             | 5 +++--
 mail/postfix/stable/Makefile                | 3 ++-
 mail/postfix/stable/files/postfix-install   | 8 +++++---
 mail/postfix/stable/pkg/PLIST               | 5 +++--
 6 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/mail/postfix/snapshot/Makefile b/mail/postfix/snapshot/Makefile
index 58a7cbd71a4..9579732a727 100644
--- a/mail/postfix/snapshot/Makefile
+++ b/mail/postfix/snapshot/Makefile
@@ -1,6 +1,7 @@
-# $OpenBSD: Makefile,v 1.188 2009/02/01 19:06:53 jakob Exp $
+# $OpenBSD: Makefile,v 1.189 2009/03/15 19:38:05 jakob Exp $
 
 VERSION=	2.6-20090125
+PATCHLEVEL=	0
 
 MASTER_SITES=	${MASTER_SITE_POSTFIX:=experimental/}
 
diff --git a/mail/postfix/snapshot/files/postfix-install b/mail/postfix/snapshot/files/postfix-install
index 5d482639e38..eceefb1767d 100644
--- a/mail/postfix/snapshot/files/postfix-install
+++ b/mail/postfix/snapshot/files/postfix-install
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: postfix-install,v 1.3 2008/03/03 10:03:18 sthen Exp $
+# $OpenBSD: postfix-install,v 1.4 2009/03/15 19:38:05 jakob Exp $
 #
 # Post-installation setup of postfix
 
@@ -71,6 +71,8 @@ do_configs()
     $POSTFIX check
 }
 
-do_mailwrapper
-do_spooldir
+if [ "$1" = "install" ]; then
+    do_mailwrapper
+    do_spooldir
+fi
 do_configs
diff --git a/mail/postfix/snapshot/pkg/PLIST b/mail/postfix/snapshot/pkg/PLIST
index 69cd0922ab2..ae62e1a999c 100644
--- a/mail/postfix/snapshot/pkg/PLIST
+++ b/mail/postfix/snapshot/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.49 2009/02/01 19:06:53 jakob Exp $
+@comment $OpenBSD: PLIST,v 1.50 2009/03/15 19:38:05 jakob Exp $
 @conflict postfix-*
 @newgroup _postfix:507
 @newgroup _postdrop:508
@@ -296,4 +296,5 @@ share/examples/postfix/master.cf
 share/examples/postfix/relocated
 share/examples/postfix/transport
 share/examples/postfix/virtual
-@exec-add PREFIX=%D SYSCONFDIR=${SYSCONFDIR} ${PREFIX}/sbin/postfix-install
+@exec-add PREFIX=%D SYSCONFDIR=${SYSCONFDIR} ${PREFIX}/sbin/postfix-install install
+@exec-update PREFIX=%D SYSCONFDIR=${SYSCONFDIR} ${PREFIX}/sbin/postfix-install upgrade
diff --git a/mail/postfix/stable/Makefile b/mail/postfix/stable/Makefile
index 4ab918b8733..96f8978cf20 100644
--- a/mail/postfix/stable/Makefile
+++ b/mail/postfix/stable/Makefile
@@ -1,6 +1,7 @@
-# $OpenBSD: Makefile,v 1.117 2009/01/06 12:47:44 jakob Exp $
+# $OpenBSD: Makefile,v 1.118 2009/03/15 19:38:05 jakob Exp $
 
 VERSION=	2.5.6
+PATCHLEVEL=	0
 
 MASTER_SITES=	${MASTER_SITE_POSTFIX:=official/}
 
diff --git a/mail/postfix/stable/files/postfix-install b/mail/postfix/stable/files/postfix-install
index 6e7cd0edf18..4ed7c5467c0 100644
--- a/mail/postfix/stable/files/postfix-install
+++ b/mail/postfix/stable/files/postfix-install
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: postfix-install,v 1.2 2008/02/01 16:37:53 jakob Exp $
+# $OpenBSD: postfix-install,v 1.3 2009/03/15 19:38:05 jakob Exp $
 #
 # Post-installation setup of postfix
 
@@ -88,6 +88,8 @@ do_configs()
     $POSTFIX check
 }
 
-do_mailwrapper
-do_spooldir
+if [ "$1" = "install" ]; then
+    do_mailwrapper
+    do_spooldir
+fi
 do_configs
diff --git a/mail/postfix/stable/pkg/PLIST b/mail/postfix/stable/pkg/PLIST
index e48be924b11..a9a622f70d0 100644
--- a/mail/postfix/stable/pkg/PLIST
+++ b/mail/postfix/stable/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.22 2008/08/21 21:52:08 brad Exp $
+@comment $OpenBSD: PLIST,v 1.23 2009/03/15 19:38:05 jakob Exp $
 @conflict postfix-*
 @newgroup _postfix:507
 @newgroup _postdrop:508
@@ -293,4 +293,5 @@ share/examples/postfix/postfix-script
 share/examples/postfix/relocated
 share/examples/postfix/transport
 share/examples/postfix/virtual
-@exec-add PREFIX=%D SYSCONFDIR=${SYSCONFDIR} ${PREFIX}/sbin/postfix-install
+@exec-add PREFIX=%D SYSCONFDIR=${SYSCONFDIR} ${PREFIX}/sbin/postfix-install install
+@exec-update PREFIX=%D SYSCONFDIR=${SYSCONFDIR} ${PREFIX}/sbin/postfix-install upgrade