gentoo resync : 31.08.2021

10 files changed, 5 insertions, 739 deletions

diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 34858f082682..f17188f985c7 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
index 9950f363c67c..cf1b4a0cd7b6 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -1,20 +1,13 @@
-AUX libmilter-sharedlib.patch 2843 BLAKE2B d64be1f4f4561a4056bca9784f00b4c965adbf30e99e1b9318162e6a3dad043eb508e925234a586443a8e8fd992f8aee67557f6c3d1e54f644d9c6c8fa7c267a SHA512 31c36b57739946c1b9c7c85307fe5c53c45d7f8cbf427a0f2248db8b74871a6f5a30ef1af524915821aeca54310d28272bcd0a587cb918192214fa5c30e4a8da
 AUX sendmail 595 BLAKE2B fe4532e30c6bc84effbdd59de70a27e2565fa7b4437c1fdc64ca169adf14702b8fa739123f2b0f0d2069b33939efe0c3382ea51716bf5fb1905f04f6074c8ac2 SHA512 0a1611eeec33a7d7eecff75ed6c8f70abf0d6d8cf4a5242f084da0d4139e0e871239e9893a53782e5dab80c4386c62d96ec03839fc98a497e697fce1f7a149aa
-AUX sendmail-8.14.6-build-system.patch 12909 BLAKE2B 7643aad99583e533246834a069611588dc667ff2c664eb9c6c088d8f340f69306a9e2f56da6f967c34ebdfafcd697498f29f2a05dccce51083b59d9829f4bc8d SHA512 0e03b7cfd7f3002a36fed2fca60240314bac175a502ca9bda8397e7ad07e26faf8d3437bbdcdb9cda4dbc6b4917ca0ed1b5c9126ad246044dc7da8ce3ad70b54
-AUX sendmail-8.15.2-glibc-2.30.patch 1381 BLAKE2B 97822902c9a6fb2ca475a3c3deed93d05d89fc891ef7e45ac4fb7466f8bf549883572f97e190165f79db8b5cff5fcd70b2c52f185294bdbbc022b27a81e2c212 SHA512 fa2bf0a1123c82b000d92ab261039203f0426a1b6c874a1309219456378b7fe656ee2e7dce7fa674f55e6c6e5e8856aea4e32d8e0d3ac67dde934dfc31e48517
-AUX sendmail-8.15.2-openssl-1.1.0-fix.patch 4567 BLAKE2B cd4cce44a65428068783e8c924f7cf8a6eb1b5dd8566d307f6709ec2821f55c77891156c6a01155711590bc48e4d7b3deb76b11de04180507f621d5fb323f2e9 SHA512 ffd3b5de59bc745d45039234b0cbbd6b04ee301333661e9d8e0138b0961e9c21d0b6759ac604058cb62ec94fd9cf77732e57065f73c2a147efac306b1e82b92b
 AUX sendmail-8.16.1-build-system.patch 9701 BLAKE2B f1bbf82ab321b502ecbd5d2658e549275330ec6f6fdd2a31af36aba580adc1fafa74acaf1213798787c5b6c985e86f366f68e4c260212e4856e5778201400bfc SHA512 9a3dad2df6a84729a5dd7dfc7c696acacdb96d1b0856f763604e1183f9fb7e7e5fc6012d4299c9e0a6a57c65d763d4ca607f3c7862a2055aa3aedf3994ed22fe
 AUX sendmail-delivered_hdr.patch 341 BLAKE2B a29362584d77bd317de58c1967a9cfb3a2e0d1c5f0b37504d13c1404830687137f9342fe567ea969b40989115a292d947064f37b307c2a3e9b75051ee53d28ff SHA512 1e97ca1b32e6cbb69fe08d4e1c5dee0763ef874537448e60129f71f82bc92c78fc5d9e124568d21188b6e6e2186a1a3c9f1362b0d0734f7e12e2272643238254
 AUX sendmail-procmail.mc 295 BLAKE2B ca3a2e0939dbf09ab8e4042737bc8c5489bae114baad9a9c09f1d698ad881fd050e57cec42929709b5635e83d3f6393ea1b70c51e01af8110d145d46ec4ec70a SHA512 eb693fb91acdc3cbc4601d517119300f238c20e86dc0dbc137a209ce56bd5bf7d7a8c9848a143daf932be487d919004da994ba2dbd7494ea5be6e08929549d58
-AUX sendmail-starttls-multi-crl.patch 643 BLAKE2B c17c4005f861a4ab29b95e212a55684e655f04dc53da3c78ced3a2228b47376b5ad5eddbdc7e0a339d03c6e701a7e5d403698f07c1a76bf4aa031196131c2d87 SHA512 3028c9aca8b1f69d911b8fa78027acc949b1584fdb5be514ee71cb2860658ed1a13ee964696a93af3e9999c7f02526c046455d8740129d3eea546c272df24bd2
 AUX sendmail.mc-r1 285 BLAKE2B 7710e6ae53d3b8e8756a63629a3c6c7f0c8dd21b7f6dc82b9d0bafe426f450132a85f2163f6b832ea6b100eba70c95a4a2927b6a0848faf45891777e0a6eb51d SHA512 f197572f4004cd1f9de4c423d1d5ded382535b9643b32aa8dc03889cdf76bf918702a77a20edde5f2d19276ca7ec473cac5db01c42b0833cda950cfc11cbbf41
 AUX sendmail.service 349 BLAKE2B dc154b2fed04553247f3a64e31351377e18f95830dac22b4498f8e2afd7e91844081d7f8eb2efb2e8b9ec9fdf022d919eccb4f383b99c1fa9ec989cc5b69cbde SHA512 4e0f263e5d125cfb0c80f96416ffd1bdb7ce3f53fa78fc516fadd3ef10c6bd6f148e081c2b9f1be4394198fd45713b47520462b70b16bdf6a3c771fa18bbe5e7
 AUX site.config.m4 564 BLAKE2B 85bcbe7b9a26071aedf0d1b530c1276d93de21d82972add0908c035a958dc34ebe15941a37add15f24116e3cf2779bf003d965baae10dbbcafdb61f0af453227 SHA512 82d9bbb233e6ffbcef411f8a8184b47aea27f3dc0b41ace053e0107e05a5fe6929d9dd76d3d1baf0ce43be78dc46f40888ad0c93e4f126f6ce0c0372007a262d
 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 6146 BLAKE2B 747051af91275349853db7e69fe8aca920b56ec065afb6d22a8961a7821f003b1b405413d8afe9b55b88f4cbb3b8d0e9aaf1b482b88eee55107cfd4e21d2f872 SHA512 745c60d10b74289043c5fd13754afd275aa76b163d5276b1184c8e96e5ffe69c6ba01af687435c276944c136790d7a94047db88aa510082621cb625790c11ad5
-EBUILD sendmail-8.17.1.ebuild 6149 BLAKE2B 17395bc10d88d312057472a4852749a31f2123da2430f2b647b5c78ad3afbb312401801eb1fc5edca0dfad2dac73796b5878e3624dfd1e393d6b8c1e6b4500bb SHA512 38cf933f9ac83640d342afcc00246943c39cf1f19f5083e9a6aa69644fbb094e2720e33966f7882d6222b490313d97837ac88258f6c54a3780c96f6d24d14a4c
+EBUILD sendmail-8.16.1-r1.ebuild 6145 BLAKE2B 2658a8af147a832ad5c557b014211a75acff24c13b6053490435e5694284feedd6850bf8072eb381b69e042967ae09349e1d96cb08cbecbcabf9b5102d4e4c7a SHA512 5d6dd7fd32b0d5b3959d6e0addae86e7c06095b01af83ddebb09b93e28fc23f514697efc9056cc940bd0b62876b48ce64fe4d025f1911f878c1e6c90d3f157c9
+EBUILD sendmail-8.17.1-r1.ebuild 6191 BLAKE2B 4740bda46439b5200e8fe0a702f85482e7062c8183d8a681de9ecf613fd4496ec805de187282d3eaa756f2d31a6e74ecc8b4285e1a0a5bab0195d36e5384902c SHA512 411e1120571045f14fe48e4598d82aa17eb3dc18f3eb8c02589cf3cce564eb531b9a7fc90c066a8d00f9fd31f8fd8304c3be6a9b2dd25f399b1844f9aaf8e51c
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/mail-mta/sendmail/files/libmilter-sharedlib.patch b/mail-mta/sendmail/files/libmilter-sharedlib.patch
deleted file mode 100644
index 43ec78612190..000000000000
--- a/mail-mta/sendmail/files/libmilter-sharedlib.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/milterlibrary.m4 sendmail-8.14.3/devtools/M4/UNIX/milterlibrary.m4
---- sendmail-8.14.3.orig/devtools/M4/UNIX/milterlibrary.m4	1970-01-01 01:00:00.000000000 +0100
-+++ sendmail-8.14.3/devtools/M4/UNIX/milterlibrary.m4	2009-08-22 21:51:10.000000000 +0200
-@@ -0,0 +1,39 @@
-+divert(-1)
-+#
-+# Copyright (c) 1999-2001 Sendmail, Inc. and its suppliers.
-+#	All rights reserved.
-+#
-+# By using this file, you agree to the terms and conditions set
-+# forth in the LICENSE file which can be found at the top level of
-+# the sendmail distribution.
-+#
-+#
-+#  Definitions for Makefile construction for sendmail
-+#
-+divert(0)dnl
-+include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/links.m4')dnl
-+bldLIST_PUSH_ITEM(`bldC_PRODUCTS', bldCURRENT_PRODUCT)dnl
-+bldPUSH_TARGET(bldCURRENT_PRODUCT`.so' bldCURRENT_PRODUCT`.a')dnl
-+bldPUSH_INSTALL_TARGET(`install-'bldCURRENT_PRODUCT)dnl
-+bldPUSH_CLEAN_TARGET(bldCURRENT_PRODUCT`-clean')dnl
-+
-+include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/defines.m4')
-+divert(bldTARGETS_SECTION)
-+bldCURRENT_PRODUCT.so: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'}
-+	${CCLINK} ${LDOPTS_SO} -o bldCURRENT_PRODUCT.so -Wl,confSONAME,bldCURRENT_PRODUCT.so.${MILTER_SOVER} ${bldCURRENT_PRODUCT`OBJS'} -lc ${LIBS}
-+bldCURRENT_PRODUCT.a: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'}
-+	${AR} ${AROPTS} bldCURRENT_PRODUCT.a ${bldCURRENT_PRODUCT`OBJS'}
-+	${RANLIB} ${RANLIBOPTS} bldCURRENT_PRODUCT.a
-+ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)')
-+
-+install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.so bldCURRENT_PRODUCT.a
-+ifdef(`bldINSTALLABLE', `	ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${bldINSTALL_DIR`'LIBDIR}" ]; then confMKDIR -p "${DESTDIR}${bldINSTALL_DIR`'LIBDIR}"; else :; fi ')
-+	${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${UBINMODE} bldCURRENT_PRODUCT.so "${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.so.${MILTER_SOVER}"
-+	${LN} ${LNOPTS} bldCURRENT_PRODUCT.so.${MILTER_SOVER} "${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.so"
-+	${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a "${DESTDIR}${LIBDIR}"')
-+
-+bldCURRENT_PRODUCT-clean:
-+	rm -f ${OBJS} bldCURRENT_PRODUCT.so bldCURRENT_PRODUCT.a ${MANPAGES}
-+
-+divert(0)
-+COPTS+= confCCOPTS_SO
-diff -Nru sendmail-8.14.3.orig/libmilter/Makefile.m4 sendmail-8.14.3/libmilter/Makefile.m4
---- sendmail-8.14.3.orig/libmilter/Makefile.m4	2008-04-08 07:23:44.000000000 +0200
-+++ sendmail-8.14.3/libmilter/Makefile.m4	2009-08-22 21:53:35.000000000 +0200
-@@ -9,7 +9,7 @@
- SMSRCDIR=ifdef(`confSMSRCDIR', `confSMSRCDIR', `${SRCDIR}/sendmail')
- PREPENDDEF(`confINCDIRS', `-I${SMSRCDIR} ')
- 
--bldPRODUCT_START(`library', `libmilter')
-+bldPRODUCT_START(`milterlibrary', `libmilter')
- define(`bldINSTALLABLE', `true')
- define(`LIBMILTER_EXTRAS', `errstring.c strl.c')
- APPENDDEF(`confENVDEF', `-DNOT_SENDMAIL -Dsm_snprintf=snprintf')
diff --git a/mail-mta/sendmail/files/sendmail-8.14.6-build-system.patch b/mail-mta/sendmail/files/sendmail-8.14.6-build-system.patch
deleted file mode 100644
index 3348e921926c..000000000000
--- a/mail-mta/sendmail/files/sendmail-8.14.6-build-system.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-diff -Nru sendmail-8.14.3.orig/cf/cf/Makefile sendmail-8.14.3/cf/cf/Makefile
---- sendmail-8.14.3.orig/cf/cf/Makefile	2005-06-14 04:16:34.000000000 +0200
-+++ sendmail-8.14.3/cf/cf/Makefile	2009-09-20 10:55:50.000000000 +0200
-@@ -80,10 +80,10 @@
- install-cf:  install-sendmail-cf install-submit-cf
- 
- install-sendmail-cf: $(CF).cf
--	$(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(CF).cf ${DESTDIR}$(MAILDIR)/sendmail.cf
-+	$(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(CF).cf "${DESTDIR}$(MAILDIR)/sendmail.cf"
- 
- install-submit-cf: $(SUBMIT).cf
--	$(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(SUBMIT).cf ${DESTDIR}$(MAILDIR)/submit.cf
-+	$(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(SUBMIT).cf "${DESTDIR}$(MAILDIR)/submit.cf"
- 
- depend:
-
-diff -Nru sendmail-8.14.6.orig/devtools/M4/UNIX/defines.m4 sendmail-8.14.6/devtools/M4/UNIX/defines.m4
---- sendmail-8.14.6.orig/devtools/M4/UNIX/defines.m4	2012-01-21 00:07:08.000000000 +0000
-+++ sendmail-8.14.6/devtools/M4/UNIX/defines.m4	2012-12-27 08:13:15.792214375 +0000
-@@ -26,7 +26,7 @@
- CCLINK = ifdef(`confCCLINK', `confCCLINK', `confCC')
- # Linker for libraries
- LD=	ifdef(`confLD', `confLD', `confCC')
--LDOPTS=	ifdef(`confLDOPTS', `confLDOPTS') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `')
-+LDOPTS=	ifdef(`confLDOPTS', `confLDOPTS')
- LDOPTS_SO= ${LDOPTS} ifdef(`confLDOPTS_SO', `confLDOPTS_SO', `-shared')
- 
- # Shell
-@@ -71,7 +71,7 @@
- LIBADD= ifdef(`conf_'bldCURRENT_PRD`_LIBS', `conf_'bldCURRENT_PRD`_LIBS')
- 
- # libraries required on your system
--LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST')
-+LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `')
- 
- # location of sendmail binary (usually /usr/sbin or /usr/lib)
- BINDIR=	ifdef(`confMBINDIR', `confMBINDIR', `/usr/sbin')
-diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/executable.m4 sendmail-8.14.3/devtools/M4/UNIX/executable.m4
---- sendmail-8.14.3.orig/devtools/M4/UNIX/executable.m4	2006-10-06 07:44:44.000000000 +0200
-+++ sendmail-8.14.3/devtools/M4/UNIX/executable.m4	2009-09-20 10:50:36.000000000 +0200
-@@ -30,12 +30,12 @@
- 
- ifdef(`bldNO_INSTALL', ,
- `install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT ifdef(`bldTARGET_INST_DEP', `bldTARGET_INST_DEP')
--	ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'BINDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'BINDIR}; else :; fi ')
--	${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${bldINSTALL_DIR`'BINDIR}
-+	ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${bldINSTALL_DIR`'BINDIR}" ]; then confMKDIR -p "${DESTDIR}${bldINSTALL_DIR`'BINDIR}"; else :; fi ')
-+	${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${bldINSTALL_DIR`'BINDIR}"
- ifdef(`bldTARGET_LINKS', `bldMAKE_TARGET_LINKS(${bldINSTALL_DIR`'BINDIR}/bldCURRENT_PRODUCT, ${bldCURRENT_PRODUCT`'TARGET_LINKS})')')
- 
- strip-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT
--	${STRIP} ${STRIPOPTS} ${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT
-+	${STRIP} ${STRIPOPTS} "${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT"
- 
- bldCURRENT_PRODUCT-clean:
- 	rm -f ${OBJS} bldCURRENT_PRODUCT ${MANPAGES}
-diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/library.m4 sendmail-8.14.3/devtools/M4/UNIX/library.m4
---- sendmail-8.14.3.orig/devtools/M4/UNIX/library.m4	2006-09-06 00:56:53.000000000 +0200
-+++ sendmail-8.14.3/devtools/M4/UNIX/library.m4	2009-09-20 10:50:36.000000000 +0200
-@@ -27,8 +27,8 @@
- ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)')
- 
- install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.a
--ifdef(`bldINSTALLABLE', `	ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'LIBDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'LIBDIR}; else :; fi ')
--	${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a ${DESTDIR}${LIBDIR}')
-+ifdef(`bldINSTALLABLE', `	ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${LIBDIR}" ]; then confMKDIR -p "${DESTDIR}${LIBDIR}"; else :; fi ')
-+	${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a "${DESTDIR}${LIBDIR}"')
- 
- bldCURRENT_PRODUCT-clean:
- 	rm -f ${OBJS} bldCURRENT_PRODUCT.a ${MANPAGES}
---- sendmail-8.14.6.orig/devtools/M4/UNIX/manpage.m4	2012-01-21 00:07:08.000000000 +0000
-+++ sendmail-8.14.6/devtools/M4/UNIX/manpage.m4	2012-12-27 08:28:52.617502447 +0000
-@@ -68,11 +68,11 @@
- ifdef(`confNO_MAN_INSTALL', `divert(-1)', `dnl')
- define(`bldMAN_INSTALL_CMD',
- `ifdef(`confDONT_INSTALL_CATMAN', `dnl',
--`	ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC} ]; then confMKDIR -p ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}; else :; fi ')
--	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).`${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}' `${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}'')
-+`	ifdef(`confMKDIR', `if [ ! -d "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}" ]; then confMKDIR -p "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}"; else :; fi ')
-+	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).`${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}' "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}''")
- ifdef(`confINSTALL_RAWMAN',
--`	ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN} ]; then confMKDIR -p ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}; else :; fi ')
--	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).bldGET_MAN_SOURCE_NUM($1) `${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}'', `dnl')'
-+`	ifdef(`confMKDIR', `if [ ! -d "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'" ]; then confMKDIR -p "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'"; else :; fi ')
-+	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).bldGET_MAN_SOURCE_NUM($1) "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}''", `dnl')'
- )dnl
- bldFOREACH(`bldMAN_INSTALL_CMD(', `bldMAN_PAGES')
- ifdef(`confNO_MAN_INSTALL', `divert(0)', `dnl')
-diff -Nru sendmail-8.14.3.orig/libmilter/Makefile.m4 sendmail-8.14.3/libmilter/Makefile.m4
---- sendmail-8.14.3.orig/libmilter/Makefile.m4	2008-04-08 07:23:44.000000000 +0200
-+++ sendmail-8.14.3/libmilter/Makefile.m4	2009-09-20 10:50:36.000000000 +0200
-@@ -32,9 +32,9 @@
- MFAPI=	${SRCDIR}/inc`'lude/libmilter/mfapi.h
- MFDEF=	${SRCDIR}/inc`'lude/libmilter/mfdef.h
- install-mfapi: ${MFAPI}
--	if [ ! -d ${DESTDIR}${INCLUDEDIR}/libmilter ]; then mkdir -p ${DESTDIR}${INCLUDEDIR}/libmilter; else :; fi
--	${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFAPI} ${DESTDIR}${INCLUDEDIR}/libmilter/mfapi.h
--	${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFDEF} ${DESTDIR}${INCLUDEDIR}/libmilter/mfdef.h
-+	if [ ! -d "${DESTDIR}${INCLUDEDIR}/libmilter" ]; then mkdir -p "${DESTDIR}${INCLUDEDIR}/libmilter"; else :; fi
-+	${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFAPI} "${DESTDIR}${INCLUDEDIR}/libmilter/mfapi.h"
-+	${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFDEF} "${DESTDIR}${INCLUDEDIR}/libmilter/mfdef.h"
- divert(0)
- 
- bldFINISH
-diff -Nru sendmail-8.14.3.orig/mail.local/Makefile.m4 sendmail-8.14.3/mail.local/Makefile.m4
---- sendmail-8.14.3.orig/mail.local/Makefile.m4	2006-06-28 23:08:02.000000000 +0200
-+++ sendmail-8.14.3/mail.local/Makefile.m4	2009-09-20 10:56:24.000000000 +0200
-@@ -30,7 +30,7 @@
- force-install: install-mail.local ifdef(`confNO_MAN_BUILD',, `install-docs')
- 
- install-mail.local: mail.local
--	${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} mail.local ${DESTDIR}${EBINDIR}
-+	${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} mail.local "${DESTDIR}${EBINDIR}"
- divert
- 
- bldFINISH
-diff -Nru sendmail-8.14.3.orig/rmail/Makefile.m4 sendmail-8.14.3/rmail/Makefile.m4
---- sendmail-8.14.3.orig/rmail/Makefile.m4	2006-06-28 23:08:04.000000000 +0200
-+++ sendmail-8.14.3/rmail/Makefile.m4	2009-09-20 10:55:29.000000000 +0200
-@@ -31,7 +31,7 @@
- force-install: install-rmail ifdef(`confNO_MAN_BUILD',, `install-docs')
- 
- install-rmail: rmail
--	${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} rmail ${DESTDIR}${UBINDIR}
-+	${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} rmail "${DESTDIR}${UBINDIR}"
- divert
- 
- bldFINISH
-diff -Nru sendmail-8.14.3.orig/sendmail/Makefile.m4 sendmail-8.14.3/sendmail/Makefile.m4
---- sendmail-8.14.3.orig/sendmail/Makefile.m4.orig	2008-03-27 17:13:33.000000000 +0100
-+++ sendmail-8.14.3/sendmail/Makefile.m4	2009-09-20 11:07:24.000000000 +0200
-@@ -14,9 +14,9 @@
- 
- dnl hack: /etc/mail is not defined as "location of .cf" in the build system
- define(`bldTARGET_INST_DEP', ifdef(`confINST_DEP', `confINST_DEP',
--`${DESTDIR}/etc/mail/submit.cf ${DESTDIR}${MSPQ}'))dnl
-+`"${DESTDIR}/etc/mail/submit.cf" "${DESTDIR}${MSPQ}"'))dnl
- define(`bldTARGET_LINKS', ifdef(`confLINKS', `confLINKS',
--`${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat')
-+`"${DESTDIR}${UBINDIR}/newaliases" "${DESTDIR}${UBINDIR}/mailq" "${DESTDIR}${UBINDIR}/hoststat" "${DESTDIR}${UBINDIR}/purgestat"')
- )dnl
- 
- # location of sendmail statistics file (usually /etc/mail/ or /var/log)
-@@ -43,21 +43,21 @@
- statistics:
- 	${CP} /dev/null statistics
- 
--${DESTDIR}/etc/mail/submit.cf:
-+"${DESTDIR}/etc/mail/submit.cf":
- 	@echo "Please read INSTALL if anything fails while installing the binary."
- 	@echo "${DESTDIR}/etc/mail/submit.cf will be installed now."
- 	cd ${SRCDIR}/cf/cf && make install-submit-cf
- 
- MSPQ=ifdef(`confMSP_QUEUE_DIR', `confMSP_QUEUE_DIR', `/var/spool/clientmqueue')
- 
--${DESTDIR}${MSPQ}:
-+"${DESTDIR}${MSPQ}":
- 	@echo "Please read INSTALL if anything fails while installing the binary."
- 	@echo "You must have setup a new user ${MSPQOWN} and a new group ${GBINGRP}"
- 	@echo "as explained in sendmail/SECURITY."
--	mkdir -p ${DESTDIR}${MSPQ}
--	chown ${MSPQOWN} ${DESTDIR}${MSPQ}
--	chgrp ${GBINGRP} ${DESTDIR}${MSPQ}
--	chmod 0770 ${DESTDIR}${MSPQ}
-+	mkdir -p "${DESTDIR}${MSPQ}"
-+	chown ${MSPQOWN} "${DESTDIR}${MSPQ}"
-+	chgrp ${GBINGRP} "${DESTDIR}${MSPQ}"
-+	chmod 0770 "${DESTDIR}${MSPQ}"
- 
- divert(0)
- 
-@@ -68,30 +68,30 @@
- divert(bldTARGETS_SECTION)
- 
- install-set-user-id: bldCURRENT_PRODUCT ifdef(`confNO_HELPFILE_INSTALL',, `install-hf') ifdef(`confNO_STATISTICS_INSTALL',, `install-st') ifdef(`confNO_MAN_BUILD',, `install-docs')
--	${INSTALL} -c -o ${S`'BINOWN} -g ${S`'BINGRP} -m ${S`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR}
-+	${INSTALL} -c -o ${S`'BINOWN} -g ${S`'BINGRP} -m ${S`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${M`'BINDIR}"
- 	for i in ${sendmailTARGET_LINKS}; do \
- 		rm -f $$i; \
- 		${LN} ${LNOPTS} ${M`'BINDIR}/sendmail $$i; \
- 	done
- 
--define(`confMTA_LINKS', `${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat')
-+define(`confMTA_LINKS', `"${DESTDIR}${UBINDIR}/newaliases" "${DESTDIR}${UBINDIR}/mailq" "${DESTDIR}${UBINDIR}/hoststat" "${DESTDIR}${UBINDIR}/purgestat"')
- install-sm-mta: bldCURRENT_PRODUCT
--	${INSTALL} -c -o ${M`'BINOWN} -g ${M`'BINGRP} -m ${M`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR}/sm-mta
-+	${INSTALL} -c -o ${M`'BINOWN} -g ${M`'BINGRP} -m ${M`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${M`'BINDIR}/sm-mta"
- 	for i in confMTA_LINKS; do \
- 		rm -f $$i; \
- 		${LN} ${LNOPTS} ${M`'BINDIR}/sm-mta $$i; \
- 	done
- 
- install-hf:
--	if [ ! -d ${DESTDIR}${HFDIR} ]; then mkdir -p ${DESTDIR}${HFDIR}; else :; fi
--	${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 444 helpfile ${DESTDIR}${HFFILE}
-+	if [ ! -d "${DESTDIR}${HFDIR}" ]; then mkdir -p "${DESTDIR}${HFDIR}"; else :; fi
-+	${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 444 helpfile "${DESTDIR}${HFFILE}"
- 
- install-st: statistics
--	if [ ! -d ${DESTDIR}${STDIR} ]; then mkdir -p ${DESTDIR}${STDIR}; else :; fi
--	${INSTALL} -c -o ${SBINOWN} -g ${UBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics ${DESTDIR}${STPATH}
-+	if [ ! -d "${DESTDIR}${STDIR}" ]; then mkdir -p "${DESTDIR}${STDIR}"; else :; fi
-+	${INSTALL} -c -o ${SBINOWN} -g ${UBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics "${DESTDIR}${STPATH}"
- 
--install-submit-st: statistics ${DESTDIR}${MSPQ}
--	${INSTALL} -c -o ${MSPQOWN} -g ${GBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics ${DESTDIR}${MSPQ}/${MSPSTFILE}
-+install-submit-st: statistics "${DESTDIR}${MSPQ}"
-+	${INSTALL} -c -o ${MSPQOWN} -g ${GBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics "${DESTDIR}${MSPQ}/${MSPSTFILE}"
- 
- divert(0)
- bldPRODUCT_END
diff --git a/mail-mta/sendmail/files/sendmail-8.15.2-glibc-2.30.patch b/mail-mta/sendmail/files/sendmail-8.15.2-glibc-2.30.patch
deleted file mode 100644
index 03281d1990fe..000000000000
--- a/mail-mta/sendmail/files/sendmail-8.15.2-glibc-2.30.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-https://bugs.gentoo.org/700108
-
---- sendmail-8.15.2-r1/libmilter/sm_gethost.c.orig	2014-03-04 19:59:45.000000000 -0500
-+++ sendmail-8.15.2-r1/libmilter/sm_gethost.c	2019-11-15 09:32:25.812406080 -0500
-@@ -51,18 +51,21 @@
- {
- 	bool resv6 = true;
- 	struct hostent *h;
--
-+#ifdef RES_USE_INET6
- 	if (family == AF_INET6)
- 	{
- 		/* From RFC2133, section 6.1 */
- 		resv6 = bitset(RES_USE_INET6, _res.options);
- 		_res.options |= RES_USE_INET6;
- 	}
-+#endif
- 	SM_SET_H_ERRNO(0);
- 	h = gethostbyname(name);
-+#ifdef RES_USE_INET6
- 	if (family == AF_INET6 && !resv6)
- 		_res.options &= ~RES_USE_INET6;
- 
-+#endif
- 	/* the function is supposed to return only the requested family */
- 	if (h != NULL && h->h_addrtype != family)
- 	{
---- sendmail-8.15.2-r2/sendmail/conf.c.orig	2019-11-14 17:36:41.262218822 -0500
-+++ sendmail-8.15.2-r2/sendmail/conf.c	2019-11-15 09:57:43.550284580 -0500
-@@ -4243,18 +4243,21 @@
- 
- # else /* HAS_GETHOSTBYNAME2 */
- 	bool resv6 = true;
--
-+#ifdef RES_USE_INET6
- 	if (family == AF_INET6)
- 	{
- 		/* From RFC2133, section 6.1 */
- 		resv6 = bitset(RES_USE_INET6, _res.options);
- 		_res.options |= RES_USE_INET6;
- 	}
-+#endif
- 	SM_SET_H_ERRNO(0);
- 	h = gethostbyname(name);
-+#ifdef RES_USE_INET6
- 	if (!resv6)
- 		_res.options &= ~RES_USE_INET6;
- 
-+#endif
- 	/* the function is supposed to return only the requested family */
- 	if (h != NULL && h->h_addrtype != family)
- 	{
diff --git a/mail-mta/sendmail/files/sendmail-8.15.2-openssl-1.1.0-fix.patch b/mail-mta/sendmail/files/sendmail-8.15.2-openssl-1.1.0-fix.patch
deleted file mode 100644
index 54a67548941d..000000000000
--- a/mail-mta/sendmail/files/sendmail-8.15.2-openssl-1.1.0-fix.patch
+++ /dev/null
@@ -1,182 +0,0 @@
---- sendmail-8.15.2.orig/sendmail/tls.c	2016-12-01 15:20:59.953546417 +0100
-+++ sendmail-8.15.2.orig/sendmail/tls.c	2016-12-01 17:26:43.868521378 +0100
-@@ -63,14 +63,28 @@ static unsigned char dh512_g[] =
- static DH *
- get_dh512()
- {
--	DH *dh = NULL;
-+	DH *dh;
-+	BIGNUM *p, *g;
- 
- 	if ((dh = DH_new()) == NULL)
- 		return NULL;
--	dh->p = BN_bin2bn(dh512_p, sizeof(dh512_p), NULL);
--	dh->g = BN_bin2bn(dh512_g, sizeof(dh512_g), NULL);
--	if ((dh->p == NULL) || (dh->g == NULL))
-+	p = BN_bin2bn(dh512_p, sizeof(dh512_p), NULL);
-+	g = BN_bin2bn(dh512_g, sizeof(dh512_g), NULL);
-+	if (p == NULL || g == NULL)
-+	{
-+		BN_free(p);
-+		BN_free(g);
-+		DH_free(dh);
- 		return NULL;
-+	}
-+
-+#if OPENSSL_VERSION_NUMBER >= 0x10100005L
-+	DH_set0_pqg(dh, p, NULL, g);
-+#else
-+	dh->p = p;
-+	dh->g = g;
-+#endif
-+
- 	return dh;
- }
- 
-@@ -117,16 +131,27 @@ get_dh2048()
- 		};
- 	static unsigned char dh2048_g[]={ 0x02, };
- 	DH *dh;
-+	BIGNUM *p, *g;
- 
- 	if ((dh=DH_new()) == NULL)
- 		return(NULL);
--	dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
--	dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
--	if ((dh->p == NULL) || (dh->g == NULL))
-+	p = BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
-+	g = BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);
-+	if (p == NULL || g == NULL)
- 	{
-+		BN_free(p);
-+		BN_free(g);
- 		DH_free(dh);
--		return(NULL);
-+		return NULL;
- 	}
-+
-+#if OPENSSL_VERSION_NUMBER >= 0x10100005L
-+	DH_set0_pqg(dh, p, NULL, g);
-+#else
-+	dh->p = p;
-+	dh->g = g;
-+#endif
-+
- 	return(dh);
- }
- # endif /* !NO_DH */
-@@ -715,6 +740,54 @@ static char server_session_id_context[]
- # define SM_SSL_OP_TLS_BLOCK_PADDING_BUG	0
- #endif
- 
-+static RSA *
-+generate_rsa_key(bits, e)
-+	int bits;
-+	unsigned long e;
-+{
-+#if OPENSSL_VERSION_NUMBER < 0x00908000L
-+	return RSA_generate_key(bits, e, NULL, NULL);
-+#else
-+	BIGNUM *bne;
-+	RSA *rsa = NULL;
-+
-+	bne = BN_new();
-+	if (bne && BN_set_word(bne, e) != 1)
-+		rsa = RSA_new();
-+	if (rsa && RSA_generate_key_ex(rsa, bits, bne, NULL) != 1)
-+	{
-+		RSA_free(rsa);
-+		rsa = NULL;
-+	}
-+	BN_free(bne);
-+	return rsa;
-+#endif
-+}
-+
-+static DSA *
-+generate_dsa_parameters(bits, seed, seed_len, counter_ret, h_ret)
-+	int bits;
-+	unsigned char *seed;
-+	int seed_len;
-+	int *counter_ret;
-+	unsigned long *h_ret;
-+{
-+#if OPENSSL_VERSION_NUMBER < 0x00908000L
-+	return DSA_generate_parameters(bits, seed, seed_len, counter_ret,
-+			               h_ret, NULL, NULL);
-+#else
-+	DSA *dsa = DSA_new();
-+
-+	if (dsa && DSA_generate_parameters_ex(dsa, bits, seed, seed_len,
-+				              counter_ret, h_ret, NULL) != 1)
-+	{
-+		DSA_free(dsa);
-+		dsa = NULL;
-+	}
-+	return dsa;
-+#endif
-+}
-+
- bool
- inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhparam)
- 	SSL_CTX **ctx;
-@@ -926,7 +999,7 @@ inittls(ctx, req, options, srv, certfile
- 	{
- 		/* get a pointer to the current certificate validation store */
- 		store = SSL_CTX_get_cert_store(*ctx);	/* does not fail */
--		crl_file = BIO_new(BIO_s_file_internal());
-+		crl_file = BIO_new(BIO_s_file());
- 		if (crl_file != NULL)
- 		{
- 			if (BIO_read_filename(crl_file, CRLFile) >= 0)
-@@ -1003,8 +1076,7 @@ inittls(ctx, req, options, srv, certfile
- 	if (bitset(TLS_I_RSA_TMP, req)
- #  if SM_CONF_SHM
- 	    && ShmId != SM_SHM_NO_ID &&
--	    (rsa_tmp = RSA_generate_key(RSA_KEYLENGTH, RSA_F4, NULL,
--					NULL)) == NULL
-+	    (rsa_tmp = generate_rsa_key(RSA_KEYLENGTH, RSA_F4)) == NULL
- #  else /* SM_CONF_SHM */
- 	    && 0	/* no shared memory: no need to generate key now */
- #  endif /* SM_CONF_SHM */
-@@ -1210,8 +1282,8 @@ inittls(ctx, req, options, srv, certfile
- 				sm_dprintf("inittls: Generating %d bit DH parameters\n", bits);
- 
- 			/* this takes a while! */
--			dsa = DSA_generate_parameters(bits, NULL, 0, NULL,
--						      NULL, 0, NULL);
-+			dsa = generate_dsa_parameters(bits, NULL, 0, NULL,
-+						      NULL);
- 			dh = DSA_dup_DH(dsa);
- 			DSA_free(dsa);
- 		}
-@@ -1747,7 +1819,7 @@ tmp_rsa_key(s, export, keylength)
- 
- 	if (rsa_tmp != NULL)
- 		RSA_free(rsa_tmp);
--	rsa_tmp = RSA_generate_key(RSA_KEYLENGTH, RSA_F4, NULL, NULL);
-+	rsa_tmp = generate_rsa_key(RSA_KEYLENGTH, RSA_F4);
- 	if (rsa_tmp == NULL)
- 	{
- 		if (LogLevel > 0)
-@@ -1974,11 +2046,20 @@ x509_verify_cb(ok, ctx)
- 	{
- 		if (LogLevel > 13)
- 			tls_verify_log(ok, ctx, "x509");
-+#if OPENSSL_VERSION_NUMBER >= 0x10100005L
-+		if (X509_STORE_CTX_get_error(ctx) ==
-+		    X509_V_ERR_UNABLE_TO_GET_CRL)
-+		{
-+			X509_STORE_CTX_set_error(ctx, 0);
-+			return 1;	/* override it */
-+		}
-+#else
- 		if (ctx->error == X509_V_ERR_UNABLE_TO_GET_CRL)
- 		{
- 			ctx->error = 0;
- 			return 1;	/* override it */
- 		}
-+#endif
- 	}
- 	return ok;
- }
diff --git a/mail-mta/sendmail/files/sendmail-starttls-multi-crl.patch b/mail-mta/sendmail/files/sendmail-starttls-multi-crl.patch
deleted file mode 100644
index 8d93817d07da..000000000000
--- a/mail-mta/sendmail/files/sendmail-starttls-multi-crl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Bug #354611
---- sendmail/tls.c.orig	2010-05-26 21:54:30.000000000 -0600
-+++ sendmail/tls.c	2010-05-26 21:54:36.000000000 -0600
-@@ -723,11 +723,12 @@
- 		{
-			if (BIO_read_filename(crl_file, CRLFile) >= 0)
-			{
--				crl = PEM_read_bio_X509_CRL(crl_file, NULL,
--							NULL, NULL);
-+				while((crl = PEM_read_bio_X509_CRL(crl_file, NULL, NULL, NULL)))
-+				{
-+					X509_STORE_add_crl(store, crl);
-+					X509_CRL_free(crl);
-+				}
- 				BIO_free(crl_file);
--				X509_STORE_add_crl(store, crl);
--				X509_CRL_free(crl);
- 				X509_STORE_set_flags(store,
-					X509_V_FLAG_CRL_CHECK|X509_V_FLAG_CRL_CHECK_ALL);
-				X509_STORE_set_verify_cb_func(store,
diff --git a/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild b/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild
deleted file mode 100644
index 6115996d21a3..000000000000
--- a/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib systemd toolchain-funcs user
-
-DESCRIPTION="Widely-used Mail Transport Agent (MTA)"
-HOMEPAGE="http://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 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="ssl ldap sasl tcpd mbox ipv6 nis sockets"
-
-DEPEND="net-mail/mailbase
-	sys-devel/m4
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.10 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	ldap? ( net-nds/openldap )
-	>=sys-libs/db-3.2
-	!net-mail/vacation
-	"
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00
-	!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/postfix
-	!mail-mta/opensmtpd
-	!mail-mta/qmail-ldap
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]"
-
-PDEPEND="!mbox? ( mail-filter/procmail )"
-
-# libmilter library is part of sendmail, but it does not share the version number with it.
-# In order to find the right libmilter version number, check SMFI_VERSION definition
-# that can be found in ${S}/include/libmilter/mfapi.h (see also SM_LM_VRS_* defines).
-# For example, version 1.0.1 has a SMFI_VERSION of 0x01000001.
-LIBMILTER_VER=1.0.2
-
-pkg_setup() {
-	enewgroup smmsp 209
-	enewuser smmsp 209 -1 /var/spool/mqueue smmsp
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/"${PN}"-8.14.6-build-system.patch
-	eapply -p0 "${FILESDIR}"/sendmail-delivered_hdr.patch
-	eapply "${FILESDIR}"/libmilter-sharedlib.patch
-	eapply -p0 "${FILESDIR}"/sendmail-starttls-multi-crl.patch
-	eapply "${FILESDIR}"/${P}-openssl-1.1.0-fix.patch
-	eapply "${FILESDIR}"/${P}-glibc-2.30.patch
-
-	local confCC="$(tc-getCC)"
-	local confCCOPTS="${CFLAGS}"
-	local confLDOPTS="${LDFLAGS}"
-	local confMAPDEF="-DMAP_REGEX"
-	local conf_sendmail_LIBS=""
-	use sasl && confLIBS="${confLIBS} -lsasl2"  \
-		&& confENVDEF="${confENVDEF} -DSASL=2" \
-		&& confCCOPTS="${confCCOPTS} -I/usr/include/sasl" \
-		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lsasl2"
-	use tcpd && confENVDEF="${confENVDEF} -DTCPWRAPPERS" \
-		&& confLIBS="${confLIBS} -lwrap"
-	use ssl && confENVDEF="${confENVDEF} -DSTARTTLS -D_FFR_DEAL_WITH_ERROR_SSL" \
-		&& confENVDEF="${confENVDEF} -D_FFR_TLS_1" \
-		&& confLIBS="${confLIBS} -lssl -lcrypto" \
-		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lssl -lcrypto"
-	use ldap && confMAPDEF="${confMAPDEF} -DLDAPMAP" \
-		&& confLIBS="${confLIBS} -lldap -llber"
-	use ipv6 && confENVDEF="${confENVDEF} -DNETINET6"
-	use nis && confENVDEF="${confENVDEF} -DNIS"
-	use sockets && confENVDEF="${confENVDEF} -DSOCKETMAP"
-	sed -e "s:@@confCCOPTS@@:${confCCOPTS}:" \
-		-e "s/@@confLDOPTS@@/${confLDOPTS}/" \
-		-e "s/@@confCC@@/${confCC}/" \
-		-e "s/@@confMAPDEF@@/${confMAPDEF}/" \
-		-e "s/@@confENVDEF@@/${confENVDEF}/" \
-		-e "s/@@confLIBS@@/${confLIBS}/" \
-		-e "s/@@conf_sendmail_LIBS@@/${conf_sendmail_LIBS}/" \
-		"${FILESDIR}"/site.config.m4 > devtools/Site/site.config.m4
-	echo "APPENDDEF(\`confLIBDIRS', \`-L${EROOT}usr/$(get_libdir)')" >> devtools/Site/site.config.m4 || die
-
-	eapply_user
-}
-
-src_compile() {
-	sh Build AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "compilation failed in main Build script"
-	pushd libmilter
-	sh Build AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" MILTER_SOVER=${LIBMILTER_VER} || die "libmilter compilation failed"
-	popd
-}
-
-src_install() {
-	local MY_LIBDIR=/usr/$(get_libdir)
-	local MY_OBJDIR="obj.`uname -s`.`uname -r`.`uname -m`"
-	dodir /usr/bin ${MY_LIBDIR} /usr/include/libmilter
-	dodir /usr/share/man/man{1,5,8} /usr/sbin /var/log /usr/share/sendmail-cf
-	dodir /var/spool/{mqueue,clientmqueue} /etc/conf.d
-	keepdir /var/spool/{clientmqueue,mqueue}
-	for dir in libsmutil sendmail mailstats praliases smrsh makemap vacation editmap
-	do
-		make DESTDIR="${D}" LIBDIR="${MY_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 \
-			install -C "${MY_OBJDIR}/${dir}" \
-			|| die "install failed"
-	done
-	for dir in rmail mail.local
-	do
-		make DESTDIR="${D}" LIBDIR="${MY_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 \
-			force-install -C "${MY_OBJDIR}/${dir}" \
-			|| die "install failed"
-	done
-
-	make DESTDIR="${D}" LIBDIR="${MY_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 \
-		MILTER_SOVER=${LIBMILTER_VER} \
-		install -C "${MY_OBJDIR}/libmilter" \
-		|| die "install failed"
-
-	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
-	newdoc sendmail/README README.sendmail
-	newdoc sendmail/SECURITY SECURITY
-	newdoc sendmail/TUNING TUNING
-	newdoc smrsh/README README.smrsh
-	newdoc libmilter/README README.libmilter
-
-	newdoc cf/README README.cf
-	newdoc cf/cf/README README.install-cf
-	cp -pPR cf/* "${D}"/usr/share/sendmail-cf
-
-	docinto contrib
-	dodoc contrib/*
-
-	insinto /etc/mail
-	if use mbox
-	then
-		newins "${FILESDIR}"/sendmail.mc-r1 sendmail.mc
-	else
-		newins "${FILESDIR}"/sendmail-procmail.mc sendmail.mc
-	fi
-	m4 "${D}"/usr/share/sendmail-cf/m4/cf.m4 "${D}"/etc/mail/sendmail.mc \
-		> "${D}"/etc/mail/sendmail.cf
-	echo "include(\`/usr/share/sendmail-cf/m4/cf.m4')dnl" \
-		> "${D}"/etc/mail/submit.mc
-	cat "${D}"/usr/share/sendmail-cf/cf/submit.mc >> "${D}"/etc/mail/submit.mc
-	echo "# local-host-names - include all aliases for your machine here" \
-		> "${D}"/etc/mail/local-host-names
-	cat <<- EOF > "${D}"/etc/mail/trusted-users
-		# trusted-users - users that can send mail as others without a warning
-		# apache, mailman, majordomo, uucp are good candidates
-	EOF
-	cat <<- EOF > "${D}"/etc/mail/access
-		# 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 > "${D}"/etc/conf.d/sendmail
-		# 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 > "${D}"/etc/sasl2/Sendmail.conf
-		pwcheck_method: saslauthd
-		mech_list: PLAIN LOGIN
-
-		EOF
-	fi
-
-	doinitd "${FILESDIR}"/sendmail
-	systemd_dounit "${FILESDIR}"/sendmail.service
-	systemd_dounit "${FILESDIR}"/sm-client.service
-
-	keepdir /usr/adm/sm.bin
-}
diff --git a/mail-mta/sendmail/sendmail-8.16.1-r1.ebuild b/mail-mta/sendmail/sendmail-8.16.1-r1.ebuild
index 78ea5e0bfbae..6b50939abeb1 100644
--- a/mail-mta/sendmail/sendmail-8.16.1-r1.ebuild
+++ b/mail-mta/sendmail/sendmail-8.16.1-r1.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="ipv6 ldap mbox nis sasl sockets ssl tcpd"
 
 BDEPEND="
diff --git a/mail-mta/sendmail/sendmail-8.17.1.ebuild b/mail-mta/sendmail/sendmail-8.17.1-r1.ebuild
index cfb7fea30f81..6df07e689c46 100644
--- a/mail-mta/sendmail/sendmail-8.17.1.ebuild
+++ b/mail-mta/sendmail/sendmail-8.17.1-r1.ebuild
@@ -52,7 +52,8 @@ src_prepare() {
 	eapply_user
 
 	local confCCOPTS="${CFLAGS}"
-	local confENVDEF="-DMAXDAEMONS=64 -DHAS_GETHOSTBYNAME2=1"
+	# See bug #808954 for FLOCK
+	local confENVDEF="-DMAXDAEMONS=64 -DHAS_GETHOSTBYNAME2=1 -DHASFLOCK=1"
 	local confLDOPTS="${LDFLAGS}"
 	local confLIBS=
 	local confMAPDEF="-DMAP_REGEX"