Version bump

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x77F1F175586A3B1F

3 files changed, 300 insertions, 5 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 2bf704638838..66eb0409d50c 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.454 2013/11/08 17:16:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.455 2013/11/11 17:03:43 eras Exp $
+
+*dovecot-2.2.7 (11 Nov 2013)
+
+  11 Nov 2013; Eray Aslan <eras@gentoo.org> +dovecot-2.2.7.ebuild:
+  Version bump
 
   08 Nov 2013; Jeroen Roovers <jer@gentoo.org> dovecot-2.2.6.ebuild:
   Stable for HPPA (bug #490128).
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index a04163901baa..f69d651144c1 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -15,18 +15,30 @@ DIST dovecot-2.2-pigeonhole-0.4.1.tar.gz 1156858 SHA256 361cf61c1b6c8a42d841d694
 DIST dovecot-2.2-pigeonhole-0.4.2.tar.gz 1159311 SHA256 0499f07037b86489fdc1d48fb19e298d5360ec41273bccaec230eb1bcf5a3e13 SHA512 3b66d00a8462ee668b8671f5eaa48bb91d47ed8bf8b331f7d879ba8c581e2bef11e236b06a8c5da9f1248572348ad0b3e2b867fd0a17badf32152fedbe61c1ed WHIRLPOOL 4d86bd5c010434620d0741156d4b7b24c60252de76958c0fc774418abff4bebeb4a8a78b5490ee34b20d48f61fb2ee75c4ff04202108ecdd33e1eaa9e2763ad9
 DIST dovecot-2.2.5.tar.gz 4356745 SHA256 15b2cd607e6533f4805f471a61dd1c8bd81675cecc6ea6361504247dd9af5cf8 SHA512 a449110b70a400388a815cd563fdc2dbc99620e6aab59484354e33917dd0f595717bf02980ebcd758d2222f2cf7a72adea5df76161692a0b433c273c41d7a274 WHIRLPOOL a4f06e7f3b0d04a698c15709bc9614766aa37f1eb01dc515388077d6ffbf4de45a6662e2e08e67e291825ba0dcf2959ecfaec37d7f501ae024f5b9e9724b2c60
 DIST dovecot-2.2.6.tar.gz 4483169 SHA256 62272bce0ba4b992f44b6eaf72543860ecd21694032243af009b9da2c0d3d6e5 SHA512 770fa399ac0947f4887e4021a14075280f72ec5d6f2a4ee79cec23bde2556dbdd40afd9465cd6e9de363bca40b633d809a853c7268279d58f8a49e288e80aad4 WHIRLPOOL eb964221dad48775ed98ded668461b55134a1da3ef9b2fef1b3d0de581ee1664af79eae5c3209eff49bb49981fa60634a1e853b4640c0a506789085aae154bbe
+DIST dovecot-2.2.7.tar.gz 4509163 SHA256 441e5f66cf258e6c8afa661f1082662f0cd6b25e16c6aeb0aec4591c5466ab6c SHA512 c723821874dd23fb2aafdd0092fb84ae04b0b6ea5aa7a673335b7d6aeea2aca4830c1918234a5bf7a03b25cf75ddc9c9877c17c00eb68383c016791dfd183395 WHIRLPOOL 2139c96bddc25016fe2064e103c336807b49685e6e1f4d4e7c36a0b04ed1ec27aabe1370ff9ccb9a64f7aaaf21548e855f4ff2e91de4086df18eee236d5f1c50
 EBUILD dovecot-2.0.19.ebuild 8872 SHA256 672190f8898d8587dad95872745bb65af195a77e2894527091e9032d4259a366 SHA512 52ef08b376d6bf6a443e9c4aea0db3b6a1a80e3cc0a899558e6dbdac6f36fbee5a1a84eb96f1d396a114ec74bafcb8ffada4a64a05a976fdbdc88c800dd0ccc3 WHIRLPOOL d4debf95e6404d908ccfbc1b01315902f77364c998488e1edd13b4a1008c308a3ba51479d228df4969e00efc29bab849216453d847d602f058674fb742aae6a2
 EBUILD dovecot-2.1.16.ebuild 8556 SHA256 7b7516de25edd2ccc8dbd6656082cfa8a0119285daa0e43c34341c9a99424b38 SHA512 6ea1d693c37d3ffa5a5383f8275bcc4b1eebb1dfa76c118a2aff5042523de4b5f66cc7ceed34b51a6bb47254bcb0bec40334ade1dbbf93d3e035ba3b56bc0566 WHIRLPOOL 7153e203b76c84053e0bf8ddf2ea396320f05901b42a1b5d7e65b82228b7f9f052eea7149b4ffc46d1e2af592744441a60a2c949279c1f0606a303a0d0122aa8
 EBUILD dovecot-2.1.17.ebuild 8635 SHA256 98486c1dc60e3f2ac43385f8077b87ae237df180f41fd95147a0557335448079 SHA512 521664a37101d5e1f95167dff9c560c24507b03e2521e966ffd40350d9d07aa4aa9efcc1c80aae77e31564cff3945f890499d402be157894384bb1138e4d4768 WHIRLPOOL 8bfe32ca7f653fb2b7f4567dae0fd4957b56a05b7dd94c0bfc0dde260bf6ca64bd37af3671320494a1a54ad455b76e9ba4e07350e00bfc6a800e70599689c398
 EBUILD dovecot-2.1.9.ebuild 8711 SHA256 7d1dcd87630cd6ea0692aeb1b3e5a323692935948634610fac6ecadc6a0c4e2b SHA512 15d6ec32508190d166eeeb5ba195e9228d58da7834cc0f670f68d43357b8dd8c3b82fbab909ea7d232ca0d8676820af4946d66acefc836526d598f61d249df33 WHIRLPOOL 73ce697ed35a319b87e2e9b4bc6286c848a847b0c72c14cc18f31e381d3815952567ef02b4c23fe280e473983ebbf078101539234ccc532810a5f73c601a5d36
 EBUILD dovecot-2.2.5.ebuild 8622 SHA256 1e03e1cf58e2d057a1b91e88523bef307f7f2b867a5617a2af03621021201197 SHA512 c359cf156abee4a0c7ae1438825c9515e8767c4ca4aead68a09fb3fc615709210e8e431fac77a12ea57730f525db2df23618ac44d94ce66d29bad1ab21a906d9 WHIRLPOOL 4e23ead1336a862f236b9bab85d9887e979a73a0a9a473bd5d68eed1d11faab5956045990662fc7e9a8875845dd32e9d423ea9bc055172a8534284e20c2ff994
 EBUILD dovecot-2.2.6.ebuild 8629 SHA256 3cfb5f8ef36ef90fa7522c08d2aed2acd9fdacbda9ef45ff81404edce730b79a SHA512 bd8cf6d9bf50d34eab57af4430ea40f2e3f112d6001b5c3e0b23aba5706c7ee1810db59492c923958f7bc0be57942e2e0ab370132c0ccf8a793f312c8c9ec0e3 WHIRLPOOL bd21382f5ac148d5987317be4c488a554502ac0313c31f0c915e755dcfa1715fe2aad1d3c1283d9902690edb660ca7b22b4068bce06cb699bccced81cfba91df
-MISC ChangeLog 67269 SHA256 6ea8ae15e16aa9c7c0a268799109d4546cd9297f6574a67a272935d1925f4c22 SHA512 787f147a160c89c40dc645bb69f9e5c0e9f00400c512afcbb2cc2d3694bb98d55ed8a1198dda7e5bce29cf78de039cb8dbb13d3dd0a7302c3b60c55537acc4bf WHIRLPOOL a0af32a590479181aab94d14d5b5ea77ac6669368a946610b07b839f5c2b56d942d59b778fde937d7061502f49a1486a569d5868668d7452edbb435b6b9928ea
+EBUILD dovecot-2.2.7.ebuild 8631 SHA256 cc6f8adaabc304c7d6779ee62ff8cca820ad4ecec767954b0005f360fe301b2f SHA512 3eec012e4663e9fbb5f51f672b92b6be8199c6c19a0f88bf11725bfdb5023f742e8b71011d3d10a4e44d86e8c505cc596079eaf600d132da0e3af6022a5307f9 WHIRLPOOL e3a21f6a322f15e1ee534901c59b36908d9a4d3336bf45c940437433875e8b094628a814efe52079e3ed3add56e123d1d8510a185c1d3c853368d8fe6f3b3752
+MISC ChangeLog 67383 SHA256 83ebe7c3d2eaf2764b4a1993aceba043922521bae16f318a40c2a4cf8e70ce5c SHA512 6435d5fa56636a6e296abdb73b1a234fee2af59cbecd4d33a533d0ef3bee7afe1f123d2c366f889b56cfd399ba7187bb1218b8a0c2f7de900e880e2ff221677f WHIRLPOOL 034ddef6e25576903b234447dda0531ed853274a43d9ea78f1bb5d21cdd7a4abfd252d5e857bf13d98a8eb48c2cff283cae39fd611257603758ee5439ccf08dd
 MISC metadata.xml 948 SHA256 ad1e5324e4ac307c9fd4acfaab4375a91399c3302c0bf7a358cc9b879953e64b SHA512 a58ed0e97a8ad182eed6a253b247a388e7e6a955ad0ec8c2c63469fa9c77d0af824bb00d959505cddda354ac434da3e22100cce7449556268ccf95fafe05f98b WHIRLPOOL c5977d6032ac360f22b723fe811e3c65988cbbc06952b222666166c074092bf4ef68465f19fe689282a74a1383c1bb99802711ff4d7b8501cb989d8989385fed
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJ9HG4ACgkQVWmRsqeSphPdrwCfXfmhZ8BaVQl3SmL7Qy6fcylB
-eRkAn0u/8sKxDEJ9dj5iIpf7+6pmj21o
-=1mZh
+iQIcBAEBCAAGBQJSgQ3wAAoJEHfx8XVYajsfT7AQAJgOKdld1R4sHxUG0q9B+M3V
+IYlY/LpptLIULQlAzzOPXsLjIKOSs5st01qd9oczGhxIGeabqHkPqW+N7iBhjiU+
+octTiEWaTVSuvgB00oQsXB95hlJnVAFqECltFwbZJR8nBOQ94q1KPFhu95/XZx9H
+cgvplAXjNkt0G5/ivxx9+/+hJ5l+r7eQatKOD9yqTJzSnmjMKInC7kbLN0S6ecVj
+OSTiEXoWJ5z8SC6w2FYjn2X68VlM7vjZbEdVfcg9JPYnOdpRC4Lov2q7UXsYBa2/
+j/CnyAognA5fwkAOZJW5/GdRb1ze1B8av2EpoIcQEATADOnXfTF7309S8pClz1MK
+MKUmuZtplRjHHZP/JA8e0uc2kSM6NBWRYlVnyjdEIk1VtkzzSse3z3K/M/8hOVFE
+lxoP8s5xYSduOkA7bs/lEF7VYfP/du+jBtItkoj28UeMlZ0fsmcfKBXwOfT8+C/m
+Tuf36o/XZOe+/xvLLhitYHoZmXk2KLs49uEn2guYAxAobd0wSCAJV/NFVZQztphd
+a5HZ0MZArMZs3H+t9DYHwXRNT7QWX/tVSa9XCkwxnsTnPzKOCbXPWkagZWPqFZzE
+UoW8LtKtZALJuHmTJGg4bdJpt3WMWbGvRZdw1JjGw6XhVbnWW7wcPALwJaJNUTSe
+ueYIGvoYuxAGlmherQDa
+=3D7I
 -----END PGP SIGNATURE-----
diff --git a/net-mail/dovecot/dovecot-2.2.7.ebuild b/net-mail/dovecot/dovecot-2.2.7.ebuild
new file mode 100644
index 000000000000..ae9bdb2eb6db
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.2.7.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.2.7.ebuild,v 1.1 2013/11/11 17:03:43 eras Exp $
+
+EAPI=5
+inherit eutils multilib ssl-cert systemd user versionator
+
+MY_P="${P/_/.}"
+major_minor="$(get_version_component_range 1-2)"
+sieve_version="0.4.2"
+SRC_URI="http://dovecot.org/releases/${major_minor}/${MY_P}.tar.gz
+	sieve? (
+	http://www.rename-it.nl/dovecot/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	)
+	managesieve? (
+	http://www.rename-it.nl/dovecot/${major_minor}/${PN}-${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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
+IUSE_DOVECOT_OTHER="bzip2 caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd zlib"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_OTHER}"
+
+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] )
+	selinux? ( sec-policy/selinux-dovecot )
+	solr? ( net-misc/curl dev-libs/expat )
+	sqlite? ( dev-db/sqlite )
+	ssl? ( dev-libs/openssl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	vpopmail? ( net-mail/vpopmail )
+	virtual/libiconv"
+
+RDEPEND="${DEPEND}
+	net-mail/mailbase"
+
+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
+	# default internal user
+	enewgroup dovecot 97
+	enewuser dovecot 97 -1 /dev/null dovecot
+	# default login user
+	enewuser dovenull -1 -1 /dev/null
+	# add "mail" group for suid'ing. Better security isolation.
+	if use suid; then
+		enewgroup mail
+	fi
+}
+
+src_configure() {
+	local conf=""
+
+	if use postgres || use mysql || use sqlite; then
+		conf="${conf} --with-sql"
+	fi
+
+	local storages=""
+	for storage in ${IUSE_DOVECOT_STORAGE//+/}; 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" \
+		--without-stemmer \
+		--with-storages="${storages}" \
+		--disable-rpath \
+		$( systemd_with_unitdir ) \
+		$( use_with bzip2 bzlib ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( use_with ldap ) \
+		$( use_with lucene ) \
+		$( use_with mysql ) \
+		$( use_with pam ) \
+		$( use_with postgres pgsql ) \
+		$( use_with sqlite ) \
+		$( use_with solr ) \
+		$( use_with ssl ) \
+		$( use_with tcpd libwrap ) \
+		$( use_with vpopmail ) \
+		$( use_with zlib ) \
+		$( use_enable static-libs static ) \
+		${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() {
+	default
+	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
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		default
+	fi
+}
+
+src_install () {
+	default
+
+	# 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-r4 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 mdbox ; then
+			mail_location="mdbox:~/.mdbox"
+		elif use sdbox ; then
+			mail_location="sdbox:~/.sdbox"
+		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{,-extprograms}.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 "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
+}