gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-17 02:39:08 -07:00
Code Issues Projects Releases Wiki Activity

dev-libs/botan: re-add support for libressl

Browse Source 
Gentoo-Bug: 633466

Package-Manager: Portage-2.3.8, Repoman-2.3.1
This commit is contained in:
Alon Bar-Lev
2017-10-04 22:20:00 +03:00
parent 71ac541cf2
commit 1e30fc072c
2 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dev-libs/botan/botan-1.10.17.ebuild
View File

@@ -34,6 +34,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-1.10.15-c++11.patch"
"${FILESDIR}/${P}-build.patch"
"${FILESDIR}/${P}-libressl.patch"
)
src_prepare() {

40
dev-libs/botan/files/botan-1.10.17-libressl.patch Normal file
View File

@@ -0,0 +1,40 @@
From e61a5f56fb404db3655909be4ce23c3a816cbb60 Mon Sep 17 00:00:00 2001
From: Alon Bar-Lev <alon.barlev@gmail.com>
Date: Wed, 4 Oct 2017 22:16:31 +0300
Subject: [PATCH] openssl: support libressl
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
---
src/engine/openssl/ossl_bc.cpp | 2 +-
src/engine/openssl/ossl_md.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/engine/openssl/ossl_bc.cpp b/src/engine/openssl/ossl_bc.cpp
index 74660c7b5..cb184c202 100644
--- a/src/engine/openssl/ossl_bc.cpp
+++ b/src/engine/openssl/ossl_bc.cpp
@@ -8,7 +8,7 @@
#include <botan/internal/openssl_engine.h>
#include <openssl/evp.h>
-#if OPENSSL_VERSION_NUMBER >= 0x10100000
+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
#error "OpenSSL 1.1 API not supported in Botan 1.10, upgrade to 2.x"
#endif
diff --git a/src/engine/openssl/ossl_md.cpp b/src/engine/openssl/ossl_md.cpp
index 2fcb2b0e5..9c43d616e 100644
--- a/src/engine/openssl/ossl_md.cpp
+++ b/src/engine/openssl/ossl_md.cpp
@@ -8,7 +8,7 @@
#include <botan/internal/openssl_engine.h>
#include <openssl/evp.h>
-#if OPENSSL_VERSION_NUMBER >= 0x10100000
+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
#error "OpenSSL 1.1 API not supported in Botan 1.10, upgrade to 2.x"
#endif
--
2.13.6