Bump #336352, disable bzip2 support #337014

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

3 files changed, 273 insertions, 2 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index fb362cb55b0b..9b339da26a76 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.255 2010/09/11 08:18:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.256 2010/09/15 15:21:03 patrick Exp $
+
+*dovecot-1.2.14 (15 Sep 2010)
+
+  15 Sep 2010; Patrick Lauer <patrick@gentoo.org> +dovecot-1.2.14.ebuild:
+  Bump #336352, disable bzip2 support #337014
 
 *dovecot-2.0.2 (11 Sep 2010)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 482c35a21f67..a991bdb946b9 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -13,6 +13,8 @@ DIST dovecot-1.2.11-managesieve-0.11.11.diff.gz 6454 RMD160 bfd7593b8ffa36ac6062
 DIST dovecot-1.2.11.tar.gz 2878057 RMD160 cb2090a21e99cfaf98d7cbfdc98adbf42df6e2cc SHA1 97e63377be3641d4c7aa5a0c6d4e2bd602d45972 SHA256 2971691d4f8307b7014ca6671f44151cb53379f80746aa4a95cdeb0b846e0474
 DIST dovecot-1.2.13-managesieve-0.11.11.diff.gz 6463 RMD160 d26fa4db66c74d46fc562703f4493ee4d5a1b2a7 SHA1 636b1bb4dbcfd9e82c93faf4e4fdf83e2dcee755 SHA256 8646fcdf8c0fda69f8b0df88d9356861e124d7f70c75df1afb714769cd84e9ed
 DIST dovecot-1.2.13.tar.gz 2946123 RMD160 083dd4504dbf0e86187019853514811155c9087f SHA1 8a6e12cc40df02083480f9e9eef57939a81fd7af SHA256 22fa612b4c3250d33bc6e5010efd81d082b10dbce73da732fea644e085701869
+DIST dovecot-1.2.14-managesieve-0.11.11.diff.gz 6459 RMD160 41684ecd3667feac71a325786afbef22d0a5119d SHA1 83b39589810baedc55a6e15e34737d7de8ec48cc SHA256 5bf1a8c983f78c2b49d9068bb57f52001126fcd1e7ab1c5daf9f3a558c08e696
+DIST dovecot-1.2.14.tar.gz 2947472 RMD160 916b28e3ade1669546e19211a27d8971a2aabf87 SHA1 c1da8c7563bd222db03cb4cd5bb26bd4f9d6b45b SHA256 925cd5d1e8a5e5ebd6e2b9887957ab1f91d46ff8d64660ba8ed43543a40d6b9e
 DIST dovecot-2.0-pigeonhole-0.2.0.tar.gz 1205747 RMD160 57c010f633d0fb0ff18bc1ae1f0883cbb87a5032 SHA1 894ab2bc881c28870b6d35bf1c7854a6afd9c260 SHA256 77e4a91eb4491b3b670ca718bebf3ed7ced9001b6702f6cdcc9335224bc647d4
 DIST dovecot-2.0.2.tar.gz 3092707 RMD160 dfca51c13e63abbfa75347f935ea49d795679002 SHA1 8ec2e5879e9dde73b12136d435566561b65256a6 SHA256 ccce009753143b64251f77511a084e8c37c77b1da9de7f15a7f47ffe77548dff
 DIST dovecot-sieve-1.1.6.tar.gz 470071 RMD160 ed6f75dc1ffdb0ec51ecf3786aa71092851289f5 SHA1 c109ee8ab1c7ffece7940fb2e37104baf784440e SHA256 a2130a8e7d732bb341a96a96a24b4ddb66834e116573a10c17e68344fe712b36
@@ -21,6 +23,7 @@ EBUILD dovecot-1.2.11-r1.ebuild 8541 RMD160 f31a3cff9606f0254ba14d5bd5f60962daf9
 EBUILD dovecot-1.2.11-r2.ebuild 8548 RMD160 d1f883279cca7db1cfbe7738a46ec658a0ea58d2 SHA1 8779360f729cf1ffdb08bd6837a89bd017a2436e SHA256 946f195e5434105bbdfb423599514914c08ab958f3afeac6f2e82cda62df1a20
 EBUILD dovecot-1.2.13-r1.ebuild 8875 RMD160 90a000f07b26331af8970df14f142f92cfe065fa SHA1 9c02334811cd97f80f10825da06de8e847b59477 SHA256 a37776e57d317f20ef274ea38e51e50d716ae7eb4da2d7b72133cb85904a5e37
 EBUILD dovecot-1.2.13.ebuild 8549 RMD160 2dc0ad1f3ae9048b45083a05e597398b1739126a SHA1 7b91eb5cc1f643e6d4163acc3b1ca2d29b95f90c SHA256 b77f8c1c341e59b1a69db280490f534901e3c08927e74c9b360edfc0c6bfdf21
+EBUILD dovecot-1.2.14.ebuild 8835 RMD160 e4a0e86570ec96215d6b8f50e454f706b92636a2 SHA1 543df556a054f507554548352c88429472ca2ff5 SHA256 f11a638d51a13724c6913296662e88f742516bd2f47cab8970d4b01f2e1985b3
 EBUILD dovecot-2.0.2.ebuild 8894 RMD160 c6579b8162d91f6b2a02599995a2f7df25cfd1e6 SHA1 c63f2d49ef3d6981ecc035b9198fb3a31a4f33a5 SHA256 b557b808332e64a737964418bf562e0fea51939f9adbacfcd8ffc409399dccb2
-MISC ChangeLog 42057 RMD160 d0b4455e9420bdd0765d5b71688df36841762f81 SHA1 d43b1610f4b0476963a663bea4b8ccf1e758a9d4 SHA256 9207ffba96df836c5cae98620916cd0a8f4aa3cca94b2f7976cd893e11871d29
+MISC ChangeLog 42209 RMD160 4420bf54e2abf4613d32722bcfbaa87cda9c78f0 SHA1 3d8e707ae84d8241487490c99c6d88e0a7273262 SHA256 0148c5b7128ffaaa55b624b99ee4a487e131491e309407647506a8c1c7c67163
 MISC metadata.xml 919 RMD160 1e3a625fb64bee092b52fe671c7b51cbbc0cea80 SHA1 d4c9aa0299f149d3d552a10971d3efcc84809a1d SHA256 872564b7c2a02f4c2e042ea7b64e5ef14b0e1b63ddf8f04af36db9aa0efab372
diff --git a/net-mail/dovecot/dovecot-1.2.14.ebuild b/net-mail/dovecot/dovecot-1.2.14.ebuild
new file mode 100644
index 000000000000..071f5246aba7
--- /dev/null
+++ b/net-mail/dovecot/dovecot-1.2.14.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.2.14.ebuild,v 1.1 2010/09/15 15:21:03 patrick Exp $
+
+EAPI="3"
+
+inherit eutils versionator ssl-cert
+
+major_minor="$( get_version_component_range 1-2 )"
+sieve_version="0.1.17"
+managesieve_version="0.11.11"
+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
+		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-sieve-${sieve_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"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86"
+
+IUSE="berkdb 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? ( dev-db/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
+		ewarn "managesieve USE flag selected but sieve USE flag unselected"
+		ewarn "sieve USE flag will be turned on"
+	fi
+
+	if use dbox && ! use maildir; then
+		ewarn "dbox USE flag selected but  maildir USE flag unselected"
+		ewarn "maildir USE flag will be turned on"
+	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
+	if use dbox && ! use maildir; then
+		storages="${storages/dbox/dbox maildir}"
+	fi
+	[ "${storages}" ] || storages="maildir"
+
+	econf \
+		--sysconfdir="${EPREFIX}/etc/dovecot" \
+		--localstatedir="${EPREFIX}/var" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		$( use_with berkdb db ) \
+		$( 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 || use managesieve; 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 || use managesieve; 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="${ED}" 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 "${ED}"/etc/dovecot/dovecot-{ldap,sql}-example.conf
+
+	newinitd "${FILESDIR}"/dovecot-1.2.init dovecot
+
+	rm -rf "${ED}"/usr/share/doc/dovecot
+
+	if use ssl; then
+		sed -i -e 's,^CERTDIR=.*,CERTDIR=\$SSLDIR/dovecot,' \
+			-e 's,^KEYDIR=.*,KEYDIR=\$SSLDIR/dovecot,' \
+			-e 's,^CERTFILE=.*,CERTFILE=\$CERTDIR/server.pem,' \
+			-e 's,^KEYFILE=.*,KEYFILE=\$KEYDIR/server.key,' \
+			doc/mkcert.sh || die "failed to update SSL settings in mkcert.sh"
+	fi
+
+	dodoc AUTHORS NEWS README TODO dovecot-example.conf || die "basic dodoc failed"
+	dodoc doc/*.{txt,cnf,xml,sh}  || die "dodoc doc/ failed"
+	docinto wiki
+	dodoc doc/wiki/* || die "dodoc doc/wiki/ failed"
+
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us....
+	local conf="${ED}/etc/dovecot/dovecot.conf"
+	mv "${ED}"/etc/dovecot/dovecot-example.conf "${ED}"/etc/dovecot/dovecot.conf
+
+	# .maildir is the Gentoo default, but we need to support mbox too
+	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 sieve pam file
+		use managesieve && dosym imap /etc/pam.d/sieve
+	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 "${ED}"/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 "${ED}"/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 || use managesieve; then
+		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
+		emake DESTDIR="${ED}" install || die "make install failed (sieve)"
+
+		if use managesieve; then
+			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
+			emake DESTDIR="${ED}" install || die "make install failed (managesieve)"
+		fi
+	fi
+
+	dodir /var/run/dovecot
+	fowners root:root /var/run/dovecot
+	fperms 0755 /var/run/dovecot
+	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 || use managesieve; then
+		ewarn " http://wiki.dovecot.org/LDA/Sieve/Dovecot#Migration_from_CMUSieve"
+		ewarn " In particular, do not forget to change cmusieve to sieve"
+	fi
+}
+
+pkg_postinst() {
+
+	if use ssl; then
+	# Let's not make a new certificate if we already have one
+		if ! [[ -e "${EROOT}"/etc/ssl/dovecot/server.pem && \
+		-e "${EROOT}"/etc/ssl/dovecot/server.key ]];	then
+			einfo "Creating SSL	certificate"
+			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+			install_cert /etc/ssl/dovecot/server
+			chown dovecot:mail "${EROOT}"/etc/ssl/dovecot/server.{key,pem}
+		fi
+	fi
+
+	if grep -q '^ssl_key_password' "${EROOT}"/etc/dovecot/dovecot.conf; then
+		echo
+		ewarn "You have set ssl_key_password in dovecot.conf!"
+		ewarn "You are URGED to read the advice in the current"
+		ewarn "dovecot.conf regarding sensible handling of that"
+		ewarn "password, as it might be readable by any user"
+		ewarn "on your system who can access that file!"
+	fi
+
+}