This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 102
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Cargo uses its own vendored libcurl which it statically links against. This patches the build configuration to set CURL_CA_BUNDLE and CURL_CA_PATH. I am still unsure as to why this broke, why this only affects KISS with OpenSSL 3.0.0, etc. Will see if the next rust release improves this else will open a bug report upstream. Closes #339
- Loading branch information
1 parent
46c9ec7
commit 39d519f
Showing
5 changed files
with
39 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
diff --git a/Cargo.lock b/Cargo.lock | ||
index 085aae3..ccedf97 100644 | ||
--- a/Cargo.lock | ||
+++ b/Cargo.lock | ||
@@ -873,7 +873,7 @@ dependencies = [ | ||
name = "curl-sys" | ||
version = "0.4.45+curl-7.78.0" | ||
source = "registry+https://github.com/rust-lang/crates.io-index" | ||
-checksum = "de9e5a72b1c744eb5dd20b2be4d7eb84625070bb5c4ab9b347b70464ab1e62eb" | ||
+checksum = "d8f1e2562c5784ad3348906a9c7e2e435c8bc5c8796a4398d322456d9a2710c1" | ||
dependencies = [ | ||
"cc", | ||
"libc", | ||
diff --git a/vendor/curl-sys/.cargo-checksum.json b/vendor/curl-sys/.cargo-checksum.json | ||
new file mode 100644 | ||
index 0000000..b3a3efe | ||
--- /dev/null | ||
+++ b/vendor/curl-sys/.cargo-checksum.json | ||
@@ -0,0 +1 @@ | ||
+{"files":{},"package":"d8f1e2562c5784ad3348906a9c7e2e435c8bc5c8796a4398d322456d9a2710c1"} | ||
diff --git a/vendor/curl-sys/build.rs b/vendor/curl-sys/build.rs | ||
index 7b66756..a7c7122 100644 | ||
--- a/vendor/curl-sys/build.rs | ||
+++ b/vendor/curl-sys/build.rs | ||
@@ -109,6 +109,8 @@ fn main() { | ||
.include("curl/lib") | ||
.include("curl/include") | ||
.define("BUILDING_LIBCURL", None) | ||
+ .define("CURL_CA_BUNDLE", "\"/etc/ssl/cert.pem\"") | ||
+ .define("CURL_CA_PATH", "\"/etc/ssl/certs\"") | ||
.define("CURL_DISABLE_CRYPTO_AUTH", None) | ||
.define("CURL_DISABLE_DICT", None) | ||
.define("CURL_DISABLE_GOPHER", None) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
1.55.0 1 | ||
1.55.0 3 |