gentoo resync : 29.10.2017

3 files changed, 294 insertions, 2 deletions

diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 9931f90409f4..40792e14b5da 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -12,13 +12,15 @@ DIST dovecot-2.2.30.2.tar.gz 6008134 SHA256 f3dba79c1ceeaa9dd0633f648d3a607704bf
 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
+DIST dovecot-2.2.33.2.tar.gz 6131086 SHA256 fe1e3b78609a56ee22fc209077e4b75348fa1bbd54c46f52bde2472a4c4cee84 SHA512 028910a4d02b1630f1ada4d1c45fcc3ea2057969db7078a78d46e2a578b4dceaf8be0ac8de4a613b4890019e721871f2d366ec651db658da4cc72977d3e09931 WHIRLPOOL a861ef3ef9f7cdb8926255c5d51f9d908fa84d671acbab676a8a4f1dbab9173c7005e8079519139a3b359b20f937cd3843a38686c03dab150855ca38c9ee3733
 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 8650 SHA256 a504fc429e85f6ffafed742343a3d1f964c30a249c561c19471ded7aa1148460 SHA512 9f9e05cf4274056ccbdb203abb2531c21918bd23ca748729edad71e04e5217300211c48d9e3cd572de76dbae8ad6230d6955bd12c76c19b13b2dd15f8bcdb19a WHIRLPOOL e6fd43467e88f88ddc7fc3f68c63f93113f55071bbb17e823a926ab4ae816a273448d4e7a2ed9743dffa992fbf1884926d6d9e44efa760855e386932adc2e5ce
+EBUILD dovecot-2.2.32.ebuild 8647 SHA256 d4a3496eaf022624cdf0fd996004340d3e1553257ade5b2d46998342735d0281 SHA512 f7e769155d455fbfce2b9ee3ee8e6aa7e123df8698adbf8c14cecdb9a46e6a45d7e50ed7f2482f7622c9fe480349fc9b3af9bd30e3faffcdb69341e812ae2665 WHIRLPOOL 5ffa113e322d2d23d873f1d736f1d771fd365ba909fcf618cbe7abd2c6c3fc85fec445dc1bbc9df4193bd80c6c4acf2438b49e15f9025ecbad8fd07c91b389c2
 EBUILD dovecot-2.2.33.1.ebuild 8652 SHA256 56fd02871646e19777d1a5e5f7878958c56dc5348e88b479947ec354d828fc6b SHA512 24dd9cbdfb0abfa7fa70ba07a77c8ecbe59a4ec22f20a840cb40cf7d9234dd003e4c5d0c5b52d32adc3dd76b7eb1af90a4f539d8f3dfa3e83c42a7e0c6a4e28d WHIRLPOOL a873f961994bccfeb3d586274f526e8251673c06b6e7e2239bcd0542cd371e3f3c8be2ac80a997a93ddf480665458a0b2c089dda397351d4654ae9b30f4530e6
+EBUILD dovecot-2.2.33.2.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.32.ebuild b/net-mail/dovecot/dovecot-2.2.32.ebuild
index 1f9dab308838..f6397ad5adc5 100644
--- a/net-mail/dovecot/dovecot-2.2.32.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.32.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 ~x86"
+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"
diff --git a/net-mail/dovecot/dovecot-2.2.33.2.ebuild b/net-mail/dovecot/dovecot-2.2.33.2.ebuild
new file mode 100644
index 000000000000..350498e8c2f4
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.2.33.2.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."
+}