version bump

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

3 files changed, 304 insertions, 16 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 74a92b968439..ca1065ae8b8a 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/dovecot
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.334 2011/12/19 15:22:57 eras Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.335 2012/01/06 21:46:27 eras Exp $
+
+*dovecot-2.0.17 (06 Jan 2012)
+
+  06 Jan 2012; Eray Aslan <eras@gentoo.org> +dovecot-2.0.17.ebuild:
+  version bump
 
   19 Dec 2011; Eray Aslan <eras@gentoo.org> -files/dovecot-2.0.12-sdbox.patch,
   -dovecot-2.0.13.ebuild, -dovecot-2.0.14.ebuild, -dovecot-2.0.14-r1.ebuild,
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index b8bb3327382e..2c8523d8fd15 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -13,29 +13,31 @@ DIST dovecot-2.0-pigeonhole-0.2.4.tar.gz 1230408 RMD160 61cf4209210f56d033586d77
 DIST dovecot-2.0-pigeonhole-0.2.5.tar.gz 1232117 RMD160 6d8e98fccfa7c6c0eca66fd3b7c70854f9fd2950 SHA1 a67388b739172134ae0d5f43cf45b773da1eff37 SHA256 2793eec5384b9136774e1b3929864aa15edc5f057b97cfbee809ec0dfc292b9c
 DIST dovecot-2.0.15.tar.gz 3303717 RMD160 2c315bbce2d7173b1e62c96d3a4bda0910a59d0d SHA1 b90f5c1610d8866413fc39cede218534ad6490e8 SHA256 63640303b5deb299a605a94ffd706cac6866d934175b291d2e66f64e95b97e0d
 DIST dovecot-2.0.16.tar.gz 3317662 RMD160 dfe0cf2bbd211a07bb492c2f0d944a6a9f1c5f79 SHA1 0df6e84233339ee308deaecd8f1a7ffddcaeca16 SHA256 a9652ce1f0767b9a4d4f613dd4d41bbe7b55c25728be6f1283dacf0aff62f057
+DIST dovecot-2.0.17.tar.gz 3329794 RMD160 108399bdaf0e03e013b78b79e39c5c8a5dd2f62d SHA1 4c12f1a074c52b17cb64fcc73c41f0a2820a88fe SHA256 3f0d4289067d2355b4ce4a00265bf2b4bf6540bca8fdcecfc6ad20611da145d2
 DIST dovecot-2.1-pigeonhole-b3bff60a18da.tar.bz2 559589 RMD160 8663b39ff8a517cd7188ee07d9b5ef2c40e0223a SHA1 b95dda50d077a207e1d6eda713df3342a64fb681 SHA256 fa819e96b6620e690d0511b34c741b5495fae59c5c6f71e035f3b4c47165b174
 DIST dovecot-2.1.rc1.tar.gz 3561759 RMD160 f45057183702fd6faa5aca345fc48755389b6387 SHA1 ef3a5803118bbf6fc9c67c4b4437ff3910305828 SHA256 629c34f00f269775f55ccc3b2e5fa042632991b1594b1ef1d4e2663dcdacfb33
 EBUILD dovecot-1.2.17.ebuild 8744 RMD160 1c40bc02a47f1bd32bab43c5a37129a53394bbe8 SHA1 5ecf16dbef283f4c0279aba519d129d45e7b2298 SHA256 8f086c275f79bda4f54e2c9b9758c8e636bee12e106748475acac0967238082e
 EBUILD dovecot-2.0.15.ebuild 8852 RMD160 d22cf98e15958acb6d414b6a6a56268e9f36f050 SHA1 ca3e304979825f8da066ffdf97d39e9a0be87d9f SHA256 5451118790e070c118639421aa834d8829e554578af514f1c1eb08a4395e6158
 EBUILD dovecot-2.0.16-r1.ebuild 8784 RMD160 f77f1e16ebaa8819387070acf2d1be84d5c7f7ea SHA1 2f7470cb0c53aa9a6badeb66e0e458ee24bb5799 SHA256 e66d6271f8b453e6fa62186db248e11900f7f7be4659662aa31c6e67f9abcdb5
 EBUILD dovecot-2.0.16.ebuild 8774 RMD160 26546711ce3221f744f2cf1162316a069a776445 SHA1 4062e369cbb851ce7fa8aa25fc3ba2ce378531ff SHA256 cc127a8f84def8c5daf4b922bb0c2785a972f0ee29b73db914c220a36e5cfbae
+EBUILD dovecot-2.0.17.ebuild 8781 RMD160 fa99b0ea7f9fa11072ad2da89adcb67df84034b6 SHA1 4c9469527577315b82f588349f6be11df0e7951d SHA256 1bef4e795878e15f0b5a006a5e58f573d6d4ab24220eda213c86da8e7fa9fe61
 EBUILD dovecot-2.1_rc1.ebuild 9496 RMD160 1a65ba842135dfffc1ab91221e09506d908b8754 SHA1 064a7b454743c8623e16cdbbbfa286a202138cdd SHA256 d85433d7f9a12f2c102846163c54e1b7b1a4dca9098201a49b886571c79d0137
-MISC ChangeLog 51938 RMD160 ac300ceaa622e4b70592939836889ca255f343e9 SHA1 d0db5bb1b18f564c21c863a304e19c918e931c6c SHA256 3a81f32992fd82da889d4bf57b9c033282875bd491086ff1de6758d6f4482342
+MISC ChangeLog 52053 RMD160 b0cb22704f3a5ac468e8679272d8e233bc801639 SHA1 89b70a5ea1298b23792fe644e8f0dd1ec76cbc10 SHA256 803a2555284a5791bea37478ba749a794a2b611c86e65e892884e0f5667231fb
 MISC metadata.xml 871 RMD160 8e53e66f2ad0b595ef424cf855c108d103a87f49 SHA1 ea5616a16a1cb3394600ad17a1422383acb100f5 SHA256 64805284b8602318ba8b8902d58adc8b4edacba0468037a9c8abae4aac46ddb8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJO71bWAAoJEHfx8XVYajsf9rQP/AodhffsVtdn2r0RLRxKi1HT
-Fl24Fi4XsuhANxcQ7PMnRlMNz+01DkpixZb1zOqQ3X+4nZMDDVrCb+0BbUSXYSnD
-10ezhvI4JulIhdQdhJ9x69Mu4A4mJk9jGZr/gQJajN+DMlgfYL/7ebS9tXIht859
-XRM6KBuZOxWGuKT4Ahbl4ZvClCK7pY1CfMZ+HrhYETux0GA2GIlI0dCefhIhFOsS
-zjP7nlrZhGOeglbBP3xGvQb0Wmqu7EUKV9iulGjFJkYa7asYHmNDGCzvHbwMzDpu
-5HNt/mMO6soF7kO+Is7/LHO4N/NAXZPPoE4fmou1oivezfphMmpeju3AfUyuZmOY
-gvvwzv1tneTLApFh6XE+tL4EtERxbnVgey1MCr46IucxQ++fZcvZrIxNSGVaVzLA
-MCXgtsW+6tAd73g1o+VF3i3/0sUzwPnpapJBFJjUnb0v4ZrvajdPs7BANcuQXh3K
-UDlymnlIzrxVbUOel04Wo46T8w6FWLd7qRJNoEyHRRhZeXwbfaHeHBjtS4W5s+x9
-xLEwAgunPfZ3GgOq8xzq+SFjoxgaZA8yiFSSDXvp/8WOxi9kue2KRhGis60/Z4fB
-sllii7mk0b3hHjtfn2ZP0MFsGjpnmkQramZhbpJHXQd3QchUzBnUKe+/onJEJUK1
-h6kK79OD3p/g86s8bSw4
-=415L
+iQIcBAEBCAAGBQJPB2vEAAoJEHfx8XVYajsfDLEP/jSUseL2m97Z+9o1Q1diFPpw
+XVn5EkIA/vt18x0XUAj86LKAqGI7wO6uBWzFiw7kQwcZMFeVUGWk8G7RQJUOIHml
+aQraUUUV/3sCI388VapCYEYa0/nijj+tjF3W2uBqfM2Kexk2D40x4g4C4IXiSFfg
+fPG15tNDLgiLC7ivuDyswmQH5319kRaXCNqKThBXQI4REBunuTjC6bK+3mhvhnP3
+RHz+jQVCxfSYOWEwlN0VxKnXZ6dhp3RS3zsQFK+CyyfxqOtkPYARH4cjpsiVTEr9
+a6IdAEnbDbuWiBLWkZ4Uzccidin3x+QNaeY/BdhqA7B7VxGM6pU3GbTskFxSLEGC
+7xg2g1Ty36InAHyn/vJp3DOCucSsLAdLGM9ptWo3rganzSFvVg5ZJRXYBAmPzAqh
+4Hls+kuBtT5yFKE94hvE+o9Vn/Qkji/gZu2eOJayQXKhgL273mXJmDsqB36JyrI5
+B1GJ/FsoaSnPKyRiifNWTuCqTqTJTkxede8A9R4VutpgnLPk9d6Oy5jOPucP6W61
+Kwu5n7O1CD3jPrZJOExYQNuqQhC8TX9rBgVKajfImt6Xj2+uFyD0BQJY8dkGyIpu
+8hjRHuxmjX5vrwYBB2aiuDnMFaseEUeowhiqe45eCZwArPBtduUBCGkCxluoo0e5
+zbL7IwdBZIM9rqe6GmaD
+=awtp
 -----END PGP SIGNATURE-----
diff --git a/net-mail/dovecot/dovecot-2.0.17.ebuild b/net-mail/dovecot/dovecot-2.0.17.ebuild
new file mode 100644
index 000000000000..916fc97679cd
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.0.17.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.0.17.ebuild,v 1.1 2012/01/06 21:46:27 eras Exp $
+
+EAPI=4
+
+inherit eutils versionator ssl-cert
+
+MY_P="${P/_/.}"
+major_minor="$( get_version_component_range 1-2 )"
+sieve_version="0.2.5"
+SRC_URI="http://dovecot.org/releases/${major_minor}/${MY_P}.tar.gz
+	sieve? (
+	http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	)
+	managesieve? (
+	http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-pigeonhole-${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 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+IUSE="bzip2 caps cydir sdbox doc ipv6 kerberos ldap +maildir managesieve mbox
+mdbox mysql pam postgres sieve sqlite +ssl static-libs suid vpopmail zlib"
+
+DEPEND="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 )
+	virtual/libiconv"
+
+RDEPEND="${DEPEND}
+	>=net-mail/mailbase-0.00-r8"
+
+S=${WORKDIR}/${MY_P}
+
+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
+
+	# Add user and group for login process (same as for fedora/redhat)
+	# default internal user
+	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
+	# default login user
+	enewuser dovenull -1 -1 /dev/null
+}
+
+src_configure() {
+	local conf=""
+
+	if use postgres || use mysql || use sqlite; then
+		conf="${conf} --with-sql"
+	fi
+
+	local storages=""
+	for storage in cydir sdbox mdbox maildir mbox; do
+		use ${storage} && storages="${storage} ${storages}"
+	done
+	[ "${storages}" ] || storages="maildir"
+
+	# turn valgrind tests off. Bug #340791
+	VALGRIND=no econf \
+		--localstatedir="${EPREFIX}/var" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		$( 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_enable static-libs static ) \
+		--with-storages="${storages}" \
+		--disable-rpath \
+		--without-systemdsystemunitdir \
+		${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}-pigeonhole-${sieve_version}" || die "cd failed"
+		econf \
+			$( use_enable static-libs static ) \
+			--localstatedir="${EPREFIX}/var" \
+			--enable-shared \
+			--with-dovecot="../${MY_P}" \
+			$( use_with managesieve )
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	fi
+}
+
+src_test() {
+	default_src_test
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		default_src_test
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${ED}" install
+
+	# 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 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+	fi
+
+	newinitd "${FILESDIR}"/dovecot.init-r3 dovecot
+
+	rm -rf "${ED}"/usr/share/doc/dovecot
+
+	dodoc AUTHORS NEWS README TODO
+	dodoc doc/*.{txt,cnf,xml,sh}
+	docinto example-config
+	dodoc doc/example-config/*.{conf,ext}
+	docinto example-config/conf.d
+	dodoc doc/example-config/conf.d/*.{conf,ext}
+	docinto wiki
+	dodoc doc/wiki/*
+	doman doc/man/*.{1,7}
+
+	# 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"
+	local confd="${ED}/etc/dovecot/conf.d"
+
+	insinto /etc/dovecot
+	doins doc/example-config/*.{conf,ext}
+	insinto /etc/dovecot/conf.d
+	doins doc/example-config/conf.d/*.{conf,ext}
+	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
+	rm -f "${confd}/../README"
+
+	# .maildir is the Gentoo default
+	local mail_location="maildir:~/.maildir"
+	if ! use maildir; then
+		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|' \
+			"${confd}/10-mail.conf" || die "sed failed"
+		elif use sdbox ; then
+			mail_location="sdbox:~/.sdbox"
+		elif use mdbox ; then
+			mail_location="mdbox:~/.mdbox"
+		fi
+	fi
+	sed -i -e \
+		"s|#mail_location =|mail_location = ${mail_location}|" \
+		"${confd}/10-mail.conf" \
+		|| die "failed to update mail location settings in 10-mail.conf"
+
+	# We're using pam files (imap and pop3) provided by mailbase
+	if use pam; then
+		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+			"${confd}/auth-system.conf.ext" \
+			|| die "failed to update PAM settings in auth-system.conf.ext"
+		# mailbase does not provide a sieve pam file
+		use managesieve && dosym imap /etc/pam.d/sieve
+		sed -i -e \
+			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update PAM settings in 10-auth.conf"
+	fi
+
+	# Disable ipv6 if necessary
+	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 = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+		|| die "ssl conf failed"
+		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
+			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
+			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
+	fi
+
+	# Install SQL configuration
+	if use mysql || use postgres; then
+		sed -i -e \
+			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
+			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
+			10-auth.conf"
+	fi
+
+	# Install LDAP configuration
+	if use ldap; then
+		sed -i -e \
+			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update ldap settings in 10-auth.conf"
+	fi
+
+	if use vpopmail; then
+		sed -i -e \
+			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update vpopmail settings in 10-auth.conf"
+	fi
+
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake DESTDIR="${ED}" install
+		sed -i -e \
+			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
+			|| die "failed to update sieve settings in 15-lda.conf"
+		rm -rf "${ED}"/usr/share/doc/dovecot
+		dodoc doc/*.txt
+		docinto example-config/conf.d
+		dodoc doc/example-config/conf.d/*.conf
+		insinto /etc/dovecot/conf.d
+		doins doc/example-config/conf.d/90-sieve.conf
+		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
+		docinto sieve/rfc
+		dodoc doc/rfc/*.txt
+		docinto sieve/devel
+		dodoc doc/devel/DESIGN
+		doman doc/man/*.{1,7}
+	fi
+
+	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-2" ; then
+		elog "There are a lot of changes in configuration files in dovecot-2.0."
+		elog "Please read http://wiki.dovecot.org/Upgrading and"
+		elog "check the conf files in ${ROOT}etc/dovecot."
+		elog "You can also run doveconf -n before running etc-update or"
+		elog "dispatch-conf to get an idea about what needs to be changed."
+		ewarn "\nDo NOT {re}start dovecot without checking your conf files"
+		ewarn "and making the necessary changes.\n"
+	fi
+}
+
+pkg_postinst() {
+	if use ssl; then
+	# 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
+			einfo "Creating SSL	certificate"
+			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+			install_cert /etc/ssl/dovecot/server
+		fi
+	fi
+}