<pre style='margin:0'>
Jeremy Huddleston Sequoia (jeremyhu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8c1ab965644f623b9cfe166ab449d42cbfaa560f">https://github.com/macports/macports-ports/commit/8c1ab965644f623b9cfe166ab449d42cbfaa560f</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 8c1ab96 openldap: Update to build against libressl-devel
</span>8c1ab96 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8c1ab965644f623b9cfe166ab449d42cbfaa560f
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Sat May 5 22:55:39 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> openldap: Update to build against libressl-devel
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
</span>---
databases/openldap/files/libressl.patch | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/openldap/files/libressl.patch b/databases/openldap/files/libressl.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 00c9f76..676ab96 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/openldap/files/libressl.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/openldap/files/libressl.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@
</span> #endif
-#if OPENSSL_VERSION_NUMBER >= 0x10100000
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if OPENSSL_VERSION_NUMBER >= 0x10100000 || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000)
</span> #define ASN1_STRING_data(x) ASN1_STRING_get0_data(x)
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@
</span> #endif /* OpenSSL 1.1 */
-#if OPENSSL_VERSION_NUMBER < 0x10100000
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000)
</span> /*
* OpenSSL 1.1 API and later makes the BIO method concrete types internal.
*/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@
</span> #endif
-#if OPENSSL_VERSION_NUMBER < 0x10100000
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if (OPENSSL_VERSION_NUMBER < 0x10100000) || defined(LIBRESSL_VERSION_NUMBER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (OPENSSL_VERSION_NUMBER < 0x10100000) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000)
</span> SSL_load_error_strings();
SSL_library_init();
OpenSSL_add_all_digests();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +32,7 @@
</span> {
tlso_ctx *c = (tlso_ctx *)ctx;
-#if OPENSSL_VERSION_NUMBER < 0x10100000
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if (OPENSSL_VERSION_NUMBER < 0x10100000) || defined(LIBRESSL_VERSION_NUMBER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (OPENSSL_VERSION_NUMBER < 0x10100000) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000)
</span> #define SSL_CTX_up_ref(ctx) CRYPTO_add( &(ctx->references), 1, CRYPTO_LOCK_SSL_CTX )
#endif
SSL_CTX_up_ref( c );
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,7 @@
</span>
xn = X509_get_subject_name(x);
-#if OPENSSL_VERSION_NUMBER < 0x10100000
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if (OPENSSL_VERSION_NUMBER < 0x10100000) || defined(LIBRESSL_VERSION_NUMBER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (OPENSSL_VERSION_NUMBER < 0x10100000) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000)
</span> der_dn->bv_len = i2d_X509_NAME( xn, NULL );
der_dn->bv_val = xn->bytes->data;
#else
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +50,7 @@
</span>
xn = X509_get_subject_name(x);
-#if OPENSSL_VERSION_NUMBER < 0x10100000
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if (OPENSSL_VERSION_NUMBER < 0x10100000) || defined(LIBRESSL_VERSION_NUMBER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (OPENSSL_VERSION_NUMBER < 0x10100000) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000)
</span> der_dn->bv_len = i2d_X509_NAME( xn, NULL );
der_dn->bv_val = xn->bytes->data;
#else
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,7 +59,7 @@
</span> };
-#if OPENSSL_VERSION_NUMBER < 0x10100000
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if (OPENSSL_VERSION_NUMBER < 0x10100000) || defined(LIBRESSL_VERSION_NUMBER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (OPENSSL_VERSION_NUMBER < 0x10100000) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000)
</span> #define BIO_set_init(b, x) b->init = x
#define BIO_set_data(b, x) b->ptr = x
#define BIO_clear_flags(b, x) b->flags &= ~(x)
</pre><pre style='margin:0'>
</pre>