Attachment 240956 Details for Bug 266670 – libressl 3.5 - 3.9

[patch] libressl 3.5 - 3.9

2e7fd29954.patch (text/plain), 2.52 KB, created by Ivan Rozhuk on 2023-03-18 20:14:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Rozhuk

Created: 2023-03-18 20:14:49 UTC

Size: 2.52 KB

patch

obsolete

>From 2e7fd29954a4d5f191155bf5e91c28143a41d2d0 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 | 57 ++++++++++++++++++++++++++++++++++
> 1 file changed, 57 insertions(+)
> create mode 100644 lang/rust/files/patch-libressl
>
>diff --git a/lang/rust/files/patch-libressl b/lang/rust/files/patch-libressl
>new file mode 100644
>index 000000000000..8650627adeb6
>--- /dev/null
>+++ b/lang/rust/files/patch-libressl
>@@ -0,0 +1,57 @@
>+--- 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,24 @@
>+         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");
>++        }
>++        if libressl_version >= 0x3_06_00_00_0 {
>++            cfgs.push("libressl360");
>++        }
>++        if libressl_version >= 0x3_07_00_00_0 {
>++            cfgs.push("libressl370");
>++        }
>++        if libressl_version >= 0x3_08_00_00_0 {
>++            cfgs.push("libressl380");
>++        }
>++        if libressl_version >= 0x3_09_00_00_0 {
>++            cfgs.push("libressl390");
>++        }
>+     } else {
>+         let openssl_version = openssl_version.unwrap();
>+ 
>+--- vendor/openssl-sys/build/main.rs
>++++ vendor/openssl-sys/build/main.rs
>+@@ -254,6 +254,11 @@
>+             (3, 3, _) => ('3', '3', 'x'),
>+             (3, 4, 0) => ('3', '4', '0'),
>+             (3, 4, _) => ('3', '4', 'x'),
>++            (3, 5, _) => ('3', '5', 'x'),
>++            (3, 6, _) => ('3', '6', 'x'),
>++            (3, 7, _) => ('3', '7', 'x'),
>++            (3, 8, _) => ('3', '8', 'x'),
>++            (3, 9, _) => ('3', '9', 'x'),
>+             _ => version_error(),
>+         };
>+

Actions: View | Diff

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