gentoo resync : 04.05.2021

8 files changed, 14 insertions, 61 deletions

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