Version bump - bug #344755

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

3 files changed, 271 insertions, 2 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 70efe6733297..8426f23d601d 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.274 2010/11/09 08:03:07 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.275 2010/11/12 07:30:03 eras Exp $
+
+*dovecot-1.2.16 (12 Nov 2010)
+
+  12 Nov 2010; Eray Aslan <eras@gentoo.org> +dovecot-1.2.16.ebuild:
+  Version bump - bug #344755
 
 *dovecot-2.0.7 (09 Nov 2010)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index e82f7155e20d..020e394e5efb 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -9,6 +9,8 @@ DIST dovecot-1.2-managesieve-0.11.12.tar.gz 406261 RMD160 f91a1fd059cebcb3c93419
 DIST dovecot-1.2-sieve-0.1.18.tar.gz 1052057 RMD160 f61b1ec03d861b964666a374a8c42a7b98c1fba1 SHA1 e661a6ab79b2987dedec1ed84cbd957755882ade SHA256 4a39bdf60d530cc27a1bc113fd3cb1f7adb6cc857578ada3720e40385c2cc7fe
 DIST dovecot-1.2.15-managesieve-0.11.12.diff.gz 6469 RMD160 82e7ce791d232f0312dbae6a7f3bde7378d685e6 SHA1 e2bb15d2847ea25e64c34abc670788f201039527 SHA256 140aa353a26c5ba0c74f0df1b33bdfca55ef9c65fb096d9646272aa9d5b5c77e
 DIST dovecot-1.2.15.tar.gz 2948856 RMD160 4b4def7a959729b9e01184565db90f0a7ee41f9e SHA1 828a4bd8822c2d1c53ee56247201b96b827b04ee SHA256 927845ba0a3de1da2d0ecefc27e835dd23a413cdf05fd044442bffb5e901442f
+DIST dovecot-1.2.16-managesieve-0.11.12.diff.gz 6459 RMD160 58369056e8f0f094fd28adf64d4de4dada24a955 SHA1 54000390e45d0d3978158322ab6377f79cd87fa0 SHA256 f2a933405361856a983235aec5e013df841bcc32fc0dc0afa2f0f9f32d16c251
+DIST dovecot-1.2.16.tar.gz 2949818 RMD160 50fbaec8a7a258be17912ea962cafaa51b4e8bc7 SHA1 84246be1c285de935bbe7649b1920efea91b12d6 SHA256 2b429a8a1666ccc97d159ce0df408ae9b524dcb72cffc7a3aabfc1c6da5dfb4c
 DIST dovecot-2.0-pigeonhole-0.2.1.tar.gz 1195090 RMD160 a3cd58c13c3de33e6941c94633c580af4406ad85 SHA1 ef06d157302576a9276c8f1181a3c5de018e2f36 SHA256 8249421cb69ca299e2830da8b635ca0a5ab692ab29456c188ba8078d7672ccda
 DIST dovecot-2.0.5.tar.gz 3109651 RMD160 f282fc026e9c709fe52ac661bf5eb9a89aed1014 SHA1 ff5d1c29887e390bc3345fa3fcfd4787fd6cc25c SHA256 974c269a53cba72dfcddad286767d446d903b2a94d48b598a41836e40a3d71fb
 DIST dovecot-2.0.6.tar.gz 3155389 RMD160 a41f0b774f3f11a28587f6f9e6a134cc4dd958a6 SHA1 70b4f58d00f6c5e6e0a129544119c88c13db62d5 SHA256 a1fe5ebc2926538f3c9b1b6e289739f83980bdb5a921157d713457e35a467753
@@ -16,8 +18,9 @@ DIST dovecot-2.0.7.tar.gz 3174912 RMD160 b284c99630935e87b124f48f132970a14737c98
 DIST dovecot-sieve-1.1.6.tar.gz 470071 RMD160 ed6f75dc1ffdb0ec51ecf3786aa71092851289f5 SHA1 c109ee8ab1c7ffece7940fb2e37104baf784440e SHA256 a2130a8e7d732bb341a96a96a24b4ddb66834e116573a10c17e68344fe712b36
 EBUILD dovecot-1.1.19.ebuild 8556 RMD160 31b66b06d538fb7a6719daeb19639633e1d7b5cb SHA1 524599a50ce525bc5deff63b24bb17b1446d06c5 SHA256 45610fede6f0f6d9b07ba2d3b38f8cb0e6f5292f3c4705c3b55327bb61307e8e
 EBUILD dovecot-1.2.15.ebuild 8826 RMD160 015d945f24dcd9fb73b6635ee624be0056893502 SHA1 7d3323f4eb086b1f3b9ddaaa8c8a911a77323751 SHA256 7e830fa0dcd0fcb91abb6dc66af1b7bff14dc17782fa9d9cc2dca20aa4bb06ff
+EBUILD dovecot-1.2.16.ebuild 8830 RMD160 1cdcd97a6d0f3287d6331aff13c7e12bb7efd5e0 SHA1 924defc679b13e06ef53439331db634e3c1abb17 SHA256 fa1580a2166c8dc898592386380459528768e0021146d6508e10de29fd6a7794
 EBUILD dovecot-2.0.5.ebuild 8943 RMD160 e0eda8790dc479a522e0107d6e8d1d8e1e8bf426 SHA1 22faa963345df58da56d11e40c7dd6d2e8236009 SHA256 b36ce191da33ea68f0e88fe2c38d7e234f207b88524ababf61904cdb36286383
 EBUILD dovecot-2.0.6.ebuild 8943 RMD160 aa6aa35148a3f97a0989d1374965c80e32defbac SHA1 62c48161d513b040f2c289074eabed99c18ff7ee SHA256 e0f24e0780e4a7a1e0caae7c95ba99f6530644b8cd5f1613b160b1b7d6715509
 EBUILD dovecot-2.0.7.ebuild 8940 RMD160 02e5a0d9391b742153f818135017e6cb889cbe5e SHA1 48c82c87f009b21d74e40c580499d3cf0cb84524 SHA256 041c3a7c7c8511e39d507867a5b27f836236ceb7814874bc2c8da3b69354b94a
-MISC ChangeLog 44207 RMD160 3622da4e37a49f41774d5787f8b7229394589f9d SHA1 a087bc7190c03182705a58e38e5ea17608b3d225 SHA256 8f2a056a9439f6de3104e59df911e9092cb63a897758b6113fe672b239932a1b
+MISC ChangeLog 44336 RMD160 d8ca58ac5361011ff2208c57ad31a3aac3c5c67a SHA1 fb8f007d3fa4a3463fbe7513a774d0a7bc585325 SHA256 daf36c32385dc6d31723e1d5b8bbb84bd6e16af7d0d1b3462d018e198c0f0643
 MISC metadata.xml 751 RMD160 5fa27151621a1de02d487372e454e82f4be4f789 SHA1 e1091b831c76e32c53e62a5ea921d7f17fa4dae9 SHA256 4952db40dfb832c18a2b29c99ed9da00926b13dca46c413434e5af8609039473
diff --git a/net-mail/dovecot/dovecot-1.2.16.ebuild b/net-mail/dovecot/dovecot-1.2.16.ebuild
new file mode 100644
index 000000000000..a0fe1d405a6d
--- /dev/null
+++ b/net-mail/dovecot/dovecot-1.2.16.ebuild
@@ -0,0 +1,261 @@
+# 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.16.ebuild,v 1.1 2010/11/12 07:30:03 eras Exp $
+
+EAPI="3"
+
+inherit eutils versionator ssl-cert
+
+major_minor="$( get_version_component_range 1-2 )"
+sieve_version="0.1.18"
+managesieve_version="0.11.12"
+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
+}