Upstream version bump for misc fixes, bug 329821 by Eray Aslan

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

3 files changed, 271 insertions, 2 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index c59ce9c1a1f5..72fdf4d3709e 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.249 2010/07/24 15:34:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.250 2010/07/26 23:21:59 darkside Exp $
+
+*dovecot-1.2.13 (26 Jul 2010)
+
+  26 Jul 2010; Jeremy Olexa <darkside@gentoo.org> +dovecot-1.2.13.ebuild:
+  Upstream version bump for misc fixes, bug 329821 by Eray Aslan
 
   24 Jul 2010; Raúl Porcel <armin76@gentoo.org> dovecot-2.0_rc3.ebuild:
   Add ~ia64 wrt #328319
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index c306919448f5..2dfc49049712 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -17,12 +17,15 @@ 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.12-managesieve-0.11.11.diff.gz 6455 RMD160 8f55a97e9a68e53faafa78a5f725969403f1f295 SHA1 f3719fc5427c97c65416658d73ff3234eaa204c9 SHA256 ea6549ed32cb1968971ef00725b43c8154023b4ed67ae1eb272485a0cf90a64f
 DIST dovecot-1.2.12.tar.gz 2882517 RMD160 9a2ecf836607905acebee57d082b0b4c36108260 SHA1 72fedd20c00eb3763012555c3622f84286cb8e65 SHA256 1ef0c40822cf64f20af1e65b4402da75296489aba25df8b13e2386df6952c281
+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-2.0.rc3.tar.gz 3063406 RMD160 c1d65515c1179981792e1a627548da29b4d7e77b SHA1 354779307fc0d5886e24f306bec0a8b3a82ce8e6 SHA256 7c64021803a0aa0b5f5b5888787fe5a54f379abf058570e50c2a9c720865e760
 DIST dovecot-sieve-1.1.6.tar.gz 470071 RMD160 ed6f75dc1ffdb0ec51ecf3786aa71092851289f5 SHA1 c109ee8ab1c7ffece7940fb2e37104baf784440e SHA256 a2130a8e7d732bb341a96a96a24b4ddb66834e116573a10c17e68344fe712b36
 EBUILD dovecot-1.1.19.ebuild 8581 RMD160 4cfb649e5cd577ab715f831210d6bdf7ddb7ea05 SHA1 3217a1cef3a0cd9192c7093d4cc3403eb1bcc9ea SHA256 b0fb355d36c9fc56016bfa3c6bcca07582dc60900c13c6c8d99848c98d8dada2
 EBUILD dovecot-1.2.11-r1.ebuild 8541 RMD160 f31a3cff9606f0254ba14d5bd5f60962daf99dba SHA1 874ee918a521b1995da49d9e7bb9d7d28d78fd36 SHA256 0e75be8e0338a01c54e72b507d8fe3c17ef1aa31a19ece769a5e3311897ca0ed
 EBUILD dovecot-1.2.11-r2.ebuild 8549 RMD160 d28caf09bbcebbc9e7393ad852a33eb887b3465b SHA1 3f7daf5e0df61733fb598f66826ab7af76d8bce9 SHA256 6897fcd0e88ca7cff75088268e5abe32cb9d15d54fa479e66fd75360d8b3d4b6
 EBUILD dovecot-1.2.12.ebuild 8547 RMD160 c5fc0acae6570bfcf3d57c772c5fb89ecc311b0e SHA1 a7c705774a4f4683b721a5e5e8692e875be8ffda SHA256 1a11428ec920f63a58f4d70847e26cf1aded769d4c7cfb7f2e98c7bbba4de1e8
+EBUILD dovecot-1.2.13.ebuild 8549 RMD160 2dc0ad1f3ae9048b45083a05e597398b1739126a SHA1 7b91eb5cc1f643e6d4163acc3b1ca2d29b95f90c SHA256 b77f8c1c341e59b1a69db280490f534901e3c08927e74c9b360edfc0c6bfdf21
 EBUILD dovecot-2.0_rc3.ebuild 9498 RMD160 2450956e2f6043e4a447d618612847152ca36fd6 SHA1 b7ab41728071db4c48badc2bfbbd78c70283a0bb SHA256 e3426a11fb2f2748f4e2e3604181180a104ebc12181a66b40b310c84cc47473b
-MISC ChangeLog 40510 RMD160 d346ff100da9af812e1b47e4ea31fa08b64d39ef SHA1 70b93a97813da8b4ddeb5134af9309467d979182 SHA256 7c64d5ed1d3b5a7bebf65c1f693a9fcc8ab8e96eb34d0a5991ea71a9be34410c
+MISC ChangeLog 40682 RMD160 e03dcd8dd310c0cb8d355dd53b17e9e02adfa244 SHA1 1fb70a283daae37e981faecff98d3b7a03dd3b76 SHA256 e56dd7f62ba9a2351910ba6f72dd8315f46546bb27d6bc9f10e11ef50ddd2c1a
 MISC metadata.xml 919 RMD160 1e3a625fb64bee092b52fe671c7b51cbbc0cea80 SHA1 d4c9aa0299f149d3d552a10971d3efcc84809a1d SHA256 872564b7c2a02f4c2e042ea7b64e5ef14b0e1b63ddf8f04af36db9aa0efab372
diff --git a/net-mail/dovecot/dovecot-1.2.13.ebuild b/net-mail/dovecot/dovecot-1.2.13.ebuild
new file mode 100644
index 000000000000..5ed9b85e1f29
--- /dev/null
+++ b/net-mail/dovecot/dovecot-1.2.13.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.13.ebuild,v 1.1 2010/07/26 23:21:59 darkside Exp $
+
+EAPI="2"
+
+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
+	)"
+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 ~arm ~ppc ~sparc ~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? ( 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
+		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-1.2.init dovecot
+
+	rm -rf "${D}"/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/* || 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="${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
+}
+
+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
+			chown dovecot:mail "${ROOT}"/etc/ssl/dovecot/server.{key,pem}
+		fi
+	fi
+
+	if grep -q '^ssl_key_password' "${ROOT}"/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
+
+}