From 33ac973ede2c424e9efe74c9c0f39e7898bce3f6 Mon Sep 17 00:00:00 2001 From: Woodpecker CI Date: Fri, 22 Aug 2025 00:13:47 +0000 Subject: Woodpecker CI b6c26953ecfb6317380620c86cf65c233d281da2 [SKIP CI] --- rust/.checksum | 14 +-- rust/.files | 51 ++++----- rust/abuild | 21 ++-- rust/fix-curl.patch | 26 ++--- rust/fix-linux_musl_base.patch | 19 ++-- rust/libressl.patch | 240 +++-------------------------------------- 6 files changed, 77 insertions(+), 294 deletions(-) diff --git a/rust/.checksum b/rust/.checksum index 8a43864c..e7695460 100644 --- a/rust/.checksum +++ b/rust/.checksum @@ -1,7 +1,7 @@ -8bb58cb1f55e9f2ebf02823a37d02a93cfc960d149205c552b09dbfb19569b38 cargo-1.86.0-x86_64-unknown-linux-musl.tar.xz -1f70d4c8f84bccf0883a21124fcd7b5f84d89934b93744e6db1ffe072e1684db fix-curl.patch -98cd52ea1add75f87899eda742c302404eea756a27d9a62b6bb318db0c6b34ac fix-linux_musl_base.patch -722dbc61a1129a3d161564b27fc711f330827e3cddfc46c4d1c6784ad41c37a3 libressl.patch -f2d98445ce70ce29a16c953d8d0b6b24900981059f7781049d36f1a53d4ece52 rust-std-1.86.0-x86_64-unknown-linux-musl.tar.xz -d11c4cdd01669b89cd92be0838d69253e075e172e59748518837c53f9c71c75f rustc-1.86.0-x86_64-unknown-linux-musl.tar.xz -818b58c6cd637dcc67bf889ab10d551e56de2940c8d4353320da8489f9d49546 rustc-1.87.0-src.tar.xz +cbf3750aed42e86d34b291ba5884361140dfe0c716a6610aac35964265618dc9 cargo-1.88.0-x86_64-unknown-linux-musl.tar.xz +c3e4bbb5ddd2268c19896a9411f471e0a2d835b2abea54d6f93c434af3d85c7d fix-curl.patch +ecefb8300fbbaaeae6ec275c3c5902ff80b78fcd953fa561f9cc27cfe0440264 fix-linux_musl_base.patch +395ee1e263ea4c887fd038e164f1e94881ecdc39cb1c475b9b790740e8fd7988 libressl.patch +dc5c9cb00481b39f902cbaad00df1f856d30fc91485ba987ba50a87957d20fee rust-std-1.88.0-x86_64-unknown-linux-musl.tar.xz +19874c904c8c6f1f06e55d5ec16414d150a4df750d2cbb1f7d1d160a89681738 rustc-1.88.0-x86_64-unknown-linux-musl.tar.xz +5170cf6e21c61ff965be6298248c360c3c03ac59c7de9326862fba482f6089a5 rustc-1.89.0-src.tar.xz diff --git a/rust/.files b/rust/.files index e4c6fcf4..bd3f76b4 100644 --- a/rust/.files +++ b/rust/.files @@ -11,7 +11,7 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/rustc -rwxr-xr-x root/root usr/bin/rustfmt drwxr-xr-x root/root usr/lib/ --rw-r--r-- root/root usr/lib/librustc_driver-0e1dcda3ba8747cc.so +-rw-r--r-- root/root usr/lib/librustc_driver-d8f6ccbad630bb74.so drwxr-xr-x root/root usr/lib/rustlib/ -rw-r--r-- root/root usr/lib/rustlib/components drwxr-xr-x root/root usr/lib/rustlib/etc/ @@ -30,35 +30,30 @@ drwxr-xr-x root/root usr/lib/rustlib/etc/ -rw-r--r-- root/root usr/lib/rustlib/rust-installer-version drwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-musl/ drwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-musl/bin/ -drwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-musl/bin/gcc-ld/ --rwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-musl/bin/gcc-ld/ld.lld --rwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-musl/bin/gcc-ld/ld64.lld --rwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-musl/bin/gcc-ld/lld-link --rwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-musl/bin/gcc-ld/wasm-ld --rwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-musl/bin/rust-lld -rwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-musl/bin/rust-objcopy drwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/ --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liballoc-e24e8390b7eca9ce.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcfg_if-c059db423d64c2a4.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcompiler_builtins-fbbc3e86faa8cbea.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcore-b4f7be52957560c4.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libgetopts-31a17d1224c0fa5e.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libhashbrown-6218ac937f1294ff.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liblibc-6d6af9a93387a9b7.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_abort-4de172cd1f436f8b.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_unwind-cb3924e106675315.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libproc_macro-7d1063fbd8c82c7f.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_demangle-daca11801ac87754.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_alloc-61fa4cfed868da4e.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_core-3fdd8ebb1cd3abc9.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_std-42e3f4febf3951d1.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-9ee22cb2a2612b83.rlib --rwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-9ee22cb2a2612b83.so --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd_detect-5d1ae0a7989f6daa.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libsysroot-d2c80c8ed2c8c64e.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libtest-de8079bf1f413e77.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunicode_width-217eb35ec1436950.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunwind-cbcadc4e995b009c.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liballoc-b914915601a540ee.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcfg_if-9549865b96027a53.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcompiler_builtins-2c9e412489fe77e8.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcore-fb112958ae32107a.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libgetopts-f356c884c023441d.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libhashbrown-2723deecd228d8df.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liblibc-3252756acea03d4d.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_abort-74ac1df5f94b4192.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_unwind-3df01eb20e7d08fb.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libproc_macro-1b1d05cc1504df78.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_demangle-b7696707417340ba.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_literal_escaper-b94ce4cabb72203d.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_alloc-34bbd448057032c7.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_core-f9d22cadcd097152.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_std-38a3164a52d96121.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-cc9978ea61e52c7b.rlib +-rwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-cc9978ea61e52c7b.so +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd_detect-9df3655dbcfd32d3.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libsysroot-90104f90a4fd9767.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libtest-bb3e040b684feb5b.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunicode_width-b1fceef505818c70.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunwind-774100fc58440514.rlib drwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/ -rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/Scrt1.o -rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/crt1.o diff --git a/rust/abuild b/rust/abuild index 22340013..09243dc8 100644 --- a/rust/abuild +++ b/rust/abuild @@ -1,9 +1,9 @@ name=rust -version=1.87.0 +version=1.89.0 ##cat src/stage0.txt -export _date=2025-04-03 -export _rustc=1.86.0 +export _date=2025-06-26 +export _rustc=1.88.0 export _cargo=$_rustc ## @@ -27,17 +27,13 @@ build() { cp $SRC/rustc-$_rustc-x86_64-unknown-linux-musl.tar.xz build/cache/$_date/ cp $SRC/cargo-$_cargo-x86_64-unknown-linux-musl.tar.xz build/cache/$_date/ - sed -i 's/\(crt_static_default = \)true/\1false/' compiler/rustc_target/src/spec/base/linux_musl.rs - sed -i 's/\("files":{\)[^}]*/\1/' vendor/curl-sys-0.4.52+curl-7.81.0/.cargo-checksum.json - sed -i 's/\("files":{\)[^}]*/\1/' vendor/curl-sys-0.4.78+curl-8.11.0/.cargo-checksum.json + #sed -i 's/\(crt_static_default = \)true/\1false/' compiler/rustc_target/src/spec/base/linux_musl.rs + sed -i 's/\("files":{\)[^}]*/\1/' vendor/curl-sys-0.4.79+curl-8.12.0/.cargo-checksum.json sed -i 's/\("files":{\)[^}]*/\1/' vendor/curl-sys-0.4.80+curl-8.12.1/.cargo-checksum.json - sed -i 's/\("files":{\)[^}]*/\1/' vendor/openssl-0.10.38/.cargo-checksum.json - sed -i 's/\("files":{\)[^}]*/\1/' vendor/openssl-0.10.64/.cargo-checksum.json - sed -i 's/\("files":{\)[^}]*/\1/' vendor/openssl-0.10.71/.cargo-checksum.json - sed -i 's/\("files":{\)[^}]*/\1/' vendor/openssl-sys-0.9.102/.cargo-checksum.json + sed -i 's/\("files":{\)[^}]*/\1/' vendor/curl-sys-0.4.82+curl-8.14.1/.cargo-checksum.json sed -i 's/\("files":{\)[^}]*/\1/' vendor/openssl-sys-0.9.104/.cargo-checksum.json - sed -i 's/\("files":{\)[^}]*/\1/' vendor/openssl-sys-0.9.106/.cargo-checksum.json - sed -i 's/\("files":{\)[^}]*/\1/' vendor/openssl-sys-0.9.72/.cargo-checksum.json + sed -i 's/\("files":{\)[^}]*/\1/' vendor/openssl-sys-0.9.107/.cargo-checksum.json + sed -i 's/\("files":{\)[^}]*/\1/' vendor/openssl-sys-0.9.92/.cargo-checksum.json cat > config.toml < TargetOptions { - let mut base = base::linux::opts(); - - base.env = "musl".into(); -- base.pre_link_objects_self_contained = crt_objects::pre_musl_self_contained(); -- base.post_link_objects_self_contained = crt_objects::post_musl_self_contained(); -- base.link_self_contained = LinkSelfContainedDefault::InferredForMusl; - - base + TargetOptions { + env: "musl".into(), +- pre_link_objects_self_contained: crt_objects::pre_musl_self_contained(), +- post_link_objects_self_contained: crt_objects::post_musl_self_contained(), +- link_self_contained: LinkSelfContainedDefault::InferredForMusl, + ..base::linux::opts() + } } diff --git a/compiler/rustc_target/src/spec/crt_objects.rs b/compiler/rustc_target/src/spec/crt_objects.rs index e3b6430..13a96e2 100644 diff --git a/rust/libressl.patch b/rust/libressl.patch index fda82f0f..7226ead9 100644 --- a/rust/libressl.patch +++ b/rust/libressl.patch @@ -1,163 +1,3 @@ -diff --git a/vendor/openssl-0.10.38/build.rs b/vendor/openssl-0.10.38/build.rs -index d90ebc17..3e323cea 100644 ---- a/vendor/openssl-0.10.38/build.rs -+++ b/vendor/openssl-0.10.38/build.rs -@@ -78,5 +78,41 @@ fn main() { - if version >= 0x3_04_00_00_0 { - println!("cargo:rustc-cfg=libressl340"); - } -+ -+ if version >= 0x3_05_00_00_0 { -+ println!("cargo:rustc-cfg=libressl350"); -+ } -+ -+ if version >= 0x3_06_00_00_0 { -+ println!("cargo:rustc-cfg=libressl360"); -+ } -+ -+ if version >= 0x3_06_01_00_0 { -+ println!("cargo:rustc-cfg=libressl361"); -+ } -+ -+ if version >= 0x3_07_00_00_0 { -+ println!("cargo:rustc-cfg=libressl370"); -+ } -+ -+ if version >= 0x3_08_00_00_0 { -+ println!("cargo:rustc-cfg=libressl380"); -+ } -+ -+ if version >= 0x3_08_02_00_0 { -+ println!("cargo:rustc-cfg=libressl382"); -+ } -+ -+ if version >= 0x3_09_00_00_0 { -+ println!("cargo:rustc-cfg=libressl390"); -+ } -+ -+ if version >= 0x4_00_00_00_0 { -+ println!("cargo:rustc-cfg=libressl400"); -+ } -+ -+ if version >= 0x4_01_00_00_0 { -+ println!("cargo:rustc-cfg=libressl410"); -+ } - } - } -diff --git a/vendor/openssl-0.10.64/build.rs b/vendor/openssl-0.10.64/build.rs -index 7677abc0..4f5ca600 100644 ---- a/vendor/openssl-0.10.64/build.rs -+++ b/vendor/openssl-0.10.64/build.rs -@@ -75,6 +75,12 @@ fn main() { - if version >= 0x3_09_00_00_0 { - println!("cargo:rustc-cfg=libressl390"); - } -+ if version >= 0x4_00_00_00_0 { -+ println!("cargo:rustc-cfg=libressl400"); -+ } -+ if version >= 0x4_01_00_00_0 { -+ println!("cargo:rustc-cfg=libressl410"); -+ } - } - - if let Ok(vars) = env::var("DEP_OPENSSL_CONF") { -diff --git a/vendor/openssl-0.10.64/src/conf.rs b/vendor/openssl-0.10.64/src/conf.rs -index 715519c5..a4261cbc 100644 ---- a/vendor/openssl-0.10.64/src/conf.rs -+++ b/vendor/openssl-0.10.64/src/conf.rs -@@ -8,7 +8,7 @@ foreign_type_and_impl_send_sync! { - pub struct ConfRef; - } - --#[cfg(not(boringssl))] -+#[cfg(not(any(boringssl, libressl400)))] - mod methods { - use super::Conf; - use crate::cvt_p; -@@ -61,5 +61,5 @@ mod methods { - } - } - } --#[cfg(not(boringssl))] -+#[cfg(not(and(boringssl, libressl400)))] - pub use methods::*; -diff --git a/vendor/openssl-0.10.71/build.rs b/vendor/openssl-0.10.71/build.rs -index 52f3e89f..ef2645fe 100644 ---- a/vendor/openssl-0.10.71/build.rs -+++ b/vendor/openssl-0.10.71/build.rs -@@ -32,6 +32,7 @@ fn main() { - println!("cargo:rustc-check-cfg=cfg(libressl382)"); - println!("cargo:rustc-check-cfg=cfg(libressl390)"); - println!("cargo:rustc-check-cfg=cfg(libressl400)"); -+ println!("cargo:rustc-check-cfg=cfg(libressl410)"); - - println!("cargo:rustc-check-cfg=cfg(ossl101)"); - println!("cargo:rustc-check-cfg=cfg(ossl102)"); -@@ -116,6 +117,9 @@ fn main() { - if version >= 0x4_00_00_00_0 { - println!("cargo:rustc-cfg=libressl400"); - } -+ if version >= 0x4_01_00_00_0 { -+ println!("cargo:rustc-cfg=libressl410"); -+ } - } - - if let Ok(vars) = env::var("DEP_OPENSSL_CONF") { -diff --git a/vendor/openssl-sys-0.9.102/build/cfgs.rs b/vendor/openssl-sys-0.9.102/build/cfgs.rs -index 91cb734c..c53eabc4 100644 ---- a/vendor/openssl-sys-0.9.102/build/cfgs.rs -+++ b/vendor/openssl-sys-0.9.102/build/cfgs.rs -@@ -65,6 +65,12 @@ pub fn get(openssl_version: Option, libressl_version: Option) -> Vec<& - if libressl_version >= 0x3_09_00_00_0 { - cfgs.push("libressl390"); - } -+ if libressl_version >= 0x4_00_00_00_0 { -+ cfgs.push("libressl400"); -+ } -+ if libressl_version >= 0x4_01_00_00_0 { -+ cfgs.push("libressl410"); -+ } - } else { - let openssl_version = openssl_version.unwrap(); - -diff --git a/vendor/openssl-sys-0.9.102/build/main.rs b/vendor/openssl-sys-0.9.102/build/main.rs -index 606acc35..a30f788b 100644 ---- a/vendor/openssl-sys-0.9.102/build/main.rs -+++ b/vendor/openssl-sys-0.9.102/build/main.rs -@@ -304,6 +304,10 @@ See rust-openssl documentation for more information: - (3, 8, _) => ('3', '8', 'x'), - (3, 9, 0) => ('3', '9', '0'), - (3, 9, _) => ('3', '9', 'x'), -+ (4, 0, 0) => ('4', '0', '0'), -+ (4, 0, _) => ('4', '0', 'x'), -+ (4, 1, 0) => ('4', '1', '0'), -+ (4, 1, _) => ('4', '1', 'x'), - _ => version_error(), - }; - -@@ -346,7 +350,7 @@ fn version_error() -> ! { - " - - This crate is only compatible with OpenSSL (version 1.0.1 through 1.1.1, or 3), or LibreSSL 2.5 --through 3.9.x, but a different version of OpenSSL was found. The build is now aborting -+through 4.1.x, but a different version of OpenSSL was found. The build is now aborting - due to this version mismatch. - - " -diff --git a/vendor/openssl-sys-0.9.104/build/cfgs.rs b/vendor/openssl-sys-0.9.104/build/cfgs.rs -index cd03888e..ca997074 100644 ---- a/vendor/openssl-sys-0.9.104/build/cfgs.rs -+++ b/vendor/openssl-sys-0.9.104/build/cfgs.rs -@@ -68,6 +68,9 @@ pub fn get(openssl_version: Option, libressl_version: Option) -> Vec<& - if libressl_version >= 0x4_00_00_00_0 { - cfgs.push("libressl400"); - } -+ if libressl_version >= 0x4_01_00_00_0 { -+ cfgs.push("libressl410"); -+ } - } else { - let openssl_version = openssl_version.unwrap(); - diff --git a/vendor/openssl-sys-0.9.104/build/main.rs b/vendor/openssl-sys-0.9.104/build/main.rs index f379e1e6..0429f12a 100644 --- a/vendor/openssl-sys-0.9.104/build/main.rs @@ -188,11 +28,11 @@ index f379e1e6..0429f12a 100644 due to this version mismatch. " -diff --git a/vendor/openssl-sys-0.9.106/build/main.rs b/vendor/openssl-sys-0.9.106/build/main.rs -index 1a59d6f3..40c722e2 100644 ---- a/vendor/openssl-sys-0.9.106/build/main.rs -+++ b/vendor/openssl-sys-0.9.106/build/main.rs -@@ -383,6 +383,8 @@ See rust-openssl documentation for more information: +diff --git a/vendor/openssl-sys-0.9.107/build/main.rs b/vendor/openssl-sys-0.9.107/build/main.rs +index c4ac240e..4007a265 100644 +--- a/vendor/openssl-sys-0.9.107/build/main.rs ++++ b/vendor/openssl-sys-0.9.107/build/main.rs +@@ -449,6 +449,8 @@ See rust-openssl documentation for more information: (3, 9, _) => ('3', '9', 'x'), (4, 0, 0) => ('4', '0', '0'), (4, 0, _) => ('4', '0', 'x'), @@ -201,7 +41,7 @@ index 1a59d6f3..40c722e2 100644 _ => version_error(), }; -@@ -425,7 +427,7 @@ fn version_error() -> ! { +@@ -491,7 +493,7 @@ fn version_error() -> ! { " This crate is only compatible with OpenSSL (version 1.0.1 through 1.1.1, or 3), or LibreSSL 2.5 @@ -210,62 +50,14 @@ index 1a59d6f3..40c722e2 100644 due to this version mismatch. " -diff --git a/vendor/openssl-sys-0.9.72/build/cfgs.rs b/vendor/openssl-sys-0.9.72/build/cfgs.rs -index 18b3e3de..b2b234a9 100644 ---- a/vendor/openssl-sys-0.9.72/build/cfgs.rs -+++ b/vendor/openssl-sys-0.9.72/build/cfgs.rs -@@ -34,6 +34,36 @@ pub fn get(openssl_version: Option, libressl_version: Option) -> Vec<& - 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_08_01_00_0 { -+ cfgs.push("libressl381"); -+ } -+ if libressl_version >= 0x3_08_02_00_0 { -+ cfgs.push("libressl382"); -+ } -+ if libressl_version >= 0x3_09_00_00_0 { -+ cfgs.push("libressl390"); -+ } -+ if libressl_version >= 0x4_00_00_00_0 { -+ cfgs.push("libressl400"); -+ } -+ if libressl_version >= 0x4_01_00_00_0 { -+ cfgs.push("libressl410"); -+ } - } else { - let openssl_version = openssl_version.unwrap(); - -diff --git a/vendor/openssl-sys-0.9.72/build/main.rs b/vendor/openssl-sys-0.9.72/build/main.rs -index 243f146b..8aacb403 100644 ---- a/vendor/openssl-sys-0.9.72/build/main.rs -+++ b/vendor/openssl-sys-0.9.72/build/main.rs -@@ -254,6 +254,21 @@ See rust-openssl README for more information: - (3, 3, _) => ('3', '3', 'x'), - (3, 4, 0) => ('3', '4', '0'), - (3, 4, _) => ('3', '4', 'x'), -+ (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, 0) => ('3', '8', '0'), +diff --git a/vendor/openssl-sys-0.9.92/build/main.rs b/vendor/openssl-sys-0.9.92/build/main.rs +index 21ccf3d0..2b06ee0f 100644 +--- a/vendor/openssl-sys-0.9.92/build/main.rs ++++ b/vendor/openssl-sys-0.9.92/build/main.rs +@@ -273,6 +273,14 @@ See rust-openssl documentation for more information: + (3, 7, 1) => ('3', '7', '1'), + (3, 7, _) => ('3', '7', 'x'), + (3, 8, 0) => ('3', '8', '0'), + (3, 8, 1) => ('3', '8', '1'), + (3, 8, _) => ('3', '8', 'x'), + (3, 9, 0) => ('3', '9', '0'), @@ -277,11 +69,11 @@ index 243f146b..8aacb403 100644 _ => version_error(), }; -@@ -296,7 +311,7 @@ fn version_error() -> ! { +@@ -315,7 +323,7 @@ fn version_error() -> ! { " 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.8.0, but a different version of OpenSSL was found. The build is now aborting +through 4.1.x, but a different version of OpenSSL was found. The build is now aborting due to this version mismatch. -- cgit v1.2.3