15 files changed, 736 insertions, 25 deletions
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 82441a11773b..97afcfad6cb8 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 146ae1b0bda0..1b897b26be98 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -7,9 +7,11 @@ DIST courier-1.3.12.tar.bz2 7901365 BLAKE2B 95cbfeb0926366cf94876b5f03bd14fee516
 DIST courier-1.3.13.tar.bz2 7903044 BLAKE2B 94e70d79ffddc295f029478f6aca2727682bc1f09c22eac9212288aba5fa91d3a9d771829b4f1a2c6929310ea2042bf4c9d2714fe01585f345416ad906642cb3 SHA512 bb2e9a0eeca17025675627ced44fec86fb0104836be16c3bb6bdc451d97fa0c37ef078d908f2fb0e4652dd8ee90ffb108d77c381381c74033244e9988e8e41b4
 DIST courier-1.3.5.tar.bz2 7901040 BLAKE2B 5a79d02d1d40967f98f2a1942fee6786d8e6e2ddc7dea6677a85db0480f71e4b974a671adc81c4bafd66c888c5b54012eb5684f2936f5164496699939d179fc4 SHA512 5f51383356f4a36f9c114be6aa69d694c82bb95b1a336d2948d486d582bd6559da69be93b7c20aee2ff57826ab7eeb265aa20794074456d036b22da7f280f95d
 DIST courier-1.4.0.tar.bz2 7904288 BLAKE2B dd6e598f7c62beb8d2609d990644ac28f2de8854cbe8990c1f99018de4e80de7128a6d889add6ac75f291b2fa7d41371e109fa9ec227d55934dddc6f8db94aa8 SHA512 2a2270ab7abfbece71b5621d5389824ebdcd0fa5f529ba408393bbd6887d1daad096671fbf7085f1580a98ef6d81012743c1ae3a1fb1dbccb45bf456d7a23b52
+DIST courier-1.4.1.tar.bz2 7904154 BLAKE2B 029a4ee48955069fdb9de2e189c7e354ac742143d3f177d0533fb361aad9a17f276616c160db2b625a5efe5dfaa304f0fb204045dc95529dfbca97e163c1018e SHA512 0b2d7cbad97d3328beb75e424725f638c2344e29acc7e1a37d56919e53a090790533057e43fa3a8638d9432b0ea0f7f6dfa89bf62a05136cac4e65c0584b17a6
 EBUILD courier-1.3.10.ebuild 9321 BLAKE2B 802796d532abc004d8f2807c39fe75bf6f43a8b37657db40178824719f9564ec8de46f0c7b6add1009e425aaa6e61faa802da00be738efde926a5b71fd586863 SHA512 bdf89cac8ed44681d0d97c93e694b8ba094c64a7bb1f5749dd35be737313e21a4582e2e3247077fda94bfef482bf6ad85eef3b0fbc602228d66cd238dc327a56
 EBUILD courier-1.3.12.ebuild 9325 BLAKE2B e549d263e37e761ea97bf9169a3cbef4fa1437065da306cc9ef11d179308108c8a32fd4d113f02d9e5a3109b487c64e2780bcf7a8d59483d890228ccd79713a0 SHA512 8801098331d21f4461e77ee6536b4eb0174bed663ab8b70d5418a12b9adad2202b2719c2bf6f0de1593bfebb2518db282cdd7da4f0d9cd9ff12fb73eae510158
 EBUILD courier-1.3.13.ebuild 9319 BLAKE2B 22f56bc4d72074d03124d96407692d8e162d8e00a8ed04d3bd52e8d9694498dd9e9a3f916a4de1078ee62504e9db10cbd854cc6b4317b69c70df2d7bdbc4c7fd SHA512 41c2da6e8c3ac2ba9b7eaeba7487fceb238fdadfe78bc523ee82cacd08afbfe3f802edf38d0441602ad5e32935ddbca6436f11a6de821858cac0193c2e5efc75
 EBUILD courier-1.3.5.ebuild 9310 BLAKE2B e1188c2420d58c097a2bb40fc2171c183a835d0cc7dc19ae6123a7a36a656df6ed29eeda9b95f3ad490b3f4bb11b28309462d2890de045034b4720996f44738d SHA512 56ed665347a94c2bdb347f53324aa5a69ea956c7fd1e32bc38bc2e5e4323e0b62f49f2e353b94b3d62c1b1c5d7a862b6e248940664228d729086401260f6ab37
 EBUILD courier-1.4.0.ebuild 9325 BLAKE2B 321fcc323fd5ffe708f88d8ecc04600611dcaa2e9a888f183fede6ea0fba60ce1cb5e89901e8e258d27d1607d75c6311b844173a4397b51a32253b82f82afaf8 SHA512 cf03fb4d425c8addd8a99cc2de91f2292480c8d979252387da96e02fac52e10aa71d0deba03870868beea322492d7159a026ec211cab27a440743e80d1a371ea
+EBUILD courier-1.4.1.ebuild 9325 BLAKE2B cdc56b1bd5ea0b70d155cdaa985113b97bbb0118bf95badc2732dd77d830eb28b7d7376779de8d9642803e2e4063d4e50a240e05ad3a5c57d2930b85d5cee822 SHA512 b07d07b30182bda8b71f5374da799731683510247ff9b88a9e0a305a4171c32d21d41222751fe7a6b946717530b7cc278024ba28eb7854553e61891af35caef8
 MISC metadata.xml 756 BLAKE2B e3d128790b1620d9005c9a14cef1c452488fc8e465b235791cc196f431cb2ea8348aba342b0867282878d0c73392694be0db0686dc048d9345b286c3bccf1cab SHA512 c3fcd1ba4b22f91b1acf49faeee41562a7963b51d37e1593156086b79a1eb4172a12e7226b71a9aa55b5a4ef7d734351752451a2300375d061ae20481778b273
diff --git a/mail-mta/courier/courier-1.4.1.ebuild b/mail-mta/courier/courier-1.4.1.ebuild
new file mode 100644
index 000000000000..6949aca60b15
--- /dev/null
+++ b/mail-mta/courier/courier-1.4.1.ebuild
@@ -0,0 +1,313 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="An MTA designed specifically for maildirs"
+HOMEPAGE="https://www.courier-mta.org/"
+SRC_URI="https://downloads.sourceforge.net/courier/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
+	fam web webmail gnutls split-usr"
+
+DEPEND="
+	>=net-libs/courier-authlib-0.72.4
+	>=net-libs/courier-unicode-2.3.2:=
+	net-dns/libidn2:=
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		dev-libs/openssl:0=
+	)
+	>=sys-libs/gdbm-1.8.0:=
+	dev-libs/libpcre2
+	app-misc/mime-types
+	dev-lang/perl:=
+	fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 )
+	pam? ( sys-libs/pam )
+	mysql? ( dev-db/mysql-connector-c )
+	ldap? ( >=net-nds/openldap-1.2.11:= )
+	postgres? ( dev-db/postgresql:= )
+	spell? ( app-text/aspell )
+	fam? ( virtual/fam )
+	!mail-filter/maildrop
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/sendmail
+	!mail-mta/ssmtp[mta]
+	!mail-mta/opensmtpd
+	!net-mail/dot-forward
+	!sys-apps/ucspi-tcp
+	"
+
+RDEPEND="${DEPEND}
+	sys-process/procps"
+
+# get rid of old style virtual/imapd - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+	!net-mail/courier-imap
+	!net-mail/cyrus-imapd"
+
+PDEPEND="pam? ( net-mail/mailbase )
+	crypt? ( >=app-crypt/gnupg-1.0.4 )"
+
+src_prepare() {
+	use norewrite && eapply "${FILESDIR}/norewrite.patch"
+	default
+}
+
+src_configure() {
+	filter-flags '-fomit-frame-pointer'
+
+	local myconf
+	myconf=""
+
+	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
+
+	econf ${myconf} \
+		$(use_with fam) \
+		$(use_with ipv6) \
+		$(use_with spell ispell) \
+		$(use_with ldap ldapaliasd) \
+		$(use_enable ldap maildroldap) \
+		$(use_with gnutls) \
+		--with-notice=unicode \
+		--enable-mimetypes=/etc/mime.types \
+		--prefix=/usr \
+		--disable-root-check \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/courier \
+		--datadir=/usr/share/courier \
+		--sharedstatedir=/var/lib/courier/com \
+		--localstatedir=/var/lib/courier \
+		--with-piddir=/var/run/courier \
+		--with-authdaemonvar=/var/lib/courier/authdaemon \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		--with-paranoid-smtpext \
+		--with-db=gdbm \
+		--disable-autorenamesent \
+		--cache-file="${S}/configuring.cache" \
+		--host="${CHOST}" debug=true || die "./configure"
+}
+
+src_compile() {
+	default
+}
+
+etc_courier() {
+	# Import existing /etc/courier/file if it exists.
+	# Add option only if it was not already set or even commented out
+	local file="${1}" word=$(echo "${2}" | sed -e "s|=.*$||" -e "s|^.*opt ||")
+	[ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
+			cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
+	grep -q "${word}" "${D}/etc/courier/${file}" || \
+		echo "${2}" >> "${D}/etc/courier/${file}"
+}
+
+etc_courier_chg() {
+	local file="${1}" key="${2}" value="${3}" section="${4}"
+	[ -z "${section}" ] && section="${2}"
+	grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
+	sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file}
+}
+
+src_install() {
+	local f
+	diropts -o mail -g mail
+	keepdir /var/lib/courier/tmp
+	keepdir /var/lib/courier/msgs
+	make install DESTDIR="${D}" || die "install"
+	make install-configure DESTDIR="${D}" || die "install-configure"
+
+	# init script takes care of this
+	rm -rf "${D}/var/run"
+
+	# Get rid of files we dont want
+	if ! use webmail ; then
+		rm -rf "${D}/usr/$(get_libdir)/courier/courier/webmail" \
+			"${D}/usr/$(get_libdir)/courier/courier/sqwebmaild" \
+			"${D}/usr/share/courier/sqwebmail/" \
+			"${D}/usr/sbin/webmaild" \
+			"${D}/usr/sbin/webgpg" \
+			"${D}/etc/courier/webmail.authpam" \
+			"${D}/var/lib/courier/webmail-logincache" \
+			"${D}"/etc/courier/sqwebmaild*
+	fi
+
+	if ! use web ; then
+		rm -rf "${D}/usr/share/courier/courierwebadmin/" \
+			"${D}/etc/courier/webadmin"
+	fi
+
+	for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do
+		keepdir "$dir2keep" || die "failed running keepdir: $dir2keep"
+	done
+
+	newinitd "${FILESDIR}/courier-init-r4" "courier"
+	use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier"
+
+	cd "${D}/etc/courier"
+	if use webmail ; then
+		insinto /etc/courier
+		newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc
+	fi
+
+	for f in *.dist ; do cp "${f}" "${f%%.dist}" ; done
+	if use ldap ; then
+		[ -e ldapaliasrc ] &&  ( chown root:mail ldapaliasrc ; chmod 640 ldapaliasrc )
+	else
+		rm -f ldapaliasrc
+	fi
+
+	( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \
+		> "${D}/etc/courier/sizelimit"
+	etc_courier maildroprc ""
+	etc_courier esmtproutes ""
+	etc_courier backuprelay ""
+	etc_courier locallowercase ""
+	etc_courier bofh "opt BOFHBADMIME=accept"
+	etc_courier bofh "opt BOFHSPFTRUSTME=1"
+	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail"
+	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none"
+	etc_courier bofh "opt BOFHSPFFROM=all"
+	etc_courier bofh "opt BOFHSPFMAILFROM=all"
+	etc_courier bofh "#opt BOFHSPFHARDERROR=fail"
+	etc_courier esmtpd "BOFHBADMIME=accept"
+	etc_courier esmtpd-ssl "BOFHBADMIME=accept"
+	etc_courier esmtpd-msa "BOFHBADMIME=accept"
+
+	use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE"
+	use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256"
+
+	# Fix for a sandbox violation on subsequential merges
+	# - ticho@gentoo.org, 2005-07-10
+	dosym ../share/courier/pop3d /usr/sbin/courier-pop3d
+	dosym ../share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
+	dosym ../share/courier/imapd /usr/sbin/courier-imapd
+	dosym ../share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl
+
+	cd "${S}"
+	cp imap/README README.imap
+	use nls && cp unicode/README README.unicode
+	dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt
+	dodoc libs/tcpd/README.couriertls
+	mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${PF}/html"
+
+	if use webmail ; then
+		insinto /usr/$(get_libdir)/courier/courier
+		insopts -m 755 -o mail -g mail
+		doins "${S}/courier/webmaild"
+	fi
+
+	if use web ; then
+		insinto /etc/courier/webadmin
+		insopts -m 400 -o mail -g mail
+		doins "${FILESDIR}/password.dist"
+	fi
+
+	# avoid name collisions in /usr/sbin, make webadmin match
+	cd "${D}/usr/sbin"
+	for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv "${f}" "courier-${f}" ; done
+	if use web ; then
+		sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \
+			-e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \
+			"${D}/usr/share/courier/courierwebadmin/admin-40imap.pl" \
+			|| ewarn "failed to fix webadmin"
+		sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \
+			-e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \
+			"${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl" \
+			|| ewarn "failed to fix webadmin"
+	fi
+
+	# users should be able to send mail. Could be restricted with suictl.
+	chmod u+s "${D}/usr/bin/sendmail"
+
+	if use split-usr; then
+		dosym ../bin/sendmail /usr/sbin/sendmail
+	fi
+}
+
+src_test() {
+	if [ `whoami` != 'root' ]; then
+		# Disable valgrind checks
+		echo '#!/bin/sh' > libs/imap/testsuitevalgrind
+		echo '#!/bin/sh' > libs/maildir/testsuitevalgrind
+		sed -i -e 's:VALGRIND=:exit 0 #VALGRIND=:g' libs/maildrop/Makefile*
+		emake -j1 check
+	else
+		einfo "make check skipped, can't run as root."
+		einfo "You can enable it with FEATURES=\"userpriv\""
+	fi
+}
+
+pkg_postinst() {
+	use fam && elog "fam daemon is needed for courier-imapd" \
+		|| ewarn "courier was built without fam support"
+}
+
+pkg_config() {
+	mailhost="$(hostname)"
+	export mailhost
+
+	domainname="$(domainname)"
+	if [ "x$domainname" = "x(none)" ] ; then
+		domainname="$(echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/")"
+	fi
+	export domainname
+
+	if [[ -z "${ROOT}" ]] ; then
+		file="${ROOT}/etc/courier/locals"
+		if [ ! -f "${file}" ] ; then
+			echo "localhost" > "${file}";
+			echo "${domainname}" >> "${file}";
+		fi
+		file="${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}"
+		if [ ! -f "${file}" ] ; then
+			echo "${domainname}" > "${file}"
+			/usr/sbin/makeacceptmailfor
+		fi
+
+		file="${ROOT}/etc/courier/smtpaccess/${domainname}"
+		if [ ! -f "${file}" ]
+		then
+			netstat -nr | grep "^[1-9]" | while read network gateway netmask rest
+			do
+				i=1
+				net=""
+				TIFS="${IFS}"
+				IFS="."
+				for o in "${netmask}"
+				do
+					if [ "${o}" == "255" ]
+					then
+						[ "_${net}" == "_" ] || net="${net}."
+						t="$(echo "${network}" | cut -d " " -f ${i})"
+						net="${net}${t}"
+					fi
+					i="$((${i} + 1))"
+				done
+				IFS="${TIFS}"
+				echo "doing configuration - relay control for the network ${net} !"
+				echo "${net}	allow,RELAYCLIENT" >> ${file}
+			done
+			/usr/sbin/makesmtpaccess
+		fi
+	fi
+
+	echo "creating cert for esmtpd-ssl:"
+	/usr/sbin/mkesmtpdcert
+	echo "creating cert for imapd-ssl:"
+	/usr/sbin/mkpop3dcert
+	echo "creating cert for pop3d-ssl:"
+	/usr/sbin/mkimapdcert
+}
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 253bff97bd73..a1114a7d0502 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -11,6 +11,7 @@ AUX exim-4.97-no-exim_id_update.patch 402 BLAKE2B 0c2f7ec1fe995f8ee58c6907e14936
 AUX exim-4.97.1-CVE-2024-39929-part1.patch 3624 BLAKE2B c58d8d2ed56acf36d851ff8cc17569aa01da3d71582f6813f43d397a7333381b7cd6acfa6923111e403ff71413a3c8d11ea1df48f8a846fcea9b0479103008cc SHA512 0d1a4080d657895153e32111fea33daee1efb2a79d1699310135fd0a25935695b016ed55e7889583170b058c072e251833057d4bbdb59a032dbb8491b8c24b8c
 AUX exim-4.97.1-CVE-2024-39929-part2.patch 7476 BLAKE2B 14a7b0e5711307cab2e19b1325162503b8e9167cc527f520d4fe395d6582a0bb8f80c058c3502487bde0414d14ae0e7fbebab5d3e471e4764679de12ad0c9600 SHA512 123bf547ee2f09f0c97f01c64c6452103eb972daf2c364b475b5d841b9d972551f03550f7dfedd8340ffd4cc3f4b6e077f04a9ea87c89d1cc3cca330249ded33
 AUX exim-4.97.1-memory-usage-bug-3047.patch 8680 BLAKE2B 6c027bebf5d2499d92cf442d3d1beaade645f59b3b6ed4e0f20db763a8697d4f77cbe2d727136df18486a9374f2c46754fa8f89da6361cb1b42812034ac0de7c SHA512 0397318fdc9de3bc9707fad84b6c5c3fec23e5c3d211d090412a907855b74013d6dde1193d590b2162e72167156c8816e9649e18081feba3061431555d6f69c6
+AUX exim-4.98-tidydb-crash.patch 357 BLAKE2B 7cf8f27a0e0e8ee70078548059faf3ea131c11731287525249aa238a5473187b729ee62a21306cd801b120f1f4f315e6a52f451c0cdf8b34f5824759e54d9dfd SHA512 68a6842b28f3e0758e453a0a41362d21ca2a01001107598207614cbcb51b7742fec022d5f51905ff0232adbc5292980f82b4130900d18fb0911bc7738db8e9bd
 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
@@ -20,10 +21,10 @@ AUX exim.service 229 BLAKE2B 6d6396ef98b8e7c4fcfa28e24223bd58393387abedfb960284d
 AUX exim.socket 139 BLAKE2B bb8281a98fdac1b52031d5250fd1e658bf5a2c32e24b49ed0daa857d0d32285abf6db23c3d717992c43443ab4bcd97a19ec3811f182200a2d99a48ced6cfb6bc SHA512 db621116907ceb573e6f34581f47c91f751bff593054d7ddc32397b34c7f2405bec184bdb0589d2ac457fa3a61bcba072761e3a6293a99c9c764d2d9fd6069ae
 AUX exim_at.service 140 BLAKE2B 8624f4a555e2acdc7aaf917952c4152ad00dc063a51076aefa1d023d47d5f7fe8b268f3308734f363ed9628cd8551ccac7fc369657e0fdf65507d2e6419f704c SHA512 11c8133ee15b3e5193c9b1c59aed66c81b6e045dd23310bede9fcde6c88905db5ef08afdb798b53b75a7465915ea1247e980edf95db07a7f9b7bb58ce95fbb5a
 DIST exim-4.97.1.tar.xz 1919308 BLAKE2B ea41bf851185c7330e648c7757f2bf0b0aea3133e399630a40d220f5f542e9055e3ed0cd67c9ee5dcede281ccc17919a4ac328abd8f05d4d828e0381f10df0b8 SHA512 eab7ca28b37f1635c48f5e963ab69fcbad539b2c35a84286ecaad7d7ff5210bbefce86452302e08099afdc0710f9cb7ca6d9b152b0ba88a19292f7c5541e0cfc
-DIST exim-4.98.tar.xz 1936984 BLAKE2B 927108e25eb60fb97e390916a4623339ccdd2dc9aaa1de1f913855f04f2372da765c12cc03c97b0ad49e47ea6200370490100407898ad3881ca41ade0940461a SHA512 13dd963dd0899bb4d64bee44c20883e720e469a4d77456b877d6693cfc4419805a045cb561508cdf763dbb37cc84fbdc6177d68acc2183934c3224fbd03caf15
+DIST exim-4.98.2.tar.xz 1929020 BLAKE2B 7e8b11de364735a0d3d1d1d269ec0a8030530daca141163fb5a57c6f2a93dbd6298cbb0fc422d9e9f4ca363e675923fe952ba52080767a6f9c21ace9d01821ab SHA512 aaa4cfc8aee90818c6d1c2fd0cf64b82668d1a343f462f678b38b2b79e10a467240f2e81786eec7705eec3598d23686a74437c50b68502f29ff67788393c812a
 DIST exim-pdf-4.97.1.tar.xz 2139688 BLAKE2B baadbb6ca7b88b11ea88f6b5ce0c96d9d713a1f5b358e4dfb52647ccc2bb1a9a6f74e75341839a8ee7df327f2f5645dbf223e4e5923631b02aa53a777701b436 SHA512 6aa733b1d48b6237f458939ff53e484e702f47a0c10ba781ba101db404d39667bd2ddc876af4f597deda1991e534d5b8b874c549e6a86b5325ebd624a6713183
-DIST exim-pdf-4.98.tar.xz 2148892 BLAKE2B 032660d946d54684ab495fd93fc600f2c2611ed87cfae2f15b4dc1e4e2a1de2eea4ba273f25085b7f8a5be481848129c366daad9447bd185ca087800a3ea1c9f SHA512 e9abce5c37fd102243c08f3eb25fe44d2fb79a9e41b23aa8f72b87d26fdb8ab13d2da8d0a7bf2ee4f9ce84d69c72f80483ca375710cd4ab87c32270ce1392641
+DIST exim-pdf-4.98.2.tar.xz 2139176 BLAKE2B 7ac5a0e4107ce3928417bcc39fef6ad6ab817ad415290dc2be913f5df56ee24ee89b26ed7be07b10580b14690b89548ef9c14ed98ddaa57133ec4d6940e2014d SHA512 ca33c47911e44f1d3918180389259e9f2e7256a2186130667dfbe71d244eb3d8df5d56136fe48b564cc756c776678780d444afc99f3163e2852f9e067739fd34
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
 EBUILD exim-4.97.1-r6.ebuild 15532 BLAKE2B 1966575423ae14f92870ef41fe372382453c1140e2d4cf936ca13c5edf291be937cf03861d9ad16e04503ba14611b9e51a6042a7a0424a34f87cbac8dc405078 SHA512 40338c59c9cd0e1175e0eb606277615deaa18da9d43e25f03fa5fadc7e8c96801e5b458d50d66a43e803bfa143cb6f36831c0ca7fbf21c4bae16c6882354fc8b
-EBUILD exim-4.98.ebuild 15343 BLAKE2B 18991173f8ecd3c57cbe12a88ed667c41b680362c45c1ff812987cebb0a3922800cc8944f9826aa8421bdf4eacf58d6e530ddcc54e4396f4e337edf7bae435e4 SHA512 623d7bfc7b42ab11a74756fa5cb1cf808ede4060dd606bb8c8cb1cc64b130349e846a5c75ba0fab6ed7241f682cc3f377f8ce5427582891c52085d79675ab4a9
+EBUILD exim-4.98.2.ebuild 15408 BLAKE2B 24cf1e0e6808964f1b1162ba3fcd73bb4194b63c6c04e364dc60279548f70ae7bc814c83f7246415691b1c47bb65391a17388de647642899c3eaf315377467be SHA512 d29d7668c2ae56ff02fb8abecbc43f41ddc88c1f4ed85d1ff0a6d1ca7aa3920d0739eafc22905ab5651b43b0d04df360e675fd283ddd87e4bfb687ad9af7385f
 MISC metadata.xml 2488 BLAKE2B 2b6eee3c45210da4bb79ed1a01801cabbdf2be353652602b60cb7c512426197eb14defb2382dd71bcbf0101685a8e5d2f58d52fbee402894f2d86e51329d2165 SHA512 1b3f9fe9cbff738595101b32179f5c8230b5afefcce5266e06db97a3a07a73ad842f0a8be44f421a71e120cdff11e262ba1893f1c7117a0a4c42cf5f37a44d7b
diff --git a/mail-mta/exim/exim-4.98.ebuild b/mail-mta/exim/exim-4.98.2.ebuild
index 44fa0a5c60e0..44aa4d7194a5 100644
--- a/mail-mta/exim/exim-4.98.ebuild
+++ b/mail-mta/exim/exim-4.98.2.ebuild
@@ -1,10 +1,28 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 inherit db-use flag-o-matic toolchain-funcs pam systemd
 
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+HOMEPAGE="https://www.exim.org/"
+
+SDIR=$(
+	[[ ${PV} == *_rc* ]]   && echo /test
+	[[ ${PV} == *.*.*.* ]] && echo /fixes
+)
+COMM_URI="https://downloads.exim.org/exim4${SDIR}"
+
+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 )"
+S=${WORKDIR}/${P//_rc/-RC}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
 IUSE="arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl
 dsn gdbm gnutls idn ipv6 ldap lmtp maildir mbx
 mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux
@@ -31,21 +49,6 @@ REQUIRED_USE="
 # 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}"
-
-GPV="r0"
-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 ~ppc ~ppc64 ~sparc ~x86"
-
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	dev-libs/libpcre2:=
 	tdb? ( sys-libs/tdb:= )
@@ -108,8 +111,6 @@ RDEPEND="${COMMON_DEPEND}
 	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
@@ -119,6 +120,7 @@ src_prepare() {
 	eapply     "${FILESDIR}"/exim-4.69-r1.27021.patch
 	eapply     "${FILESDIR}"/exim-4.97-localscan_dlopen.patch
 	eapply     "${FILESDIR}"/exim-4.97-no-exim_id_update.patch
+	eapply     "${FILESDIR}"/exim-4.98-tidydb-crash.patch # upstream #3144
 
 	# oddity, they disable berkdb as hack, and then throw an error when
 	# berkdb isn't enabled
diff --git a/mail-mta/exim/files/exim-4.98-tidydb-crash.patch b/mail-mta/exim/files/exim-4.98-tidydb-crash.patch
new file mode 100644
index 000000000000..7f109688c41b
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.98-tidydb-crash.patch
@@ -0,0 +1,16 @@
+https://bugs.exim.org/show_bug.cgi?id=3144
+
+--- a/src/hintsdb.h
++++ b/src/hintsdb.h
+@@ -596,7 +596,11 @@
+ /* EXIM_DBDELETE_CURSOR - terminate scanning operation. */
+ static inline void
+ exim_dbdelete_cursor(EXIM_CURSOR * cursor)
++# ifdef COMPILE_UTILITY
++{ free(cursor); }
++# else
+ { store_free(cursor); }
++# endif
+ 
+ /* EXIM_DBCLOSE */
+ static inline void
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 5bb334aa8bc1..bab020dad20f 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -5,13 +5,13 @@ AUX smtp.pass 29 BLAKE2B 589915bd2856fa64e22caa12fca54ef342eb07606de38d3879c13ac
 AUX smtp.sasl 42 BLAKE2B 67e9108101779b6027fa1e5cc7c9256a606d440e15bb037a0da186e6b4983ab26e88ede2f0604737c78144c03e182f66005062f1d49e10443d1ddb9757461d1f SHA512 a48e2bd173c4443dd2c389f6973a541dbcba4223b52b42b409a68d934a7fc82a98d4027267befcd5db6ec628cce6a9dffdf044e6fbd774b6e748f07f4106db47
 DIST postfix-3.10.0.tar.gz 5047589 BLAKE2B b1788cabe0e2013ae01f3f8b8d78e2a191e2d439ce7a60948216f36201096027c3b926e23494fe6ccaced715a2ef2640a3420965ce94ada1fe5a7a1c65ac3022 SHA512 dbb492ce7747c196ca99a345bcafe7f0d905f80e38ecf680ab8976d3391a1eb1c80e4b0fec487947ed793a3163e39a9fcd34dc6f172dee7cac4c11a1ef76275e
 DIST postfix-3.10.1.tar.gz 5047708 BLAKE2B ff2ff4a6fc61eb7f513124abc7a03f69b4c195967816a28a4708fbe7256e78959d499941747ef2fea7999bd2754e2e640e98e247a7870449cffb66ebf30ffee9 SHA512 f977668a3475493c679884fb06e7b6aee33e082b2a828e63e1f67515907ded7b406468d2bb03685275b9cde50ac04c03415876119401d0ca45c5b28ca0277cfe
-DIST postfix-3.11-20250323.tar.gz 5052693 BLAKE2B b62e4b44fcc4059e392df2a20159a4a216ecbc592f280c2c981c56cfbbcd3e2bbbb5dd48cb1d2042e7c462829460927a7d622da92f8c7e5ffa92d64549c627b1 SHA512 71461277ffad0e8cf0d20aa79983b4e4e8fe6028cdae28b25892cb004586b897a8fdf61a3344064fe450811e16421282b5ad8f9df0c70e15b6045d6aa9d422d3
+DIST postfix-3.11-20250409.tar.gz 5056704 BLAKE2B 15209a920be4e89d8843667eaaf75fb41c9a1ca05e5cfaab57fc12514f4f9e8bb8639c5c42563557be599e82e83f2e8372b2d0582c9f8c2332845e6863056f01 SHA512 a010a311aca481ad62fa15744ca3b2e9216686ed283b0240d5bd05e93c404e4fe0a9996c7d0a2769b9eef38011cabaed1008a9a5da54ea043d5c3591a3c6ead4
 DIST postfix-3.9.1.tar.gz 4953855 BLAKE2B 78be7bf0f0d9e46429b40f98ddc98cac442cfdb404d77073346c973f3d0d4c52f299fc7f5d64bddaaf2db60dd234c52790f1efe4995faee8e2cd10c6f8e2096f SHA512 79109d9f19e51d9089a0f2b5c6134972148a6e1a7e385aabc79c0a32e09c78715ad94a93ae3eca1171b770c62d6bf3b8e079b94183ae851001db1a0cf21fff15
 DIST postfix-3.9.2.tar.gz 4956185 BLAKE2B 539a09282e939a62de1f7aab4648a399872df744cb6e6ec4bd63c5281ada9c439c953e5da524d59dfe3c59debab8a6933046a6099efff2688dc1b3824edaa35d SHA512 14154077bd474283e522c427d9e45b3599be0c748c0bd2131309fcc506162e8522669a230c1a35bb467a5216d7e99c3d9685fc8f581232cd12e9337ea48d1981
 DIST postfix-3.9.3.tar.gz 4956314 BLAKE2B 01d69092483f3894a54489c7455a4a1a0125e13b3e7675316ce0a34a193004c488a123c473d243f6b3ca6e288807a7251d165d64f0e448e198ebee6422e97851 SHA512 7539d81296da6d7d569a1f7ad0cee413a87e0293f09b5fbcc7d4b847dfbfba02c106a4d6be87c7443831fee1d0d6cc7fa152133dd784e960865afc240fda1946
 EBUILD postfix-3.10.0.ebuild 8664 BLAKE2B 5f4df04cbc8753bf4ba1af87859e88937ca53bcac6ae87700b2bb9da95202b32e206c27f28166e7fc1a18d77ccccb711166e21c1dc3082d01193106a60268ab1 SHA512 95c5f5604faaf8004963f7350cdb786dbadce2418a2d35c3834d76ece5e57dc475de0b56c504367e9e432ac35254f647e95295613fc54317b15536bd4e7d2d1f
 EBUILD postfix-3.10.1.ebuild 8687 BLAKE2B a1a76fa33ce58bc3e6c95fbee92b0215a70813b29a80e6a51d8baf5f16809c792d273c26ce2daaa97f748eb71f82b62f539a03436c835a6c2a694ed6bd876df5 SHA512 c0bd9537e7df80aa51ae23684105c00e6a6adcc236782e4322d9d8b4977a6f2a7e224f8a0ed6a20c37b1571c4ea2f2c155f52fc929371877f2090bde9e3d0bfb
-EBUILD postfix-3.11_pre20250323.ebuild 8691 BLAKE2B 359cd413ca41738457b8fad02a55ad5622bdf5a0a828665a80cc8dc94e126810f59592dc78c82231472af0d98de63a1ffb7257e8318bbc95b4859eda508d318d SHA512 0cc5cc9ea55df612e63ccbd52ccf4ac5eb7fe3ae706e52289da2e34c1856501fa6e7f095e6f91e8b2dded43fff9f83b618ffb2e8b5de8cc0142eb394cc816498
+EBUILD postfix-3.11_pre20250409.ebuild 8691 BLAKE2B 359cd413ca41738457b8fad02a55ad5622bdf5a0a828665a80cc8dc94e126810f59592dc78c82231472af0d98de63a1ffb7257e8318bbc95b4859eda508d318d SHA512 0cc5cc9ea55df612e63ccbd52ccf4ac5eb7fe3ae706e52289da2e34c1856501fa6e7f095e6f91e8b2dded43fff9f83b618ffb2e8b5de8cc0142eb394cc816498
 EBUILD postfix-3.9.1.ebuild 8593 BLAKE2B 1dc0370fc86b3e1370b8d267a0c3b202e3543eb530877a8ca579b20535a051bf3c28fd5f0c370fd12f520e82d751356cd79849e56a53ed880fa8f93757e347aa SHA512 df4f65a343059bf6fc9746d0a525178a052e33e74e395a9b3dda1458242677a47dde5d278d09a5b3ecb4ad905b50e5bfa28a493c2f031acc790dac7dc732ecec
 EBUILD postfix-3.9.2.ebuild 8599 BLAKE2B 9968c98b1752d75ee80adf3e287ebd99d2a9212b6343ddd174923824aae005fded4ef166ff0a9d170a9606b17d57bf66ffddf71ac21bec403283cfb967012a3b SHA512 740877cc65837a620de3f49b7bf47aa55f99cb67b303a7337b4ed9b5d683134961d085394b6c9255b01529af147f956332f345f2f1c575342a1022a47702bb8f
 EBUILD postfix-3.9.3.ebuild 8599 BLAKE2B 9968c98b1752d75ee80adf3e287ebd99d2a9212b6343ddd174923824aae005fded4ef166ff0a9d170a9606b17d57bf66ffddf71ac21bec403283cfb967012a3b SHA512 740877cc65837a620de3f49b7bf47aa55f99cb67b303a7337b4ed9b5d683134961d085394b6c9255b01529af147f956332f345f2f1c575342a1022a47702bb8f
diff --git a/mail-mta/postfix/postfix-3.11_pre20250323.ebuild b/mail-mta/postfix/postfix-3.11_pre20250409.ebuild
index 32a53e98dd5c..32a53e98dd5c 100644
--- a/mail-mta/postfix/postfix-3.11_pre20250323.ebuild
+++ b/mail-mta/postfix/postfix-3.11_pre20250409.ebuild
diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
index 646d3b3f91a7..8ee1e3f627dc 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -1,11 +1,17 @@
 AUX sendmail 595 BLAKE2B fe4532e30c6bc84effbdd59de70a27e2565fa7b4437c1fdc64ca169adf14702b8fa739123f2b0f0d2069b33939efe0c3382ea51716bf5fb1905f04f6074c8ac2 SHA512 0a1611eeec33a7d7eecff75ed6c8f70abf0d6d8cf4a5242f084da0d4139e0e871239e9893a53782e5dab80c4386c62d96ec03839fc98a497e697fce1f7a149aa
 AUX sendmail-8.16.1-build-system.patch 9701 BLAKE2B f1bbf82ab321b502ecbd5d2658e549275330ec6f6fdd2a31af36aba580adc1fafa74acaf1213798787c5b6c985e86f366f68e4c260212e4856e5778201400bfc SHA512 9a3dad2df6a84729a5dd7dfc7c696acacdb96d1b0856f763604e1183f9fb7e7e5fc6012d4299c9e0a6a57c65d763d4ca607f3c7862a2055aa3aedf3994ed22fe
+AUX sendmail-8.18.1-ctime.patch 322 BLAKE2B 743939a84a2b59bbe47dcec7e33a2c96aa34597fc625440820fd55f49aacd87f95e266f170a250c8bb897e8b6c75a1cead2877b95e013feff42519488376c9c2 SHA512 d651ee21468422957c3da908af12d180b2dd870d39c48a8a1b2ed24ade2aae17a1b60ef79fe2ae089930f20d7b8f374cdb2dce7e96a49dc6db98adb19e392d74
 AUX sendmail-delivered_hdr.patch 341 BLAKE2B a29362584d77bd317de58c1967a9cfb3a2e0d1c5f0b37504d13c1404830687137f9342fe567ea969b40989115a292d947064f37b307c2a3e9b75051ee53d28ff SHA512 1e97ca1b32e6cbb69fe08d4e1c5dee0763ef874537448e60129f71f82bc92c78fc5d9e124568d21188b6e6e2186a1a3c9f1362b0d0734f7e12e2272643238254
+AUX sendmail-maildir.mc 365 BLAKE2B fa7a8d7d53ab57d41625957d3906022412f5aaf11be6f29c716f6e9c9aec62ebfef29aef12b28268811f9ec00b8e8d5795c38ae56089592ff230f40c51d49d20 SHA512 5c12d3803737364d5747790ada59224192fb4676db4580b85c94176c5c0bb499a2ce13d47e99ab8a6d23f4a70fa9e08e4d7d7ed86f7ba695792c63219b48160d
+AUX sendmail-musl-disable-cdefs.patch 352 BLAKE2B 192218bd59e4b5b4b7b7dd8f0a7a3ea19a3df1de3d32ad11c3b7159e55d92d7a2a500c7449dcd2c63b2d84934a18205f45b2962e7a80621697e81bcfbd7e1bdf SHA512 1305d7b0d0742d26fcb742b8751672ec03033abc2b01bb95a31c533dd197903138c3d39468fe104fb4779017d036f5c1656e06454e891e08155b34bbe1718292
+AUX sendmail-musl-stack-size.patch 1522 BLAKE2B c2348f569cf69d52418beef8b2fc5fea31d5e100ab849220aca1ebbae44a955c482c375a02ddf43524894574355cebdc292b9566bfa420dead96df2d229a44a8 SHA512 d3e12943fe7e9babdf700a2d8c0229bc16fa2ea16097615600341dee13f137b157ffa4b03f76c92ba9c5552ca3bf01cb598f6a6201720408df3a37247001a219
 AUX sendmail-procmail.mc 295 BLAKE2B ca3a2e0939dbf09ab8e4042737bc8c5489bae114baad9a9c09f1d698ad881fd050e57cec42929709b5635e83d3f6393ea1b70c51e01af8110d145d46ec4ec70a SHA512 eb693fb91acdc3cbc4601d517119300f238c20e86dc0dbc137a209ce56bd5bf7d7a8c9848a143daf932be487d919004da994ba2dbd7494ea5be6e08929549d58
 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.17.1.9.tar.gz 2345302 BLAKE2B 378f2f98ffff6457c49f934228964e792acec6f33fbabd89a8712f09f1dc7afc951b7c984a397aa7dd3773d86bdf57a946ea9ac54ae426bc0b8ea4c040e2ad4a SHA512 ad8198b12bdc0037de5b64b2504bd5e0a42bf054274a4834163a7c46953b9aec23d52d58063cc6b925d90199973608f35edeb40128671ae32889f4558e5c0d4b
+DIST sendmail.8.18.1.tar.gz 2401566 BLAKE2B 3afa36073fd611c7fdb43ef0ab9f02d5fb8ae388e9471bdc7275c6c9dcee0a654f46ddef505b70e978cb1b818b0da375250678e501676d8bace534d59ee40d90 SHA512 9ce713b44439d4de6faa9e3cdfa2226b44b4fbeb352a5f81584c062570e9472da244158287e489aabe258d28fe54ca4964565c7b0adc7e1763d212be42f98061
 EBUILD sendmail-8.17.1.9.ebuild 6460 BLAKE2B 5347fbc062ff276b90f385fd47a48f8f8fa886556c41e89eaea9fd61ee841dce1fab76a1fedf55613f8ea189519a3663376f859c0ca0d0dbd142cd7ab2d0ce4c SHA512 f32e6f63b722ed778b0fa9e2071673de1a76a2c1eed3c28b2c270dab6eeafbf87dedeecb4aa7b93717eb97318d7e93b6cd443483396264f189f0d49b02dea671
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+EBUILD sendmail-8.18.1.ebuild 8338 BLAKE2B b209bd9d3028122a90fabbc1204632ddda5c318c62bf81a6770b6caca27efeb5134f6f1f934fcb9163a37d0016747426eadac765c5ed93d86fd5b878b1bb712e SHA512 8d97b4e6a6b444df1a52a13ba5737c788a1cdc3056c932b696d06dfc29e06c7db31e5476fc9e288a656819f82d99324cf44667ccfec9090bf514a88f79bde055
+MISC metadata.xml 573 BLAKE2B 011a4aeedbe6ced9d79254008d489322c93e117dfe3f8b8a4e65ff6f1da3bbe32963744192c3f3ed7e73e2535449bbe0e3141a3b51798d3b7834657be1a3c859 SHA512 99f44116dd7a9a6e11b66328851be56bb1de62cf72a2dcc345810b3ac31f1abc3039d3e1aa3ccdd90d0a02083614bde43717056f3c3d31d42f33f5837a8bff31
diff --git a/mail-mta/sendmail/files/sendmail-8.18.1-ctime.patch b/mail-mta/sendmail/files/sendmail-8.18.1-ctime.patch
new file mode 100644
index 000000000000..2db37c424652
--- /dev/null
+++ b/mail-mta/sendmail/files/sendmail-8.18.1-ctime.patch
@@ -0,0 +1,13 @@
+Bug: https://bugs.gentoo.org/945726
+
+--- a/mailstats/mailstats.c
++++ b/mailstats/mailstats.c
+@@ -65,7 +65,7 @@
+ 	char sfilebuf[MAXPATHLEN];
+ 	char buf[MAXLINE];
+ 	struct statistics stats;
+-	extern char *ctime();
++	extern char *ctime(const time_t *);
+ 	extern char *optarg;
+ 	extern int optind;
+ # define MSOPTS "cC:f:opP"
diff --git a/mail-mta/sendmail/files/sendmail-maildir.mc b/mail-mta/sendmail/files/sendmail-maildir.mc
new file mode 100644
index 000000000000..eb8a3f06c48f
--- /dev/null
+++ b/mail-mta/sendmail/files/sendmail-maildir.mc
@@ -0,0 +1,13 @@
+divert(-1)
+divert(0)dnl
+include(`/usr/share/sendmail-cf/m4/cf.m4')dnl
+VERSIONID(`$Id$')dnl
+OSTYPE(linux)dnl
+DOMAIN(generic)dnl
+FEATURE(`smrsh',`/usr/sbin/smrsh')dnl
+FEATURE(`local_lmtp',`/usr/sbin/mail.local')dnl
+FEATURE(`local_procmail')dnl
+dnl FEATURE(`local_procmail',`/usr/bin/maildrop',`maildrop -d $u')dnl
+MAILER(local)dnl
+MAILER(smtp)dnl
+MAILER(procmail)dnl
diff --git a/mail-mta/sendmail/files/sendmail-musl-disable-cdefs.patch b/mail-mta/sendmail/files/sendmail-musl-disable-cdefs.patch
new file mode 100644
index 000000000000..6dc4ac63105e
--- /dev/null
+++ b/mail-mta/sendmail/files/sendmail-musl-disable-cdefs.patch
@@ -0,0 +1,11 @@
+--- a/include/sm/os/sm_os_linux.h	2020-06-09 11:57:46.789786561 +0200
++++ b/include/sm/os/sm_os_linux.h	2020-06-09 11:57:49.174781812 +0200
+@@ -33,7 +33,7 @@
+ # endif /* LINUX_VERSION_CODE */
+ #endif /* SM_CONF_SHM */
+
+-#define SM_CONF_SYS_CDEFS_H	1
++#define SM_CONF_SYS_CDEFS_H	0
+ #ifndef SM_CONF_SEM
+ # define SM_CONF_SEM	2
+ #endif /* SM_CONF_SEM */
diff --git a/mail-mta/sendmail/files/sendmail-musl-stack-size.patch b/mail-mta/sendmail/files/sendmail-musl-stack-size.patch
new file mode 100644
index 000000000000..9993adfece34
--- /dev/null
+++ b/mail-mta/sendmail/files/sendmail-musl-stack-size.patch
@@ -0,0 +1,42 @@
+Set default pthread stack size to 256 KB
+
+This patch tries to fix various crashes for applications depending on libmilter
+by setting the stack size for pthreads to 256 KB. The default stack size for
+musl libc is set to 80 KB whereas glibc has it set to 8 MB. This causes problems
+when a large amount of memory is allocated on the stack.
+
+For example, opendkim allocates blocks of 64 KB multiple times, which causes
+libmilter (and therefore opendkim) to crash. For now, a stack size of 256 KB
+looks sufficient and makes opendkim stop crashing.
+
+Fixes https://bugs.alpinelinux.org/issues/6360
+
+--- a/libmilter/libmilter.h
++++ b/libmilter/libmilter.h
+@@ -127,10 +127,10 @@
+ # define MI_SOCK_READ(s, b, l)	read(s, b, l)
+ # define MI_SOCK_READ_FAIL(x)	((x) < 0)
+ # define MI_SOCK_WRITE(s, b, l)	write(s, b, l)
+-
+-# define thread_create(ptid,wr,arg) pthread_create(ptid, NULL, wr, arg)
+ # define sthread_get_id()	pthread_self()
+
++extern int thread_create(pthread_t *ptid, void *(*wr) (void *), void *arg);
++
+ typedef pthread_mutex_t smutex_t;
+ # define smutex_init(mp)	(pthread_mutex_init(mp, NULL) == 0)
+ # define smutex_destroy(mp)	(pthread_mutex_destroy(mp) == 0)
+--- a/libmilter/main.c
++++ b/libmilter/main.c
+@@ -16,6 +16,12 @@
+ #include <fcntl.h>
+ #include <sys/stat.h>
+
++int thread_create(pthread_t *ptid, void *(*wr) (void *), void *arg) {
++	pthread_attr_t attr;
++	pthread_attr_init(&attr);
++	pthread_attr_setstacksize(&attr,256*1024);
++	return pthread_create(ptid, &attr, wr, arg);
++}
+
+ static smfiDesc_ptr smfi = NULL;
diff --git a/mail-mta/sendmail/metadata.xml b/mail-mta/sendmail/metadata.xml
index 115e9d64a669..588af3680863 100644
--- a/mail-mta/sendmail/metadata.xml
+++ b/mail-mta/sendmail/metadata.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>cfuga@cfuga.mx</email>
+		<name>Cristian Othón Martínez Vera</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="eai">Add support for SMTPUTF8</flag>
+		<flag name="tinycdb">Add support for using <pkg>dev-db/tinycdb</pkg>
+			for lookup tables</flag>
+	</use>
 </pkgmetadata>
diff --git a/mail-mta/sendmail/sendmail-8.18.1.ebuild b/mail-mta/sendmail/sendmail-8.18.1.ebuild
new file mode 100644
index 000000000000..95e367ed3452
--- /dev/null
+++ b/mail-mta/sendmail/sendmail-8.18.1.ebuild
@@ -0,0 +1,280 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note: please bump this together with mail-filter/libmilter and app-shells/smrsh
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="Widely-used Mail Transport Agent (MTA)"
+HOMEPAGE="https://www.sendmail.org/"
+if [[ -n $(ver_cut 4) ]] ; then
+	# Snapshots have an extra version component (e.g. 8.17.1 vs 8.17.1.9)
+	SRC_URI="https://ftp.sendmail.org/snapshots/${PN}.${PV}.tar.gz"
+fi
+SRC_URI+=" https://ftp.sendmail.org/${PN}.${PV}.tar.gz"
+SRC_URI+=" https://ftp.sendmail.org/past-releases/${PN}.${PV}.tar.gz"
+
+LICENSE="Sendmail GPL-2" # GPL-2 is here for initscript
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+berkdb eai ipv6 ldap mbox nis sasl selinux sockets ssl tinycdb tcpd"
+REQUIRED_USE="|| ( berkdb tinycdb )"
+
+DEPEND="
+	acct-group/smmsp
+	>=acct-user/smmsp-0-r2
+	net-mail/mailbase
+	berkdb? ( >=sys-libs/db-3.2:= )
+	eai? ( dev-libs/icu:= )
+	elibc_musl? ( virtual/libcrypt:= )
+	ldap? ( net-nds/openldap:= )
+	nis? ( net-libs/libnsl:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.10 )
+	ssl? ( dev-libs/openssl:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	tinycdb? ( dev-db/tinycdb )
+"
+RDEPEND="
+	${DEPEND}
+	>=mail-filter/libmilter-1.0.2_p2
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/notqmail
+	!mail-mta/nullmailer
+	!mail-mta/opensmtpd
+	!mail-mta/postfix
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	selinux? ( sec-policy/selinux-sendmail )
+"
+BDEPEND="
+	sys-devel/m4
+	virtual/pkgconfig
+"
+PDEPEND="
+	!mbox? (
+		|| (
+			mail-filter/procmail
+			mail-filter/maildrop
+		)
+	)
+"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-8.16.1-build-system.patch
+	eapply "${FILESDIR}"/${PN}-8.18.1-ctime.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 berkdb; then
+		# See bug #808954 for FLOCK
+		confENVDEF+=" -DHASFLOCK=1"
+		confMAPDEF+=" -DNEWDB"
+		confLIBS+=" -ldb"
+	else
+		confMAPDEF+=" -UNEWDB"
+	fi
+
+	if use eai; then
+		confCCOPTS+=" $($(tc-getPKG_CONFIG) --cflags icu-uc)"
+		confENVDEF+=" -DUSE_EAI"
+		confLIBS+=" $($(tc-getPKG_CONFIG) --libs icu-uc)"
+	fi
+
+	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"
+		# Bug #944822 - fix certification chain with intermediate cert file
+		confENVDEF+=" -D_FFR_TLS_USE_CERTIFICATE_CHAIN_FILE"
+		conf_sendmail_LIBS+=" $($(tc-getPKG_CONFIG) --libs openssl)"
+	fi
+
+	if use tcpd; then
+		confENVDEF+=" -DTCPWRAPPERS"
+		confLIBS+=" -lwrap"
+	fi
+
+	if use tinycdb; then
+		confMAPDEF+=" -DCDB=2"
+		confLIBS+=" -lcdb"
+	else
+		confMAPDEF+=" -UCDB"
+	fi
+
+	use ipv6 && confENVDEF+=" -DNETINET6"
+	use nis && confENVDEF+=" -DNIS"
+	use sockets && confENVDEF+=" -DSOCKETMAP"
+
+	if use elibc_musl; then
+		confENVDEF+=" -DHASSTRERROR -DHASRRESVPORT=0"
+		use ipv6 && confENVDEF+=" -DNEEDSGETIPNODE"
+
+		eapply "${FILESDIR}"/${PN}-musl-stack-size.patch
+		eapply "${FILESDIR}"/${PN}-musl-disable-cdefs.patch
+	fi
+
+	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
+	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-maildir.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/sendmail-cf/README file for a description
+		# of the format of this file. (search for access_db in that file)
+		#
+
+	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 failed"
+			pwcheck_method: saslauthd
+			mech_list: PLAIN LOGIN
+
+		EOF
+	fi
+
+	doinitd "${FILESDIR}"/sendmail
+	systemd_dounit "${FILESDIR}"/sendmail.service
+	systemd_dounit "${FILESDIR}"/sm-client.service
+}
+
+pkg_postinst() {
+	if ! use berkdb; then
+		ewarn "If your configuration relies on userdb, you should install"
+		ewarn "this package with USE=berkdb."
+	fi
+
+	if ! use mbox; then
+		elog "Starting with mail-mta/sendmail-8.18.1 you could use either"
+		elog "procmail or maildrop to use maildir-style mailbox in user's home directory."
+		elog ""
+		elog "If you prefer procmail (default), emerge mail-filter/procmail with USE=-mbox"
+		elog "and include the following lines in sendmail.mc to create your sendmail.cf"
+		elog "configuration file:"
+		elog "\tFEATURE(\`local_procmail')dnl"
+		elog "\tMAILER(\`procmail')dnl"
+		elog ""
+		elog "If you prefer maildrop, you'll need to ensure that you configure a mail"
+		elog "storage location using DEFAULT in /etc/maildroprc, for example:"
+		elog "\tDEFAULT=\$HOME/.maildir"
+		elog ""
+		elog "and include the following line in sendmail.mc to create your sendmail.cf"
+		elog "configuration file:"
+		elog "\tFEATURE(\`local_procmail',\`/usr/bin/maildrop',\`maildrop -d $u')dnl"
+	fi
+}