[gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/files/9.4.0/

[gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/files/9.4.0/

[Sam James]

commit:     8ab165bb19dc5db0c6a6865f66f507de764ab504
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May  3 18:28:16 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  3 18:45:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ab165bb

app-backup/bacula: drop obsolete LibreSSL patches

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/9.4.0/bacula-9.4.0-libressl26.patch      | 33 ----------------------
 .../files/9.4.0/bacula-9.4.0-libressl27.patch      | 11 --------
 2 files changed, 44 deletions(-)

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 ea7fa0bb7a3..00000000000
--- 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 3ce61be5925..00000000000
--- 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