version bump

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

3 files changed, 303 insertions, 15 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index ac083a63453f..ff29beb32568 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.350 2012/03/15 15:21:33 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.351 2012/03/15 15:44:00 eras Exp $
+
+*dovecot-2.0.19 (15 Mar 2012)
+
+  15 Mar 2012; Eray Aslan <eras@gentoo.org> +dovecot-2.0.19.ebuild:
+  version bump
 
 *dovecot-2.1.2 (15 Mar 2012)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 7a77552d1830..5743ed55ef2e 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -14,6 +14,7 @@ DIST dovecot-2.0.15.tar.gz 3303717 RMD160 2c315bbce2d7173b1e62c96d3a4bda0910a59d
 DIST dovecot-2.0.16.tar.gz 3317662 RMD160 dfe0cf2bbd211a07bb492c2f0d944a6a9f1c5f79 SHA1 0df6e84233339ee308deaecd8f1a7ffddcaeca16 SHA256 a9652ce1f0767b9a4d4f613dd4d41bbe7b55c25728be6f1283dacf0aff62f057
 DIST dovecot-2.0.17.tar.gz 3329794 RMD160 108399bdaf0e03e013b78b79e39c5c8a5dd2f62d SHA1 4c12f1a074c52b17cb64fcc73c41f0a2820a88fe SHA256 3f0d4289067d2355b4ce4a00265bf2b4bf6540bca8fdcecfc6ad20611da145d2
 DIST dovecot-2.0.18.tar.gz 3353149 RMD160 e6260b009e3b0f5b58113dd71a2755edee665e0e SHA1 117e90053be3d51ab3cf2674f2c04536729474d7 SHA256 92fc68af6ef0309990c749fcab39eeebce56ea8888c3d73ba812b65a74d1fa1b
+DIST dovecot-2.0.19.tar.gz 3357056 RMD160 8f0fda1393133a98f76eacdb9ef84d226d0b43be SHA1 54adccd4297e0a63af2a17ff676aadeac7009cce SHA256 50e49e181acea7f2c08008c5a61500c01803dc36b5ae1e6ffe24c1c56e3c69b4
 DIST dovecot-2.1-pigeonhole-0.3.0.tar.gz 1277277 RMD160 64692b03b60079b9ed22b069de947da7f4a32114 SHA1 e465536ce14690804665b4eea0916969562dc926 SHA256 2aeee8aa6dc700483b0a5a3d31f535abce71698ed1d467f11e931aeace2b0ada
 DIST dovecot-2.1.0.tar.gz 3662969 RMD160 302b6628cbcb14c1334d4bb14293f8ebc4216451 SHA1 1434746a230b0ab554036c00d11ae16aed2746bc SHA256 61d1a776bf02c72272f2401ee4b7b4f1ce530dd2695a774c1ebedb61a228238b
 DIST dovecot-2.1.1.tar.gz 3667894 RMD160 6f6204a8703c589c18b03d7218829a234b553782 SHA1 d7e2458fc405de1cc7070ee8b17e3a6dfb269334 SHA256 f233a2d40f86785b0e568291a08312d5c15247c12de011be916c1eaf96276191
@@ -24,25 +25,26 @@ EBUILD dovecot-2.0.16-r1.ebuild 8822 RMD160 c2ce983c76a557f04515118bcee8d716e537
 EBUILD dovecot-2.0.16.ebuild 8809 RMD160 be475bd89f87cf2bab857febd4d2de968069548d SHA1 de0d53be4f702a07b488dbf83f2a54d38d231f06 SHA256 fe0b1de7f5c9c274e55094365b1988596379120500b2862f2d5de9922af4ddd9
 EBUILD dovecot-2.0.17.ebuild 8815 RMD160 df5bba4dcb463b4595acf7b64d448f9645bb109e SHA1 4e9997bd70f96b2476036717561d8c3ff7ab1002 SHA256 fd72f917ae88ed08f77d37520db9efb2d1f58ff2947a7d90dbad317a0e9cecdf
 EBUILD dovecot-2.0.18.ebuild 8819 RMD160 0ccf90a6a18847c61f5e04364309173330a08e17 SHA1 68c2817db52f3d182543821ec4c67e25b745da5c SHA256 ecbafef7e5093bc36ed6e0741b7ec3ddf4bd315ea8a3e8319ec0012a3417f733
+EBUILD dovecot-2.0.19.ebuild 8819 RMD160 6f8d62c80fbe1737825c0d09986eb76383f19924 SHA1 539f7342dd5f389d7cf84aabae39cafbc796be11 SHA256 4a5ef8b7455b45f2109fd9fd0b6d1452af28bfb6eed3763c37326481ab3cbf25
 EBUILD dovecot-2.1.0.ebuild 8991 RMD160 0453db88a26c332630a0337c0d83186b064eb7a7 SHA1 5b60a4feef3b11b7e1ca230c004d3f8c08536bd2 SHA256 10f4c89e4aaed1f41271edd61c208b1f19b78e6b07f8b15f325f90814fb4f942
 EBUILD dovecot-2.1.1.ebuild 8991 RMD160 31a16e57b7fe073ae41a9609e774a0a7cf148a0a SHA1 a98ce62992698b2f571a31ebf548376c304d070f SHA256 2e5b856feb12c0c46da84b123f65f332a08ec2e55aaa8bb22b0dd6ba857548b2
 EBUILD dovecot-2.1.2.ebuild 8489 RMD160 d311e2d1fc393573c186766ee9b1507ea317b312 SHA1 4966d7fcd64cd4867c9d869e6ab49175e79d2417 SHA256 622812590b0cd879a77913a6bb67055e2e2cfb10fb30df28ba418ce41c07d7e3
-MISC ChangeLog 54014 RMD160 c2e9c7345d1dea597add6d26bcfabb46a418a8d9 SHA1 21aa6db77bdbd6c1feb0981a0ab1a1776226a62a SHA256 fa2741cf33b65364606a242a790aa1493544d86ce94da9ed95896cbf1c5f20d0
+MISC ChangeLog 54129 RMD160 404da12a8a8769d5801c078b9a04ad5838b679b9 SHA1 cd0ad7cf5933784f9574368b14b4eb8bbf502b5f SHA256 8314b1635dc40591300b57600c7603aa322d3da243f5738f7bf39ec650e27072
 MISC metadata.xml 871 RMD160 8e53e66f2ad0b595ef424cf855c108d103a87f49 SHA1 ea5616a16a1cb3394600ad17a1422383acb100f5 SHA256 64805284b8602318ba8b8902d58adc8b4edacba0468037a9c8abae4aac46ddb8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPYgkDAAoJEHfx8XVYajsfrQQQAI4uo+aEFvkyYEa7TRUo8ZzN
-YKSt5s/P12+VXGxYvwLQHle0rbAMo7RUZuuVLwj+GgohFoznGFhCcjSt5dC3XJDO
-i9g4bW+JEAHhQU81paJdwNLKCSjC8ZUlr8krZ+S+byqxbapu16p5kZ9jnLhe9poF
-S7fojAZggbvctBFbLi8mAcQ8fdeCCnJKNWneUDuYdj/gltZmFF0Vp4Nvxj61Gv2L
-6yXXJ5CEXRIRGvaeb57+b7ngn7S0z2zofYpwiEol4yDtYDSzDjv/46N96/1YPR8m
-zkKQWIKbeBLLu4tfh1SWM7zlwWt7jRK52Vae3qy1R9kzsYooPEwDifGtxVVan3xP
-7cAWSSJCHTu3j2oDer/gI3o0tCrrZJDPPneJWlMLJ0mpaDa+8ICq6bA4m1dU6ASe
-GQP//6QhPVQ9/GDf60kVBQwLPuzyqeqcoXs9j6CQEIATHdgO04aiD9f013u+pL6g
-R2KtEFGGuQNh9nS7/olG8uiYML6C6T+U6Dy49aKJV80mshC2u/6WxjPcE5e/D7Tq
-lO4acLUD9M2UVzOuECaRrlj1DMwkRMsP5vUUbuUNyuUXQjFTamGHAv2x5CZ8V5Vu
-Gwk4fyQsib+rAPiKV726hm5Y3z6E5eQOiHWgupLYUNIh+A3cpka9pk8kIpZbRu83
-UkuzS5QbzmCnlYMvg368
-=4GQY
+iQIcBAEBCAAGBQJPYg5FAAoJEHfx8XVYajsfRgEP/1CCbL7914hBdp9JA12A+pnE
+owGy3FIyLDy19tOYfcJ1PGYJ0ujwiAC5y+r4EIvLiHkr9oZOZG4ggOJKQzMeyLkQ
+IeG+j49WY5n3NIb+/LPjNKeqh6HgU6n3GHfqWSpCZIzsrfVeusREMVM5Shwr1xiE
+FmzMUumJf54DxSq/PzW9fvXQLMcgh0P0arpTzqqOXjr4OouVlKUErVN2jvP9uNdl
+vw18KDxa/uqbhSRtwtwUlOQhg3jCzG3/lyGetU6a60DFRR/7lyywwths+wuFQmpp
+ZkGaM+YrLmdxZjwj1O7qZhbNLF/KkKxWBwUkQVL+7MWjUSkA1Ktc2POXecQfJkgU
+q9Fctqi6bPTnumCQoCajP5ejE92BvUcKtiWoV2iv5+nEup5EjNrZqV9ucl1PV9jH
+9mdjWnIrja6Zt6cKpRGHl9xcw6VRAf6LW/JJ0GTnXMjj1zN/qontpeDyz8G8kJJK
+UfGgrWvGWf+CS9W7CXPPTR0OJE05hkG3hcWgtNHXSeSYaoxPpUaebz9sRcgr0rnb
+5MjjRTsZBFivSz55kEOC4wic+j/niQcult3uplAkrrqY8Fhbh1GjIxZ4/AlaADJs
+XlOC4YCqJmr6PIi+vS6UzMuyBo3WWTXi1HwtbtCc0mY75+CiA3F1YDD7BvKjtcc/
+9Hb8YUiOQdeC4YJk9Jij
+=NBMo
 -----END PGP SIGNATURE-----
diff --git a/net-mail/dovecot/dovecot-2.0.19.ebuild b/net-mail/dovecot/dovecot-2.0.19.ebuild
new file mode 100644
index 000000000000..dba75fb88630
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.0.19.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.0.19.ebuild,v 1.1 2012/03/15 15:43:59 eras Exp $
+
+EAPI=4
+
+inherit eutils versionator ssl-cert
+
+MY_P="${P/_/.}"
+major_minor="$( get_version_component_range 1-2 )"
+sieve_version="0.2.6"
+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 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+IUSE="bzip2 caps cydir sdbox doc ipv6 kerberos ldap +maildir managesieve mbox
+mdbox mysql pam postgres sieve sqlite +ssl static-libs 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 !dev-db/postgresql-base[ldap,threads] )
+	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 ) \
+		$( use_enable static-libs static ) \
+		--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 \
+			$( use_enable static-libs static ) \
+			--localstatedir="${EPREFIX}/var" \
+			--enable-shared \
+			--with-dovecot="../${MY_P}" \
+			$( use_with managesieve )
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	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
+
+	# 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 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+	fi
+
+	newinitd "${FILESDIR}"/dovecot.init-r3 dovecot
+
+	rm -rf "${ED}"/usr/share/doc/dovecot
+
+	dodoc AUTHORS NEWS README TODO
+	dodoc doc/*.{txt,cnf,xml,sh}
+	docinto example-config
+	dodoc doc/example-config/*.{conf,ext}
+	docinto example-config/conf.d
+	dodoc doc/example-config/conf.d/*.{conf,ext}
+	docinto wiki
+	dodoc doc/wiki/*
+	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
+	rm -f "${confd}/../README"
+
+	# .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
+		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
+
+	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
+}
+
+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
+}