aboutsummaryrefslogtreecommitdiffstats
path: root/community/cargo/openssl-fix-libressl-cmsh-detection.patch
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2018-02-16 01:47:34 +0100
committerJakub Jirutka <jakub@jirutka.cz>2018-02-16 01:55:38 +0100
commit7dbccc4f0781db1940354d2c390351ea98708d8c (patch)
treed0177af1542f3837c4fe7eb3ec7c526f86661e7a /community/cargo/openssl-fix-libressl-cmsh-detection.patch
parentb1f5a020aa4060b6b3341bdb5e440dc8e315eda3 (diff)
downloadaports-7dbccc4f0781db1940354d2c390351ea98708d8c.tar.bz2
aports-7dbccc4f0781db1940354d2c390351ea98708d8c.tar.xz
community/cargo: rebuild against libgit2 0.26.0 and newer openssl crate
I had to update crate openssl to 0.9.24 to make it build against libressl 2.6.4.
Diffstat (limited to 'community/cargo/openssl-fix-libressl-cmsh-detection.patch')
-rw-r--r--community/cargo/openssl-fix-libressl-cmsh-detection.patch47
1 files changed, 0 insertions, 47 deletions
diff --git a/community/cargo/openssl-fix-libressl-cmsh-detection.patch b/community/cargo/openssl-fix-libressl-cmsh-detection.patch
deleted file mode 100644
index 3548f3401b..0000000000
--- a/community/cargo/openssl-fix-libressl-cmsh-detection.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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");
- }
-