gentoo resync : 09.07.2022

21 files changed, 546 insertions, 372 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 7562f9360622..f49404e48828 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index a6c8a517cfb9..91eb332dd940 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,3 +1,4 @@
+AUX CVE-2022-30550.patch 5745 BLAKE2B ae48938734cceefa05473fa1d055e5d85c27f8a73ac4ed24debb631d83efbd1a1c94dd3629514d193abf5810d9adbf609c6cfc077d2a9de3e37d7429311ef86e SHA512 b2ff67fd8b6c5cea93877651a1168ef1a5d399cc5f1a61d1cce407c7624f5b6d758996084c6a5714b6880de0ce11ce5eac74a1e02918758cb6983caedb651c58
 AUX dovecot-autoconf-lua-version-v2.patch 524 BLAKE2B a0cb51a21169e55fe0ae92ed7fad3ccc898585ed4b0c9ed3db243b6f41165d5a4ad6470a6a76f5a04a44d450068da1b7173707f272f65a72265d4b49a630ac2e SHA512 cc9319926f90a4c4aaf1d1e77944bfa5df9f7f15ee9581469ff8c1a069ef18e55addb69fcfe88e024cad8544c0efb90f5b83c2b6d803e0c68770467849d31f78
 AUX dovecot-socket-name-too-long.patch 356 BLAKE2B ada5007b620cd5eef5a950d64add7d83ac366f126e1a9a70268e528d44a0a036fec096015bee2421caeca8a052d118011c5911b3c432fa73e846c66781df4da9 SHA512 f362bad725c9e408830dc9d5908a2b35b8ee82cb05f3d58795079b32d5ac4712779e71bd0f479fe072906fcaf01e4e08f08cedb9fd5ee08931409887480b8349
 AUX dovecot.init-r6 1573 BLAKE2B 206318cbf7a6ef0276cb93237b091dd34dc2603a00f13ed288c787dc81f8902e770f7774c54eba90de49e9634eb93873046a043bd7825cfb65bab5b2ea9ce108 SHA512 982f9897e4a0a5a3957bb12785961c9cde72a2c941f55efdb23e9a26cec19efe89e3be4effe79522c297ea2b258d201db78c19b6e3f9cd5e68d3736c2a0f0063
@@ -6,5 +7,6 @@ DIST dovecot-2.3-pigeonhole-0.5.19.tar.gz 1954148 BLAKE2B 0c52293f9447260f3e95f3
 DIST dovecot-2.3.18.tar.gz 7763230 BLAKE2B ff3e0c2cad87d2e2632345a25825eebd0a6c1520376d85286453bde7505f22410d03911cd588a0d102b75f22cc1de051b01c43a57c90138340186e8cb024247a SHA512 b5eccf790a3960614876f122efb6296fe49ab7c523b08c10347fd4d10ed293fbd327279511c227b420f7c0786975186157eaa0fb5cd3aab1f3be9a4c5c3ad233
 DIST dovecot-2.3.19.1.tar.gz 7790851 BLAKE2B 6826977a0febfcb56eb99baf6e0dc0a130fc24a14f113ca7ce0f72b26b8c9755d8352999c5965e21320a62621787e02428c99dd6888768e8c35a46e4082ba071 SHA512 ceb87a5f76b6352d28fd030aae5ad2165a133e9a8a6309891e793911203fc0ada9fb254dc05d183eaaa7e2b9851d3f1755b33f08fa6ff5b4b415ac4272bfe150
 EBUILD dovecot-2.3.18-r1.ebuild 8859 BLAKE2B a022d5c3fb0da72559ecd071711ca2bbea7dbd999a75449f7b6e50047d74497895ad00a74de6c0653e61d78f76600d5aab9204133476558ee6c59b1628180438 SHA512 e3c1b3f2733a348344d3349091622b0e3827bdedd4575fef0ada44d13346f22bef33ef9817540c2cc5c15fd6142050a36bfdc32ecf905a64ee67e3283e6c6981
+EBUILD dovecot-2.3.19.1-r1.ebuild 8689 BLAKE2B a02875e7f8404cc3f404b66cfbce96c095c89e5ff83eb65a9104f02d81f524017eed3565bcd4b802ab119387956862dffbfa8e15d13e28e03f612fe09e1ad477 SHA512 b5d45fe0ce376eee7991f737b2e61dccb344683b924d1ec581cdf3d50c736d5a2904e71b332aca0453db17ff66bf796d4b93c2b34817d6a536ab08f016e36b46
 EBUILD dovecot-2.3.19.1.ebuild 8658 BLAKE2B d9edf93a3287d299403509f0991f1c0a976207a2693ee62404a323803c22574ced457503297c209432f0d2a942be60780a40e913f62c11e3d600449d63a481ff SHA512 85c3138977452eb8ef341d5c67c30694230606d47dccec99feea37efafb8d9e6fa956fbe6d43d3e3670cc3183e0a26cf390e264f634ed7e97d2acbe5a8a62f29
 MISC metadata.xml 1025 BLAKE2B 5e9309f0cf659eb51dbf908776fd0f6a97c06c305380ff0b66f969d92382c78e1460310b0d4dd323e1193d622f5bd9cc796d31e8bda304e833d5ab974b934992 SHA512 befdb4837de276d9a73a77a926d972dae9a6c5a39a28137d4ef8f1e9e51c4885b8df24b8a144b9ba5d9533af7430ea531cada49944d529651bf63bc98aeff92f
diff --git a/net-mail/dovecot/dovecot-2.3.19.1-r1.ebuild b/net-mail/dovecot/dovecot-2.3.19.1-r1.ebuild
new file mode 100644
index 000000000000..9d580a135e17
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.3.19.1-r1.ebuild
@@ -0,0 +1,303 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 lua5-3 )
+# do not add a ssl USE flag.  ssl is mandatory
+SSL_DEPS_SKIP=1
+inherit autotools flag-o-matic lua-single ssl-cert systemd toolchain-funcs
+
+MY_P="${P/_/.}"
+#MY_S="${PN}-ce-${PV}"
+major_minor="$(ver_cut 1-2)"
+sieve_version="0.5.19"
+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 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
+IUSE_DOVECOT_COMPRESS="lz4 zstd"
+IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 lucene managesieve rpc
+	selinux sieve solr static-libs stemmer suid systemd tcpd textcat unwind"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+DEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
+	dev-libs/icu:=
+	dev-libs/openssl:0=
+	sys-libs/zlib:=
+	virtual/libiconv
+	argon2? ( dev-libs/libsodium:= )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:= )
+	lua? ( ${LUA_DEPS} )
+	lucene? ( >=dev-cpp/clucene-2.3 )
+	lz4? ( app-arch/lz4 )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	pam? ( sys-libs/pam:= )
+	postgres? ( dev-db/postgresql:* )
+	rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto )
+	selinux? ( sec-policy/selinux-dovecot )
+	solr? ( net-misc/curl dev-libs/expat )
+	sqlite? ( dev-db/sqlite:* )
+	stemmer? ( dev-libs/snowball-stemmer:= )
+	suid? ( acct-group/mail )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	textcat? ( app-text/libexttextcat )
+	unwind? ( sys-libs/libunwind:= )
+	zstd? ( app-arch/zstd:= )
+	virtual/libcrypt:=
+	"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/dovecot
+	acct-group/dovenull
+	acct-user/dovecot
+	acct-user/dovenull
+	net-mail/mailbase
+	"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-autoconf-lua-version-v2.patch
+	"${FILESDIR}/${PN}"-socket-name-too-long.patch
+	"${FILESDIR}"/CVE-2022-30550.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_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
+}
+
+src_prepare() {
+	default
+	# bug 657108
+	#elibtoolize
+	eautoreconf
+
+	# Bug #727244
+	append-cflags -fasynchronous-unwind-tables
+}
+
+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 \
+	LUAPC="${ELUA}" \
+	systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+	econf \
+		--with-rundir="${EPREFIX}/run/dovecot" \
+		--with-statedir="${EPREFIX}/var/lib/dovecot" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		--disable-rpath \
+		--with-bzlib \
+		--without-libbsd \
+		--with-lzma \
+		--with-icu \
+		--with-ssl \
+		--with-zlib \
+		$( use_with argon2 sodium ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( use_with lua ) \
+		$( use_with ldap ) \
+		$( use_with lucene ) \
+		$( use_with lz4 ) \
+		$( use_with mysql ) \
+		$( use_with pam ) \
+		$( use_with postgres pgsql ) \
+		$( use_with sqlite ) \
+		$( use_with solr ) \
+		$( use_with stemmer ) \
+		$( use_with systemd ) \
+		$( use_with tcpd libwrap ) \
+		$( use_with textcat ) \
+		$( use_with unwind libunwind ) \
+		$( use_with zstd ) \
+		$( 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 ldap ) \
+			$( 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
+
+	if use suid; then
+		einfo "Changing perms to allow deliver to be suided"
+		fowners root:mail "/usr/libexec/dovecot/dovecot-lda"
+		fperms 4750 "/usr/libexec/dovecot/dovecot-lda"
+	fi
+
+	newinitd "${FILESDIR}"/dovecot.init-r6 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 /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 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
+}
diff --git a/net-mail/dovecot/files/CVE-2022-30550.patch b/net-mail/dovecot/files/CVE-2022-30550.patch
new file mode 100644
index 000000000000..d7da1316f76f
--- /dev/null
+++ b/net-mail/dovecot/files/CVE-2022-30550.patch
@@ -0,0 +1,155 @@
+From 7bad6a24160e34bce8f10e73dbbf9e5fbbcd1904 Mon Sep 17 00:00:00 2001
+From: Timo Sirainen <timo.sirainen@open-xchange.com>
+Date: Mon, 9 May 2022 15:23:33 +0300
+Subject: [PATCH 1/2] auth: Fix handling passdbs with identical driver/args but
+ different mechanisms/username_filter
+
+The passdb was wrongly deduplicated in this situation, causing wrong
+mechanisms or username_filter setting to be used. This would be a rather
+unlikely configuration though.
+
+Fixed by moving mechanisms and username_filter from struct passdb_module
+to struct auth_passdb, which is where they should have been in the first
+place.
+---
+ src/auth/auth-request.c |  6 +++---
+ src/auth/auth.c         | 18 ++++++++++++++++++
+ src/auth/auth.h         |  5 +++++
+ src/auth/passdb.c       | 15 ++-------------
+ src/auth/passdb.h       |  4 ----
+ 5 files changed, 28 insertions(+), 20 deletions(-)
+
+diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
+index cd08b1fa02..0ca29f3674 100644
+--- a/src/auth/auth-request.c
++++ b/src/auth/auth-request.c
+@@ -534,8 +534,8 @@ auth_request_want_skip_passdb(struct auth_request *request,
+ 			      struct auth_passdb *passdb)
+ {
+ 	/* if mechanism is not supported, skip */
+-	const char *const *mechs = passdb->passdb->mechanisms;
+-	const char *const *username_filter = passdb->passdb->username_filter;
++	const char *const *mechs = passdb->mechanisms;
++	const char *const *username_filter = passdb->username_filter;
+ 	const char *username;
+ 
+ 	username = request->fields.user;
+@@ -548,7 +548,7 @@ auth_request_want_skip_passdb(struct auth_request *request,
+ 		return TRUE;
+ 	}
+ 
+-	if (passdb->passdb->username_filter != NULL &&
++	if (passdb->username_filter != NULL &&
+ 	    !auth_request_username_accepted(username_filter, username)) {
+ 		auth_request_log_debug(request,
+ 				       request->mech != NULL ? AUTH_SUBSYS_MECH
+diff --git a/src/auth/auth.c b/src/auth/auth.c
+index f2f3fda20c..9f6c4ba60c 100644
+--- a/src/auth/auth.c
++++ b/src/auth/auth.c
+@@ -99,6 +99,24 @@ auth_passdb_preinit(struct auth *auth, const struct auth_passdb_settings *set,
+ 	auth_passdb->override_fields_tmpl =
+ 		passdb_template_build(auth->pool, set->override_fields);
+ 
++	if (*set->mechanisms == '\0') {
++		auth_passdb->mechanisms = NULL;
++	} else if (strcasecmp(set->mechanisms, "none") == 0) {
++		auth_passdb->mechanisms = (const char *const[]){ NULL };
++	} else {
++		auth_passdb->mechanisms =
++			(const char *const *)p_strsplit_spaces(auth->pool,
++				set->mechanisms, " ,");
++	}
++
++	if (*set->username_filter == '\0') {
++		auth_passdb->username_filter = NULL;
++	} else {
++		auth_passdb->username_filter =
++			(const char *const *)p_strsplit_spaces(auth->pool,
++				set->username_filter, " ,");
++	}
++
+ 	/* for backwards compatibility: */
+ 	if (set->pass)
+ 		auth_passdb->result_success = AUTH_DB_RULE_CONTINUE;
+diff --git a/src/auth/auth.h b/src/auth/auth.h
+index f700e29d5c..460a179765 100644
+--- a/src/auth/auth.h
++++ b/src/auth/auth.h
+@@ -41,6 +41,11 @@ struct auth_passdb {
+ 	struct passdb_template *default_fields_tmpl;
+ 	struct passdb_template *override_fields_tmpl;
+ 
++	/* Supported authentication mechanisms, NULL is all, {NULL} is none */
++	const char *const *mechanisms;
++	/* Username filter, NULL is no filter */
++	const char *const *username_filter;
++
+ 	enum auth_passdb_skip skip;
+ 	enum auth_db_rule result_success;
+ 	enum auth_db_rule result_failure;
+diff --git a/src/auth/passdb.c b/src/auth/passdb.c
+index eb4ac8ae82..f5eed1af4f 100644
+--- a/src/auth/passdb.c
++++ b/src/auth/passdb.c
+@@ -224,19 +224,8 @@ passdb_preinit(pool_t pool, const struct auth_passdb_settings *set)
+ 	passdb->id = ++auth_passdb_id;
+ 	passdb->iface = *iface;
+ 	passdb->args = p_strdup(pool, set->args);
+-	if (*set->mechanisms == '\0') {
+-		passdb->mechanisms = NULL;
+-	} else if (strcasecmp(set->mechanisms, "none") == 0) {
+-		passdb->mechanisms = (const char *const[]){NULL};
+-	} else {
+-		passdb->mechanisms = (const char* const*)p_strsplit_spaces(pool, set->mechanisms, " ,");
+-	}
+-
+-	if (*set->username_filter == '\0') {
+-		passdb->username_filter = NULL;
+-	} else {
+-		passdb->username_filter = (const char* const*)p_strsplit_spaces(pool, set->username_filter, " ,");
+-	}
++	/* NOTE: if anything else than driver & args are added here,
++	   passdb_find() also needs to be updated. */
+ 	array_push_back(&passdb_modules, &passdb);
+ 	return passdb;
+ }
+diff --git a/src/auth/passdb.h b/src/auth/passdb.h
+index 2e95328e5c..e466a9fdb6 100644
+--- a/src/auth/passdb.h
++++ b/src/auth/passdb.h
+@@ -63,10 +63,6 @@ struct passdb_module {
+ 	/* Default password scheme for this module.
+ 	   If default_cache_key is set, must not be NULL. */
+ 	const char *default_pass_scheme;
+-	/* Supported authentication mechanisms, NULL is all, [NULL] is none*/
+-	const char *const *mechanisms;
+-	/* Username filter, NULL is no filter */
+-	const char *const *username_filter;
+ 
+ 	/* If blocking is set to TRUE, use child processes to access
+ 	   this passdb. */
+
+From a1022072e2ce36f853873d910287f466165b184b Mon Sep 17 00:00:00 2001
+From: Timo Sirainen <timo.sirainen@open-xchange.com>
+Date: Mon, 16 May 2022 14:58:45 +0200
+Subject: [PATCH 2/2] auth: Add a comment about updating userdb_find()
+
+---
+ src/auth/userdb.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/auth/userdb.c b/src/auth/userdb.c
+index 0849659102..830bc2dd64 100644
+--- a/src/auth/userdb.c
++++ b/src/auth/userdb.c
+@@ -158,7 +158,8 @@ userdb_preinit(pool_t pool, const struct auth_userdb_settings *set)
+ 	userdb->id = ++auth_userdb_id;
+ 	userdb->iface = iface;
+ 	userdb->args = p_strdup(pool, set->args);
+-
++	/* NOTE: if anything else than driver & args are added here,
++	   userdb_find() also needs to be updated. */
+ 	array_push_back(&userdb_modules, &userdb);
+ 	return userdb;
+ }
diff --git a/net-mail/grepmail/Manifest b/net-mail/grepmail/Manifest
index 11af79be57f3..c90ec03177ce 100644
--- a/net-mail/grepmail/Manifest
+++ b/net-mail/grepmail/Manifest
@@ -1,7 +1,3 @@
-AUX 5.30.33-fix_nonexistent_mailbox_test.patch 1138 BLAKE2B ebcc4958fc773f4ee0d1156f6ffbb722fc985d641c5e9b4a7fb1f12de90faf85808c74719271b99159572f86244aba2ef98adeffc106392f22e636d12738bede SHA512 88c3123ea5031a9d925cf8c7464b53290a4015faf43b2ef5a0543698d8374e45b93291bf1eefe636b52ba4a8d1a9ebf2dc3a9261572bfd5bcc9f16f1671e8969
-AUX 5.30.33-midnight.patch 560 BLAKE2B 4b2d085dc8f334f1ec1a9949ef91524791c841a5bb6b92a69c90d87ec62aaa4280558e8a57112b6d085beb34551a1b42662ae6a5311ffc5f60da6d5b9b8520c3 SHA512 41ce56d0a2371bcc527f997825530e87ad0199c78605ea72567255cb985158fa56e669aeea966a547ccd970231bda1a5da783320fda1568642890e9832c69775
-DIST grepmail-5.3033.tar.gz 536791 BLAKE2B 400cc3c30a291f6075d343522a4f506997e3328c2adda2cfa7d4449052ce5bd6112fc06a44f8359def6358c716422b5c33353c7247dd6b5cf6c5a0502a2c34d6 SHA512 58fb63c42b534ba32d8224753cd11701adc3ab6eeca838753982cd6fdc46c05142eeb34106ae585b48698c299648cc2e0135215900ce28dd7c84921c8ad7831f
 DIST grepmail-5.3111.tar.gz 560547 BLAKE2B 88c9e841aed419ae428c45dd9a1bfb294076d73a3635e06b50a1f5b3bb3d2d447a8c586054b80ad793ccd6b2b2cb16394486d044f988c5760c04f9fe2da0e73e SHA512 50df6585ecebb838a2b60c048e66588d7a161a88256ffce2c7313e61d32751739b3c30a64deb43dcd2a5933970cacc812fbb2dbd9f91a8ac34012e0581cd2962
-EBUILD grepmail-5.30.33-r2.ebuild 1039 BLAKE2B d906e5707d8704752811797b7964aa63732aaeb369d209e237247c7ad1d66d2667a7ce1df70bbfb959148698e3ab8ffa2ba3a8f51b496049c505f3822c413c31 SHA512 9582058ef44dd1dfea0cf0230a7ad66be28dededcdaa2f2b5590d3168d41c176ad1ddb893596d97fd1cc699320a2e488b1a0555a1be5ea9074d4b02957ae36e0
 EBUILD grepmail-5.3111.ebuild 687 BLAKE2B 90630630731805fd859b793187c7cd9553ed8b3c4c85b9395e932c73da57c8627f437addc1d5f3953ff1b9624fbe920bff4142c3a8374a891e584725842ec92a SHA512 fa068b49907cdd2c0f501dc0bffc6b4f440d0540447cb7591b1705bcf00c56fae7d04be2283a7c04c31cb0a896870808d40c730dc32ba5437cdd4e10096bd369
 MISC metadata.xml 246 BLAKE2B e117fa7ba84c2250c8699ba7658f09aeefda0f7977dc851b17ab79b20e9c139e94de32b755136f4a7e901d0a2cecf6e3a8fc88521d1eb2767dcdc07c8f43fd37 SHA512 43283f70e6e72dc2211754908e9bb54668d4f0d569ebff77890b291868a27d08abf9d530de1be10e72cf0ac95c24a7ff491490b90a30104364f1b6fd93147354
diff --git a/net-mail/grepmail/files/5.30.33-fix_nonexistent_mailbox_test.patch b/net-mail/grepmail/files/5.30.33-fix_nonexistent_mailbox_test.patch
deleted file mode 100644
index cdab28bb635c..000000000000
--- a/net-mail/grepmail/files/5.30.33-fix_nonexistent_mailbox_test.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Fix FTBFS with libmail-mbox-messageparser-perl 1.5002
- From 1.5002, it does not return "No data on standard input" anymore.
-Author: Vincent Legout <vincent@legout.info>
-Last-Update: 2010-04-28
-Bug-Debian: http://bugs.debian.org/549782
-Bug-Gentoo: https://bugs.gentoo.org/296657
-
---- grepmail/t/nonexistent_mailbox.t
-+++ grepmail/t/nonexistent_mailbox.t
-@@ -13,21 +13,15 @@
-   => ['none','no_such_file'],
- "$^X -MExtUtils::Command -e cat no_such_file 2>" . devnull() .
-   " | grepmail pattern"
--  => ['none','no_data'],
-+  => ['none','none'],
- "grepmail -E $single_quote\$email =~ /pattern/$single_quote no_such_file"
-   => ['none','no_such_file'],
- "$^X -MExtUtils::Command -e cat no_such_file 2>" . devnull() .
-   " | grepmail -E $single_quote\$email =~ /pattern/$single_quote"
--  => ['none','no_data'],
-+  => ['none','none'],
- );
- 
- my %expected_errors = (
--"$^X -MExtUtils::Command -e cat no_such_file 2>" . devnull() .
--  " | grepmail pattern"
--  => 1,
--"$^X -MExtUtils::Command -e cat no_such_file 2>" . devnull() .
--  " | grepmail -E $single_quote\$email =~ /pattern/$single_quote"
--  => 1,
- );
- 
- my %localization = (
diff --git a/net-mail/grepmail/files/5.30.33-midnight.patch b/net-mail/grepmail/files/5.30.33-midnight.patch
deleted file mode 100644
index d861774df81a..000000000000
--- a/net-mail/grepmail/files/5.30.33-midnight.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix bug with midnight
-Author: Manuel Prinz <manuel@debian.org>
-Last-Update: 2010-02-22
-Bug-Debian: http://bugs.debian.org/559588
-Bug-Gentoo: https://bugs.gentoo.org/355067
-
---- grepmail/grepmail
-+++ grepmail/grepmail
-@@ -397,7 +397,7 @@
-     if (eval 'require Date::Manip')
-     {
-       my ($version_number) = $Date::Manip::VERSION =~ /^(\d+\.\d+)/;
--      Date::Manip::Date_Init("TodayIsMidnight=1") if $version_number >= 5.43;
-+      Date::Manip::Date_Init("TodayIsMidnight=1") if $version_number >= 5.43 and $version_number < 6;
-     }
-   }
- 
diff --git a/net-mail/grepmail/grepmail-5.30.33-r2.ebuild b/net-mail/grepmail/grepmail-5.30.33-r2.ebuild
deleted file mode 100644
index c02c6360e139..000000000000
--- a/net-mail/grepmail/grepmail-5.30.33-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator perl-module
-
-MY_P="${PN}-$(delete_version_separator 2)"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Search normal or compressed mailbox using a regular expression or dates"
-HOMEPAGE="https://github.com/coppit/grepmail"
-SRC_URI="mirror://sourceforge/grepmail/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/Inline
-	dev-perl/TimeDate
-	dev-perl/Date-Manip
-	virtual/perl-Digest-MD5
-	>=dev-perl/Mail-Mbox-MessageParser-1.40.01
-"
-DEPEND="${RDEPEND}
-"
-#	test? ( dev-perl/Mail-Mbox-MessageParser )
-
-# 100% failure on running
-DIST_TEST="skip"
-
-PATCHES=(
-	"${FILESDIR}"/5.30.33-fix_nonexistent_mailbox_test.patch
-	"${FILESDIR}"/5.30.33-midnight.patch
-)
-
-src_prepare() {
-	sed -i -e 's/use inc::Module::Install/use lib q[.]; use inc::Module::Install/' Makefile.PL ||
-		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
-	perl-module_src_prepare
-}
diff --git a/net-mail/mhonarc-gentoo/Manifest b/net-mail/mhonarc-gentoo/Manifest
index 3ef9b2ad26e0..1f1f7b6a4a3b 100644
--- a/net-mail/mhonarc-gentoo/Manifest
+++ b/net-mail/mhonarc-gentoo/Manifest
@@ -1,4 +1,4 @@
-AUX mhonarc-gentoo-2.6.18-archives-gentoo.patch 6534 BLAKE2B 32bb00808fd084445442c69c3689cb2d2efbb149e52a6a0f2375a89116eddc239c0d997ab2274e486ff475b0aea9cbbc94b0380c64afb07060dc25edd700b659 SHA512 f4c238e3394df9fccf1cefe697a2f5a53fdda5f02498ed5cd6d9adb301f49b257b8f01bf486a00ebd49b128d8707b8699a6e08cf3e3548709cbd29dca12e3d92
+AUX mhonarc-gentoo-2.6.18-archives-gentoo.patch 5666 BLAKE2B 97368c21d6e17a5791bc6e888df3105e437bd82594aa5780ac60c103de011d397fdeaf1f1c4b92cb36ba0dc3c15f175562f4f0400d65ea9ab92a26d3eded1dab SHA512 146680d6558d4b7139ceead0a6c7010af1a91010bccf7b802621cbc02753e516025e4d33b9c2c870b5317c1121b75282f4ed007d9919157450dad5168fc7a891
 DIST MHonArc-2.6.18.tar.bz2 1546854 BLAKE2B dd403ef742ee3cf2ce3d4490a489d88fb4ba8814456d0ecfae347c4dfd5fc5a61593b9def93edcafadae5e32e9afd5853ac0bf584b8f0060962d1b6b3fb1f04f SHA512 816acfd5c68db274848859ea60c8fb47a12daadea5d8dc8acd12018b72c8ff22133ef7e366edb005ef309f7a74f2b4dfdb7ad5fe9256eb850bebaeb165be5511
-EBUILD mhonarc-gentoo-2.6.18-r2.ebuild 752 BLAKE2B c2f88a28593eaa69d89fc310a972f30ed01725c0a4d694376767b00e29b389caaba2334c888b51891099630b1c429fb2ded4a19fd5954ed6873ceccc93c46872 SHA512 f5240bed8951ec02cfd0506ec14375c705770f450e7cbf8d8c8dc49460c2f1e87a21c2b29803eb87f9acaf0c23d57b4067ed081657911fb62e478157e0af78d7
+EBUILD mhonarc-gentoo-2.6.18-r3.ebuild 751 BLAKE2B a82c7bdde8fc9ad44f65b76f951cf065cd579e3d1177287b73acedd178715f46a7007768a6ce52b1ec9d69c7d924919856ea47c139797a3e4e74ce44ebe103b5 SHA512 635dcf4440d278a1f380652f8d3728774abc7ebc9b0fa95f57255a7b0d8afa255d5a50783fc6ea12fad16e0093f7b2b0c8a4c8a11b1ca155220aa9eec95f26aa
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-mail/mhonarc-gentoo/files/mhonarc-gentoo-2.6.18-archives-gentoo.patch b/net-mail/mhonarc-gentoo/files/mhonarc-gentoo-2.6.18-archives-gentoo.patch
index d67c63e4b95f..7f1f894882d5 100644
--- a/net-mail/mhonarc-gentoo/files/mhonarc-gentoo-2.6.18-archives-gentoo.patch
+++ b/net-mail/mhonarc-gentoo/files/mhonarc-gentoo-2.6.18-archives-gentoo.patch
@@ -1,6 +1,5 @@
-diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl
---- a/lib/mhamain.pl	2006-06-10 02:42:58.000000000 +0000
-+++ b/lib/mhamain.pl	2008-01-27 14:12:48.000000000 +0000
+--- a/lib/mhamain.pl
++++ b/lib/mhamain.pl
 @@ -73,6 +73,8 @@
      TERM TRAP USR1 USR2 VTALRM XCPU XFSZ
  );
@@ -10,7 +9,7 @@ diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl
  ###############################################################################
  ##	Public routines
  ###############################################################################
-@@ -934,6 +936,16 @@
+@@ -936,6 +938,16 @@
      } else {
  	$ctype = 'text/plain';
      }
@@ -26,8 +25,8 @@ diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl
 +    }
  
      ## Insure uniqueness of index
-     $index .= $X . sprintf('%d',(defined($msgnum)?$msgnum:($LastMsgNum+1)));
-@@ -955,6 +967,7 @@
+     my $t = $index;
+@@ -961,6 +973,7 @@
      $Subject{$index} = $sub;
      $MsgHead{$index} = htmlize_header($fields);
      $ContentType{$index} = $ctype;
@@ -35,7 +34,7 @@ diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl
      if ($msgid) {
  	$MsgId{$msgid} = $index;
  	$NewMsgId{$msgid} = $index;	# Track new message-ids
-@@ -966,6 +979,7 @@
+@@ -972,6 +985,7 @@
      } else {
  	$IndexNum{$index} = getNewMsgNum();
      }
@@ -43,7 +42,7 @@ diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl
  
      $Refs{$index} = [ @refs ]  if (@refs);
  
-@@ -1102,7 +1116,7 @@
+@@ -1121,7 +1135,7 @@
  
      my $adding	     = ($ADD && !$force && !$SINGLE);
      my $i_p0 	     = fmt_msgnum($msgnum);
@@ -52,7 +51,7 @@ diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl
      my $filepathname = join($DIRSEP, $OUTDIR, $filename);
      my $tmppathname;
  
-@@ -1160,7 +1174,9 @@
+@@ -1179,7 +1193,9 @@
  		"<!--X-Message-Id: ",
  		    commentize($Index2MsgId{$index}), " -->\n",
  		"<!--X-Content-Type: ",
@@ -63,7 +62,7 @@ diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl
  
  	    if (defined($Refs{$index})) {
  		foreach (@{$Refs{$index}}) {
-@@ -1456,8 +1472,9 @@
+@@ -1475,8 +1491,9 @@
      #&defineIndex2MsgId();
      my $msgnum = $IndexNum{$key};
      return (undef, undef)  if ($msgnum eq '');
@@ -74,9 +73,8 @@ diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl
      delete $ContentType{$key};
      delete $Date{$key};
      delete $From{$key};
-diff -Nuar a/lib/mhdb.pl b/lib/mhdb.pl
---- a/lib/mhdb.pl	2005-12-20 21:28:15.000000000 +0000
-+++ b/lib/mhdb.pl	2008-01-27 13:25:52.000000000 +0000
+--- a/lib/mhdb.pl
++++ b/lib/mhdb.pl
 @@ -61,6 +61,7 @@
  
  ## Meta-data
@@ -85,10 +83,9 @@ diff -Nuar a/lib/mhdb.pl b/lib/mhdb.pl
  print_var($db,'Date',        \%Date);
  print_var($db,'Derived',     \%Derived);
  print_var($db,'FollowOld',   \%Follow);
-diff -Nuar a/lib/mhinit.pl b/lib/mhinit.pl
---- a/lib/mhinit.pl	2005-07-08 06:34:03.000000000 +0000
-+++ b/lib/mhinit.pl	2008-01-27 13:25:52.000000000 +0000
-@@ -247,6 +247,7 @@
+--- a/lib/mhinit.pl
++++ b/lib/mhinit.pl
+@@ -248,6 +248,7 @@
  %Follow  	= ();	# Index key to follow-ups
  %FolCnt   	= ();	# Index key to number of follow-ups
  %ContentType	= ();	# Index key to base content-type of message
@@ -96,9 +93,8 @@ diff -Nuar a/lib/mhinit.pl b/lib/mhinit.pl
  %Icons    	= ();	# Index key to icon URL for content-type
  %AddIndex 	= ();	# Flags for messages that must be written
  
-diff -Nuar a/lib/mhmsgfile.pl b/lib/mhmsgfile.pl
---- a/lib/mhmsgfile.pl	2001-09-17 16:10:28.000000000 +0000
-+++ b/lib/mhmsgfile.pl	2008-01-27 14:12:16.000000000 +0000
+--- a/lib/mhmsgfile.pl
++++ b/lib/mhmsgfile.pl
 @@ -123,6 +123,10 @@
      if (defined($href->{'derived'})) {
  	$Derived{$index} = $href->{'derived'};
@@ -110,10 +106,9 @@ diff -Nuar a/lib/mhmsgfile.pl b/lib/mhmsgfile.pl
  
      $IndexNum{$index} = int($msgnum);
  
-diff -Nuar a/lib/mhopt.pl b/lib/mhopt.pl
---- a/lib/mhopt.pl	2005-07-08 06:34:03.000000000 +0000
-+++ b/lib/mhopt.pl	2008-01-27 13:25:52.000000000 +0000
-@@ -764,6 +764,7 @@
+--- a/lib/mhopt.pl
++++ b/lib/mhopt.pl
+@@ -798,6 +798,7 @@
      delete($MsgId{''});
      delete($FollowOld{''});
      delete($ContentType{''});
@@ -121,10 +116,9 @@ diff -Nuar a/lib/mhopt.pl b/lib/mhopt.pl
      delete($Refs{''});
  
      # update DOCURL if default old value
-diff -Nuar a/lib/mhrcvars.pl b/lib/mhrcvars.pl
---- a/lib/mhrcvars.pl	2005-07-08 05:27:52.000000000 +0000
-+++ b/lib/mhrcvars.pl	2008-01-27 14:11:19.000000000 +0000
-@@ -195,7 +195,7 @@
+--- a/lib/mhrcvars.pl
++++ b/lib/mhrcvars.pl
+@@ -225,7 +225,7 @@
  	}
      	if ($var eq 'MSG') {		## Filename of message page
  	    ($lref, $key, $pos) = compute_msg_pos($index, $var, $arg);
@@ -133,7 +127,7 @@ diff -Nuar a/lib/mhrcvars.pl b/lib/mhrcvars.pl
  	    last REPLACESW;
  	}
  	if ($var eq 'MSGHFIELD') {	## Message header field
-@@ -417,7 +417,7 @@
+@@ -447,7 +447,7 @@
  	    if (!defined($key)) { $tmp = ""; last REPLACESW; }
  	    $tmp = qq/name="/ . &fmt_msgnum($IndexNum{$key}) .
  		   qq/" href="/ .
@@ -142,7 +136,7 @@ diff -Nuar a/lib/mhrcvars.pl b/lib/mhrcvars.pl
  		   qq/"/;
  	    last REPLACESW;
  	}
-@@ -432,7 +432,7 @@
+@@ -462,7 +462,7 @@
  	    $isurl = 0;
  	    ($lref, $key, $pos) = compute_msg_pos($index, $var, $arg);
  	    if (!defined($key)) { $tmp = ""; last REPLACESW; }
@@ -151,7 +145,7 @@ diff -Nuar a/lib/mhrcvars.pl b/lib/mhrcvars.pl
  	    last REPLACESW;
  	}
      	if ($var eq 'IDXFNAME') {	## Filename of index page
-@@ -730,7 +730,7 @@
+@@ -760,7 +760,7 @@
      $ret = qq|<a name="| .
  	   &fmt_msgnum($IndexNum{$index}) .
  	   qq|" href="| .
@@ -160,9 +154,8 @@ diff -Nuar a/lib/mhrcvars.pl b/lib/mhrcvars.pl
  	   qq|">$ret</a>|
  	if $var eq 'SUBJECT' && $arg eq "" && !$mailto;
  
-diff -Nuar a/lib/mhutil.pl b/lib/mhutil.pl
---- a/lib/mhutil.pl	2005-07-08 05:27:53.000000000 +0000
-+++ b/lib/mhutil.pl	2008-01-27 14:11:50.000000000 +0000
+--- a/lib/mhutil.pl
++++ b/lib/mhutil.pl
 @@ -28,6 +28,7 @@
  package mhonarc;
  
@@ -171,7 +164,7 @@ diff -Nuar a/lib/mhutil.pl b/lib/mhutil.pl
  
  ## RFC 2369 header fields to check for URLs
  %HFieldsList = (
-@@ -304,16 +305,20 @@
+@@ -313,16 +314,20 @@
  ##	Routine to get filename of a message number.
  ##
  sub msgnum_filename {
diff --git a/net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18-r2.ebuild b/net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18-r3.ebuild
index 333911aff1b2..544922d5947e 100644
--- a/net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18-r2.ebuild
+++ b/net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18-r3.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit perl-module
 
+MY_P="${P/mhonarc-gentoo/MHonArc}"
+
 DESCRIPTION="Perl Mail-to-HTML Converter, Gentoo fork"
 HOMEPAGE="https://www.mhonarc.org/"
-LICENSE="GPL-2"
 SRC_URI="https://www.mhonarc.org/release/MHonArc/tar/MHonArc-${PV}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="!net-mail/mhonarc"
 
-MY_P="${P/mhonarc-gentoo/MHonArc}"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${P}-archives-gentoo.patch" )
+PATCHES=( "${FILESDIR}"/${P}-archives-gentoo.patch )
 
 src_install() {
-	sed -e "s|-prefix |-docpath '${D}/usr/share/doc/${PF}' -prefix '${D}'|g" -i Makefile || die "sed on Makefile failed"
+	sed -e "s|-prefix |-docpath '${ED}/usr/share/doc/${PF}' -prefix '${ED}'|g" -i Makefile || die "sed on Makefile failed"
 	sed -e "s|installsitelib|installvendorlib|g" -i install.me || die "sed on install.me failed"
 
 	perl-module_src_install
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 08fe22939479..86987d61673c 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,12 +1,6 @@
 AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f48576508d47718afb1b08b4f83ce87f257e68756690f4ac70ed9770b7064f2613dc3c4077bbcf9b826512644d0 SHA512 ae50746ba93e3ac81a11d3c8746b72182fcdadc3e29966d65233debd8e6b8aa56f76f5e6a70fc68f7761e4dd55045d2b32e3765cedcced4813de3682187beeea
-AUX mu-1.7.12-gcc12.patch 279 BLAKE2B 6b193a92ffbb3d126d39b45c09c4ccc971fe362af9e2621fc6e21e5e697d376f3a21c8e7f3521340d169ba572f9ad857bcd2ef69917650a5e5be0c99fef3aa31 SHA512 59887f801811bc86de2a562ab93304887725421baf7cf878c33bd5bc3b12eca68db951008899b18050c9b597580bc98f676881e58aafdda4af49d20e2fc64d45
-AUX mu-1.7.12-optional-mu4e.patch 1047 BLAKE2B a951fe687e59dc6cfd4266c3c3f18aa6a80e562f3bcd617526fc14c8c076768cff444d683a016100e829d6ee80c11d4701db62bcec3a13e28b40ef9b0d1505fe SHA512 3f79f0c8591170231ca800e6fd4476fa1475aea18ec5b1f6c035c88f6b947755527cfa6674a0b221cbae7808e4841b03aed8bbf56b71f2b68d84fe9c2562c363
 DIST mu-1.6.10.tar.xz 867008 BLAKE2B 6cce22f18691c3ad6dda1ec012d72c398df2ba4d1beca70fc6f88d87aa9b749e2aa4c03f5c0e0d70f4f9978e2beb60ea02642b8ff71e86e0668df726e5923b52 SHA512 a51847b338afeff9c9fa88c4698df4b85289d017063cb5e3410eb967c605d8779618dcbd988e2d923a92291c1e0738ec84afecf017c76a63776149619d134887
-DIST mu-1.6.11.tar.xz 870188 BLAKE2B ec2ab4312800e8357b4fc902251708e27968cdde389e2403fca9ad6b1ef5e00154aa018d5a7751ec5372b5ca2be2eb030a9148c0d53f35040f420877d51ca3f3 SHA512 78faa4f9b34827676203ab305797deb96c0c0f9b0e8158e627c9a992bccd9c5708d4a1f5cc93c0b9c7f9a224b047800bd389bf3fceb163aa139ecff0cfa19274
-DIST mu-1.7.23.tar.xz 2136016 BLAKE2B 9b0a27fc07072e52c06d8d4b807a77491d314d4c531799a83b1281ce935b79f5eab3510dc94be98ee0effe86c69379331172cfea3db330b8302d03582f7bf364 SHA512 412789146e4962f670c356576906e5eabc5783dd0fc7d04440146f064877f53b4e948713ed557e97b114a96d7a41b3087a8e3c528b48bb363e68fd0eabfe42fc
-DIST mu-1.8.1.tar.xz 537892 BLAKE2B dda0cdd3a45572000861557b04d8c92c0d61c283c6ace69a034ce209d22dc7e26ea4ac77c6493c505e0c7bcbf47ace82cd82ab20295170b2a986fcccaa0c5df9 SHA512 01b4c349aecf4134c700b6e4b1bc58d1e1360a74feec3f3ee56d1f350c7640b7447bdc35f158ce892427b7b7fbe15cfb00ab28d5aa05b9eaba1d4b4f32e5ed26
+DIST mu-1.8.5.tar.xz 539368 BLAKE2B 6efc12f82aab2beee86475ee49492ce59cb70e8b4fa63f2099a6071ec3275e7f0f308a868133ab3be4646d2280f720a4f6bb5673563a4437d2135e149b1cdfac SHA512 f43afb9484937077f32a38f347352b1ec8fb74c85be74f3afdd53ff75b965f42ab88daa58433fd9292a10c69ed2f2daf3ddbaf3d8d5d5595b0b29b81629a846f
 EBUILD mu-1.6.10.ebuild 1586 BLAKE2B d14b3421814913a85460439407fb4fc90b9537df3132520c64697a20b5b3f35fc8c658395a36d4fabf514da9964333969c4e86d1092866cc6d033732d836a168 SHA512 465f3afbb8e522ce51404d6f0de08984b680498fe322484bec0f9dd2a5740fc4405ea69a78d081d9e07fcc26520c50e3349706d830c8cc2fb5dd4539f719c15a
-EBUILD mu-1.6.11.ebuild 1590 BLAKE2B ab43c3330249f7fb9175dcb4f4e47a679efac9491ff184fed07e50e107e0eb73a1e95d269eec56b32fb13ab753ebc0daf884a6a812bc93af1afad204fec19a58 SHA512 1b3f0ba75c9baf1761cb853a2c2142137bceed8b106914b19b9598e0bc7c4644b5f8a5000be793d9f6eb3c4818dc9a777169e77b7e1b6dbfc48b48b3619ba01e
-EBUILD mu-1.7.23.ebuild 2073 BLAKE2B 5f0eae7568d09af9d62a8475c056a0f74b96517372a46cdf81538f1a43bffdfc75fc813cb086cc6f876a2b099e9bdef247e47e54ea9b0868c926e92e3a8497ab SHA512 56cf8c574b242910c1d787bae63ed04bfdf03298f27852baa373b599b087da8816035b55507f29665192f5fc7cb8c8a43cedd6dbcd2f68c9baff6f5522bd5af1
-EBUILD mu-1.8.1.ebuild 2043 BLAKE2B 2122817aade6a310834d42c3f2720424a1506c13497f063794a95b5cd1eca05a0601fb16db335698523e4620bf7d7a2393560cf6fd577210b6646e7a7e32d63b SHA512 a3130bbcafaa38c64168ec87ef82fd23bfb5a2dc83b9b2e8e1de8d3a6ae90aa732fe6d58cfcdc840e0ad634544ea3b2bde6a9148c3ccfa5b0a30b3387134be40
+EBUILD mu-1.8.5.ebuild 2103 BLAKE2B 3def0840baba20487d6256076c9327c2762cca569af1e1c48589ee7308569f20e88aa32245b449eca9416dc4f819937f1720a0c569799d7ae29cbc7b595eb07a SHA512 f24cb94e4c8d62559a5ef824472d2684ff7b8a5239c9112c8bace36a4df6c0c38089a707bf9138928b874ef445165efd5e18bca644659fb140f1a90abb548459
 MISC metadata.xml 893 BLAKE2B 4d21c0794fc184957939ebaab628b9a1abe0bbdb63915157e266ce0a773fe3acc52722d010d3b4e096f86257e945c0f9dd51cd0dbe54c37f717408ffe942bc06 SHA512 7f499e039820d12c9acd0affe2a402fc53ee6367684a3c2ba25669987f02b0fabb3db0de978e197876bd9e3af315734af398ba7c8305119c511d59c709b6e225
diff --git a/net-mail/mu/files/mu-1.7.12-gcc12.patch b/net-mail/mu/files/mu-1.7.12-gcc12.patch
deleted file mode 100644
index f360351e17f4..000000000000
--- a/net-mail/mu/files/mu-1.7.12-gcc12.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://github.com/djcb/mu/pull/2224 (rebased)
-https://bugs.gentoo.org/839918
---- a/lib/utils/mu-utils.cc
-+++ b/lib/utils/mu-utils.cc
-@@ -32,6 +32,7 @@
- #include <string.h>
- #include <iostream>
- #include <algorithm>
-+#include <functional>
- #include <numeric>
-
- #include <glib.h>
diff --git a/net-mail/mu/files/mu-1.7.12-optional-mu4e.patch b/net-mail/mu/files/mu-1.7.12-optional-mu4e.patch
deleted file mode 100644
index 0f14bf3249e2..000000000000
--- a/net-mail/mu/files/mu-1.7.12-optional-mu4e.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 41e262b51968359074faac21fa80d2f1237c57cf Mon Sep 17 00:00:00 2001
-From: Matthew Smith <matthew@gentoo.org>
-Date: Sat, 2 Apr 2022 10:06:21 +0100
-Subject: [PATCH] build: add emacs option
-
-Without this option, mu4e will always be installed when Emacs is
-installed.
----
- meson.build       | 2 +-
- meson_options.txt | 5 +++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 58ac9002..5f71d766 100644
---- a/meson.build
-+++ b/meson.build
-@@ -174,7 +174,7 @@ subdir('lib')
- subdir('mu')
- subdir('man')
- 
--if emacs.found()
-+if get_option('emacs').enabled() and emacs.found()
-    subdir('mu4e')
- endif
- 
-diff --git a/meson_options.txt b/meson_options.txt
-index 0c70826e..34cb0c02 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -29,3 +29,8 @@ option('readline',
-        type: 'feature',
-        value: 'auto',
-        description: 'enable readline support for the mu4e repl')
-+
-+option('emacs',
-+       type : 'feature',
-+       value: 'disabled',
-+       description: 'build mu4e')
--- 
-2.35.1
-
diff --git a/net-mail/mu/mu-1.6.11.ebuild b/net-mail/mu/mu-1.6.11.ebuild
deleted file mode 100644
index 311a0e76b0b5..000000000000
--- a/net-mail/mu/mu-1.6.11.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
-SRC_URI="https://github.com/djcb/mu/releases/download/${PV}/mu-${PV}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
-IUSE="emacs guile readline"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/gmime:3.0
-	>=dev-libs/xapian-1.4:=
-	emacs? ( >=app-editors/emacs-25.3:* )
-	guile? ( >=dev-scheme/guile-2.2:* )
-	readline? ( sys-libs/readline:= )"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-SITEFILE="70mu-gentoo-autoload.el"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable emacs mu4e)
-		$(use_enable guile)
-		$(use_enable readline)
-		--disable-gtk
-		--disable-webkit
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# On some systems make -n errors out so the default src_test
-	# implementation does not call the tests.  Bug #836782
-	emake test
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -type f -delete || die
-}
-
-pkg_preinst() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog "After upgrading from an old major version, you should"
-		elog "rebuild your mail index."
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		einfo "To use mu4e you need to configure it in your .emacs file"
-		einfo "See the manual for more information:"
-		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
-
-		elisp-site-regen
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/mu/mu-1.7.23.ebuild b/net-mail/mu/mu-1.7.23.ebuild
deleted file mode 100644
index 39d5cb8ad147..000000000000
--- a/net-mail/mu/mu-1.7.23.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common meson
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
-SRC_URI="https://dev.gentoo.org/~matthew/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
-IUSE="emacs readline"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/gmime:3.0
-	>=dev-libs/xapian-1.4:=
-	emacs? ( >=app-editors/emacs-25.3:* )
-	readline? ( sys-libs/readline:= )"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	sys-apps/texinfo
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.12-optional-mu4e.patch
-	"${FILESDIR}"/${PN}-1.7.12-gcc12.patch
-)
-
-SITEFILE="70mu-gentoo-autoload.el"
-
-src_prepare() {
-	default
-
-	# Don't install NEWS.org into /usr/share/doc.
-	sed -i '/NEWS.org/,+1 d' meson.build || die
-	sed -i '/mu4e-about.org/d' mu4e/meson.build || die
-
-	# Instead, put it in /usr/share/doc/${PF}.
-	sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature emacs)
-		$(meson_feature readline)
-		# NOTE: Guile interface is deprecated to be removed shortly.
-		-Dguile=disabled
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Since meson no longer installs NEWS.org, install it with dodoc.
-	# Also, it must be uncompressed so that it can be viewed with
-	# mu4e-info.
-	docompress -x /usr/share/doc/${PF}/NEWS.org
-	dodoc NEWS.org
-
-	# Same as above.
-	docompress -x /usr/share/doc/${PF}/mu4e-about.org
-	dodoc mu4e/mu4e-about.org
-}
-
-pkg_preinst() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog "After upgrading from an old major version, you should"
-		elog "rebuild your mail index."
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		einfo "To use mu4e you need to configure it in your .emacs file"
-		einfo "See the manual for more information:"
-		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
-
-		elisp-site-regen
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/mu/mu-1.8.1.ebuild b/net-mail/mu/mu-1.8.5.ebuild
index ef60bb7e559f..af673005c01c 100644
--- a/net-mail/mu/mu-1.8.1.ebuild
+++ b/net-mail/mu/mu-1.8.5.ebuild
@@ -26,10 +26,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.12-optional-mu4e.patch
-)
-
 SITEFILE="70mu-gentoo-autoload.el"
 
 src_prepare() {
@@ -39,14 +35,17 @@ src_prepare() {
 	sed -i '/NEWS.org/,+1 d' meson.build || die
 	sed -i '/mu4e-about.org/d' mu4e/meson.build || die
 
+	# Don't compress the info file.
+	sed -i '/gzip/d' build-aux/meson-install-info.sh || die
+
 	# Instead, put it in /usr/share/doc/${PF}.
 	sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die
 }
 
 src_configure() {
 	local emesonargs=(
-		$(meson_feature emacs)
 		$(meson_feature readline)
+		-Demacs="$(usex emacs "${EMACS}" emacs-not-enabled)"
 		# NOTE: Guile interface is deprecated to be removed shortly.
 		-Dguile=disabled
 	)
diff --git a/net-mail/public-inbox/Manifest b/net-mail/public-inbox/Manifest
index 9258707a76dc..4b1ced580611 100644
--- a/net-mail/public-inbox/Manifest
+++ b/net-mail/public-inbox/Manifest
@@ -1,3 +1,5 @@
 DIST public-inbox-1.7.0.tar.gz 805628 BLAKE2B 4403cd11a2c4f793b136aff07ccc06ea60011c21484196e497921ca36599870eecdf7b93f550ef44e876bca814a3b03e1d8d4b484113506ee809098124cfd1b2 SHA512 cb03d2ec3e28f1fc75bdbff2b8ea5b417898ddb2895d27b105624cab35f0dcab99269d86bfc158bdf42faecb7b7a5734363a81d2202970e8d079bf05fa359250
+DIST public-inbox-1.8.0.tar.gz 808979 BLAKE2B 1b68121429f9d9b56008951c0fef8eca4082a71969c907d0e2ba1db434774a451e4080e88c7d0fe80960dba906e0981e19bfcacd63042acfe3c6e16f36aba675 SHA512 878c60d6e6bfdcac3218d71b8aa5cab766c622ff1a81c8ebb04399a48da7ef1ab86cae67f8f05e8486f92451f90b9c068ab67ba35dfb74179163598fb5860229
 EBUILD public-inbox-1.7.0.ebuild 823 BLAKE2B 3d98c16723c2c50e3fd795455db11893fe594254d7cc832adc139d76d76b19b0e055ae2b260936b6512bf1c8f1548b818b26cc3f5649a2e1bc08ae4fa94713f1 SHA512 16535edc771c53ed10b90cb6aa4f400c8ae38f7d4080bdfb5a6600d9b90ec2016cffe5af64f6d36b8ffe28d6913c4d19105ddad0a7bc7953fad76e944d324988
+EBUILD public-inbox-1.8.0.ebuild 823 BLAKE2B 3d98c16723c2c50e3fd795455db11893fe594254d7cc832adc139d76d76b19b0e055ae2b260936b6512bf1c8f1548b818b26cc3f5649a2e1bc08ae4fa94713f1 SHA512 16535edc771c53ed10b90cb6aa4f400c8ae38f7d4080bdfb5a6600d9b90ec2016cffe5af64f6d36b8ffe28d6913c4d19105ddad0a7bc7953fad76e944d324988
 MISC metadata.xml 378 BLAKE2B 569717fcbe03797e4b5dd1fa859bddbb5947d1f4e51687c05ec955d23d85ba3c1b2cac0eaaa5221800e7db719c5106b1e2f3e9ba3e9594eff649ff2642b154bb SHA512 d5c104ddf9fbd660f6e57e6fb2543c0b5a166f6fc32a7f719a749641ba1a154781ee3745759ad649cba02815607b238b8a85f68580a3830d6d59f143f1dcce0c
diff --git a/net-mail/public-inbox/public-inbox-1.8.0.ebuild b/net-mail/public-inbox/public-inbox-1.8.0.ebuild
new file mode 100644
index 000000000000..6d7bfd810fcf
--- /dev/null
+++ b/net-mail/public-inbox/public-inbox-1.8.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit perl-module
+
+HOMEPAGE="https://public-inbox.org"
+SRC_URI="https://public-inbox.org/public-inbox.git/snapshot/${P}.tar.gz"
+DESCRIPTION="An archives-first approach to mailing lists"
+LICENSE="AGPL-3+"
+
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+# in order of mention in INSTALL.html, going more for feature completeness
+# than for minimal footprint
+RDEPEND="
+	dev-vcs/git
+	dev-perl/DBD-SQLite
+	virtual/mta
+	dev-perl/URI
+	dev-perl/Plack
+	dev-perl/TimeDate
+	dev-perl/Inline-C
+	dev-perl/Email-Address-XS
+	dev-perl/Search-Xapian
+	dev-perl/Parse-RecDescent
+	dev-perl/Mail-IMAPClient
+	dev-perl/BSD-Resource
+	net-misc/curl
+	dev-perl/Linux-Inotify2
+	dev-perl/Net-Server
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/net-mail/queue-repair/Manifest b/net-mail/queue-repair/Manifest
index e3193e3f16c4..ae9c99b0f568 100644
--- a/net-mail/queue-repair/Manifest
+++ b/net-mail/queue-repair/Manifest
@@ -1,3 +1,3 @@
 DIST queue-repair-0.9.0.tar.gz 13913 BLAKE2B 04935bdb8473bad4d785732eabe2df7bd19d8e7b7364e1be516a8f94c6aee15c6f14bd171be8585f087ba0281281285f0695bb79a90a02519aa252a5884bfd7d SHA512 b7c21de207c80c3f764eddae6e60b4d54869f2037f572f98ff4e0a1e34f55ae1feeab5162b4f0f902a5a3c9d631c687057cdfdc4f646d6843d845f31f5b7bf6f
-EBUILD queue-repair-0.9.0-r2.ebuild 824 BLAKE2B 224c1dbdf6bd93f364e573259c3105c33927e379e40f4b2f76efa0c053a14f7abb5a3dd165e0f8535d970995b9ad366e1c819be034c9ba6b23bf941c98c2e3f9 SHA512 7e94dabc52ffd97a9dbb0eef7cd3460605bbe99ae04a45b190d2e6f909833faab9cf0b62012f4a1deb86403e3b4f5b02a9d9719e4f25117eac6585b772935a72
+EBUILD queue-repair-0.9.0-r2.ebuild 825 BLAKE2B 424e5fe6e15b00dcd3c42718f216996286360683a9305c2a820c7d59272a8b402bc51dba2d9ba56171db94e50843888e61f3500c60eef429775aae076543cdfa SHA512 71e7734b489cfe88172c03e157e8cd5a175a0a06ab4829755b9eebe917bf20353398d26dc680b0da59775177fd408d453b8731fe9b73bd544bbe6d26ea33efa5
 MISC metadata.xml 491 BLAKE2B 300d847c603b0e10d5ef42d4025ec329e3361af3f0bed904f8d5a5c561c44080b7605ef1666cec91a8bce97b0a9302e47a0f87c0bdad2390e2bec9568b08cd64 SHA512 e8ca4ed701628fd1b352e04f6b42432f8a85177603c46625b0b818d7ce378817ee096bb07f0a580420909d95ba7f87e6e383a24738f32346388139bb63cb035b
diff --git a/net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild b/net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild
index dcad85db8ec6..523f7eff7e31 100644
--- a/net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild
+++ b/net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit python-single-r1