gentoo resync : 14.07.2018

8 files changed, 379 insertions, 89 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 4375f33f2067..c8ea73c697fe 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 8522579bfbc9..fe9378ff7a9b 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,4 +1,5 @@
 AUX dovecot-10-ssl.patch 550 BLAKE2B 5317b802113e6dd711056684bb2de8167113c95ea28ea805fd3a1f688878505d02d85bd9ab69fc222cb2debdc1b5186f48f3c2cbea2f1df24714482939284f46 SHA512 7acc31dd4a3f51a9c13d590fd2803c2cb98c281e0595ca2a800539a143f89b95f923a3678beb0aa2b254a54385522329e0f3e1e8ba4c5852e7b51f8f111122a9
+AUX dovecot-glibc226.patch 2838 BLAKE2B 522fd7552faf88cba7c48f5074d264ca4450d1f72113eba9a7cf23317402b76a53874998bc0eb6cadb4580935dca061314b7c6bd355a6ce618c43465a7c8c5d2 SHA512 5ed7a19941cec35a8edace588bedac7d6d12903bf5ece2a224a61f021ae663352dd668c81cebe2c9b132fd0614998c77f1d19de2f48b2d3794c453b9ae333693
 AUX dovecot.init-r4 1499 BLAKE2B 9c05fd7da0409b0944b0204bdcd683ab889190effc8cb7b072dcab140f52e2f39336a344deb74b63ef184152604412ca4c2b3d79c3d63341386e7952c54b0a26 SHA512 8fbc80bc0efa6b83685da19b6a5c2a2d2ca7e59be7f1f7352984fe30004175330e53f3db1c4c2471f1d7d5e088bef0b4dced97d29d32be8b50d000987b6eeb09
 DIST dovecot-2.2-pigeonhole-0.4.18.tar.gz 1742357 BLAKE2B 8f9fc54e6effb233f7e8543a560b474dd4cd028d0a7bd1cc02e45c879bc2e7d636c2543e8aed3bd8e0b49b260703590be44fd1032ba3e1f4eb87a8e6f8ecf396 SHA512 6f49a6a6435b0e4dcbe29f852ce17c016df2f367f5460301a2a2c6bd5f5ba6260b23bfe1c5e78b91c6041554ee67d1ce14ad3adf219505f692c61681d9e70cc4
 DIST dovecot-2.2-pigeonhole-0.4.20.tar.gz 1745121 BLAKE2B 4a320d7340f3a7fbb92f911c16abb49561692310c7c9224842065b9830f057e442e6ae27010232d615a06f6fdd889ef8619c555516e2d843802297644b935a27 SHA512 84a28842be206e05cb96c07cf1c1b62c9c378ba4c952caa47cf79a44b9428e076f4182eadd9c4fb8f45d3605b881f91e8e520c41705017ac4039240d4bcace39
@@ -14,8 +15,10 @@ DIST dovecot-2.2.35.tar.gz 6185237 BLAKE2B 7ad08816553683126c4c8d494770730c49c29
 DIST dovecot-2.2.36.tar.gz 6239707 BLAKE2B 702bb24265b5fefec9c484b3cca890fb1536ff94d1f2d6c99ee8c294ee4e38091eef5a727f0d4bd03700263286361f55747a22fa74def350710f9e49a4b10580 SHA512 327c50971e276f6013ca7f7bb59498ee88d76c9f8419bd18ee531cf10142214350fb81c6d64eaef73ee01765dd0fcf4142ab146ed67d9d7d86d5a58d41cf8db5
 DIST dovecot-2.3-pigeonhole-0.5.0.1.tar.gz 1783039 BLAKE2B 8452c11d1c5f26d2ee9a0c54a2c30642bce5117f1ad140db8a8509a2bcc03236361a99c6f622267279eb75c19c68de7d96947557b595c345db34e34a135b492c SHA512 60016145caa444eeba13b49735f87ab2ebe7f178f104ad57283b5aa7e5119920d9f579032b775547e0866e86045a4ab653fd084068187d0cbe2e088cc15fc288
 DIST dovecot-2.3-pigeonhole-0.5.1.tar.gz 1792702 BLAKE2B 219bc6b3182e303b7f3784cca0fb7fcc9d9aae62e60cc490d7f0a94fa4f9b805933d9fd67c4927cd8f9c864c3b73e28bfde1866848960c71dc47d5e36196b748 SHA512 5d65c3c9f3131c4e82287d054bd8b963d7c56c3e0677d7384881cf109ca82080d6222f672d8f973447d98be823a4df5bf43760d4ba87b76447d13abab30130c4
+DIST dovecot-2.3-pigeonhole-0.5.2.tar.gz 1814618 BLAKE2B b1187021673429bee1b45a1f657bea995e9881257919ff55bac63106d65963294ee2b3829167c6d50e351c4bc3c7e88a5ccfb757308d2500c5d4146246145074 SHA512 6bc24d9241f94db795a012346d9bc94b5cc7d7ce0175c03213c2b5d179d80dec95e9bdbd50bed628c8f9f7c51639e692ba5e429212a3b4a654c1e4764ac4f11c
 DIST dovecot-2.3.0.1.tar.gz 6499984 BLAKE2B 4bfb38ba8bed154e58db03c53c0a6958632841fd66a118571c341be90f9d20a570a22699d4b8d117b72d4599fe074248c96cf4e7fc78ddd65c69662b4275cf97 SHA512 2b30c46c1660f425f6303a15cf638388439fd7a8065c91d28caf41d9a6403a4fccb530df3f69037a634bc3b0b9e498037da6b0b93c176f5e3b5808907d3f759d
 DIST dovecot-2.3.1.tar.gz 6703089 BLAKE2B a9a021531241f86083cd5bf31f7b9211df77b2423ad213ca35904e23002121631e81a6419e3b07a838eb699faff615dcb35f3b95a1da537f74068b3c15795b35 SHA512 fe664ab771145f2390fef45839ff2756e36731c61e571dfa6975014f9cea43144e2aca0acf1a83b1dac55ad50042d0fa170b83570aa411228557861ada410b79
+DIST dovecot-2.3.2.1.tar.gz 6797491 BLAKE2B 92b88fd0f0cb8ed6c418bf27c2e1fc4efe13f1ccfb4948ce5eed1a4e76a4e96f0d6770d9841026ec5a515310ebaa4b335063e3516de454db8ba06cc4ee5a00ec SHA512 c085a0d04925485423086736a3c7d919ad0ca9efeff005890382da5333edb68c7d23ccb89fbe2ac44f8f016fc993bf2c669e450794c3ab13463676cbb47c7bf7
 EBUILD dovecot-2.2.19.ebuild 9072 BLAKE2B 27ccb93298e73d91e8402b6fa0666a35d0cc4c59ff5ea5a5b5a8c1e421b75bb29d6ded7d0a8ae3128a59ab39c88ca89dffc383bb85353e4236174397e119a8a5 SHA512 46683dd02f04b8c03a6261983e89ac0b3bf1b80ba05e7a574c0275f0699ab6c85a0f44cb4106b1d967a83f8f92aa4b8a74eced4054e7e14ee128a08ee118c3d4
 EBUILD dovecot-2.2.29.1.ebuild 9215 BLAKE2B 4797bfb9f28d498d156d75e5837211ffba13f60da38990b55ef62960479af213a8a4eadb4de3b95a2d600089edccd3ec406cf97744d13918598020f18e756458 SHA512 e83a87950486c3f0b07b856b98430d99c42b42fb32fd796c1ef4ed192e05dc3d774429281e73a806855e809cec0e3ff1a7c6209de5d7608e01d17a29a3653bae
 EBUILD dovecot-2.2.32.ebuild 8655 BLAKE2B 9f500ad24385b63fe899c6c66e546d6e3f68f9059af9d7c10d406e3df75a4085a38ce19dfaaab7a7b1d022d07fef4bdcb033d1d20fed5752a5f864f0a0ff8a0e SHA512 f4ca664c39c32400528b5e01a8c0e58ef71d51f4ef52c827ec58b66bffd96281ddd91dad388be496ab78f887746f4c1ac9deb272ed108854e542ce5d4ae2348d
@@ -24,4 +27,5 @@ EBUILD dovecot-2.2.35.ebuild 8680 BLAKE2B ee3b5978fcda5ffe294bfa7dde81c6018a4023
 EBUILD dovecot-2.2.36.ebuild 8680 BLAKE2B 72a70c2452e8bfd0364abafe74c6adaf466ef8ff1b73fee0738e75584515ec934ea13b00db597fc69aa9a42f3b0857321efc426f02a828adad8a31165eabbd1e SHA512 186ff159dbee204d75df7acf04001aa7c10c11ce87a05e89aff4d010233b9da27b51f59b0eec4a0535d3f404fcf330c391eb0e843d1d6de4d1bb73a9ce7f8740
 EBUILD dovecot-2.3.0.1.ebuild 8678 BLAKE2B 6ba17ac442f7d88698444bae891690e4fe840d0b3fb0ab17033639f3c38b9a7da3041fe8dfaf42dab6269519a23b0300773b89a9b5dd9129a89e02a25b9e3e6f SHA512 6f058b5793c9c1ffe2cd1894fb4f40508befd87a36a66c00d6f5d202e99b014a638ff873eb68ffd7ccf59ff3941cb27f2981a4658ce7b8402d3c24449ff1fcf5
 EBUILD dovecot-2.3.1.ebuild 8676 BLAKE2B ea98fd811bdfec3f54d867a82598c46b0853c370ee06df43aa033eb4ea272385b2783ae91a577856e3a975ffabb251ca2073789612b66259b1f0216a51297219 SHA512 aa2b5e14e32fa6392a193b987eef13dbdddd725b61aba22e45b4bc3e466086d55ebfda58bd2d8ed93dc55ec7823eccfd5de311955693e9a0c362a8723aac4a48
+EBUILD dovecot-2.3.2.1.ebuild 8792 BLAKE2B 34856e60e8aae3d17df882a5196743b4ee2a03a05bde6dc9e15ebaec7cac22111da43213b0953b54b3cb7db42f288aaf58114c12c4330dd5161bbfd7ce8ce180 SHA512 bb1ec91d9575dd4c3abc14d38372fae1581d47f2a95fe820656d7ac38410bdad8496f3809ca6fca32d97e6d8e7b29bd0d934138e7e2c958e9594ac1439b51fb0
 MISC metadata.xml 1374 BLAKE2B 629969318c5bcbdf0521d2293c6ead5e735ba5a113db3166e4df82103a3a84cbc62f3a2843082c9d5bdb635f25353ac7d3a4fcdf80d45e07b11b98754e744506 SHA512 16bdf15120dd8c957cd6e4957910acf21440dd0b8774cac9d9c5a48635cd46c7093850974b592ebbcd49085607fff2051691a42112f4ab9df44c51b9fea6d180
diff --git a/net-mail/dovecot/dovecot-2.3.2.1.ebuild b/net-mail/dovecot/dovecot-2.3.2.1.ebuild
new file mode 100644
index 000000000000..49bdb7f94292
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.3.2.1.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+# do not add a ssl USE flag.  ssl is mandatory
+SSL_DEPS_SKIP=1
+inherit autotools ssl-cert systemd user versionator
+
+MY_P="${P/_/.}"
+#MY_S="${PN}-ce-${PV}"
+major_minor="$(get_version_component_range 1-2)"
+sieve_version="0.5.2"
+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}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	)
+	managesieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="https://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
+IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+DEPEND="argon2? ( dev-libs/libsodium )
+	bzip2? ( app-arch/bzip2 )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lua? ( dev-lang/lua:* )
+	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:* )
+	!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"
+
+PATCHES=( "${FILESDIR}/${PN}-glibc226.patch" )
+
+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() {
+	default
+	# bug 657108
+	# elibtoolize
+	eautoreconf
+}
+
+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 \
+		--with-rundir="${EPREFIX}/run/dovecot" \
+		--with-statedir="${EPREFIX}/var/lib/dovecot" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		--without-stemmer \
+		--disable-rpath \
+		--without-libbsd \
+		--with-icu \
+		--with-ssl \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$( use_with argon2 sodium ) \
+		$( use_with bzip2 bzlib ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( use_with lua ) \
+		$( 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 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="${S}" \
+			$( 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
+	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"
+
+	# 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() {
+	# 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
+
+	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
+}
diff --git a/net-mail/dovecot/files/dovecot-glibc226.patch b/net-mail/dovecot/files/dovecot-glibc226.patch
new file mode 100644
index 000000000000..adf1dd99aac8
--- /dev/null
+++ b/net-mail/dovecot/files/dovecot-glibc226.patch
@@ -0,0 +1,84 @@
+From 9a58361b08e1858e3bc7ea93934b7613261da476 Mon Sep 17 00:00:00 2001
+From: Timo Sirainen <timo.sirainen@dovecot.fi>
+Date: Mon, 9 Jul 2018 11:33:23 +0300
+Subject: [PATCH] m4: Enable rquota only if rpc/rpc.h exists
+
+It's been removed in glibc 2.26
+---
+ m4/quota.m4 | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/m4/quota.m4 b/m4/quota.m4
+index 5840e3af89..0695b1e021 100644
+--- a/m4/quota.m4
++++ b/m4/quota.m4
+@@ -7,8 +7,10 @@ AC_DEFUN([DOVECOT_RPCGEN], [
+   
+   have_rquota=no
+   if test -f /usr/include/rpcsvc/rquota.x && test -n "$RPCGEN"; then
+-    AC_DEFINE(HAVE_RQUOTA,, [Define if you wish to retrieve quota of NFS mounted mailboxes])
+-    have_rquota=yes
++    AC_CHECK_HEADER([rpc/rpc.h], [
++      AC_DEFINE(HAVE_RQUOTA,, [Define if you wish to retrieve quota of NFS mounted mailboxes])
++      have_rquota=yes
++    ])
+   fi
+   AM_CONDITIONAL(HAVE_RQUOTA, test "$have_rquota" = "yes")
+ ])
+From 5803ae4bbd420def0072e1660ea7061c0e5dbcb9 Mon Sep 17 00:00:00 2001
+From: Timo Sirainen <timo.sirainen@dovecot.fi>
+Date: Mon, 9 Jul 2018 11:39:59 +0300
+Subject: [PATCH] m4, quota: Support rquota using libtirpc
+
+---
+ m4/quota.m4                   | 13 ++++++++++---
+ src/plugins/quota/Makefile.am |  3 ++-
+ 2 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/m4/quota.m4 b/m4/quota.m4
+index 0695b1e021..d75af447e1 100644
+--- a/m4/quota.m4
++++ b/m4/quota.m4
+@@ -7,18 +7,25 @@ AC_DEFUN([DOVECOT_RPCGEN], [
+   
+   have_rquota=no
+   if test -f /usr/include/rpcsvc/rquota.x && test -n "$RPCGEN"; then
+-    AC_CHECK_HEADER([rpc/rpc.h], [
+-      AC_DEFINE(HAVE_RQUOTA,, [Define if you wish to retrieve quota of NFS mounted mailboxes])
++    PKG_CHECK_MODULES(LIBTIRPC, libtirpc, [
+       have_rquota=yes
++      QUOTA_LIBS="$QUOTA_LIBS \$(LIBTIRPC_LIBS)"
++    ], [
++      AC_CHECK_HEADER([rpc/rpc.h], [
++	have_rquota=yes
++      ])
+     ])
+   fi
++  if test "$have_rquota" = yes; then
++    AC_DEFINE(HAVE_RQUOTA,, [Define if you wish to retrieve quota of NFS mounted mailboxes])
++  fi
+   AM_CONDITIONAL(HAVE_RQUOTA, test "$have_rquota" = "yes")
+ ])
+ 
+ AC_DEFUN([DOVECOT_QUOTA], [
+   AC_SEARCH_LIBS(quota_open, quota, [
+     AC_DEFINE(HAVE_QUOTA_OPEN,, [Define if you have quota_open()])
+-    QUOTA_LIBS="-lquota"
++    QUOTA_LIBS="$QUOTA_LIBS -lquota"
+   ])
+   AC_SUBST(QUOTA_LIBS)
+ ])
+diff --git a/src/plugins/quota/Makefile.am b/src/plugins/quota/Makefile.am
+index f220d4f075..ffebc67404 100644
+--- a/src/plugins/quota/Makefile.am
++++ b/src/plugins/quota/Makefile.am
+@@ -19,7 +19,8 @@ AM_CPPFLAGS = \
+ 	-I$(top_srcdir)/src/lib-storage/index/imapc \
+ 	-I$(top_srcdir)/src/lib-storage/index/maildir \
+ 	-I$(top_srcdir)/src/lib-program-client \
+-	-I$(top_srcdir)/src/doveadm
++	-I$(top_srcdir)/src/doveadm \
++	$(LIBTIRPC_CFLAGS)
+ 
+ NOPLUGIN_LDFLAGS =
+ lib10_doveadm_quota_plugin_la_LDFLAGS = -module -avoid-version
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 1d6f48bc545a..b4a2c7ad637f 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -3,7 +3,6 @@ AUX hdr.at 1400 BLAKE2B f7b3c5a2bf5ca268adefaac2898ce9a2823357ed77b4ab0f73a67cb8
 AUX imap4d.initd 566 BLAKE2B 2d030e47f63b4133eed4b47c9069c54de290f907d9429eb99675380569e1e0efdbb1172664ba1ee0f2924ac7284981fbe350d1543a6d0790722456523d997535 SHA512 51d6cf4285c6823d97e52c7eb408a80aa66376f329685acdc21e096c2099a044b2fd18e7b9e5ed89406a3cd1f16b7aa7b0243f8ea46aa7824da48b566ec00324
 AUX mail 82 BLAKE2B 6d9cc293deff8f99cea0ce8842dd34e658844ca9a1f4e530d3c95f8154ed337ab6ccc2b6263af9cfa8078913a7b70beb5874c999174d5648c1faeace8f68e146 SHA512 80080a3118ed66cfde44ad3663e4b07bcd5fe756b86a213ea4e1ab86e27f8485dcf02af3ee6b7f6f12105a267b9619376668e0cb6e60743ffb7664d2dbea9144
 AUX mailutils-2.99.98-readline-6.3.patch 1321 BLAKE2B 061f3fbb554b2b8b9ed8452920c40ee6d9a93343b22aefcb550bbe03f9e0051ac8c770e58f44e4451ae63e3cca8350a09eed972dcf1db50bc6c40f1fb33a32a5 SHA512 cba6cd29af43b84bb9f13c6850756408e942b5cdf512f04582b3b3ae8e5532c615f8ed71cd8c19088aff4ef30f41861efab6e419d2300f99ad85f8b6abf30fa5
-AUX mailutils-3.2-fix-build.patch 2100 BLAKE2B a87e77ee7e8378fddb53d1001aafd01265fe1379af6563d20d2d03b7dc8caf514b3db1d489e8b99a5d7b0aa39bf3b7498b6ff7c4d00a9452850a03075de5fb28 SHA512 4ec7dc7c10dfed4862c0ecb7f9b5225abc957d03760f4cfb1982e7d3076244b45ef78b85b064f3aba925a09c67ab5103b37fefd4a8f9d45efefa9d481bb15505
 AUX mailutils-3.4-MH-testsuite.patch 2077 BLAKE2B d9a85a3fe025fb9e3fa240abd901f8567803f94e9cba58055b62a2bcfbd9e60db7cfd332c3c16faf5ac09ab3d9b7a43eb2b2b791ecf006e6d731ad555aa2da67 SHA512 2f10b61c47ec4981f912f180619627959338d7cf73e277bb25d6021044ae4752317773e6f7a13e7cba1dbf6782b3e32e92e77e1c265184bff89e8a79ce813954
 AUX mailutils-3.4-fix-endianness.patch 2871 BLAKE2B e868b624d10ff62fc7508ce66309d9aeec5f66582c9090771d5a132e0f2541943cadd63c37f91f2191145161d336e6e62ede42922f14c4219f3ee768bc6fdfdb SHA512 e219a11c060505d61a7ae14e24c4edeee2f0fbf5a824571c5a497b4702374a1776a2307f3702921a42551c7a229c1739a54d1f2f14b37d896a965712d8ebb2ef
 AUX mailutils.rc 258 BLAKE2B 3dc68190e11c8bf5016b0fe8b22c61f79ba7de96a1f230f7d0743ba23fa903cb9f99fac94a7363c7d80b7bbaf76e2d4de848e7ac726642fb23c56caf43a46568 SHA512 691bcc81fd355d8f2776e72006c149996273579e099f24970ff0c5dd6bdf65cd64e31597f8b3d8e0a900a91c3325b8d2a1a96682a9b3ff53acd41218fe8721fe
diff --git a/net-mail/mailutils/files/mailutils-3.2-fix-build.patch b/net-mail/mailutils/files/mailutils-3.2-fix-build.patch
deleted file mode 100644
index 7036cd68ca34..000000000000
--- a/net-mail/mailutils/files/mailutils-3.2-fix-build.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From afbb33cf9ff750e93a9a4c1f51a3b62d584f056e Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@gnu.org>
-Date: Sun, 19 Mar 2017 17:31:08 +0200
-Subject: Fix a bug in field-map handling.
-
-* libmailutils/cfg/driver.c (parse_mapping): Fix expected value type.
-* libmu_auth/sql.c (get_field): Remove left-over mu_assoc_ref call
-(see 622bc770).
----
- NEWS                      |  2 +-
- libmailutils/cfg/driver.c |  7 ++++++-
- libmu_auth/sql.c          | 11 +++++++----
- 3 files changed, 14 insertions(+), 6 deletions(-)
-
-diff --git a/libmailutils/cfg/driver.c b/libmailutils/cfg/driver.c
-index 7da75a8..8af543d 100644
---- a/libmailutils/cfg/driver.c
-+++ b/libmailutils/cfg/driver.c
-@@ -617,10 +617,15 @@ static int
- parse_mapping (void *item, void *data)
- {
-   struct mapping_closure *clos = data;
--  char *str = item;
-+  struct mu_config_value *cval = item;
-+  char const *str;
-   size_t len;
-   char *key, *val;
-   int rc;
-+
-+  if (mu_cfg_assert_value_type (cval, MU_CFG_STRING))
-+    return 1;
-+  str = cval->v.string;
-   
-   len = strcspn (str, "=");
-   if (str[len] == 0)
-diff --git a/libmu_auth/sql.c b/libmu_auth/sql.c
-index d69c36c..c50598d 100644
---- a/libmu_auth/sql.c
-+++ b/libmu_auth/sql.c
-@@ -214,20 +214,23 @@ mu_sql_expand_query (const char *query, const char *ustr)
- static int
- get_field (mu_sql_connection_t conn, const char *id, char **ret, int mandatory)
- {
--  const char **name = mu_assoc_ref (mu_sql_module_config.field_map, id);
--  int rc = mu_sql_get_field (conn, 0, name ? *name : id, ret);
-+  int rc;
-+  const char *name = mu_assoc_get (mu_sql_module_config.field_map, id);
-+  if (!name)
-+    name = id;
-+  rc = mu_sql_get_field (conn, 0, name, ret);
-   if (rc)
-     {
-       if (mandatory || rc != MU_ERR_NOENT)
- 	mu_error (_("cannot get SQL field `%s' (`%s'): %s"),
--		  id, name ? *name : id, mu_strerror (rc));
-+		  id, name, mu_strerror (rc));
-     }
-   else if (!*ret)
-     {
-       if (mandatory)
- 	{
- 	  mu_error (_("SQL field `%s' (`%s') has NULL value"),
--		    id, name ? *name : id);
-+		    id, name);
- 	  rc = MU_ERR_READ;
- 	}
-       else
--- 
-cgit v1.0-41-gc330
-
diff --git a/net-mail/qmhandle/Manifest b/net-mail/qmhandle/Manifest
index adc98c6d885e..f5075c6b5689 100644
--- a/net-mail/qmhandle/Manifest
+++ b/net-mail/qmhandle/Manifest
@@ -1,4 +1,3 @@
-AUX qmHandle-gentoo-svc.patch 718 BLAKE2B efb684c0c11ab7c2a3df534f0ab9c5cf911c2936fc23c74bef8b88f64b2e4ed68293f5ac6427146ac593149ce9e1e809a88e62d7e717f87045750ccd3de27f37 SHA512 9beeb4a2b17c2577807620b3a67147c694de3f43f491452a7511fd213e5376950b3da55278f2a64b76b95129b3ea7153fc117c286fffd2f472dd9fc4a2f20992
 DIST qmhandle-1.3.2.tar.gz 15423 BLAKE2B 92a97404fb495b83329e6a7b6dd83140e5b73f2dfd6a6999d546a7fc2dfdf302d52e0a5ae67a8415e012f972688283b2cafc9538aeca41608a05b3c9d91b58f3 SHA512 ec6bb344f4d345e4a59ab3acb336a5a76a22c07a9eccac1e1f178b2a96f83afb9a4d669f16f960c254cc203745db96027ef9e6181ea8a16b0bff5e86141ce779
 EBUILD qmhandle-1.3.2.ebuild 678 BLAKE2B 5177e5f603d724cd3d3835b5fcd81373ffe50fa045730c2d5fb7f372fe01a06bc9afc2d1897c6192ab0c3e4e2c0707d37a384ecccfbcd6f26af6ec634d9ef575 SHA512 deba6d7414d689720c11726f2fc7a5d06d9eeffea06b120f6d72c64a576b38d3f663089e9aeb89c958cbf31eef573aaf9caff5d13dfd0527b8091665dad380bf
 MISC metadata.xml 762 BLAKE2B f3d23ddb50669bab668e1e5279eec4ee45cb7bc44688aa41ba101c3c90ef128473f0bf396815fc16962f8b44336630cd908fb352a617d15370ed84a5170c59b0 SHA512 88d0d2a8527bf75f55da559f64ccf40e4dc08b64c6bda3a9354b6e0e59a53b8fcb5fd85b6012e30419bb9b03a672ab4b83a1aec93583dc77e64a3c0d1ffa08e4
diff --git a/net-mail/qmhandle/files/qmHandle-gentoo-svc.patch b/net-mail/qmhandle/files/qmHandle-gentoo-svc.patch
deleted file mode 100644
index fc516d4e0b7a..000000000000
--- a/net-mail/qmhandle/files/qmHandle-gentoo-svc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- qmHandle.orig	2005-08-24 19:39:11.000000000 +0200
-+++ qmHandle	2005-08-24 19:40:15.000000000 +0200
-@@ -29,8 +29,12 @@
- #my ($startqmail) = '/usr/local/bin/svc -u /service/qmail-send';
- 
- # While this is if you have a Debian GNU/Linux with its qmail package
--my ($stopqmail) = '/etc/init.d/qmail stop';
--my ($startqmail) = '/etc/init.d/qmail start';
-+#my ($stopqmail) = '/etc/init.d/qmail stop';
-+#my ($startqmail) = '/etc/init.d/qmail start';
-+
-+# Gentoo Linux:
-+my ($stopqmail) = '/usr/bin/svc -d /var/qmail/supervise/qmail-send';
-+my ($startqmail) = '/usr/bin/svc -u /var/qmail/supervise/qmail-send';
- 
- # If you don't have scripts, leave $stopqmail blank (the process will
- # be hunted and killed by qmHandle):