diff options
Diffstat (limited to 'community/cargo/openssl-fix-libressl-cmsh-detection.patch')
| -rw-r--r-- | community/cargo/openssl-fix-libressl-cmsh-detection.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/community/cargo/openssl-fix-libressl-cmsh-detection.patch b/community/cargo/openssl-fix-libressl-cmsh-detection.patch new file mode 100644 index 0000000000..3548f3401b --- /dev/null +++ b/community/cargo/openssl-fix-libressl-cmsh-detection.patch @@ -0,0 +1,47 @@ +From 6e66bf9c38653b3a06fb4efb96e71e9bada25d79 Mon Sep 17 00:00:00 2001 +From: Greg V <greg@unrelenting.technology> +Date: Mon, 6 Nov 2017 16:19:16 +0300 +Subject: [PATCH] Fix LibreSSL cms.h detection + +Patch-Source: https://github.com/sfackler/rust-openssl/commit/6e66bf9c38653b3a06fb4efb96e71e9bada25d79 + +--- a/openssl/systest/build.rs ++++ b/openssl/systest/build.rs +@@ -5,6 +5,7 @@ use std::env; + fn main() { + let mut cfg = ctest::TestGenerator::new(); + let target = env::var("TARGET").unwrap(); ++ let mut is_libressl = false; + + if let Ok(out) = env::var("DEP_OPENSSL_INCLUDE") { + cfg.include(&out); +@@ -24,6 +25,7 @@ fn main() { + + if let Ok(_) = env::var("DEP_OPENSSL_LIBRESSL") { + cfg.cfg("libressl", None); ++ is_libressl = true; + } else if let Ok(version) = env::var("DEP_OPENSSL_VERSION") { + cfg.cfg(&format!("ossl{}", version), None); + } +@@ -41,12 +43,6 @@ fn main() { + } + } + +- let has_cms_h = if let Ok(version) = env::var("DEP_OPENSSL_LIBRESSL_VERSION") { +- version != "261" && version != "262" +- } else { +- true +- }; +- + cfg.header("openssl/comp.h") + .header("openssl/dh.h") + .header("openssl/ossl_typ.h") +@@ -64,7 +60,7 @@ fn main() { + .header("openssl/aes.h") + .header("openssl/ocsp.h"); + +- if has_cms_h { ++ if !is_libressl { + cfg.header("openssl/cms.h"); + } + |