Date: Sat, 3 Nov 2018 14:22:06 +0000 (UTC) From: Palle Girgensohn <girgen@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483897 - head/security/apache-xml-security-c/files Message-ID: <201811031422.wA3EM6ks096670@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: girgen Date: Sat Nov 3 14:22:05 2018 New Revision: 483897 URL: https://svnweb.freebsd.org/changeset/ports/483897 Log: Fix build with LibreSSL PR: 232915 Submitted by: Andreas Sommer Added: head/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLCryptoBase64.cpp (contents, props changed) head/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLCryptoBase64.hpp (contents, props changed) head/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLSupport.cpp (contents, props changed) head/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLSupport.hpp (contents, props changed) Added: head/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLCryptoBase64.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLCryptoBase64.cpp Sat Nov 3 14:22:05 2018 (r483897) @@ -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 Added: head/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLCryptoBase64.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLCryptoBase64.hpp Sat Nov 3 14:22:05 2018 (r483897) @@ -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 Added: head/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLSupport.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLSupport.cpp Sat Nov 3 14:22:05 2018 (r483897) @@ -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 Added: head/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLSupport.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLSupport.hpp Sat Nov 3 14:22:05 2018 (r483897) @@ -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 + };
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811031422.wA3EM6ks096670>