Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

curl: fix ipv6 detection compile error in configure script #277471

Merged
merged 1 commit into from Dec 31, 2023
Merged

curl: fix ipv6 detection compile error in configure script #277471

merged 1 commit into from Dec 31, 2023

Conversation

ghost
Copy link

@ghost ghost commented Dec 29, 2023 •
edited by ghost
Loading

fixes #276961

add patch to fix compile error in ipv6 detection in configure script.
PR submitted upstream as: curl/curl#12607 and merged as curl/curl@ae75db3

vendored patch is required because the source we use comes with a generated configure script, which also needs to be patched.

supersedes #277078

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@shyim

Add a 👍 reaction to pull requests you find important.

@ghost ghost mentioned this pull request Dec 29, 2023
Closed
13 tasks
@ofborg ofborg bot added the 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild label Dec 29, 2023
@ofborg ofborg bot requested a review from lovek323 December 29, 2023 08:30
@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Dec 29, 2023
@delroth delroth removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Dec 30, 2023
@ghost
Copy link
Author

ghost commented Dec 30, 2023

@ofborg eval

@philiptaron
Copy link
Contributor

https://github.com/curl/curl/commit/ae75db3527461248b0a7b1686df52200d28d83b9.patch

Would pulling this patch be sufficient? I see the checked in patch only changes configure.ac, rather than both configure and configure.ac.

@ghost
Copy link
Author

ghost commented Dec 30, 2023

https://github.com/curl/curl/commit/ae75db3527461248b0a7b1686df52200d28d83b9.patch

Would pulling this patch be sufficient? I see the checked in patch only changes configure.ac, rather than both configure and configure.ac.

there is not a configure script upstream, https://github.com/curl/curl. so the author must generate it from configure.ac before they package the source release.

additionally, after looking around the pkg to answer your question, i noticed that the curl package can not use fetchpatch

nixpkgs/pkgs/tools/networking/curl/default.nix

Lines 41 to 44 in 84563fc

# Note: this package is used for bootstrapping fetchurl, and thus
# cannot use fetchpatch! All mutable patches (generated by GitHub or
# cgit) that are needed here should be included directly in Nixpkgs as
# files.

philiptaron
philiptaron approved these changes Dec 30, 2023
View reviewed changes
Copy link
Contributor

@philiptaron philiptaron left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two great reasons this is written the way that it is.

@delroth delroth added the 12.approvals: 2 This PR was reviewed and approved by two reputable people label Dec 30, 2023
@7c6f434c 7c6f434c merged commit d381913 into NixOS:staging Dec 31, 2023
22 of 23 checks passed
@github-actions GitHub Actions
Copy link
Contributor

Successfully created backport PR for staging-23.11:

@github-actions github-actions bot mentioned this pull request Dec 31, 2023
Merged
1 task
@ghost ghost deleted the curl-fix-ipv6-detection branch December 31, 2023 11:40
@ghost ghost mentioned this pull request Dec 31, 2023
Closed
@wegank wegank mentioned this pull request Jan 4, 2024
Closed
13 tasks
reckenrode added a commit to reckenrode/nixpkgs that referenced this pull request Jan 5, 2024
@reckenrode
nix: fix installCheckPhase crashes on Darwin
8dd78e6 
Ensure that `OBJC_DISABLE_INITIALIZE_FORK_SAFETY=yes` is set when
starting the Nix daemon during tests, or the fetchurl.sh test will
crash trying to initialize libcurl. This is happening since IPv6 support
was enabled in NixOS#277471.

See also:
- http://sealiesoftware.com/blog/archive/2017/6/5/Objective-C_and_fork_in_macOS_1013.html
- NixOS/nix#2674
@reckenrode reckenrode mentioned this pull request Jan 5, 2024
Merged
13 tasks
github-actions bot pushed a commit that referenced this pull request Jan 5, 2024
@reckenrode @github-actions
nix: fix installCheckPhase crashes on Darwin
74a30bd 
Ensure that `OBJC_DISABLE_INITIALIZE_FORK_SAFETY=yes` is set when
starting the Nix daemon during tests, or the fetchurl.sh test will
crash trying to initialize libcurl. This is happening since IPv6 support
was enabled in #277471.

See also:
- http://sealiesoftware.com/blog/archive/2017/6/5/Objective-C_and_fork_in_macOS_1013.html
- NixOS/nix#2674

(cherry picked from commit 8dd78e6)
@ghost ghost mentioned this pull request Jan 25, 2024
Closed
jshort added a commit to jshort/nixpkgs that referenced this pull request May 24, 2024
@jshort
curl ipv6 fix
321b25e 
see NixOS#277471
@jshort jshort mentioned this pull request May 24, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lovek323 lovek323 Awaiting requested review from lovek323

Assignees
No one assigned
Labels
10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 12.approvals: 2 This PR was reviewed and approved by two reputable people
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@philiptaron @7c6f434c @shyim @delroth