Security bump - bug #509954

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

4 files changed, 335 insertions, 15 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index f016b6c90dbe..360f33872245 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.476 2014/05/10 19:23:06 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.477 2014/05/12 15:27:43 eras Exp $
+
+*dovecot-2.2.13 (12 May 2014)
+
+  12 May 2014; Eray Aslan <eras@gentoo.org> +dovecot-2.2.13.ebuild,
+  +files/dovecot-10-ssl.patch:
+  Security bump - bug #509954
 
   10 May 2014; Eray Aslan <eras@gentoo.org> dovecot-2.2.12.ebuild:
   Adjust SRC_URI for rc releases - bug #509940
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 3c9c7cc56de1..0729a838de42 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX dovecot-10-ssl.patch 675 SHA256 973d6736a13ac8e56618e1a4d1b0e7a4e47c44e792d542803745fd5f2aec6ae1 SHA512 a201cbc275dbe4182d26971cc1c90ece22c05455535b7e55241ac0e71d61233882ad088d127cca2d1cd0d82dc86b1731ec98570254e29b056315567a1fd4d4a7 WHIRLPOOL ac9f4762684713507d3f196b97d7de16d228ac3f7ebd69e759b13efcb86caba821a439a15df300c41fd9c22738aec651e92c300350228f878a9c205d28850f6c
 AUX dovecot-2.1.9_managesieve_gold.patch 1938 SHA256 e81efbc39b710d010a407a0f9863f3a41801bee6c4423a9c36c09c87e906cdae SHA512 17152599dda9a2d34f6a1e6a885dc0887db503d701e00d875878dfb594f3778f99e5194e98cf74c999c643b7faab314f224b9023f7e0cb038fbc25c1488aa216 WHIRLPOOL 2b125645dbd7a108c6646cf22aabb4d9695b4d7d156c7afafefffbb299ad7625aa7cf6119df81da28725f87e757da295bed8eb79e0c53ce86558ffbc8a4f3a2a
 AUX dovecot-2.2.8-mail-headers.patch 1302 SHA256 a331316ac02fa9bb89581236df3e70436089dd91eeabb25b9ee13b51bfc5ecb6 SHA512 cd15e37b8ab1031c301bcf477b22d8a0991b98381b760ec85385f26a70e1b7ad3c1e46c1f6b7b0392bd7c2e300859d216d899c3efe0ae213a1fb60f20d0800bc WHIRLPOOL 4a75e89cd0a0f63f2b0e3156d54a6a6cd91cb6bb20d36f340299cc084934dff77e8e1817344c2a5e201898708ff23488ed9650ad1ba8a33573a45b5b1942b39c
 AUX dovecot-2.2.8-sieve.patch 1233 SHA256 371f62cdce968346e2a463f1f08713db21ac8e3c35011d71c04d0e3de8b686c6 SHA512 ed2592a20351010a379d965caf80fb68508a68ca966b6c78bd594b393e8885c42580059ac0b05ed07d6384aad713c7d7bb57b7f0bde250043710ee116d7c9275 WHIRLPOOL 1d191a7f91915cdbd750770929d10b86c3773ca728f693e13672885747f16c080d83665266726ee308cc8f2eb85f6907d8a858e39941f66c3f27acbe03955826
@@ -14,29 +15,31 @@ DIST dovecot-2.1.17.tar.gz 3908153 SHA256 f59cb39ff5839badaf73fa28006c37b79839b4
 DIST dovecot-2.2-pigeonhole-0.4.2.tar.gz 1159311 SHA256 0499f07037b86489fdc1d48fb19e298d5360ec41273bccaec230eb1bcf5a3e13 SHA512 3b66d00a8462ee668b8671f5eaa48bb91d47ed8bf8b331f7d879ba8c581e2bef11e236b06a8c5da9f1248572348ad0b3e2b867fd0a17badf32152fedbe61c1ed WHIRLPOOL 4d86bd5c010434620d0741156d4b7b24c60252de76958c0fc774418abff4bebeb4a8a78b5490ee34b20d48f61fb2ee75c4ff04202108ecdd33e1eaa9e2763ad9
 DIST dovecot-2.2.10.tar.gz 4558660 SHA256 75592483d40dc4f76cc3b41af40caa4be80478946a699d46846d5d03e4d2e09b SHA512 862a20d4e8bcfa21fb635a3f27bc689ca5b41dec0ec4984fe0f329a719b87c23341d99c259b6fc912ab3277028a05450c2d197dd7d9748a2e6f39ac5aedfc8bb WHIRLPOOL 4b4257d906fbf3fe0b2d04b5c8f51399dff93e6ee441ac85e36cbd672a9cab23546c442a6c8b05cdb94f1e75cf96269576e15a4a2f4c6bcbdab46b6cec5164aa
 DIST dovecot-2.2.12.tar.gz 4587634 SHA256 f3de1cae5665ff202713c1489bc96b4d029760808bf3311d76c173d7f3e38c56 SHA512 f3d99ae58b05b739c7e8f07cfb5ddd60b7490a1226b319fd693f222ec63d0800c33bd19d12d998e2914b077c1c66f1a4e9150748d850c8fd56b58f0392760271 WHIRLPOOL 8a638f2137a4070573f261f40643c924cca61380cc036b50ca9f4f24d597bf9af563b5f7aee71cc0f3ab974e68dfbc23fa2cea82cd99a20706852f2f0c099ca8
+DIST dovecot-2.2.13.tar.gz 4613824 SHA256 133cf3d2aa81733f6688ec986c91dbe07602fad81e856ba3d8046ffca85d9dce SHA512 1f3c0e600048ac2c1b2e497286620976c0fc821a6cac8e4e1492180af8eb9620cd143c89ee6d12872cecacbcadca573435cce1050c46325de3072c98ab5a9331 WHIRLPOOL 7bb81575faf69820b07d654c469fdd3fcf12c47517bb1dd6ea5566771bb60ce8f9c3a1a7b5c6df6d5f4b903d10472ffa1cca1a01c7fd158b6055794a44aacf39
 DIST dovecot-2.2.9.tar.gz 4540858 SHA256 7c3b6b8a05f6ebcc9fd01736fdcac0de12158959f5b99d1f7077f7a8626ee2d5 SHA512 41f826df22d3b34116de7abaa4543cbcf9362d7db1348e3b685019263b89d0ffe8bf0c1ddf21e4baa3bb7e98c87047b85b6fec78873df7f0db18ccecf63cea55 WHIRLPOOL 775cdbca9be788b1d20cd7f45e4d9a6265936b39a780b2232efa84958fa75a11f0984f680249e2af5faf40c9c91fa5c57026b55865dcaeddabcc90d44e3b6fae
 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.2.10.ebuild 8632 SHA256 19d797f4d966f1bc0e46aaf02f4bda652189d55b758527589faa285b8209c8f5 SHA512 174e8020c895d282aaf9ff7d3d9c7ee552198e75baf751a96b336744734a85d9f346fe6d060902c4b2e559614db1ca92749439eb21c8e482ea4406cc52d54657 WHIRLPOOL f69d5e23236dbc5414642738e464c433cd41467a3144d4838a50ff8f450e9a79d7ec6a8d0034c8ab081b9a1104cf65e5d84513e205bc74cfabb90e7aa94338dd
 EBUILD dovecot-2.2.12.ebuild 8825 SHA256 68cf99e54403ce69a33320d21b305e9385dfadd7d49e20c2bc64f1bdef02d053 SHA512 442028d1c98e38afaecb4ab208b1808a585457792aefab500dcdb296762eabd6ec15c6b619b113fa619248208813c720fb8d616283f12e4b9b11fd8ee5ac699b WHIRLPOOL 1d726b36d3d54769862174b281c611774c00c41afce530c073c7f30f6f6c4989b4ccaadbbedbc4469bb3fb70eb17f46dda0bfff4244dd7455221c53a4c694d7d
+EBUILD dovecot-2.2.13.ebuild 8885 SHA256 02dc4e3e32527b4ddaa7a857e099cfcc666b498d023c4c210c2a27e5d1e200aa SHA512 973d853c769935dc884ca68d64fa2694c73bb30437bd91a2b1a1a36316e6b6aa2650fcbe4a7fd450917a352bc216c14750f0c574fd19372f83d1e5fd2ba77462 WHIRLPOOL 4c6927f65742ead6a83ed6cc872f6839d653c8e6eb7e6d0253df411e5bf42715c126baff7d35e94af63cb11242b397fea86a5d57e1e3a294c5c4af0bb8b5d368
 EBUILD dovecot-2.2.9.ebuild 8622 SHA256 86f4fdac2ac4095840e57cd1188e00bd013d89face21e3fe7b5a6254af1e8efd SHA512 46e29a8b68aab961a5678fb0534490c7da2fa6284bf3b878313dfffeac0aeda429b09d093cc7eb93c0f61c54cfc259d7028dd594c16d97ff16e06f86de246025 WHIRLPOOL 82fd1003e529636ab214b8aabf7696d7a532b8e018176c1d85b259b80308b979097e5bc7ec9638780f0ed8351c25a50ebb432cc6a57dafab8152bcd40f4e669a
-MISC ChangeLog 69954 SHA256 d6e58846edd567bac8692ea7998d17cc24aefbe3472183f144753093b0ea65a3 SHA512 9d248ef5e99688a2d17417266ea216c9bfab9ad69e7785958617aa00bbbdf0bffd0e8c6d7998b6ce4f53732169ad144f59c969ffc314054040b6fb2b3176d54e WHIRLPOOL 37d24f546b1eba65ac2e37620883172ddf4638064e2a960bde5987cfab5058f7cbce7ac2dbba9fcbe86e6e264715861c7725dd05c947e2929e2efeee59a5eb78
+MISC ChangeLog 70115 SHA256 85e4db9f874885fb4f507d223c78c65ce96c19febfc57a3d841366b55300a533 SHA512 f4bd0230828a333136c0afea8bb47b91427da233f184fc2288325ba2dc5879cea25f51e72351bd9dd2aa15ec42d5c69ed835235544402e86778f63ff965372fe WHIRLPOOL 74ab1025174ede99fc8f78f76bab7a5d456cee9491b6cfd3b745af01376f2228fdfad95c213d88b0444ebd72810e32138cfc9cdd5b55349b32b5f173feaff300
 MISC metadata.xml 1078 SHA256 cad311926efedde5a689ae18496389ca80a1e4c5b4b16f1bfb456e8e27ce118c SHA512 f208e189f4901e1385d4c237cb7c91f333021b7bc4656d8b8365d7f6d827dc3a3e7ef58963baec88f399ffea505577e94e7901c5e58119e5952736f1c129e4bb WHIRLPOOL d94e39a391cf3ce8c31647d55a387c6102e244fcc3ebdb34909024f8b2faecf7a225552c77dbc5d841ac45f2583ec38b7f8e18e9eee92fbc702210dbdb581740
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTbnylAAoJEHfx8XVYajsflr8P/jwNelKXHZKdg7SzfO7tVnTK
-/XWKAfyIsX2vdWOMzl49VrwuPiT9hHwTXaMYCtBiaGCPNAuDmd5Y6ap8qDWuW9gR
-+1yzj4cbMrmzAqnsxwqy9rTyzkM3762oYXZUANRknALv74Km+h4sVtUosv0KsEAO
-ARt6DC25TQDsfgxxmvzETXcvZeBrxKNBFuHKJp6faCPUOWDwgZL2IpFryZCEhjSn
-mR1YfWLXute3168CrycfSZxAznPbKdtGhY2dZHL4XBM0PdH8x8H9klPRSQwFW+9i
-XNev3kJumI9SD+vt/xxAXVTwGiDYYxTQs6v2OCPQKdvXWVXYgskspNCv/TnaS5v1
-OrKvG/0wkAABcIoYoe/LXPitmZMuTSAGfsPaDLK1OFOEzKIqYaJdGGQ8/hlmjXrb
-VCZE7ckOGQaHxYCabB1BJBVckA548eauPtvrw5eHY1G9bQ/YWBEVe6ajokVqqEU8
-R1gGePdst54ublZ8kRwjSK7X3EHxu4nAoboUemmpFxbiQKw98oxLYSdeBZ+Yldrm
-AbZSO81R2F17YPRFR2IRTv+g0hswD3dRS5ov7mvl0++my523//vI/0/yWxk9inML
-7r5gxn2XlzLkSk91dwY4sMGJuBZdR2IoKSy9IcDDeBiHkE91wIR63h6cwMINbTjC
-IxriAr/G6oulo6Tov1WR
-=ZMVw
+iQIcBAEBCAAGBQJTcOh5AAoJEHfx8XVYajsfoooQAJoYuYxagpfUW/OQwqkKpbvj
+Zin4WvCbRmzu5pkMek64qgfrn8i6PiCWOiUWBTBpZhp/Ww/WW34k0rbI4sOnl0ZX
+anb4pYzaE7Z2TLRQznIFerBGN7Dg14NOFojkdH50023E72CZygy8ixXHDnepffOW
+Ph+Uoeeoc4Sc2hdcrWr+L+p0H6m2eqZsVUyODuTa1ZL3B5aQDKIrdw246ZRKg2o8
+m23Mq/9+7+ZpGKsFMxC62mT3/5vhTXkn3k+sdEUluBfEtLt4Ve7LQPlh7FzzHU5B
+P5Xle812kTCbrrfwWaZZRAKM7U2jpbGxaTvs/FgQVwDWmxzLRRKB2BFoDEKec582
+wKvtI252ZAC5yZ/LZ1EerkJEblsabW9ZntXJL2xAmYjbBtuKwBDmQLvplH8XHqqq
+FucVXnsgfTQBaBaxiToKaUswGZc0AJ3FNqf7iPWmdSdIsiOxylhDl/yGEGLcG5jN
+f4rmKNo9SJUphyaBa3KQHPk+7aMDsXaC/1qGcEEJha+KfRjMfSDj/Fz5+SIurbsV
+QdbHuZEpQgUGsZTk3YfjQIZKI+tAuK0VRxYac9HhfoUXRqpSXHNtT4+2xW9TWWyX
+Jd6jVhuRHO20vx98Wxrz5W0OZt6wClBFhGn+7IdWeurGpBAL8WxLuitYtbn1FugA
+O7Uom4g91Pp8yOp4+xvw
+=Z64b
 -----END PGP SIGNATURE-----
diff --git a/net-mail/dovecot/dovecot-2.2.13.ebuild b/net-mail/dovecot/dovecot-2.2.13.ebuild
new file mode 100644
index 000000000000..e328bdb47bb7
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.2.13.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.2.13.ebuild,v 1.1 2014/05/12 15:27: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"
+if [[ ${PV} == *_rc* ]] ; then
+	rc_dir="rc/"
+else
+	rc_dir=""
+fi
+SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${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="~amd64 ~arm ~hppa ~ia64 ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
+IUSE_DOVECOT_OTHER="caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+DEPEND="bzip2? ( app-arch/bzip2 )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lucene? ( >=dev-cpp/clucene-2.3 )
+	lzma? ( app-arch/xz-utils )
+	lz4? ( app-arch/lz4 )
+	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 )
+	zlib? ( sys-libs/zlib )
+	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_prepare() {
+	epatch "${FILESDIR}/${PN}-10-ssl.patch"
+}
+
+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."
+}
diff --git a/net-mail/dovecot/files/dovecot-10-ssl.patch b/net-mail/dovecot/files/dovecot-10-ssl.patch
new file mode 100644
index 000000000000..2e72e5945cb7
--- /dev/null
+++ b/net-mail/dovecot/files/dovecot-10-ssl.patch
@@ -0,0 +1,19 @@
+# bug 508552
+--- doc/example-config/conf.d/10-ssl.conf	2013-11-24 13:37:39.000000000 +0000
++++ doc/example-config/conf.d/10-ssl.conf	2014-05-12 14:42:26.000000000 +0000
+@@ -51,6 +51,15 @@
+ # SSL ciphers to use
+ #ssl_cipher_list = ALL:!LOW:!SSLv2:!EXP:!aNULL
+ 
++# ##########################################
++# You are strongly encouraged to change the above two settings to
++#
++#ssl_protocols = !SSLv2 !SSLv3
++#ssl_cipher_list = ALL:!EXPORT:!LOW:!MEDIUM:!aNULL:+RC4:@STRENGTH
++#
++# if you are not required to support legacy mail clients.
++# ##########################################
++
+ # Prefer the server's order of ciphers over client's.
+ #ssl_prefer_server_ciphers = no
+