gentoo Easter resync : 12.04.2020

6 files changed, 58 insertions, 222 deletions

diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
index 4e7956029a7f..bf43a0f85413 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -1,17 +1,15 @@
 AUX libmilter-sharedlib.patch 2843 BLAKE2B d64be1f4f4561a4056bca9784f00b4c965adbf30e99e1b9318162e6a3dad043eb508e925234a586443a8e8fd992f8aee67557f6c3d1e54f644d9c6c8fa7c267a SHA512 31c36b57739946c1b9c7c85307fe5c53c45d7f8cbf427a0f2248db8b74871a6f5a30ef1af524915821aeca54310d28272bcd0a587cb918192214fa5c30e4a8da
 AUX sendmail 595 BLAKE2B fe4532e30c6bc84effbdd59de70a27e2565fa7b4437c1fdc64ca169adf14702b8fa739123f2b0f0d2069b33939efe0c3382ea51716bf5fb1905f04f6074c8ac2 SHA512 0a1611eeec33a7d7eecff75ed6c8f70abf0d6d8cf4a5242f084da0d4139e0e871239e9893a53782e5dab80c4386c62d96ec03839fc98a497e697fce1f7a149aa
-AUX sendmail-8.14.5+db-5.0.patch 432 BLAKE2B 0eb836ba65c932d3feba356dc234bdfd82f84d134ca2e8593b67764cf5a0462fb6a60eb09f7b8e23d39d6474fd7282b1b362d67cef68f8dcf36214ecb553dcea SHA512 f9df3b0560a0620a9875f6e85b1ea0866879aafd3475efa47539f41f4b54a34fe91c752a067fb62634cb71ad09c44b8408bdacddf3d5c47545b49c618eb005ec
 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-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 353 BLAKE2B 9ae842fd4cd5f12ad54359772880bffe7e96f51f6b1e05e4388df34078790e4969367be812738e33651d54f6e7343bd0f44656ff54de7df8c4e40904d789e55d SHA512 3bf4d502c965c56c7d421b1a1b68ab49d42f61d7227bf91d56c527ed1ae1a604aead35a6b774f6e534e9b014f3f6d1e53c00c349df1f2b90a81f70b5d5948012
+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.14.9.tar.gz 2114293 BLAKE2B 51c24478724a1dd87e3bbda0bf0e8c9c64bc8f36eaa624752eda50942520a4f19262d2c8cebbb0a02467bb3f49e1e7edd78a69f0327effa3834e4234b289f04c SHA512 a541fe687e9967fb87f2f6c6263ecc698aac42c6a52e81e7ee556f0c3d719b9c996dfccf10cc2e0e5c6d03dd8d3ce79b856b78ca049dd47665e38c77763fa424
 DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc45a5d730d2bed1ef956adb574721833f87aeba0475705b76e0c7d6cf00f9a10025bffb0de6c6b4dae606eb2ec399 SHA512 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9
-EBUILD sendmail-8.14.9.ebuild 7038 BLAKE2B e5eeab9989dc4e74fd9763a707bb94afad121d5d5cca6e276e47cb0196781c37f590884e1c2f8ff64a14ba99baffe4186fafa13952bf7bf4617fcd9ecd617c8d SHA512 00169095b070eb1c3e30d2e5e215625dff0677d171c79757c006a1ee1cf171d8ec1e19fd654b56e3da8fe78caa429b8dd8893d639e39bfafdf0015603aabb583
-EBUILD sendmail-8.15.2-r2.ebuild 7220 BLAKE2B bef926cae4d7eec00db753c7ba63f0393a51cba70b90efd4ec6aa76fc47c0871b0f05622893e24846ea923bdf538860871dcb78aeb170f562155e31e3c13502d SHA512 baec1257fd1e4bf7900d9006f560a09f40cb09328215ead62e710594479733a51fd100512134bf5341947d0d22d903032d6ba3b734151e1b747b8510646ca233
+EBUILD sendmail-8.15.2-r2.ebuild 7261 BLAKE2B 531926c58e8dbbfd3fa80ecfcd69bc77770dfe4daa9844094eb3befc683829bb0600f7fb0ffab75d31e8fba5618303de02ee93702d7addc4fef498a528c7582a SHA512 1a18654abb2237ce98a483536315f2196d2bdb891b4e2c7dff88a352dabcdf8a4f40700d9a7ce4319c941e803c0f54d15f9ac45fcf5e6ed59c4dc5dd0b800128
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/mail-mta/sendmail/files/sendmail-8.14.5+db-5.0.patch b/mail-mta/sendmail/files/sendmail-8.14.5+db-5.0.patch
deleted file mode 100644
index 99ecbe081674..000000000000
--- a/mail-mta/sendmail/files/sendmail-8.14.5+db-5.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: sendmail-8.14.4/include/sm/bdb.h
-===================================================================
---- sendmail-8.14.4.orig/include/sm/bdb.h
-+++ sendmail-8.14.4/include/sm/bdb.h
-@@ -19,7 +19,7 @@
- #  define DB_VERSION_MAJOR 1
- # endif /* ! DB_VERSION_MAJOR */
- 
--# if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1
-+# if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5
- 
- #  define DBTXN	NULL ,
- 
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
new file mode 100644
index 000000000000..03281d1990fe
--- /dev/null
+++ b/mail-mta/sendmail/files/sendmail-8.15.2-glibc-2.30.patch
@@ -0,0 +1,52 @@
+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.service b/mail-mta/sendmail/files/sendmail.service
index 1aeb769ececc..2d268fa1f870 100644
--- a/mail-mta/sendmail/files/sendmail.service
+++ b/mail-mta/sendmail/files/sendmail.service
@@ -5,7 +5,7 @@ Wants=sm-client.service
 
 [Service]
 Type=forking
-PIDFile=/var/run/sendmail.pid
+PIDFile=/run/sendmail.pid
 ExecStartPre=-/usr/bin/newaliases
 ExecStartPre=-/bin/rm -f /var/spool/mqueue/xf*
 ExecStart=/usr/sbin/sendmail -bd -q30m -L sm-mta
diff --git a/mail-mta/sendmail/sendmail-8.14.9.ebuild b/mail-mta/sendmail/sendmail-8.14.9.ebuild
deleted file mode 100644
index 8454266308d6..000000000000
--- a/mail-mta/sendmail/sendmail-8.14.9.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit eutils 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 ~sh 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() {
-	epatch "${FILESDIR}"/"${PN}"-8.14.6-build-system.patch
-	epatch "${FILESDIR}"/sendmail-delivered_hdr.patch
-	epatch "${FILESDIR}"/libmilter-sharedlib.patch
-	epatch "${FILESDIR}"/"${PN}"-8.14.5+db-5.0.patch
-	epatch "${FILESDIR}"/sendmail-starttls-multi-crl.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
-}
-
-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 /usr/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.15.2-r2.ebuild b/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild
index d3fd92fa5bb7..99feb6efaa4e 100644
--- a/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild
+++ b/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild
@@ -10,7 +10,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 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="ssl ldap libressl sasl tcpd mbox ipv6 nis sockets"
 
 DEPEND="net-mail/mailbase
@@ -59,6 +59,7 @@ src_prepare() {
 	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}"