gentoo resync : 04.05.2021

6 files changed, 12 insertions, 91 deletions

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index cdea82ffd79d..c990a8d8e450 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -4,8 +4,6 @@ AUX 7.0.2/bacula-7.0.2-depend.patch 599 BLAKE2B be676329434260e65f7dcbefbfa8d9a0
 AUX 7.2.0/bacula-7.2.0-doc.patch 435 BLAKE2B 65d528b337f9a3e2eaf456b6dad37ddc59bc1a3f6e54208899346a6bc285fe2b19a464b39cc0c9439c4266baf98c1b3a06afd235b3ee7c88373d3c890163e01a SHA512 27d2839658e3471487dce023c806261e5b5d03212f12eab75885b9b61eb22e57c96e85c07a5f81c812974963904ab81b6ce15abf5381647bd2188abd14139b34
 AUX 9.0.2/bacula-9.0.2-lib-search-path.patch 1431 BLAKE2B f04bbf695a926424092dd974994967eefcd48407f2de43b9e94bff25403e66f4a49cde08d667e3b5fc4fb9f8d273a786c3422325db3f589278d16f136d4a9a0c SHA512 3863102d2f8db4158dede306b07297da6550bbad1c77aea49a75de412a7f4630216ef2ae28fc51ffa8d8f9c373510e58982f28e32fdbb142a3551eef7f112b7d
 AUX 9.0.6/bacula-9.0.6-bat-pro.patch 667 BLAKE2B b8987c244025f029a182d6b44f30e0e0a6835b9f6cadb6b43b2b55ea33113e20c20b6a367d965ea12358597e9807c79846e45571b31f9b66dc3ad83265fed4e7 SHA512 d521759cad65ef73fb674cd6b58f9540ef6e86842bcd45ece4730f71a408076b38faea2088bf6f2993fed9a88d727ff2ff8c3e3619e27fcaa1d5afe4506640cf
-AUX 9.4.0/bacula-9.4.0-libressl26.patch 1354 BLAKE2B b5d22a50e702a239aedd803c6f390572892124370c916887b166e263f1f3aae32fede777ba580e0a32401a58dc5ce10f6d5942e8764b5bf5d3abe1b9ae7c287c SHA512 3ae42c7c4e58e8e04cb444cb07399648f6962100b9f17146385c807fd5a5890f5f5b873bb790c5918be6a97bdfb7baa980798fe04f6adffbb1648fd4fa63c1fc
-AUX 9.4.0/bacula-9.4.0-libressl27.patch 414 BLAKE2B 29c2720cd05bd5d4ddc57db61e2729744efa4ac03985995b552b2570144dbb968d7e2f91c9a8ae01fe2286483555b72b72eea5110ab364fdf6203141ee9aadd3 SHA512 8f2ea8c552c0080eb56c2e39de78779567156c8198adc2ec775fa3282b01749b8c2b113123265fee88ade2c21c5819a0d8e4c0bda6a409ee5fee2d7352e2e3d6
 AUX 9.6.3/bacula-9.6.3-fix-static.patch 3731 BLAKE2B 0fe8e289a9ef38f79d4b2dacb5503a245e5fb871771b4fce800d9196de3ccce3edf596e013ee313f19fe3f575ff4a23a1bc97decb38d4dff08e2ac38a154f610 SHA512 ec1004d63df94eb9854c7c8ab8699645ac58051c02b99152224f2274767b2a329231fa0b8bf399545c4b9e7263b303a96c1e3401308a37d857ab2480fc3c5290
 AUX bacula-9.6.x-fix-race-condition.patch 657 BLAKE2B 8d5230145144a9ae737793b54f2075421e13fc9d391266fd2c976c867ba70806377ac9c64634a3e0ddd937d4287129e5ac1d714f891ac774f25ea41fd89c3b25 SHA512 ef8ff994c5184faa7a853321628e232242e57651a54857fb524bf24b012e39ab36d3367e2e59d4b17095140733ff6f4dcf3bb40b4a7cfb3a650edbbf2d79dc98
 AUX bacula-dir.confd 629 BLAKE2B 85eb7131fe1735ea3af0075b26c88408a11ce7653b92e27198d6bbfdbe2bf4d4e157eb6685f2cac79a8de1e4d24d9c4eb25f9d64b1b956162718fe09633018c4 SHA512 85ed5317313721a7b3776a257c204e0ac45a5221c6bd0b5886944cbd1e4829fe146e7af52cdc604cbf5e3d8722c955da40cbf989dc9ea7466653c98bf8c7cfdf
@@ -18,7 +16,7 @@ AUX newscripts/bacula-sd.initd 252 BLAKE2B c27f6635ca72c96fc74d1d27c252934ca516c
 DIST bacula-9.6.5.tar.gz 4252526 BLAKE2B 48bfc9f45db10949fb4d7396c2ca15ed17dad3bd6ab9c6ab5cd0b3a80d1df0d37868a8671c2ead9b00fe89da91d43e945ca2818016f09502aff1a2fd3a5d455d SHA512 4018e242b2131c2416cd16ae3530c9c848dc8e88dd6532136c699a50fcbf39a574ffec8ef13bc5d7a9673d057b51cf1d1be80667e89abe0e18ec79d04b0edd70
 DIST bacula-9.6.6.tar.gz 4253303 BLAKE2B 131353e24265f64dd3c4e0632bee93d2a170d3ed88626ab80f1804e7a218eb86c5ac7507f4a4fe5ef7d4472a1c90ef0f45e1a6ad0a4a65a1fa8f1a8f63287e3f SHA512 1b669bbf1e54f40e0426603601a4751c42101985de901f951a68add7644971d48615b3089c65fafd444c762c3d82b67cafdcae9636e8a19af8fd94ae631c315a
 DIST bacula-9.6.7.tar.gz 4168102 BLAKE2B 8f5d5cbe8c3ce62105624138e9dfbb9f19eb0721bb2e377c07ef2cd3d4a8442641b4758b00b3050d2352dde31205658963782d2bec3e87242dac7b4b6a4d659c SHA512 27551faa2e4b13c6c2b9a2500f1253dfa5ee84929013491a7bf512d965d655c5af78b08201090474bc9b29827ca0a5c1c5a23a55712a1f739f37de75449cfd4d
-EBUILD bacula-9.6.5.ebuild 12502 BLAKE2B e8fca58c9aecd84da6a156a6c59584808dbdf100590bd38f41cd66bf4d67ff410404df0bac9f0966a1462e37d82258789152ae8565601b75f7b0d110766a7d64 SHA512 8ceb86a5891f6ee92876ee5d019fe22a719d60a4661caa2e664c0eb25e519fc51231f739977ed595fabb44c9a8ecf5da18a8068b90977da7f81b2a0eb5c42e23
-EBUILD bacula-9.6.6.ebuild 12505 BLAKE2B 2ef4888fa482355f3cdb74dcc9372d151754ecdf6e6da6e6850c04da66481199cca0dc7be0dfaa2ac70ce8137e79692a3312ce7894f0d721564147a6b10c784f SHA512 9242b3eb45b6908b947dfc40e33a78307dd2d3b420146628f55eb2262cdda990b7b43ee70165154b50498cc0b8755267bf57c323f6e384b5b6a99c25f7a87b55
-EBUILD bacula-9.6.7.ebuild 12505 BLAKE2B 2ef4888fa482355f3cdb74dcc9372d151754ecdf6e6da6e6850c04da66481199cca0dc7be0dfaa2ac70ce8137e79692a3312ce7894f0d721564147a6b10c784f SHA512 9242b3eb45b6908b947dfc40e33a78307dd2d3b420146628f55eb2262cdda990b7b43ee70165154b50498cc0b8755267bf57c323f6e384b5b6a99c25f7a87b55
+EBUILD bacula-9.6.5.ebuild 12072 BLAKE2B 4e8db8adee0c9a29ffbbb873cf8089b0291e693b0f461339d376a0c1e18c5fd0cff9c06569d492f5e08562dd7d7d8372639dd2b27cd8b700f2fcc29dac8d34c8 SHA512 8b2ee720023b762944690b51fc504e00a9cc61ea6bdc57efbf6afeebe625c9ed076765f744fc6a03fc46386bc61bb3de50db65defefa136a4f89f5dee56ca8db
+EBUILD bacula-9.6.6.ebuild 12075 BLAKE2B 51314b17c6a5f8ee40266f651f5c76c826bab5860977e2392eed9cf48ec7e2d9c6867ae128710757522edf0b935233cef06b841aaeb5645b31351470a5773f57 SHA512 2f7ebbd951410ae5d1cfd0dabf6476365170962de4b4179144f697fd44770543f2af82c729b246c51d21ab3b6e5a16c25ffda2dfb2aea36cd07c4a4d82789908
+EBUILD bacula-9.6.7.ebuild 12075 BLAKE2B 51314b17c6a5f8ee40266f651f5c76c826bab5860977e2392eed9cf48ec7e2d9c6867ae128710757522edf0b935233cef06b841aaeb5645b31351470a5773f57 SHA512 2f7ebbd951410ae5d1cfd0dabf6476365170962de4b4179144f697fd44770543f2af82c729b246c51d21ab3b6e5a16c25ffda2dfb2aea36cd07c4a4d82789908
 MISC metadata.xml 696 BLAKE2B 9a24744f1035e27017f140768b70ab4406e80e1eec452968cfa82e7686876d359ac7a90f9c5998356fc9b4170b9132842d3295877cfa6740d6f1d42e804afbcf SHA512 dcf03b8409574b0e4fb43fefc1f24f7ebc096ff04d79beef0bd31714b233f324bec87387cad8f3eb5c08ab972feae82a32702718aaef39255eec07e6e0352875
diff --git a/app-backup/bacula/bacula-9.6.5.ebuild b/app-backup/bacula/bacula-9.6.5.ebuild
index 13290a4abf99..d9cbcaee1838 100644
--- a/app-backup/bacula/bacula-9.6.5.ebuild
+++ b/app-backup/bacula/bacula-9.6.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
 
 DEPEND="
 	!bacula-clientonly? (
@@ -40,8 +40,7 @@ DEPEND="
 		sys-libs/zlib[static-libs]
 		acl? ( virtual/acl[static-libs(+)] )
 		ssl? (
-			!libressl? ( dev-libs/openssl:0=[static-libs] )
-			libressl? ( dev-libs/libressl:0=[static-libs] )
+			dev-libs/openssl:0=[static-libs]
 		)
 	)
 	!static? (
@@ -50,8 +49,7 @@ DEPEND="
 		sys-libs/zlib
 		acl? ( virtual/acl )
 		ssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 		)
 	)
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
@@ -156,15 +154,6 @@ src_prepare() {
 	touch src/qt-console/.libs/bat || die
 	chmod 755 src/qt-console/.libs/bat || die
 
-	# fix handling of libressl version
-	# needs separate handling for <libressl-2.7 and >=libressl2.7
-	# (see bug #655520)
-	if has_version "<dev-libs/libressl-2.7"; then
-		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
-	else
-		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
-	fi
-
 	# Don't let program install man pages directly
 	sed -i -e 's/ manpages//' Makefile.in || die
 
diff --git a/app-backup/bacula/bacula-9.6.6.ebuild b/app-backup/bacula/bacula-9.6.6.ebuild
index aaffa58674b0..d527ca5224e4 100644
--- a/app-backup/bacula/bacula-9.6.6.ebuild
+++ b/app-backup/bacula/bacula-9.6.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
 
 DEPEND="
 	!bacula-clientonly? (
@@ -40,8 +40,7 @@ DEPEND="
 		sys-libs/zlib[static-libs]
 		acl? ( virtual/acl[static-libs(+)] )
 		ssl? (
-			!libressl? ( dev-libs/openssl:0=[static-libs] )
-			libressl? ( dev-libs/libressl:0=[static-libs] )
+			dev-libs/openssl:0=[static-libs]
 		)
 	)
 	!static? (
@@ -50,8 +49,7 @@ DEPEND="
 		sys-libs/zlib
 		acl? ( virtual/acl )
 		ssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 		)
 	)
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
@@ -156,15 +154,6 @@ src_prepare() {
 	touch src/qt-console/.libs/bat || die
 	chmod 755 src/qt-console/.libs/bat || die
 
-	# fix handling of libressl version
-	# needs separate handling for <libressl-2.7 and >=libressl2.7
-	# (see bug #655520)
-	if has_version "<dev-libs/libressl-2.7"; then
-		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
-	else
-		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
-	fi
-
 	# Don't let program install man pages directly
 	sed -i -e 's/ manpages//' Makefile.in || die
 
diff --git a/app-backup/bacula/bacula-9.6.7.ebuild b/app-backup/bacula/bacula-9.6.7.ebuild
index aaffa58674b0..d527ca5224e4 100644
--- a/app-backup/bacula/bacula-9.6.7.ebuild
+++ b/app-backup/bacula/bacula-9.6.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
 
 DEPEND="
 	!bacula-clientonly? (
@@ -40,8 +40,7 @@ DEPEND="
 		sys-libs/zlib[static-libs]
 		acl? ( virtual/acl[static-libs(+)] )
 		ssl? (
-			!libressl? ( dev-libs/openssl:0=[static-libs] )
-			libressl? ( dev-libs/libressl:0=[static-libs] )
+			dev-libs/openssl:0=[static-libs]
 		)
 	)
 	!static? (
@@ -50,8 +49,7 @@ DEPEND="
 		sys-libs/zlib
 		acl? ( virtual/acl )
 		ssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 		)
 	)
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
@@ -156,15 +154,6 @@ src_prepare() {
 	touch src/qt-console/.libs/bat || die
 	chmod 755 src/qt-console/.libs/bat || die
 
-	# fix handling of libressl version
-	# needs separate handling for <libressl-2.7 and >=libressl2.7
-	# (see bug #655520)
-	if has_version "<dev-libs/libressl-2.7"; then
-		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
-	else
-		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
-	fi
-
 	# Don't let program install man pages directly
 	sed -i -e 's/ manpages//' Makefile.in || die
 
diff --git a/app-backup/bacula/files/9.4.0/bacula-9.4.0-libressl26.patch b/app-backup/bacula/files/9.4.0/bacula-9.4.0-libressl26.patch
deleted file mode 100644
index ea7fa0bb7a3d..000000000000
--- a/app-backup/bacula/files/9.4.0/bacula-9.4.0-libressl26.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/lib/crypto.c.orig       2018-02-02 15:34:39.420489000 -0600
-+++ src/lib/crypto.c    2018-02-02 15:35:44.000524000 -0600
-@@ -195,7 +195,7 @@
- IMPLEMENT_ASN1_FUNCTIONS(SignatureData)
- IMPLEMENT_ASN1_FUNCTIONS(CryptoData)
-
--#if defined(DEFINE_STACK_OF)
-+#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) )
- DEFINE_STACK_OF(SignerInfo);
- DEFINE_STACK_OF(RecipientInfo);
- #else
---- src/lib/openssl-compat.h.orig       2018-02-02 15:26:04.182557000 -0600
-+++ src/lib/openssl-compat.h    2018-02-02 15:27:50.229100000 -0600
-@@ -1,7 +1,7 @@
- #ifndef __OPENSSL_COPMAT__H__
- #define __OPENSSL_COPMAT__H__
-
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) )
- static inline int EVP_PKEY_up_ref(EVP_PKEY *pkey)
- {
-        CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY);
---- src/lib/tls.c.orig	2017-11-21 18:37:16.000000000 +0100
-+++ src/lib/tls.c	2018-04-16 20:00:54.082000000 +0200
-@@ -116,7 +116,7 @@
-    ctx = (TLS_CONTEXT *)malloc(sizeof(TLS_CONTEXT));
- 
-    /* Allocate our OpenSSL TLS Context */
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) )
-    /* Allows SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols */
-    ctx->openssl = SSL_CTX_new(TLS_method());
- 
diff --git a/app-backup/bacula/files/9.4.0/bacula-9.4.0-libressl27.patch b/app-backup/bacula/files/9.4.0/bacula-9.4.0-libressl27.patch
deleted file mode 100644
index 3ce61be59252..000000000000
--- a/app-backup/bacula/files/9.4.0/bacula-9.4.0-libressl27.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/crypto.c.orig       2018-02-02 15:34:39.420489000 -0600
-+++ src/lib/crypto.c    2018-02-02 15:35:44.000524000 -0600
-@@ -195,7 +195,7 @@
- IMPLEMENT_ASN1_FUNCTIONS(SignatureData)
- IMPLEMENT_ASN1_FUNCTIONS(CryptoData)
-
--#if defined(DEFINE_STACK_OF)
-+#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) )
- DEFINE_STACK_OF(SignerInfo);
- DEFINE_STACK_OF(RecipientInfo);
- #else