Replace call to docert by install_cert, bug 201671.

Package-Manager: portage-2.1.4.1
RepoMan-Options: --force

5 files changed, 61 insertions, 45 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 5b27ea036738..7d97ba2b3d4d 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for mail-mta/postfix
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.143 2007/12/12 16:56:07 jer Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.144 2008/02/03 11:43:08 ulm Exp $
+
+*postfix-2.4.6-r2 (03 Feb 2008)
+*postfix-2.3.8-r1 (03 Feb 2008)
+*postfix-2.2.11-r1 (03 Feb 2008)
+
+  03 Feb 2008; Ulrich Mueller <ulm@gentoo.org> -postfix-2.2.11.ebuild,
+  +postfix-2.2.11-r1.ebuild, -postfix-2.3.8.ebuild,
+  +postfix-2.3.8-r1.ebuild, -postfix-2.4.6-r1.ebuild,
+  +postfix-2.4.6-r2.ebuild:
+  Replace docert by install_cert, bug 201671.
 
   12 Dec 2007; Jeroen Roovers <jer@gentoo.org> postfix-2.4.5.ebuild:
   Stable for HPPA (bug #199332).
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 1fdf4f42687a..c1561b1a9ab4 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mailer.conf 438 RMD160 b9efd9921c9e6295d8791e621e4e08510b526ac4 SHA1 fad8603d181a0d1ba104f09719e5620bae421288 SHA256 4ea1fb59653bd12841501f30781bda51a66aae56a5560623f7d41709dc97c839
 AUX postfix-2.0.9-get-FQDN.patch 1057 RMD160 492e9de53c0a16e71940ab4f4ed99bc4f76061fa SHA1 38f0322792822612a836ded1845368b23d3c1120 SHA256 6e5f5a1f9bc60e04d6decc8491c5955c625396f23698d961c412b50ec793e878
 AUX postfix-master.cf.patch 1064 RMD160 25283e8c3c27ff156e229ad1ae8643d3be61d6b7 SHA1 86088a034f6cf4a09a68436c97df5e5babf11251 SHA256 b1f7040cb9445379c4318e2161efd79c74bc6927125f4542eb87500ece145f60
@@ -25,10 +28,17 @@ DIST tls+ipv6-1.26-pf-2.1.5.patch.gz 256725 RMD160 ff2fb005681659476383fe4f32fd1
 EBUILD postfix-2.1.5-r2.ebuild 7552 RMD160 e7bb4fc0cf4e710bf70662762a0c7766c68fc194 SHA1 fa54387cc615280c0818a4baaecb898a48ef078b SHA256 2fb092f7aa2b547ec4176d79afd840438b9bd9304f6c5fab073e1075f9081cef
 EBUILD postfix-2.2.10-r1.ebuild 10283 RMD160 b2b3629e12b4371bece59da7181ab58a97de45be SHA1 11540902c277d87e18b645ff979e80c0774b776a SHA256 e2a72f6c761020ffdf77526558f4b9ec635cdc3911e9eba98e020a3b895f923b
 EBUILD postfix-2.2.10.ebuild 10498 RMD160 1270b45378779c41b03bee595f894293c6a36455 SHA1 36dab9fc97b92640f1872b8baee548e10a6749ca SHA256 3b73d1d9e09bb4fbcd1fe7928804e2cd77f9169382384aff0338ff966ba5ea96
-EBUILD postfix-2.2.11.ebuild 10416 RMD160 679aa75bd29f0c693a4e09c56363bc32c8d49fed SHA1 f4b04a63a127558a2711c423f8bafd2151800e25 SHA256 f538c83be8a16e9ec6cbb7f06e38f272a649f619f05a454bf626473d2a062c6c
+EBUILD postfix-2.2.11-r1.ebuild 10452 RMD160 14bd0b55cf2039202abe055b7b6e9616d1605487 SHA1 ff6c8bccd76931b2a7f46310f6169d23a18e0641 SHA256 598864f8b9f5277b2c49e7449da885e8a92611a7fb779bb7296e729effb4a99f
 EBUILD postfix-2.3.6.ebuild 11733 RMD160 2404297aefdddb372b70abc7ba5faa6a32d731b7 SHA1 acd24db82d75e1af425891cf77771725b69986e4 SHA256 cb69161151cbe6177f4a8c4171da9212de7d19f40976a9ac90ec5fd4285c027b
-EBUILD postfix-2.3.8.ebuild 11749 RMD160 b1d96930be7ebca10ab4d124d65d8c1531773ccd SHA1 e91a8add030b416da98dafc8cc2de72cb641d36b SHA256 45d0c4528097ead9398338e53cb4e6a15de20f1e99a1a1e0c75b99859c1aff6d
+EBUILD postfix-2.3.8-r1.ebuild 11779 RMD160 77f70014b5af8a8d1bf6e75c993b3f0d5e1f7c77 SHA1 a58360259296f0fa5d0bf6c8ebe761f550efddb4 SHA256 1098b3589afcb39ed4213220521634d74196d0d52c70f3129f32f22cd1eff3b6
 EBUILD postfix-2.4.5.ebuild 11678 RMD160 fb60b2092618dc26a634fad020f825957e2d3413 SHA1 19d8dd063b6437b361ef4ad14239b5b7ef3c5cab SHA256 e206fe2db84685d199da6a18e29f0e50475a9cb979066bd65ad113cf0273c1c3
-EBUILD postfix-2.4.6-r1.ebuild 11694 RMD160 c915dad059699a815e809b618286fb654e669e46 SHA1 0c7c6b3ff4dc80628a9369a010b30338fd332549 SHA256 913e4b7b9eebcdd16a02d39413f36d37abeec44e34d3981ce9cc560fc04611e1
-MISC ChangeLog 45774 RMD160 908065d542babb081628344da916507b4490e632 SHA1 cb83e4c8baf6634735790750cad85ed938c0b8f8 SHA256 883449582ef93e254a4eeb149837da928662d9f6f54e782258bed269142a87f4
+EBUILD postfix-2.4.6-r2.ebuild 11696 RMD160 9759988f08cda904c3965912575d882c8102d71f SHA1 37d77cd9282f3e0837f77b9df4fd153dda89029d SHA256 c9777774bf0bd1678e5ee2fdbc7127fb692ad2dd5911cc1799f7ddfbc781337e
+MISC ChangeLog 46124 RMD160 d821a8f795ed0c5afb45cea58ca6e290500173b0 SHA1 4e1f76e4a32e9b5e1680fe5808898a82623eec3e SHA256 738ef8532e683c3fd34db66e8b79c2f1f8cc2ebe708562dc9d9ca0431c95cf59
 MISC metadata.xml 162 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 SHA1 e6aecefcc2137d6047cedfe447686775ab59cb48 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.8 (GNU/Linux)
+
+iEYEARECAAYFAkelqMMACgkQOeoy/oIi7uzOzQCeLFnzdRmWrn4nvO8XHx5/cEKi
+zcwAoIGMojlHQ/BW7N2NVooL06Oj92Iy
+=KnCY
+-----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/postfix-2.2.11.ebuild b/mail-mta/postfix/postfix-2.2.11-r1.ebuild
index f523116c7e12..902df8c89c73 100644
--- a/mail-mta/postfix/postfix-2.2.11.ebuild
+++ b/mail-mta/postfix/postfix-2.2.11-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.2.11.ebuild,v 1.3 2007/10/21 11:15:08 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.2.11-r1.ebuild,v 1.1 2008/02/03 11:43:08 ulm Exp $
 
 inherit eutils ssl-cert toolchain-funcs flag-o-matic pam
 IUSE="ipv6 pam ldap mysql postgres ssl sasl mailwrapper mbox nis vda selinux hardened cdb"
@@ -148,7 +148,6 @@ src_unpack() {
 }
 
 src_compile() {
-	cd ${S}
 	# added -Wl,-z,now wrt 62674.
 	# remove -ldl as it is not necessary, resolve bug #106446.
 	# -Wl,-z,now replaced by $(bindnow-flags)
@@ -199,7 +198,7 @@ src_compile() {
 		if has_version dev-db/tinycdb; then
 			einfo "build with dev-db/tinycdb"
 			# ugly hack because gentoo doesn't install cdb.h
-			cp /usr/include/tinycdb.h ${S}/src/util/cdb.h || die \
+			cp /usr/include/tinycdb.h "${S}"/src/util/cdb.h || die \
 				"failed to cp /usr/include/tinycdb.h to ${S}/util/cdb.h"
 			CDB_LIBS="-ltinycdb"
 		else
@@ -279,7 +278,7 @@ src_install () {
 	fperms 02711 /usr/sbin/post{drop,queue}
 
 	keepdir /etc/postfix
-	mv ${D}/usr/share/doc/${PF}/defaults/{*.cf,post*-*} ${D}/etc/postfix
+	mv "${D}"/usr/share/doc/${PF}/defaults/{*.cf,post*-*} "${D}"/etc/postfix
 	if use mbox ; then
 		mypostconf="mail_spool_directory=/var/spool/mail"
 	else
@@ -297,19 +296,11 @@ src_install () {
 		die "newinitd failed"
 
 	mv "${S}/examples" "${D}/usr/share/doc/${PF}/"
-	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
+	dodoc *README COMPATIBILITY HISTORY INSTALL PORTING RELEASE_NOTES*
 	dohtml html/*
 
 	pamd_mimic_system smtp auth account
 
-	# do not install server.{key,pem) if they are exist.
-	if use ssl && [[ ! -f /etc/ssl/postfix/server.key && ! -f /etc/ssl/postfix/server.pem ]]; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
-		insinto /etc/ssl/postfix
-		docert server
-		fowners postfix:mail /etc/ssl/postfix/server.{key,pem}
-	fi
-
 	if use sasl ; then
 		insinto /etc/sasl2
 		newins "${FILESDIR}/smtp.sasl" smtpd.conf
@@ -321,6 +312,14 @@ pkg_postinst() {
 	# add postfix, postdrop user/group. Bug #77565.
 	group_user_check || die "failed to check/add needed user/group"
 
+	# Do not install server.{key,pem) SSL certificates if they already exist
+	if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
+		&& ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
+		install_cert /etc/ssl/postfix/server
+		chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
+	fi
+
 	ebegin "Fixing queue directories and permissions"
 	"${ROOT}/etc/postfix/post-install" upgrade-permissions
 	echo
diff --git a/mail-mta/postfix/postfix-2.3.8.ebuild b/mail-mta/postfix/postfix-2.3.8-r1.ebuild
index d6baa9f63c43..59c73b50f1c1 100644
--- a/mail-mta/postfix/postfix-2.3.8.ebuild
+++ b/mail-mta/postfix/postfix-2.3.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.3.8.ebuild,v 1.3 2007/10/21 11:15:08 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.3.8-r1.ebuild,v 1.1 2008/02/03 11:43:08 ulm Exp $
 
 # NOTE: this ebuild is regular ebuild without mailer-config support
 # comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
@@ -177,7 +177,6 @@ src_unpack() {
 }
 
 src_compile() {
-	cd ${S}
 	# added -Wl,-z,now wrt 62674.
 	# remove -ldl as it is not necessary, resolve bug #106446.
 	# -Wl,-z,now replaced by $(bindnow-flags)
@@ -336,19 +335,11 @@ src_install () {
 		die "newinitd failed"
 
 	mv "${S}/examples" "${D}/usr/share/doc/${PF}/"
-	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
+	dodoc *README COMPATIBILITY HISTORY INSTALL PORTING RELEASE_NOTES*
 	dohtml html/*
 
 	pamd_mimic_system smtp auth account
 
-	# do not install server.{key,pem) if they are exist.
-	if use ssl && [[ ! -f /etc/ssl/postfix/server.key && ! -f /etc/ssl/postfix/server.pem ]]; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
-		insinto /etc/ssl/postfix
-		docert server
-		fowners postfix:mail /etc/ssl/postfix/server.{key,pem}
-	fi
-
 	if use sasl ; then
 		insinto /etc/sasl2
 		newins "${FILESDIR}/smtp.sasl" smtpd.conf
@@ -359,6 +350,14 @@ pkg_postinst() {
 	# add postfix, postdrop user/group. Bug #77565.
 	group_user_check || die "failed to check/add needed user/group"
 
+	# Do not install server.{key,pem) SSL certificates if they already exist
+	if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
+		&& ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
+		install_cert /etc/ssl/postfix/server
+		chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
+	fi
+
 	ebegin "Fixing queue directories and permissions"
 	"${ROOT}/etc/postfix/post-install" upgrade-permissions
 	echo
diff --git a/mail-mta/postfix/postfix-2.4.6-r1.ebuild b/mail-mta/postfix/postfix-2.4.6-r2.ebuild
index 4ff38b3b758c..08f89ae53368 100644
--- a/mail-mta/postfix/postfix-2.4.6-r1.ebuild
+++ b/mail-mta/postfix/postfix-2.4.6-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.4.6-r1.ebuild,v 1.1 2007/11/26 12:09:04 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.4.6-r2.ebuild,v 1.1 2008/02/03 11:43:08 ulm Exp $
 
 # NOTE: this ebuild is a regular ebuild without mailer-config support!
 # Comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
@@ -167,8 +167,6 @@ src_unpack() {
 }
 
 src_compile() {
-	cd "${S}"
-
 	# Added -Wl,-z,now wrt bug #62674
 	# Remove -ldl as it is not necessary, solves bug #106446
 	# -Wl,-z,now replaced by $(bindnow-flags)
@@ -327,19 +325,11 @@ src_install () {
 	newinitd "${FILESDIR}/postfix.rc6.${RC_VER}" postfix || die "newinitd failed"
 
 	mv "${S}/examples" "${D}/usr/share/doc/${PF}/"
-	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
+	dodoc *README COMPATIBILITY HISTORY INSTALL PORTING RELEASE_NOTES*
 	dohtml html/*
 
 	pamd_mimic_system smtp auth account
 
-	# Do not install server.{key,pem) SSL certificates if they already exist
-	if use ssl && [[ ! -f /etc/ssl/postfix/server.key && ! -f /etc/ssl/postfix/server.pem ]] ; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
-		insinto /etc/ssl/postfix
-		docert server
-		fowners postfix:mail /etc/ssl/postfix/server.{key,pem}
-	fi
-
 	if use sasl ; then
 		insinto /etc/sasl2
 		newins "${FILESDIR}/smtp.sasl" smtpd.conf
@@ -350,6 +340,14 @@ pkg_postinst() {
 	# Add postfix, postdrop user/group (bug #77565)
 	group_user_check || die "Failed to check/add needed user/group"
 
+	# Do not install server.{key,pem) SSL certificates if they already exist
+	if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
+		&& ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
+		install_cert /etc/ssl/postfix/server
+		chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
+	fi
+
 	ebegin "Fixing queue directories and permissions"
 	"${ROOT}/etc/postfix/post-install" upgrade-permissions
 	echo