gentoo resync : 21.08.2021

13 files changed, 419 insertions, 19 deletions

diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index da457efe23dc..c36cf0bbcf97 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index 296b79c90738..14613e3b7d67 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -18,4 +18,5 @@ DIST qmail-smtputf8.patch 6693 BLAKE2B 1b9cd78e63ab9f2f8ca9f49c49406f603efb31d32
 DIST qmail-spp-0.42.tar.gz 18689 BLAKE2B df67f10f6daf9601fd074c774c5be4decca59f3e790774d502c28ebd495f9d7523ecebfd37abd333e347151647364d08d3ccc25099c82748bf7b7ea84bb18977 SHA512 03449862886a0ca20fbadab4c94b34b55d185f8df3261bd68aea99e9ded9edfab4477c6b38a8e0295e9b38b0045615da8b1a906a458f28745eadd3c4d882bcbf
 DIST vu555316.patch 617 BLAKE2B fa98c360cb199fc4367c668d605399cc53ab2d26668f5ed6bbf0c26449fdf584f71fd415d80ba7babb6593dc842ec342aba4f7357ae838e6556d43f1dc76b6d9 SHA512 5d7810360e5eaa8e8ee141fe92c765d9458aa12198a8d0ac702e0630e08d060ad4a1d33690d434f20f5aff79eb200cd8173bebc334c411e340c0198b5d8d1a65
 EBUILD netqmail-1.06-r14.ebuild 4304 BLAKE2B 3f76458c2a06a2cc8a8d65403a68a0e765e8cabc922f7809f8c70fcd09bd59e7a43410df96948fcc4d0b4926613e396d43be376386685a6a114c6a1f5207bd6d SHA512 89a0da991e4e28c6ef9b21e0ee5c61167a21e42edb080377a9b55fa7ffe5f7ac7a58dc45f7f71de81a6b873dc5a2d29f7e993546967893ea9e448f0d7134ec00
+EBUILD netqmail-1.06-r15.ebuild 4322 BLAKE2B 05ac92d9d5beff0486051f2bde046339800fde8346ce4c7d23c439b05e5bb7677b258c1f4dbc1f1b4c4f05c228595fad06ca09cb0bda0d3f41147e3867a2674e SHA512 2f34040c546583157744b4b67b101c77ff38e35096a74cad98db5353b2993757bdbb3d526481111524b60bdb4321051e8175fd13318695a5ad608295e64ae29a
 MISC metadata.xml 750 BLAKE2B 57f6e3a507f543a4491fc7b0340050a35bb86efcf987d1bed48b9937fed56a225ff3e5e577a97038b2c21257e321f2fbf1c65f69ccb009c67891f9fcecaf357a SHA512 e973a7170cb17b6b322dd2c63e4bf56a90b6331cbcc7183a647b862e7d0392882773f9171b840f0dbdeb9a411fb72fdf4c000481fcf5d670003c3136327a1fac
diff --git a/mail-mta/netqmail/netqmail-1.06-r15.ebuild b/mail-mta/netqmail/netqmail-1.06-r15.ebuild
new file mode 100644
index 000000000000..093af57c515f
--- /dev/null
+++ b/mail-mta/netqmail/netqmail-1.06-r15.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GENQMAIL_PV=20200817
+QMAIL_SPP_PV=0.42
+
+QMAIL_TLS_PV=20190114
+QMAIL_TLS_F=${PN}-1.05-tls-smtpauth-${QMAIL_TLS_PV}.patch
+QMAIL_TLS_CVE=vu555316.patch
+
+QMAIL_BIGTODO_PV=103
+QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch
+
+QMAIL_LARGE_DNS='qmail-103.patch'
+
+QMAIL_SMTPUTF8='qmail-smtputf8.patch'
+
+inherit qmail
+
+DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent"
+HOMEPAGE="
+	http://netqmail.org
+	https://cr.yp.to/qmail.html
+	http://qmail.org
+"
+SRC_URI="mirror://qmail/${P}.tar.gz
+	https://github.com/DerDakon/genqmail/releases/download/genqmail-${GENQMAIL_PV}/${GENQMAIL_F}
+	https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
+	!vanilla? (
+		highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
+		qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
+		ssl? (
+			https://mirror.alexh.name/qmail/netqmail/${QMAIL_TLS_F}
+			http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
+			https://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch
+		)
+	)
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="authcram gencertdaily highvolume pop3 qmail-spp ssl vanilla"
+REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
+RESTRICT="test"
+
+DEPEND="
+	acct-group/nofiles
+	acct-group/qmail
+	acct-user/alias
+	acct-user/qmaild
+	acct-user/qmaill
+	acct-user/qmailp
+	acct-user/qmailq
+	acct-user/qmailr
+	acct-user/qmails
+	net-dns/libidn2
+	net-mail/queue-repair
+	sys-apps/gentoo-functions
+	sys-apps/groff
+	ssl? ( >=dev-libs/openssl-1.1:0= )
+"
+RDEPEND="${DEPEND}
+	sys-apps/ucspi-tcp
+	authcram? ( >=net-mail/cmd5checkpw-0.30 )
+	ssl? (
+		pop3? ( sys-apps/ucspi-ssl )
+	)
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/nullmailer
+	!mail-mta/opensmtpd
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/ssmtp[mta]
+"
+PDEPEND="
+	virtual/checkpassword
+	virtual/daemontools
+"
+
+src_unpack() {
+	genqmail_src_unpack
+	use qmail-spp && qmail_spp_src_unpack
+
+	unpack ${P}.tar.gz
+}
+
+PATCHES=(
+	"${FILESDIR}/${PV}-exit.patch"
+	"${FILESDIR}/${PV}-readwrite.patch"
+	"${DISTDIR}/${QMAIL_LARGE_DNS}"
+	"${FILESDIR}/${PV}-fbsd-utmpx.patch"
+	"${FILESDIR}/${P}-ipme-multiple.patch"
+	"${FILESDIR}/${P}-any-to-cname.patch"
+	"${FILESDIR}/${P}-CVE-2005-1513.patch"
+	"${FILESDIR}/${P}-CVE-2005-1514.patch"
+	"${FILESDIR}/${P}-CVE-2005-1515.patch"
+	"${FILESDIR}/${P}-overflows.patch"
+)
+
+src_prepare() {
+	if ! use vanilla; then
+		if use ssl; then
+			# This patch contains relative paths and needs to be cleaned up.
+			sed 's~^--- \.\./\.\./~--- ~g' \
+				< "${DISTDIR}"/${QMAIL_TLS_F} \
+				> "${T}"/${QMAIL_TLS_F} || die
+			PATCHES+=( "${T}/${QMAIL_TLS_F}"
+				"${DISTDIR}/${QMAIL_TLS_CVE}"
+				"${FILESDIR}/qmail-smtputf8.patch"
+				"${FILESDIR}/qmail-smtputf8-crlf-fix.patch"
+			)
+		fi
+		if use highvolume; then
+			PATCHES+=( "${DISTDIR}/${QMAIL_BIGTODO_F}" )
+		fi
+
+		if use qmail-spp; then
+			if use ssl; then
+				SPP_PATCH="${QMAIL_SPP_S}/qmail-spp-smtpauth-tls-20060105.diff"
+			else
+				SPP_PATCH="${QMAIL_SPP_S}/netqmail-spp.diff"
+			fi
+			# make the patch work with "-p1"
+			sed -e 's#^--- \([Mq]\)#--- a/\1#' -e 's#^+++ \([Mq]\)#+++ b/\1#' -i ${SPP_PATCH} || die
+
+			PATCHES+=( "${SPP_PATCH}" )
+		fi
+	fi
+
+	default
+
+	qmail_src_postunpack
+
+	# Fix bug #33818 but for netqmail (Bug 137015)
+	if ! use authcram; then
+		einfo "Disabled CRAM_MD5 support"
+		sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c || die
+	else
+		einfo "Enabled CRAM_MD5 support"
+	fi
+
+	ht_fix_file Makefile*
+}
+
+src_compile() {
+	qmail_src_compile
+	use qmail-spp && qmail_spp_src_compile
+}
+
+src_install() {
+	qmail_src_install
+}
+
+pkg_postinst() {
+	qmail_queue_setup
+	qmail_rootmail_fixup
+	qmail_tcprules_build
+
+	qmail_config_notice
+	qmail_supervise_config_notice
+	elog
+	elog "If you are looking for documentation, check those links:"
+	elog "https://wiki.gentoo.org/wiki/Virtual_mail_hosting_with_qmail"
+	elog "  -- qmail/vpopmail Virtual Mail Hosting System Guide"
+	elog "http://www.lifewithqmail.com/"
+	elog "  -- Life with qmail"
+	elog
+}
+
+pkg_config() {
+	# avoid some weird locale problems
+	export LC_ALL=C
+
+	qmail_config_fast
+	qmail_tcprules_config
+	qmail_tcprules_build
+
+	use ssl && qmail_ssl_generate
+}
diff --git a/mail-mta/notqmail/Manifest b/mail-mta/notqmail/Manifest
index 2932910ac19b..44274bafc550 100644
--- a/mail-mta/notqmail/Manifest
+++ b/mail-mta/notqmail/Manifest
@@ -6,6 +6,6 @@ DIST notqmail-1.08-tls-20200107.patch 50123 BLAKE2B 94bbab86bd089c6ac032bfabc300
 DIST notqmail-1.08-tls-spp.patch 64223 BLAKE2B d2337017dacd41d975a9ebd4650cce58425c3c6e1ebfaaaf29a222a532cfd246fec16f52997e85eb921ad376235eb69a8580ba8df493bf760f3d8237311411c0 SHA512 012cdc62c2361737fb984e750a28bd06f357aefd9fa8d909e2e380e65fc5ae3a2cbef3f592eb60455ad858385dbf8e8b50a2f6358a9ffa3f885aa76250a336a0
 DIST notqmail-1.08.tar.xz 179500 BLAKE2B 6c774037b257849aea65e7761a6f6c9918079faa490c0ed027d73a8b32de5d5907a54a59162b9b68479229c4b92a23fe28cd2f334123cfe674a94502b90a3635 SHA512 c18d09e28c2e580522eea144e5344e814811108b12f3272b4cf10ad58d9d3d8e666616dcfea2f369e226b68db4fe8cf67cbae994b242d36e9e07c289a0539394
 DIST qmail-103.patch 2104 BLAKE2B 23721b3331c719f3b6deca8b2603bf824b66068d3901a84dda9edbe33b506d0c2b6e711364e2426d9e393453a54485f0286d4668f99cf6b9acabf10a5dc59b0a SHA512 b81062bb0b0023f474c0b6af40601926e1c04ad395de480d114809e48a8060c06d99bdbdeb6f44d9e24ae1acedabb094b979193d305371aed958f18fc6eee354
-EBUILD notqmail-1.08-r3.ebuild 4345 BLAKE2B 3acf5aa25d847b394dd95c71184099cf293d45ba94f3cdea265b8a6061ca1eacf3dea520735e93ebfd1ba2f0b80026b43e5cac349655d01a27bbb498fad6b3c5 SHA512 9c69b88ce22a52bb3ee2a566d096515f1893110fad00cd2566c20441056c18e2a98270527ece512c79a6b570df255ba836228c8aea3aa4b576d9680694ae0b82
-EBUILD notqmail-9999.ebuild 4200 BLAKE2B 1767f0d643eba378498ef256e20a1030a78bec0e8c610f44317eccdfd32c2da33700b5285074541e0677ab7a514ebd7b2e9ef68e1b3212a350b37fbc3145e1e7 SHA512 cee482b43bd22f77ae2f1a958eba78bdf1f88ab96961c526ad8fb98da0df958800a5b80d1e4bf3efd754f6d841b11a22b91db6377d8ead1f472b427960fa9b02
+EBUILD notqmail-1.08-r4.ebuild 4357 BLAKE2B 0703b5f20431a97a71394e840a1d6e73266efe0e575af5bc8001587f6ba9fe9b555dbcd24294aeb593ae7ff0f7ae4ee7439b6e7933c098ee1443951fa056ef8c SHA512 8fc5b44175d807f7f69b9cf868204a87c62e1dc2e744009c120f77b73eb07911fa41054f7abbe9976835f7fc0bcc5db98409c4379e82b52a5eae3755a51b9f69
+EBUILD notqmail-9999.ebuild 4212 BLAKE2B 912e80676f3d90c6ee04e176246eacd4fff76d99b5edcb29f2332925ad22885ceb71b7ebc5627abd590b707746d9fee42f3240ea8d222990c6683474956a1bff SHA512 b98f08f3ff2f5b006d6f02142eedd57744074a295da580d920533bd69182cfca2060536bc76c3e71ad7ee35b6d92889b5d0df0ffd69f68355bebe02f80f01c08
 MISC metadata.xml 807 BLAKE2B 3bbc2374094c3bcfab161787b20321ab8dac7e861c758f4803507d6063b3441c382ce8dd3447c6e939181d32d06547bf91c47d4928a1e5ce8a76eca6c7db496c SHA512 e0619acfcebadc9b2d1ff7c47767426528c74d157072a489b61f8cc61c549671544744c6fd74c4531c2bed04974157fd12010c5ef6b28380d11723446549084b
diff --git a/mail-mta/notqmail/notqmail-1.08-r3.ebuild b/mail-mta/notqmail/notqmail-1.08-r4.ebuild
index 6afc55ac3bde..e9e36f9d9138 100644
--- a/mail-mta/notqmail/notqmail-1.08-r3.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 GENQMAIL_PV=20200817
 QMAIL_SPP_PV=0.42
@@ -78,8 +78,6 @@ RDEPEND="${DEPEND}
 	acct-user/qmailr
 	acct-user/qmails
 	sys-apps/ucspi-tcp
-	virtual/checkpassword
-	virtual/daemontools
 	authcram? ( >=net-mail/cmd5checkpw-0.30 )
 	ssl? (
 		pop3? ( sys-apps/ucspi-ssl )
@@ -96,6 +94,10 @@ RDEPEND="${DEPEND}
 	!mail-mta/sendmail
 	!mail-mta/ssmtp[mta]
 "
+PDEPEND="
+	virtual/checkpassword
+	virtual/daemontools
+"
 
 src_unpack() {
 	genqmail_src_unpack
diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild
index 224aaed06285..baec765a78d4 100644
--- a/mail-mta/notqmail/notqmail-9999.ebuild
+++ b/mail-mta/notqmail/notqmail-9999.ebuild
@@ -75,8 +75,6 @@ RDEPEND="${DEPEND}
 	acct-user/qmailr
 	acct-user/qmails
 	sys-apps/ucspi-tcp
-	virtual/checkpassword
-	virtual/daemontools
 	authcram? ( >=net-mail/cmd5checkpw-0.30 )
 	ssl? (
 		pop3? ( sys-apps/ucspi-ssl )
@@ -93,6 +91,10 @@ RDEPEND="${DEPEND}
 	!mail-mta/sendmail
 	!mail-mta/ssmtp[mta]
 "
+PDEPEND="
+	virtual/checkpassword
+	virtual/daemontools
+"
 
 src_unpack() {
 	genqmail_src_unpack
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 5dedacfbbdf1..d6d837f81426 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -6,8 +6,8 @@ AUX smtp.sasl 42 BLAKE2B 67e9108101779b6027fa1e5cc7c9256a606d440e15bb037a0da186e
 DIST postfix-3.6.1.tar.gz 4748754 BLAKE2B c64d8f4c12cd7cb39bd15c371c20db4aa61b39120b6c078eda7c48c94d65e181b51ac8f74f3231791fc3ad6c0d04f74975f50776f984ffa9b9f8a4c5c99cbade SHA512 6f83a6aa55bd442fe005b35c7470483ff5ba6781121f783b07ef454580354fc5c85d0d5106936810d6bef0f5592937f0863eec3b82e138caac7694e2a3bb7bc3
 DIST postfix-3.6.2.tar.gz 4749530 BLAKE2B 349f3eb2995fe72c89e374a2f95cbb09d4a4f5a5c896e340a2a166ffcb2c498ba514022a59a17d2731807f6dadc03f804a3d4b16127dd2d6addb825558b7ffd6 SHA512 464ce9ec77e637ede91123472a0383b2bfda52102f9e9852c7191016d4fda2e14f302f2db9793887c182688c2a14dde6eeda728523196a627a8028f99555a4d9
 DIST postfix-3.7-20210815.tar.gz 4756174 BLAKE2B a699ba9b58927e0cbab0f47331f295a41f2aeb27ea62d8ba10ba18ebcefc6f8868dbcca6a3c1893400547e4b40b6af2013f7eeda38fce11fe4e7c9a69f1c922e SHA512 e5dc03dad32bba501c819e1ed53e501119c138b21fcf2ed895014dd4c99d7830c8c3363ae6dddb30c5e232dd1ad1ea57e0dac756585868b0c956ac52fb06818e
-EBUILD postfix-3.6.1.ebuild 7978 BLAKE2B 66c865d94f250d4ef3ae2c3dc24a0fb184f85cc67cb5e461c8bf46178415b649e80c6b936dd6e85e02adab33e7ef2b6a5e451500dea66967b97f32f0bd17d107 SHA512 368f073d877c9d49e4b38f5c603b30e99c23505c2bce1262b0152a03dfb4bfafeb2d43dc6cdc67e2c4cd4ac4559ebaec61df21d674eba026c27a38c386d14ff0
-EBUILD postfix-3.6.2-r1.ebuild 7968 BLAKE2B b275a53bea871cf3d7a4a124fd169114bebcf93e544fb4729211fa9f5ce83f65d91daf5ac2da08f1bb36060a0e0550072bf0afa7081be0ca6ed0dcfbf82fdfdf SHA512 55ed05197c60227868980d6fc6bd75092483dd11fbffedc2bf82da59389f641a8df89ffc320b137b44d05780c8048884e2ecc571b569de2354e7d573e37a6340
-EBUILD postfix-3.6.2.ebuild 7917 BLAKE2B 58ccfe215e40993ce6dcc20646a3083d2e4ec8c7e6575b65facf3060a15d4ea7184e2ae6130336099ad908b8283eef8947c0fc4db5532801f77c930082b8b5b5 SHA512 aabb59f03bef2d4a8e917c102da12f510b33dd148fa25cd8306c06bb7bd9aafef0d1b41f8e87f768b4927b33c6ebe82290cf3293bd0e0a32739489dab1a8b10d
-EBUILD postfix-3.7_pre20210815.ebuild 7925 BLAKE2B 21e1d85a0404946a7829e7991ba6172c452b36cda8aee27df48ed3ccda5394f9d0748d59583ecee39e04bde206c078841e09797e6e3fa54a173486b99980f451 SHA512 7f1161f3e773e5202946af10b138d9e1829c9383c042a26b47d68e02e6c43cbeaae5d8198430b2a5a3319f535a672ddf294431db0ca82e7d16f85b3734b14cf7
+EBUILD postfix-3.6.1-r1.ebuild 7982 BLAKE2B a2e700693bdabe624f503be1b09010518b6fcf02e364dde1c88b4c81927b13d99244f049f11228ea74f653cc90ed48c9c2b1ee6012b1a379afaf8f7bad7fd6b8 SHA512 97e2a0f1c4a92118ad08afdcb03ec3caaa7d1611d424c45379522ea7136899846f66f4990971012bc2dd8233d7c741889c4e787556bfae2b0c1c75a8568e891b
+EBUILD postfix-3.6.2-r3.ebuild 7921 BLAKE2B c4a41f841ffb79b1d9e6c4fc858d70a34bb6b261e6150366bd152691785a8df1da11c599ef31f27f7a07f1d581ea72538664309739b55177d4531214052510d0 SHA512 3eb3d37002ea634adf28d54c67912af98631e6ef7443a59be0fd990050f35fc941637a9fb2ca4202c1ee62e359b2a992ac1d7c99b6a8551e07e286f31b14cc0e
+EBUILD postfix-3.6.2-r4.ebuild 7972 BLAKE2B eb18cab2c20f1684395abae6afa06e4cea8db7543a1dedce106c6bc1b1b17996c842c76a68a4913a2d256e9e3c1e151dd1a3ddc535541d7b39a425f63413610b SHA512 1df2d5dfbd7c065a82386ce2a7d2b63891436951ef02ec250241bf17c2e2d95867c14d15cc5a211235da0dc40ab89737f4db6c8505da8395c8cb993ae81e4e8c
+EBUILD postfix-3.7_pre20210815-r1.ebuild 7929 BLAKE2B 164ff69129c6d4a246dc15a4c27340c6500df5d701da2a0f0d451f9fbc013afb848103c640f873cca58f5cc8aa8696d2b31cc5a0bba69581557349136c067731 SHA512 4c6fe1b2625c343f838313ae08128e81629c6ec76714481a165838d6a9aab56287318391fa7f93e5891120c11f4b0a3dcdd0d49a0d75f604f39625c2f06ce72f
 MISC metadata.xml 866 BLAKE2B 341527ecb22f2ec1bb1125c0c9bc9191935ef6f64a7dcf5c3320f7a245b8480eadca539359cb62af1f89ea9091074d621e88c1b2ba2437d1e367cff3c7856b8f SHA512 3f1dd670329e7752770de72e4df9e984e17346a3ff6ff01a9f16fd251f4dde67f59a4178b253ba1fb76c16c2bcd9ae390e15db97de1d3f550581408710a85a84
diff --git a/mail-mta/postfix/postfix-3.6.1.ebuild b/mail-mta/postfix/postfix-3.6.1-r1.ebuild
index 3ae2ed817ecd..acb3e7b9e452 100644
--- a/mail-mta/postfix/postfix-3.6.1.ebuild
+++ b/mail-mta/postfix/postfix-3.6.1-r1.ebuild
@@ -29,9 +29,9 @@ DEPEND="
 	eai? ( dev-libs/icu:= )
 	ldap? ( net-nds/openldap )
 	ldap-bind? ( net-nds/openldap[sasl] )
-	lmdb? ( >=dev-db/lmdb-0.9.11 )
+	lmdb? ( >=dev-db/lmdb-0.9.11:= )
 	mysql? ( dev-db/mysql-connector-c:0= )
-	nis? ( net-libs/libnsl )
+	nis? ( net-libs/libnsl:= )
 	pam? ( sys-libs/pam )
 	postgres? ( dev-db/postgresql:* )
 	sasl? (  >=dev-libs/cyrus-sasl-2 )
diff --git a/mail-mta/postfix/postfix-3.6.2.ebuild b/mail-mta/postfix/postfix-3.6.2-r3.ebuild
index 84f99b91b850..bf009bbecf7c 100644
--- a/mail-mta/postfix/postfix-3.6.2.ebuild
+++ b/mail-mta/postfix/postfix-3.6.2-r3.ebuild
@@ -29,9 +29,9 @@ DEPEND="
 	eai? ( dev-libs/icu:= )
 	ldap? ( net-nds/openldap )
 	ldap-bind? ( net-nds/openldap[sasl] )
-	lmdb? ( >=dev-db/lmdb-0.9.11 )
+	lmdb? ( >=dev-db/lmdb-0.9.11:= )
 	mysql? ( dev-db/mysql-connector-c:0= )
-	nis? ( net-libs/libnsl )
+	nis? ( net-libs/libnsl:= )
 	pam? ( sys-libs/pam )
 	postgres? ( dev-db/postgresql:* )
 	sasl? (  >=dev-libs/cyrus-sasl-2 )
diff --git a/mail-mta/postfix/postfix-3.6.2-r1.ebuild b/mail-mta/postfix/postfix-3.6.2-r4.ebuild
index 823fde3d62d1..9fe7bafd66bf 100644
--- a/mail-mta/postfix/postfix-3.6.2-r1.ebuild
+++ b/mail-mta/postfix/postfix-3.6.2-r4.ebuild
@@ -29,9 +29,9 @@ DEPEND="
 	eai? ( dev-libs/icu:= )
 	ldap? ( net-nds/openldap )
 	ldap-bind? ( net-nds/openldap[sasl] )
-	lmdb? ( >=dev-db/lmdb-0.9.11 )
+	lmdb? ( >=dev-db/lmdb-0.9.11:= )
 	mysql? ( dev-db/mysql-connector-c:0= )
-	nis? ( net-libs/libnsl )
+	nis? ( net-libs/libnsl:= )
 	pam? ( sys-libs/pam )
 	postgres? ( dev-db/postgresql:* )
 	sasl? (  >=dev-libs/cyrus-sasl-2 )
diff --git a/mail-mta/postfix/postfix-3.7_pre20210815.ebuild b/mail-mta/postfix/postfix-3.7_pre20210815-r1.ebuild
index 02153fbc289f..f5274f856140 100644
--- a/mail-mta/postfix/postfix-3.7_pre20210815.ebuild
+++ b/mail-mta/postfix/postfix-3.7_pre20210815-r1.ebuild
@@ -29,9 +29,9 @@ DEPEND="
 	eai? ( dev-libs/icu:= )
 	ldap? ( net-nds/openldap )
 	ldap-bind? ( net-nds/openldap[sasl] )
-	lmdb? ( >=dev-db/lmdb-0.9.11 )
+	lmdb? ( >=dev-db/lmdb-0.9.11:= )
 	mysql? ( dev-db/mysql-connector-c:0= )
-	nis? ( net-libs/libnsl )
+	nis? ( net-libs/libnsl:= )
 	pam? ( sys-libs/pam )
 	postgres? ( dev-db/postgresql:* )
 	sasl? (  >=dev-libs/cyrus-sasl-2 )
diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
index 2cfd5af867f6..cb3fa901b670 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -13,6 +13,8 @@ AUX site.config.m4 564 BLAKE2B 85bcbe7b9a26071aedf0d1b530c1276d93de21d82972add09
 AUX sm-client.service 418 BLAKE2B a9057cac008c11d3cfd5a4b662cf3fc71a33be79e8890a54e556a258b098ceccc2e9941f62dce868498751bd22f23f45289bc84a8250020b140acbd2b6508b58 SHA512 26e5a64790fd7106e45de0f4dfafb3b648094953bd1831a223ca7c60b7cb75b673fb554b426a6aa0e7dc200a134fd042b4ecc6795641cfddd82bd04e4c7ea324
 DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc45a5d730d2bed1ef956adb574721833f87aeba0475705b76e0c7d6cf00f9a10025bffb0de6c6b4dae606eb2ec399 SHA512 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9
 DIST sendmail.8.16.1.tar.gz 2236402 BLAKE2B 80a9c2f1d04719099703e55f0a0c54fd638cf69b72839d358ae6863c95c9e0965d1b7fdd5b1807bec1ffdf87bca0c7c9ba91060962e6de5da5bf14422f6279ea SHA512 d7d4aac3c6d7505782abdb166204901b8b51cac000d610dfe40eda9eef7441a073af9e8e0b14c8719b07b445f55a1e2c28ac63d663d0daa7f1eafc5a101788b2
+DIST sendmail.8.17.1.tar.gz 2284027 BLAKE2B 4cbbc2bb536a48ea27994721e9dfefff7739ef1c825bbc0397202e600d8dad8f9a2572a777204693cf9630f767865d50566f0827be6b52be41c1e25532cb394c SHA512 ae42343fb06c09f2db5d919d602afc4241914387dfdae0f15e0967dda3be25bf1d3a4637b57266763679646a3cea6aa07e6453266fd9b7358c1a09ec2b627a15
 EBUILD sendmail-8.15.2-r2.ebuild 7199 BLAKE2B 801a30a6d9d71d3aa34ddf3910c9bb4658d687905b3df1e17052b9bbab692db74d2e703906cff948ba173684e08668f44274afb2fd9d269f51607dd2318a8d46 SHA512 9a8e3c5118e64bad84082d34b9593aec4b3bbf7bee23aea056a32b1d5bdae797086d4a0e342f217cd91bec9dc112cd387b7c02401eb800ac7f613fd5eecbcbb2
 EBUILD sendmail-8.16.1-r1.ebuild 6152 BLAKE2B bef102ab5a1c63b6e55ad7b170a43d55147a98fccabf0715fddc51b94e71421801ffb33babc1f22ae35e1d3f91b72e0afac9c80f8400034471f052e7a590b789 SHA512 c2b27b940a3ab8fa675f7460cce64cd6b0ae97eadacfec3253fc6eababe267f3b59bf9ee30b9729d3e78a60554c72c9934c0573fd6450fcdb4c9c4639a2f8654
+EBUILD sendmail-8.17.1.ebuild 6149 BLAKE2B 17395bc10d88d312057472a4852749a31f2123da2430f2b647b5c78ad3afbb312401801eb1fc5edca0dfad2dac73796b5878e3624dfd1e393d6b8c1e6b4500bb SHA512 38cf933f9ac83640d342afcc00246943c39cf1f19f5083e9a6aa69644fbb094e2720e33966f7882d6222b490313d97837ac88258f6c54a3780c96f6d24d14a4c
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/mail-mta/sendmail/sendmail-8.17.1.ebuild b/mail-mta/sendmail/sendmail-8.17.1.ebuild
new file mode 100644
index 000000000000..cfb7fea30f81
--- /dev/null
+++ b/mail-mta/sendmail/sendmail-8.17.1.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Note: please bump this together with mail-filter/libmilter
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="Widely-used Mail Transport Agent (MTA)"
+HOMEPAGE="https://www.sendmail.org/"
+SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz"
+
+LICENSE="Sendmail GPL-2" # GPL-2 is here for initscript
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="ipv6 ldap mbox nis sasl sockets ssl tcpd"
+
+BDEPEND="
+	sys-devel/m4
+	virtual/pkgconfig"
+DEPEND="
+	acct-group/smmsp
+	>=acct-user/smmsp-0-r2
+	net-mail/mailbase
+	>=sys-libs/db-3.2:=
+	ldap? ( net-nds/openldap )
+	nis? ( net-libs/libnsl:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.10 )
+	ssl? ( dev-libs/openssl:0= )
+	tcpd? ( sys-apps/tcp-wrappers )"
+RDEPEND="
+	${DEPEND}
+	>=mail-filter/libmilter-1.0.2_p2
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/opensmtpd
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	!net-mail/vacation"
+PDEPEND="!mbox? ( mail-filter/procmail )"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-8.16.1-build-system.patch
+	eapply -p0 "${FILESDIR}"/${PN}-delivered_hdr.patch
+	eapply_user
+
+	local confCCOPTS="${CFLAGS}"
+	local confENVDEF="-DMAXDAEMONS=64 -DHAS_GETHOSTBYNAME2=1"
+	local confLDOPTS="${LDFLAGS}"
+	local confLIBS=
+	local confMAPDEF="-DMAP_REGEX"
+	local conf_sendmail_LIBS=
+
+	if use ldap; then
+		confMAPDEF+=" -DLDAPMAP"
+		confLIBS+=" -lldap -llber"
+	fi
+
+	if use sasl; then
+		confCCOPTS+=" $($(tc-getPKG_CONFIG) --cflags libsasl2)"
+		confENVDEF+=" -DSASL=2"
+		conf_sendmail_LIBS+=" $($(tc-getPKG_CONFIG) --libs libsasl2)"
+	fi
+
+	if use ssl; then
+		# Bug #542370 - lets add support for modern crypto (PFS)
+		confCCOPTS+=" $($(tc-getPKG_CONFIG) --cflags openssl)"
+		confENVDEF+=" -DSTARTTLS -D_FFR_DEAL_WITH_ERROR_SSL"
+		confENVDEF+=" -D_FFR_TLS_1 -D_FFR_TLS_EC"
+		conf_sendmail_LIBS+=" $($(tc-getPKG_CONFIG) --libs openssl)"
+	fi
+
+	if use tcpd; then
+		confENVDEF+=" -DTCPWRAPPERS"
+		confLIBS+=" -lwrap"
+	fi
+
+	use ipv6 && confENVDEF+=" -DNETINET6"
+	use nis && confENVDEF+=" -DNIS"
+	use sockets && confENVDEF+=" -DSOCKETMAP"
+
+	sed -e "s|@@confCC@@|$(tc-getCC)|" \
+		-e "s|@@confCCOPTS@@|${confCCOPTS}|" \
+		-e "s|@@confENVDEF@@|${confENVDEF}|" \
+		-e "s|@@confLDOPTS@@|${confLDOPTS}|" \
+		-e "s|@@confLIBS@@|${confLIBS}|" \
+		-e "s|@@confMAPDEF@@|${confMAPDEF}|" \
+		-e "s|@@conf_sendmail_LIBS@@|${conf_sendmail_LIBS}|" \
+		"${FILESDIR}"/site.config.m4 > devtools/Site/site.config.m4 \
+		|| die "failed to generate site.config.m4"
+
+	echo "APPENDDEF(\`confLIBDIRS', \`-L${EPREFIX}/usr/$(get_libdir)')" \
+		>> devtools/Site/site.config.m4 || die "failed adding to site.config.m4"
+}
+
+src_compile() {
+	sh Build AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "compilation failed in main build script"
+}
+
+src_install() {
+	dodir /usr/{bin,$(get_libdir)}
+	dodir /usr/share/man/man{1,5,8} /usr/sbin /usr/share/sendmail-cf
+	dodir /var/spool/{mqueue,clientmqueue} /etc/conf.d
+
+	keepdir /var/spool/{clientmqueue,mqueue}
+
+	local emakeargs=(
+		DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)"
+		MANROOT=/usr/share/man/man
+		SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root
+		MANOWN=root MANGRP=root INCOWN=root INCGRP=root
+		LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root
+		MSPQOWN=root CFOWN=root CFGRP=root
+	)
+
+	local dir
+	for dir in libsmutil sendmail mailstats praliases smrsh makemap vacation editmap; do
+		emake -j1 -C obj.*/${dir} "${emakeargs[@]}" install
+	done
+	for dir in rmail mail.local; do
+		emake -j1 -C obj.*/${dir} "${emakeargs[@]}" force-install
+	done
+
+	fowners root:smmsp /usr/sbin/sendmail
+	fperms 2555 /usr/sbin/sendmail
+	fowners smmsp:smmsp /var/spool/clientmqueue
+	fperms 770 /var/spool/clientmqueue
+	fperms 700 /var/spool/mqueue
+	dosym ../sbin/makemap /usr/bin/makemap
+	dodoc FAQ KNOWNBUGS README RELEASE_NOTES doc/op/op.ps
+
+	dodoc sendmail/{SECURITY,TUNING}
+	newdoc sendmail/README README.sendmail
+	newdoc smrsh/README README.smrsh
+
+	newdoc cf/README README.cf
+	newdoc cf/cf/README README.install-cf
+
+	dodoc -r contrib
+
+	cp -pPR cf/. "${ED}"/usr/share/sendmail-cf || die
+
+	insinto /etc/mail
+	if use mbox; then
+		newins "${FILESDIR}"/sendmail.mc-r1 sendmail.mc
+	else
+		newins "${FILESDIR}"/sendmail-procmail.mc sendmail.mc
+	fi
+
+	# See discussion on bug #730890
+	m4 "${ED}"/usr/share/sendmail-cf/m4/cf.m4 \
+		<(grep -v "${EPREFIX}"/usr/share/sendmail-cf/m4/cf.m4 "${ED}"/etc/mail/sendmail.mc) \
+		> "${ED}"/etc/mail/sendmail.cf || die "cf.m4 failed"
+
+	echo "include(\`/usr/share/sendmail-cf/m4/cf.m4')dnl" \
+		> "${ED}"/etc/mail/submit.mc || die "submit.mc echo failed"
+
+	cat "${ED}"/usr/share/sendmail-cf/cf/submit.mc \
+		>> "${ED}"/etc/mail/submit.mc || die "submit.mc cat failed"
+
+	echo "# local-host-names - include all aliases for your machine here" \
+		> "${ED}"/etc/mail/local-host-names || die "local-host-names echo failed"
+
+	cat <<- EOF > "${ED}"/etc/mail/trusted-users || die "trusted-users cat failed"
+		# trusted-users - users that can send mail as others without a warning
+		# apache, mailman, majordomo, uucp are good candidates
+	EOF
+
+	cat <<- EOF > "${ED}"/etc/mail/access || die "access cat failed"
+		# Check the /usr/share/doc/sendmail/README.cf file for a description
+		# of the format of this file. (search for access_db in that file)
+		# The /usr/share/doc/sendmail/README.cf is part of the sendmail-doc
+		# package.
+		#
+
+	EOF
+
+	cat <<- EOF > "${ED}"/etc/conf.d/sendmail || die "sendmail cat failed"
+		# Config file for /etc/init.d/sendmail
+		# add start-up options here
+		SENDMAIL_OPTS="-bd -q30m -L sm-mta" # default daemon mode
+		CLIENTMQUEUE_OPTS="-Ac -q30m -L sm-cm" # clientmqueue
+		KILL_OPTS="" # add -9/-15/your favorite evil SIG level here
+
+	EOF
+
+	if use sasl; then
+		dodir /etc/sasl2
+		cat <<- EOF > "${ED}"/etc/sasl2/Sendmail.conf || die "Sendmail.conf cat ailed"
+			pwcheck_method: saslauthd
+			mech_list: PLAIN LOGIN
+
+		EOF
+	fi
+
+	doinitd "${FILESDIR}"/sendmail
+	systemd_dounit "${FILESDIR}"/sendmail.service
+	systemd_dounit "${FILESDIR}"/sm-client.service
+}