diff options
Diffstat (limited to 'repos/extra/rust/libressl.patch')
| -rw-r--r-- | repos/extra/rust/libressl.patch | 73 |
1 files changed, 58 insertions, 15 deletions
diff --git a/repos/extra/rust/libressl.patch b/repos/extra/rust/libressl.patch index cc8ef966..239f7554 100644 --- a/repos/extra/rust/libressl.patch +++ b/repos/extra/rust/libressl.patch @@ -1,67 +1,110 @@ 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 +index c4ac240e..2e40d75a 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() { +@@ -151,6 +151,8 @@ 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(libressl430)"); println!("cargo:rustc-check-cfg=cfg(ossl101)"); println!("cargo:rustc-check-cfg=cfg(ossl102)"); -@@ -449,6 +450,10 @@ See rust-openssl documentation for more information: +@@ -449,6 +451,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'), ++ (4, 3, _) => ('4', '3', 'x'), _ => version_error(), }; -@@ -491,7 +496,7 @@ fn version_error() -> ! { +@@ -491,7 +497,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.2.x, but a different version of OpenSSL was found. The build is now aborting ++through 4.3.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.109/build/main.rs b/vendor/openssl-sys-0.9.109/build/main.rs -index 4007a265..906958e3 100644 +index 4007a265..2e40d75a 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() { +@@ -151,6 +151,8 @@ 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(libressl430)"); 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: +@@ -451,6 +453,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, 2, 0) => ('4', '2', '0'), + (4, 2, _) => ('4', '2', 'x'), ++ (4, 3, _) => ('4', '3', 'x'), _ => version_error(), }; -@@ -493,7 +496,7 @@ fn version_error() -> ! { +@@ -493,7 +497,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.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 ++through 4.3.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.111/build/main.rs b/vendor/openssl-sys-0.9.111/build/main.rs +index cbbeb961..b103630e 100644 +--- a/vendor/openssl-sys-0.9.111/build/main.rs ++++ b/vendor/openssl-sys-0.9.111/build/main.rs +@@ -161,6 +161,7 @@ fn main() { + 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(libressl430)"); + + println!("cargo:rustc-check-cfg=cfg(ossl101)"); + println!("cargo:rustc-check-cfg=cfg(ossl102)"); +@@ -434,6 +435,7 @@ See rust-openssl documentation for more information: + (4, 1, 0) => ('4', '1', '0'), + (4, 1, _) => ('4', '1', 'x'), + (4, 2, _) => ('4', '2', 'x'), ++ (4, 3, _) => ('4', '3', 'x'), + _ => version_error(), + }; + +diff --git a/vendor/openssl-sys-0.9.112/build/main.rs b/vendor/openssl-sys-0.9.112/build/main.rs +index 3f9eae06..549c9dde 100644 +--- a/vendor/openssl-sys-0.9.112/build/main.rs ++++ b/vendor/openssl-sys-0.9.112/build/main.rs +@@ -425,6 +425,7 @@ See rust-openssl documentation for more information: + (4, 1, 0) => ('4', '1', '0'), + (4, 1, _) => ('4', '1', 'x'), + (4, 2, _) => ('4', '2', 'x'), ++ (4, 3, _) => ('4', '3', 'x'), + _ => version_error(), + }; + +@@ -461,7 +462,7 @@ fn version_error() -> ! { + " + + This crate is only compatible with OpenSSL (version 1.1.0, 1.1.1, or 3.x), or LibreSSL 3.5.0 +-through 4.2.x, but a different version of OpenSSL was found. The build is now aborting ++through 4.3.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..3bd07b5f 100644 +index 21ccf3d0..fd02e9c6 100644 --- a/vendor/openssl-sys-0.9.92/build/main.rs +++ b/vendor/openssl-sys-0.9.92/build/main.rs @@ -273,6 +273,16 @@ See rust-openssl documentation for more information: @@ -76,8 +119,8 @@ index 21ccf3d0..3bd07b5f 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'), ++ (4, 3, _) => ('4', '3', 'x'), _ => version_error(), }; @@ -86,7 +129,7 @@ index 21ccf3d0..3bd07b5f 100644 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.2.x, but a different version of OpenSSL was found. The build is now aborting ++through 4.3.x, but a different version of OpenSSL was found. The build is now aborting due to this version mismatch. " |