Attachment #195318 for bug #226955

Lines 156-162 post-patch: Link Here

(-)lang/rust/Makefile (-1 / +1 lines)
156	${WRKSRC}/src/stage0.txt	156	${WRKSRC}/src/stage0.txt
157	# After patching crates, we need to update their corresponding	157	# After patching crates, we need to update their corresponding
158	# `.cargo-checksum.json` to reflect the new checksums verified by Cargo.	158	# `.cargo-checksum.json` to reflect the new checksums verified by Cargo.
159	@for dir in "${WRKSRC}/src/vendor/libc" "${WRKSRC}/src/vendor/openssl" "${WRKSRC}/src/vendor/openssl-sys"; do \	159	@for dir in "${WRKSRC}/src/vendor/libc" "${WRKSRC}/src/vendor/libgit2-sys"; do \
160	if ! test -d "$$dir"; then \	160	if ! test -d "$$dir"; then \
161	continue; \	161	continue; \
162	fi; \	162	fi; \




--- 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




--- 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)
 {

Return to bug 226955

Added Link Here

(-)lang/rust/files/patch-src_vendor_libgit2-sys_libgit2_src_streams_openssl.c (+12 lines)
1	--- src/vendor/libgit2-sys/libgit2/src/streams/openssl.c.orig 2018-05-07 18:50:07 UTC
2	+++ src/vendor/libgit2-sys/libgit2/src/streams/openssl.c
3	@@ -104,7 +104,8 @@ int git_openssl_stream_global_init(void)
4	ssl_opts \|= SSL_OP_NO_COMPRESSION;
5	#endif
6
7	-#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
8	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| \
9	+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
10	SSL_load_error_strings();
11	OpenSSL_add_ssl_algorithms();
12	#else