Version bump to fix mbox problems caused in rc3, #142576

Package-Manager: portage-2.1.1_pre4-r1

4 files changed, 186 insertions, 5 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 68e296000da0..a1cf66f964ac 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.58 2006/08/02 16:45:24 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.59 2006/08/03 09:06:45 uberlord Exp $
+
+*dovecot-1.0_rc5 (03 Aug 2006)
+
+  03 Aug 2006; Roy Marples <uberlord@gentoo.org> +dovecot-1.0_rc5.ebuild:
+  Version bump to fix mbox problems caused in rc3, #142576
+  thanks to Kilburn Abrahams.
 
 *dovecot-1.0_rc3 (02 Aug 2006)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 5ef75a206dbd..41e6c9e39f70 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -6,6 +6,7 @@ DIST dovecot-1.0.beta8.tar.gz 1392106 RMD160 101a7011467691ba5f4a6f48e21d6d1dc56
 DIST dovecot-1.0.rc1.tar.gz 1254731 RMD160 fa761a2b24ede31b383b505ed36fc202810191cd SHA1 4b56d2205cd8b7229e368c736c993ebc1f59fe5e SHA256 b3fdcbf6093e3672bd3f78fa360569b527926274f9c9d5de83eccbe10660d072
 DIST dovecot-1.0.rc2.tar.gz 1257435 RMD160 cbb1919f30ccc82033ddda5a9a4b2e9695f78eb9 SHA1 548d691166c71533cce05f72204d5f728941bab6 SHA256 594b38c099a4576e22d8a33673fd1461332c09a1e2c715792f6c2ff656b1bf6e
 DIST dovecot-1.0.rc3.tar.gz 1260043 RMD160 7d154c7154242902dbef8e5a192850be98ed70e8 SHA1 c3c303ea1c3081144ede044c919826bd72b2544a SHA256 c1a7c0e2bb7baad391f33a310fce14d84a6c0587b5d8efca0f31e1261f328e08
+DIST dovecot-1.0.rc5.tar.gz 1260398 RMD160 2a89dc534fc46fa7f70e14848cafed04cdbc32e2 SHA1 f96698aba80f3f05daaf7a09880fd4e6266e61b3 SHA256 4ceffc02eb8661ce8175a046cbcf0bc699fcae9b6964cbaaeea00a0bd02ee2b2
 EBUILD dovecot-1.0_beta8.ebuild 4645 RMD160 4792da7ed1922b0c11caa5710f2f073d8fa7a92d SHA1 060efcf3110e6ef0015e3087cce46780943243e6 SHA256 6d68b17728695ef6d79dd229c74847ef1e0d106d46215d82df694f48c6e129a6
 MD5 9394fb4f53cb69bb777019adf947d2e7 dovecot-1.0_beta8.ebuild 4645
 RMD160 4792da7ed1922b0c11caa5710f2f073d8fa7a92d dovecot-1.0_beta8.ebuild 4645
@@ -22,10 +23,14 @@ EBUILD dovecot-1.0_rc3.ebuild 4837 RMD160 b7be39920f8a77531d807290636c43425d7c12
 MD5 b483181109dfbf7b8388ef613d3ae9e8 dovecot-1.0_rc3.ebuild 4837
 RMD160 b7be39920f8a77531d807290636c43425d7c1224 dovecot-1.0_rc3.ebuild 4837
 SHA256 7f96d01948a7c1f90d0aaa07cdc7e1d9f882500815aad7222318abc8c3e18221 dovecot-1.0_rc3.ebuild 4837
-MISC ChangeLog 10719 RMD160 35ab8a2a890ab1d10c8e9d353ee5c8994d30825b SHA1 6158bc67bb07a2d4bc8303f3933a685bbff84d44 SHA256 b768c77e2cef64f5d6ea45cebd317b828e4dcca55e0da79f8dcb2a18516687c2
-MD5 0c53121449ae123fd507ea7efd8c23c2 ChangeLog 10719
-RMD160 35ab8a2a890ab1d10c8e9d353ee5c8994d30825b ChangeLog 10719
-SHA256 b768c77e2cef64f5d6ea45cebd317b828e4dcca55e0da79f8dcb2a18516687c2 ChangeLog 10719
+EBUILD dovecot-1.0_rc5.ebuild 4837 RMD160 13489627172974b0e5635caf5ea12ca76e2016a6 SHA1 dcfb0bbd30cefb4caf542c4662d2a816045a3570 SHA256 d42da1a0e479de7d59bcf3c68252383778a31f170bfa751404c96605907f61f3
+MD5 86ff8fe4277fdfc25d1db098eff75e29 dovecot-1.0_rc5.ebuild 4837
+RMD160 13489627172974b0e5635caf5ea12ca76e2016a6 dovecot-1.0_rc5.ebuild 4837
+SHA256 d42da1a0e479de7d59bcf3c68252383778a31f170bfa751404c96605907f61f3 dovecot-1.0_rc5.ebuild 4837
+MISC ChangeLog 10915 RMD160 8bcea1198c6f681bbe076a80c327f39c99ff892b SHA1 46abb272baa449841504117969ba3c737678b254 SHA256 93e71b08cc5475fcdd792593ded033b3efef86df8551ce420abfce641e37757b
+MD5 73e394e4988f66d43310a4a2e2791388 ChangeLog 10915
+RMD160 8bcea1198c6f681bbe076a80c327f39c99ff892b ChangeLog 10915
+SHA256 93e71b08cc5475fcdd792593ded033b3efef86df8551ce420abfce641e37757b ChangeLog 10915
 MISC metadata.xml 252 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 SHA1 57de811cfb02936b35c4bef2108018e6b2697a99 SHA256 419ffa57f459d89a62dd42ee4bb01934f03e6913b470323f5b2b8a7c89e2dc66
 MD5 b6ff89c08602229bdd234da83a89df77 metadata.xml 252
 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 metadata.xml 252
@@ -42,3 +47,6 @@ SHA256 9cb8858afcad7af0cf0a43c96d00c153e7e49dbe84f59634b637eb74dec5199f files/di
 MD5 589ca6c0aaeaa166c25e7c8a63786097 files/digest-dovecot-1.0_rc3 250
 RMD160 beed76a3a5cf167286f1e8f899de78f68eccb918 files/digest-dovecot-1.0_rc3 250
 SHA256 1b784a558cb6d7c24448b1ad32ad42d2b4d1d2068e60b24b912c1946a1d2a7c0 files/digest-dovecot-1.0_rc3 250
+MD5 7c72b8c9f99f2d2d15f5119798ba9404 files/digest-dovecot-1.0_rc5 250
+RMD160 8ab9aebd6f184973199fc33ced8427edfdfc2d8b files/digest-dovecot-1.0_rc5 250
+SHA256 32637c5f3cee8f5d9672325fe5d7f0d7f2245c52ce9ce950ef2e815646bf3b84 files/digest-dovecot-1.0_rc5 250
diff --git a/net-mail/dovecot/dovecot-1.0_rc5.ebuild b/net-mail/dovecot/dovecot-1.0_rc5.ebuild
new file mode 100644
index 000000000000..dbcc26aad05f
--- /dev/null
+++ b/net-mail/dovecot/dovecot-1.0_rc5.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.0_rc5.ebuild,v 1.1 2006/08/03 09:06:45 uberlord Exp $
+
+inherit autotools eutils
+
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://dovecot.org/"
+MY_P="${P/_/.}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="http://dovecot.org/releases/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+IUSE="debug doc ipv6 kerberos ldap mbox mysql pop3d pam postgres ssl vpopmail"
+
+DEPEND=">=sys-apps/sed-4
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl )
+	postgres? ( dev-db/postgresql )
+	mysql? ( dev-db/mysql )
+	vpopmail? ( net-mail/vpopmail )"
+
+RDEPEND="${DEPEND}
+	>=net-mail/mailbase-0.00-r8"
+
+pkg_setup() {
+	# Add user and group for login process (same as for fedora/redhat)
+	enewgroup dovecot 97
+	enewuser dovecot 97 -1 /dev/null dovecot
+}
+
+src_compile() {
+	local myconf="--with-ioloop=best --with-poll=best"
+	use ssl && myconf="${myconf} --with-ssl=openssl" \
+		|| myconf="${myconf} --without-ssl"
+
+	econf --localstatedir=/var \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_with pam) \
+		$(use_with pop3d) \
+		$(use_with postgres pgsql) \
+		$(use_with vpopmail) \
+		${myconf} || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	newinitd "${FILESDIR}"/dovecot.init dovecot
+
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us....
+	mv "${D}"/etc/dovecot-example.conf "${D}"/etc/dovecot.conf
+	fperms 0600 /etc/dovecot.conf
+
+	# .maildir is the Gentoo default, but we need to support mbox to
+	local mailenv="maildir:%h/.maildir"
+	if use mbox ; then
+		mailenv="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
+		keepdir /var/dovecot
+		sed -i -e 's|#mail_extra_groups =|mail_extra_groups = mail|' \
+			"${D}"/etc/dovecot.conf
+	fi
+	sed -i -e \
+		"s|#default_mail_env =|default_mail_env = ${mailenv}|" \
+		"${D}"/etc/dovecot.conf
+
+	# We're using pam files (imap and pop3) provided by mailbase
+	if use pam ; then
+		sed -i -e '/passdb pam/, /^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+			"${D}"/etc/dovecot.conf
+	fi
+
+	# Listen on ipv6 and ipv4
+	if use ipv6 ; then
+		sed -i -e 's/^#listen = \*/listen = \[::\]/g' \
+			"${D}"/etc/dovecot.conf
+	fi
+
+	# Install SQL configuration
+	if use mysql || use postgres ; then
+		cp doc/dovecot-sql.conf "${D}"/etc
+		fperms 600 /etc/dovecot-sql.conf
+		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' \
+			"${D}"/etc/dovecot.conf
+	fi
+
+	# Install LDAP configuration
+	if use ldap ; then
+		cp doc/dovecot-ldap.conf "${D}"/etc
+		fperms 600 /etc/dovecot-ldap.conf
+		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' \
+			"${D}"/etc/dovecot.conf
+	fi
+
+	# Documentation
+	rm -rf "${D}"/usr/share/doc/dovecot
+	if use doc ; then
+		dodoc AUTHORS NEWS README TODO dovecot-example.conf
+		dodoc doc/*.txt doc/*.conf doc/*.cnf doc/mkcert.sh
+	fi
+
+	# Create SSL certificates
+	if use ssl ; then
+		dodir /etc/ssl/certs
+		dodir /etc/ssl/private
+		# Let's not make a new certificate if we already have one
+		if ! [[ -e /etc/ssl/certs/dovecot.pem && \
+			-e /etc/ssl/private/dovecot.pem ]]; then
+			einfo "Generating X.509 certificate for SSL"
+			pushd doc >/dev/null && \
+				SSLDIR="${D}"/etc/ssl sh mkcert.sh && \
+				popd >/dev/null
+		fi
+	fi
+
+	dodir /var/run/dovecot
+	fowners root:0 /var/run/dovecot
+	fperms 0700 /var/run/dovecot
+	keepdir /var/run/dovecot/login
+	fowners root:dovecot /var/run/dovecot/login
+	fperms 0750 /var/run/dovecot/login
+}
+
+get_config_var() {
+	sed -n 's/^[[:space:]]\?base_dir[[:space:]]*="*\([^#"]\+\)"*/\1/p' \
+		/etc/dovecot.conf
+}
+
+pkg_postinst() {
+	einfo "The dovecot configuration has vastly changed since 0.99."
+	einfo "You are encouraged to start afresh with a new configuration file."
+	einfo "see http://wiki.dovecot.org/ for configuration examples."
+
+	local base_dir="$(get_config_var base_dir)"
+	base_dir="${basedir:-/var/run/dovecot}"
+	if use ssl \
+		&& [[ ! -e "${ROOT}/${base_dir}/login/ssl-parameters.dat" ]] ; then
+		einfo
+		einfo "Dovecot requires DH SSL Parameters if you use SSL connections"
+		einfo "These take some time to make, and dovecot will create them before"
+		einfo "it allows any SSL connections."
+		einfo "You can create them now before starting dovecot like so"
+		einfo "   emerge --config =${PF}"
+	fi
+}
+
+pkg_config() {
+	local base_dir="$(get_config_var base_dir)"
+	base_dir="${base_dir:-/var/run/dovecot}"
+
+	einfo "Regenerating SSL parameters. This will take some time."
+	/usr/libexec/dovecot/ssl-build-param "${base_dir}/login/ssl-parameters.dat"
+}
diff --git a/net-mail/dovecot/files/digest-dovecot-1.0_rc5 b/net-mail/dovecot/files/digest-dovecot-1.0_rc5
new file mode 100644
index 000000000000..7a48692797c7
--- /dev/null
+++ b/net-mail/dovecot/files/digest-dovecot-1.0_rc5
@@ -0,0 +1,3 @@
+MD5 c54cc01f70a4666d99708f3068c8cc28 dovecot-1.0.rc5.tar.gz 1260398
+RMD160 2a89dc534fc46fa7f70e14848cafed04cdbc32e2 dovecot-1.0.rc5.tar.gz 1260398
+SHA256 4ceffc02eb8661ce8175a046cbcf0bc699fcae9b6964cbaaeea00a0bd02ee2b2 dovecot-1.0.rc5.tar.gz 1260398