diff options
| author | Palle Girgensohn <girgen@FreeBSD.org> | 2018-11-03 14:22:05 +0000 |
|---|---|---|
| committer | Palle Girgensohn <girgen@FreeBSD.org> | 2018-11-03 14:22:05 +0000 |
| commit | 397fc620cde1767d9ac28940582383e4940b5b3c (patch) | |
| tree | 6f7dd6bba7f1085cbc0fbf880f4719e35e2065b9 /security/apache-xml-security-c/files | |
| parent | GCC 8 removed CilkPlus support, so we cannot USE_GCC=yes. Instead (diff) | |
Fix build with LibreSSL
PR: 232915
Submitted by: Andreas Sommer
Notes
Notes:
svn path=/head/; revision=483897
Diffstat (limited to 'security/apache-xml-security-c/files')
4 files changed, 44 insertions, 0 deletions
diff --git a/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLCryptoBase64.cpp b/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLCryptoBase64.cpp new file mode 100644 index 000000000000..ea0fb0abd3e7 --- /dev/null +++ b/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLCryptoBase64.cpp @@ -0,0 +1,11 @@ +--- xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp.orig 2018-06-18 14:48:29.000000000 +0000 ++++ xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp 2018-11-02 18:30:38.642036000 +0000 +@@ -48,7 +48,7 @@ + // Construction/Destruction + // -------------------------------------------------------------------------------- + +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + OpenSSLCryptoBase64::OpenSSLCryptoBase64() : mp_ectx(&m_ectx_store), mp_dctx(&m_dctx_store) { } + OpenSSLCryptoBase64::~OpenSSLCryptoBase64() { } + #else diff --git a/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLCryptoBase64.hpp b/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLCryptoBase64.hpp new file mode 100644 index 000000000000..4474837fd56f --- /dev/null +++ b/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLCryptoBase64.hpp @@ -0,0 +1,11 @@ +--- xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp.orig 2018-06-18 14:48:29.000000000 +0000 ++++ xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp 2018-11-02 18:30:38.642261000 +0000 +@@ -205,7 +205,7 @@ + EVP_ENCODE_CTX *mp_ectx; // Encode context + EVP_ENCODE_CTX *mp_dctx; // Decode context + +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + EVP_ENCODE_CTX m_ectx_store; + EVP_ENCODE_CTX m_dctx_store; + #endif diff --git a/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLSupport.cpp b/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLSupport.cpp new file mode 100644 index 000000000000..2ff49586dd74 --- /dev/null +++ b/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLSupport.cpp @@ -0,0 +1,11 @@ +--- xsec/enc/OpenSSL/OpenSSLSupport.cpp.orig 2018-06-18 14:48:29.000000000 +0000 ++++ xsec/enc/OpenSSL/OpenSSLSupport.cpp 2018-11-02 18:30:38.642471000 +0000 +@@ -273,7 +273,7 @@ + + #endif + +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + EvpEncodeCtxRAII::EvpEncodeCtxRAII() : mp_ctx(&mp_ctx_store) { }; + EvpEncodeCtxRAII::~EvpEncodeCtxRAII() { } + #else diff --git a/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLSupport.hpp b/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLSupport.hpp new file mode 100644 index 000000000000..66fdf7de6801 --- /dev/null +++ b/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLSupport.hpp @@ -0,0 +1,11 @@ +--- xsec/enc/OpenSSL/OpenSSLSupport.hpp.orig 2018-06-18 14:48:29.000000000 +0000 ++++ xsec/enc/OpenSSL/OpenSSLSupport.hpp 2018-11-02 18:30:38.642655000 +0000 +@@ -88,7 +88,7 @@ + + private: + EVP_ENCODE_CTX *mp_ctx; +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + EVP_ENCODE_CTX mp_ctx_store; + #endif + }; |