Attachment 242702 Details for Bug 266670 – build fix with libressl 3.7+

[patch] build fix with libressl 3.7+

c68446a165.patch (text/plain), 1.91 KB, created by Ivan Rozhuk on 2023-06-09 17:53:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Rozhuk

Created: 2023-06-09 17:53:34 UTC

Size: 1.91 KB

patch

obsolete

>From c68446a1655cfd841055ecb38a76040af3431a79 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.7+
>
>---
> lang/rust/files/patch-libressl | 41 ++++++++++++++++++++++++++++++++++
> 1 file changed, 41 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..fe1c525a8daf
>--- /dev/null
>+++ b/lang/rust/files/patch-libressl
>@@ -0,0 +1,41 @@
>+--- 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
>+@@ -282,8 +282,9 @@
>+             (3, 5, _) => ('3', '5', 'x'),
>+             (3, 6, 0) => ('3', '6', '0'),
>+             (3, 6, _) => ('3', '6', 'x'),
>+-            (3, 7, 0) => ('3', '7', '0'),
>+-            (3, 7, 1) => ('3', '7', '1'),
>++            (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