diff options
Diffstat (limited to 'rust/libressl.patch')
| -rw-r--r-- | rust/libressl.patch | 64 |
1 files changed, 38 insertions, 26 deletions
diff --git a/rust/libressl.patch b/rust/libressl.patch index 7226ead9..cc8ef966 100644 --- a/rust/libressl.patch +++ b/rust/libressl.patch @@ -1,60 +1,70 @@ -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 -+++ b/vendor/openssl-sys-0.9.104/build/main.rs -@@ -103,6 +103,7 @@ fn main() { - println!("cargo:rustc-check-cfg=cfg(libressl382)"); +diff --git a/vendor/openssl-sys-0.9.107/build/main.rs b/vendor/openssl-sys-0.9.107/build/main.rs +index c4ac240e..906958e3 100644 +--- a/vendor/openssl-sys-0.9.107/build/main.rs ++++ b/vendor/openssl-sys-0.9.107/build/main.rs +@@ -151,6 +151,7 @@ fn main() { 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(libressl410)"); ++ println!("cargo:rustc-check-cfg=cfg(libressl420)"); println!("cargo:rustc-check-cfg=cfg(ossl101)"); println!("cargo:rustc-check-cfg=cfg(ossl102)"); -@@ -382,6 +383,8 @@ See rust-openssl documentation for more information: +@@ -449,6 +450,10 @@ See rust-openssl documentation for more information: (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'), ++ (4, 2, 0) => ('4', '2', '0'), ++ (4, 2, _) => ('4', '2', 'x'), _ => version_error(), }; -@@ -424,7 +427,7 @@ fn version_error() -> ! { +@@ -491,7 +496,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 4.0.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 ++through 4.2.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.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'), +diff --git a/vendor/openssl-sys-0.9.109/build/main.rs b/vendor/openssl-sys-0.9.109/build/main.rs +index 4007a265..906958e3 100644 +--- a/vendor/openssl-sys-0.9.109/build/main.rs ++++ b/vendor/openssl-sys-0.9.109/build/main.rs +@@ -151,6 +151,7 @@ fn main() { + 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(libressl420)"); + + println!("cargo:rustc-check-cfg=cfg(ossl101)"); + println!("cargo:rustc-check-cfg=cfg(ossl102)"); +@@ -451,6 +452,8 @@ See rust-openssl documentation for more information: (4, 0, _) => ('4', '0', 'x'), -+ (4, 1, 0) => ('4', '1', '0'), -+ (4, 1, _) => ('4', '1', 'x'), + (4, 1, 0) => ('4', '1', '0'), + (4, 1, _) => ('4', '1', 'x'), ++ (4, 2, 0) => ('4', '2', '0'), ++ (4, 2, _) => ('4', '2', 'x'), _ => version_error(), }; -@@ -491,7 +493,7 @@ fn version_error() -> ! { +@@ -493,7 +496,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 4.0.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 +-through 4.1.x, but a different version of OpenSSL was found. The build is now aborting ++through 4.2.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.92/build/main.rs b/vendor/openssl-sys-0.9.92/build/main.rs -index 21ccf3d0..2b06ee0f 100644 +index 21ccf3d0..3bd07b5f 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: +@@ -273,6 +273,16 @@ See rust-openssl documentation for more information: (3, 7, 1) => ('3', '7', '1'), (3, 7, _) => ('3', '7', 'x'), (3, 8, 0) => ('3', '8', '0'), @@ -66,15 +76,17 @@ index 21ccf3d0..2b06ee0f 100644 + (4, 0, _) => ('4', '0', 'x'), + (4, 1, 0) => ('4', '1', '0'), + (4, 1, _) => ('4', '1', 'x'), ++ (4, 2, 0) => ('4', '2', '0'), ++ (4, 2, _) => ('4', '2', 'x'), _ => version_error(), }; -@@ -315,7 +323,7 @@ fn version_error() -> ! { +@@ -315,7 +325,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.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 ++through 4.2.x, but a different version of OpenSSL was found. The build is now aborting due to this version mismatch. " |