| 1 |
commit: 8ab165bb19dc5db0c6a6865f66f507de764ab504 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 3 18:28:16 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 3 18:45:33 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ab165bb |
| 7 |
|
| 8 |
app-backup/bacula: drop obsolete LibreSSL patches |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
.../files/9.4.0/bacula-9.4.0-libressl26.patch | 33 ---------------------- |
| 13 |
.../files/9.4.0/bacula-9.4.0-libressl27.patch | 11 -------- |
| 14 |
2 files changed, 44 deletions(-) |
| 15 |
|
| 16 |
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 |
| 17 |
deleted file mode 100644 |
| 18 |
index ea7fa0bb7a3..00000000000 |
| 19 |
--- a/app-backup/bacula/files/9.4.0/bacula-9.4.0-libressl26.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,33 +0,0 @@ |
| 22 |
---- src/lib/crypto.c.orig 2018-02-02 15:34:39.420489000 -0600 |
| 23 |
-+++ src/lib/crypto.c 2018-02-02 15:35:44.000524000 -0600 |
| 24 |
-@@ -195,7 +195,7 @@ |
| 25 |
- IMPLEMENT_ASN1_FUNCTIONS(SignatureData) |
| 26 |
- IMPLEMENT_ASN1_FUNCTIONS(CryptoData) |
| 27 |
- |
| 28 |
--#if defined(DEFINE_STACK_OF) |
| 29 |
-+#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) ) |
| 30 |
- DEFINE_STACK_OF(SignerInfo); |
| 31 |
- DEFINE_STACK_OF(RecipientInfo); |
| 32 |
- #else |
| 33 |
---- src/lib/openssl-compat.h.orig 2018-02-02 15:26:04.182557000 -0600 |
| 34 |
-+++ src/lib/openssl-compat.h 2018-02-02 15:27:50.229100000 -0600 |
| 35 |
-@@ -1,7 +1,7 @@ |
| 36 |
- #ifndef __OPENSSL_COPMAT__H__ |
| 37 |
- #define __OPENSSL_COPMAT__H__ |
| 38 |
- |
| 39 |
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L) |
| 40 |
-+#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) ) |
| 41 |
- static inline int EVP_PKEY_up_ref(EVP_PKEY *pkey) |
| 42 |
- { |
| 43 |
- CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY); |
| 44 |
---- src/lib/tls.c.orig 2017-11-21 18:37:16.000000000 +0100 |
| 45 |
-+++ src/lib/tls.c 2018-04-16 20:00:54.082000000 +0200 |
| 46 |
-@@ -116,7 +116,7 @@ |
| 47 |
- ctx = (TLS_CONTEXT *)malloc(sizeof(TLS_CONTEXT)); |
| 48 |
- |
| 49 |
- /* Allocate our OpenSSL TLS Context */ |
| 50 |
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) |
| 51 |
-+#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) ) |
| 52 |
- /* Allows SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols */ |
| 53 |
- ctx->openssl = SSL_CTX_new(TLS_method()); |
| 54 |
- |
| 55 |
|
| 56 |
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 |
| 57 |
deleted file mode 100644 |
| 58 |
index 3ce61be5925..00000000000 |
| 59 |
--- a/app-backup/bacula/files/9.4.0/bacula-9.4.0-libressl27.patch |
| 60 |
+++ /dev/null |
| 61 |
@@ -1,11 +0,0 @@ |
| 62 |
---- src/lib/crypto.c.orig 2018-02-02 15:34:39.420489000 -0600 |
| 63 |
-+++ src/lib/crypto.c 2018-02-02 15:35:44.000524000 -0600 |
| 64 |
-@@ -195,7 +195,7 @@ |
| 65 |
- IMPLEMENT_ASN1_FUNCTIONS(SignatureData) |
| 66 |
- IMPLEMENT_ASN1_FUNCTIONS(CryptoData) |
| 67 |
- |
| 68 |
--#if defined(DEFINE_STACK_OF) |
| 69 |
-+#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) ) |
| 70 |
- DEFINE_STACK_OF(SignerInfo); |
| 71 |
- DEFINE_STACK_OF(RecipientInfo); |
| 72 |
- #else |
Archives