gentoo resync : 19.10.2017

5 files changed, 316 insertions, 30 deletions

diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index a70fd60ddd85..6d7bd70c957a 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -3,6 +3,7 @@ AUX dovecot.init-r4 1499 SHA256 54f6710ea0560db3e62fb910662d8bbce71b330067dc856d
 DIST dovecot-2.2-pigeonhole-0.4.18.tar.gz 1742357 SHA256 dd871bb57fad22795460f613f3c9484a8bf229272ac00956d837a34444f1c3a9 SHA512 6f49a6a6435b0e4dcbe29f852ce17c016df2f367f5460301a2a2c6bd5f5ba6260b23bfe1c5e78b91c6041554ee67d1ce14ad3adf219505f692c61681d9e70cc4 WHIRLPOOL 809ca6efbdf8688087bbfa48902d7c5467a5313135ce23d621eb84541854140e48c94e7ce8180f9e64816df8c1faf85a8cb42c29bf749da1eb7ebfb125469080
 DIST dovecot-2.2-pigeonhole-0.4.19.tar.gz 1743025 SHA256 629204bfbdcd3480e1ebcdc246da438323c3ea5fea57480ab859e8b201ad8793 SHA512 c1211a3c65b25995770309c427ec5cd888ddb962f2f64884640163b492a11ffa8937aac1eb66d25e48f0e00131da1cc98c1cb307781576780de47b8816333ff1 WHIRLPOOL 67867f93b5b4e0c1d73d9312ec47b135ffacdfd7e74329bdcb94cdbfbe2f5309189b562719db8b79c6a5581796627155f57fccddf2775110209ab536f85d8289
 DIST dovecot-2.2-pigeonhole-0.4.20.tar.gz 1745121 SHA256 6fe17d0b8f25f2ad580e01ad81ce47a9e965255e383a1f80e455f9ca0f00be5b SHA512 84a28842be206e05cb96c07cf1c1b62c9c378ba4c952caa47cf79a44b9428e076f4182eadd9c4fb8f45d3605b881f91e8e520c41705017ac4039240d4bcace39 WHIRLPOOL ed2ebb1d0d6f09b4ec9055fa5539bd308c3f454192a57691de62b3b0695afc0e61890275b5545338cfb7cb0ac843327962bada62df839fd64e1294f95085a706
+DIST dovecot-2.2-pigeonhole-0.4.21.tar.gz 1774887 SHA256 4ae09cb788c5334d167f5a89ee70b0616c3231e5904ad258ce408e4953cfdd6a SHA512 4751f449ede1b05173c706b414ebf9f7f670ff78589ce6f0b687c32c9abe6dae8b3064ed1b20e893d9ec0147b0139ce479e1d74ebe94747c33f2d8ca177912de WHIRLPOOL 2f7628e396e83476b538b41cd77cccdda2079d0b6310db418517540943d8ee28f14e0fe6d2b59a9537b1282694c0e08372d9560a653851388497ff6853ab801f
 DIST dovecot-2.2-pigeonhole-0.4.9.tar.gz 1577127 SHA256 82892f876d26008a076973dfddf1cffaf5a0451825fd44e06287e94b89078649 SHA512 9e7a18b43d59ed955b142d16696ca221822a547ea59ac70c1bb374eedb28b6ed99ea49f34ead1f9a16ded4573605e410a5cc8e038e1bdf5f943a65588b5d3af2 WHIRLPOOL be309436b43af82a7cb8eff205e1638b2c59751927fdab187e6fde72330e4abd99878cbfa94ca50440ec8de1f9b569bf334d426891ddc73d5f647ee2040c193f
 DIST dovecot-2.2.19.tar.gz 5256627 SHA256 759e1e3f9d907cdaabad1f5fbacc793ca191d234c084bec3bba42966952a4e9f SHA512 1b9d605a6a5862ade9d1ca634a9e0171b7c212ab025fc2059051c3795470685b66516fa9fbe5ad91d84388268ea15795f2dcd70ffdf81736ce4d80fd284835e9 WHIRLPOOL 30dbe70bfeef10dbe414ebf3f091041ad66926a8748cd401ecaf9ed5c7602939e86943d98bfb839f32c0aa1d0081ab71adacf23bb4adba34e828ee296e9a7278
 DIST dovecot-2.2.29.1.tar.gz 5972119 SHA256 ccfa9ffb7eb91e9e87c21c108324b911250c9ffa838bffb64b1caafadcb0f388 SHA512 1e5ea6080ebe7dd4afe6fcfe8e98ed6d2ad2735655a18cc96e439dd044ccc3a1a6a80428bc746b4d6250820895d6a62121562e97e4b46c8b1cf88a19443bc111 WHIRLPOOL 97a3b45191a32e78a08b4113a6e8b34e0bc538ec8359210d0bdf63990246af89be25cdaf9017c46f3107a7ec82758fa25820d61c25eda94f14ce7351d3aaea7a
@@ -10,12 +11,14 @@ DIST dovecot-2.2.30.1.tar.gz 6004223 SHA256 9049db49f7ccd76850a17872896dfb877867
 DIST dovecot-2.2.30.2.tar.gz 6008134 SHA256 f3dba79c1ceeaa9dd0633f648d3a607704bf3d0591e7d48168084c8add87189e SHA512 740118e3081864234168593bd83f2f5e7b9f5c7cefff3a3a7795369cf791f300c0881fbfacae2c76c0bb42e366ad26e7613c487708d113b19887ebe869d711ea WHIRLPOOL 34eaa59d3cbd837ae92aa9e7e3640cfd181ff2ce01ab80aa27143cb70987e4e5e1369ace7f5d7f2cf7f564a3e26e8c31368d0e60a1716abfed250dc812af0dcb
 DIST dovecot-2.2.31.tar.gz 5993283 SHA256 034be40907748128d65088a4f59789b2f99ae7b33a88974eae0b6a68ece376a1 SHA512 071797e260a75de9117b03c0fa9d903de82b1f1c039c2aece2d7313587e6673c49174bfce17b80fe3f3725fcbc42ed3a1bd1f1c22efef5bc016752277eff3266 WHIRLPOOL cc54758f65cc1f6295cc5533dd784b888d53d9b884016de08ddd16d893f3dc43df2cff87e474dd9f0f4b9df1c90f62330f7c70f051497f34729829849b39e519
 DIST dovecot-2.2.32.tar.gz 6100268 SHA256 160b2151e2af359877f69cb2dcdfe1a3f4138ad3766e3b8562b96616e2f6bc2e SHA512 a26ce763fdea7d72ff9801d3b7d57a1f0d00278e4a1aa60d1be070fe5a6d2c6a15f266a519119492bee7a3e7a6b7d0732e9879e5c5841adbab8c0952cd1b7c7c WHIRLPOOL 11ec82d0648a3fcbeb803f23672c2a734b2bc41828d71990ff72d5f6bfa56e3b294034de615b5b34da257477727832025988446f0baa92a0a56f61aa1d695297
+DIST dovecot-2.2.33.1.tar.gz 6131180 SHA256 e4d9a182408100dce70e05dad1f8a703252a497aeb25706642286d84a118890b SHA512 46760a1d52f8d64c36bd4f589f7f240a13d66500c93e47ce479551647e8e4ef7322fc0c325c418c3e0495910292abae105ca5680cd4b0fcd78746723f1549b71 WHIRLPOOL 941cd157aadbbf6c46c2dca56708e14dea1b2a3103ff84c41e625f5a3b0a75ab15a4b8c2d4e45915fb92a4bd2d589e640425f2354524bc8bdda9604cdc39af3f
 EBUILD dovecot-2.2.19.ebuild 9085 SHA256 c6ba82ed8109d79688c2127479da169fdf6dc5a65552cf13af3d81e681c274d2 SHA512 cb619f9f5588ab1be1b5de749663e4798044d695a359c96182037c8b3cdb94c8a7b41eac93054f2979b30d09405a3396e83d0d08cad3ad964654ae98f7632098 WHIRLPOOL 170cd361c69375216783253103dd28fd9cb51ba4d46f800e2dc196aaeef26acb917fcdbb4b16c90e0fcc740449304c8170fa3fa9fa39e0d88ecbb5c3739d8860
 EBUILD dovecot-2.2.29.1.ebuild 9207 SHA256 9b76684eb0c7052510f3e29a3e03458235f6ea1327f6dae0d24a759148ef8d1c SHA512 ca5a2af20756d5ac72dc96dd2a80334a3dc533a55b13b1d78ffaf29754795c4af353e39ea34d8e76f82054cec154d4128dc958c855aefdc5ca1877f7c0f3d06b WHIRLPOOL 2087852cf3a36a46f25ecb200f80f7dfbc1d215f48ff574856124a7bdfb0d3a692793c98889797ef58dcd3d4f2c4fc23ff8b60ab9dbcf98e4de6b016fa035305
 EBUILD dovecot-2.2.30.1.ebuild 8646 SHA256 5abad12b2792e8d8022d9bf51485ecb472bc83243f44c1bc751932c1966fdd22 SHA512 b9460cd076d8cb35699abe54ed7dcffa77c83f920bc01ae451fcfefa609850323d6da91e84deb77f38c48174e60c7a9d26e7f086a0e65c7dfb96e3e2e0d8eb0a WHIRLPOOL b4299ee41581612994709e02350ddd4572c82a19bd4832d2d7d444afa36fdf2087437c99b8a771ac1157270f7d791b1447a41486014c9fdddeb71e60df7f568b
 EBUILD dovecot-2.2.30.2.ebuild 8646 SHA256 5abad12b2792e8d8022d9bf51485ecb472bc83243f44c1bc751932c1966fdd22 SHA512 b9460cd076d8cb35699abe54ed7dcffa77c83f920bc01ae451fcfefa609850323d6da91e84deb77f38c48174e60c7a9d26e7f086a0e65c7dfb96e3e2e0d8eb0a WHIRLPOOL b4299ee41581612994709e02350ddd4572c82a19bd4832d2d7d444afa36fdf2087437c99b8a771ac1157270f7d791b1447a41486014c9fdddeb71e60df7f568b
 EBUILD dovecot-2.2.31.ebuild 8652 SHA256 e6d18d821a52fdec681e96f909d47c55c22b1857d574d7ed6af3cde2cdc796a6 SHA512 c2780f5ecbe58947fd9ef01f5df4ee371aa224f63b86b9ddcee4c38cc11eeceff96880b29a29739b7b2479bc0b646ae09b57f38ee4cb31b005b5576e2edbffec WHIRLPOOL 0f3d2437d8d5e6ede3b4b4580513ae48863ddc6f52fb65efb97f46d0a6f1b4d3a01a8e12c836d4315c41cf364dd1cb35a83c1f88336dc6204d7fd8551d0fb568
 EBUILD dovecot-2.2.32.ebuild 8652 SHA256 9df1365c5c087b3fbb1f6aa5da885c203ff5a4bb06a8b2b36ff089ade4bc0c58 SHA512 67464014935e1996e5f2ac20207cb85e2e14e056fb223675fc8eac8559e45cd7a8c0b61217bea4baa63b730d603dcc20cca3cf78f7751b0a5fba436cada25f0d WHIRLPOOL 4b67791ad2088e73a761d23677afa97fa279372d8001cfd14b0b1fed9f24334d44f69f4f427197c6364fdd75648b223aba59d4659024531f61464d6210c17f36
+EBUILD dovecot-2.2.33.1.ebuild 8652 SHA256 56fd02871646e19777d1a5e5f7878958c56dc5348e88b479947ec354d828fc6b SHA512 24dd9cbdfb0abfa7fa70ba07a77c8ecbe59a4ec22f20a840cb40cf7d9234dd003e4c5d0c5b52d32adc3dd76b7eb1af90a4f539d8f3dfa3e83c42a7e0c6a4e28d WHIRLPOOL a873f961994bccfeb3d586274f526e8251673c06b6e7e2239bcd0542cd371e3f3c8be2ac80a997a93ddf480665458a0b2c089dda397351d4654ae9b30f4530e6
 MISC ChangeLog 9857 SHA256 973c08c13df5fb24d94aed96c681cf0ec7539b24581fd0caac2ab3c6e0b192e1 SHA512 0ff9e788bd55fac94e1e641edcbe7849e0dfc0d8152a2df047353f90c8de61655e79f450dbaedec27ffaa29853d3bd603960567109c41500aafafc77cb646206 WHIRLPOOL 32858c3ace71c60b6f0cd95b2dd380acee65dabf57253dc2be4a4dfe11b5468708a351a6591d5cbfa72b054666a0a0221d5e68702f530faf06e40d2d6a11a8bf
 MISC ChangeLog-2015 75391 SHA256 223be6e013f9d10fafa0176b5aee5e71b049add2a493aaa0cf379d9ea40aa04b SHA512 f333fd9ab300bfde52a6ca236fea8110f49362bfc2852783cb483f3769ab8df8c68f1fed0ac2271226bf5a829dc711dd683d5ee7a18313429f027e718cdf4c3d WHIRLPOOL fd8f34b8e8e18c13f98b668e0323d15bd75ee4fbd30258edaf46b93caf3beae51a189bc685b1b2fa3d0c565d5c57ca8f57ef8c89edc9fca362edece65b2c2c12
 MISC metadata.xml 1303 SHA256 50a1e4e8eec92e6c44f7bdb75934727fe0334e6ec6454946c4664a63b0303d16 SHA512 6c574a0373c64e3eaeb6f8a3f4ea88437afe8c43cae6ab7c9144cb75973e0e8b4d66f805fecc7aca62257f0e7ad581a6834d1ad06e5773b6617f0d0e8b623e7d WHIRLPOOL 00ca51b94155b00b3b2fae67daaeb9afb8e8a6fee12fc768964926914cae389053369fc0a73b6826fb24b8d0f4356d3e901f9dbd41b27eb354d852f26f36f592
diff --git a/net-mail/dovecot/dovecot-2.2.33.1.ebuild b/net-mail/dovecot/dovecot-2.2.33.1.ebuild
new file mode 100644
index 000000000000..350498e8c2f4
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.2.33.1.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit ssl-cert systemd user versionator
+
+MY_P="${P/_/.}"
+major_minor="$(get_version_component_range 1-2)"
+sieve_version="0.4.21"
+if [[ ${PV} == *_rc* ]] ; then
+	rc_dir="rc/"
+else
+	rc_dir=""
+fi
+SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
+	sieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	)
+	managesieve? (
+	https://pigeonhole.dovecot.org/releases/${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 ~ppc ~ppc64 ~s390 ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
+IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat"
+
+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:* !dev-db/postgresql[ldap,threads] )
+	selinux? ( sec-policy/selinux-dovecot )
+	solr? ( net-misc/curl dev-libs/expat )
+	sqlite? ( dev-db/sqlite:* )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+	textcat? ( app-text/libexttextcat )
+	vpopmail? ( net-mail/vpopmail )
+	zlib? ( sys-libs/zlib )
+	virtual/libiconv
+	dev-libs/icu:="
+
+RDEPEND="${DEPEND}
+	net-mail/mailbase"
+
+# Dovecot does not support building without ssl.  Force it for now
+REQUIRED_USE="ssl"
+
+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() {
+	eapply -p0 "${FILESDIR}/${PN}-10-ssl.patch"
+	eapply_user
+}
+
+src_configure() {
+	local conf=""
+
+	if use postgres || use mysql || use sqlite; then
+		conf="${conf} --with-sql"
+	fi
+
+	# turn valgrind tests off. Bug #340791
+	VALGRIND=no econf \
+		--localstatedir="${EPREFIX}/var" \
+		--runstatedir="${EPREFIX}/run" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		--without-stemmer \
+		--disable-rpath \
+		--with-icu \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$( use_with bzip2 bzlib ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( use_with ldap ) \
+		$( use_with lucene ) \
+		$( use_with lz4 ) \
+		$( use_with lzma ) \
+		$( 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 textcat ) \
+		$( 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"
+	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
+		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
+		docinto plugins
+		dodoc doc/plugins/*.txt
+		docinto extensions
+		dodoc doc/extensions/*.txt
+		docinto locations
+		dodoc doc/locations/*.txt
+		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/mailutils/Manifest b/net-mail/mailutils/Manifest
index c04976ca6214..17551cdfe881 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -2,7 +2,6 @@ AUX comsatd.initd 569 SHA256 04983a4c4cb4736a9a58eb15991f9fa1f9f0d36565e25762e02
 AUX hdr.at 1400 SHA256 28354d253a10a9bf19744b2eadc7b3c890d49b37da4a3e8c85cc080d3d9e175e SHA512 f9b16a7726068b646dbde37e9c5293a0cfaa6baaa40908df3b36e125c5a06b52d946a8a0568db424009964965e90ac0d568e83345bcc9b1bce3b6f9157584b48 WHIRLPOOL ac4aa608bb0c236515b541efbc972049ba2ea553be7359a5376ccdc48bf8afbe891774876e0153c9db4b77ec953ed5ee481c5cbd071e2dc2448502602e1f7463
 AUX imap4d.initd 566 SHA256 008e9597107b28099f743245793d67148b169484b8a666eeb40b4d16cbd0b687 SHA512 51d6cf4285c6823d97e52c7eb408a80aa66376f329685acdc21e096c2099a044b2fd18e7b9e5ed89406a3cd1f16b7aa7b0243f8ea46aa7824da48b566ec00324 WHIRLPOOL 0c4e976c82b039529cb537567c5e750553238248ffaf09f370a256dff9b47040a53f2cc8ff9da126b41470db2bcaa5a327bcfe0d15dae4bcf3aac20929840822
 AUX mail 82 SHA256 639caffcadbe11530f2296cf22f155b1204b7cb51b952b868467be40fb4dfa85 SHA512 80080a3118ed66cfde44ad3663e4b07bcd5fe756b86a213ea4e1ab86e27f8485dcf02af3ee6b7f6f12105a267b9619376668e0cb6e60743ffb7664d2dbea9144 WHIRLPOOL 3205ffeb942b2d89d639baa219a2c40395ba85430aba8a347dc65b109a3a52f0e4eb3c67219bef22d6fa2adc88647eee34ebdaac694e21645d260d7a905f1c81
-AUX mailutils-2.99.98-array_bounds.patch 271 SHA256 51e146ed31205d565d6a7357de4977b02af7979e17467e31dc88210ee2fce448 SHA512 01de8bdaa7af244434fdbc5df9652f0127865d96b1e5f7b3495d4191c6dc53383d5246d8183efc913ae606b609141e9440d37afd8028278cc054840f039c5c5c WHIRLPOOL 1f6334678eabe598a622164334ff13f9e0452442b610de8b333c4e7695151985b9c3ae971f7cfe49be28462b7a895df56e48294608f9f260d0fc7a28cb08d095
 AUX mailutils-2.99.98-readline-6.3.patch 1321 SHA256 616b40e493496d8a7d9224e84b27c572c7bee51a789bbd687aa3e0f11665cd41 SHA512 cba6cd29af43b84bb9f13c6850756408e942b5cdf512f04582b3b3ae8e5532c615f8ed71cd8c19088aff4ef30f41861efab6e419d2300f99ad85f8b6abf30fa5 WHIRLPOOL 30312962f103bb2f10c43467d78a763826a1f27acf5932bb00b17f3ee0aa86f96ae0a4215c09361a3ac5ebbc76771a75688c3970b9f3a0d8403099cdfe138761
 AUX mailutils-3.2-fix-build.patch 2100 SHA256 09d29aa1853d16a6bcbe6c1440737ef035617f5b015caac53a83eb90de46c5d5 SHA512 4ec7dc7c10dfed4862c0ecb7f9b5225abc957d03760f4cfb1982e7d3076244b45ef78b85b064f3aba925a09c67ab5103b37fefd4a8f9d45efefa9d481bb15505 WHIRLPOOL fd3bc7dfb448ef48e275d813038faa98b6039b6d4c129cd0e80bd9a4bc1bcb60d280e2d3160d1100b45e9eac93caf01180d2d60c416ed3d0c3dd60924d57eb68
 AUX mailutils.rc 258 SHA256 a8618dcea1117d62e728ad8036018063a59e20bba0e6e23ce17ec9f498fa9220 SHA512 691bcc81fd355d8f2776e72006c149996273579e099f24970ff0c5dd6bdf65cd64e31597f8b3d8e0a900a91c3325b8d2a1a96682a9b3ff53acd41218fe8721fe WHIRLPOOL fb690a12d7b9687b3f9b785fab3c849b8bb8170f1c313fe5bd580bb3a9783f105da7c131d3e8fca659de01c7d6924bde42a15ab77ab88701ca373a186bb835dd
@@ -10,12 +9,12 @@ AUX nohdr.at 1032 SHA256 679139793c3148104504d82eb8aabe9677689088a8aaa085a1d548b
 AUX pop3d.initd 563 SHA256 470db1e9b766bf9666035552b4471fa3685bf39b0b11921fe1c32087ffc967c1 SHA512 7847c29a03f21df82d36c077ccb38329457a332cccdfba24bee3b1c9a8170fc71c07ee674408f069693953dd1bf44b8b8f782dcc35d6b16e62f70b2b32ce018f WHIRLPOOL ee1fe66b85fea66b07736f64bf4159881cc4a012d5ac24af3d4b6aa3842d5c401de7c94b43783aadab5be569b61af208c9e7ffeb7726ab8e4ddd5b9ede4aa0b2
 AUX twomsg.at 2216 SHA256 2f4daa90e190f2859fbf5b2480389ca425c5b7d0e44ad3613f41f52e5e4ea296 SHA512 dc84c7b0c3ce6fb919eabaf574b63943e9e318432ea11d6b65d13caa7f978b2dab6c70413e565b49e3b7e59aa791975dcd95e9a8e24024154f7c2f4dfd4d91aa WHIRLPOOL 083e915fc92d6c38f4b59bb030c51b59f3dd16ca1be0200dde150f12bbb3164eef15992d8ae1a7e0e4888f6158a70d6ea7e20baa1f0996993b2a2e3da9b61f8c
 AUX weed.at 1100 SHA256 d08206e05e39b903f7fa171cb14ea45e0d629baf756896d62b2e2506a7ea0184 SHA512 84fa4564cb1876c1b9f1a8b143f8fc95829de5d2b02edf8894d86aa50efcdd5696d66d773737a8989ccc4ae22d4d0e2c4b7c055e281faabb82cea399150b2821 WHIRLPOOL acf6bf42d1bf5ffde5b636bc12d9acd9a04010792e55f2efd1bf79ce794316dbd8fa5742d1f32531a3568af373849cb8ea183eebfe0f7ea5bf8c8390e59ef504
-DIST mailutils-2.99.98.tar.xz 2505252 SHA256 62e2c28aed77e451e05ed15e68b5abc3932bcc3d2d6caf9b4a6864258c6a7b1a SHA512 fc20d97b3eed0f0ff7f1d7885e59f8de6ffd5b4646cd06c3636bda4a6bc9f7a0d5acdc7bb3bb573cdc80d63dfdc0be6464033ef2f6d88514bd2190f6611a1083 WHIRLPOOL c0f6f4f9dc2d60074c06a6c8f604fa4d92df4dafd6e205df8c360e97663e96c9b64a02aab9af7eab0659abc39e8aed70bbb0761b7d5a21b5873beabbcd409030
 DIST mailutils-3.1.1.tar.xz 2759000 SHA256 e5a07994924f63d8f29efe94e63ba6b110ac70b2b7f61ffa6f54ae4c9287bc21 SHA512 68a6f530935118f60503550aff925c799fee4de77377e726548f418e05687b1c8f29210bcb97e1b1033f9414bdbceeaa41e65496b0648a6356c8363554955e8c WHIRLPOOL 37c475e488f1967658e0f204cd9a47d402976f2af31566de6f9b815a4c4e1cace83a9367e8e343eb575a7128653f3e82f114c4966b1b1ac32c7512aa2246baf2
 DIST mailutils-3.2.tar.xz 2795512 SHA256 96d354e69e93d5ed6dc2e1019bc3ed3c6e322248a2c477d8fc89dbed91ed077e SHA512 48499d64da65653f996257bd920ee6574840ce9872476425c499d2af6dda5f2cd88a6dc89affba5451ab28c347308a2ae1b53ec40679289d63d74775cd722f96 WHIRLPOOL 99eb034c708dcbbc0b2dcb086ea33010c5d90b3cc8b4b7b5eba2c786d042bd5ac517a611d3f185a84084c03f16b62e8c4efd75f1be315dd19df5868d2cfff82d
-EBUILD mailutils-2.99.98-r1.ebuild 3404 SHA256 1a3da14ca7d67212ae0b74fe5ce0c89dfea03f61ca5a0544ed2bd707f40356e0 SHA512 cc5c474cf3fd9944a02b4d3cc35310af2e0b3bbead99f1a2ced78ebfacf27d187b4b30038b94e0204f5922b6528e861c14d036522622108e0f8ef36d9bcf26bb WHIRLPOOL 86fb246484632c3bba9ff018d209d2e512c668f869da7be22fd8e2804758909de3409c7597eaf754e5d360dbd5db35be901da9d2a2df887dfca90bfd516c66dd
+DIST mailutils-3.3.tar.xz 2618632 SHA256 27d7fbdff904abf4eebf008c56ca61f135b110f8304c22bc4926dca4f944b4f6 SHA512 ece4e59ca46e287b8e69e45b9ca1207f9a7ef450ea009212ed9284d5aceaeafe64b0ee6333f42c1edcea2a2c45d414b8436e49bf342938bd78b7157a751bce9c WHIRLPOOL cf78b4d5762c7888c8995603b772d6b9b2485cd48c149d22c2c61a646857cf0f23f80a285a740b5d8ad177999eae302b90eb931d08021ee7fbd813463ce147ab
 EBUILD mailutils-3.1.1.ebuild 3575 SHA256 a3a8f2f6878946f91853ad2989e277e90e4c7abad868778b5ad275d84b7c4b74 SHA512 3fa3501b885b254bfaf86786d67a3177f0756cb0346ba630dc9b902c851ceb708abce1057d326de769704ff50d713859f0280433b384a6f17b016a4045d05570 WHIRLPOOL efb958c29b2e8ed499997cdc5e6e4fb78a2069750077acb605a17ef828f21931a9a5e3d2a6b00fac20f15c7d530ca18def937c2898fce872a6ec1193e154c8cc
 EBUILD mailutils-3.2.ebuild 3572 SHA256 2444d17d022ceedd371f2a76906d62b2778f04d45b6758c5205a182418980ec7 SHA512 eb2de61804c2e6da6a6c704f7df7e88b6ab8682b1e023e2f47661c504a38bea4fbe391fb4fce462f6674e1de645422c0a991f4d906635d41163dd9ac7874ad03 WHIRLPOOL 884887b2ecf8a6928e5b9f3af118dc808977f9826b7f19c59b1965a798471e16634e542f5e4f8b6712c6c5de7770c90839fe655802d4167e491911a52405adb8
+EBUILD mailutils-3.3.ebuild 3462 SHA256 a865dcc9e2cd804dd01e1c13b5fc9d804ea1b006394935e8eff26988ea4b5a17 SHA512 0cac9a11d3b995aff0cf97b633b64ef3f4b3807e5d0d1b355fe3e16e5b9ef1abfe0874c936cf5b8b67468188b3ba73c764945b6028cae14b97e7d05e2e716033 WHIRLPOOL 40f8f90250e0957ec7ae636a50defe11e0b858cf8590a71f5fbc7c431b708294a4c625f1e63168255a029b3767fe111a950aaede0e1d682f1c9377bf3856cdc1
 MISC ChangeLog 5455 SHA256 22024cf49b78294fdbf350d540c1cbff74ded9b5ed5790552ad3063ff7940ba5 SHA512 b16a07cda1196de4eb31e60ad88a0aa9e28e43d7dd810d18269892a849ec70ebe4d1af7299a76557ef10289eade0c85cfa1fe4fc8af2ab6f622b5b70128ba7c4 WHIRLPOOL 57e8d636f52f82d34a233ceed610cdae1f84d4f73924fc2ce170cfd2c72105ca1924af35f59ab3bd7a0ff37113502597f1634ed2bcbf4cba3fbe22d8bd2cf38c
 MISC ChangeLog-2015 10533 SHA256 6005cfed69eb8d6065cbc67be396bb130ceb3a4c40427e17b5608ac72ed719cb SHA512 8351be5fb052ca348935f535ac456034fb1342871d6eb0ff3a66cd6565b33a383c197be33b6a42f0b57f15f6730f8f549f48d7a96142a124ef3f17a83651963f WHIRLPOOL 11932cba8f90b74c53f55de61748f1ca217ad5137376572d34166f19345e12bb5ce1b3fffb16b6a3e051c8e0407c2616b6d52d433b367bad1746740be1184fc0
 MISC metadata.xml 598 SHA256 11e28455f0762275ad80e82ebb26de0119b7791916fbb5a6c677185e213b6ecc SHA512 16f2b6b082da7c932457df31809c8ca1caca1f8439037f56b5751c28cf1217658ed60fd4155871d4d5d71e7040c01edbe37198dee27beeae1905da954317c8e7 WHIRLPOOL 34b3346cb70bb38e74fd021b28b21578dfa82a7b038db8ec5109b0e58a489cf8dece99cf33c970d22e7f410641c58ccc39ef8fea57b72f109b8c883791e74d0f
diff --git a/net-mail/mailutils/files/mailutils-2.99.98-array_bounds.patch b/net-mail/mailutils/files/mailutils-2.99.98-array_bounds.patch
deleted file mode 100644
index 8ac418c7c037..000000000000
--- a/net-mail/mailutils/files/mailutils-2.99.98-array_bounds.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmu_auth/ldap.c	2012-03-25 14:02:22.000000000 +0300
-+++ libmu_auth/ldap.c	2013-03-22 12:29:19.034880845 +0200
-@@ -534,7 +534,7 @@
- 
-   env[0] = "user";
-   env[1] = key;
--  env[3] = NULL;
-+  env[2] = NULL;
- 
-   ws.ws_env = env;
-   if (mu_wordsplit (filter_pat, &ws,
diff --git a/net-mail/mailutils/mailutils-2.99.98-r1.ebuild b/net-mail/mailutils/mailutils-3.3.ebuild
index b42056d47eff..00ddc41f835c 100644
--- a/net-mail/mailutils/mailutils-2.99.98-r1.ebuild
+++ b/net-mail/mailutils/mailutils-3.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 inherit autotools eutils flag-o-matic python-single-r1 toolchain-funcs
@@ -9,28 +9,29 @@ inherit autotools eutils flag-o-matic python-single-r1 toolchain-funcs
 DESCRIPTION="A useful collection of mail servers, clients, and filters"
 HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html"
 #SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
-SRC_URI="mirror://gnu-alpha/mailutils/${P}.tar.xz"
+SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ppc x86 ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="berkdb bidi +clients gdbm sasl guile ipv6 kerberos ldap mysql nls pam postgres
-python servers ssl static-libs +threads tcpd tokyocabinet"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="berkdb bidi +clients gdbm sasl guile ipv6 kerberos kyotocabinet ldap \
+	mysql nls pam postgres python servers ssl static-libs +threads tcpd \
+	tokyocabinet"
 
-# Drop the libtool dep once libltdl goes stable.
 RDEPEND="!mail-client/nmh
 	!mail-filter/libsieve
 	!mail-client/mailx
 	!mail-client/nail
 	sys-libs/ncurses:=
 	sys-libs/readline:=
-	|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )
+	dev-libs/libltdl:0
 	virtual/mta
 	berkdb? ( sys-libs/db:= )
 	bidi? ( dev-libs/fribidi )
 	gdbm? ( sys-libs/gdbm )
 	guile? ( dev-scheme/guile:= )
 	kerberos? ( virtual/krb5 )
+	kyotocabinet? ( dev-db/kyotocabinet )
 	ldap? ( net-nds/openldap )
 	mysql? ( virtual/mysql )
 	nls? ( sys-devel/gettext )
@@ -45,7 +46,8 @@ RDEPEND="!mail-client/nmh
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	servers? ( tcpd )"
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -54,22 +56,22 @@ pkg_setup() {
 src_prepare() {
 	# Disable bytecompilation of Python modules.
 	echo "#!/bin/sh" > build-aux/py-compile
-	epatch "${FILESDIR}/${P}-array_bounds.patch"
-	epatch "${FILESDIR}/${P}-readline-6.3.patch" #503954
+	# add missing tests so that make check doesn't fail
+	cp "${FILESDIR}"/{hdr,nohdr,twomsg,weed}.at "${S}"/readmsg/tests || die
 	if use mysql; then
 		sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
 			sql/Makefile.am || die
-		eautoreconf
 	fi
+	eapply_user
+	eautoreconf
 }
 
 src_configure() {
 	append-flags -fno-strict-aliasing
 
 	# maildir is the Gentoo default
-	# but fails tests. So set it in config file instead.
-	#econf MU_DEFAULT_SCHEME=maildir \
-	econf CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
+	econf MU_DEFAULT_SCHEME=maildir \
+		CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
 		$(use_with berkdb berkeley-db) \
 		$(use_with bidi fribidi) \
 		$(use_enable ipv6) \
@@ -87,6 +89,8 @@ src_configure() {
 		$(use_enable static-libs static) \
 		$(use_enable threads pthread) \
 		$(use_with tokyocabinet) \
+		$(use_with kyotocabinet) \
+		$(use_with tcpd tcp-wrappers) \
 		$(use_enable servers build-servers) \
 		$(use_enable clients build-clients) \
 		--with-mail-spool=/var/spool/mail \
@@ -100,7 +104,8 @@ src_install() {
 	emake DESTDIR="${D}" install
 
 	insinto /etc
-	doins "${FILESDIR}/mailutils.rc"
+	# bug 613112
+	newins "${FILESDIR}/mailutils.rc" mailutils.conf
 	keepdir /etc/mailutils.d/
 	insinto /etc/mailutils.d
 	doins "${FILESDIR}/mail"