Link with CoreServices to fix macOs curl init crash #530
Conversation
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
|
I am trying to fix the initialization crash with this patch, but when I apply patch on top of https://github.com/sagebind/isahc and run diff --git a/Cargo.toml b/Cargo.toml
index d797d20..af49991 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -50,12 +50,14 @@ waker-fn = "1" # async primitive
# underlying HTTP engine that powers Isahc
[dependencies.curl]
-version = "0.4.43"
+git = "https://github.com/SomeoneToIgnore/curl-rust"
+branch = "update-curl"
default-features = false
# access to certain curl APIs not exposed in safe wrapper
[dependencies.curl-sys]
-version = "0.4.55"
+git = "https://github.com/SomeoneToIgnore/curl-rust"
+branch = "update-curl"
default-features = false
# used in TLS cert parsing
diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml
index ddbf688..d3c12d4 100644
--- a/benchmarks/Cargo.toml
+++ b/benchmarks/Cargo.toml
@@ -6,11 +6,14 @@ publish = false
[dependencies]
criterion = "0.4"
-curl = "0.4.42"
rayon = "1"
rouille = "3"
reqwest = { version = "0.11.10", features = ["blocking"] }
+[dependencies.curl]
+git = "https://github.com/SomeoneToIgnore/curl-rust"
+branch = "update-curl"
+
[dependencies.isahc]
path = ".."Yet, it appears in
is present that includes curl/curl@6ab7e19 What am I doing wrong and how could I fix curl init for Sonoma? |
|
Thanks for trying to help! However, I think this has several issues: A. We have to wait for 8.4 to be released before the version can be updated. |
This comment was marked as outdated.
This comment was marked as outdated.
|
I have pushed the One side note: curl build seems to emit a lot of warnings currently: curl deprecation warnings during buildthat seems unrelated to current crash fix, so leaving as is but looks rather dangerous. |
|
Is there a particular reason to wait for a new release to fix the linking issue? Are there changes on the curl side that are needed? |
SomeoneToIgnore
force-pushed
the
update-curl
branch
from
a83e16c
to
1d73b29
Compare
|
You're right indeed, we don't have to update curl at all, just fix the build.rs |
SomeoneToIgnore
changed the title
|
@ehuss do you think we can merge this (or whatever other fix on your mind)? Even |
Take a look at the workarounds I suggested on nabijaczleweli/cargo-update#240 |
|
Thank you, that would fix cargo-update, but there are more crates that fail for me (one has a transitive dependency on |
|
I would recommend also applying this change to make it easier for the maintainers to publish a new version. --- a/curl-sys/Cargo.toml
+++ b/curl-sys/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "curl-sys"
-version = "0.4.66+curl-8.3.0"
+version = "0.4.67+curl-8.3.0"
authors = ["Alex Crichton <[email protected]>"]
links = "curl"
build = "build.rs" |
ehuss
approved these changes
Oct 8, 2023
|
Thank you, Monday starts to look not that bad after this. |
|
@alexcrichton , seems that you're the one who can help with the final steps to fix Sonoma's issues with curl: if the PR looks fine to you, could you please merge it and make another release? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #524
Fix macOs Sonoma curl initialization crash: curl/curl#11893 by linking with
CoreServicesas the corresponding curl fix did: curl/curl@6ab7e19