diff --git a/security/apache-xml-security-c/Makefile b/security/apache-xml-security-c/Makefile index 2e27351c3ddb..0a7b5b486b92 100644 --- a/security/apache-xml-security-c/Makefile +++ b/security/apache-xml-security-c/Makefile @@ -1,7 +1,7 @@ # Created by: Tony Maher PORTNAME= xml-security-c -PORTVERSION= 2.0.2 +PORTVERSION= 2.0.3 CATEGORIES= security MASTER_SITES= APACHE/santuario/c-library PKGNAMEPREFIX= apache- diff --git a/security/apache-xml-security-c/distinfo b/security/apache-xml-security-c/distinfo index 1f4891b69370..304c274ac730 100644 --- a/security/apache-xml-security-c/distinfo +++ b/security/apache-xml-security-c/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541343540 -SHA256 (xml-security-c-2.0.2.tar.bz2) = 39e963ab4da477b7bda058f06db37228664c68fe68902d86e334614dd06e046b -SIZE (xml-security-c-2.0.2.tar.bz2) = 659543 +TIMESTAMP = 1635286229 +SHA256 (xml-security-c-2.0.3.tar.bz2) = 803029f129005a9b453aa45f0b3e44c28b8f2ec5eb526c20c74f93995cf6da69 +SIZE (xml-security-c-2.0.3.tar.bz2) = 676128 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 deleted file mode 100644 index ea0fb0abd3e7..000000000000 --- a/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLCryptoBase64.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 4474837fd56f..000000000000 --- a/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLCryptoBase64.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 2ff49586dd74..000000000000 --- a/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLSupport.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 66fdf7de6801..000000000000 --- a/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLSupport.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - }; diff --git a/security/apache-xml-security-c/pkg-plist b/security/apache-xml-security-c/pkg-plist index 98ca6b51e73a..9642a485915c 100644 --- a/security/apache-xml-security-c/pkg-plist +++ b/security/apache-xml-security-c/pkg-plist @@ -155,8 +155,7 @@ include/xsec/xkms/XKMSUseKeyWith.hpp include/xsec/xkms/XKMSValidateRequest.hpp include/xsec/xkms/XKMSValidateResult.hpp include/xsec/xkms/XKMSValidityInterval.hpp -lib/libxml-security-c.a lib/libxml-security-c.so lib/libxml-security-c.so.20 -lib/libxml-security-c.so.20.0.2 +lib/libxml-security-c.so.20.0.3 libdata/pkgconfig/xml-security-c.pc