version bump

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

3 files changed, 299 insertions, 15 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 7231dc28343d..8c9f522442f3 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.296 2011/05/09 08:24:33 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.297 2011/05/11 19:18:08 eras Exp $
+
+*dovecot-2.0.13 (11 May 2011)
+
+  11 May 2011; Eray Aslan <eras@gentoo.org> +dovecot-2.0.13.ebuild:
+  version bump
 
   09 May 2011; Eray Aslan <eras@gentoo.org> dovecot-2.0.12-r2.ebuild:
   Remove useless berkdb USE flag bug #366481
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 0ce6b2441e54..c3c1b41344dc 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -12,27 +12,29 @@ DIST dovecot-2.0-pigeonhole-0.2.2.tar.gz 1199973 RMD160 7aa58935acb5a89348c53f8e
 DIST dovecot-2.0-pigeonhole-0.2.3.tar.gz 1213027 RMD160 63898d5b71aee933399e9e76b6a1784b3b31197e SHA1 c8f67304028e21f8ff33163427fd4f47fa738d9d SHA256 5f6f95f8e504e19c574d9d65fce382a2b3f8709ccf2d86beb709b09bf337b113
 DIST dovecot-2.0.11.tar.gz 3225716 RMD160 e63234ad2c000f55b701ee2a27865c91b1d02beb SHA1 e79cce204d06a3cabf43dbeb4f0a9bc109d4d095 SHA256 5979af86719bcf6a99530029c74c02c865899fcde7ce92ac05d34d81b6e20de4
 DIST dovecot-2.0.12.tar.gz 3257165 RMD160 9b4aee66a187517e1ef0d8976c461a4f8c9709ba SHA1 6d991e8d68d6ec8e956bfb8cd71df2b15021079a SHA256 05322d7378d19991c098f231b9bc0296d53e499d3b12b91ab92a3e2d10ab43d6
+DIST dovecot-2.0.13.tar.gz 3272542 RMD160 2c0edd03aba7935e6db18af1384a26bf0b5b432e SHA1 31d556bd1659fb10e5edb45bab8951911151bbfb SHA256 2b512263ec05bbd74cde5c697ad12250d9268eba1c8ce4a8144adea69308675d
 EBUILD dovecot-1.2.16.ebuild 8827 RMD160 c4da85e63c65784c50fca6b8cbfa4d276432c254 SHA1 dedcc6b7da960d89a7b66024556c1b1df1b12718 SHA256 980b1cc7b84add1c4b49231eef821eefa6d8edbf58181b2520e44beb9452d18a
 EBUILD dovecot-2.0.11.ebuild 8955 RMD160 7f171a4992c8b31249bbbca1e388fa9c5f247648 SHA1 aab6ec760c8a82d055ba60bd60f0876048018f90 SHA256 1c7a1593ff9a355933fc325de3e12e06141477c6a176be674a15f68fd3f78951
 EBUILD dovecot-2.0.12-r1.ebuild 8955 RMD160 2f3bffc943ebb97f63d94c457317534a6185d1bf SHA1 bac8a32647366c0f6bee1018628861c09acff7e4 SHA256 511240141da63c5b1d81decab47848c40f77cc9d22b2c93e84728078e60800a6
 EBUILD dovecot-2.0.12-r2.ebuild 8981 RMD160 769b62e7ad41a515097b83f2224f2e094f45d53e SHA1 b469d5bd4d4cf67b3dd1d2dad2cb7d672fa56bf3 SHA256 40dab368c35762f66af483213d9761772197090df9b0ee4029f1d752c55e8389
 EBUILD dovecot-2.0.12.ebuild 8952 RMD160 ab9feb663d4b614ab998bae3a71eca6abc8d1dea SHA1 23d63bb322f9068c645ef0903a2ce7c2273a9abc SHA256 0b832f8941ea140b666565e95a67ad67765900c653ed685c543051b9bebf2bb2
-MISC ChangeLog 47094 RMD160 304564cfd10e6566479823d379e26c608012ec28 SHA1 df550adb6302bb53bc0c99df36289d2bfab91b77 SHA256 2abd65d7034789b708202e68fbb235ca129c1d02e4d3ac7f0d583a5917db1e08
+EBUILD dovecot-2.0.13.ebuild 8920 RMD160 76c4894580f421b9d7aa3cca032b40f0ecc2fdb4 SHA1 464ae8d9601a48fc492a81b4292c4b333a16ca03 SHA256 aa6aff97d47fa069ac1d9089ce5985988ae0560e9643801c3521c10e1c78a253
+MISC ChangeLog 47209 RMD160 ea61c9567d61fca726e9a1948a5a550ffb70e9c0 SHA1 782c3ae4d72d8ab418c2abccbdfcfe05a5e55ca6 SHA256 e2e2ed9e1c56faeeafc944b3b83daa4fdfb4ff47a311af4c2e25f155d96ba757
 MISC metadata.xml 703 RMD160 a7a55f21501b09979922b24a931fbf7a5bbf86b1 SHA1 b4c9f2cd2a2fae951e319960ce3aba33d56301cf SHA256 3a897cb8fc88c875563623d2757f7b0ebd08743ba4d4fcbdfe37072d99694c58
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNx6TOAAoJEHfx8XVYajsfuSIP/3GW586q4kCcSiyLMs0O21Mh
-pIo94KIxSjFV3l6rL15qGCneWMdHejrVXwTkgLA/FDjvhUbIcb9NT1AOjFaiKBAt
-aQhWXbDpIarDpvRSqEhr3Xi9+sOzJFg4uuC0L8WdD4KGoiEo3NlRoI5ZW/D/Uior
-+awA1knS5sg6ISWRngkumX+KM3cF+GkphruZoxHkH6iZV1CBrRmKqdXrspLJqJdj
-7ZHfYhkcH5eay6kAUVoVlIVCxv0zAeRIf6xVf1lSNF+CP771Yjbh0PRR53Uuo+iz
-t0fJDerAkVlEBLhm3osrF69YM7p8qsqxNz7zGbd0qv3XDM8oLLf+vBHxkzQ3rKQw
-1lVocN0Q1tqJYdyNPIIZw0odsjdFKMHPiglw+7IVaLzO3xX9rZwgffDg7RLpw3Wv
-nOSrJVFD2BmE8B42Xh9ckLGdI3/ef8rSX0p7/x8inIzGrhR8YXXY9Nmcts6AIQ8l
-of9bQTzePmcWUzTN0YaRAwJkv9fcVyoaO1olA9NZWLxetb4riAsdqwO589RdYECi
-77DXTaV3mIhZUqiUxJEVfQCqxEy/itGldA5TaErLsBdUErf660RHj+U+PQSjaCDN
-BHdzqkud+viXQtDHAqIvW3wQCJPZ5gu8LiQCGw/dO4kY6cda1riRLhahjXnN1+Lg
-OiBREsVqAi9KfCz+IOk2
-=nV82
+iQIcBAEBCAAGBQJNyuD+AAoJEHfx8XVYajsfY3oQAK0mO2h/tOsnsoAvTPShBNyt
+3mPPDtbh1LcbSpSUFaGhNR4ysBk7i1M+KyB2LKqk+DIAoEWhpv5t2dm1FjY1AiHC
+oenAIyWuZ9knxnFl7OlJ1dZJZpQjReRtttqnzrQ0u7SQN0oehpxu8HMupZFx9x8U
+TaNQS8XIdo9bpJ1AV+E1WDqDzSm0kVcj9oOgHuG0t8ss459uMP1sRw0tGcjMNihT
+v/o8hr/+yK+NDSsVZe61ENf3o7JrvTTEGblgiVnLdkQtgwBL8ihtmjNDr9nrZW8y
+9MN/ecyZ4P7Vk+cDlZUhwaLdVYiySFk7HzaSAbWpsLpHrlc9qLnrknOPDhBUTylM
+2NfjAH6cqvU33SDFWpeqdf+Kn0sQ1WYgVWpDCBkPhauKmFd1eR9PK4seXVKIkjIl
+EIHhhBf6pya9OFZULo0lWtQdgRKNgWzwHK4o3DbQkJ5ZIP4jA9Ce+LhyUmMn4irZ
+6QNIAWIUmvgiGDFE5RhK8gJbxE7GYap/7EgvLA+4WiV4TUovrilY8LXX8BkdBA+5
+TeAnyFaBvzimJVxwYdu9RrE+vuna61ZFj7VnjQrl7ARL6Cp56RVd5faf5uHxFpZR
+BxAvHwHvru9FjDKcga/e4XcCAodDkPT598GNMEzjeI5g1+neArj4ea3o1ZLLylF8
++qLrPQU2mf7ZUEmvDqPM
+=LEQD
 -----END PGP SIGNATURE-----
diff --git a/net-mail/dovecot/dovecot-2.0.13.ebuild b/net-mail/dovecot/dovecot-2.0.13.ebuild
new file mode 100644
index 000000000000..a89a3d5bb814
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.0.13.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.0.13.ebuild,v 1.1 2011/05/11 19:18:08 eras Exp $
+
+EAPI="3"
+
+inherit eutils versionator ssl-cert
+
+MY_P="${P/_/.}"
+major_minor="$( get_version_component_range 1-2 )"
+sieve_version="0.2.3"
+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 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+
+IUSE="bzip2 caps cydir sdbox doc ipv6 kerberos ldap +maildir managesieve mbox mdbox mysql pam postgres sieve sqlite +ssl 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 ) \
+		--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 \
+			--localstatedir="${EPREFIX}/var" \
+			--enable-shared \
+			--with-dovecot="../${MY_P}" \
+			$( use_with managesieve )
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
+
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make sieve failed"
+	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 || 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 "${ED}"/usr/libexec/dovecot/deliver
+		fperms 4750 "${ED}"/usr/libexec/dovecot/deliver
+	fi
+
+	newinitd "${FILESDIR}"/dovecot.init-r2 dovecot
+
+	rm -rf "${ED}"/usr/share/doc/dovecot
+
+	dodoc AUTHORS NEWS README TODO || die "basic dodoc failed"
+	dodoc doc/*.{txt,cnf,xml,sh} || die "dodoc doc failed"
+	docinto example-config
+	dodoc doc/example-config/*.{conf,ext} || die "dodoc example failed"
+	docinto example-config/conf.d
+	dodoc doc/example-config/conf.d/*.{conf,ext} || die "dodoc conf.d failed"
+	docinto wiki
+	dodoc doc/wiki/* || die "dodoc wiki failed"
+	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
+	sed -i -e "s:/usr/share/doc/dovecot/:/usr/share/doc/${PF}/:" \
+		"${confd}/../README" || die "sed failed"
+
+	# .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 || die "make install failed (sieve)"
+		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
+}
+
+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
+}