<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/54aaa082b488c2b0f08f033716b284e244bcabb9">https://github.com/macports/macports-ports/commit/54aaa082b488c2b0f08f033716b284e244bcabb9</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 54aaa08 serf1: Fix build failure with libressl
</span>54aaa08 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 54aaa082b488c2b0f08f033716b284e244bcabb9
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Thu Apr 19 01:27:03 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> serf1: Fix build failure with libressl
</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>---
www/serf1/Portfile | 3 +-
www/serf1/files/patch-ssl_buckets.c.diff | 89 ++++++++++++++++++++++++++++++++
2 files changed, 91 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/serf1/Portfile b/www/serf1/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5d42521..1240006 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/serf1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/serf1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,8 @@ checksums rmd160 4bbc773841eb2bd83a7c12170937b403201dd83b \
</span> sha256 549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc \
size 145132
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-SConstruct.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-SConstruct.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ssl_buckets.c.diff
</span>
platforms darwin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/serf1/files/patch-ssl_buckets.c.diff b/www/serf1/files/patch-ssl_buckets.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e53605a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/serf1/files/patch-ssl_buckets.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,89 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 3fbad74705a8fd506c6bab61c3c013f3a6704d98 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 6 Nov 2017 08:59:15 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix build failure when using libressl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ buckets/ssl_buckets.c | 16 ++++++++--------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 8 insertions(+), 8 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/buckets/ssl_buckets.c b/buckets/ssl_buckets.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3272645..2fd843d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- buckets/ssl_buckets.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ buckets/ssl_buckets.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -239,7 +239,7 @@ apps_ssl_info_callback(const SSL *s, int where, int ret)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void bio_set_data(BIO *bio, void *data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef USE_OPENSSL_1_1_API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(USE_OPENSSL_1_1_API) && !defined(LIBRESSL_VERSION_NUMBER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BIO_set_data(bio, data);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bio->ptr = data;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -248,7 +248,7 @@ static void bio_set_data(BIO *bio, void *data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void *bio_get_data(BIO *bio)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef USE_OPENSSL_1_1_API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(USE_OPENSSL_1_1_API) && !defined(LIBRESSL_VERSION_NUMBER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return BIO_get_data(bio);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return bio->ptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -381,7 +381,7 @@ static int bio_file_gets(BIO *bio, char *in, int inlen)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int bio_bucket_create(BIO *bio)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef USE_OPENSSL_1_1_API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(USE_OPENSSL_1_1_API) && !defined(LIBRESSL_VERSION_NUMBER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BIO_set_shutdown(bio, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BIO_set_init(bio, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BIO_set_data(bio, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -424,7 +424,7 @@ static long bio_bucket_ctrl(BIO *bio, int cmd, long num, void *ptr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef USE_OPENSSL_1_1_API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !(defined(USE_OPENSSL_1_1_API) && !defined(LIBRESSL_VERSION_NUMBER))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static BIO_METHOD bio_bucket_method = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BIO_TYPE_MEM,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Serf SSL encryption and decryption buckets",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -460,7 +460,7 @@ static BIO_METHOD *bio_meth_bucket_new(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BIO_METHOD *biom = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef USE_OPENSSL_1_1_API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(USE_OPENSSL_1_1_API) && !defined(LIBRESSL_VERSION_NUMBER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ biom = BIO_meth_new(BIO_TYPE_MEM,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Serf SSL encryption and decryption buckets");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (biom) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -481,7 +481,7 @@ static BIO_METHOD *bio_meth_file_new(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BIO_METHOD *biom = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef USE_OPENSSL_1_1_API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(USE_OPENSSL_1_1_API) && !defined(LIBRESSL_VERSION_NUMBER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ biom = BIO_meth_new(BIO_TYPE_FILE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Wrapper around APR file structures");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BIO_meth_set_write(biom, bio_file_write);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -499,7 +499,7 @@ static BIO_METHOD *bio_meth_file_new(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void bio_meth_free(BIO_METHOD *biom)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef USE_OPENSSL_1_1_API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(USE_OPENSSL_1_1_API) && !defined(LIBRESSL_VERSION_NUMBER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BIO_meth_free(biom);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1156,7 +1156,7 @@ static void init_ssl_libraries(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef USE_OPENSSL_1_1_API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(USE_OPENSSL_1_1_API) && !defined(LIBRESSL_VERSION_NUMBER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPENSSL_malloc_init();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CRYPTO_malloc_init();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.17.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>