Date: Tue, 27 Mar 2018 12:17:06 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465696 - head/devel/libgit2/files Message-ID: <201803271217.w2RCH6KD097263@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Tue Mar 27 12:17:06 2018 New Revision: 465696 URL: https://svnweb.freebsd.org/changeset/ports/465696 Log: devel/libgit2: Fix build with LibreSSL 2.7 - LibreSSL 2.7 adds OpenSSL 1.1 API PR: 226954 Approved by: wg (maintainer) Added: head/devel/libgit2/files/ head/devel/libgit2/files/patch-src_openssl__stream.c (contents, props changed) head/devel/libgit2/files/patch-src_openssl__stream.h (contents, props changed) Added: head/devel/libgit2/files/patch-src_openssl__stream.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libgit2/files/patch-src_openssl__stream.c Tue Mar 27 12:17:06 2018 (r465696) @@ -0,0 +1,11 @@ +--- src/openssl_stream.c.orig 2017-06-14 11:31:20 UTC ++++ src/openssl_stream.c +@@ -103,7 +103,7 @@ int git_openssl_stream_global_init(void) + ssl_opts |= SSL_OP_NO_COMPRESSION; + #endif + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) + SSL_load_error_strings(); + OpenSSL_add_ssl_algorithms(); + #else Added: head/devel/libgit2/files/patch-src_openssl__stream.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libgit2/files/patch-src_openssl__stream.h Tue Mar 27 12:17:06 2018 (r465696) @@ -0,0 +1,11 @@ +--- src/openssl_stream.h.orig 2017-06-14 11:31:20 UTC ++++ src/openssl_stream.h +@@ -27,7 +27,7 @@ extern int git_openssl_stream_new(git_st + + + +-# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++# if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) + + GIT_INLINE(BIO_METHOD*) BIO_meth_new(int type, const char *name) + {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803271217.w2RCH6KD097263>