Date: Sat, 21 Jul 2018 15:04:14 +0000 (UTC) From: =?UTF-8?Q?Jean-S=c3=a9bastien_P=c3=a9dron?= <dumbbell@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475069 - head/lang/rust/files Message-ID: <201807211504.w6LF4Epx060645@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dumbbell Date: Sat Jul 21 15:04:14 2018 New Revision: 475069 URL: https://svnweb.freebsd.org/changeset/ports/475069 Log: lang/rust: Add patches to fix the build with LibreSSL 2.7 PR: 226955 Submitted by: Charlie Li <ml+freebsd@vishwin.info> Added: head/lang/rust/files/patch-src_vendor_libgit2-sys_libgit2_src_streams_openssl.c (contents, props changed) head/lang/rust/files/patch-src_vendor_libgit2-sys_libgit2_src_streams_openssl.h (contents, props changed) Added: head/lang/rust/files/patch-src_vendor_libgit2-sys_libgit2_src_streams_openssl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/rust/files/patch-src_vendor_libgit2-sys_libgit2_src_streams_openssl.c Sat Jul 21 15:04:14 2018 (r475069) @@ -0,0 +1,12 @@ +--- src/vendor/libgit2-sys/libgit2/src/streams/openssl.c.orig 2018-05-07 18:50:07 UTC ++++ src/vendor/libgit2-sys/libgit2/src/streams/openssl.c +@@ -104,7 +104,8 @@ 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/lang/rust/files/patch-src_vendor_libgit2-sys_libgit2_src_streams_openssl.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/rust/files/patch-src_vendor_libgit2-sys_libgit2_src_streams_openssl.h Sat Jul 21 15:04:14 2018 (r475069) @@ -0,0 +1,12 @@ +--- src/vendor/libgit2-sys/libgit2/src/streams/openssl.h.orig 2018-05-07 18:50:07 UTC ++++ src/vendor/libgit2-sys/libgit2/src/streams/openssl.h +@@ -31,7 +31,8 @@ extern int git_openssl__set_cert_location(const char * + + + +-# 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?201807211504.w6LF4Epx060645>