version bump - bug #425058

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

3 files changed, 294 insertions, 15 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 87f716b84f23..dccc32ec9caa 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,9 @@
 # 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.367 2012/06/17 06:19:40 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.368 2012/07/06 17:29:15 eras Exp $
+
+  06 Jul 2012; Eray Aslan <eras@gentoo.org> +dovecot-2.1.8.ebuild:
+  version bump - bug #425058
 
   17 Jun 2012; Eray Aslan <eras@gentoo.org> +dovecot-2.0.17.ebuild:
   add dovecot-2.0.17 back - bug #415571
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 83eb737b59dd..939f54a4ae2c 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -16,6 +16,7 @@ DIST dovecot-2.0.21.tar.gz 3372011 RMD160 2d816f49a9680a4486cfa1023557774a5c1271
 DIST dovecot-2.1-pigeonhole-0.3.1.tar.gz 1084148 RMD160 f6b3c25edcd20c042310b4c54533ed1251efeb3f SHA1 a9d895c64e4f6d188f98aefe7cbd83013c4bd5ca SHA256 e95d86c5cd912c9a7e180414ffd5eee52e1b5dc8abef3d5762b950d1de86b5c7
 DIST dovecot-2.1.6.tar.gz 3773967 RMD160 807ddcc41402b0ea6c8bfd33ec8df9ed1ff75d95 SHA1 88bde8a8110646ef1a5b594337a21964e5b35850 SHA256 4b81b2cdf624344c6c2ff91be1b794911b51c98dffa24095a6dcbc7eb6bc1e89
 DIST dovecot-2.1.7.tar.gz 3778791 RMD160 72275ef2f1408f1c361f94d37a14d33545706b44 SHA1 68fc6c80b71946d88f492b3182cb73b43b921bbe SHA256 d5b7bc61fff947722aebe12ebb25e92c38ce3e27e14ebc54cfc66f0b346cf452
+DIST dovecot-2.1.8.tar.gz 3807008 RMD160 772cec080a8fe69bdd7f434235aee36a3dc294e6 SHA1 02a82b620b56d24894653cace6f80b6b662fd634 SHA256 48807384f815072cf5a9c8a94726b4179433d4a3dd35f33cbe8db3a7880b000d
 EBUILD dovecot-1.2.17.ebuild 8779 RMD160 e7e72abbabba9b996c5c22b696064a9ea6be6e23 SHA1 abc5692a012d84b17efee7706fd53257106c9b37 SHA256 d98318a83549c639f579d039653a97ac1c41cd0da98f0d5524baa6a82593865d
 EBUILD dovecot-2.0.17.ebuild 8809 RMD160 0018ccc9520decf0772c44a1f8d3ead0a1976a9a SHA1 0fe2018a920c26d7dd7b79419bbf4db897667099 SHA256 0536b6064792e582c83e3933278d592591d549d5a8bb089ceda749e884bce942
 EBUILD dovecot-2.0.19.ebuild 8811 RMD160 51fcec97e6379552252130945c266af9ea06b073 SHA1 fe4ada4270700fd82f81ca8c83532245b26a433f SHA256 ead198ebc3666606552b825060813506d3f0d711484117e1149458d93b70eb8e
@@ -23,22 +24,23 @@ EBUILD dovecot-2.0.20.ebuild 8819 RMD160 900d7b84f5c766b1d906380ac7c394714d07d22
 EBUILD dovecot-2.0.21.ebuild 8796 RMD160 8073fdf1446e30796b4071846f9eb4fb99c12d73 SHA1 6eb24b8a4664a4fd2b90df94dbd9df5db4357ff9 SHA256 b17fab06af210c8d38249c4faf2d8f05f96f5a226370cab10c9876004af61d90
 EBUILD dovecot-2.1.6-r1.ebuild 8455 RMD160 e2caa1ee99d46812c927d66444ee43f1481c4cef SHA1 745ee77ac542f9ec2a9f13136e68aac57e71759a SHA256 6fab9f2394585026955486cc926ed8a55a940872e09c4bc9be231856ecb97399
 EBUILD dovecot-2.1.7.ebuild 8452 RMD160 3dec50218541ecd59cf258adea6ff7b05555754b SHA1 6127d0e91aa54c9189baa5de9ae0a344fd9d2333 SHA256 e2f35a193d6a3997a7d0625dd4cc8d51b8c3b237af1e4a46357f43d19d5bd9ec
-MISC ChangeLog 56350 RMD160 680849cef431ae0cbb3465d751d5d216d4e8a710 SHA1 bdbf603d8d4640be79e474ad150b15599e6c6f2a SHA256 6d34ca006a9d59295d009f5598816587da224b39b15aabe756037e08e1415665
+EBUILD dovecot-2.1.8.ebuild 8452 RMD160 2ef73744b96b398e19c5c0d0efc1c3698bbd2faa SHA1 58c6b68c945e01e582e2a3619d9e9b1e8ae91e9e SHA256 fc7ad2d4c5b9e24b3f42a14be95c4e93dd894ed7155eca047584838fe5b47e84
+MISC ChangeLog 56447 RMD160 091d7e52092b9f26fbbdd1b5a2b6fb2bd395cc22 SHA1 604e469f6235aaeaead3ce0f5b6f0e95f823e6bc SHA256 03a3cc6f93716a291823b34534c573fc7307c5a65ad1165b8799dda1ecb497bb
 MISC metadata.xml 871 RMD160 8e53e66f2ad0b595ef424cf855c108d103a87f49 SHA1 ea5616a16a1cb3394600ad17a1422383acb100f5 SHA256 64805284b8602318ba8b8902d58adc8b4edacba0468037a9c8abae4aac46ddb8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJP3XcLAAoJEHfx8XVYajsfWZIQAKOMWB0NFI1KPFl5/iP/aGXo
-2pxk/KhZM/L7HZk0zdMWc+DCoXyM2iTwpnHH918wQusdzwgfimun1ataLdr6Of/w
-F6xX+009MbgIF1OzeDOFxTOCBQKrtax2a5+aawj9wlmJoliPee9vtKKekcmiIIrL
-6oC+o7Rb++mAcIlkOdQr1Ay/npH6V8M7MRrq7jy4hcy7AJX/sMl22+rDSurqz6om
-2MhJsr172e4pCd3lijKeYTmzpepuHv6r8Qnbt/+dCVUdJ0v6LUR6X+QJ8jadX4ou
-aqY+7rvaq9z4puOf+Hp6c7Lkvks2iI4DC0NGvcLUq2dQvfGCPqz864ryvQAA72Qu
-ux8jKwE2YhCgZuagRqNRQo4+geLoDRKcLnfR6dXb93JcqDARCSS426+l0GZ7zn9a
-HtbF1i3HUpqlGTo6IZ31EMumWjvWlvpZ/1LoKZ4mHH5Ual6KsvyBPtEidSOYmPkZ
-T7xc8/nv5ds9ipCzXtFoe4/42rc8QhhZfSF/9E4G2C/VccZPmL2bDs4tG+OQ4jTI
-weZ2iGXWmuTaOO8J1O0E8r7J8FJi8NdjSL3Z7kvQxXjYyO3FXk70U7gYuK3cabIC
-QU4CYEFL65SijUh+Kgz4xWcGcQCKQ23NwBcgyWcbVpA4YKygOO0vHeLzOmjf5AxG
-pwmfGZridHfiK8VAYoSp
-=B+NA
+iQIcBAEBCAAGBQJP9yC6AAoJEHfx8XVYajsfh6oQAI8Kxwh5GQ9WHTKW0DU2nRaL
+bw+NbPr6h0KHR5vsedUFQ2jwHu+AcSSh80V+/WqiTxzicYzcBjRlrQG+GFzBaE+j
+afZaweBulSbCoLar9dqKeD++dJHl0/Y4TY2YWVUOdH9pL9AyRVKiNc2UPqguZy5s
+jBt8FmQHaBw60OmFkt3n5a/G83oNUSY7rmG64ASl8EpreHnL6J5o2g0rjg3Qcyqz
+TfQB2pbfXQ0hr8oXWtxxGdN+g2VzlU4RSEfv1GtbHdfKxWG30GohUIOJu04rtLOa
+asCjWqXcmWzaAL46V7AJJafgh3Gp/gc65QjEjvELutB23lzZCzF/qL4RymcEDDtm
+qgYIXvjU1Vhs/lQW+hZCIJLhYnXBd5kUOfTnqe74sPQn/YMoeP6RFYmCHLswO2G5
+31QyL1W9z/Nv4y61dKRV4qqeKKDyJNHgLENal3HwOIeNurAWsXOKmGTBCDzvtzJ7
+Jo9ejFt4FYjv721VldLFDSAF76L/5uWm14kyIk63tCHheYigJurcSf4wF9KbEpHG
+cmaHpvL1q4uEaVDO8Qn+UNp7qOrb3GsLITJ/uH6U1miVZfYeyZCwP3KKC+wPnGhA
+G3THNZbblP0sWEN9bOt7Gdyxq/Bu/CaKCNTzNqc3lKcwZ61L6Qitl8vl1w3R9dZy
+cSs6NCVLXROYhOWv9vmw
+=9yNh
 -----END PGP SIGNATURE-----
diff --git a/net-mail/dovecot/dovecot-2.1.8.ebuild b/net-mail/dovecot/dovecot-2.1.8.ebuild
new file mode 100644
index 000000000000..d82ab5293708
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.1.8.ebuild
@@ -0,0 +1,274 @@
+# 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.1.8.ebuild,v 1.1 2012/07/06 17:29:15 eras Exp $
+
+EAPI=4
+inherit eutils versionator ssl-cert systemd
+
+MY_P="${P/_/.}"
+major_minor="$( get_version_component_range 1-2 )"
+sieve_version="0.3.1"
+SRC_URI="http://www.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 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="bzip2 caps cydir sdbox doc ipv6 imapc kerberos ldap lucene +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 )
+	lucene? ( >=dev-cpp/clucene-2.3 )
+	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 imapc; 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 lucene ) \
+		--without-stemmer \
+		$( 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 \
+		$(systemd_with_unitdir) \
+		${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
+		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_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
+
+	elog "Upgrade notes can be found at:"
+	elog "\thttp://wiki2.dovecot.org/Upgrading"
+}