Attachment 195318 Details for Bug 226955 – rust-1.27.1-libressl2.7.patch

[patch] rust-1.27.1-libressl2.7.patch

rust-1.27.1-libressl2.7.patch (text/plain), 2.23 KB, created by Charlie Li on 2018-07-21 05:54:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Charlie Li

Created: 2018-07-21 05:54:04 UTC

Size: 2.23 KB

patch

obsolete

>diff --git lang/rust/Makefile lang/rust/Makefile
>index f3a855c72b0e..361c567c0440 100644
>--- lang/rust/Makefile
>+++ lang/rust/Makefile
>@@ -156,7 +156,7 @@ post-patch:
> 		${WRKSRC}/src/stage0.txt
> # After patching crates, we need to update their corresponding
> # `.cargo-checksum.json` to reflect the new checksums verified by Cargo.
>-	@for dir in "${WRKSRC}/src/vendor/libc" "${WRKSRC}/src/vendor/openssl" "${WRKSRC}/src/vendor/openssl-sys"; do \
>+	@for dir in "${WRKSRC}/src/vendor/libc" "${WRKSRC}/src/vendor/libgit2-sys"; do \
> 		if ! test -d "$$dir"; then \
> 			continue; \
> 		fi; \
>diff --git lang/rust/files/patch-src_vendor_libgit2-sys_libgit2_src_streams_openssl.c lang/rust/files/patch-src_vendor_libgit2-sys_libgit2_src_streams_openssl.c
>new file mode 100644
>index 000000000000..30b3c6bd6673
>--- /dev/null
>+++ lang/rust/files/patch-src_vendor_libgit2-sys_libgit2_src_streams_openssl.c
>@@ -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
>diff --git lang/rust/files/patch-src_vendor_libgit2-sys_libgit2_src_streams_openssl.h lang/rust/files/patch-src_vendor_libgit2-sys_libgit2_src_streams_openssl.h
>new file mode 100644
>index 000000000000..6e715ef874ab
>--- /dev/null
>+++ lang/rust/files/patch-src_vendor_libgit2-sys_libgit2_src_streams_openssl.h
>@@ -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)
>+ {

Flags:

dumbbell: maintainer-approval+

Actions: View | Diff

Attachments on bug 226955: 192365 | 193508 | 195318