Bump to beta6, thanks to Eray Aslan. Fixes #323677

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 292 insertions, 2 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index b070356706c8..339b329c830d 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.241 2010/05/19 13:26:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.242 2010/06/15 21:23:32 patrick Exp $
+
+*dovecot-2.0_beta6 (15 Jun 2010)
+
+  15 Jun 2010; Patrick Lauer <patrick@gentoo.org> +dovecot-2.0_beta6.ebuild:
+  Bump to beta6, thanks to Eray Aslan. Fixes #323677
 
 *dovecot-2.0_beta5 (19 May 2010)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index a357e08a4ea5..2821ea7cc481 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -5,6 +5,7 @@ AUX dovecot-1.1.11-c08c602ca0dc.patch 1110 RMD160 dbb1908ce6959c6efe1bb43e315573
 AUX dovecot.init 874 RMD160 aa899b69d42946dcf2262c38731319474e759041 SHA1 4f0a95cf6ba9e86bd9008694ea927dc97703b24d SHA256 145d68382d757110aa86f58b2567fb25648fa0ca62788e3461f2b45fc5999c80
 AUX dovecot.init-r2 1618 RMD160 5b5c88847c096282f5ab94b82db7fab5c9e42aa3 SHA1 d9f61ac897a6e377dc8cf2c6da4952a4ff7918e9 SHA256 6ad0d1fc09c41ba390e717667e4dad3838f669ef7b227e3cbdb60c499758a901
 DIST 2cb08c188b6a.tar.gz 659713 RMD160 62af3e681e6383c7dd4f7fb260ee0d621a20ffdd SHA1 114b28098fdbdd16c34e331173d580e699703b2d SHA256 73173159e1ddef016fa178ebd91bdf938597ae8c4c33bef7294f37599401fdcd
+DIST b877a1db00a5.tar.gz 666617 RMD160 021f74b27f613efdace9102028d334f378ab08a5 SHA1 e0fd744e54457692c1f9ebf5623f5c920a040b87 SHA256 69fc9beff5a637eda802b5e5a840b652a22da699e8a6b602fe93cea00d97539a
 DIST b8dbef9ec43b.tar.gz 663065 RMD160 6a071c68f972a14f783eb8b4ce85af205e5e2022 SHA1 72ce2c45c0729ef419e5e87a7a06e268290e45f9 SHA256 d2c919987d5862762a8640f107b586d064f2959cd8cd0a12d26be15fcb88e1d9
 DIST dovecot-1.1-managesieve-0.10.4.tar.gz 397332 RMD160 4da8129ead0de9d807e7311849a1b660c7f0509a SHA1 70a84beb5477738ff03024c4ce18a678b90fa1df SHA256 3a66a9dcad5b3a291cd87364fbb961725aa1473cf9c7ce7fa675ba71fe9313ae
 DIST dovecot-1.1-managesieve-0.10.6.tar.gz 395642 RMD160 a4c0b123e2a3b93805d264703426dbdf97b369da SHA1 8644426936bc85c90e3dfdc7a72645c635063149 SHA256 72f8c0fdc7da85321b75e3893c17aa540a915511b474ade5ff3c936cec10879b
@@ -35,6 +36,7 @@ DIST dovecot-1.2.9-managesieve-0.11.10.diff.gz 6456 RMD160 5e9692bf733d2100c5af7
 DIST dovecot-1.2.9.tar.gz 2889394 RMD160 fa17bafabdd6fab69c22d617deff368a4bc165d1 SHA1 7c1013a1bc856a4366f76ac1f40e856185695e20 SHA256 b4661e2e839ec2dde27e74c596d1157530b80c767ce42566c894553cb16a6887
 DIST dovecot-2.0.beta4.tar.gz 3315148 RMD160 cf155d09d13679b75b77849345f5369f5b3ddcd4 SHA1 9e919df0d4dac0d696e2abfc0c00aa96401f7c92 SHA256 7630510f2f2806190b419dd6c51eeca5f45d7030f1b260692bb59aa57988d14c
 DIST dovecot-2.0.beta5.tar.gz 3409443 RMD160 35c3b09f938edd79f14674744a58c2a64c3703ac SHA1 cbd9a4677f09d91db09e84ee6a07a7474847e0e2 SHA256 89077a43bd09747d41619fa0c56e50005684e80a5d92ddbf1f4f22413e09455c
+DIST dovecot-2.0.beta6.tar.gz 3464359 RMD160 eecde90aab83c97ba5352c4a9ef990aec03a7f09 SHA1 97cea30ea6c0bfd2d6d6634aded83e27d4d2ae29 SHA256 bcbd26a6bd8ac0f199f94d8581bc6a314898adae823744ffa39ea72527787b31
 DIST dovecot-sieve-1.1.5.tar.gz 468913 RMD160 825a8ec07d49527d8551cb5f3f86b638fddbafbd SHA1 672adf0a2f1627d96f97fc63fecaf024dd9f7a42 SHA256 ec1ea94311d5fb6cb5dd7e451728784afb39521a6a580f640b4d2115505a5ddf
 DIST dovecot-sieve-1.1.6.tar.gz 470071 RMD160 ed6f75dc1ffdb0ec51ecf3786aa71092851289f5 SHA1 c109ee8ab1c7ffece7940fb2e37104baf784440e SHA256 a2130a8e7d732bb341a96a96a24b4ddb66834e116573a10c17e68344fe712b36
 EBUILD dovecot-1.1.16.ebuild 8588 RMD160 aa2eec6ca31112c8b1ed97f48e75f80e06d13c38 SHA1 c6dcd325eadd926aa1344bf82875674d9fc098e6 SHA256 b5ab1b69eca6f157bc9807e6debe0b18fefcae9060588a4ac75936dfdc0da42f
@@ -50,5 +52,6 @@ EBUILD dovecot-1.2.8.ebuild 7747 RMD160 67b002a4c7212e1814df5486e6b2b36a6032fab5
 EBUILD dovecot-1.2.9-r1.ebuild 7747 RMD160 fcdbc597a4216903eefce47a3ae592eaaa2848eb SHA1 4be5713548a7306a2c1251bb638a55afb67c11c9 SHA256 20ae2b450ae344c21ddec63c8ae1d2d2b6c060f3baaf4a035cbd985f0d4a0c0c
 EBUILD dovecot-2.0_beta4.ebuild 9979 RMD160 b47e5d5e66d253136cf24f2c67ae8993f3c767cc SHA1 1f69a0357253c2f90c3bc3a48eb250462804940f SHA256 cf09f38bdf87c559b55d2b02b3db1b8eb962cfba5b3e87f3c45b6f5db0df3991
 EBUILD dovecot-2.0_beta5.ebuild 10401 RMD160 e7d3b485966e6e077f0e3f9237b1f910b3686c9a SHA1 294ebed11c05bdba54a883d0cbd01a029528617c SHA256 d6513706d69e3a12b2faa55a8c63ca2a1aeb3106262606adc1bf57fa905eee0b
-MISC ChangeLog 38496 RMD160 d0c21c80d20c53b53661d78e806cfb023e62c103 SHA1 cad436173546c2754ebca04ce993abcc42b298bb SHA256 5f58096bd3de984063ebca67985236425d4ab4cbab4bfb082aace33aa70ce1e6
+EBUILD dovecot-2.0_beta6.ebuild 8770 RMD160 63fccb9fa8911981594efa71451d1df03540745e SHA1 a4920e1b82a17d876d21f6a59647bebf8bc31416 SHA256 23ee1069896dacd74744adb722f721878316bcbad4ba2aa37212c1aa180e3a17
+MISC ChangeLog 38661 RMD160 cb94fc1437fb49ca3402ab4bf8b56af16d358218 SHA1 5c2afa387973a6480fc72222bf67da5cb09b0a2e SHA256 cf9abe7df42953a93222d2e913585341b7108b745304f4718ec9abed27c223e8
 MISC metadata.xml 805 RMD160 5463fdc136060ba785d5d1394774f7bb6c76bdb5 SHA1 a309cf7dcbd283d70f7d418ca1a198400023dabe SHA256 f4edba91969b56d55fed13f18f0f49b81325377e1786a3d129feeb8de6086ee2
diff --git a/net-mail/dovecot/dovecot-2.0_beta6.ebuild b/net-mail/dovecot/dovecot-2.0_beta6.ebuild
new file mode 100644
index 000000000000..4a9bed6618a5
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.0_beta6.ebuild
@@ -0,0 +1,282 @@
+# 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-2.0_beta6.ebuild,v 1.1 2010/06/15 21:23:33 patrick Exp $
+
+EAPI="2"
+
+inherit eutils versionator ssl-cert
+
+MY_P="${P/_/.}"
+major_minor="$( get_version_component_range 1-2 )"
+sieve_snapshot="b877a1db00a5"
+SRC_URI="http://dovecot.org/releases/${major_minor}/beta/${MY_P}.tar.gz
+	sieve? (
+	http://hg.rename-it.nl/dovecot-2.0-pigeonhole/archive/${sieve_snapshot}.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 ~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? ( virtual/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)
+	# 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 dbox maildir mbox; do
+		use ${storage} && storages="${storage} ${storages}"
+	done
+	[ "${storages}" ] || storages="maildir"
+
+	cd ${MY_P}
+	econf \
+		--localstatedir=/var \
+		--with-moduledir="/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 \
+		${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"
+
+		# snapshot. should not be necessary for 2.0 release
+		cd "$(find ../ -type d -name dovecot-2-0-pigeonhole*)" || die "cd failed"
+		./autogen.sh || die "autogen failed"
+
+		econf \
+			--localstatedir=/var \
+			--enable-shared \
+			--with-dovecot="../${MY_P}" \
+			$( use_with managesieve )
+	fi
+}
+
+src_compile() {
+	cd "${MY_P}"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
+
+	if use sieve; then
+		cd "$(find ../ -type d -name dovecot-2-0-pigeonhole*)" || die "cd failed"
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make sieve failed"
+	fi
+}
+
+src_install () {
+	cd "${MY_P}"
+	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 "${D}"/usr/libexec/dovecot/deliver
+		fperms 4750 "${D}"/usr/libexec/dovecot/deliver
+	fi
+
+	newinitd "${FILESDIR}"/dovecot.init-r2 dovecot
+
+	rm -rf "${D}"/usr/share/doc/dovecot
+	rm -rf "${D}"/usr/share/aclocal
+
+	dodoc AUTHORS NEWS README TODO || die "basic dodoc failed"
+	rm -f doc/Makefile*
+	dodoc doc/* || 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"
+
+	# 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"
+	local confd="${D}/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 /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, 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|' \
+		"${confd}/10-mail.conf" || die "sed failed"
+	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 managesieve pam file
+		use managesieve && dosym imap /etc/pam.d/managesieve
+		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; then
+		cd "$(find ../ -type d -name dovecot-2-0-pigeonhole*)" || die "cd failed"
+		emake DESTDIR="${D}" install || die "make install failed (sieve)"
+		sed -i -e \
+			's/^[[:space:]]*#mail_plugins =/mail_plugins = sieve/' "${confd}/15-lda.conf" \
+			|| die "failed to update sieve settings in 15-lda.conf"
+		rm -rf "${D}"/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
+	fi
+
+}
+
+pkg_preinst() {
+
+	has_version =${CATEGORY}/${PN}-0*
+	dovecot_upgrade_from_0_x=$?
+
+	has_version =${CATEGORY}/${PN}-1*
+	dovecot_upgrade_from_1_x=$?
+
+	if [[ $dovecot_upgrade_from_0_x = 0 ]] ; then
+		elog "There are a lot of changes in configuration files.  Please read"
+		elog "http://wiki.dovecot.org/Upgrading and edit the conf files"
+		elog "in ${ROOT}etc/dovecot"
+	elif [[ $dovecot_upgrade_from_1_x = 0 ]] ; then
+		elog "There are a lot of changes in configuration files in dovecot-2.0."
+		elog "Please check the conf files in ${ROOT}etc/dovecot."
+		elog "You can run doveconf -n before running etc-update or"
+		elog "dispatch-conf to get an idea about what needs to be changed."
+		ewarn "Do not {re}start dovecot without checking your conf files"
+		ewarn "and making the necessary changes."
+	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
+
+}