fix bug #201686

Package-Manager: portage-2.1.4_rc8

3 files changed, 31 insertions, 34 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index a12f4fac78b5..c462c64d0ac4 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.127 2007/12/08 11:35:02 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.128 2007/12/09 02:22:06 wschlich Exp $
+
+  09 Dec 2007; Wolfram Schlich <wschlich@gentoo.org> dovecot-1.0.8.ebuild:
+  fix bug #201686
 
 *dovecot-1.0.8 (08 Dec 2007)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 93d190d0953f..fdcd906a283c 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -25,14 +25,14 @@ EBUILD dovecot-1.0.7.ebuild 6271 RMD160 eaacfaaa53e7b3dfb8e778f8e3d7f72891be83ea
 MD5 ff7fe37443565347b312820a7e943c05 dovecot-1.0.7.ebuild 6271
 RMD160 eaacfaaa53e7b3dfb8e778f8e3d7f72891be83ea dovecot-1.0.7.ebuild 6271
 SHA256 6f134f18006c19cbcbcd09d21ef79c92eecc88f18cc84863e04c87ae33ed7847 dovecot-1.0.7.ebuild 6271
-EBUILD dovecot-1.0.8.ebuild 7280 RMD160 961b0d096073321b56320540a17e2f06f30a77cd SHA1 d85302ead057a22f93cad9fe5ec519ddf9df2566 SHA256 d126fa7cffeeb9ab5af2318d361586a22ec9014ad32c62c7434d50fe54cd63c3
-MD5 b593b0b64fb31f7975dcffdc43c9216d dovecot-1.0.8.ebuild 7280
-RMD160 961b0d096073321b56320540a17e2f06f30a77cd dovecot-1.0.8.ebuild 7280
-SHA256 d126fa7cffeeb9ab5af2318d361586a22ec9014ad32c62c7434d50fe54cd63c3 dovecot-1.0.8.ebuild 7280
-MISC ChangeLog 20391 RMD160 99bfac86f3e288e483e81222b04e2b0187c14c36 SHA1 e4798a2e2c8f6d24a3414740244e14814358061a SHA256 782d02cbf304f26a415e4e26d769622bfd35a65f89c933572657c18978a427c1
-MD5 488e419f582d47ca0e65bda62c6e53d5 ChangeLog 20391
-RMD160 99bfac86f3e288e483e81222b04e2b0187c14c36 ChangeLog 20391
-SHA256 782d02cbf304f26a415e4e26d769622bfd35a65f89c933572657c18978a427c1 ChangeLog 20391
+EBUILD dovecot-1.0.8.ebuild 7126 RMD160 1b66a1685f18590692aef6c4dc1325b6931dc2bf SHA1 84c804b0eccf06af5ec39479e78ddeddfd4adccd SHA256 3010e4e69ef240c86b538d672d9cd11a9dd8f9c91c12ff19f0df71fefff11a72
+MD5 c67525eea53ea7f62c0e1bf21a420d7c dovecot-1.0.8.ebuild 7126
+RMD160 1b66a1685f18590692aef6c4dc1325b6931dc2bf dovecot-1.0.8.ebuild 7126
+SHA256 3010e4e69ef240c86b538d672d9cd11a9dd8f9c91c12ff19f0df71fefff11a72 dovecot-1.0.8.ebuild 7126
+MISC ChangeLog 20485 RMD160 892ace49a8438d709c1d98ff17e9b01022bd1844 SHA1 4e4c64e5b6e41284827b736eb790269c5c0eea78 SHA256 20bd943d0a7aec3ae4dddc008d22d9e148e27c62aeda38613cc48af139e65fdb
+MD5 81b29350447f0805250ec42a0cbc0326 ChangeLog 20485
+RMD160 892ace49a8438d709c1d98ff17e9b01022bd1844 ChangeLog 20485
+SHA256 20bd943d0a7aec3ae4dddc008d22d9e148e27c62aeda38613cc48af139e65fdb ChangeLog 20485
 MISC metadata.xml 252 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 SHA1 57de811cfb02936b35c4bef2108018e6b2697a99 SHA256 419ffa57f459d89a62dd42ee4bb01934f03e6913b470323f5b2b8a7c89e2dc66
 MD5 b6ff89c08602229bdd234da83a89df77 metadata.xml 252
 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 metadata.xml 252
diff --git a/net-mail/dovecot/dovecot-1.0.8.ebuild b/net-mail/dovecot/dovecot-1.0.8.ebuild
index 42773f3ed894..8bc26fd90277 100644
--- a/net-mail/dovecot/dovecot-1.0.8.ebuild
+++ b/net-mail/dovecot/dovecot-1.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.0.8.ebuild,v 1.2 2007/12/08 23:02:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.0.8.ebuild,v 1.3 2007/12/09 02:22:06 wschlich Exp $
 
 inherit autotools eutils ssl-cert
 
@@ -141,15 +141,6 @@ src_install () {
 		sed -i -e 's,^#ssl_cert_file =.*,ssl_cert_file = /etc/ssl/dovecot/server.pem,' \
 			-e 's,^#ssl_key_file =.*,ssl_key_file = /etc/ssl/dovecot/server.key,' \
 			"${conf}" || die "failed to update SSL settings in dovecot.conf"
-
-		# Let's not make a new certificate if we already have one
-		if ! [[ -e "${ROOT:-/}"etc/ssl/dovecot/server.pem && \
-			-e "${ROOT:-/}"etc/ssl/dovecot/server.key ]]; then
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			insinto "${ROOT:-/}"etc/ssl/dovecot
-			docert server
-			fowners dovecot:mail /etc/ssl/dovecot/server.{key,pem}
-		fi
 	fi
 
 	# Install SQL configuration
@@ -194,31 +185,34 @@ get_config_var() {
 }
 
 pkg_postinst() {
-	# Touch ssl certs so that they are modified outisde of src_install
-	# We do this so portage does't unmerge them - silly portage
-	if use ssl; then
-		touch "${ROOT:-/}"/etc/ssl/dovecot/server.{key,pem}
-	fi
-
 	elog "The Dovecot configuration has vastly changed since 0.99."
 	elog "You are encouraged to start afresh with a new configuration file."
 	elog "see http://wiki.dovecot.org/ for configuration examples."
 
 	if [[ -e "${ROOT:-/}"etc/dovecot.conf ]]; then
-		ewarn
+		echo
 		ewarn "The Dovecot configuration now resides in ${ROOT:-/}etc/dovecot"
 	fi
 
 	local base_dir="$(get_config_var base_dir)"
 	base_dir="${base_dir:-/var/run/dovecot}"
-	if use ssl \
-		&& [[ ! -e "${ROOT:-/}${base_dir}/login/ssl-parameters.dat" ]]; then
-		elog
-		elog "Dovecot requires DH SSL Parameters if you use SSL connections"
-		elog "These take some time to make, and dovecot will create them before"
-		elog "it allows any SSL connections."
-		elog "You can create them now before starting dovecot like so"
-		elog "   emerge --config =${PF}"
+	if use ssl; then
+		# Let's not make a new certificate if we already have one
+		if ! [[ -e "${ROOT:-/}"etc/ssl/dovecot/server.pem && \
+			-e "${ROOT:-/}"etc/ssl/dovecot/server.key ]]; then
+			einfo "Creating SSL certificate"
+			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+			install_cert "${ROOT:-/}"etc/ssl/dovecot/server
+			chown dovecot:mail "${ROOT:-/}"etc/ssl/dovecot/server.{key,pem}
+		fi
+		if [[ ! -e "${ROOT:-/}${base_dir}/login/ssl-parameters.dat" ]]; then
+			echo
+			elog "Dovecot requires DH SSL Parameters if you use SSL connections"
+			elog "These take some time to make, and dovecot will create them before"
+			elog "it allows any SSL connections."
+			elog "You can create them now before starting dovecot like so"
+			elog "   emerge --config =${PF}"
+		fi
 	fi
 }