Bump, #182182 thanks to Kilburn Abrahams.

Package-Manager: portage-2.1.3_rc5

4 files changed, 229 insertions, 15 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 30fbc9841fd0..d55b5f949e40 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,11 @@
 # 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.107 2007/06/12 12:17:55 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.108 2007/06/26 13:04:48 uberlord Exp $
+
+*dovecot-1.0.1 (26 Jun 2007)
+
+  26 Jun 2007; Roy Marples <uberlord@gentoo.org> +dovecot-1.0.1.ebuild:
+  Bump, #182182 thanks to Kilburn Abrahams.
 
   12 Jun 2007; Marius Mauch <genone@gentoo.org> dovecot-1.0_rc29.ebuild,
   dovecot-1.0_rc31.ebuild, dovecot-1.0_rc31-r1.ebuild,
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 77543bfb89d3..e7f03111db9b 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX dovecot-1.0_rc31-ldap.patch 502 RMD160 b0942e7acdfd43ceb9607d0915d85c5d6e65a457 SHA1 b9c4f72d56de03c323d1aa7e18c5195d526c1e28 SHA256 3224b0c08c0f09e73e35542d5b91a251ba6c25278e148bd203bdd2256222257a
 MD5 ad1cfd518233a37539c41f1cf3a95180 files/dovecot-1.0_rc31-ldap.patch 502
 RMD160 b0942e7acdfd43ceb9607d0915d85c5d6e65a457 files/dovecot-1.0_rc31-ldap.patch 502
@@ -10,6 +7,7 @@ MD5 6d3e44da73ef66d20b42a5fad49731f0 files/dovecot.init 878
 RMD160 32906bdbf40221017c4f39a7ca0e3fa97070b9ab files/dovecot.init 878
 SHA256 1bd24e14af5536828d3e232186d5ae68d3e394da3324c660fa1e658b4ae3b413 files/dovecot.init 878
 DIST dovecot-1.0.0.tar.gz 1674299 RMD160 e750eb726fc7cf04d8dbd97604f01aa5ce4e3d19 SHA1 69054e9d3d10425bba5b13d092fa2cfeab382dce SHA256 414ef7893f6c831f9248fb4bda2e127661948820da543620f6effd6b8a008f5f
+DIST dovecot-1.0.1.tar.gz 1739087 RMD160 99fb3c7f69d7518d0fff3cc8245860c8731d1414 SHA1 2772e27ecfc4afcb37b7afbed0deb98599fe645a SHA256 463220ff14fac3807964e669082a24271a872b7de445f38325de5317037cde0d
 DIST dovecot-1.0.rc29.tar.gz 1670673 RMD160 b09da68a67e951bf019ab077bf17ebbfd7e729a2 SHA1 f090f6ceb22849da4fc255d21e99d303f537c237 SHA256 6b8431e8276c07e235d30c195946e9b09d1f3e12f28aea6f755b6d4c72008dd9
 DIST dovecot-1.0.rc31.tar.gz 1672213 RMD160 c4d3f1d3df231de8bea1bd2c148dbe7be154099d SHA1 cb753f8f2a8557f7481303e1428110004b36f525 SHA256 69161740558b13d388e97ab6ca4730b6ff420e51bdb9086d438b27e6119d094a
 DIST dovecot-1.0.rc32.tar.gz 1672650 RMD160 0d2acfcf5f33633d182f0a2e2c81b88321de980b SHA1 a8779ef4e98d3799ccab3890448a46b216abe638 SHA256 c7ce6b71892dad8d86c723c854397bb3ed623f04fb2766484648acff7f7ff973
@@ -18,6 +16,10 @@ EBUILD dovecot-1.0.0.ebuild 6262 RMD160 c57f533cd6a64db5d6d0b6a76ba70d600da0d897
 MD5 a7d835c4324ebccf7aefd7cfaee8b9a7 dovecot-1.0.0.ebuild 6262
 RMD160 c57f533cd6a64db5d6d0b6a76ba70d600da0d897 dovecot-1.0.0.ebuild 6262
 SHA256 442fc62315b67d1f84383e3dfa1ae9647b5bbe06e129cd9acc1ded1ce4b1f93f dovecot-1.0.0.ebuild 6262
+EBUILD dovecot-1.0.1.ebuild 6264 RMD160 17ee6cf7f5cda2b9353d1d3517ee102d54ec456c SHA1 33799c9d636194baf226e94421444cdd114222d4 SHA256 5baf57460961014921e56fa2d4c8d4eedafc65c2eaf3f22aa2cf89e080bd048c
+MD5 f7a4d7d962e9f7101339c0e89dc4b549 dovecot-1.0.1.ebuild 6264
+RMD160 17ee6cf7f5cda2b9353d1d3517ee102d54ec456c dovecot-1.0.1.ebuild 6264
+SHA256 5baf57460961014921e56fa2d4c8d4eedafc65c2eaf3f22aa2cf89e080bd048c dovecot-1.0.1.ebuild 6264
 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
@@ -34,10 +36,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 17819 RMD160 a6f4cf5482bd9f0f3d985eac7a2a4ffc8f2841b6 SHA1 51c330169caac8e42eaf5f526093442ae9b70d7d SHA256 98c714919f35dcd5cf248b6c9a713850a7dc66163e63f688abc6db7c56f1713e
-MD5 f45e342398ec1f1d6f8283ec39decf3d ChangeLog 17819
-RMD160 a6f4cf5482bd9f0f3d985eac7a2a4ffc8f2841b6 ChangeLog 17819
-SHA256 98c714919f35dcd5cf248b6c9a713850a7dc66163e63f688abc6db7c56f1713e ChangeLog 17819
+MISC ChangeLog 17968 RMD160 870e71e5170dee709b1c3145f19d894a65109949 SHA1 bfa0264716f65fa0f746dc4e9b1fe37f01d73393 SHA256 92e200569e4e29f26dff5136d7f9c0089a625522590c7a1f1a71e78a3dc01b43
+MD5 73285cbe2bf89f5ba1a8510eedb98b14 ChangeLog 17968
+RMD160 870e71e5170dee709b1c3145f19d894a65109949 ChangeLog 17968
+SHA256 92e200569e4e29f26dff5136d7f9c0089a625522590c7a1f1a71e78a3dc01b43 ChangeLog 17968
 MISC metadata.xml 252 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 SHA1 57de811cfb02936b35c4bef2108018e6b2697a99 SHA256 419ffa57f459d89a62dd42ee4bb01934f03e6913b470323f5b2b8a7c89e2dc66
 MD5 b6ff89c08602229bdd234da83a89df77 metadata.xml 252
 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 metadata.xml 252
@@ -45,6 +47,9 @@ SHA256 419ffa57f459d89a62dd42ee4bb01934f03e6913b470323f5b2b8a7c89e2dc66 metadata
 MD5 88a242bc0bdea4861b8f1aabbfe7a692 files/digest-dovecot-1.0.0 497
 RMD160 639845301ec57ad7b92fdd5fdd0fd187fd0fe99b files/digest-dovecot-1.0.0 497
 SHA256 9d209d2f7604ff73c65eae7a327f41b7509b2369cc8ef611466725f9a1d1b4fa files/digest-dovecot-1.0.0 497
+MD5 270b826603d8929efc098aaef30c4fec files/digest-dovecot-1.0.1 497
+RMD160 8db41651efbd2a426c8f8abcf9072fed8075ffbb files/digest-dovecot-1.0.1 497
+SHA256 97b06f23dfb7b94bd25785a5e7bf009c5ad84b18d524ac26db6ca48cf4c44738 files/digest-dovecot-1.0.1 497
 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
@@ -57,10 +62,3 @@ SHA256 cb93de608a72203adb454f274c996d804e4ce0f035b04d02f40c88398d4b8ad0 files/di
 MD5 2a381aaa8c20d05cfebfb40883231e85 files/digest-dovecot-1.0_rc32 506
 RMD160 0a295b8431e2942af57b6ea2b40cb649bfb4261d files/digest-dovecot-1.0_rc32 506
 SHA256 65eb459595be4caa6162cd4828d0111578904f0e9903eb4c82eed0be7b0a7637 files/digest-dovecot-1.0_rc32 506
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGbo8F6J2i8a8J4okRAm8JAJ4xoANyV2x9MyWR+mxBUjNRYbX0GwCeNCuE
-Pn8+qB/kyoMoxIeI8XrS2UY=
-=+WRb
------END PGP SIGNATURE-----
diff --git a/net-mail/dovecot/dovecot-1.0.1.ebuild b/net-mail/dovecot/dovecot-1.0.1.ebuild
new file mode 100644
index 000000000000..8f185b52e9f0
--- /dev/null
+++ b/net-mail/dovecot/dovecot-1.0.1.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.1.ebuild,v 1.1 2007/06/26 13:04:48 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 +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.1 b/net-mail/dovecot/files/digest-dovecot-1.0.1
new file mode 100644
index 000000000000..65130e116c2d
--- /dev/null
+++ b/net-mail/dovecot/files/digest-dovecot-1.0.1
@@ -0,0 +1,6 @@
+MD5 0878f744382417fce09d83f5b1c14030 dovecot-1.0.1.tar.gz 1739087
+RMD160 99fb3c7f69d7518d0fff3cc8245860c8731d1414 dovecot-1.0.1.tar.gz 1739087
+SHA256 463220ff14fac3807964e669082a24271a872b7de445f38325de5317037cde0d dovecot-1.0.1.tar.gz 1739087
+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