Attachment 236898 Details for Bug 266670 – patch

[patch] patch

133b343a29.patch (text/plain), 2.32 KB, created by Ivan Rozhuk on 2022-09-28 08:37:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Rozhuk

Created: 2022-09-28 08:37:25 UTC

Size: 2.32 KB

patch

obsolete

>From 133b343a29a7b066c6f0af7da489a6ec5ddb7588 Mon Sep 17 00:00:00 2001
>From: Rozhuk Ivan <rozhuk.im@gmail.com>
>Date: Wed, 28 Sep 2022 11:34:03 +0300
>Subject: [PATCH] lang/rust: fix build with libressl 3.5+
>
>---
> lang/rust/files/patch-libressl_3.5.x | 50 ++++++++++++++++++++++++++++
> 1 file changed, 50 insertions(+)
> create mode 100644 lang/rust/files/patch-libressl_3.5.x
>
>diff --git a/lang/rust/files/patch-libressl_3.5.x b/lang/rust/files/patch-libressl_3.5.x
>new file mode 100644
>index 000000000000..5eb8a8769d45
>--- /dev/null
>+++ b/lang/rust/files/patch-libressl_3.5.x
>@@ -0,0 +1,50 @@
>+--- vendor/libssh2-sys/libssh2/src/openssl.h
>++++ vendor/libssh2-sys/libssh2/src/openssl.h
>+@@ -57,8 +57,11 @@
>+ #include <openssl/pem.h>
>+ #include <openssl/rand.h>
>+ 
>+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
>+-    !defined(LIBRESSL_VERSION_NUMBER)
>++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && \
>++    !defined(LIBRESSL_VERSION_NUMBER)) || defined(LIBSSH2_WOLFSSL) || \
>++    LIBRESSL_VERSION_NUMBER >= 0x3050000fL
>++/* For wolfSSL, whether the structs are truly opaque or not, it's best to not
>++ * rely on their internal data members being exposed publicly. */
>+ # define HAVE_OPAQUE_STRUCTS 1
>+ #endif
>+ 
>+--- vendor/openssl-sys/build/cfgs.rs
>++++ vendor/openssl-sys/build/cfgs.rs
>+@@ -34,6 +34,12 @@
>+         if libressl_version >= 0x3_03_02_00_0 {
>+             cfgs.push("libressl332");
>+         }
>++        if libressl_version >= 0x3_04_00_00_0 {
>++            cfgs.push("libressl340");
>++        }
>++        if libressl_version >= 0x3_05_00_00_0 {
>++            cfgs.push("libressl350");
>++        }
>+     } else {
>+         let openssl_version = openssl_version.unwrap();
>+ 
>+--- vendor/openssl-sys/build/main.rs
>++++ vendor/openssl-sys/build/main.rs
>+@@ -254,6 +254,7 @@
>+             (3, 3, _) => ('3', '3', 'x'),
>+             (3, 4, 0) => ('3', '4', '0'),
>+             (3, 4, _) => ('3', '4', 'x'),
>++            (3, 5, _) => ('3', '5', 'x'),
>+             _ => version_error(),
>+         };
>+ 
>+@@ -296,7 +297,7 @@
>+         "
>+ 
>+ This crate is only compatible with OpenSSL (version 1.0.1 through 1.1.1, or 3.0.0), or LibreSSL 2.5
>+-through 3.4.1, but a different version of OpenSSL was found. The build is now aborting
>++through 3.5.x, but a different version of OpenSSL was found. The build is now aborting
>+ due to this version mismatch.
>+ 
>+ "

Actions: View | Diff

Attachments on bug 266670: 236898 | 237869 | 240956 | 241050 | 242702 | 243073 | 244725 | 246136 | 246529 | 246931 | 247053 | 247536 | 249461 | 251577 | 254621