Version bump and fix bug #291290.

Package-Manager: portage-2.2_rc50/cvs/Linux x86_64

4 files changed, 246 insertions, 5 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 96e72091077e..dc5c4a0987ed 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.221 2009/11/14 15:18:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.222 2009/11/18 15:57:14 scarabeus Exp $
+
+*dovecot-1.2.7 (18 Nov 2009)
+
+  18 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org> dovecot-1.2.6.ebuild,
+  +dovecot-1.2.7.ebuild:
+  Version bump and fix bug #291290.
 
   14 Nov 2009; Raúl Porcel <armin76@gentoo.org> dovecot-1.1.19.ebuild:
   sparc stable wrt #286844
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 318f4033cf6a..84d138bc9837 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -17,11 +17,14 @@ DIST dovecot-1.2-managesieve-0.11.9.tar.gz 396242 RMD160 1b85540bb0b32e30a6f8e78
 DIST dovecot-1.2-sieve-0.1.12.tar.gz 964938 RMD160 92ed585f098ebaa37bececa56bdd912d47e7f162 SHA1 cd142f051b45b58cc162222f9ccdc12e1f69c343 SHA256 dc28182fc0bedb2622a851a33a1dab4c851aaa106c14550f782a3b8abde36514
 DIST dovecot-1.2.6-managesieve-0.11.9.diff.gz 6443 RMD160 43408c4090e7c384a30bacfd207453e50583271d SHA1 c2710e09c9b71ce3607e5614683de4748dac6d85 SHA256 4928fea010f3d993d2fc2bb624cf7586680f42aad2f7548f515773ed244a0164
 DIST dovecot-1.2.6.tar.gz 2668219 RMD160 e6086e1a57dd3cf75614823916b509fedfc5283d SHA1 02ede3936123252d542da90488a2d189fa39979c SHA256 b8511688a631bbf1ec35e87c685cf4252085404a931ca20e470ace2a28d4c225
+DIST dovecot-1.2.7-managesieve-0.11.9.diff.gz 6458 RMD160 32fe5f253b352063f21166596efe66684df1d251 SHA1 636976c8302fc1f45085b4bc5a6970104fe0dce7 SHA256 bce916dd22493cbc0eaf918f75da1e2bef48d5d9fc5ce0bfec8d950754af4659
+DIST dovecot-1.2.7.tar.gz 2701990 RMD160 70380ce4e2ba9cc7721bd69b578fa3633076a7d5 SHA1 418e890e7007dfe2e2ed34dae08247e0d920cb53 SHA256 4ebd51a10f4f58329f2974b9e098a777d383b01dc43927b4a6103bcbe1478ec8
 DIST dovecot-sieve-1.1.5.tar.gz 468913 RMD160 825a8ec07d49527d8551cb5f3f86b638fddbafbd SHA1 672adf0a2f1627d96f97fc63fecaf024dd9f7a42 SHA256 ec1ea94311d5fb6cb5dd7e451728784afb39521a6a580f640b4d2115505a5ddf
 DIST dovecot-sieve-1.1.6.tar.gz 470071 RMD160 ed6f75dc1ffdb0ec51ecf3786aa71092851289f5 SHA1 c109ee8ab1c7ffece7940fb2e37104baf784440e SHA256 a2130a8e7d732bb341a96a96a24b4ddb66834e116573a10c17e68344fe712b36
 EBUILD dovecot-1.1.16.ebuild 8588 RMD160 aa2eec6ca31112c8b1ed97f48e75f80e06d13c38 SHA1 c6dcd325eadd926aa1344bf82875674d9fc098e6 SHA256 b5ab1b69eca6f157bc9807e6debe0b18fefcae9060588a4ac75936dfdc0da42f
 EBUILD dovecot-1.1.19.ebuild 8583 RMD160 f2d14abdd87ae0912d1e19a0f6ef1e6d403b5a5e SHA1 59bc7f31ecf003cd3a3dc88f9ed8fe989956d351 SHA256 bb226fc4cbcf1b3be06d3199e83e4cb05d563dc4f1ef3a6a0becb0c544f7f56e
 EBUILD dovecot-1.1.7-r1.ebuild 8584 RMD160 9e0bf8fdbf8ed699fd131273241bdf3d4d3cb6bc SHA1 565e5a6bee35ccd3540682ac5f37a47d988700c0 SHA256 1a39caa28662acb24ee1413de6ef2efbc2dd093c2cfe717008fc3dc08f938a37
-EBUILD dovecot-1.2.6.ebuild 7453 RMD160 64e57782afd4ac48030256c0521170bc15e564c7 SHA1 02a52fd3adb55e23a2201bc1e7fb1083bf69b80e SHA256 31084b687202e7a7e8c092e6f496beed951755609bf172039fc532e475ca9df8
-MISC ChangeLog 35736 RMD160 eb2c0eb26be4000d56fa161a58fdcb3c79a3ab54 SHA1 bf26a4f0a2f3eacb881d0c5f22cb3e380c572c37 SHA256 9ac0e99f9ea5c6c283ce362ae4014ba030018101df90a0ebab48aa4973aba8b4
+EBUILD dovecot-1.2.6.ebuild 7448 RMD160 da89e66f55da305f05ce6335b438c44498b902cb SHA1 cb85484973f99ad51f41f9bbda3a6a5d1d67b8af SHA256 2439638053cd98f3c3c1091aadd26a5622b5f85128de49fbe7e6c1237ab5d268
+EBUILD dovecot-1.2.7.ebuild 7456 RMD160 d2994d3ae96ff730e108bedb3426d1e5ae3c8e8f SHA1 b3e8fe70a9cf5358e16dcefbb7ac17a97f7a5414 SHA256 1859f91b25bdd1c8e5423722c49edb4da3aa25fe2fc4dd547d320e1090d7a76e
+MISC ChangeLog 35907 RMD160 9a1006a67b9d68d7c83bf2c604f8403c0ceed7ce SHA1 88b2cf4d267b0257a40144c3cbc726f409bc644b SHA256 0005940127f6dcf2760e9cf72ad4185683d00ec0e294c1009ca03f0bfa39786d
 MISC metadata.xml 519 RMD160 d0eb63c3a021b24ac08c5ea5b3e5dc393a4b25ff SHA1 7138482d992a2348d7d59fa38aa072958c766b17 SHA256 3814d22e317ff83709a577f037a8cfb10e897ebfbe572132a8d1af882c813ce3
diff --git a/net-mail/dovecot/dovecot-1.2.6.ebuild b/net-mail/dovecot/dovecot-1.2.6.ebuild
index 18fe9f201e8f..3a1e1ffda35a 100644
--- a/net-mail/dovecot/dovecot-1.2.6.ebuild
+++ b/net-mail/dovecot/dovecot-1.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.2.6.ebuild,v 1.4 2009/11/08 17:03:26 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.2.6.ebuild,v 1.5 2009/11/18 15:57:14 scarabeus Exp $
 
 EAPI="2"
 
@@ -172,7 +172,7 @@ src_install () {
 		sed -i -e '/passdb pam/, /^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
 			"${conf}" || die "failed to update PAM settings in dovecot.conf"
 		# mailbase does not provide a managesieve pam file
-		use managesieve && dosym imap /etc/pam.d/managesieve
+		use managesieve && dosym imap /etc/pam.d/sieve
 	fi
 
 	# Listen on ipv6 and ipv4
diff --git a/net-mail/dovecot/dovecot-1.2.7.ebuild b/net-mail/dovecot/dovecot-1.2.7.ebuild
new file mode 100644
index 000000000000..d775801ac974
--- /dev/null
+++ b/net-mail/dovecot/dovecot-1.2.7.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.2.7.ebuild,v 1.1 2009/11/18 15:57:14 scarabeus Exp $
+
+EAPI="2"
+
+inherit eutils versionator
+
+major_minor="$( get_version_component_range 1-2 )"
+sieve_version="0.1.12"
+managesieve_version="0.11.9"
+SRC_URI="http://dovecot.org/releases/${major_minor}/${P}.tar.gz
+	sieve? ( http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-sieve-${sieve_version}.tar.gz )
+	managesieve? (
+		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${PV}-managesieve-${managesieve_version}.diff.gz
+		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-managesieve-${managesieve_version}.tar.gz
+	)"
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1" # MIT too?
+KEYWORDS="~alpha ~amd64 ~x86"
+
+IUSE="berkdb bzip2 caps cydir dbox doc ipv6 kerberos ldap +maildir managesieve mbox mysql pam postgres sieve sqlite +ssl suid vpopmail zlib"
+
+DEPEND="berkdb? ( sys-libs/db )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( virtual/postgresql-base )
+	sqlite? ( dev-db/sqlite )
+	ssl? ( dev-libs/openssl )
+	vpopmail? ( net-mail/vpopmail )"
+
+RDEPEND="${DEPEND}
+	>=net-mail/mailbase-0.00-r8"
+
+pkg_setup() {
+	if use managesieve && ! use sieve; then
+		eerror "managesieve USE flag selected but sieve USE flag unselected"
+		die "USE flag problem"
+	fi
+
+	if use dbox && ! use maildir; then
+		eerror "dbox USE flag needs maildir USE flag enabled"
+		die "USE flag problem"
+	fi
+
+	# Add user and group for login process (same as for fedora/redhat)
+	enewgroup dovecot 97
+	enewuser dovecot 97 -1 /dev/null dovecot
+	# add "mail" group for suid'ing. Better security isolation.
+	if use suid; then
+		enewgroup mail
+	fi
+}
+
+src_prepare() {
+	use managesieve && epatch "${WORKDIR}"/dovecot-${PV}-managesieve-${managesieve_version}.diff
+}
+
+src_configure() {
+	local conf=""
+
+	if use postgres || use mysql || use sqlite; then
+		conf="${conf} --with-sql"
+	fi
+
+	local storages=""
+	for storage in cydir dbox maildir mbox; do
+		use ${storage} && storages="${storage} ${storages}"
+	done
+	[ "${storages}" ] || storages="maildir"
+
+	econf \
+		--sysconfdir=/etc/dovecot \
+		--localstatedir=/var \
+		--with-moduledir="/usr/$( get_libdir )/dovecot" \
+		$( use_with berkdb db ) \
+		$( use_with bzip2 bzlib ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( use_with ldap ) \
+		$( use_with mysql ) \
+		$( use_with pam ) \
+		$( use_with postgres pgsql ) \
+		$( use_with sqlite ) \
+		$( use_with ssl ) \
+		$( use_with vpopmail ) \
+		$( use_with zlib ) \
+		$( use_with ldap) \
+		--with-storages="${storages}" \
+		--with-pic \
+		--enable-header-install \
+		${conf}
+
+	if use sieve; then
+		# The sieve plugin needs this file to be build to determine the plugin
+		# directory and the list of libraries to link to.
+		emake dovecot-config || die "emake dovecot-config failed"
+		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
+		econf --with-dovecot="${S}"
+
+		if use managesieve; then
+			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
+			econf --with-dovecot="${S}" --with-dovecot-sieve="../dovecot-${major_minor}-sieve-${sieve_version}"
+		fi
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
+
+	if use sieve; then
+		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
+
+		if use managesieve; then
+			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
+			emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
+		fi
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	# insecure:
+	#use suid && fperms u+s /usr/libexec/dovecot/deliver
+	#better:
+	if use suid;then
+		einfo "Changing perms to allow deliver to be suided"
+		fowners root:mail /usr/libexec/dovecot/deliver
+		fperms 4750 /usr/libexec/dovecot/deliver
+	fi
+
+	rm -f "${D}"/etc/dovecot/dovecot-{ldap,sql}-example.conf
+
+	newinitd "${FILESDIR}"/dovecot.init-r2 dovecot
+
+	rm -rf "${D}"/usr/share/doc/dovecot
+
+	if use doc; then
+		dodoc AUTHORS NEWS README TODO dovecot-example.conf || die "basic dodoc failed"
+		dodoc doc/* || die "dodoc doc/ failed"
+		docinto wiki
+		dodoc doc/wiki/* || die "dodoc doc/wiki/ failed"
+
+	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_privileged_group =|mail_privileged_group = mail|' "${conf}"
+	fi
+	sed -i -e \
+		"s|#mail_location =|mail_location = ${mail_location}|" "${conf}" \
+		|| die "failed to update mail location settings in 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 = "\*"|' \
+			"${conf}" || die "failed to update PAM settings in dovecot.conf"
+		# mailbase does not provide a managesieve pam file
+		use managesieve && dosym imap /etc/pam.d/managesieve
+	fi
+
+	# Listen on ipv6 and ipv4
+	if use ipv6; then
+		sed -i -e 's/^#listen = \*/listen = \[::\]/g' "${conf}" \
+			|| die "failed to update listen settings in dovecot.conf"
+	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 "failed to update SSL settings in dovecot.conf"
+	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}" \
+			|| die "failed to update SQL settings in dovecot-sql.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}" \
+			|| die "failed to update LDAP settings in dovecot-ldap.conf"
+		dodoc doc/dovecot-ldap-example.conf
+	fi
+
+	if use sieve; then
+		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
+		emake DESTDIR="${D}" install || die "make install failed (sieve)"
+
+		if use managesieve; then
+			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
+			emake DESTDIR="${D}" install || die "make install failed (managesieve)"
+		fi
+	fi
+
+	dodir /var/run/dovecot
+	fowners root:root /var/run/dovecot
+	fperms 0755 /var/run/dovecot
+	keepdir /var/run/dovecot/login
+	fowners root:dovecot /var/run/dovecot/login
+	fperms 0750 /var/run/dovecot/login
+
+	ewarn "If you are upgrading from Dovecot 1.1, read "
+	ewarn " http://wiki.dovecot.org/Upgrading/1.2"
+	if use sieve; then
+		ewarn " http://wiki.dovecot.org/LDA/Sieve/Dovecot#Migration_from_CMUSieve"
+		ewarn " In particular, do not forget to change cmusieve to sieve"
+	fi
+}