6 files changed, 743 insertions, 27 deletions
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index f92968a04307..0fb0b5844bbd 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 6627b2763333..8112aff76a87 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -8,6 +8,7 @@ AUX exim-4.93-as-needed-ldflags.patch 6013 BLAKE2B 2de473f089a36cabd5481020524dc
 AUX exim-4.94-localscan_dlopen.patch 9595 BLAKE2B c48eaaf486585890dc4028beaca7a39d5b1d965323468c4c317d099ccf0e2e983e9366cb923e0b34546a66ac718ee15e8f682a65cdcd771de8164f76b86c0aa2 SHA512 bd7872473ad1ab9eca41757ca6ee7dd8628bddfa145191aea6a5ac4b62b0e4e3539803cf75fcb22b8bfdcca33a7d2f71ff58ca1862f456960e6b7e4d262ba6ef
 AUX exim-4.94-maildir.patch 316 BLAKE2B fe0b27712e77eba83244434c33372cec47fa317026d159de7a0ac37f2563999a6470df2dc203c1fcda8e7074c949133a0311c2b94c4b48bbc46d64c7c486202c SHA512 13863226883f79dcc781fe8eb3b50ad3c5511af130cf6e41ce40e8543d46832668bd7d746a2cc67842748cdf26144bef4aece49397d3168819215eac93ca1e6e
 AUX exim-4.94-opendmarc-1.4.patch 506 BLAKE2B d8ba66e1165dffb9ba367b997d69090fa8b31aa6ce3cb17d6ade4bd3b3dabf2a2d93223106eeb7f39754397eb17979e66d52de8dc2d524de9019c9598cd89af6 SHA512 6145f07c0b5b4234160fd3480329759a06500b658643523f32bcfa9158258a9b708095725f2e56d5538567f888c5e0e954c4ac51c8f2d16921dc4950241cd2fc
+AUX exim-4.94.2-fix-crash-resolve.patch 809 BLAKE2B cd9d3d923510315f75a3bad8c56b89b59782f9af8523a794845b1163c0bac5682f311a86eda1b8e78396d77c159629ef5186416626ebe627d723e17e3b388afc SHA512 a00960409e835dd067c88b4cb34953bc9343417ddfd448f5042b1597bc127f95937a5d8786d6f3ae347654842344d61ec268c7ed37e0f05c79ef7c530f741a7b
 AUX exim-submission.socket 161 BLAKE2B 409a5a687897af369a6a2ff0c30564096cc6b308dbc5d0afb6742df44d2aa972e45bad9681d2cb72be9731b260d23fdadb80bae644e7b875af5e34e9c8b8b40f SHA512 4a233761793e3510e9efa5aad3a6098c41b757f13133a7ea825680f2b393aba8d7935f16bf1dd065dde884fe7ba45639a8d398333a7d9bf0a6b72f88c8f2a09d
 AUX exim-submission_at.service 360 BLAKE2B 9ebcac1ab0f01a8264141843a4e711d77f634bdd910406bd466a0c197fdad8a9ff4bc31b9b28ef73c810aaff3e549eb60c0a2546507910dfc800da154eb1da00 SHA512 dc28698f15e8eaa4614ae81fc8cb76d92fed1110ce02f7a6ee8feace418dbb194711eb2d4dd444cf818628c11721e21d80b7b974879ab6ddd78cc717cce17c2f
 AUX exim.confd 141 BLAKE2B bc200e6121544d17e7feb0e162b5f6a5157647c3323492218da1556a19f3a2febf89a698e157a6dc657540d2f46088a9b1e34700655c715fbeaf0c201bc4aa9f SHA512 cb5e4aa71d3f0b7945e9806064f6a3ab64cb894381654ead40c73a49ae2d1bbb3dc587919952a09b2c81b9fcf8784f73d59c12081cda96a5b7210442f5088998
@@ -21,4 +22,5 @@ DIST exim-pdf-4.94.2.tar.xz 2092248 BLAKE2B 973ab4f117fdb58afa017bc41b4496fac127
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
 EBUILD exim-4.94.2-r4.ebuild 14997 BLAKE2B 3310c70b714502a63fdd9661bfd41964502ad797d24a772923aee706bedce01914506671de09dc892b49efeaa1273125932215ab474fef09ba7eaba5fdbc1117 SHA512 8de6e22d61f302056032a9b9069429086e157898d26fceea59a3384f0f2d204a5719fd8e6ffa36e2e9b60231683d42d40fb2497164d990b5e2adac68d8e4b038
 EBUILD exim-4.94.2-r5.ebuild 16187 BLAKE2B 7c94a9819769508a34d432020c781a127ff5967abf58d9ee6308461148583066b11a6beba4835d0297f6d96a896639e6fbe0edb0ff98ff6b4da1f326b589a824 SHA512 d6f39e1f2725f315bbe2885e6cb16c0058adb82beeb941439e6f63e2b13a3c5ebeedcdc7071bb058cb084c88caf69579a2a68ce725bd6b1a21a9ecb0a373e641
+EBUILD exim-4.94.2-r6.ebuild 16264 BLAKE2B 8741216d5b88321cfce21823f40bed7d5dc4018548ab6f65a0df24ed19333d6647094c8bd61b55863860e3a9d570cfbe2c6fd6cc279723dc4325cc18541e5e9d SHA512 df1ca34e2a2eab3e6b139037463d1303da0d4890e4f684901b3763718d66ad71b68278f5d5ae55a8644a6e8b01b7b947d2b729d32c662edcebf1df08cef9fba9
 MISC metadata.xml 2758 BLAKE2B d45d9ddafe5943e5a9aab7deb3814cf33090ee8b48347ffc188cb2ec6aadb30897f4d10cb0ab5040808f818a5b0dd98252455b49aa6492449b5b55ea3dc0974d SHA512 d2800e4c35f24adfbd04982d390a056d0c9f48d21cd2ecd544fc8163f3d1c16be1f02f19652ba071b22fbaad50fe96d13757ba8320cf945dc8e28dd1cd716d17
diff --git a/mail-mta/exim/exim-4.94.2-r6.ebuild b/mail-mta/exim/exim-4.94.2-r6.ebuild
new file mode 100644
index 000000000000..fd36c6e44c73
--- /dev/null
+++ b/mail-mta/exim/exim-4.94.2-r6.ebuild
@@ -0,0 +1,665 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit db-use toolchain-funcs multilib pam systemd
+
+IUSE="arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl
+dsn elibc_glibc exiscan-acl gdbm gnutls idn ipv6 ldap lmtp maildir mbx
+mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux
+socks5 spf sqlite srs +srs-alt srs-native +ssl syslog tdb tcpd +tpda X"
+REQUIRED_USE="
+	arc? ( dkim spf )
+	dane? ( ssl !gnutls )
+	dmarc? ( dkim spf )
+	dkim? ( ssl !gnutls )
+	gnutls? ( ssl )
+	pkcs11? ( ssl )
+	spf? ( exiscan-acl )
+	srs? (
+		exiscan-acl
+		^^ ( srs-alt srs-native )
+	)
+	|| ( berkdb gdbm tdb )
+"
+# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
+# for x86 and amd64 only, due to this, repoman won't allow depending on
+# gnutls[dane] for all else.  Because we cannot express USE=dane when
+# USE=gnutls is in effect only in package.use.mask, the only option we
+# have left is to a) ignore the dependency (but that results in bug
+# #661164) or b) mask the usage of USE=dane with USE=gnutls.  Both are
+# incorrect, but b) is the only "correct" view from repoman.
+# We cannot express a required use for berkdb/gdbm/tdb correctly because
+# berkdb and gdbm are both enabled in base profile
+
+SDIR=$([[ ${PV} == *_rc* ]]   && echo /test
+	 [[ ${PV} == *.*.*.* ]] && echo /fixes)
+COMM_URI="https://downloads.exim.org/exim4${SDIR}"
+
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="${COMM_URI}/${P//_rc/-RC}.tar.xz
+	mirror://gentoo/system_filter.exim.gz
+	doc? ( ${COMM_URI}/${PN}-pdf-${PV//_rc/-RC}.tar.xz )"
+HOMEPAGE="https://www.exim.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
+
+COMMON_DEPEND=">=sys-apps/sed-4.0.5
+	dev-libs/libpcre:=
+	tdb? ( sys-libs/tdb:= )
+	!tdb? ( berkdb? ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) )
+	!tdb? ( !berkdb? ( sys-libs/gdbm:= ) )
+	idn? ( net-dns/libidn:= net-dns/libidn2:= )
+	perl? ( dev-lang/perl:= )
+	pam? ( sys-libs/pam )
+	tcpd? ( sys-apps/tcp-wrappers )
+	ssl? (
+		gnutls? (
+			net-libs/gnutls:0=[pkcs11?]
+			dev-libs/libtasn1
+		)
+		!gnutls? (
+			dev-libs/openssl:0=
+		)
+	)
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	elibc_glibc? (
+		net-libs/libnsl
+		nis? (
+			net-libs/libtirpc
+			>=net-libs/libnsl-1:=
+		)
+	)
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
+	redis? ( dev-libs/hiredis )
+	spf? ( >=mail-filter/libspf2-1.2.5-r1 )
+	dmarc? ( mail-filter/opendmarc:= )
+	srs? ( srs-alt? ( mail-filter/libsrs_alt ) )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-libs/libXaw
+	)
+	sqlite? ( dev-db/sqlite )
+	radius? ( net-dialup/freeradius-client )
+	virtual/libcrypt:=
+	virtual/libiconv
+	"
+	# added X check for #57206
+BDEPEND="virtual/pkgconfig"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/mini-qmail
+	!<mail-mta/msmtp-1.4.19-r1
+	!>=mail-mta/msmtp-1.4.19-r1[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	!net-mail/mailwrapper
+	>=net-mail/mailbase-0.00-r5
+	virtual/logger
+	dcc? ( mail-filter/dcc )
+	selinux? ( sec-policy/selinux-exim )
+	"
+
+S=${WORKDIR}/${P//_rc/-RC}
+
+src_prepare() {
+	# Legacy patches which need a respin for -p1
+	eapply -p0 "${FILESDIR}"/exim-4.14-tail.patch
+	eapply -p0 "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
+	eapply     "${FILESDIR}"/exim-4.93-as-needed-ldflags.patch # 352265, 391279
+	eapply -p0 "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
+	eapply     "${FILESDIR}"/exim-4.69-r1.27021.patch
+	eapply     "${FILESDIR}"/exim-4.94-localscan_dlopen.patch
+	eapply     "${FILESDIR}"/exim-4.94.2-fix-crash-resolve.patch # 799368 upstr
+
+	# for this reason we have a := dep on opendmarc, they changed their
+	# API in a minor release
+	if use dmarc && has_version ">=mail-filter/opendmarc-1.4" ; then
+		eapply "${FILESDIR}"/exim-4.94-opendmarc-1.4.patch
+	fi
+
+	if use maildir ; then
+		eapply "${FILESDIR}"/exim-4.94-maildir.patch
+	else
+		eapply -p0 "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606
+	fi
+
+	eapply_user
+
+	# user Exim believes it should be
+	MAILUSER=mail
+	MAILGROUP=mail
+	if use prefix && [[ ${EUID} != 0 ]] ; then
+		MAILUSER=$(id -un)
+		MAILGROUP=$(id -gn)
+	fi
+}
+
+src_configure() {
+	# general config and paths
+
+	local aliases="${EPREFIX}/etc/mail/aliases"
+	sed -i \
+		-e "/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${aliases}'" \
+		src/configure.default || die
+
+	sed -i -e 's/^buildname=.*/buildname=exim-gentoo/' Makefile || die
+
+	if use elibc_musl; then
+		sed -i -e 's/^LIBS = -lnsl/LIBS =/g' OS/Makefile-Linux || die
+	fi
+
+	local conffile="${EPREFIX}/etc/exim/exim.conf"
+	sed -e "48i\CFLAGS=${CFLAGS}" \
+		-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
+		-e "s;EXIM_USER=;EXIM_USER=ref:${MAILUSER};" \
+		-e "s:CONFIGURE_FILE=.*$:CONFIGURE_FILE=${conffile}:" \
+		-e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
+		-e "s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
+		src/EDITME > Local/Makefile || die
+
+	# work on Local/Makefile from now on
+	cd Local
+
+	cat >> Makefile <<- EOC
+		INFO_DIRECTORY=${EPREFIX}/usr/share/info
+		PID_FILE_PATH=${EPREFIX}/run/exim.pid
+		SPOOL_DIRECTORY=${EPREFIX}/var/spool/exim
+		HAVE_ICONV=yes
+	EOC
+
+	# configure db implementation, Exim always needs one for its hints
+	# database, we prefer tdb and gdbm, since bdb is kind of getting
+	# less and less support
+	if use tdb ; then
+		cat >> Makefile <<- EOC
+			USE_TDB=yes
+			DBMLIB = -ltdb
+		EOC
+		sed -i -e 's:^USE_DB=yes:# USE_DB=yes:' Makefile || die
+		sed -i -e 's:^USE_GDBM=yes:# USE_GDBM=yes:' Makefile || die
+	elif use berkdb ; then
+		# use the "native" interfaces to the DBM and CDB libraries, support
+		# passwd and directory lookups by default
+		local DB_VERS="5.3 5.1 4.8 4.7 4.6 4.5 4.4 4.3 4.2 3.2"
+		cat >> Makefile <<- EOC
+			USE_DB=yes
+			# keep include in CFLAGS because exim.h -> dbstuff.h -> db.h
+			CFLAGS += -I$(db_includedir ${DB_VERS})
+			DBMLIB = -l$(db_libname ${DB_VERS})
+		EOC
+		sed -i -e 's:^USE_GDBM=yes:# USE_GDBM=yes:' Makefile || die
+		sed -i -e 's:^USE_TDB=yes:# USE_TDB=yes:' Makefile || die
+	else # must be gdbm via required_use
+		cat >> Makefile <<- EOC
+			USE_GDBM=yes
+			DBMLIB = -lgdbm
+		EOC
+		sed -i -e 's:^USE_DB=yes:# USE_DB=yes:' Makefile || die
+		sed -i -e 's:^USE_TDB=yes:# USE_TDB=yes:' Makefile || die
+	fi
+
+	# if we use libiconv, now is the time to tell so
+	if use !elibc_glibc && use !elibc_musl ; then
+		cat >> Makefile <<- EOC
+			EXTRALIBS_EXIM=-liconv
+		EOC
+	fi
+
+	# support for IPv6
+	if use ipv6; then
+		cat >> Makefile <<- EOC
+			HAVE_IPV6=YES
+		EOC
+	fi
+
+	# support i18n/IDNA
+	if use idn; then
+		cat >> Makefile <<- EOC
+			SUPPORT_I18N=yes
+			SUPPORT_I18N_2008=yes
+			EXTRALIBS_EXIM += -lidn -lidn2
+		EOC
+	fi
+
+	#
+	# mail storage formats
+	#
+
+	# mailstore is Exim's traditional storage format
+	cat >> Makefile <<- EOC
+		SUPPORT_MAILSTORE=yes
+	EOC
+
+	# mbox
+	if use mbx; then
+		cat >> Makefile <<- EOC
+			SUPPORT_MBX=yes
+		EOC
+	fi
+
+	# maildir
+	if use maildir; then
+		cat >> Makefile <<- EOC
+			SUPPORT_MAILDIR=yes
+		EOC
+	fi
+
+	#
+	# lookup methods
+	#
+
+	# support passwd and directory lookups by default
+	cat >> Makefile <<- EOC
+		LOOKUP_CDB=yes
+		LOOKUP_PASSWD=yes
+		LOOKUP_DSEARCH=yes
+	EOC
+
+	if ! use dnsdb; then
+		# DNSDB lookup is enabled by default
+		sed -i -e 's:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:' Makefile || die
+	fi
+
+	if use ldap; then
+		cat >> Makefile <<- EOC
+			LOOKUP_LDAP=yes
+			LDAP_LIB_TYPE=OPENLDAP2
+			LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/ldap
+			LOOKUP_LIBS += -lldap -llber
+		EOC
+	fi
+
+	if use mysql; then
+		cat >> Makefile <<- EOC
+			LOOKUP_MYSQL=yes
+			LOOKUP_INCLUDE += $(mysql_config --include)
+			LOOKUP_LIBS += $(mysql_config --libs)
+		EOC
+	fi
+
+	if use nis; then
+		cat >> Makefile <<- EOC
+			LOOKUP_NIS=yes
+			LOOKUP_NISPLUS=yes
+		EOC
+		if use elibc_glibc ; then
+			cat >> Makefile <<- EOC
+				LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/tirpc
+				LOOKUP_LIBS += -lnsl
+			EOC
+		fi
+	fi
+
+	if use postgres; then
+		cat >> Makefile <<- EOC
+			LOOKUP_PGSQL=yes
+			LOOKUP_INCLUDE += -I$(pg_config --includedir)
+			LOOKUP_LIBS += -L$(pg_config --libdir) -lpq
+		EOC
+	fi
+
+	if use sqlite; then
+		cat >> Makefile <<- EOC
+			LOOKUP_SQLITE=yes
+			LOOKUP_SQLITE_PC=sqlite3
+		EOC
+	fi
+
+	if use redis; then
+		cat >> Makefile <<- EOC
+			LOOKUP_REDIS=yes
+			LOOKUP_LIBS += -lhiredis
+		EOC
+	fi
+
+	# Exim monitor, enabled by default, controlled via X USE-flag,
+	# disable if not requested, bug #46778
+	if use X; then
+		cp ../exim_monitor/EDITME eximon.conf || die
+		cat >> Makefile <<- EOC
+			EXIM_MONITOR=eximon.bin
+		EOC
+	fi
+
+	#
+	# features
+	#
+
+	# content scanning support
+	if use exiscan-acl; then
+		cat >> Makefile <<- EOC
+			WITH_CONTENT_SCAN=yes
+		EOC
+	fi
+
+	# DomainKeys Identified Mail, RFC4871
+	if ! use dkim; then
+		# DKIM is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_DKIM=yes
+		EOC
+	fi
+
+	# Per-Recipient-Data-Response
+	if ! use prdr; then
+		# PRDR is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_PRDR=yes
+		EOC
+	fi
+
+	# Transport post-delivery actions
+	if use !tpda && use !dane; then
+		# EVENT is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_EVENT=yes
+		EOC
+	fi
+
+	# log to syslog
+	if use syslog; then
+		local eximlog="${EPREFIX}/var/log/exim/exim_%s.log"
+		sed -i \
+			-e "s:LOG_FILE_PATH=${eximlog}:LOG_FILE_PATH=syslog:" \
+			Makefile || die
+		cat >> Makefile <<- EOC
+			LOG_FILE_PATH=syslog
+		EOC
+	else
+		cat >> Makefile <<- EOC
+			LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log
+		EOC
+	fi
+
+	# starttls support (ssl)
+	if use ssl; then
+		if use gnutls; then
+			echo "USE_GNUTLS=yes" >> Makefile
+			echo "USE_GNUTLS_PC=gnutls $(use dane && echo gnutls-dane)" \
+				>> Makefile
+			use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile
+		else
+			echo "USE_OPENSSL=yes" >> Makefile
+			echo "USE_OPENSSL_PC=openssl" >> Makefile
+		fi
+	else
+		echo "DISABLE_TLS=yes" >> Makefile
+	fi
+
+	# TCP wrappers
+	if use tcpd; then
+		cat >> Makefile <<- EOC
+			USE_TCP_WRAPPERS=yes
+			EXTRALIBS_EXIM += -lwrap
+		EOC
+	fi
+
+	# Light Mail Transport Protocol
+	if use lmtp; then
+		cat >> Makefile <<- EOC
+			TRANSPORT_LMTP=yes
+		EOC
+	fi
+
+	# embedded Perl
+	if use perl; then
+		cat >> Makefile <<- EOC
+			EXIM_PERL=perl.o
+		EOC
+	fi
+
+	# dlfunc
+	if use dlfunc; then
+		cat >> Makefile <<- EOC
+			EXPAND_DLFUNC=yes
+			HAVE_LOCAL_SCAN=yes
+			DLOPEN_LOCAL_SCAN=yes
+		EOC
+	fi
+
+	# Proxy Protocol
+	if use proxy; then
+		cat >> Makefile <<- EOC
+			SUPPORT_PROXY=yes
+		EOC
+	fi
+
+	# SOCKS5 (outbound) proxy support
+	if use socks5; then
+		cat >> Makefile <<- EOC
+			SUPPORT_SOCKS=yes
+		EOC
+	fi
+
+	# DANE
+	if use !dane; then
+		# DANE is enabled by default
+		sed -i -e 's:^SUPPORT_DANE=yes:# SUPPORT_DANE=yes:' Makefile || die
+	fi
+
+	# DMARC
+	if use dmarc; then
+		cat >> Makefile <<- EOC
+			SUPPORT_DMARC=yes
+			EXTRALIBS_EXIM += -lopendmarc
+		EOC
+	fi
+
+	# Sender Policy Framework
+	if use spf; then
+		cat >> Makefile <<- EOC
+			SUPPORT_SPF=yes
+			EXTRALIBS_EXIM += -lspf2
+		EOC
+	fi
+
+	#
+	# experimental features
+	#
+
+	# Authenticated Receive Chain
+	if use arc; then
+		echo "EXPERIMENTAL_ARC=yes">> Makefile
+	fi
+
+	# Distributed Checksum Clearinghouse
+	if use dcc; then
+		echo "EXPERIMENTAL_DCC=yes">> Makefile
+	fi
+
+	# Sender Rewriting Scheme
+	if use srs; then
+		# NOTE: we currently USE-default to srs-alt, because this is
+		# what USE=srs used to be.  Eventually we want to rid ourselves
+		# of this external implementation.
+		if use srs-alt; then
+			# historical default, from 4.95 this becomes
+			# EXPERIMENTAL_SRS_ALT
+			cat >> Makefile <<- EOC
+				EXPERIMENTAL_SRS=yes
+				EXTRALIBS_EXIM += -lsrs_alt
+			EOC
+		fi
+		if use srs-native; then
+			# this one becomes SUPPORT_SRS in 4.95
+			cat >> Makefile <<- EOC
+				EXPERIMENTAL_SRS_NATIVE=yes
+			EOC
+		fi
+	fi
+
+	# Delivery Sender Notifications extra information in fail message
+	if use dsn; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_DSN_INFO=yes
+		EOC
+	fi
+
+	#
+	# authentication (SMTP AUTH)
+	#
+
+	# standard bits
+	cat >> Makefile <<- EOC
+		AUTH_SPA=yes
+		AUTH_CRAM_MD5=yes
+		AUTH_PLAINTEXT=yes
+	EOC
+
+	# Cyrus SASL
+	if use sasl; then
+		cat >> Makefile <<- EOC
+			CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/run/saslauthd/mux
+			AUTH_CYRUS_SASL=yes
+			AUTH_LIBS += -lsasl2
+		EOC
+	fi
+
+	# Dovecot
+	if use dovecot-sasl; then
+		cat >> Makefile <<- EOC
+			AUTH_DOVECOT=yes
+		EOC
+	fi
+
+	# Pluggable Authentication Modules
+	if use pam; then
+		cat >> Makefile <<- EOC
+			SUPPORT_PAM=yes
+			AUTH_LIBS += -lpam
+		EOC
+	fi
+
+	# Radius
+	if use radius; then
+		cat >> Makefile <<- EOC
+			RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf
+			RADIUS_LIB_TYPE=RADIUSCLIENTNEW
+			AUTH_LIBS += -lfreeradius-client
+		EOC
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" HOSTCC="$(tc-getBUILD_CC)" \
+		AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO=''
+}
+
+src_install() {
+	cd "${S}"/build-exim-gentoo || die
+	dosbin exim
+	if use X; then
+		dosbin eximon.bin
+		dosbin eximon
+	fi
+	fperms 4755 /usr/sbin/exim
+
+	dosym exim /usr/sbin/sendmail
+	dosym exim /usr/sbin/rsmtp
+	dosym exim /usr/sbin/rmail
+	dosym ../sbin/exim /usr/bin/mailq
+	dosym ../sbin/exim /usr/bin/newaliases
+	dosym ../sbin/sendmail /usr/lib/sendmail
+
+	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
+		exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep \
+		convert4r3 convert4r4 exipick
+	do
+		dosbin $i
+	done
+
+	dodoc -r "${S}"/doc/.
+	doman "${S}"/doc/exim.8
+	use dsn && dodoc "${S}"/README.DSN
+	use doc && dodoc "${WORKDIR}"/${PN}-pdf-${PV//rc/RC}/doc/*.pdf
+
+	# conf files
+	insinto /etc/exim
+	newins "${S}"/src/configure.default exim.conf.dist
+	if use exiscan-acl; then
+		newins "${S}"/src/configure.default exim.conf.exiscan-acl
+	fi
+	doins "${WORKDIR}"/system_filter.exim
+	doins "${FILESDIR}"/auth_conf.sub
+
+	if use pam; then
+		pamd_mimic system-auth exim auth account
+	fi
+
+	# headers, #436406
+	if use dlfunc ; then
+		# fixup includes so they actually can be found when including
+		sed -i \
+			-e '/#include "\(config\|store\|mytypes\).h"/s:"\(.\+\)":<exim/\1>:' \
+			local_scan.h || die
+		insinto /usr/include/exim
+		doins {config,local_scan}.h ../src/{mytypes,store}.h
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/exim.logrotate" exim
+
+	newinitd "${FILESDIR}"/exim.rc10 exim
+	newconfd "${FILESDIR}"/exim.confd exim
+
+	systemd_dounit \
+		"${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket}
+	systemd_newunit \
+		"${FILESDIR}"/exim_at.service 'exim@.service'
+	systemd_newunit \
+		"${FILESDIR}"/exim-submission_at.service 'exim-submission@.service'
+
+	diropts -m 0750 -o ${MAILUSER} -g ${MAILGROUP}
+	keepdir /var/log/${PN}
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/exim/exim.conf ]] ; then
+		einfo "${EROOT}/etc/exim/system_filter.exim is a sample system_filter."
+		einfo "${EROOT}/etc/exim/auth_conf.sub contains the configuration sub"
+		einfo "for using smtp auth."
+		einfo "Please create ${EROOT}/etc/exim/exim.conf from"
+		einfo "  ${EROOT}/etc/exim/exim.conf.dist."
+	fi
+	if use dmarc ; then
+		einfo "DMARC support requires ${EROOT}/etc/exim/opendmarc.tlds"
+		einfo "you can populate this file with the contents downloaded from"
+		einfo "  https://publicsuffix.org/list/public_suffix_list.dat"
+	fi
+	if use dcc ; then
+		einfo "DCC support is experimental, you can find some limited"
+		einfo "documentation at the bottom of this prerelease message:"
+		einfo "  http://article.gmane.org/gmane.mail.exim.devel/3579"
+	fi
+	if use srs ; then
+		einfo "SRS support is experimental in this release of Exim"
+		if use srs-alt; then
+			elog "You are using libsrs_alt to implement SRS support."
+			elog "In future release of Exim, the native SRS implementation"
+			elog "(USE=srs-native) will become the default.  Please prepare"
+			elog "your package.use or switch to USE=srs-native now."
+		fi
+	fi
+	use dsn && einfo "extra information in fail DSN message is experimental"
+	einfo
+	elog "Note that this release contains a tainted variable check that"
+	elog "is likely to break your configuration used with Exim 4.93 and before."
+	elog "Please check your transports for occurences of \$local_part, and"
+	elog "use a replacement like \$local_part_data where possible."
+}
diff --git a/mail-mta/exim/files/exim-4.94.2-fix-crash-resolve.patch b/mail-mta/exim/files/exim-4.94.2-fix-crash-resolve.patch
new file mode 100644
index 000000000000..27e68bfdd74f
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.94.2-fix-crash-resolve.patch
@@ -0,0 +1,24 @@
+From d4bc023436e4cce7c23c5f8bb5199e178b4cc743 Mon Sep 17 00:00:00 2001
+From: "Heiko Schlittermann (HS12-RIPE)" <hs@schlittermann.de>
+Date: Sun, 16 May 2021 19:11:19 +0200
+Subject: [PATCH] Fix host_name_lookup (Close 2747)
+
+https://bugs.exim.org/show_bug.cgi?id=2747
+
+(cherry picked from commit 20812729e3e47a193a21d326ecd036d67a8b2724)
+---
+ src/src/host.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/src/host.c b/src/src/host.c
+--- a/src/host.c
++++ b/src/host.c
+@@ -1691,7 +1691,7 @@ while ((ordername = string_nextinlist(&list, &sep, NULL, 0)))
+       {
+       uschar **aptr = NULL;
+       int ssize = 264;
+-      int count = 0;
++      int count = 1;  /* need 1 more for terminating NULL */
+       int old_pool = store_pool;
+ 
+       sender_host_dnssec = dns_is_secure(dnsa);
diff --git a/mail-mta/protonmail-bridge/Manifest b/mail-mta/protonmail-bridge/Manifest
index 2018860c8638..366f5a8c6c9c 100644
--- a/mail-mta/protonmail-bridge/Manifest
+++ b/mail-mta/protonmail-bridge/Manifest
@@ -9,6 +9,8 @@ DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.0.mod 49 BLAKE2B 75301d
 DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.0.zip 29693 BLAKE2B b82bf12654737a5719056c9aa16c0a2fbb510fc0680844485c79b45c1d54c2254832f41517440f4ff37f3d7bf292f594dace50038e221ef790ded3ccd18bef24 SHA512 ac438522dffc4312f7b67ae0dabd8b640584f5c934682e316b212c106cd4046486bf9a29ea4a7f00afbae98288b95633acb2cacc5034da65372fc8fb9e15a505
 DIST github.com%2F!proton!mail%2Fbcrypt%2F@v%2Fv0.0.0-20170924085257-7509ea014998.mod 36 BLAKE2B bace2db83ace774667f5a2f8ac2fe64ef18c55bd94d184e25d97ae880d30d86e5ee6f40629e6b8fe59c86f898fe0d75fc776e4f8339a369257a445f520fcf920 SHA512 878fe5c5cc0931b0571d054ea9626bbd0815f29dc99bfd39c96e62951bb837c298b2bff13215491edefa5cab48041f7cbb0d97673f2cf727262ce081854c1e96
 DIST github.com%2F!proton!mail%2Fbcrypt%2F@v%2Fv0.0.0-20170924085257-7509ea014998.zip 11440 BLAKE2B 1923365ca54fa598bbb77cbaa412fa448fa09e6713c1a9b34a9c1e48ca26243a9b58a612b1ca9268d1c438a68d989b6c227faec97f94dea1542bcda2a61a03b3 SHA512 55548db2fc3a44c768a9d0de64c47f283f8625706d65c4ada897a5ba5768c6dfbb8371df05b056e36425897c14b3b2099aabdf631f93807c017be5f103d9929e
+DIST github.com%2F!proton!mail%2Fbcrypt%2F@v%2Fv0.0.0-20210511135022-227b4adcab57.mod 36 BLAKE2B bace2db83ace774667f5a2f8ac2fe64ef18c55bd94d184e25d97ae880d30d86e5ee6f40629e6b8fe59c86f898fe0d75fc776e4f8339a369257a445f520fcf920 SHA512 878fe5c5cc0931b0571d054ea9626bbd0815f29dc99bfd39c96e62951bb837c298b2bff13215491edefa5cab48041f7cbb0d97673f2cf727262ce081854c1e96
+DIST github.com%2F!proton!mail%2Fbcrypt%2F@v%2Fv0.0.0-20210511135022-227b4adcab57.zip 13865 BLAKE2B 9ea0fc16a6ad11dd6c3df3062f4c5e76221e23a2f69f4f1e214025f63e351ff65ce8cc0d9eeaa913c3f003a509428eb12b3a333caf0699f02d4cb81f6b639136 SHA512 30688bbe632bdb7a66148ecfaf2b699782101de47d32622e41758ec67e2725d81619c0a31491729b837a4d02f9209bb99621d0cdbe33cc357807d7418000573d
 DIST github.com%2F!proton!mail%2Fcrypto%2F@v%2Fv0.0.0-20201112115411-41db4ea0dd1c.mod 155 BLAKE2B d75a47c029b00596a87b29a4e15f36bbb8a99d11db6a16de41135e9a43baa3ab1f73662257a42676f19c1d3c5a507dfe69d5d5d47f088617613ce87d5a0c224c SHA512 997bd7684ef59d103e132fbd0bb6841d20b621f18ff245100b1f3870343c567d6cc7d12b8c9e8e34a6a9fd615ef4b24778de35b6a7faed9b2633b01384b88925
 DIST github.com%2F!proton!mail%2Fcrypto%2F@v%2Fv0.0.0-20201112115411-41db4ea0dd1c.zip 2186252 BLAKE2B 438b18b873ffc737bbdec409d8eb90b76873f011d32330ec63fdcb976015c28a7923915e677e79ec45077e725033675cf444f1e0979d484e50bde1e0a22deca4 SHA512 dc1ff3a05b091152a2c818f61ed808971613837d06a137d55df94f39400636c49937bdbc2c7526e459b637e8c611a23095a9b5321a1f8e453dd644f9b7dd7761
 DIST github.com%2F!proton!mail%2Fdocker-credential-helpers%2F@v%2Fv1.1.0.mod 106 BLAKE2B 0e008ed6534fa2d49febcbfadd9e466263b1b75f8f6d8c0397c7c36536e76d68e4d970c15694cc99e32d82ed60bb591b045247d6d19db10a97d59bdeb9131797 SHA512 596e94e146bf52901be3fd7833d424ac516383c4bb2abe966b8c2c041a395fa70e21a6064db589dff213e46deaaa5bec5d8b77636f9b4e167961420df8c7a73d
@@ -17,16 +19,26 @@ DIST github.com%2F!proton!mail%2Fgo-autostart%2F@v%2Fv0.0.0-20181114175602-c5272
 DIST github.com%2F!proton!mail%2Fgo-autostart%2F@v%2Fv0.0.0-20181114175602-c5272053443a.zip 6615 BLAKE2B f3438820f0bfb667f3d54ef5ca64fd79010ba837da2cff7aa9a8a1321e8c4cc65066fa1371ba91f964e0525a55aae43a1bcaec5729fe0c71a1077d80a607673c SHA512 84543d41f69f8102c992876275c82160b6f42ae8fe12eb5168710478fadf02a5ebddea2f3ac2195fb8bfc757d177db304ac3edcb2b918c02fb5472ec80d82d30
 DIST github.com%2F!proton!mail%2Fgo-crypto%2F@v%2Fv0.0.0-20201208171014-cdb7591792e2.mod 221 BLAKE2B daa570f33cf43a18f58a0b60d9a0e0b4cd2101097d0463d58f644889cc6d2ce5c6e322d6bf8c57329db81bb0b73dfa7e205b2e67e15a663c7887f1c001d1d7f7 SHA512 9066edced3a1bde60b1f27c2586f89695c3afab54bf6d5ae6db984200026cbf552b88f47c052c2fd48ef4172922a5ed32757369b6bd655f51b5f2cf4ad3823f2
 DIST github.com%2F!proton!mail%2Fgo-crypto%2F@v%2Fv0.0.0-20201208171014-cdb7591792e2.zip 2175686 BLAKE2B 3db5d72be2b5c4466c71081474378218878f9f01079b4ecd38d86b86382be1b6dbc698f3a2dc14b5ccb76ecda4b790ed13ab71ca3674d429a551af3e04284d73 SHA512 d0fd301bb13af3dbb2af3a5004091df7bfb55e55da8c8a1d67d04538d281bb0704896b64e3127747d1f00e483a3f9705230305f719cbcf8280911e9de516005d
+DIST github.com%2F!proton!mail%2Fgo-crypto%2F@v%2Fv0.0.0-20210428141323-04723f9f07d7.mod 112 BLAKE2B ef3083d3a65268fbd1db1c571a909b250b2b13dea588358f6b958e7ad1fdf1b4e4e9fb3f2494d4f6ba75d347b113a626f07b59dd1cfc72e0a9e37916dfb39a0f SHA512 67d2f173895329e13a7a17d91e95557b55b199c6d7df7466ca8395d4fcc4f6ad123cb798e01bc136b2b3bd2dd9229d3db43f01021b4d38695554fc8b01dbe545
+DIST github.com%2F!proton!mail%2Fgo-crypto%2F@v%2Fv0.0.0-20210428141323-04723f9f07d7.zip 352529 BLAKE2B 7ae3562dce4e7e42b3ab4673beb97c051131848365153b24ab544d4096d3b5ca508075412162bc8163bc6d6af2be1a7c79721d1d89fa0f6c6856d39c1a095081 SHA512 5bd2cb94e95f647d174e3b5b717ab2e90ee002e3b80a314330a3ac59e7f4975cd2d0a1211454e959e13694e472330a8e97e71a49666971c9c58cd2b5cc7d66f2
 DIST github.com%2F!proton!mail%2Fgo-imap%2F@v%2Fv0.0.0-20201228133358-4db68cea0cac.mod 187 BLAKE2B 68dfc1a850099b9eb724b9e60c83da0cf58c225ce2f4835eec30ab152a901fcfb942842a82ac89a1ae13e27ca070df017f8b513d41e99f8dd9239de5c43e60c1 SHA512 0c24e87c7e7258f4f481e89eabcf93609ec86214d0912f2e98bdd2af327af3c43e5bd045c1f6c98e156ff0b3f7413c57757f357af938c7cadcd3b220a0674b5b
 DIST github.com%2F!proton!mail%2Fgo-imap%2F@v%2Fv0.0.0-20201228133358-4db68cea0cac.zip 155177 BLAKE2B 2687dc612f4e7f55fb389bf486f8012f4adab6c1e7c2c6604800bb6c755e420d98896822cf95f36d3e60d4ab77e75e454fdb417b7115333e40194d0003ed9d82 SHA512 5dc428882b894e3d9234dbf4cdd1f59eac8976b4fb57de5d0f9adb23088e0036ac74be1507d8a34854ad86a9728e1aaed4ca461d69e05e4ad62f6cc6628d0342
 DIST github.com%2F!proton!mail%2Fgo-imap-id%2F@v%2Fv0.0.0-20190926060100-f94a56b9ecde.mod 40 BLAKE2B 989b7b355863c0ad186fa3e5d6469ff2b6cd18d164e26c9d0c745d460ebbb1d840ac68d0902d81d56d7a0d6f8f250787e443425e56c7080ea5227c90261fbae8 SHA512 7117d1ec8cb167c05f5046f9be943ede56b49e8fa9815be82230097b6aebf35be7404c8b07ac9e502c424381593d7a999fbc63ded244e45048017bac221945dc
 DIST github.com%2F!proton!mail%2Fgo-imap-id%2F@v%2Fv0.0.0-20190926060100-f94a56b9ecde.zip 5255 BLAKE2B d2044630b02d6b6340da696241802b7b03cf3419c2e0ef47447d325175fcfe5088464b1bfd619f9e6525d694ec113d9a5d5aea435d8602c8d046473fe52af67d SHA512 272137c0259c1f295f8e01e500ea50aed7387b4eae937258a9fee94518259dd19c1359df90c08fc21e3d4f67a5d7f593c04d36f91a167ae1a5b9540dfc3749fd
+DIST github.com%2F!proton!mail%2Fgo-message%2F@v%2Fv0.0.0-20210611055058-fabeff2ec753.mod 187 BLAKE2B bc72faecdd047d49ef0078b3b669250f8f2cbffc6d3094c3ae26ae70f61c790fbf45fd7d3db82069c6836ff749b0ca512c4c1981791059689ea7431a2aa51bc3 SHA512 46430f650fd97ab10021cd08a93781a83de58dca872a3213ab341893c5c613b68ee31bbbbbf4dba522e68bd5257de551dcd79a8a3d9f83bae1ea90cd0c068ea4
+DIST github.com%2F!proton!mail%2Fgo-message%2F@v%2Fv0.0.0-20210611055058-fabeff2ec753.zip 59462 BLAKE2B 74db29356814b472093f618a1a4c92d8dab71da634893bdfc831918305295caaeaf15b9d6ae4978d7429c22d82659d31b21acb3ea005c55af33712e7ab9eeffe SHA512 2eb8e6c5f24b8d810b7660e565e09c72b87cac384ea6167a1472f7f472d4e455f04eb970e9f5b6f4cd90d0b4b1d92f67538fe3bdfb1f7257c0052503083e9eba
 DIST github.com%2F!proton!mail%2Fgo-mime%2F@v%2Fv0.0.0-20190923161245-9b5a4261663a.mod 120 BLAKE2B aa60435c1e4c631af6863fcb62ccfb82a1ef9b7cc579380f5f2c68620b2c19b0681267b5aad489c4e079e2ed19dbb8b9baa7aa91f1432118398916c1987406fe SHA512 995e24e5102c75eae2121560d4812d6346bc6d38a5a3ef666a7fe14be48d3afb712b40c9dd30987a569b3fcbd9251e2c282ad5617670bcc5b4293cb3bd668e24
 DIST github.com%2F!proton!mail%2Fgo-mime%2F@v%2Fv0.0.0-20190923161245-9b5a4261663a.zip 26387 BLAKE2B bf0671783aaa80f2d5daf85190fe2725bcc9b1ba030de15eab4450cbe75627fd9b506f4e6262d93fb488ab666d943e92b79cc377acdc226cc44f9aedfc55004c SHA512 fb9eabf60062fcd7c0b84f3d2f4bb8057cf911237d0c3275b1228714764dfb6e9a5c4a9722faa2e50004d26f66a45945bf36b1af9f23a72b42908c2acedf3dc7
 DIST github.com%2F!proton!mail%2Fgo-rfc5322%2F@v%2Fv0.5.0.mod 193 BLAKE2B a1aae724ac86c0506906831314c354de6e05a15f3823546af08970374b5a698ad91c5d4402f3846d46d8289953722f04797c5e7c1222f922d301a6e2f802b580 SHA512 e7f7086c0acbab558b8f67c59ed739dfd08a27a4da33fbf99f487d3506ef88e32d78b0fb1e5acd790fcd28398e100a7da422dc501c2d514b703d9f93d9b5638c
 DIST github.com%2F!proton!mail%2Fgo-rfc5322%2F@v%2Fv0.5.0.zip 102640 BLAKE2B f12eeb6636807a294d54f9d65a724c2ea0f2514149df67bf04a7178429833a25f0567373e22168d9a44d12e96278fab9131d0aaac43c875e604ca6cb644df063 SHA512 9341cddcae47d35b1f9d74016649dd56c397410e75df310a5ce915a20ca87255943f61e7a7694f0b89cbd6893d084ef3f8f95b20a224387faf70bb15bbcceb48
+DIST github.com%2F!proton!mail%2Fgo-rfc5322%2F@v%2Fv0.8.0.mod 205 BLAKE2B f188b4b4242557b4703bf74985c18911cd4b84cdc42e1d9f4d03292d466b7df993d2dcb32a7755acb618c05937ed21efd22ca69e71a277f2f75abb355ce91e5e SHA512 02db97b75de41cd3c2b4f18384f53f6c1b0156795e72cc59c806c20e4caf39e5149cbb541f59bd59cd3a38c347c004b404a46cbff0bed8a91da709fcb97ea776
+DIST github.com%2F!proton!mail%2Fgo-rfc5322%2F@v%2Fv0.8.0.zip 99988 BLAKE2B d314fea3feab964ec867a2d4f90e2c3b3393b643c51fa43b854d34543d15083c0d375ea97c0333cef66700d5ccc168eb6bf2a5a71a7810ce60ee8058f4d8a3e8 SHA512 a25b8dcb8e6e05842b7cced4bed308283041f7ed905194bd36337495675a56457815bb02b08815d26fdc8e2b150a60ff3e2e49179cd18a706deb32ab56907232
+DIST github.com%2F!proton!mail%2Fgo-srp%2F@v%2Fv0.0.0-20210514134713-bd9454f3fa01.mod 463 BLAKE2B 9efd806334ff2f03b0d1d2ec2ce6407aa464eaaafb70a14805f1868297d2643557f94a3b92e0e9e8c3cc94739dcc5e68f7eac707a4824c1b027a296ed4a7cbcc SHA512 9709265bf974e73869b715924b4849786c7c6a1cc350df78fc2df0080c987e40a00607b6a19f8fe68b0d068fb7cac1a6b208e4b71a1f2004cff677b345cc44aa
+DIST github.com%2F!proton!mail%2Fgo-srp%2F@v%2Fv0.0.0-20210514134713-bd9454f3fa01.zip 17135001 BLAKE2B e66e32753adebde75e4bba2bae204c9867740ea4a7f132453f25f73c5db041076561a988f8c35680777951bb48b1d3f583f91addeb1d29c7fd99e05dd46e4346 SHA512 ed37c4ac0d9eb8d3329f00aecb109123adf5425d92a92d6d53ffcbef16ec1652202a70e75cc1b68bb761f36046ed45065a5068e0d07e6d64ed4611a5ac5540de
 DIST github.com%2F!proton!mail%2Fgo-vcard%2F@v%2Fv0.0.0-20180326232728-33aaa0a0c8a5.mod 38 BLAKE2B 42e6ccc50593305fd719cb025f7abec4a58a0b57cfa84fba89bf5a27f71b10d91cde03b212e02fc661c7a175bfcbefa21f914cfeedb8ba1d55b4e834d904cb4a SHA512 94461718930753ef00763e31fdece85a3e5fa312237639f00d83c93f1da57b788c57c1a7408a917d553dd24086143c4cd4e6f913b0702c4b33705b52a10412c8
 DIST github.com%2F!proton!mail%2Fgo-vcard%2F@v%2Fv0.0.0-20180326232728-33aaa0a0c8a5.zip 15622 BLAKE2B 4f2ffee50f1b6119a5ba7478940c22461aff208ec7ba75a2ed2929d831558fd38d727217694ae66228e61640b271d55734fe826e6497616acdc21c3d2d7dba68 SHA512 afba1af43e85c4b4e61dac1d5f0ed9169785f14c2f8d3d776a9d96e1fc8720cff7ad077b65e649090c157856e7c90803a528e8b591ea39cb0772623dd95407fd
+DIST github.com%2F!proton!mail%2Fgopenpgp%2Fv2%2F@v%2Fv2.1.10.mod 474 BLAKE2B c6a93c164f1e337926b87f65d16d1476a6aad9cdd23bc8e3d9dedc86c2cc05181b4051959018a0e32d3a26d7a0ea841847346a7bba5d7187c8ce67060c77144b SHA512 b9d1f0f0d6a213e5f20726c2917e0ebddf61a6b2c61cddfcbc8ba626f08596461d4aa4eddfe7b60e8796452fa008589a59d8b81ee14e40e6678b3972b57c5f93
+DIST github.com%2F!proton!mail%2Fgopenpgp%2Fv2%2F@v%2Fv2.1.10.zip 143619 BLAKE2B 2d8f31bff73477d71e90e8585b39d92d701443fb8e0bc920d7203358e80165abc103bcd3973f3fd4e017f8cdc47501b261ea91ce15e2ba71b9924c3bf55f002e SHA512 dd546b224ab4d7343547d87a2e8aa94ac572f6c20066d3286b5e3e28f241c26c65f7620ba196b07cfabdb9ee6ddcebe6206c87ec79c4cae798d0c867412dc49b
 DIST github.com%2F!proton!mail%2Fgopenpgp%2Fv2%2F@v%2Fv2.1.3.mod 418 BLAKE2B 3b14aca85e032253dca0f6fcab38794e3571d32ac4f5e6e5d4e2434727d71bde6680c9ebcdcb3b8064b056da705ec1f02b86f7d8afdb178f658738aa656c6424 SHA512 36b64035a71d43085e4f20cff54b89977e4fd140476f70b70a4c4afb274b1efe7d183ee8986a84805e3e977ae2d610256d5681e664d135aef2486428d3311bdc
 DIST github.com%2F!proton!mail%2Fgopenpgp%2Fv2%2F@v%2Fv2.1.3.zip 119269 BLAKE2B d773a7ed7a821423d0a7bf5752b34d353750ddcd8cfd460efb9bb6c37cea6132fc49f0c28d38669597f685325288a8590950f832ef415353e77750aed87934a9 SHA512 7c9e9bce4555e47a17e80c788f30f4520731e204542e8b6858a4f2a4ef9ebb1c68ac18939ea8db97c7dea7d2c855a3df1ddfbe1b449216dd1cbb3438f4fedad1
 DIST github.com%2F!puerkito!bio%2Fgoquery%2F@v%2Fv1.5.1.mod 153 BLAKE2B 95b3087015afb5ebdc5516ff2dac1bba30438f21bb191befa2a77ebc06843f35c92776b5a8f2d9f2155a3753ab029c55f970ef6777b56917b5726b18da69807d SHA512 e6a65896ed5e371605fa0099e81788157aebf0f392a4dc881176579f015cbccabdeab3971ff6d97051c4f4bd2c5c3ecd6d1be47dba1f97aba635ea9390ecba15
@@ -293,10 +305,21 @@ DIST github.com%2Fyudai%2Fgolcs%2F@v%2Fv0.0.0-20170316035057-ecda9a501e82.mod 30
 DIST github.com%2Fyudai%2Fpp%2F@v%2Fv2.0.1+incompatible.mod 27 BLAKE2B 812d02f5407062dcd8442be6e13f7f407e8ba2bb7bc85aff63505bbace0f3c156e3465555ae55715e2d0a8fe2f72ee6a5442ddb5ce77249915ed021c75c6aaca SHA512 b704c91c3a1ad3d8b2a0fd904e6a1837ed4b78fac7dcfa48bd2de4da82ffae7b17ec70c1d8ba68f91bd37c036bc1d4373617472448156776e5f5d869e1a1c98c
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.mod 94 BLAKE2B 5014c2a8459f1f01661c7cac0a7d2ad7de372b3e2916d56d721fd454e459fc75d5b4f6249a73dc54b46b91df00b1ef5c3d47d099fa28429a6967427ec7bfb36a SHA512 d3cfb7a75e321d2a6fc145b727dea76002189ae2caa8dd3162e5e6903a1acbe5bd55be81d7f112c71b47e61351534ff991be30993632be9c9d7443111600fe39
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.zip 115621 BLAKE2B f59bced3cd34292c237fe5a472a66fabca151ffdfd39553bd060bcc706433c248d0712fc4fcc7c44a67ee86fb3517a30cd1846c5c5e70b4549d42c1f12be9495 SHA512 0b6a8a073673708adc8fc0d01c96fb0ec4276db63a17f45ff02b4243235de9634952747aff63382ed767157c6dcbcaebd5399ace63a14e52cc826bd5c9749f82
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190418165655-df01cb2cc480.mod 88 BLAKE2B 22568b660b7e13eed0dd423bfb6b033adf659a2c2b59c6ab12d707aca9f6f7317b7b438640caf6233dea4d9840aec4eb997eff5fcccbcdb193ba81db52d814d7 SHA512 fcfc8d63d333065f1193e9c27efe32a1fab270e450fbe1db533156e00427a13c75691163cd1bc7e9aa26b84d4142625c9fbd755535c575f83d63d82d7a276066
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191227163750-53104e6ec876.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.mod 209 BLAKE2B ae212ac1167b75a96c3b74f33594fa85e980530886edcf3bb58fb5e077793d24e69d1015e8581caafcc78b2d41cc75e4e17e82b2d3f76f10058ff5a715f00641 SHA512 c2a45c244884d6ccc5c4f73b6b3852d28c9ed1d3acd4805ff36292681e5011284af42ab75ebf6274cda4cc3bcd426496515db7eaca2a529500c0e896190f26a8
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.zip 1864784 BLAKE2B 6e21ae64d3917f37cc233bb3d63c25149182930d022ff1e70bfc50ead953f49d6fd434405b9c1a4ad5b31ea39471b0a9ae6a0093b53d8b7e6cc1e88a34a45544 SHA512 f7077f2cb6f051911f8d97449b22ca79679c5f8e0a29c3c438a4f4bad25fdc58dbfdb9baa32b008663059bf9054cb9ec029215262559fc655f05a413b7214bd3
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190731235908-ec7cb31e5a56.mod 352 BLAKE2B 6d1d0aceff4dfa5b853e402cc26ce30c5c1db84f3e4ed6f6a8c40e1c8d6dd9d6fc8c48a7997339f36937dead36beba912f1fde152ece1a2f398f5d61d8068d7d SHA512 8884065744cf5abb0d6bf36f2fd4352b85dee1784a11fe54ff81864b17d5aca1fac950bc8740ced0b48441445bd530f4c0df8c9736d523668f5b2f1c99155199
 DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod 60 BLAKE2B 1c8445e3c9313293a0551c8a2acc31a1738724b96886bdf165c74de6cf2d25b784baefa2c41997a64ff189333a8c59756fac7ac41b0ae1d4f167c38574905351 SHA512 c466f8b348acdc26208bcb782cf330a979d9af086a95f307a785884492430f11fe45d1ddc3abdc1b092654b3880a5e7a456740293935b1912a1d39b658de80e8
 DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod 69 BLAKE2B f2318e92793bd626374b94e2917ea05ec2b41285c169f1461365edfa00412a798775a8ce137221e1c280983a62d03bf1cc97eadaf8668661ed4387ef5823963b SHA512 d463167481b44386a011b867d6e26eaf2fe81c750325ea89f631af7b065c5152249084c45e7195a662d9b9ddde0e81a5273d8110f73a18c4d841c155c67ea0f6
 DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod 27 BLAKE2B 9bc664bbb78cd778f132bf3504160bf8f6d9950342fa73c461db815f07c0ce2ae5bb2a0ac099457d022e1edf2d07e536566fea043a77aa8b21054254ae854c46 SHA512 a105eb088532321694d3adb5da0b3cdceb7781670a2d4a8a757799e3c8fde02784b981747714cfa8770ed29eb1a0228e0945ad3c363220c39108a7432fc29a32
+DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190910184405-b558ed863381.mod 212 BLAKE2B 8e049791cb64119b3e4bcadd56e57a731676a336ec7bd03d875802ea4850fc1b67ae6a5b90325250334efa54190d9a8048c0381a34bb74cff4cf8ec6a4a9cb58 SHA512 dc1dd42fac6c5777fca8a2b8029e1aa7b527946a55395890188037dff798da9a214785549f3ad544fba3bd1d939e778c070e82adc498df362e4edbe2c5373d66
 DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20200801112145-973feb4309de.mod 267 BLAKE2B 64a48fcec55fbe841bc4f933a27f93b97f02423eee8b1b6edf6bfeae98a6fff90023fe6e53bfe25c0d171a19e1e829b507e805a6c446de4e8f29924f26b9f708 SHA512 6e259127bc6a441f5669e11c4d67595a6e603b07d24fb8a4ff970f67b52c3d177fdc0aeb7aa97d9cbf0b61aa68b83ed1064c0c62047365aa8dcc9e9d04772fba
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod 97 BLAKE2B 54b5bbd5b0908619326ca8bcebebf13f45b2838737d22008f20d3f40ae52fb4f8fdb8c73cbd98b57873aefc8b37c7328aab2bf02ad82a7d5f83e0d75a9283e81 SHA512 4e955424df3c1cce0b716fc518eed10196feb34ec718c1fe537350ce99efd0676276c2000feca6faaa6f3db8ce626e2d330f700fa43a10c73120dd13f5f1a764
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod 159 BLAKE2B 7124b4e21f0b1ff142fe4cd5c57a22de7bc5b1c578e16e8661085d475d67573279c1ce3165e05a28c77a41eac43fe29b1d98854abdcc7b0b66167f82db652dd8 SHA512 5e225da646ef87b8bf435b745313187cecd1bd3e88660f8a90cd2a6fdcadbe8fc51f53edae4b3aa2357ad273a8e58034920bb61a1cd5898b95d3fe39f30ec648
@@ -328,6 +351,7 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod 24 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190419153524-e8e3143a4f4a.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -355,6 +379,7 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190327201419-c70d86f8b7cf.mod 87 BLA
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190420181800-aa740d480789.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190909214602-067311248421.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117012304-6edc0a871e69.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117012304-6edc0a871e69.zip 2944986 BLAKE2B cb7ef605e711d8df0fb925898c7ab3df27a057e7ee9737cadfaf1474d8c93a6f8d0dd23eae0519326ace2bf095b799de93b6927bdddd3872ca4ac1b45bf0701a SHA512 600318a6e26978681f810e57f568794381853ff97e1d8a481adf9ca4d21fcb4815d44812c2a2e7e8c29ebda15c7b873d7428643628d2c8bd4b2b2d59ff581d17
@@ -377,8 +402,8 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20191120175047-4206685974f2.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
-DIST protonmail-bridge-1.8.1.tar.gz 2728694 BLAKE2B ebed984db917d5e0b30ccd05f26b4d82089bcf1f7aab6d6bfd3e1087f8ff9e6192c95108dadf0f063ba1cb353605a7b4cf079e7dc2e7e11563a353bc4af75298 SHA512 38671c89c47e1b3f66a5aa00c09ef70b7374b730cd43b43918a2818f33f53b35d6c0ec0b4e7aaca463d17d01ac4b8473751adc1741211b7994eaa9ece44334cc
 DIST protonmail-bridge-1.8.3.tar.gz 2728631 BLAKE2B f42d6b09dcef7777ae4605e81698e579d284dd6dd88da31ae1817d679f2b94baac6ee3b73ce172c4dbf1d5a07c4e17f52f59dc95e8b28e3b532be04531d06be9 SHA512 135fb12c6832ecb2476e801d00bca1d46fb3d5931b66c66d30da4f7e52a9d4437103a083fa3f72570d5035652adfcc9e0aafa5011f6eb212878db91c5bbcc53d
-EBUILD protonmail-bridge-1.8.1.ebuild 22606 BLAKE2B ff0e8d79f12d449678d8050a39801278fd9a4d08c38f37ecf3081417fae7f74fb71f79e173ffbbf81dfc4f3deed55664917cff4a2fdc1beaaf52b402fd90618c SHA512 bee10c3a9376f83409cef80135600b5b6f78c185b61543e8d4497b0d904c582c506f88f994b3340c0338ad73076e988aeb64246ccf49488ed8ccb18507509ffe
+DIST protonmail-bridge-1.8.7.tar.gz 2735961 BLAKE2B f3b95dc62ec88f6010e562e1acfe776703ffbcb0f64554683d253157ce886f10dbdabd7ce33f4e8c8f291fe5c89a9ee3c41e7ab4049d2f673c6d13ec391ab7cd SHA512 021856b4337cf467164d6a6369f8b303f127f52059f3291683151775d92828cced7b9dec38fc85c53e656d56dac81b06fdee0b5cc92ac0b588ba62c76c0c667e
 EBUILD protonmail-bridge-1.8.3.ebuild 22606 BLAKE2B ff0e8d79f12d449678d8050a39801278fd9a4d08c38f37ecf3081417fae7f74fb71f79e173ffbbf81dfc4f3deed55664917cff4a2fdc1beaaf52b402fd90618c SHA512 bee10c3a9376f83409cef80135600b5b6f78c185b61543e8d4497b0d904c582c506f88f994b3340c0338ad73076e988aeb64246ccf49488ed8ccb18507509ffe
+EBUILD protonmail-bridge-1.8.7.ebuild 22679 BLAKE2B 3e1fa2eeaec891c86a3f681fbcd54f96ec825aab39dd30a86c79f7872129fa9fab257e4abf1eb70c028af4ab1189138024e0497727f744ea60aa6201c9a6e71d SHA512 b66dc949d47177cdae382bfb531d5c1e3f25506689008d84c3ff741772c2f2407b0ead23525007082e87d74f634ec7244fbd804aa8574c7221f3ded5f6fe9f23
 MISC metadata.xml 618 BLAKE2B a392fa79076ac6eed79581e425edc46eeaa42e4ff3193fe23845062f4de9e8e9edc067473724707ce07025973f0942bdebc94b10c7f02f1e477835ce969ab556 SHA512 813f43dcdec361b1fd0f354245e7572ef2061500bea09fcf2712c1d44883cfadbd0c37dcf960d5dc34c848530a3dd80abaeb6b5da26fbb81363116ec737a1c84
diff --git a/mail-mta/protonmail-bridge/protonmail-bridge-1.8.1.ebuild b/mail-mta/protonmail-bridge/protonmail-bridge-1.8.7.ebuild
index 6487150f5142..5a90130c5c97 100644
--- a/mail-mta/protonmail-bridge/protonmail-bridge-1.8.1.ebuild
+++ b/mail-mta/protonmail-bridge/protonmail-bridge-1.8.7.ebuild
@@ -16,28 +16,30 @@ EGO_SUM=(
 	"github.com/Joker/hpp v1.0.0/go.mod"
 	"github.com/Masterminds/semver/v3 v3.1.0"
 	"github.com/Masterminds/semver/v3 v3.1.0/go.mod"
-	"github.com/ProtonMail/bcrypt v0.0.0-20170924085257-7509ea014998"
-	"github.com/ProtonMail/bcrypt v0.0.0-20170924085257-7509ea014998/go.mod"
-	"github.com/ProtonMail/crypto v0.0.0-20201112115411-41db4ea0dd1c"
-	"github.com/ProtonMail/crypto v0.0.0-20201112115411-41db4ea0dd1c/go.mod"
+	"github.com/ProtonMail/bcrypt v0.0.0-20210511135022-227b4adcab57"
+	"github.com/ProtonMail/bcrypt v0.0.0-20210511135022-227b4adcab57/go.mod"
 	"github.com/ProtonMail/docker-credential-helpers v1.1.0"
 	"github.com/ProtonMail/docker-credential-helpers v1.1.0/go.mod"
 	"github.com/ProtonMail/go-autostart v0.0.0-20181114175602-c5272053443a"
 	"github.com/ProtonMail/go-autostart v0.0.0-20181114175602-c5272053443a/go.mod"
-	"github.com/ProtonMail/go-crypto v0.0.0-20201208171014-cdb7591792e2"
-	"github.com/ProtonMail/go-crypto v0.0.0-20201208171014-cdb7591792e2/go.mod"
+	"github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7"
+	"github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod"
 	"github.com/ProtonMail/go-imap v0.0.0-20201228133358-4db68cea0cac"
 	"github.com/ProtonMail/go-imap v0.0.0-20201228133358-4db68cea0cac/go.mod"
 	"github.com/ProtonMail/go-imap-id v0.0.0-20190926060100-f94a56b9ecde"
 	"github.com/ProtonMail/go-imap-id v0.0.0-20190926060100-f94a56b9ecde/go.mod"
+	"github.com/ProtonMail/go-message v0.0.0-20210611055058-fabeff2ec753"
+	"github.com/ProtonMail/go-message v0.0.0-20210611055058-fabeff2ec753/go.mod"
 	"github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a"
 	"github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a/go.mod"
-	"github.com/ProtonMail/go-rfc5322 v0.5.0"
-	"github.com/ProtonMail/go-rfc5322 v0.5.0/go.mod"
+	"github.com/ProtonMail/go-rfc5322 v0.8.0"
+	"github.com/ProtonMail/go-rfc5322 v0.8.0/go.mod"
+	"github.com/ProtonMail/go-srp v0.0.0-20210514134713-bd9454f3fa01"
+	"github.com/ProtonMail/go-srp v0.0.0-20210514134713-bd9454f3fa01/go.mod"
 	"github.com/ProtonMail/go-vcard v0.0.0-20180326232728-33aaa0a0c8a5"
 	"github.com/ProtonMail/go-vcard v0.0.0-20180326232728-33aaa0a0c8a5/go.mod"
-	"github.com/ProtonMail/gopenpgp/v2 v2.1.3"
-	"github.com/ProtonMail/gopenpgp/v2 v2.1.3/go.mod"
+	"github.com/ProtonMail/gopenpgp/v2 v2.1.10"
+	"github.com/ProtonMail/gopenpgp/v2 v2.1.10/go.mod"
 	"github.com/PuerkitoBio/goquery v1.5.1"
 	"github.com/PuerkitoBio/goquery v1.5.1/go.mod"
 	"github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod"
@@ -81,8 +83,6 @@ EGO_SUM=(
 	"github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod"
 	"github.com/emersion/go-imap-appendlimit v0.0.0-20190308131241-25671c986a6a"
 	"github.com/emersion/go-imap-appendlimit v0.0.0-20190308131241-25671c986a6a/go.mod"
-	"github.com/emersion/go-imap-idle v0.0.0-20200601154248-f05f54664cc4"
-	"github.com/emersion/go-imap-idle v0.0.0-20200601154248-f05f54664cc4/go.mod"
 	"github.com/emersion/go-imap-move v0.0.0-20190710073258-6e5a51a5b342"
 	"github.com/emersion/go-imap-move v0.0.0-20190710073258-6e5a51a5b342/go.mod"
 	"github.com/emersion/go-imap-quota v0.0.0-20210203125329-619074823f3c"
@@ -91,15 +91,11 @@ EGO_SUM=(
 	"github.com/emersion/go-imap-unselect v0.0.0-20171113212723-b985794e5f26/go.mod"
 	"github.com/emersion/go-mbox v1.0.2"
 	"github.com/emersion/go-mbox v1.0.2/go.mod"
-	"github.com/emersion/go-message v0.11.1/go.mod"
-	"github.com/emersion/go-message v0.12.1-0.20201221184100-40c3f864532b"
-	"github.com/emersion/go-message v0.12.1-0.20201221184100-40c3f864532b/go.mod"
 	"github.com/emersion/go-sasl v0.0.0-20191210011802-430746ea8b9b/go.mod"
 	"github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21"
 	"github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod"
 	"github.com/emersion/go-smtp v0.14.0"
 	"github.com/emersion/go-smtp v0.14.0/go.mod"
-	"github.com/emersion/go-textwrapper v0.0.0-20160606182133-d0e65e56babe/go.mod"
 	"github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594"
 	"github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594/go.mod"
 	"github.com/emersion/go-vcard v0.0.0-20190105225839-8856043f13c5"
@@ -186,9 +182,6 @@ EGO_SUM=(
 	"github.com/logrusorgru/aurora v2.0.3+incompatible"
 	"github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod"
 	"github.com/magiconair/properties v1.8.0/go.mod"
-	"github.com/martinlindhe/base36 v1.0.0/go.mod"
-	"github.com/martinlindhe/base36 v1.1.0"
-	"github.com/martinlindhe/base36 v1.1.0/go.mod"
 	"github.com/mattn/go-colorable v0.1.2/go.mod"
 	"github.com/mattn/go-colorable v0.1.4"
 	"github.com/mattn/go-colorable v0.1.4/go.mod"
@@ -270,7 +263,6 @@ EGO_SUM=(
 	"github.com/stretchr/testify v1.6.1/go.mod"
 	"github.com/therecipe/qt v0.0.0-20200701200531-7f61353ee73e"
 	"github.com/therecipe/qt v0.0.0-20200701200531-7f61353ee73e/go.mod"
-	"github.com/therecipe/qt v0.0.0-20200904063919-c0c124a5770d"
 	"github.com/therecipe/qt/internal/binding/files/docs/5.12.0 v0.0.0-20200904063919-c0c124a5770d"
 	"github.com/therecipe/qt/internal/binding/files/docs/5.12.0 v0.0.0-20200904063919-c0c124a5770d/go.mod"
 	"github.com/therecipe/qt/internal/binding/files/docs/5.13.0 v0.0.0-20200904063919-c0c124a5770d"
@@ -300,10 +292,21 @@ EGO_SUM=(
 	"github.com/yudai/pp v2.0.1+incompatible/go.mod"
 	"go.etcd.io/bbolt v1.3.5"
 	"go.etcd.io/bbolt v1.3.5/go.mod"
+	"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod"
+	"golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod"
+	"golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2"
+	"golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod"
 	"golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod"
 	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
 	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
 	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/mobile v0.0.0-20190910184405-b558ed863381/go.mod"
 	"golang.org/x/mobile v0.0.0-20200801112145-973feb4309de/go.mod"
 	"golang.org/x/mod v0.1.0/go.mod"
 	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
@@ -320,13 +323,11 @@ EGO_SUM=(
 	"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
 	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
 	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
-	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110"
 	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
 	"golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4"
 	"golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod"
 	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
 	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
 	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
 	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c"
 	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
@@ -335,6 +336,7 @@ EGO_SUM=(
 	"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
 	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
 	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
 	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
 	"golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod"
 	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
@@ -342,13 +344,10 @@ EGO_SUM=(
 	"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
 	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
 	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
-	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68"
 	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
-	"golang.org/x/sys v0.0.0-20210303074136-134d130e1a04"
 	"golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod"
 	"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44"
 	"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod"
-	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
 	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
 	"golang.org/x/text v0.3.0/go.mod"
 	"golang.org/x/text v0.3.2/go.mod"
@@ -362,6 +361,7 @@ EGO_SUM=(
 	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
 	"golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod"
 	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190909214602-067311248421/go.mod"
 	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
 	"golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69"
 	"golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod"