Make sure spool only gets created in pkg_postinst(). Fixes bug #45142.

5 files changed, 43 insertions, 28 deletions

diff --git a/net-mail/postfix/ChangeLog b/net-mail/postfix/ChangeLog
index a17e17324477..3840ead439e1 100644
--- a/net-mail/postfix/ChangeLog
+++ b/net-mail/postfix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/postfix
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/ChangeLog,v 1.114 2004/03/19 23:22:34 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/ChangeLog,v 1.115 2004/03/22 21:33:51 max Exp $
+
+  22 Mar 2004; Max Kalika <max@gentoo.org> postfix-2.0.19-r1.ebuild,
+  postfix-2.0.19-r2.ebuild, postfix-2.0.19.ebuild:
+  Make sure spool only gets created in pkg_postinst(). Fixes bug #45142.
 
   19 Mar 2004; Jason Wever <weeve@gentoo.org> postfix-2.0.19.ebuild:
   Marked stable on sparc.
diff --git a/net-mail/postfix/Manifest b/net-mail/postfix/Manifest
index 2e5092f679fa..7f8bf10a6a7f 100644
--- a/net-mail/postfix/Manifest
+++ b/net-mail/postfix/Manifest
@@ -1,28 +1,28 @@
-MD5 3b7bee84d49f9fd006f62506f52bf5c0 ChangeLog 23252
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 27fe74a078816742b6413fbfabadb4d8 postfix-2.0.18.ebuild 6793
+MD5 e66fbdd5da08ddc3ccba28e99db161ca postfix-2.0.19-r2.ebuild 6171
 MD5 814186572595eb376ac5febb83c50d00 postfix-1.1.11.20020917-r1.ebuild 4593
-MD5 4c4377dfe501bf2a981176f09c98fede postfix-1.1.11.20020917.ebuild 4578
-MD5 203fa874ac60ebfd492d00215963aac4 postfix-2.0.11.ebuild 6042
-MD5 9df73810c99fc194ce82dd3cdd3cead0 postfix-2.0.19-r1.ebuild 5935
-MD5 8ceb34ad49a65ca81ff03c42507b2ef7 postfix-2.0.19.ebuild 6788
-MD5 8a8a8048f4a11b5adb15bea0170149b3 postfix-2.0.19-r2.ebuild 6088
 MD5 9caa85e7ab35992b3eb513006ac19937 postfix-2.0.16-r1.ebuild 6793
-MD5 27fe74a078816742b6413fbfabadb4d8 postfix-2.0.18.ebuild 6793
-MD5 6775371821db3139dd2470c794a1e01f files/digest-postfix-1.1.11.20020917 166
+MD5 fe47d11706e1033dc5a606371a691d11 postfix-2.0.19.ebuild 6834
+MD5 1a70c6bcf0c1964ce940ed036a3c7682 postfix-2.0.19-r1.ebuild 5978
+MD5 0b47148a81f815311a1141cd23ec0f8e ChangeLog 23444
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 203fa874ac60ebfd492d00215963aac4 postfix-2.0.11.ebuild 6042
+MD5 4c4377dfe501bf2a981176f09c98fede postfix-1.1.11.20020917.ebuild 4578
 MD5 6775371821db3139dd2470c794a1e01f files/digest-postfix-1.1.11.20020917-r1 166
-MD5 1d4abcdc55f9e76735ae1ae0fcc13c53 files/digest-postfix-2.0.11 295
-MD5 20fa9d533a75c392127160b6b83d4229 files/digest-postfix-2.0.19 445
-MD5 ee0429eb6f0245518f984c5086191ed5 files/digest-postfix-2.0.19-r1 511
-MD5 ee0429eb6f0245518f984c5086191ed5 files/digest-postfix-2.0.19-r2 511
-MD5 2ab4ae9066b82e25800818cc0beb5908 files/mailer.conf 753
-MD5 8b504ee0538fd73b921421395d56c293 files/digest-postfix-2.0.16-r1 447
-MD5 40a96d0b5dfb56714e11d1f379ddc5a7 files/main.cf 18376
-MD5 e17b09d7df6537631ef2263b83fe0d38 files/master.cf 4421
-MD5 ff6584c14212d383b742fe5fc0aceed5 files/postfix-2.0.9-get-FQDN.patch 993
 MD5 6442ba195aa3af711558795cb04c4376 files/postfix.rc6 578
-MD5 41b1fd28cf1cb7ea752968c0fdd5cc84 files/smtp.pam 250
 MD5 ffb7badd0a9041f2bf61287c0e881d4f files/smtp.pass 134
 MD5 6a0281eb56da3530d3208ccbed185c4c files/smtp.sasl 124
-MD5 e651e2015b6c6f1495ac84a37e4a8871 files/smtpd.conf 130
+MD5 40a96d0b5dfb56714e11d1f379ddc5a7 files/main.cf 18376
+MD5 1d4abcdc55f9e76735ae1ae0fcc13c53 files/digest-postfix-2.0.11 295
 MD5 86074a74de686c68c34e40b36c1188b6 files/digest-postfix-2.0.18 445
+MD5 20fa9d533a75c392127160b6b83d4229 files/digest-postfix-2.0.19 445
+MD5 e651e2015b6c6f1495ac84a37e4a8871 files/smtpd.conf 130
+MD5 ff6584c14212d383b742fe5fc0aceed5 files/postfix-2.0.9-get-FQDN.patch 993
+MD5 e17b09d7df6537631ef2263b83fe0d38 files/master.cf 4421
+MD5 6775371821db3139dd2470c794a1e01f files/digest-postfix-1.1.11.20020917 166
+MD5 2ab4ae9066b82e25800818cc0beb5908 files/mailer.conf 753
+MD5 41b1fd28cf1cb7ea752968c0fdd5cc84 files/smtp.pam 250
+MD5 8b504ee0538fd73b921421395d56c293 files/digest-postfix-2.0.16-r1 447
+MD5 ee0429eb6f0245518f984c5086191ed5 files/digest-postfix-2.0.19-r1 511
+MD5 ee0429eb6f0245518f984c5086191ed5 files/digest-postfix-2.0.19-r2 511
 MD5 803eb5ffc166aaaf2f3b78ddf71fe73d files/postfix-2.0.0/main.cf.diff 2382
diff --git a/net-mail/postfix/postfix-2.0.19-r1.ebuild b/net-mail/postfix/postfix-2.0.19-r1.ebuild
index 6218bd1b7ae7..d9502d863ae9 100644
--- a/net-mail/postfix/postfix-2.0.19-r1.ebuild
+++ b/net-mail/postfix/postfix-2.0.19-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.19-r1.ebuild,v 1.2 2004/03/17 23:50:32 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.19-r1.ebuild,v 1.3 2004/03/22 21:33:51 max Exp $
 
 inherit eutils ssl-cert
 
@@ -128,6 +128,9 @@ src_install () {
 		mail_owner="postfix" \
 		setgid_group="postdrop" || die "postfix-install failed"
 
+	rm -rf "${D}/var"
+	keepdir /var/spool/postfix
+
 	# Provide another link for legacy FSH.
 	dosym /usr/sbin/sendmail /usr/lib/sendmail
 
diff --git a/net-mail/postfix/postfix-2.0.19-r2.ebuild b/net-mail/postfix/postfix-2.0.19-r2.ebuild
index 8aa05c9d20ab..fb970366a4f5 100644
--- a/net-mail/postfix/postfix-2.0.19-r2.ebuild
+++ b/net-mail/postfix/postfix-2.0.19-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.19-r2.ebuild,v 1.2 2004/03/18 15:25:31 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.19-r2.ebuild,v 1.3 2004/03/22 21:33:51 max Exp $
 
 inherit eutils ssl-cert
 
@@ -128,14 +128,16 @@ src_install () {
 		mail_owner="postfix" \
 		setgid_group="postdrop" || die "postfix-install failed"
 
+	# Fix spool removal on upgrade.
+	rm -rf "${D}/var"
+	keepdir /var/spool/postfix
+
 	# Remove the /usr/sbin/sendmail symlink
-	mv ${D}/usr/sbin/sendmail ${D}/usr/sbin/sendmail.postfix
+	mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
+
 	# Provide another link for legacy FSH.
 	dosym /usr/sbin/sendmail /usr/lib/sendmail
 
-	insinto /etc
-	doins ${FILESDIR}/mailer.conf
-
 	# Install an rmail for UUCP, closing bug #19127.
 	dobin auxiliary/rmail/rmail
 
@@ -157,6 +159,9 @@ src_install () {
 		"default_destination_concurrency_limit=2" \
 		${mypostconf} || die "postconf failed"
 
+	insinto /etc
+	doins "${FILESDIR}/mailer.conf"
+
 	insinto /etc/postfix
 	newins "${FILESDIR}/smtp.pass" saslpass
 	fperms 600 /etc/postfix/saslpass
diff --git a/net-mail/postfix/postfix-2.0.19.ebuild b/net-mail/postfix/postfix-2.0.19.ebuild
index 0dcba5d245ed..30d8c57bd8fd 100644
--- a/net-mail/postfix/postfix-2.0.19.ebuild
+++ b/net-mail/postfix/postfix-2.0.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.19.ebuild,v 1.3 2004/03/19 23:22:34 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-2.0.19.ebuild,v 1.4 2004/03/22 21:33:51 max Exp $
 
 inherit eutils ssl-cert
 
@@ -151,6 +151,9 @@ src_install () {
 		mail_owner="postfix" \
 		setgid_group="postdrop" || die "postfix-install failed"
 
+	rm -rf "${D}/var"
+	keepdir /var/spool/postfix
+
 	# Provide another link for legacy FSH.
 	dosym /usr/sbin/sendmail /usr/lib/sendmail