summaryrefslogtreecommitdiff
path: root/mail-mta
diff options
context:
space:
mode:
Diffstat (limited to 'mail-mta')
-rw-r--r--mail-mta/Manifest.gzbin2381 -> 2375 bytes
-rw-r--r--mail-mta/courier/Manifest10
-rw-r--r--mail-mta/courier/courier-1.0.13.ebuild5
-rw-r--r--mail-mta/courier/courier-1.0.14.ebuild5
-rw-r--r--mail-mta/courier/courier-1.0.17.ebuild5
-rw-r--r--mail-mta/courier/courier-1.0.5.ebuild5
-rw-r--r--mail-mta/courier/courier-1.1.2.ebuild5
-rw-r--r--mail-mta/esmtp/Manifest2
-rw-r--r--mail-mta/esmtp/esmtp-1.2-r1.ebuild4
-rw-r--r--mail-mta/exim/Manifest10
-rw-r--r--mail-mta/exim/exim-4.93.0.4-r2.ebuild7
-rw-r--r--mail-mta/exim/exim-4.94-r2.ebuild7
-rw-r--r--mail-mta/exim/exim-4.94-r3.ebuild617
-rw-r--r--mail-mta/exim/exim-4.94.2.ebuild616
-rw-r--r--mail-mta/exim/metadata.xml4
-rw-r--r--mail-mta/opensmtpd/Manifest4
-rw-r--r--mail-mta/opensmtpd/opensmtpd-6.7.1_p1.ebuild7
-rw-r--r--mail-mta/opensmtpd/opensmtpd-6.8.0_p2.ebuild5
-rw-r--r--mail-mta/postfix/Manifest16
-rw-r--r--mail-mta/postfix/files/postfix-libressl-certkey.patch13
-rw-r--r--mail-mta/postfix/files/postfix-libressl-server.patch14
-rw-r--r--mail-mta/postfix/postfix-3.5.10.ebuild10
-rw-r--r--mail-mta/postfix/postfix-3.5.8-r1.ebuild10
-rw-r--r--mail-mta/postfix/postfix-3.5.9-r1.ebuild10
-rw-r--r--mail-mta/postfix/postfix-3.6.0.ebuild (renamed from mail-mta/postfix/postfix-3.6.0_rc1.ebuild)0
-rw-r--r--mail-mta/postfix/postfix-3.7_pre20210424.ebuild (renamed from mail-mta/postfix/postfix-3.6_pre20210422.ebuild)2
-rw-r--r--mail-mta/sendmail/Manifest4
-rw-r--r--mail-mta/sendmail/sendmail-8.15.2-r2.ebuild7
-rw-r--r--mail-mta/sendmail/sendmail-8.16.1.ebuild5
-rw-r--r--mail-mta/ssmtp/Manifest2
-rw-r--r--mail-mta/ssmtp/ssmtp-2.64-r4.ebuild5
31 files changed, 1298 insertions, 118 deletions
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index bb917b510323..55359c1a5ace 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
Binary files differ
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 72d8d97a271b..8a9a4c773074 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -7,9 +7,9 @@ DIST courier-1.0.14.tar.bz2 7541652 BLAKE2B 5ddaabcfc49d5681b884311187eae04e492e
DIST courier-1.0.17.tar.bz2 7644893 BLAKE2B c31a5f9b27119b0affc7fe3b66da8d35534f519c8ade77b5e59e0b08f92f143b54d519ef0f726b1e68f900e8f330811befb7f2d626de041ebee53be25e089bbe SHA512 588415d1062581ba7fef64eb884c129e4802d90f6e6bf583e249c6e83e62ec90dbc7ccc0e6e9ce4697c00a4c66b10b84bfc6121854fa7abacd613010f34936d6
DIST courier-1.0.5.tar.bz2 7465054 BLAKE2B 55e9ba2a85889e7210652475149f4d3e687fd63a27b44a5a16c888b2f60bb18c4156e3344792585fed2ee3d81770e79c55ce5791842c255b8701bad5d2f8af4e SHA512 99a8e98633da99abd1f6f4e24328d4655526d51dc9fc03ffcb9c1e0cce0e608dedb2ac9511829af4487ff5af4618500d6fbbee26568f2a05e3c9d3cf3b48b2a5
DIST courier-1.1.2.tar.bz2 7652292 BLAKE2B 3d5ded14e3972532abd86bdd9d2a144dc907d6e0d1300dcc5395fcc36984bc619453e612c4c2b504fd06cdbea44ce9cd70227e5b122445704df3ba852cdc5594 SHA512 e0267acae90e792a8813b189296a599c4e27337bd5952d311cc99b068b628d4c0c6e0ae4c6ccb03fd6ada4d0a9cb362c59a7a21833177301a830fcb4c437abfd
-EBUILD courier-1.0.13.ebuild 9285 BLAKE2B 688c8dd0b199c24aa50efc99bbb2fe04711e7f0533b3f976705e92624661c67d9f0e20fed7a17c58c8eb124c25c9106f9c84b96f7826b7c6e68bba7c8eaf6766 SHA512 255d573038665431489a019667539da15c2daeb60f4dc6cfe026bbe33ad09fc92f423e50e12dd306aff360a1ffea2393df8ba500f5140ac87e2e3886f03e3f92
-EBUILD courier-1.0.14.ebuild 9279 BLAKE2B 26de200aa8bf4864f64e485d3436d682209b193cfc9c28280d0a9cdc1d1edb29fbcd126aa2c486c2a21742141321d73b6f2cd79360b226ce18d1393b388cb31d SHA512 6a0dc478d8518a6e510c308d59c486a332150891c6352d725096939cc0a5c8c1033d0f71b88ca99c5ee6fc911b5aaba07c3473764cfbd059952f1c21d21ff720
-EBUILD courier-1.0.17.ebuild 9287 BLAKE2B 807bfd85ae2d42fd96f0375d1b5daa6d80f8431a164f09e04d31175032ad8b76b96df32b09fc1de564bd13252993e06cc1b09cda6b44733df72351f7890ed27b SHA512 8b5e27f4b405c4783b7a5756a87de776bde3d5aa27b8e0ce6b18b3097ad54dd40922df28b2f07498d8bf85586d6267abef8662cf5271259dfe1c88b4ebfc5944
-EBUILD courier-1.0.5.ebuild 9504 BLAKE2B 2b1d9a4ea96668b9ac8b3dc866bc6177e25faaa61a0d1fd4cb9b40d9467a1a33e27239b7749e10431f2845be36f2000106a719170ab4559ecacfff3e74fc5352 SHA512 77294bc3dc2ff842f17da380abb7a4f79ba054f2478af3352ce6b0e4600568c40ac4e6b0dd63ad36330c2f73a7d08aaad16aa8c34605a3a656ab1aac9aec9fcb
-EBUILD courier-1.1.2.ebuild 9287 BLAKE2B 003a8c5478b5a827fba4dd800fb1959d90cfe7132d271aa82b2cb0ab20b0a9701e335bf9d4f509adf0d76f3b18b6e5f5cde042575ac2a2fd9b1469a277e540d6 SHA512 17841aa43d355dd30c5557a11cffd6f10cf67e4ad0621ecf0aae0bc46f16a6b7e6e06efc0aa667ab6b2fce309fd65afbdbc9218901a50a37abe5289e9935d4bf
+EBUILD courier-1.0.13.ebuild 9224 BLAKE2B 5208e68e759506bc292dbb588c9dfeaaa1f461b69e3c41758e6c91373fdf12f6897b49f0edbd2a3eb085fef1f7996eb68458295a0595e0628fc3d0fb86b50657 SHA512 3cc51f382bcc84f75c12bcb7c76742f8a2546f3c7dd56c20fc87b56e2c60b2715f29cebac5e998497fdc086bfe361b5e96d2dbcb09db9d5b6aa5d8bad8986375
+EBUILD courier-1.0.14.ebuild 9218 BLAKE2B 44fabea536a2b64fa88047a074cbbf30c04c071182c6551f3fa969deb875b000fb764810204d1f73dfe8c6d6edca77e2b04d933ac3d038f40102d0a538d6ed42 SHA512 4644d80a601ce95d8b0127353ae24f4434d7701c3da1916640f5e878354e11f6982544e9d3e70d0c40ed470a15d244c76b7e436e723c51ae702f43fe3ddd93f2
+EBUILD courier-1.0.17.ebuild 9226 BLAKE2B 6bc83cef3ea12abe29323d742022584ce7b8024a29eebe8c1e1a280d47d88f89da2bb000203a9146d54b7c52aa11480b8e7116de63152c8f3238059784b9f886 SHA512 9f6d36c6019a16d59c6825de7991cf22afe38e288b02884f33488738ce289a10fdbba9a493fc7a2a790fdbcc7ea9340b2fdedeb52b8ebda37e0ecfb08f0e23d7
+EBUILD courier-1.0.5.ebuild 9443 BLAKE2B 4db42a5ec6807d65df7e5f552fd9fa4723fd55ffc3e48cb10928e455194c09dfdbce92d61caa988db66e18209bfda36d06f4fe641d96ccf1e9b9f37b17d444d8 SHA512 f19f078f7f7567285cf2cfbd86b16e38532f0b51519283b642f0acac30b2b7c4a49322792d7359adabee73d55fa5368a286d1402df44c4019c91c9cb248cb2ff
+EBUILD courier-1.1.2.ebuild 9226 BLAKE2B 6f88130314ee3f5a49a7f9543df877f9c9554eeb9bb924f3d32d069e3b8127b759579f20f155b29a5e6266c514e7f11c9fde5be1ab53e450691ebc6ce5fc2aa9 SHA512 9098dc546856e349a1ec6c7e403903a0bbf1472c48108a0473ac92ad300c09c8981c9b88a7d2c3d1f46ebcddb0768026d69672f8a5360d645aef2753dd44a614
MISC metadata.xml 755 BLAKE2B 8ec0dd31ad59193d95585ab88f0bac6ced87132444a4136b2c2f80458a11f5296c42283574c3b56c26a31dad25fff530ebbfbf1ef467a1b824d11afe93a6da31 SHA512 de15af05e98deba4d3b297b4301439d892c3ba0d8af30ca459fcac72bf0179de87bf11260b8bfdb3827dd1f0e5123d68817766ffe037cece9c30adb3e8bd8b06
diff --git a/mail-mta/courier/courier-1.0.13.ebuild b/mail-mta/courier/courier-1.0.13.ebuild
index c05f3387c09f..dbbd6de31479 100644
--- a/mail-mta/courier/courier-1.0.13.ebuild
+++ b/mail-mta/courier/courier-1.0.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite \
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
fam web webmail gnutls"
DEPEND="
@@ -21,8 +21,7 @@ DEPEND="
net-dns/libidn:=
gnutls? ( net-libs/gnutls:= )
!gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
)
>=sys-libs/gdbm-1.8.0
dev-libs/libpcre
diff --git a/mail-mta/courier/courier-1.0.14.ebuild b/mail-mta/courier/courier-1.0.14.ebuild
index 4ad365ca157f..5c392591b5d9 100644
--- a/mail-mta/courier/courier-1.0.14.ebuild
+++ b/mail-mta/courier/courier-1.0.14.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite \
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
fam web webmail gnutls"
DEPEND="
@@ -21,8 +21,7 @@ DEPEND="
net-dns/libidn:=
gnutls? ( net-libs/gnutls:= )
!gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
)
>=sys-libs/gdbm-1.8.0
dev-libs/libpcre
diff --git a/mail-mta/courier/courier-1.0.17.ebuild b/mail-mta/courier/courier-1.0.17.ebuild
index 18202c44d22d..54b43c46eafd 100644
--- a/mail-mta/courier/courier-1.0.17.ebuild
+++ b/mail-mta/courier/courier-1.0.17.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite \
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
fam web webmail gnutls"
DEPEND="
@@ -21,8 +21,7 @@ DEPEND="
net-dns/libidn:=
gnutls? ( net-libs/gnutls:= )
!gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
)
>=sys-libs/gdbm-1.8.0
dev-libs/libpcre
diff --git a/mail-mta/courier/courier-1.0.5.ebuild b/mail-mta/courier/courier-1.0.5.ebuild
index 243d53af7dea..d72ae7ccd03b 100644
--- a/mail-mta/courier/courier-1.0.5.ebuild
+++ b/mail-mta/courier/courier-1.0.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite \
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
fam web webmail gnutls"
DEPEND="
@@ -21,8 +21,7 @@ DEPEND="
net-dns/libidn:=
gnutls? ( net-libs/gnutls:= )
!gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
)
>=sys-libs/gdbm-1.8.0
dev-libs/libpcre
diff --git a/mail-mta/courier/courier-1.1.2.ebuild b/mail-mta/courier/courier-1.1.2.ebuild
index c62aaf446196..8fa881169a0e 100644
--- a/mail-mta/courier/courier-1.1.2.ebuild
+++ b/mail-mta/courier/courier-1.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite \
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
fam web webmail gnutls"
DEPEND="
@@ -21,8 +21,7 @@ DEPEND="
net-dns/libidn:=
gnutls? ( net-libs/gnutls:= )
!gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
)
>=sys-libs/gdbm-1.8.0
dev-libs/libpcre
diff --git a/mail-mta/esmtp/Manifest b/mail-mta/esmtp/Manifest
index 27b62454b124..9c8f41b9e7fc 100644
--- a/mail-mta/esmtp/Manifest
+++ b/mail-mta/esmtp/Manifest
@@ -1,5 +1,5 @@
AUX esmtp-1.2-pkgconfig.patch 761 BLAKE2B f3e041ad29b73b456f88771f67f0614dffe5da9e99f60465d9720adde27f8f84ab27b667cf04c12b8f1cc0c229500b747fe4ab456566eddc59001b41cf30f048 SHA512 ada3444f7ac1f1fa1a62f33444ab135ee6e1cc477cd740fe57a8313abf4d43d0651a0495207de5eef98875a05ac860e6556a6f3a19646d08a3876b11521a5f02
DIST esmtp-1.2.tar.bz2 127921 BLAKE2B 09823dace39d3fa7d525b85e33e6e64497ef81a6e2b4b1f3682e0576511b845c7cdf50602d6b1acd6d777ca34581d3727a337ff8cb7e737f278983c06fc8773c SHA512 a1e7b56743ba32b1778bf02d0abcbdb5e6e3cb7d592c3a23a575789de60dfd62a307d4aef06860c9553cc492cdde0fff0a42de53e9d4e972587a10f609be4821
-EBUILD esmtp-1.2-r1.ebuild 940 BLAKE2B 099402570bd18146d4a1e9c26f7beeb06e919500e5f5ee8f3a153fc1aec9713d392e5c79be73eb85aa3fe8e5e33837afe592c7cab6dd11d94fa833caeeddb789 SHA512 f054e39ce72312b8f9b7d3e991cc6e5df57d891831dfeba61b6078e5c4d1a502b8131298006024ea318bfdd1d33c37bb2c1149a544724d564e34b8b7f1af7d87
+EBUILD esmtp-1.2-r1.ebuild 874 BLAKE2B 6565a83320191a7cdfe39cdbd3d30b6c8c5ecfb080b0e9f72bf632839b95545e09e79291c197a08f1ddb6375187b3a37d07abee7e2d8ec1ea5360ca64f19ed56 SHA512 af92d551548080c93030bf362d2b25b08f065f6d7baba4abffce8768be7e72ff79a227aa64970deba939b986ecc099501541a1c9eb5f29de2b03885453466297
EBUILD esmtp-1.2-r2.ebuild 994 BLAKE2B cebbfeb4998699a4d64a6ac27166c037caf643e6a3b0354389ef95743fc0cae0404017a67fef53008d8bce6af3ff09d4ca8a46f59e85ad9a8ed2d7d189f47dd7 SHA512 82fcb3e3ea85c975abe6e0e3d5c247b37b256e163f6491cddb56214af650d6e815cec4f2dfac0a1403db3a305877ed4916e6ae7989c49f05d004a1b58ad6ce4e
MISC metadata.xml 242 BLAKE2B 041399005c131e6e66967025968669f0ddb0972aa213f52e81852518a0005b7c478debfb6bc182443bb6a35066ebd6d3049c99d7b8e4a6272fd95960504e4d74 SHA512 8d906d3c3f37a584908f69913417a2c54ef0cde2709d7f2f88d25b932bfa18f98014a34f83d9ebd73f0508e324747ee48f412d909a0423892069fa9f03b78f37
diff --git a/mail-mta/esmtp/esmtp-1.2-r1.ebuild b/mail-mta/esmtp/esmtp-1.2-r1.ebuild
index 26f3962d4d62..db15fcfb38a6 100644
--- a/mail-mta/esmtp/esmtp-1.2-r1.ebuild
+++ b/mail-mta/esmtp/esmtp-1.2-r1.ebuild
@@ -10,12 +10,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="libressl"
CDEPEND="
net-libs/libesmtp
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
+ dev-libs/openssl:0=
"
RDEPEND="${CDEPEND}
!mail-mta/courier
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 89879070d698..5f662ee054a4 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -22,10 +22,14 @@ 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.93.0.4.tar.xz 1804696 BLAKE2B 721336101104d9c71b3bb6f432e382c28ad17d80cdb50d04213989e65a719d906caf8eb95639bfaf7a1bfdd62c7000d9df14484953446ecfca901fd7c708514e SHA512 84951849b69399d6f187d2801760dc0cb9e61c88c7c88aaca4e07e48120199a6be94b2236d058ffeacb8d611dd84056b610d480353c301a3ad5799768dd39d96
+DIST exim-4.94.2.tar.xz 1838076 BLAKE2B 684e115a7af3efdab15451f8e11f9b53455c9166d8c078216d7a95223d77569cec8a882ed99b9180acbd8a9e747a0bca03d56993d011de15dc35143a989ab046 SHA512 5334c236221ed4e03dbc33e6a79d939b06037fa2f4b71971607a360b67af5c85a89681ee13a5eeaf0184382c55a160cf2e89ed7afb2949f025a54f1e88f9e3fc
DIST exim-4.94.tar.xz 1828824 BLAKE2B 3836ae6427830b16fa366f5ca35431144eb48b922b699da20f3a5e423c9c8266def981afa008e50a879ac3583f3491d8f9c449e67c66053dc45e8612e38e836f SHA512 3bf95ade30902327403e7308089a3e423761da5b0745397dace7c7fd15ba3838d93e0ee418f1fed57606f79e57b793c7c7407e5c0d526146f0036126d5d95316
DIST exim-pdf-4.93.0.4.tar.xz 2069744 BLAKE2B 28730134293d87b16d672df66119ff97aaf2d796cf28842bb5bf6831a0be6a186a5cce503200b9fc985aaa14386053ca83c259625949634c5a28937b285247ca SHA512 929b4198a3e8764a64478e7ff5a9c7398ad1990114206b68494b1f1f563c23405c7b440e2f21a9f777e9e3cd3a3398d6faea3b882407f731ef3a767c27fd9361
+DIST exim-pdf-4.94.2.tar.xz 2092248 BLAKE2B 973ab4f117fdb58afa017bc41b4496fac1277e707a9926d67317c455b0bd617021c17cba6c8d793d8962aacef12c0790d5add7174017512b7b1ea070f8e8533d SHA512 3a661f69d81a992798d4b7e5b7def7cfffa297a7b3c02a6631be426cefff5a6e8783fa322a1bd105d01f7b06968d01e77963e6ab7be3157f63eb62eb6ff172b0
DIST exim-pdf-4.94.tar.xz 2089804 BLAKE2B 08f4631e903f1344d76da8dc1dcfd122cd5963bb2efbd54a486e7cf95df9e7ef06aa31dead1243a007656f05c18993f3fda18ba16ba1fde9377ac33324d5fe99 SHA512 d56666b619ba850dfa68de90afc7435bae741d72d18b5837762781ba18032878323ad40978e0113d4b88a01fd7a1d07213e6a74c38d699371d62796b6c3c35cc
DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
-EBUILD exim-4.93.0.4-r2.ebuild 14043 BLAKE2B f16a191151ed0ed32522c1291cfab414fc08978120cc0e92c967d73040a3d55528dd276d705dce334ffac22e8f217bda391084e6d1b6cb2d2ea6fff8cf8742df SHA512 517b16cf091b60d7ff03db68e17f243d1dd8a34b551d6539f1a01bfbec09584bef2fd4be05397557a592e7ac669709af9df0b6a230e889a930209eb53d7bc42f
-EBUILD exim-4.94-r2.ebuild 14094 BLAKE2B 6209011bfe3f3ced3f3bf9e0d3d5113380cae164b3125df7baff787e48ef67532ae7c062152a7732e6d298643e0676c92d9990f6724dbeef16affecad24a0a05 SHA512 77b07c5901593e79ec75029252346e5225981efcd29f659906ff11f8df4390d8aeb88432507a3b5cc68b76a934b2a7a5e9dd277cabcf7dea1eae83aff2f5bd45
-MISC metadata.xml 2457 BLAKE2B c1dcbaedd069b41c4cfb190806b44014229d53cf6d6f72e04b99dc91f223567cb4f30100792aae72658780da0579fa26e6fb8a0266565bcc0c307996d59ac3ed SHA512 9044abccd15525c7676fc218b62d9b663bd155482894eced9c0cfc8a22e8cd7353009adc75a9f3de15b14f267e6ee6b4f4c91d8bd9260931c0b9de6bf48c762f
+EBUILD exim-4.93.0.4-r2.ebuild 13976 BLAKE2B ebb85b661fc8443cfd6bb9d248bd9b5f068668d5efd45eca563c879c6e83b2968b9c1c01fde1a8a026a436f45388e400e0cef19af27d1734746a38d6bd182b62 SHA512 d63c1ef98aa5cfcc3d2c5ed34529d6cd42a7bac58ffc56bd450a74aeb4dc49b582d46f8167f1907b1fe985d2fca48f20aea7b1691571b1b91a66607f385c1eac
+EBUILD exim-4.94-r2.ebuild 14028 BLAKE2B fd76249bf2fe9896f2a6d7085de5f3e3e6e210404239f08417f236b780f39e599c98792ebafdf7cbb81106fe44896c698197de919ce871a083ecc2788d74bd53 SHA512 019a668ad8f824adac8c0f7da0f5576bbbfab939d46f3ca88b2bdf80be20312ee42b97b9341adff2f0f24ecec2c6091d9947dc5357fdcd299f441b72abbf9b2b
+EBUILD exim-4.94-r3.ebuild 14837 BLAKE2B 1e6a4c4a9e01564be481a618b46ed9ca39bb15254ce77bf1daafd8ba68a4367dc81ea00fc0200274831886c6f5af3497a8f95cd34226d49382d1f0b02aa6e726 SHA512 242c49382a95b2fc7873956a64fc0e0f818f41a5eff1c855be7b0350912e530f5fbd6c13dded41490f4e91f2c42f7875f842161c22166284fa3867c576b16193
+EBUILD exim-4.94.2.ebuild 14757 BLAKE2B abd2def9c7594ae9eab6a130c16ae4b56b35ba3d0f01a15585f7316abcd4122eefc3e396804da9e62bd984c2560b86d53ebc49dff81adc8eba9682197ccfb732 SHA512 38d3fefe9148d3ef5697bdd930125a3ba537713c8d52168e0f734918ffae4bbb616d14320e2b22696ca43c513efb36e1e8d1381c27690de3fe4afb058dc43f45
+MISC metadata.xml 2646 BLAKE2B 30c5942c58fa821f1fa8ce3274cb3b5797655c347faad8e5a5ae65e1401b65875ebb540c30cd5ad468de704223b088e1dbae8c28a8878af11819010034fc1902 SHA512 87d88d3083b30a60e4c074ebb1a1fce8baaca6b4c2c61e50bb5354fc8dcb634ddde19d0e71b82b28f497bfa95a682ce78167a273652ad3e8fd59370a5d2900d4
diff --git a/mail-mta/exim/exim-4.93.0.4-r2.ebuild b/mail-mta/exim/exim-4.93.0.4-r2.ebuild
index b47b3f94f56d..27021c7a2f0e 100644
--- a/mail-mta/exim/exim-4.93.0.4-r2.ebuild
+++ b/mail-mta/exim/exim-4.93.0.4-r2.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
inherit db-use toolchain-funcs multilib pam systemd
-IUSE="arc +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs +ssl syslog tcpd +tpda X"
+IUSE="arc +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs +ssl syslog tcpd +tpda X"
REQUIRED_USE="
arc? ( dkim spf )
dane? ( ssl !gnutls )
@@ -25,7 +25,7 @@ REQUIRED_USE="
# incorrect, but b) is the only "correct" view from repoman.
SDIR=$([[ ${PV} == *_rc* ]] && echo /test
- [[ ${PV} == *.*.*.* ]] && echo /fixes)
+ [[ ${PV} == *.*.*.* ]] && echo /fixes)
COMM_URI="https://downloads.exim.org/exim4${SDIR}"
DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
@@ -51,8 +51,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
dev-libs/libtasn1
)
!gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
+ dev-libs/openssl:0=
)
)
ldap? ( >=net-nds/openldap-2.0.7 )
diff --git a/mail-mta/exim/exim-4.94-r2.ebuild b/mail-mta/exim/exim-4.94-r2.ebuild
index 5fb494208b3d..0abf59832592 100644
--- a/mail-mta/exim/exim-4.94-r2.ebuild
+++ b/mail-mta/exim/exim-4.94-r2.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
inherit db-use toolchain-funcs multilib pam systemd
-IUSE="arc +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs +ssl syslog tcpd +tpda X"
+IUSE="arc +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs +ssl syslog tcpd +tpda X"
REQUIRED_USE="
arc? ( dkim spf )
dane? ( ssl !gnutls )
@@ -25,7 +25,7 @@ REQUIRED_USE="
# incorrect, but b) is the only "correct" view from repoman.
SDIR=$([[ ${PV} == *_rc* ]] && echo /test
- [[ ${PV} == *.*.*.* ]] && echo /fixes)
+ [[ ${PV} == *.*.*.* ]] && echo /fixes)
COMM_URI="https://downloads.exim.org/exim4${SDIR}"
DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
@@ -51,8 +51,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
dev-libs/libtasn1
)
!gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
+ dev-libs/openssl:0=
)
)
ldap? ( >=net-nds/openldap-2.0.7 )
diff --git a/mail-mta/exim/exim-4.94-r3.ebuild b/mail-mta/exim/exim-4.94-r3.ebuild
new file mode 100644
index 000000000000..7ec16446c715
--- /dev/null
+++ b/mail-mta/exim/exim-4.94-r3.ebuild
@@ -0,0 +1,617 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit db-use toolchain-funcs multilib pam systemd
+
+IUSE="arc +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs +srs-alt srs-native +ssl syslog tcpd +tpda X"
+REQUIRED_USE="
+ arc? ( dkim spf )
+ dane? ( ssl !gnutls )
+ dmarc? ( dkim spf )
+ dkim? ( ssl !gnutls )
+ gnutls? ( ssl )
+ pkcs11? ( ssl )
+ spf? ( exiscan-acl )
+ srs? (
+ exiscan-acl
+ ^^ ( srs-alt srs-native )
+ )
+"
+# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
+# for x86 and amd64 only, due to this, repoman won't allow depending on
+# gnutls[dane] for all else. Because we cannot express USE=dane when
+# USE=gnutls is in effect only in package.use.mask, the only option we
+# have left is to a) ignore the dependency (but that results in bug
+# #661164) or b) mask the usage of USE=dane with USE=gnutls. Both are
+# incorrect, but b) is the only "correct" view from repoman.
+
+SDIR=$([[ ${PV} == *_rc* ]] && echo /test
+ [[ ${PV} == *.*.*.* ]] && echo /fixes)
+COMM_URI="https://downloads.exim.org/exim4${SDIR}"
+
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="${COMM_URI}/${P//_rc/-RC}.tar.xz
+ mirror://gentoo/system_filter.exim.gz
+ doc? ( ${COMM_URI}/${PN}-pdf-${PV//_rc/-RC}.tar.xz )"
+HOMEPAGE="https://www.exim.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
+
+COMMON_DEPEND=">=sys-apps/sed-4.0.5
+ ( >=sys-libs/db-3.2:= <sys-libs/db-6:= )
+ dev-libs/libpcre
+ idn? ( net-dns/libidn:= net-dns/libidn2:= )
+ perl? ( dev-lang/perl:= )
+ pam? ( sys-libs/pam )
+ tcpd? ( sys-apps/tcp-wrappers )
+ ssl? (
+ gnutls? (
+ net-libs/gnutls:0=[pkcs11?]
+ dev-libs/libtasn1
+ )
+ !gnutls? (
+ dev-libs/openssl:0=
+ )
+ )
+ ldap? ( >=net-nds/openldap-2.0.7 )
+ nis? (
+ elibc_glibc? (
+ net-libs/libtirpc
+ >=net-libs/libnsl-1:=
+ )
+ )
+ mysql? ( dev-db/mysql-connector-c:= )
+ postgres? ( dev-db/postgresql:= )
+ sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
+ redis? ( dev-libs/hiredis )
+ spf? ( >=mail-filter/libspf2-1.2.5-r1 )
+ dmarc? ( mail-filter/opendmarc )
+ srs? ( srs-alt? ( mail-filter/libsrs_alt ) )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXmu
+ x11-libs/libXt
+ x11-libs/libXaw
+ )
+ sqlite? ( dev-db/sqlite )
+ radius? ( net-dialup/freeradius-client )
+ virtual/libiconv
+ elibc_glibc? ( net-libs/libnsl )
+ "
+ # added X check for #57206
+BDEPEND="virtual/pkgconfig"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+ !mail-mta/courier
+ !mail-mta/esmtp
+ !mail-mta/mini-qmail
+ !<mail-mta/msmtp-1.4.19-r1
+ !>=mail-mta/msmtp-1.4.19-r1[mta]
+ !mail-mta/netqmail
+ !mail-mta/nullmailer
+ !mail-mta/postfix
+ !mail-mta/qmail-ldap
+ !mail-mta/sendmail
+ !mail-mta/opensmtpd
+ !<mail-mta/ssmtp-2.64-r2
+ !>=mail-mta/ssmtp-2.64-r2[mta]
+ !net-mail/mailwrapper
+ >=net-mail/mailbase-0.00-r5
+ virtual/logger
+ dcc? ( mail-filter/dcc )
+ selinux? ( sec-policy/selinux-exim )
+ "
+
+S=${WORKDIR}/${P//_rc/-RC}
+
+src_prepare() {
+ # Legacy patches which need a respin for -p1
+ eapply -p0 "${FILESDIR}"/exim-4.14-tail.patch
+ eapply -p0 "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
+ eapply "${FILESDIR}"/exim-4.93-as-needed-ldflags.patch # 352265, 391279
+ eapply -p0 "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
+ eapply "${FILESDIR}"/exim-4.69-r1.27021.patch
+ eapply "${FILESDIR}"/exim-4.94-localscan_dlopen.patch
+ eapply -p2 "${FILESDIR}"/exim-4.94-taint-pam-expansion.patch # drop on NR
+
+ if use maildir ; then
+ eapply "${FILESDIR}"/exim-4.94-maildir.patch
+ else
+ eapply -p0 "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606
+ fi
+
+ eapply_user
+
+ # user Exim believes it should be
+ MAILUSER=mail
+ MAILGROUP=mail
+ if use prefix && [[ ${EUID} != 0 ]] ; then
+ MAILUSER=$(id -un)
+ MAILGROUP=$(id -gn)
+ fi
+}
+
+src_configure() {
+ # general config and paths
+
+ local aliases="${EPREFIX}/etc/mail/aliases"
+ sed -i \
+ -e "/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${aliases}'" \
+ src/configure.default || die
+
+ sed -i -e 's/^buildname=.*/buildname=exim-gentoo/' Makefile || die
+
+ if use elibc_musl; then
+ sed -i -e 's/^LIBS = -lnsl/LIBS =/g' OS/Makefile-Linux || die
+ fi
+
+ local conffile="${EPREFIX}/etc/exim/exim.conf"
+ sed -e "48i\CFLAGS=${CFLAGS}" \
+ -e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
+ -e "s;EXIM_USER=;EXIM_USER=ref:${MAILUSER};" \
+ -e "s:CONFIGURE_FILE=.*$:CONFIGURE_FILE=${conffile}:" \
+ -e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
+ -e "s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
+ src/EDITME > Local/Makefile || die
+
+ # work on Local/Makefile from now on
+ cd Local
+
+ cat >> Makefile <<- EOC
+ INFO_DIRECTORY=${EPREFIX}/usr/share/info
+ PID_FILE_PATH=${EPREFIX}/run/exim.pid
+ SPOOL_DIRECTORY=${EPREFIX}/var/spool/exim
+ HAVE_ICONV=yes
+ EOC
+
+ # if we use libiconv, now is the time to tell so
+ if use !elibc_glibc && use !elibc_musl ; then
+ cat >> Makefile <<- EOC
+ EXTRALIBS_EXIM=-liconv
+ EOC
+ fi
+
+ # support for IPv6
+ if use ipv6; then
+ cat >> Makefile <<- EOC
+ HAVE_IPV6=YES
+ EOC
+ fi
+
+ # support i18n/IDNA
+ if use idn; then
+ cat >> Makefile <<- EOC
+ SUPPORT_I18N=yes
+ SUPPORT_I18N_2008=yes
+ EXTRALIBS_EXIM += -lidn -lidn2
+ EOC
+ fi
+
+ #
+ # mail storage formats
+ #
+
+ # mailstore is Exim's traditional storage format
+ cat >> Makefile <<- EOC
+ SUPPORT_MAILSTORE=yes
+ EOC
+
+ # mbox
+ if use mbx; then
+ cat >> Makefile <<- EOC
+ SUPPORT_MBX=yes
+ EOC
+ fi
+
+ # maildir
+ if use maildir; then
+ cat >> Makefile <<- EOC
+ SUPPORT_MAILDIR=yes
+ EOC
+ fi
+
+ #
+ # lookup methods
+
+ # use the "native" interfaces to the DBM and CDB libraries, support
+ # passwd and directory lookups by default
+ local DB_VERS="5.3 5.1 4.8 4.7 4.6 4.5 4.4 4.3 4.2 3.2"
+ cat >> Makefile <<- EOC
+ USE_DB=yes
+ LOOKUP_CDB=yes
+ LOOKUP_PASSWD=yes
+ LOOKUP_DSEARCH=yes
+ # keep include in CFLAGS because exim.h -> dbstuff.h -> db.h
+ CFLAGS += -I$(db_includedir ${DB_VERS})
+ DBMLIB = -l$(db_libname ${DB_VERS})
+ EOC
+
+ if ! use dnsdb; then
+ # DNSDB lookup is enabled by default
+ sed -i -e 's:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:' Makefile || die
+ fi
+
+ if use ldap; then
+ cat >> Makefile <<- EOC
+ LOOKUP_LDAP=yes
+ LDAP_LIB_TYPE=OPENLDAP2
+ LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/ldap
+ LOOKUP_LIBS += -lldap -llber
+ EOC
+ fi
+
+ if use mysql; then
+ cat >> Makefile <<- EOC
+ LOOKUP_MYSQL=yes
+ LOOKUP_INCLUDE += $(mysql_config --include)
+ LOOKUP_LIBS += $(mysql_config --libs)
+ EOC
+ fi
+
+ if use nis; then
+ cat >> Makefile <<- EOC
+ LOOKUP_NIS=yes
+ LOOKUP_NISPLUS=yes
+ EOC
+ if use elibc_glibc ; then
+ cat >> Makefile <<- EOC
+ LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/tirpc
+ LOOKUP_LIBS += -lnsl
+ EOC
+ fi
+ fi
+
+ if use postgres; then
+ cat >> Makefile <<- EOC
+ LOOKUP_PGSQL=yes
+ LOOKUP_INCLUDE += -I$(pg_config --includedir)
+ LOOKUP_LIBS += -L$(pg_config --libdir) -lpq
+ EOC
+ fi
+
+ if use sqlite; then
+ cat >> Makefile <<- EOC
+ LOOKUP_SQLITE=yes
+ LOOKUP_SQLITE_PC=sqlite3
+ EOC
+ fi
+
+ if use redis; then
+ cat >> Makefile <<- EOC
+ LOOKUP_REDIS=yes
+ LOOKUP_LIBS += -lhiredis
+ EOC
+ fi
+
+ # Exim monitor, enabled by default, controlled via X USE-flag,
+ # disable if not requested, bug #46778
+ if use X; then
+ cp ../exim_monitor/EDITME eximon.conf || die
+ cat >> Makefile <<- EOC
+ EXIM_MONITOR=eximon.bin
+ EOC
+ fi
+
+ #
+ # features
+ #
+
+ # content scanning support
+ if use exiscan-acl; then
+ cat >> Makefile <<- EOC
+ WITH_CONTENT_SCAN=yes
+ EOC
+ fi
+
+ # DomainKeys Identified Mail, RFC4871
+ if ! use dkim; then
+ # DKIM is enabled by default
+ cat >> Makefile <<- EOC
+ DISABLE_DKIM=yes
+ EOC
+ fi
+
+ # Per-Recipient-Data-Response
+ if ! use prdr; then
+ # PRDR is enabled by default
+ cat >> Makefile <<- EOC
+ DISABLE_PRDR=yes
+ EOC
+ fi
+
+ # Transport post-delivery actions
+ if use !tpda && use !dane; then
+ # EVENT is enabled by default
+ cat >> Makefile <<- EOC
+ DISABLE_EVENT=yes
+ EOC
+ fi
+
+ # log to syslog
+ if use syslog; then
+ local eximlog="${EPREFIX}/var/log/exim/exim_%s.log"
+ sed -i \
+ -e "s:LOG_FILE_PATH=${eximlog}:LOG_FILE_PATH=syslog:" \
+ Makefile || die
+ cat >> Makefile <<- EOC
+ LOG_FILE_PATH=syslog
+ EOC
+ else
+ cat >> Makefile <<- EOC
+ LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log
+ EOC
+ fi
+
+ # starttls support (ssl)
+ if use ssl; then
+ if use gnutls; then
+ echo "USE_GNUTLS=yes" >> Makefile
+ echo "USE_GNUTLS_PC=gnutls $(use dane && echo gnutls-dane)" \
+ >> Makefile
+ use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile
+ else
+ echo "USE_OPENSSL=yes" >> Makefile
+ echo "USE_OPENSSL_PC=openssl" >> Makefile
+ fi
+ else
+ echo "DISABLE_TLS=yes" >> Makefile
+ fi
+
+ # TCP wrappers
+ if use tcpd; then
+ cat >> Makefile <<- EOC
+ USE_TCP_WRAPPERS=yes
+ EXTRALIBS_EXIM += -lwrap
+ EOC
+ fi
+
+ # Light Mail Transport Protocol
+ if use lmtp; then
+ cat >> Makefile <<- EOC
+ TRANSPORT_LMTP=yes
+ EOC
+ fi
+
+ # embedded Perl
+ if use perl; then
+ cat >> Makefile <<- EOC
+ EXIM_PERL=perl.o
+ EOC
+ fi
+
+ # dlfunc
+ if use dlfunc; then
+ cat >> Makefile <<- EOC
+ EXPAND_DLFUNC=yes
+ HAVE_LOCAL_SCAN=yes
+ DLOPEN_LOCAL_SCAN=yes
+ EOC
+ fi
+
+ # Proxy Protocol
+ if use proxy; then
+ cat >> Makefile <<- EOC
+ SUPPORT_PROXY=yes
+ EOC
+ fi
+
+ # DANE
+ if use !dane; then
+ # DANE is enabled by default
+ sed -i -e 's:^SUPPORT_DANE=yes:# SUPPORT_DANE=yes:' Makefile || die
+ fi
+
+ # DMARC
+ if use dmarc; then
+ cat >> Makefile <<- EOC
+ SUPPORT_DMARC=yes
+ EXTRALIBS_EXIM += -lopendmarc
+ EOC
+ fi
+
+ # Sender Policy Framework
+ if use spf; then
+ cat >> Makefile <<- EOC
+ SUPPORT_SPF=yes
+ EXTRALIBS_EXIM += -lspf2
+ EOC
+ fi
+
+ #
+ # experimental features
+ #
+
+ # Authenticated Receive Chain
+ if use arc; then
+ echo "EXPERIMENTAL_ARC=yes">> Makefile
+ fi
+
+ # Distributed Checksum Clearinghouse
+ if use dcc; then
+ echo "EXPERIMENTAL_DCC=yes">> Makefile
+ fi
+
+ # Sender Rewriting Scheme
+ if use srs; then
+ # NOTE: we currently USE-default to srs-alt, because this is
+ # what USE=srs used to be. Eventually we want to rid ourselves
+ # of this external implementation.
+ if use srs-alt; then
+ # historical default, from 4.95 this becomes
+ # EXPERIMENTAL_SRS_ALT
+ cat >> Makefile <<- EOC
+ EXPERIMENTAL_SRS=yes
+ EXTRALIBS_EXIM += -lsrs_alt
+ EOC
+ fi
+ if use srs-native; then
+ # this one becomes SUPPORT_SRS in 4.95
+ cat >> Makefile <<- EOC
+ EXPERIMENTAL_SRS_NATIVE=yes
+ EOC
+ fi
+ fi
+
+ # Delivery Sender Notifications extra information in fail message
+ if use dsn; then
+ cat >> Makefile <<- EOC
+ EXPERIMENTAL_DSN_INFO=yes
+ EOC
+ fi
+
+ #
+ # authentication (SMTP AUTH)
+ #
+
+ # standard bits
+ cat >> Makefile <<- EOC
+ AUTH_SPA=yes
+ AUTH_CRAM_MD5=yes
+ AUTH_PLAINTEXT=yes
+ EOC
+
+ # Cyrus SASL
+ if use sasl; then
+ cat >> Makefile <<- EOC
+ CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/run/saslauthd/mux
+ AUTH_CYRUS_SASL=yes
+ AUTH_LIBS += -lsasl2
+ EOC
+ fi
+
+ # Dovecot
+ if use dovecot-sasl; then
+ cat >> Makefile <<- EOC
+ AUTH_DOVECOT=yes
+ EOC
+ fi
+
+ # Pluggable Authentication Modules
+ if use pam; then
+ cat >> Makefile <<- EOC
+ SUPPORT_PAM=yes
+ AUTH_LIBS += -lpam
+ EOC
+ fi
+
+ # Radius
+ if use radius; then
+ cat >> Makefile <<- EOC
+ RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf
+ RADIUS_LIB_TYPE=RADIUSCLIENTNEW
+ AUTH_LIBS += -lfreeradius-client
+ EOC
+ fi
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" HOSTCC="$(tc-getBUILD_CC)" \
+ AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO=''
+}
+
+src_install() {
+ cd "${S}"/build-exim-gentoo || die
+ dosbin exim
+ if use X; then
+ dosbin eximon.bin
+ dosbin eximon
+ fi
+ fperms 4755 /usr/sbin/exim
+
+ dosym exim /usr/sbin/sendmail
+ dosym exim /usr/sbin/rsmtp
+ dosym exim /usr/sbin/rmail
+ dosym ../sbin/exim /usr/bin/mailq
+ dosym ../sbin/exim /usr/bin/newaliases
+ dosym ../sbin/sendmail /usr/lib/sendmail
+
+ for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
+ exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep \
+ convert4r3 convert4r4 exipick
+ do
+ dosbin $i
+ done
+
+ dodoc -r "${S}"/doc/.
+ doman "${S}"/doc/exim.8
+ use dsn && dodoc "${S}"/README.DSN
+ use doc && dodoc "${WORKDIR}"/${PN}-pdf-${PV//rc/RC}/doc/*.pdf
+
+ # conf files
+ insinto /etc/exim
+ newins "${S}"/src/configure.default exim.conf.dist
+ if use exiscan-acl; then
+ newins "${S}"/src/configure.default exim.conf.exiscan-acl
+ fi
+ doins "${WORKDIR}"/system_filter.exim
+ doins "${FILESDIR}"/auth_conf.sub
+
+ if use pam; then
+ pamd_mimic system-auth exim auth account
+ fi
+
+ # headers, #436406
+ if use dlfunc ; then
+ # fixup includes so they actually can be found when including
+ sed -i \
+ -e '/#include "\(config\|store\|mytypes\).h"/s:"\(.\+\)":<exim/\1>:' \
+ local_scan.h || die
+ insinto /usr/include/exim
+ doins {config,local_scan}.h ../src/{mytypes,store}.h
+ fi
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/exim.logrotate" exim
+
+ newinitd "${FILESDIR}"/exim.rc10 exim
+ newconfd "${FILESDIR}"/exim.confd exim
+
+ systemd_dounit \
+ "${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket}
+ systemd_newunit \
+ "${FILESDIR}"/exim_at.service 'exim@.service'
+ systemd_newunit \
+ "${FILESDIR}"/exim-submission_at.service 'exim-submission@.service'
+
+ diropts -m 0750 -o ${MAILUSER} -g ${MAILGROUP}
+ keepdir /var/log/${PN}
+}
+
+pkg_postinst() {
+ if [[ ! -f ${EROOT}/etc/exim/exim.conf ]] ; then
+ einfo "${EROOT}/etc/exim/system_filter.exim is a sample system_filter."
+ einfo "${EROOT}/etc/exim/auth_conf.sub contains the configuration sub"
+ einfo "for using smtp auth."
+ einfo "Please create ${EROOT}/etc/exim/exim.conf from"
+ einfo " ${EROOT}/etc/exim/exim.conf.dist."
+ fi
+ if use dmarc ; then
+ einfo "DMARC support requires ${EROOT}/etc/exim/opendmarc.tlds"
+ einfo "you can populate this file with the contents downloaded from"
+ einfo " https://publicsuffix.org/list/public_suffix_list.dat"
+ fi
+ if use dcc ; then
+ einfo "DCC support is experimental, you can find some limited"
+ einfo "documentation at the bottom of this prerelease message:"
+ einfo " http://article.gmane.org/gmane.mail.exim.devel/3579"
+ fi
+ if use srs ; then
+ einfo "SRS support is experimental in this release of Exim"
+ if use srs-alt; then
+ elog "You are using libsrs_alt to implement SRS support."
+ elog "In future release of Exim, the native SRS implementation"
+ elog "(USE=srs-native) will become the default. Please prepare"
+ elog "your package.use or switch to USE=srs-native now."
+ fi
+ fi
+ use dsn && einfo "extra information in fail DSN message is experimental"
+ einfo
+ elog "Note that this release contains a tainted variable check that"
+ elog "is likely to break your configuration used with Exim 4.93 and before."
+ elog "Please check your transports for occurences of \$local_part, and"
+ elog "use a replacement like \$local_part_data where possible."
+}
diff --git a/mail-mta/exim/exim-4.94.2.ebuild b/mail-mta/exim/exim-4.94.2.ebuild
new file mode 100644
index 000000000000..3998c87f8605
--- /dev/null
+++ b/mail-mta/exim/exim-4.94.2.ebuild
@@ -0,0 +1,616 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit db-use toolchain-funcs multilib pam systemd
+
+IUSE="arc +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs +srs-alt srs-native +ssl syslog tcpd +tpda X"
+REQUIRED_USE="
+ arc? ( dkim spf )
+ dane? ( ssl !gnutls )
+ dmarc? ( dkim spf )
+ dkim? ( ssl !gnutls )
+ gnutls? ( ssl )
+ pkcs11? ( ssl )
+ spf? ( exiscan-acl )
+ srs? (
+ exiscan-acl
+ ^^ ( srs-alt srs-native )
+ )
+"
+# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
+# for x86 and amd64 only, due to this, repoman won't allow depending on
+# gnutls[dane] for all else. Because we cannot express USE=dane when
+# USE=gnutls is in effect only in package.use.mask, the only option we
+# have left is to a) ignore the dependency (but that results in bug
+# #661164) or b) mask the usage of USE=dane with USE=gnutls. Both are
+# incorrect, but b) is the only "correct" view from repoman.
+
+SDIR=$([[ ${PV} == *_rc* ]] && echo /test
+ [[ ${PV} == *.*.*.* ]] && echo /fixes)
+COMM_URI="https://downloads.exim.org/exim4${SDIR}"
+
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="${COMM_URI}/${P//_rc/-RC}.tar.xz
+ mirror://gentoo/system_filter.exim.gz
+ doc? ( ${COMM_URI}/${PN}-pdf-${PV//_rc/-RC}.tar.xz )"
+HOMEPAGE="https://www.exim.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-solaris"
+
+COMMON_DEPEND=">=sys-apps/sed-4.0.5
+ ( >=sys-libs/db-3.2:= <sys-libs/db-6:= )
+ dev-libs/libpcre
+ idn? ( net-dns/libidn:= net-dns/libidn2:= )
+ perl? ( dev-lang/perl:= )
+ pam? ( sys-libs/pam )
+ tcpd? ( sys-apps/tcp-wrappers )
+ ssl? (
+ gnutls? (
+ net-libs/gnutls:0=[pkcs11?]
+ dev-libs/libtasn1
+ )
+ !gnutls? (
+ dev-libs/openssl:0=
+ )
+ )
+ ldap? ( >=net-nds/openldap-2.0.7 )
+ nis? (
+ elibc_glibc? (
+ net-libs/libtirpc
+ >=net-libs/libnsl-1:=
+ )
+ )
+ mysql? ( dev-db/mysql-connector-c:= )
+ postgres? ( dev-db/postgresql:= )
+ sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
+ redis? ( dev-libs/hiredis )
+ spf? ( >=mail-filter/libspf2-1.2.5-r1 )
+ dmarc? ( mail-filter/opendmarc )
+ srs? ( srs-alt? ( mail-filter/libsrs_alt ) )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXmu
+ x11-libs/libXt
+ x11-libs/libXaw
+ )
+ sqlite? ( dev-db/sqlite )
+ radius? ( net-dialup/freeradius-client )
+ virtual/libiconv
+ elibc_glibc? ( net-libs/libnsl )
+ "
+ # added X check for #57206
+BDEPEND="virtual/pkgconfig"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+ !mail-mta/courier
+ !mail-mta/esmtp
+ !mail-mta/mini-qmail
+ !<mail-mta/msmtp-1.4.19-r1
+ !>=mail-mta/msmtp-1.4.19-r1[mta]
+ !mail-mta/netqmail
+ !mail-mta/nullmailer
+ !mail-mta/postfix
+ !mail-mta/qmail-ldap
+ !mail-mta/sendmail
+ !mail-mta/opensmtpd
+ !<mail-mta/ssmtp-2.64-r2
+ !>=mail-mta/ssmtp-2.64-r2[mta]
+ !net-mail/mailwrapper
+ >=net-mail/mailbase-0.00-r5
+ virtual/logger
+ dcc? ( mail-filter/dcc )
+ selinux? ( sec-policy/selinux-exim )
+ "
+
+S=${WORKDIR}/${P//_rc/-RC}
+
+src_prepare() {
+ # Legacy patches which need a respin for -p1
+ eapply -p0 "${FILESDIR}"/exim-4.14-tail.patch
+ eapply -p0 "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
+ eapply "${FILESDIR}"/exim-4.93-as-needed-ldflags.patch # 352265, 391279
+ eapply -p0 "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
+ eapply "${FILESDIR}"/exim-4.69-r1.27021.patch
+ eapply "${FILESDIR}"/exim-4.94-localscan_dlopen.patch
+
+ if use maildir ; then
+ eapply "${FILESDIR}"/exim-4.94-maildir.patch
+ else
+ eapply -p0 "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606
+ fi
+
+ eapply_user
+
+ # user Exim believes it should be
+ MAILUSER=mail
+ MAILGROUP=mail
+ if use prefix && [[ ${EUID} != 0 ]] ; then
+ MAILUSER=$(id -un)
+ MAILGROUP=$(id -gn)
+ fi
+}
+
+src_configure() {
+ # general config and paths
+
+ local aliases="${EPREFIX}/etc/mail/aliases"
+ sed -i \
+ -e "/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${aliases}'" \
+ src/configure.default || die
+
+ sed -i -e 's/^buildname=.*/buildname=exim-gentoo/' Makefile || die
+
+ if use elibc_musl; then
+ sed -i -e 's/^LIBS = -lnsl/LIBS =/g' OS/Makefile-Linux || die
+ fi
+
+ local conffile="${EPREFIX}/etc/exim/exim.conf"
+ sed -e "48i\CFLAGS=${CFLAGS}" \
+ -e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
+ -e "s;EXIM_USER=;EXIM_USER=ref:${MAILUSER};" \
+ -e "s:CONFIGURE_FILE=.*$:CONFIGURE_FILE=${conffile}:" \
+ -e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
+ -e "s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
+ src/EDITME > Local/Makefile || die
+
+ # work on Local/Makefile from now on
+ cd Local
+
+ cat >> Makefile <<- EOC
+ INFO_DIRECTORY=${EPREFIX}/usr/share/info
+ PID_FILE_PATH=${EPREFIX}/run/exim.pid
+ SPOOL_DIRECTORY=${EPREFIX}/var/spool/exim
+ HAVE_ICONV=yes
+ EOC
+
+ # if we use libiconv, now is the time to tell so
+ if use !elibc_glibc && use !elibc_musl ; then
+ cat >> Makefile <<- EOC
+ EXTRALIBS_EXIM=-liconv
+ EOC
+ fi
+
+ # support for IPv6
+ if use ipv6; then
+ cat >> Makefile <<- EOC
+ HAVE_IPV6=YES
+ EOC
+ fi
+
+ # support i18n/IDNA
+ if use idn; then
+ cat >> Makefile <<- EOC
+ SUPPORT_I18N=yes
+ SUPPORT_I18N_2008=yes
+ EXTRALIBS_EXIM += -lidn -lidn2
+ EOC
+ fi
+
+ #
+ # mail storage formats
+ #
+
+ # mailstore is Exim's traditional storage format
+ cat >> Makefile <<- EOC
+ SUPPORT_MAILSTORE=yes
+ EOC
+
+ # mbox
+ if use mbx; then
+ cat >> Makefile <<- EOC
+ SUPPORT_MBX=yes
+ EOC
+ fi
+
+ # maildir
+ if use maildir; then
+ cat >> Makefile <<- EOC
+ SUPPORT_MAILDIR=yes
+ EOC
+ fi
+
+ #
+ # lookup methods
+
+ # use the "native" interfaces to the DBM and CDB libraries, support
+ # passwd and directory lookups by default
+ local DB_VERS="5.3 5.1 4.8 4.7 4.6 4.5 4.4 4.3 4.2 3.2"
+ cat >> Makefile <<- EOC
+ USE_DB=yes
+ LOOKUP_CDB=yes
+ LOOKUP_PASSWD=yes
+ LOOKUP_DSEARCH=yes
+ # keep include in CFLAGS because exim.h -> dbstuff.h -> db.h
+ CFLAGS += -I$(db_includedir ${DB_VERS})
+ DBMLIB = -l$(db_libname ${DB_VERS})
+ EOC
+
+ if ! use dnsdb; then
+ # DNSDB lookup is enabled by default
+ sed -i -e 's:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:' Makefile || die
+ fi
+
+ if use ldap; then
+ cat >> Makefile <<- EOC
+ LOOKUP_LDAP=yes
+ LDAP_LIB_TYPE=OPENLDAP2
+ LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/ldap
+ LOOKUP_LIBS += -lldap -llber
+ EOC
+ fi
+
+ if use mysql; then
+ cat >> Makefile <<- EOC
+ LOOKUP_MYSQL=yes
+ LOOKUP_INCLUDE += $(mysql_config --include)
+ LOOKUP_LIBS += $(mysql_config --libs)
+ EOC
+ fi
+
+ if use nis; then
+ cat >> Makefile <<- EOC
+ LOOKUP_NIS=yes
+ LOOKUP_NISPLUS=yes
+ EOC
+ if use elibc_glibc ; then
+ cat >> Makefile <<- EOC
+ LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/tirpc
+ LOOKUP_LIBS += -lnsl
+ EOC
+ fi
+ fi
+
+ if use postgres; then
+ cat >> Makefile <<- EOC
+ LOOKUP_PGSQL=yes
+ LOOKUP_INCLUDE += -I$(pg_config --includedir)
+ LOOKUP_LIBS += -L$(pg_config --libdir) -lpq
+ EOC
+ fi
+
+ if use sqlite; then
+ cat >> Makefile <<- EOC
+ LOOKUP_SQLITE=yes
+ LOOKUP_SQLITE_PC=sqlite3
+ EOC
+ fi
+
+ if use redis; then
+ cat >> Makefile <<- EOC
+ LOOKUP_REDIS=yes
+ LOOKUP_LIBS += -lhiredis
+ EOC
+ fi
+
+ # Exim monitor, enabled by default, controlled via X USE-flag,
+ # disable if not requested, bug #46778
+ if use X; then
+ cp ../exim_monitor/EDITME eximon.conf || die
+ cat >> Makefile <<- EOC
+ EXIM_MONITOR=eximon.bin
+ EOC
+ fi
+
+ #
+ # features
+ #
+
+ # content scanning support
+ if use exiscan-acl; then
+ cat >> Makefile <<- EOC
+ WITH_CONTENT_SCAN=yes
+ EOC
+ fi
+
+ # DomainKeys Identified Mail, RFC4871
+ if ! use dkim; then
+ # DKIM is enabled by default
+ cat >> Makefile <<- EOC
+ DISABLE_DKIM=yes
+ EOC
+ fi
+
+ # Per-Recipient-Data-Response
+ if ! use prdr; then
+ # PRDR is enabled by default
+ cat >> Makefile <<- EOC
+ DISABLE_PRDR=yes
+ EOC
+ fi
+
+ # Transport post-delivery actions
+ if use !tpda && use !dane; then
+ # EVENT is enabled by default
+ cat >> Makefile <<- EOC
+ DISABLE_EVENT=yes
+ EOC
+ fi
+
+ # log to syslog
+ if use syslog; then
+ local eximlog="${EPREFIX}/var/log/exim/exim_%s.log"
+ sed -i \
+ -e "s:LOG_FILE_PATH=${eximlog}:LOG_FILE_PATH=syslog:" \
+ Makefile || die
+ cat >> Makefile <<- EOC
+ LOG_FILE_PATH=syslog
+ EOC
+ else
+ cat >> Makefile <<- EOC
+ LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log
+ EOC
+ fi
+
+ # starttls support (ssl)
+ if use ssl; then
+ if use gnutls; then
+ echo "USE_GNUTLS=yes" >> Makefile
+ echo "USE_GNUTLS_PC=gnutls $(use dane && echo gnutls-dane)" \
+ >> Makefile
+ use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile
+ else
+ echo "USE_OPENSSL=yes" >> Makefile
+ echo "USE_OPENSSL_PC=openssl" >> Makefile
+ fi
+ else
+ echo "DISABLE_TLS=yes" >> Makefile
+ fi
+
+ # TCP wrappers
+ if use tcpd; then
+ cat >> Makefile <<- EOC
+ USE_TCP_WRAPPERS=yes
+ EXTRALIBS_EXIM += -lwrap
+ EOC
+ fi
+
+ # Light Mail Transport Protocol
+ if use lmtp; then
+ cat >> Makefile <<- EOC
+ TRANSPORT_LMTP=yes
+ EOC
+ fi
+
+ # embedded Perl
+ if use perl; then
+ cat >> Makefile <<- EOC
+ EXIM_PERL=perl.o
+ EOC
+ fi
+
+ # dlfunc
+ if use dlfunc; then
+ cat >> Makefile <<- EOC
+ EXPAND_DLFUNC=yes
+ HAVE_LOCAL_SCAN=yes
+ DLOPEN_LOCAL_SCAN=yes
+ EOC
+ fi
+
+ # Proxy Protocol
+ if use proxy; then
+ cat >> Makefile <<- EOC
+ SUPPORT_PROXY=yes
+ EOC
+ fi
+
+ # DANE
+ if use !dane; then
+ # DANE is enabled by default
+ sed -i -e 's:^SUPPORT_DANE=yes:# SUPPORT_DANE=yes:' Makefile || die
+ fi
+
+ # DMARC
+ if use dmarc; then
+ cat >> Makefile <<- EOC
+ SUPPORT_DMARC=yes
+ EXTRALIBS_EXIM += -lopendmarc
+ EOC
+ fi
+
+ # Sender Policy Framework
+ if use spf; then
+ cat >> Makefile <<- EOC
+ SUPPORT_SPF=yes
+ EXTRALIBS_EXIM += -lspf2
+ EOC
+ fi
+
+ #
+ # experimental features
+ #
+
+ # Authenticated Receive Chain
+ if use arc; then
+ echo "EXPERIMENTAL_ARC=yes">> Makefile
+ fi
+
+ # Distributed Checksum Clearinghouse
+ if use dcc; then
+ echo "EXPERIMENTAL_DCC=yes">> Makefile
+ fi
+
+ # Sender Rewriting Scheme
+ if use srs; then
+ # NOTE: we currently USE-default to srs-alt, because this is
+ # what USE=srs used to be. Eventually we want to rid ourselves
+ # of this external implementation.
+ if use srs-alt; then
+ # historical default, from 4.95 this becomes
+ # EXPERIMENTAL_SRS_ALT
+ cat >> Makefile <<- EOC
+ EXPERIMENTAL_SRS=yes
+ EXTRALIBS_EXIM += -lsrs_alt
+ EOC
+ fi
+ if use srs-native; then
+ # this one becomes SUPPORT_SRS in 4.95
+ cat >> Makefile <<- EOC
+ EXPERIMENTAL_SRS_NATIVE=yes
+ EOC
+ fi
+ fi
+
+ # Delivery Sender Notifications extra information in fail message
+ if use dsn; then
+ cat >> Makefile <<- EOC
+ EXPERIMENTAL_DSN_INFO=yes
+ EOC
+ fi
+
+ #
+ # authentication (SMTP AUTH)
+ #
+
+ # standard bits
+ cat >> Makefile <<- EOC
+ AUTH_SPA=yes
+ AUTH_CRAM_MD5=yes
+ AUTH_PLAINTEXT=yes
+ EOC
+
+ # Cyrus SASL
+ if use sasl; then
+ cat >> Makefile <<- EOC
+ CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/run/saslauthd/mux
+ AUTH_CYRUS_SASL=yes
+ AUTH_LIBS += -lsasl2
+ EOC
+ fi
+
+ # Dovecot
+ if use dovecot-sasl; then
+ cat >> Makefile <<- EOC
+ AUTH_DOVECOT=yes
+ EOC
+ fi
+
+ # Pluggable Authentication Modules
+ if use pam; then
+ cat >> Makefile <<- EOC
+ SUPPORT_PAM=yes
+ AUTH_LIBS += -lpam
+ EOC
+ fi
+
+ # Radius
+ if use radius; then
+ cat >> Makefile <<- EOC
+ RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf
+ RADIUS_LIB_TYPE=RADIUSCLIENTNEW
+ AUTH_LIBS += -lfreeradius-client
+ EOC
+ fi
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" HOSTCC="$(tc-getBUILD_CC)" \
+ AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO=''
+}
+
+src_install() {
+ cd "${S}"/build-exim-gentoo || die
+ dosbin exim
+ if use X; then
+ dosbin eximon.bin
+ dosbin eximon
+ fi
+ fperms 4755 /usr/sbin/exim
+
+ dosym exim /usr/sbin/sendmail
+ dosym exim /usr/sbin/rsmtp
+ dosym exim /usr/sbin/rmail
+ dosym ../sbin/exim /usr/bin/mailq
+ dosym ../sbin/exim /usr/bin/newaliases
+ dosym ../sbin/sendmail /usr/lib/sendmail
+
+ for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
+ exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep \
+ convert4r3 convert4r4 exipick
+ do
+ dosbin $i
+ done
+
+ dodoc -r "${S}"/doc/.
+ doman "${S}"/doc/exim.8
+ use dsn && dodoc "${S}"/README.DSN
+ use doc && dodoc "${WORKDIR}"/${PN}-pdf-${PV//rc/RC}/doc/*.pdf
+
+ # conf files
+ insinto /etc/exim
+ newins "${S}"/src/configure.default exim.conf.dist
+ if use exiscan-acl; then
+ newins "${S}"/src/configure.default exim.conf.exiscan-acl
+ fi
+ doins "${WORKDIR}"/system_filter.exim
+ doins "${FILESDIR}"/auth_conf.sub
+
+ if use pam; then
+ pamd_mimic system-auth exim auth account
+ fi
+
+ # headers, #436406
+ if use dlfunc ; then
+ # fixup includes so they actually can be found when including
+ sed -i \
+ -e '/#include "\(config\|store\|mytypes\).h"/s:"\(.\+\)":<exim/\1>:' \
+ local_scan.h || die
+ insinto /usr/include/exim
+ doins {config,local_scan}.h ../src/{mytypes,store}.h
+ fi
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/exim.logrotate" exim
+
+ newinitd "${FILESDIR}"/exim.rc10 exim
+ newconfd "${FILESDIR}"/exim.confd exim
+
+ systemd_dounit \
+ "${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket}
+ systemd_newunit \
+ "${FILESDIR}"/exim_at.service 'exim@.service'
+ systemd_newunit \
+ "${FILESDIR}"/exim-submission_at.service 'exim-submission@.service'
+
+ diropts -m 0750 -o ${MAILUSER} -g ${MAILGROUP}
+ keepdir /var/log/${PN}
+}
+
+pkg_postinst() {
+ if [[ ! -f ${EROOT}/etc/exim/exim.conf ]] ; then
+ einfo "${EROOT}/etc/exim/system_filter.exim is a sample system_filter."
+ einfo "${EROOT}/etc/exim/auth_conf.sub contains the configuration sub"
+ einfo "for using smtp auth."
+ einfo "Please create ${EROOT}/etc/exim/exim.conf from"
+ einfo " ${EROOT}/etc/exim/exim.conf.dist."
+ fi
+ if use dmarc ; then
+ einfo "DMARC support requires ${EROOT}/etc/exim/opendmarc.tlds"
+ einfo "you can populate this file with the contents downloaded from"
+ einfo " https://publicsuffix.org/list/public_suffix_list.dat"
+ fi
+ if use dcc ; then
+ einfo "DCC support is experimental, you can find some limited"
+ einfo "documentation at the bottom of this prerelease message:"
+ einfo " http://article.gmane.org/gmane.mail.exim.devel/3579"
+ fi
+ if use srs ; then
+ einfo "SRS support is experimental in this release of Exim"
+ if use srs-alt; then
+ elog "You are using libsrs_alt to implement SRS support."
+ elog "In future release of Exim, the native SRS implementation"
+ elog "(USE=srs-native) will become the default. Please prepare"
+ elog "your package.use or switch to USE=srs-native now."
+ fi
+ fi
+ use dsn && einfo "extra information in fail DSN message is experimental"
+ einfo
+ elog "Note that this release contains a tainted variable check that"
+ elog "is likely to break your configuration used with Exim 4.93 and before."
+ elog "Please check your transports for occurences of \$local_part, and"
+ elog "use a replacement like \$local_part_data where possible."
+}
diff --git a/mail-mta/exim/metadata.xml b/mail-mta/exim/metadata.xml
index 62051142d87b..3c76bb641e6b 100644
--- a/mail-mta/exim/metadata.xml
+++ b/mail-mta/exim/metadata.xml
@@ -37,6 +37,10 @@
<flag name="mbx">Adds support for UW's mbx format</flag>
<flag name="spf">Adds support for Sender Policy Framework</flag>
<flag name="srs">Adds support for Sender Rewriting Scheme</flag>
+ <flag name="srs-alt">Use <pkg>mail-filter/libsrs_alt</pkg> to
+ implement SRS support</flag>
+ <flag name="srs-native">Use Exim's built-in SRS support to
+ implement SRS support</flag>
<flag name="proxy">Add support for being behind a proxy, such as HAProxy</flag>
<flag name="pkcs11">Require pkcs11 support in <pkg>net-libs/gnutls</pkg> with USE=gnutls</flag>
<flag name="redis">Adds support for querying <pkg>dev-db/redis</pkg></flag>
diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest
index d59870b81484..54e2e129c2b3 100644
--- a/mail-mta/opensmtpd/Manifest
+++ b/mail-mta/opensmtpd/Manifest
@@ -4,6 +4,6 @@ AUX smtpd.service 138 BLAKE2B c76db1847110622621701cdf1fdb764d26bf28b86a25adf9ae
AUX smtpd.socket 114 BLAKE2B e684727be39592dce128cc0ab02f8e5bc4510591dcb2c170b49c120e84319b53e10eae275bc6a26ed8c9d51e53a21e41c551f18afd2441602cefc4e93344d50c SHA512 fbbccb4aab80a4a4612609e590965940642321119a65359cf2490530f81d55706a0105309d321a624d40348f12776724d2cf6b8bf29ea24391e60ef8b8bc8ba2
DIST opensmtpd-6.7.1p1.tar.gz 859364 BLAKE2B 5b4002e8f15ab31810c9a4ccf22a0efc240f9db8bd14b8bb78aedf853b9c9db77cc4d6602a8d4b8d73904682cb1b345cb34aee69d10152d5be5cdf8d6cd37b96 SHA512 403952e77b360f42d8dc8ae7cd7faeced831b9e37bffd7c67d338b7208f7471d50f3594c3475a9282d18cb17435efd305ec8c05f89eaeab5d363ddb1c4d54a2e
DIST opensmtpd-6.8.0p2.tar.gz 860189 BLAKE2B 603e8516860eddefb1694ea4cb5631cec2df2a19fa3193b25388caf73c41e82d44e57847fc95b5187488cae629542e72ff2d5a17badc15cef1647bdb173d7827 SHA512 48f152b75575146fdd09bdf47123041ea62fefb6e5de33a69826bf91a2126a918f8db1caffadb2f142a1a21de8126d492de88cb65bdf169e61c0b22d3e78d290
-EBUILD opensmtpd-6.7.1_p1.ebuild 1833 BLAKE2B c0f81e5ad50b984666d6b08e07ea6ec3174d23f22fe676d08c461bef32ac5b5f61fb6bbf4099285a70f375b10765f4342d17cbe75ac0bd8931883dd6a3819c3c SHA512 a734ca654a0194550b2012dbf334c3d49a9b176837a1476c3ef8eb1f81f7fccd72d2b440f41c5f1315e9066e9dd513a190fad0c5719c62e5b9752bfce3292159
-EBUILD opensmtpd-6.8.0_p2.ebuild 1833 BLAKE2B b7b215b988394a1cfa57c983cb62aaef935a3157238f77435eec712ad3d73c947bf6cd552188d2874ed99bdf3ba4f8aa9aec34cc1d2b20cc1d7549e06f9acbc2 SHA512 d59715c353214062ec53e38f2ef60a04f5eef9a06b950857b228e8eb650f79bd6e9b003850cbe85ec198905f4977c07d1e140441cb89a96dfe7615120205c6b9
+EBUILD opensmtpd-6.7.1_p1.ebuild 1773 BLAKE2B 4aeb8833c0d5606aa842d0cfbba18f713c1e4896560f9e03e1d3ae2bd57444a827a6d114006657fd7c691ee59faca65b3f15bfd9bf71a4e2b65190104349fb84 SHA512 088d646a35aa20b437fbe4f90d87eadc49a9c6024946a6e90039229ae87f39ce09a89d5fd1df46098ba0ab886ff81d5b69bde1932d06fa28f24ea0dbb9102b5f
+EBUILD opensmtpd-6.8.0_p2.ebuild 1773 BLAKE2B 4aeb8833c0d5606aa842d0cfbba18f713c1e4896560f9e03e1d3ae2bd57444a827a6d114006657fd7c691ee59faca65b3f15bfd9bf71a4e2b65190104349fb84 SHA512 088d646a35aa20b437fbe4f90d87eadc49a9c6024946a6e90039229ae87f39ce09a89d5fd1df46098ba0ab886ff81d5b69bde1932d06fa28f24ea0dbb9102b5f
MISC metadata.xml 595 BLAKE2B c13a49c15ec7c4430834682a4428b80e81be9832cbf6fbdd506ce9bcfc625aabf342d094ee83c689e63573cff9bfb2abee86196374c617c75aa487eb83ad0e4c SHA512 aa7344806cd011cec6c7afa277345eb2988f11970ea3038d969efa50d5b1f485f199f15a1b632197700791c2242ed8f712ff3cc382b1491e44c14ee94075a1d5
diff --git a/mail-mta/opensmtpd/opensmtpd-6.7.1_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-6.7.1_p1.ebuild
index 9e8a2907a207..53f82ac42483 100644
--- a/mail-mta/opensmtpd/opensmtpd-6.7.1_p1.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-6.7.1_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,13 +12,12 @@ SRC_URI="https://www.opensmtpd.org/archives/${P/_}.tar.gz"
LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
SLOT="0"
KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="libressl pam +mta berkdb"
+IUSE="pam +mta berkdb"
DEPEND="
acct-user/smtpd
acct-user/smtpq
- !libressl? ( >=dev-libs/openssl-1.1:0= )
- libressl? ( dev-libs/libressl:0= )
+ >=dev-libs/openssl-1.1:0=
elibc_musl? ( sys-libs/fts-standalone )
sys-libs/zlib
pam? ( sys-libs/pam )
diff --git a/mail-mta/opensmtpd/opensmtpd-6.8.0_p2.ebuild b/mail-mta/opensmtpd/opensmtpd-6.8.0_p2.ebuild
index 6a83f4eb0aca..53f82ac42483 100644
--- a/mail-mta/opensmtpd/opensmtpd-6.8.0_p2.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-6.8.0_p2.ebuild
@@ -12,13 +12,12 @@ SRC_URI="https://www.opensmtpd.org/archives/${P/_}.tar.gz"
LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
SLOT="0"
KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="libressl pam +mta berkdb"
+IUSE="pam +mta berkdb"
DEPEND="
acct-user/smtpd
acct-user/smtpq
- !libressl? ( >=dev-libs/openssl-1.1:0= )
- libressl? ( dev-libs/libressl:0= )
+ >=dev-libs/openssl-1.1:0=
elibc_musl? ( sys-libs/fts-standalone )
sys-libs/zlib
pam? ( sys-libs/pam )
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index d9bb10c6b2d2..7af86886b7f3 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,5 +1,3 @@
-AUX postfix-libressl-certkey.patch 436 BLAKE2B fc9a949e8499163010b117971fc817d070f3eb74371fddbcf1cebae51276eaa30da0e8d9aaad24f775971b5ea54f3df35142bbb66d984245674e6e88728992da SHA512 b3913b1158d1fa46868b9f3ed13a2a464abd5d8f4acabc594c0c19bb3134028231503fa05dcb70b8ca0fcaefae30ea45b6e715d3545c5820b70272367e1127b5
-AUX postfix-libressl-server.patch 446 BLAKE2B bd07df754cb0d943dfd3483272399b3271471f09ce9c7062f3ad6ee27fed80b714144b9227ec1e91e66e1d7f8766952534662d512bf3e3a89156632cfc4b72bf SHA512 19eaca88239ab6b7ba5dc3ce36ccaae0ad2994dcfa17fbe2e03a9731d2016398dbebb4068f4ebab6c65a389bc7fa8c27b2e8e447cb9a550da5e0ee9c22879854
AUX postfix.rc6.2.7 2107 BLAKE2B 291d9e02ffdac79a1c7c64febc5674321e675de341b468ba0bcad63b0a57420d68d4c6f56aac7b8c970137b73c9b9b9d56e5f3d10b461636164d3316fd20c566 SHA512 2ad1b053bbb51d4f480dbf5a01252e8e99a82ec14a75ff49336b2b190ea55bc02400542b109fa0cc4ebfe6b42eaabbc45f70f2ea581f1eb9c4189c439b825592
AUX postfix.service 662 BLAKE2B dcf9ceb71ad483b580d126fcb5ac68889cdeb898df3333d38f195227190b73cf0fb41cd68a86e97cfe844cc7f9f095cba0a17afe9ce7c8697e0aa30f5faecde6 SHA512 04b475040b153f488a9358567ff9ee2eb8f263c619dadc23c837d17c19106041296e3652bcaded2be0c7c8b9eee7fd5f2ad55bed3e7f9b3a4bf9655f4762d563
AUX smtp.pass 29 BLAKE2B 589915bd2856fa64e22caa12fca54ef342eb07606de38d3879c13ac395413c84de6c3b733c83cc0625a4433167efcc7d504b2f87fa26c05b2facde9c3d103021 SHA512 a8a940099a77ea0547004daf5392a6efc0cd643f10072803d65e37763012464ad25b1b925ae9e32bffb3c3e8a5d4b2d3bb5619a174d58fdc4ea5d4090db0d365
@@ -7,11 +5,11 @@ AUX smtp.sasl 42 BLAKE2B 67e9108101779b6027fa1e5cc7c9256a606d440e15bb037a0da186e
DIST postfix-3.5.10.tar.gz 4621130 BLAKE2B 32a0ef43131c1bff319fb8a159e78a4fd81aba85aa2c8aab3020d575e6216a1e5fb4612a4aa3693b62de5825a29bf5ea1c1870835f033569a5d2d3e494306ef1 SHA512 5845701d3dcdaaea376a44810a84dbe908e96e5ff54921cd40fd2d5c5643ed8e4add5936e149237fea4cb69c1ffb4ceb4171d1e779be096aa21a6e5021b604da
DIST postfix-3.5.8.tar.gz 4614733 BLAKE2B 13166e854f70987f981bb5e7e5dabfaa73b3170ab16fc1ff8f70f6b98a0697ac980bdf74bbfb39fdfd1972f922a31a28882b1575b79fd8f01d81e08e68d756bc SHA512 0abb07d99e343b76e6a26b4a090af9d592f4dfd03c8c737cc72bfb0f4267dafcbb0cb0aa7b6255f8b834c9289d89a5c47b167be3758239309937cb77e0d9464b
DIST postfix-3.5.9.tar.gz 4620852 BLAKE2B 66a7bd71e7f74c8f25963ed8d41f04f1f95e060fd23c848065a0e947e766efe058e6593ed8ce1f69528f5b2e9868756d0ea0622b3d77486852882622dd3bb872 SHA512 9ff3a33cdd5811e470d5c6cfa896fa76e4d3257b139deec5f420d18e34232f327b7c8496c5d13566c6f9ae1fdf8719feb9981372b2869b0208a2eb3a1daaeadd
-DIST postfix-3.6-20210422.tar.gz 4737710 BLAKE2B 5559115e14922f1692ab193e06f5aa4097c6d82c2b693bef39858a9284177c381c32db81ac686f055fe2c516223dc223a1cad607ef79bddcef059e382bf5d3ed SHA512 6cb3d101d5f9aee786ca131432ed6aaaffe4c225f207b538e9dc2bd765b4c4e67c4751506b8cca6f9867fe4aee0a18ed703fd7006160b2fdfe1a4d48aa95834c
-DIST postfix-3.6.0-RC1.tar.gz 4748644 BLAKE2B 288064e6f1cb60060c960772ceab87cdc8b8dea23489f4ec0368074fe80d5aff0c2bb768e93d2a7a369c63a67590b92539a3c5f89c8088bc9372f199fe9136b7 SHA512 64837a83fc7df0210b02ceb18d4d5b562cc2f0219a3b1457986633d1ebb4c1790b3f288d48039fc85352d28a31b128557f975185f1e0a95623021aa4db8a2c30
-EBUILD postfix-3.5.10.ebuild 8867 BLAKE2B 5502caafc72e6cc477c2ec32ed39eca48d979ed09c9a797bfe2ac147385a1d636b9cadc1f9b920f17ecb0c8e43d5fca60e355e13af1d68fe20c6c5965af50262 SHA512 4330677f846f701056e408f08534709d48f3fa1a03844ee4e74e64e81064fa6c25d1416a00db3780313ed46ecd9f89dcf20d28a3b140bee932ae5c91e7ab9211
-EBUILD postfix-3.5.8-r1.ebuild 8862 BLAKE2B c9712ef05b3e80c38d10f215c355e19f2b0a319034a04d10234733f50b68b161bec2789a56b553447a6932d1dfffab52a801f0ebc5b55410409f69ce1497a780 SHA512 5dce3db0ebb51b9b5e35ad5a425f2fdbfad6e439383831db7d78b740eccb9bd34ac0f7374c110cf03164e84afe745d93a1e9b3b1f34dc0c264e25cae348654a1
-EBUILD postfix-3.5.9-r1.ebuild 8867 BLAKE2B 5502caafc72e6cc477c2ec32ed39eca48d979ed09c9a797bfe2ac147385a1d636b9cadc1f9b920f17ecb0c8e43d5fca60e355e13af1d68fe20c6c5965af50262 SHA512 4330677f846f701056e408f08534709d48f3fa1a03844ee4e74e64e81064fa6c25d1416a00db3780313ed46ecd9f89dcf20d28a3b140bee932ae5c91e7ab9211
-EBUILD postfix-3.6.0_rc1.ebuild 7984 BLAKE2B 30ccb9c5339e0cf795b97e6228a5190d0bbce455d1a254b536fc684f767e82ed54d80f3291847ea0dc52f5c05d9c0e5e0309f5f4fad05bc8fa49de98c48c3e11 SHA512 5cefa9c8a1a6b83f0158e704f69fd2f6a9633c801e3051c5abe6fcff5c4213c514b93629c0f620823d0166c329126967b10fb51206e43b0cda03e0f145966634
-EBUILD postfix-3.6_pre20210422.ebuild 7987 BLAKE2B ff17c4b600d024cd51cf53a999b6949b7bfcad747d8ec06111f8556aed0bb44dee0220849b4858ddd423c01edf584274b0551b1866264c1c049e34509747ce06 SHA512 c1d0b46bd8efd0e10209fd6a728663f57711fc192db3ed4237f1d997f6a03e08291cc0e9fabee7cc5013b85b8533ecd7cb1822f03e86fa892b41b2dfd536263a
+DIST postfix-3.6.0.tar.gz 4748506 BLAKE2B f4692500cb78e82cede48d750eb86db61dc67ba1d69d220d24c965b57941402a5bf157b4a69d65133d37ce3d9e1341260d07ebd4477184b3caa56b22fd13b4f5 SHA512 af326472333935de111d7f7025af53a1dfd84382c2d2891e91624ce665c258831f28d92fd73d1ab68f82192d9848025bd30d16eb48b3912b46e3fb50dbf194bf
+DIST postfix-3.7-20210424.tar.gz 4738620 BLAKE2B 106a9e6eaaa0e1a0595736ad7f6bb6d9bb1e8e4f563b34c6e0e9bf744744e1b22d9c5ce35ac71fa0a40d698908b18ab91924083e847feb0a95b14aa45236fb6e SHA512 7661c4c597ecf14a7ac350b3ba2d0dccb39ab1d4d67791fe3cc995e8b1a4256e2473170330607ccbd3b361fad20c78013f94a04b6759fe7b5375592539f2edb8
+EBUILD postfix-3.5.10.ebuild 8698 BLAKE2B 40aed4bdcc1a9eddec5e0660999adea5b8f31a04dcbd0494155940c8b9545ba232796ec059632d0c863b306a32deeac109e93c6bd3c4a1d2c19facb26e59ff56 SHA512 603e713ce215b54ff9726f27cbfa70d5f09d35e892f21ea8644ba3c1e8164f4c520922078f2e24284543791369fadee52b566d75fd5fdf9d7027c7e4af428a13
+EBUILD postfix-3.5.8-r1.ebuild 8693 BLAKE2B e0ca3baeabcb4b0e703115c6839b4b0e0d75c789421c8fbd0aaeccff22630f797f11e5b8cc5ae1f09d21773f257a5edc117392b377d9c743e5de62cf42289540 SHA512 7ff76d64ab024375f4d015634898f1f8475d349ed9718c40e02ffad2abddfb32676b076168bc0bdb35f78b4e95df596d1fd286b95b9d5a7fb57d4c8188dd46b2
+EBUILD postfix-3.5.9-r1.ebuild 8698 BLAKE2B 40aed4bdcc1a9eddec5e0660999adea5b8f31a04dcbd0494155940c8b9545ba232796ec059632d0c863b306a32deeac109e93c6bd3c4a1d2c19facb26e59ff56 SHA512 603e713ce215b54ff9726f27cbfa70d5f09d35e892f21ea8644ba3c1e8164f4c520922078f2e24284543791369fadee52b566d75fd5fdf9d7027c7e4af428a13
+EBUILD postfix-3.6.0.ebuild 7984 BLAKE2B 30ccb9c5339e0cf795b97e6228a5190d0bbce455d1a254b536fc684f767e82ed54d80f3291847ea0dc52f5c05d9c0e5e0309f5f4fad05bc8fa49de98c48c3e11 SHA512 5cefa9c8a1a6b83f0158e704f69fd2f6a9633c801e3051c5abe6fcff5c4213c514b93629c0f620823d0166c329126967b10fb51206e43b0cda03e0f145966634
+EBUILD postfix-3.7_pre20210424.ebuild 7984 BLAKE2B 8ff4ea5764bf32b9950ec05d0128bd86f37a2379d97112863c56b55f7d823c4d1d96053c35235b707c92d4b3bec8307ce401d386cc9ebd1661b1a6725e52ad02 SHA512 0f06f240cdbb600cedac028f95f12e35562d88dd1bfebce4d750458ec8c207441ade65838931b986140d4dc148dd8189c2fd78ff7afc8b1b8199a4df6020b476
MISC metadata.xml 939 BLAKE2B 01474efe62df1eda9a3ba5976847064d615b3c32d9c71838354ef375c851c7ab4d1fcc2bc0d2945ce3d259fc6a698938cee6d1354c4e0f02f1e66395e377a0c5 SHA512 8602700c2a21b66ecf2c024c06ce23452f7effd9c06a5d58c1ccb351bcdef43a3c89575cc9136efc72fcd4e06ecb0654017b51bb145e7ffeeda771e3f4e7a673
diff --git a/mail-mta/postfix/files/postfix-libressl-certkey.patch b/mail-mta/postfix/files/postfix-libressl-certkey.patch
deleted file mode 100644
index b6ab8aeb7901..000000000000
--- a/mail-mta/postfix/files/postfix-libressl-certkey.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-see https://bugs.gentoo.org/678874
-
---- a/src/tls/tls_certkey.c.orig 2019-03-07 23:57:10 UTC
-+++ b/src/tls/tls_certkey.c
-@@ -144,7 +144,7 @@ static void init_pem_load_state(pem_load
-
- /* use_chain - load cert, key and chain into ctx or ssl */
-
--#if OPENSSL_VERSION_NUMBER >= 0x1010100fUL
-+#if OPENSSL_VERSION_NUMBER >= 0x1010100fUL && !defined(LIBRESSL_VERSION_NUMBER)
- static int use_chain(pem_load_state_t *st)
- {
- int ret;
diff --git a/mail-mta/postfix/files/postfix-libressl-server.patch b/mail-mta/postfix/files/postfix-libressl-server.patch
deleted file mode 100644
index 8573bb80bb59..000000000000
--- a/mail-mta/postfix/files/postfix-libressl-server.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-see https://bugs.gentoo.org/678874
-
---- a/src/tls/tls_server.c.orig 2018-12-26 19:21:49 UTC
-+++ b/src/tls/tls_server.c
-@@ -518,7 +518,9 @@ TLS_APPL_STATE *tls_server_init(const TL
- * ticket decryption callback already (since 2.11) asks OpenSSL to
- * avoid issuing new tickets when the presented ticket is re-usable.
- */
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CTX_set_num_tickets(server_ctx, 1);
-+#endif
- }
- #endif
- if (!ticketable)
diff --git a/mail-mta/postfix/postfix-3.5.10.ebuild b/mail-mta/postfix/postfix-3.5.10.ebuild
index 100b89428484..e68677152aa4 100644
--- a/mail-mta/postfix/postfix-3.5.10.ebuild
+++ b/mail-mta/postfix/postfix-3.5.10.ebuild
@@ -17,7 +17,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
LICENSE="|| ( IBM EPL-2.0 )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
+IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
DEPEND="
acct-group/postfix
@@ -38,8 +38,7 @@ DEPEND="
sasl? ( >=dev-libs/cyrus-sasl-2 )
sqlite? ( dev-db/sqlite:3 )
ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( >=dev-libs/libressl-2.9.1:0= )
+ dev-libs/openssl:0=
)"
RDEPEND="${DEPEND}
@@ -63,11 +62,6 @@ REQUIRED_USE="ldap-bind? ( ldap sasl )"
S="${WORKDIR}/${MY_SRC}"
-PATCHES=(
- "${FILESDIR}/${PN}-libressl-certkey.patch"
- "${FILESDIR}/${PN}-libressl-server.patch"
-)
-
src_prepare() {
default
sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
diff --git a/mail-mta/postfix/postfix-3.5.8-r1.ebuild b/mail-mta/postfix/postfix-3.5.8-r1.ebuild
index 5cd530ccc455..7bc7473a5158 100644
--- a/mail-mta/postfix/postfix-3.5.8-r1.ebuild
+++ b/mail-mta/postfix/postfix-3.5.8-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
LICENSE="|| ( IBM EPL-2.0 )"
SLOT="0"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
+IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
DEPEND="
acct-group/postfix
@@ -38,8 +38,7 @@ DEPEND="
sasl? ( >=dev-libs/cyrus-sasl-2 )
sqlite? ( dev-db/sqlite:3 )
ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( >=dev-libs/libressl-2.9.1:0= )
+ dev-libs/openssl:0=
)"
RDEPEND="${DEPEND}
@@ -63,11 +62,6 @@ REQUIRED_USE="ldap-bind? ( ldap sasl )"
S="${WORKDIR}/${MY_SRC}"
-PATCHES=(
- "${FILESDIR}/${PN}-libressl-certkey.patch"
- "${FILESDIR}/${PN}-libressl-server.patch"
-)
-
src_prepare() {
default
sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
diff --git a/mail-mta/postfix/postfix-3.5.9-r1.ebuild b/mail-mta/postfix/postfix-3.5.9-r1.ebuild
index 100b89428484..e68677152aa4 100644
--- a/mail-mta/postfix/postfix-3.5.9-r1.ebuild
+++ b/mail-mta/postfix/postfix-3.5.9-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
LICENSE="|| ( IBM EPL-2.0 )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
+IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
DEPEND="
acct-group/postfix
@@ -38,8 +38,7 @@ DEPEND="
sasl? ( >=dev-libs/cyrus-sasl-2 )
sqlite? ( dev-db/sqlite:3 )
ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( >=dev-libs/libressl-2.9.1:0= )
+ dev-libs/openssl:0=
)"
RDEPEND="${DEPEND}
@@ -63,11 +62,6 @@ REQUIRED_USE="ldap-bind? ( ldap sasl )"
S="${WORKDIR}/${MY_SRC}"
-PATCHES=(
- "${FILESDIR}/${PN}-libressl-certkey.patch"
- "${FILESDIR}/${PN}-libressl-server.patch"
-)
-
src_prepare() {
default
sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
diff --git a/mail-mta/postfix/postfix-3.6.0_rc1.ebuild b/mail-mta/postfix/postfix-3.6.0.ebuild
index 96598ffacec1..96598ffacec1 100644
--- a/mail-mta/postfix/postfix-3.6.0_rc1.ebuild
+++ b/mail-mta/postfix/postfix-3.6.0.ebuild
diff --git a/mail-mta/postfix/postfix-3.6_pre20210422.ebuild b/mail-mta/postfix/postfix-3.7_pre20210424.ebuild
index 3df0aef4df2f..5abe1a30db9f 100644
--- a/mail-mta/postfix/postfix-3.6_pre20210422.ebuild
+++ b/mail-mta/postfix/postfix-3.7_pre20210424.ebuild
@@ -196,7 +196,7 @@ src_install() {
# Provide another link for legacy FSH
dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
- # Install qshape, posttls-finger and collate and tlstype
+ # Install qshape, posttls-finger, collate and tlstype
dobin auxiliary/qshape/qshape.pl
doman man/man1/qshape.1
dobin bin/posttls-finger
diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
index 707f1ddb711a..eea08a721157 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -13,6 +13,6 @@ AUX site.config.m4 564 BLAKE2B 85bcbe7b9a26071aedf0d1b530c1276d93de21d82972add09
AUX sm-client.service 418 BLAKE2B a9057cac008c11d3cfd5a4b662cf3fc71a33be79e8890a54e556a258b098ceccc2e9941f62dce868498751bd22f23f45289bc84a8250020b140acbd2b6508b58 SHA512 26e5a64790fd7106e45de0f4dfafb3b648094953bd1831a223ca7c60b7cb75b673fb554b426a6aa0e7dc200a134fd042b4ecc6795641cfddd82bd04e4c7ea324
DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc45a5d730d2bed1ef956adb574721833f87aeba0475705b76e0c7d6cf00f9a10025bffb0de6c6b4dae606eb2ec399 SHA512 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9
DIST sendmail.8.16.1.tar.gz 2236402 BLAKE2B 80a9c2f1d04719099703e55f0a0c54fd638cf69b72839d358ae6863c95c9e0965d1b7fdd5b1807bec1ffdf87bca0c7c9ba91060962e6de5da5bf14422f6279ea SHA512 d7d4aac3c6d7505782abdb166204901b8b51cac000d610dfe40eda9eef7441a073af9e8e0b14c8719b07b445f55a1e2c28ac63d663d0daa7f1eafc5a101788b2
-EBUILD sendmail-8.15.2-r2.ebuild 7259 BLAKE2B c30fe7036eb3e65dc6c83574984e5ca887c6f9ac6a5cf6eeba929b475cfc0514accf87b7a289f953260f52d30a881197cf9791713161b64daa73816041d8d0ee SHA512 5d0b2189cbbfd8765d71dcdec262841a5b32a38f7393406e92fe72acd4a28825988ece85e2e7dedd83442d00eab04d8518c82d3c7e5094a6c84a7120613368c5
-EBUILD sendmail-8.16.1.ebuild 6541 BLAKE2B 38a17e69978704632c4e9aab0e59b2b4c92fb8420c2dfd077cd11df98141cff3001809ce8026f4c95193cfead069e09d86e257d9b20c60ee50f9c6cd303a6680 SHA512 1b87bd6e32985ff14c97b73ff819e771ad61ad0b0560b4ffa8faac30db3a4115421cba0fbe8cda1818d136fdae4e1401bb6c3ce1d30b4416a2e261b862fecb86
+EBUILD sendmail-8.15.2-r2.ebuild 7199 BLAKE2B 801a30a6d9d71d3aa34ddf3910c9bb4658d687905b3df1e17052b9bbab692db74d2e703906cff948ba173684e08668f44274afb2fd9d269f51607dd2318a8d46 SHA512 9a8e3c5118e64bad84082d34b9593aec4b3bbf7bee23aea056a32b1d5bdae797086d4a0e342f217cd91bec9dc112cd387b7c02401eb800ac7f613fd5eecbcbb2
+EBUILD sendmail-8.16.1.ebuild 6480 BLAKE2B 3bd092503dd0ed465f7d7690be9850705b34d4d2c3ceace4694a693e79bb7828246f8fb8c38180ae3233aff13ccbaa287c7d0266c4ee73a19ca3cc18bcca2b3e SHA512 e18bf609e018aaaf6173ccf7adc4948b16153f6b7b521df251012b2e8cae878be21cd329745a9d0d76240e72b705aa79d4041df184e2c7f5d5acdb4634f9db00
MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild b/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild
index d076d1380941..6115996d21a3 100644
--- a/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild
+++ b/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,15 +11,14 @@ 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 libressl sasl tcpd mbox ipv6 nis sockets"
+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? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
+ dev-libs/openssl:0=
)
ldap? ( net-nds/openldap )
>=sys-libs/db-3.2
diff --git a/mail-mta/sendmail/sendmail-8.16.1.ebuild b/mail-mta/sendmail/sendmail-8.16.1.ebuild
index edb48e9e4712..56796fa2dc58 100644
--- a/mail-mta/sendmail/sendmail-8.16.1.ebuild
+++ b/mail-mta/sendmail/sendmail-8.16.1.ebuild
@@ -12,15 +12,14 @@ 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="ipv6 ldap libressl mbox nis sasl sockets ssl tcpd"
+IUSE="ipv6 ldap mbox nis sasl sockets ssl tcpd"
BDEPEND="sys-devel/m4"
DEPEND="net-mail/mailbase
sasl? ( >=dev-libs/cyrus-sasl-2.1.10 )
tcpd? ( sys-apps/tcp-wrappers )
ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
)
ldap? ( net-nds/openldap )
>=sys-libs/db-3.2:=
diff --git a/mail-mta/ssmtp/Manifest b/mail-mta/ssmtp/Manifest
index 9a1e5ffbe935..ff04f8e022f0 100644
--- a/mail-mta/ssmtp/Manifest
+++ b/mail-mta/ssmtp/Manifest
@@ -1,4 +1,4 @@
DIST ssmtp-2.64-patches-4.tar.xz 6928 BLAKE2B 6f1d9a823273298abc58025c94cb288e1e296031580f63ed489a9d2559cd8846761e78c6fdfc1a385e645f990bc739ce3cf3ad0d1c1a3006dd3bd60e4a38c4f4 SHA512 6fa57c0bc5ad363e21bf69fb60f1cbb87ad1ead393a53ab5bd25b709303c321a29ed37ce7fe95b94dae748703bba3b0631fc2a95e40957c5241b5d9f42bc0c4a
DIST ssmtp_2.64.orig.tar.bz2 52501 BLAKE2B be158f8d969f98e1a7105bf4b741da960efa2a1c4a941426d6b6ec0677df13a2272fc71a93d2c44fe65c7d0a30e9acc4ec8259ed298b746c8d9ceefd64f95336 SHA512 911752e744420adf58552b9cf3a6e558d8b39103e5ad33a9ed4429b9a3a2091f7674aac11fe9bbd66747a61cdabe6bd638b80efcaadc86b057c12e2e235cca72
-EBUILD ssmtp-2.64-r4.ebuild 3606 BLAKE2B 05c8a9c4a3bba94ae313d8fe3054a52af3169ed6c79fdb37c76cf89ae01be171d9f0b5f59b0e81b29309ab42e3674ba95db787a70bbada4b1f96cd65faf32d99 SHA512 ea7535e360713ce49ed0ee761c1f4328cd14d72cfc8e5973154e34318a4e91922fa9b4cbd4267f82ff73f7246c532046cd99ee0f4275786052b3f4433a886312
+EBUILD ssmtp-2.64-r4.ebuild 3544 BLAKE2B d6ed897d1434460c858a1d3035592d3a408f2f7a3e377c213b86676102885286a61774c2fda6f30515621eb7df384058e0c67a3445a52071b972b0eb4a91aed2 SHA512 64b1db8169ea706d57f92dd11593a40ba0d79d038b2dd0646659bda529c46bd0f8de37633abbf023fe2967abd6ec7e3d1a137e88ed14e0bf488ac0ab56c5fefa
MISC metadata.xml 259 BLAKE2B eb59516b105b0fdc4b755c3852b714707dba4f5b414eb0eea763db68aa0c5d1971b55866972ef14f1e3e5bc81ccb66975a24b9292aa796edf02877d649a661f2 SHA512 3e7a5afefe4f2095be4347e56af64eef343bbb4920ef80a7d93c88111864e8993f899328af33e736324960d26f30939e29e001e90381548a353ee0089f96a766
diff --git a/mail-mta/ssmtp/ssmtp-2.64-r4.ebuild b/mail-mta/ssmtp/ssmtp-2.64-r4.ebuild
index 321bf549dfd8..9b99e81e7bf3 100644
--- a/mail-mta/ssmtp/ssmtp-2.64-r4.ebuild
+++ b/mail-mta/ssmtp/ssmtp-2.64-r4.ebuild
@@ -18,15 +18,14 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ipv6 libressl +ssl gnutls +mta"
+IUSE="ipv6 +ssl gnutls +mta"
DEPEND="
!prefix? ( acct-group/ssmtp )
ssl? (
gnutls? ( net-libs/gnutls[openssl] )
!gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
)
)
"