Version bump bug #337928 by Eray Aslan. Sieve bump to 0.2.1. Add vpopmail USE flag back.

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

3 files changed, 289 insertions, 12 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 2f66d3952f32..ae15e0495857 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,12 @@
 # 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.259 2010/09/30 19:47:48 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.260 2010/10/05 03:42:56 darkside Exp $
+
+*dovecot-2.0.5 (05 Oct 2010)
+
+  05 Oct 2010; Jeremy Olexa <darkside@gentoo.org> +dovecot-2.0.5.ebuild:
+  Version bump bug #337928 by Eray Aslan. Sieve bump to 0.2.1. Add vpopmail
+  USE flag back.
 
   30 Sep 2010; Markus Meier <maekke@gentoo.org> dovecot-1.2.13-r1.ebuild:
   amd64/x86 stable, bug #335383
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 52cbc4f412d5..f3bca0417b6d 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX dovecot-1.2.init 1720 RMD160 0f641929fd2c58878f6d69e6ba454b9110603031 SHA1 c498c5208f0504f2eadc460d515f563f907d05ef SHA256 9c7ef516324cd5a17c5f28f6af272d8d06106420c747ff5c4da6fa14a3ac316c
 AUX dovecot-2.0_rc4-asneeded.patch 630 RMD160 b4a3c4e36e74b120f6deb8e3990de0751ea5e654 SHA1 ef8c294dd08597872a2d983c1ba9ad5dc59ea97c SHA256 1f6ca549223518f99be887e7261c31a57522ce66347109ead333a71cd75d3061
 AUX dovecot.init 874 RMD160 aa899b69d42946dcf2262c38731319474e759041 SHA1 4f0a95cf6ba9e86bd9008694ea927dc97703b24d SHA256 145d68382d757110aa86f58b2567fb25648fa0ca62788e3461f2b45fc5999c80
@@ -19,7 +16,9 @@ DIST dovecot-1.2.13.tar.gz 2946123 RMD160 083dd4504dbf0e86187019853514811155c908
 DIST dovecot-1.2.14-managesieve-0.11.11.diff.gz 6459 RMD160 41684ecd3667feac71a325786afbef22d0a5119d SHA1 83b39589810baedc55a6e15e34737d7de8ec48cc SHA256 5bf1a8c983f78c2b49d9068bb57f52001126fcd1e7ab1c5daf9f3a558c08e696
 DIST dovecot-1.2.14.tar.gz 2947472 RMD160 916b28e3ade1669546e19211a27d8971a2aabf87 SHA1 c1da8c7563bd222db03cb4cd5bb26bd4f9d6b45b SHA256 925cd5d1e8a5e5ebd6e2b9887957ab1f91d46ff8d64660ba8ed43543a40d6b9e
 DIST dovecot-2.0-pigeonhole-0.2.0.tar.gz 1205747 RMD160 57c010f633d0fb0ff18bc1ae1f0883cbb87a5032 SHA1 894ab2bc881c28870b6d35bf1c7854a6afd9c260 SHA256 77e4a91eb4491b3b670ca718bebf3ed7ced9001b6702f6cdcc9335224bc647d4
+DIST dovecot-2.0-pigeonhole-0.2.1.tar.gz 1195090 RMD160 a3cd58c13c3de33e6941c94633c580af4406ad85 SHA1 ef06d157302576a9276c8f1181a3c5de018e2f36 SHA256 8249421cb69ca299e2830da8b635ca0a5ab692ab29456c188ba8078d7672ccda
 DIST dovecot-2.0.2.tar.gz 3092707 RMD160 dfca51c13e63abbfa75347f935ea49d795679002 SHA1 8ec2e5879e9dde73b12136d435566561b65256a6 SHA256 ccce009753143b64251f77511a084e8c37c77b1da9de7f15a7f47ffe77548dff
+DIST dovecot-2.0.5.tar.gz 3109651 RMD160 f282fc026e9c709fe52ac661bf5eb9a89aed1014 SHA1 ff5d1c29887e390bc3345fa3fcfd4787fd6cc25c SHA256 974c269a53cba72dfcddad286767d446d903b2a94d48b598a41836e40a3d71fb
 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
@@ -28,12 +27,6 @@ EBUILD dovecot-1.2.13-r1.ebuild 8871 RMD160 7f7adc2a1b6340241613dda6eba35f3dbbe4
 EBUILD dovecot-1.2.13.ebuild 8549 RMD160 2dc0ad1f3ae9048b45083a05e597398b1739126a SHA1 7b91eb5cc1f643e6d4163acc3b1ca2d29b95f90c SHA256 b77f8c1c341e59b1a69db280490f534901e3c08927e74c9b360edfc0c6bfdf21
 EBUILD dovecot-1.2.14.ebuild 8835 RMD160 e4a0e86570ec96215d6b8f50e454f706b92636a2 SHA1 543df556a054f507554548352c88429472ca2ff5 SHA256 f11a638d51a13724c6913296662e88f742516bd2f47cab8970d4b01f2e1985b3
 EBUILD dovecot-2.0.2.ebuild 8894 RMD160 c6579b8162d91f6b2a02599995a2f7df25cfd1e6 SHA1 c63f2d49ef3d6981ecc035b9198fb3a31a4f33a5 SHA256 b557b808332e64a737964418bf562e0fea51939f9adbacfcd8ffc409399dccb2
-MISC ChangeLog 42315 RMD160 8e0e7fd12c857fb003b5a2688ce039e6cabf36e6 SHA1 88367d124024b8a3f6c0e692705ec50cc1460d15 SHA256 2393ecf523abce867487bd5a2c33acd219701105461ba7da162aa15738681d31
+EBUILD dovecot-2.0.5.ebuild 8891 RMD160 821e5122c68eb2bdf74309dc0ad488d8b65d4ce5 SHA1 aa3aa1669f912ae7a3aabb3fa434a085c376acf8 SHA256 84e9b4e92950d70a7cf80c27d6fa358dc247c42e25cbbfb781335cfe4b669cb9
+MISC ChangeLog 42514 RMD160 cf0b9d67dd6f13e2a4cae234549db8a3684b5fa9 SHA1 1019eb4a6b0301ebd0dc464fd6d1b9fb2ac9f265 SHA256 c60a5b24dd8eca7e42117f62c135d76760aca4885a55ce382da0267caa199555
 MISC metadata.xml 919 RMD160 1e3a625fb64bee092b52fe671c7b51cbbc0cea80 SHA1 d4c9aa0299f149d3d552a10971d3efcc84809a1d SHA256 872564b7c2a02f4c2e042ea7b64e5ef14b0e1b63ddf8f04af36db9aa0efab372
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkyk6SMACgkQkKaRLQcq0GImVQCdGXS0vzSWftJT2VWkPwmRrn2E
-jpMAn1EoF9lChS14dcY40zsw/jKatmQi
-=2zpk
------END PGP SIGNATURE-----
diff --git a/net-mail/dovecot/dovecot-2.0.5.ebuild b/net-mail/dovecot/dovecot-2.0.5.ebuild
new file mode 100644
index 000000000000..a11c2234fb87
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.0.5.ebuild
@@ -0,0 +1,278 @@
+# 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.5.ebuild,v 1.1 2010/10/05 03:42:56 darkside Exp $
+
+EAPI="3"
+
+inherit eutils versionator ssl-cert
+
+MY_P="${P/_/.}"
+major_minor="$( get_version_component_range 1-2 )"
+sieve_version="0.2.1"
+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"
+
+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 )"
+
+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"
+
+	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 \
+		${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
+	rm -rf "${ED}"/usr/share/aclocal
+
+	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 ""
+		ewarn "Do NOT {re}start dovecot without checking your conf files"
+		ewarn "and making the necessary changes."
+		ewarn ""
+	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
+}