fperms are now u+s for suid.

Package-Manager: portage-2.1.3_rc8

6 files changed, 448 insertions, 5 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index fdd3bc334841..61abeb63767c 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,13 @@
 # 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.110 2007/07/15 19:17:07 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.111 2007/07/19 16:17:26 uberlord Exp $
+
+*dovecot-1.0.2-r1 (19 Jul 2007)
+*dovecot-1.0_rc29-r1 (19 Jul 2007)
+
+  19 Jul 2007; Roy Marples <uberlord@gentoo.org>
+  +dovecot-1.0_rc29-r1.ebuild, +dovecot-1.0.2-r1.ebuild:
+  fperms are now u+s for suid.
 
 *dovecot-1.0.2 (15 Jul 2007)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index e8c6c38fb1e2..1f77a06e8a4a 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -22,10 +22,18 @@ EBUILD dovecot-1.0.1.ebuild 6266 RMD160 fdcd27950d1c46e56cb8f665e910185375893fbf
 MD5 480912dfbc4395f409176dc873c326cc dovecot-1.0.1.ebuild 6266
 RMD160 fdcd27950d1c46e56cb8f665e910185375893fbf dovecot-1.0.1.ebuild 6266
 SHA256 a45d274dfea32d236f5ebdd086bf0cf2d1df7784827d27100f175c53220acf63 dovecot-1.0.1.ebuild 6266
+EBUILD dovecot-1.0.2-r1.ebuild 6270 RMD160 2c2d99e5f0934db044df4272d5d5c33c50140cb0 SHA1 5dc99814130f9a1f0b32f74dbba647ebb886707b SHA256 cb4b971336ef906f75cd63a347068e7fc318ad3e6615b954280875798eb1c846
+MD5 7897c5fbdd3885a6fe9ed538894012da dovecot-1.0.2-r1.ebuild 6270
+RMD160 2c2d99e5f0934db044df4272d5d5c33c50140cb0 dovecot-1.0.2-r1.ebuild 6270
+SHA256 cb4b971336ef906f75cd63a347068e7fc318ad3e6615b954280875798eb1c846 dovecot-1.0.2-r1.ebuild 6270
 EBUILD dovecot-1.0.2.ebuild 6266 RMD160 45db1d47d37afaafc8a25ad298eb0da9a58dc020 SHA1 38884d70d9112b34c1d7cf1e460e41390e7442ab SHA256 162dd3998b5ab03266c2b89e043850d92a503999032be20212d380f431457de5
 MD5 123635ae9e64e31d2df3a2e979710124 dovecot-1.0.2.ebuild 6266
 RMD160 45db1d47d37afaafc8a25ad298eb0da9a58dc020 dovecot-1.0.2.ebuild 6266
 SHA256 162dd3998b5ab03266c2b89e043850d92a503999032be20212d380f431457de5 dovecot-1.0.2.ebuild 6266
+EBUILD dovecot-1.0_rc29-r1.ebuild 6266 RMD160 f1f275d0821552004ed83a0f4f9cbb856b0acdf4 SHA1 327a6d22d651245816255befba667e97abbc205b SHA256 75ced0779df129d61be2f1ce400da854fb308fe6bf6a422185569b65dfe04dff
+MD5 e1f9ca63430cc339da47f65e04f06c8c dovecot-1.0_rc29-r1.ebuild 6266
+RMD160 f1f275d0821552004ed83a0f4f9cbb856b0acdf4 dovecot-1.0_rc29-r1.ebuild 6266
+SHA256 75ced0779df129d61be2f1ce400da854fb308fe6bf6a422185569b65dfe04dff dovecot-1.0_rc29-r1.ebuild 6266
 EBUILD dovecot-1.0_rc29.ebuild 6260 RMD160 3520000f27089826b1ed5c25372a60063e3bdc45 SHA1 d86fd100f7b8098e4446fb8cff8a53da5efb559c SHA256 72beb4436be4620f4c238cf89b5b847e87c497811bce35dded03526100aee21b
 MD5 83f15ea60f3620e03f96ad3bb2ff1d06 dovecot-1.0_rc29.ebuild 6260
 RMD160 3520000f27089826b1ed5c25372a60063e3bdc45 dovecot-1.0_rc29.ebuild 6260
@@ -42,10 +50,10 @@ EBUILD dovecot-1.0_rc32.ebuild 6265 RMD160 8338307640e25eb3e254d1525a07e0a788ac5
 MD5 e0cfab6ff8dc16d7a0e3e13e01c6fad2 dovecot-1.0_rc32.ebuild 6265
 RMD160 8338307640e25eb3e254d1525a07e0a788ac5573 dovecot-1.0_rc32.ebuild 6265
 SHA256 e207589652837a5eda42dd60f5c366696935e61c3724d61fe550aef8483e0190 dovecot-1.0_rc32.ebuild 6265
-MISC ChangeLog 18243 RMD160 954401d47b9afad4fdbe6398c132a2afa5c1e83d SHA1 c7df39b6affe249768dbe56d4e0a53fe1d51d723 SHA256 6c0c4c97b2961e34aa59ddae00a49d0bdf7350ef77983bca774f91bca1abd8fd
-MD5 8fe616b58dbabb7621485475ae0ff637 ChangeLog 18243
-RMD160 954401d47b9afad4fdbe6398c132a2afa5c1e83d ChangeLog 18243
-SHA256 6c0c4c97b2961e34aa59ddae00a49d0bdf7350ef77983bca774f91bca1abd8fd ChangeLog 18243
+MISC ChangeLog 18449 RMD160 e9b99e3d999039150f84b268d77d3b575924bcb2 SHA1 18aceea03fcfa958450d7f29d23f3b777f741221 SHA256 c118ab931f6a515dbcdedb185b2ddc7cbe3088bfab918ad5c1b2887091c1c986
+MD5 8c55417b24b267501854ba1fa79a1362 ChangeLog 18449
+RMD160 e9b99e3d999039150f84b268d77d3b575924bcb2 ChangeLog 18449
+SHA256 c118ab931f6a515dbcdedb185b2ddc7cbe3088bfab918ad5c1b2887091c1c986 ChangeLog 18449
 MISC metadata.xml 252 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 SHA1 57de811cfb02936b35c4bef2108018e6b2697a99 SHA256 419ffa57f459d89a62dd42ee4bb01934f03e6913b470323f5b2b8a7c89e2dc66
 MD5 b6ff89c08602229bdd234da83a89df77 metadata.xml 252
 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 metadata.xml 252
@@ -59,9 +67,15 @@ SHA256 2c6d813899c6e70a20b1f4d07f037fb5fce58b6fd6f9c5e0a89317a9958965a3 files/di
 MD5 2b7efa49fbc4b2ff6922cd9a64173f18 files/digest-dovecot-1.0.2 503
 RMD160 37a061aeb6505a1999cf1141c3c429422efc6a85 files/digest-dovecot-1.0.2 503
 SHA256 11877723c01b280ffc0fa88fef3a86cb3bbe657f7023428184770fe79fb47509 files/digest-dovecot-1.0.2 503
+MD5 2b7efa49fbc4b2ff6922cd9a64173f18 files/digest-dovecot-1.0.2-r1 503
+RMD160 37a061aeb6505a1999cf1141c3c429422efc6a85 files/digest-dovecot-1.0.2-r1 503
+SHA256 11877723c01b280ffc0fa88fef3a86cb3bbe657f7023428184770fe79fb47509 files/digest-dovecot-1.0.2-r1 503
 MD5 3a2a6879891be58fc76cb6ec2fae1b5b files/digest-dovecot-1.0_rc29 506
 RMD160 10b492542da124a42a5ed44384e3bddb1f3a5885 files/digest-dovecot-1.0_rc29 506
 SHA256 e105494181591e87387643dd71988f2fb78c143a18d6826139693bb18e8aa438 files/digest-dovecot-1.0_rc29 506
+MD5 3a2a6879891be58fc76cb6ec2fae1b5b files/digest-dovecot-1.0_rc29-r1 506
+RMD160 10b492542da124a42a5ed44384e3bddb1f3a5885 files/digest-dovecot-1.0_rc29-r1 506
+SHA256 e105494181591e87387643dd71988f2fb78c143a18d6826139693bb18e8aa438 files/digest-dovecot-1.0_rc29-r1 506
 MD5 e846f87a9516661b9f6b23ba58608d08 files/digest-dovecot-1.0_rc31 506
 RMD160 f7710198d350bf5da2e241adec708b2c9ac3c4e6 files/digest-dovecot-1.0_rc31 506
 SHA256 cb93de608a72203adb454f274c996d804e4ce0f035b04d02f40c88398d4b8ad0 files/digest-dovecot-1.0_rc31 506
diff --git a/net-mail/dovecot/dovecot-1.0.2-r1.ebuild b/net-mail/dovecot/dovecot-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..74987a464f09
--- /dev/null
+++ b/net-mail/dovecot/dovecot-1.0.2-r1.ebuild
@@ -0,0 +1,205 @@
+# 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.2-r1.ebuild,v 1.1 2007/07/19 16:17:26 uberlord Exp $
+
+inherit autotools eutils ssl-cert
+
+MY_P="${P/_/.}"
+S="${WORKDIR}/${MY_P}"
+SIEVE="dovecot-sieve-1.0.1"
+SIEVE_S="${WORKDIR}/${SIEVE}"
+
+SRC_URI="http://dovecot.org/releases/${MY_P}.tar.gz
+sieve? ( http://dovecot.org/releases/sieve/${SIEVE}.tar.gz )"
+
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+
+IUSE="debug doc ipv6 kerberos ldap mbox mysql pop3d pam postgres sieve ssl suid vpopmail"
+
+# Developer documentation, controlled by the doc USE flag
+DEVDOCS="auth-protocol index multiaccess securecoding"
+
+DEPEND=">=sys-apps/sed-4
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl )
+	postgres? ( dev-db/postgresql )
+	mysql? ( virtual/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=
+	use ssl && myconf="${myconf} --with-ssl=openssl" \
+		|| myconf="${myconf} --without-ssl"
+
+		econf --localstatedir=/var --sysconfdir=/etc/dovecot \
+		--enable-header-install \
+		--with-ioloop=best --with-poll=best \
+		$(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"
+
+	if use sieve ; then
+		einfo "Building sieve"
+		cd "${SIEVE_S}"
+		econf --with-dovecot="${S}" || die "configure failed"
+		emake || die "make failed"
+	fi
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die "make install failed"
+	use suid && fperms u+s /usr/libexec/dovecot/deliver
+
+	rm -f "${D}"/etc/dovecot/dovecot-{ldap,sql}-example.conf
+
+	newinitd "${FILESDIR}"/dovecot.init dovecot
+
+	# Documentation
+	rm -rf "${D}"/usr/share/doc/dovecot
+	dodoc AUTHORS NEWS README TODO dovecot-example.conf
+	if use doc ; then
+		dodoc doc/*.txt
+	else
+		local x= n=
+		for x in doc/*.txt ; do
+			n=$(basename "${x}" .txt)
+			[[ " ${DEVDOCS} " != *" ${n} "* ]] && dodoc "${x}"
+		done
+	fi
+
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us....
+	local conf="${D}/etc/dovecot/dovecot.conf"
+	mv "${D}"/etc/dovecot/dovecot-example.conf "${D}"/etc/dovecot/dovecot.conf
+
+	# .maildir is the Gentoo default, but we need to support mbox to
+	local mail_location="maildir:~/.maildir"
+	if use mbox ; then
+		mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
+		keepdir /var/dovecot
+		sed -i -e 's|#mail_extra_groups =|mail_extra_groups = mail|' "${conf}"
+	fi
+	sed -i -e \
+		"s|#mail_location =|mail_location = ${mail_location}|" "${conf}" || die
+
+	# 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 = "\*"|' \
+			"${conf}" || die
+	fi
+
+	# Listen on ipv6 and ipv4
+	if use ipv6 ; then
+		sed -i -e 's/^#listen = \*/listen = \[::\]/g' "${conf}" || die
+	fi
+
+	# Update ssl cert locations
+	if use ssl ; then
+		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
+
+		# 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
+	if use mysql || use postgres ; then
+		cp doc/dovecot-sql-example.conf "${D}"/etc/dovecot/dovecot-sql.conf
+		fperms 600 /etc/dovecot/dovecot-sql.conf
+		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}"
+		dodoc doc/dovecot-sql-example.conf
+	fi
+
+	# Install LDAP configuration
+	if use ldap ; then
+		cp doc/dovecot-ldap-example.conf "${D}"/etc/dovecot/dovecot-ldap.conf
+		fperms 600 /etc/dovecot/dovecot-ldap.conf
+		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}"
+		dodoc doc/dovecot-ldap-example.conf
+	fi
+
+	# Install sieve plugin
+	if use sieve ; then
+		make -C "${SIEVE_S}" DESTDIR="${D}" install || die "make install failed"
+	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/dovecot.conf
+}
+
+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
+		ewarn "dovecot configuration is now in ${ROOT}etc/dovecot"
+	fi
+
+	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
+		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}"
+	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/dovecot-1.0_rc29-r1.ebuild b/net-mail/dovecot/dovecot-1.0_rc29-r1.ebuild
new file mode 100644
index 000000000000..ff43893af03e
--- /dev/null
+++ b/net-mail/dovecot/dovecot-1.0_rc29-r1.ebuild
@@ -0,0 +1,205 @@
+# 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_rc29-r1.ebuild,v 1.1 2007/07/19 16:17:26 uberlord Exp $
+
+inherit autotools eutils ssl-cert
+
+MY_P="${P/_/.}"
+S="${WORKDIR}/${MY_P}"
+SIEVE="dovecot-sieve-1.0"
+SIEVE_S="${WORKDIR}/${SIEVE}"
+
+SRC_URI="http://dovecot.org/releases/${MY_P}.tar.gz
+sieve? ( http://dovecot.org/releases/sieve/${SIEVE}.tar.gz )"
+
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="alpha amd64 ppc sparc x86 ~x86-fbsd"
+
+IUSE="debug doc ipv6 kerberos ldap mbox mysql pop3d pam postgres sieve ssl suid vpopmail"
+
+# Developer documentation, controlled by the doc USE flag
+DEVDOCS="auth-protocol index multiaccess securecoding"
+
+DEPEND=">=sys-apps/sed-4
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl )
+	postgres? ( dev-db/postgresql )
+	mysql? ( virtual/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=
+	use ssl && myconf="${myconf} --with-ssl=openssl" \
+		|| myconf="${myconf} --without-ssl"
+
+		econf --localstatedir=/var --sysconfdir=/etc/dovecot \
+		--enable-header-install \
+		--with-ioloop=best --with-poll=best \
+		$(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"
+
+	if use sieve ; then
+		einfo "Building sieve"
+		cd "${SIEVE_S}"
+		econf --with-dovecot="${S}" || die "configure failed"
+		emake || die "make failed"
+	fi
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die "make install failed"
+	use suid && fperms u+s /usr/libexec/dovecot/deliver
+
+	rm -f "${D}"/etc/dovecot/dovecot-{ldap,sql}-example.conf
+
+	newinitd "${FILESDIR}"/dovecot.init dovecot
+
+	# Documentation
+	rm -rf "${D}"/usr/share/doc/dovecot
+	dodoc AUTHORS NEWS README TODO dovecot-example.conf
+	if use doc ; then
+		dodoc doc/*.txt
+	else
+		local x= n=
+		for x in doc/*.txt ; do
+			n=$(basename "${x}" .txt)
+			[[ " ${DEVDOCS} " != *" ${n} "* ]] && dodoc "${x}"
+		done
+	fi
+
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us....
+	local conf="${D}/etc/dovecot/dovecot.conf"
+	mv "${D}"/etc/dovecot/dovecot-example.conf "${D}"/etc/dovecot/dovecot.conf
+
+	# .maildir is the Gentoo default, but we need to support mbox to
+	local mail_location="maildir:~/.maildir"
+	if use mbox ; then
+		mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
+		keepdir /var/dovecot
+		sed -i -e 's|#mail_extra_groups =|mail_extra_groups = mail|' "${conf}"
+	fi
+	sed -i -e \
+		"s|#mail_location =|mail_location = ${mail_location}|" "${conf}" || die
+
+	# 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 = "\*"|' \
+			"${conf}" || die
+	fi
+
+	# Listen on ipv6 and ipv4
+	if use ipv6 ; then
+		sed -i -e 's/^#listen = \*/listen = \[::\]/g' "${conf}" || die
+	fi
+
+	# Update ssl cert locations
+	if use ssl ; then
+		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
+
+		# 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
+	if use mysql || use postgres ; then
+		cp doc/dovecot-sql-example.conf "${D}"/etc/dovecot/dovecot-sql.conf
+		fperms 600 /etc/dovecot/dovecot-sql.conf
+		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}"
+		dodoc doc/dovecot-sql-example.conf
+	fi
+
+	# Install LDAP configuration
+	if use ldap ; then
+		cp doc/dovecot-ldap-example.conf "${D}"/etc/dovecot/dovecot-ldap.conf
+		fperms 600 /etc/dovecot/dovecot-ldap.conf
+		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}"
+		dodoc doc/dovecot-ldap-example.conf
+	fi
+
+	# Install sieve plugin
+	if use sieve ; then
+		make -C "${SIEVE_S}" DESTDIR="${D}" install || die "make install failed"
+	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/dovecot.conf
+}
+
+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
+		ewarn "dovecot configuration is now in ${ROOT}etc/dovecot"
+	fi
+
+	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
+		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}"
+	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.2-r1 b/net-mail/dovecot/files/digest-dovecot-1.0.2-r1
new file mode 100644
index 000000000000..f7f5c8205b0e
--- /dev/null
+++ b/net-mail/dovecot/files/digest-dovecot-1.0.2-r1
@@ -0,0 +1,6 @@
+MD5 769f0dd2750e7de521de3396999a09e5 dovecot-1.0.2.tar.gz 1768818
+RMD160 0633225e510d1dd72306ff00003f065de25e09c5 dovecot-1.0.2.tar.gz 1768818
+SHA256 d3335076c104eaa08dd01a02db94443790998870a433da5720a8dc79b83c6a03 dovecot-1.0.2.tar.gz 1768818
+MD5 b070d2177009bb555cd7e25c710047d5 dovecot-sieve-1.0.1.tar.gz 444126
+RMD160 9b4a2a3be52b6dfcd3164d82a7139b8ab1a820f9 dovecot-sieve-1.0.1.tar.gz 444126
+SHA256 59f16c23a73b36ff973a8388b601cc2f6408e0a6ae4f882c4adb830e72f3ac66 dovecot-sieve-1.0.1.tar.gz 444126
diff --git a/net-mail/dovecot/files/digest-dovecot-1.0_rc29-r1 b/net-mail/dovecot/files/digest-dovecot-1.0_rc29-r1
new file mode 100644
index 000000000000..b6e35ba585b9
--- /dev/null
+++ b/net-mail/dovecot/files/digest-dovecot-1.0_rc29-r1
@@ -0,0 +1,6 @@
+MD5 4b5ab65d59474c8e783ad6bd496fff22 dovecot-1.0.rc29.tar.gz 1670673
+RMD160 b09da68a67e951bf019ab077bf17ebbfd7e729a2 dovecot-1.0.rc29.tar.gz 1670673
+SHA256 6b8431e8276c07e235d30c195946e9b09d1f3e12f28aea6f755b6d4c72008dd9 dovecot-1.0.rc29.tar.gz 1670673
+MD5 dabe564d2ef262a008622737ad84579f dovecot-sieve-1.0.tar.gz 442943
+RMD160 b56f5a7391607125184755b9bbcbe749e79e26d4 dovecot-sieve-1.0.tar.gz 442943
+SHA256 c1ce887c1c6e09d9d1b4af6825db5c50befb10c1fed742a6666a12ac9492d98a dovecot-sieve-1.0.tar.gz 442943