From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3DB6913835A for ; Mon, 3 May 2021 18:46:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 671C9E0898; Mon, 3 May 2021 18:46:35 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4D8F5E0898 for ; Mon, 3 May 2021 18:46:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 41F6B34097F for ; Mon, 3 May 2021 18:46:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BFF0B744 for ; Mon, 3 May 2021 18:46:32 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1620067533.8ab165bb19dc5db0c6a6865f66f507de764ab504.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/files/9.4.0/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-backup/bacula/files/9.4.0/bacula-9.4.0-libressl26.patch app-backup/bacula/files/9.4.0/bacula-9.4.0-libressl27.patch X-VCS-Directories: app-backup/bacula/files/9.4.0/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8ab165bb19dc5db0c6a6865f66f507de764ab504 X-VCS-Branch: master Date: Mon, 3 May 2021 18:46:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a0a7bf1f-725f-49f3-a695-0cfe81f04b7b X-Archives-Hash: a00c58e9e1314ba595e3b97d820ac446 commit: 8ab165bb19dc5db0c6a6865f66f507de764ab504 Author: Sam James gentoo org> AuthorDate: Mon May 3 18:28:16 2021 +0000 Commit: Sam James gentoo 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 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