Backport sdbox patch - bug #365445. Thanks to Kerin Millar.

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

4 files changed, 322 insertions, 15 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 82a6daeca445..30f2d40c7ff2 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,12 @@
 # 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.293 2011/04/15 21:52:46 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.294 2011/04/30 20:48:43 eras Exp $
+
+*dovecot-2.0.12-r2 (30 Apr 2011)
+
+  30 Apr 2011; Eray Aslan <eras@gentoo.org> +dovecot-2.0.12-r2.ebuild,
+  +files/dovecot-2.0.12-sdbox.patch:
+  Backport sdbox patch - bug #365445. Thanks to Kerin Millar.
 
 *dovecot-2.0.12-r1 (15 Apr 2011)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 5a7cd6b94b25..d275365a22e0 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX dovecot-1.2.init 1720 RMD160 0f641929fd2c58878f6d69e6ba454b9110603031 SHA1 c498c5208f0504f2eadc460d515f563f907d05ef SHA256 9c7ef516324cd5a17c5f28f6af272d8d06106420c747ff5c4da6fa14a3ac316c
+AUX dovecot-2.0.12-sdbox.patch 545 RMD160 92b9d80e3cd1c2f915d4c4fcc751a8267c9cf619 SHA1 6046b2a8076b478deab2003142b31020f875fb5e SHA256 f4f70d4ff9453e5ec3246b3bef27adf101de84ce2d1dcff50577ff79b22d9441
 AUX dovecot.init-r2 1618 RMD160 5b5c88847c096282f5ab94b82db7fab5c9e42aa3 SHA1 d9f61ac897a6e377dc8cf2c6da4952a4ff7918e9 SHA256 6ad0d1fc09c41ba390e717667e4dad3838f669ef7b227e3cbdb60c499758a901
 DIST dovecot-1.2-managesieve-0.11.12.tar.gz 406261 RMD160 f91a1fd059cebcb3c934192f1db57eb75ea4baa6 SHA1 c632c74bfc5e0c0c0a00c1445a65cb012423ceba SHA256 c43d2d2ab4abf7aba5061984f01dd4880118504c101b6451bd530a7edb8e3f6a
 DIST dovecot-1.2-sieve-0.1.18.tar.gz 1052057 RMD160 f61b1ec03d861b964666a374a8c42a7b98c1fba1 SHA1 e661a6ab79b2987dedec1ed84cbd957755882ade SHA256 4a39bdf60d530cc27a1bc113fd3cb1f7adb6cc857578ada3720e40385c2cc7fe
@@ -14,23 +15,24 @@ DIST dovecot-2.0.12.tar.gz 3257165 RMD160 9b4aee66a187517e1ef0d8976c461a4f8c9709
 EBUILD dovecot-1.2.16.ebuild 8827 RMD160 c4da85e63c65784c50fca6b8cbfa4d276432c254 SHA1 dedcc6b7da960d89a7b66024556c1b1df1b12718 SHA256 980b1cc7b84add1c4b49231eef821eefa6d8edbf58181b2520e44beb9452d18a
 EBUILD dovecot-2.0.11.ebuild 8952 RMD160 6d3243901e5234ddeaf184cb896064bc20160bc1 SHA1 d307572961bcc951dde0999520e8201154965226 SHA256 782251e52787c53e150f0e8908867ab1ca5fe53a772108ec560ac344b0863482
 EBUILD dovecot-2.0.12-r1.ebuild 8955 RMD160 2f3bffc943ebb97f63d94c457317534a6185d1bf SHA1 bac8a32647366c0f6bee1018628861c09acff7e4 SHA256 511240141da63c5b1d81decab47848c40f77cc9d22b2c93e84728078e60800a6
+EBUILD dovecot-2.0.12-r2.ebuild 9013 RMD160 ece3a6d28f454cd1e33c1feed568762d7607fed4 SHA1 1fda5945b647117e08b2527a6ec981e2ea254273 SHA256 e0a04fdbb85e9eef3c9da25db7fee73cc2545067bda78ae8a3c4d63aefc4a249
 EBUILD dovecot-2.0.12.ebuild 8952 RMD160 ab9feb663d4b614ab998bae3a71eca6abc8d1dea SHA1 23d63bb322f9068c645ef0903a2ce7c2273a9abc SHA256 0b832f8941ea140b666565e95a67ad67765900c653ed685c543051b9bebf2bb2
-MISC ChangeLog 46662 RMD160 6ac393db347e3578853375129dc13895ee16e69c SHA1 c705224c2e0c31eaa9ece38f51d6cb071730486c SHA256 62665f3045f3795e80c9aa54f08e9c0851da5119a115026041aa4c01434b64b7
+MISC ChangeLog 46867 RMD160 e50967c775de060c8797e5993b4d2459c5eb33cb SHA1 1ce78aa6a0fc97ffdba2570c144c711b451e17c8 SHA256 9c6a8a1e781d5bae56d41824f5d5467d18269e63b8086b89c382c890a7ac5ebe
 MISC metadata.xml 703 RMD160 a7a55f21501b09979922b24a931fbf7a5bbf86b1 SHA1 b4c9f2cd2a2fae951e319960ce3aba33d56301cf SHA256 3a897cb8fc88c875563623d2757f7b0ebd08743ba4d4fcbdfe37072d99694c58
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNqL4+AAoJEHfx8XVYajsfAosP/1mUMsfoDRiWC+79r4u2ZUOb
-/v8R3ANy0qb59f5CnulJ9vrO+ykMR+hO7nbQZXAKC0QSMOP/IdqoFvA7KZT7nwTN
-Dkn/ITBmrObfDZqRMVjmiJ29G/OsyYLdf+sZQrHTmEjtLlgd0yJPxddbHqHJhhLj
-AFrAM6T4ZJRZCTM0LcsRugB3eBesda23GNbxoYEngT35z1zq01tdO6IVhaphe3Cx
-uBqttIRT9NOqLDvdio5ECdlI4Hiv2hLca7qEJl3gN5nWITD1a99lwNNnEoXpCueL
-MkvqCJD6vjYdXG7ySLxuz0+zyo6iCVDwQ7ZwTFZVpmwuZfWiE6F9skCiCQZgQe3A
-TehpUDj+AeZqXyXQskxL1R9eVIVAEhBgHy8G6L187Q/FOUF+b3evaNlAQ7P2cmmi
-RFt+7CEW79cIz8k+TpVsXv1CyIDUeNMBKK9zVOMd5K8hJVs2INSMA2RJOta7j/uI
-fi3PLZSlu8nbue3VBMxxOP075vVfumbYjsGeiV029IqyYTvuJ6BaGvQFEtr2Ti6f
-XuiEEUooXhDG8RFSm4KWd1rP5C3Gbrm4Rgg4Eqwb9njTs4dPHRWFkeA6kQ+yLU0Y
-POIHkStnHqvqs6BLwI74xH8vWd2BqEDOXVA1Te0u8VAMQerTfuYXAWQIziqQfApW
-9GBDbhZuXyoY4iaO3SAs
-=o7YJ
+iQIcBAEBCAAGBQJNvHW6AAoJEHfx8XVYajsfr+kP/2HOukg1Wlws0YaBcJhvXgvS
+T67edB5N2rQY1TzRvfalrMtJx2I6rdVp5zx/+xiHJ6NUi4UgoJPjxkcyV1hjg1cD
+i3e4bsPDF9KA1nFbj83CICnFOHoslEJ1xcC/y62FJ0Xu4e5glcyBMcJcXfOV6LVo
+seIHe/ttxEq0uU5iue6w7Td8Ztc+epNAYArbllLdvRds8iW7p5dUxRzGl+K6VyjW
+e8XTlzaENQii7rTYGWMOOcf1WPnTqslAOqmLw9xYRWLEyFHDLJEh0E1DDfpT+52z
+UTfFZ7974pumcuw1F/P4UIqpnjayvSoy4sRQ9/qTyFzd8pMH7r/lkpeGNvzQymGp
+M9IBludWBBnokDm+df+xZPCUOe/pUVZCHN6ZHNIReENNU3Dk18zsDMfetVYOgYdi
+Cw7aW0IeH0W2ZT1vUbdaEys4tUIeK8TfDFc9qxaq0FXVF5hWhWIWlyChyb1VcUn+
+G/a1UG+FKGpEsM3lI9cGXO5/UBtdFiVkUj1CUDP0gt6A/f+Fv5ZZGmn6MjiroQXx
+JrPSa76aSmKWH2+IY7o2NyC3kpgHG3N9TTvzjQ8l5HX2SKTUHayKI+s4hKNCdkNm
+qpXE6pashYdF1XY1LApcklBXiXHwTW37UMhT5mrjYKM+kBfChBanwhmOJLlXFEjY
+0ToVWr6LrW3HPBrvdwQO
+=LJf/
 -----END PGP SIGNATURE-----
diff --git a/net-mail/dovecot/dovecot-2.0.12-r2.ebuild b/net-mail/dovecot/dovecot-2.0.12-r2.ebuild
new file mode 100644
index 000000000000..d251fe104187
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.0.12-r2.ebuild
@@ -0,0 +1,282 @@
+# 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.12-r2.ebuild,v 1.1 2011/04/30 20:48:43 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="berkdb bzip2 caps cydir sdbox doc ipv6 kerberos ldap +maildir managesieve mbox mdbox 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 )
+	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_prepare() {
+	epatch "${FILESDIR}/${P}-sdbox.patch"
+}
+
+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
+}
diff --git a/net-mail/dovecot/files/dovecot-2.0.12-sdbox.patch b/net-mail/dovecot/files/dovecot-2.0.12-sdbox.patch
new file mode 100644
index 000000000000..ad16cf3496b8
--- /dev/null
+++ b/net-mail/dovecot/files/dovecot-2.0.12-sdbox.patch
@@ -0,0 +1,17 @@
+
+diff -r d4945c93c33b -r 663528c5c799 src/lib-storage/index/dbox-single/sdbox-storage.c
+--- a/src/lib-storage/index/dbox-single/sdbox-storage.c	Tue Apr 12 18:38:50 2011 +0300
++++ b/src/lib-storage/index/dbox-single/sdbox-storage.c	Sat Apr 30 15:55:08 2011 +0300
+@@ -118,6 +118,8 @@
+ 		mail_index_update_header_ext(trans, mbox->hdr_ext_id, 0,
+ 					     &new_hdr, sizeof(new_hdr));
+ 	}
++	memcpy(mbox->mailbox_guid, new_hdr.mailbox_guid,
++	       sizeof(mbox->mailbox_guid));
+ }
+ 
+ static int sdbox_mailbox_create_indexes(struct mailbox *box,
+
+
+
+