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.

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: 7.70.0 -> 7.71.0 #91399

Closed
wants to merge 1 commit into from
Closed

curl: 7.70.0 -> 7.71.0 #91399

wants to merge 1 commit into from

Conversation

picnoir
Copy link
Member

@picnoir picnoir commented Jun 24, 2020 •
edited

Motivation for this change

Changelog:
https://daniel.haxx.se/blog/2020/06/24/curl-7-71-0-blobs-and-retries/

Fixes:

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@picnoir picnoir changed the base branch from master to staging June 24, 2020 09:21
@picnoir
Copy link
Member Author

picnoir commented Jun 24, 2020

Heh, I just realized this is going to generate a mass rebuild ><. Rebasing on staging in a minute.

@ofborg ofborg bot requested a review from lovek323 June 24, 2020 09:23
@vcunat
Copy link
Member

vcunat commented Jun 24, 2020

Patching sounds more suitable for 20.03. Why not just update to 7.71.0 here? (released today)

@mweinelt
Copy link
Member

Patching sounds more suitable for 20.03.

Except then we need to decide whether we want to pursue #86999, which is waiting for a curl bump to 20.03.

@vcunat
Copy link
Member

vcunat commented Jun 24, 2020 •
edited

Oh, OK; good to know. Anyway, I meant mainly the other part of implication – that I can't see why patch in master/staging.

@picnoir
Copy link
Member Author

picnoir commented Jun 24, 2020 via email

@vcunat
Copy link
Member

vcunat commented Jun 24, 2020

I believe we update it quite routinely.

@picnoir picnoir changed the title curl: fix CVE-2020-816 and CVE-2020-8177 curl: 7.70.0 -> 7.71.0 Jun 24, 2020
@picnoir
Copy link
Member Author

picnoir commented Jun 24, 2020 •
edited

I tried to apply the patches on top of 20.03; which is still on curl 7.68.0.

The patches cannot be cleanly applied. Meaning we either want to bump that to 7.70.0, either find a way to properly apply the patches.

I don't really have time to dig into that. Could somebody else have a look?

@mweinelt
Copy link
Member

I don't really have time to dig into that. Could somebody else have a look?

I will give it a spin.

@mweinelt mweinelt mentioned this pull request Jun 24, 2020
Merged
10 tasks
vcunat added a commit that referenced this pull request Jun 28, 2020
@vcunat
Merge #91399: curl: 7.70.0 -> 7.71.0 (security)
3a78c31 
...into staging branch.
@vcunat
Copy link
Member

vcunat commented Jun 28, 2020

I just merged a slightly different commit hash than any I see here: 277dd15. I'm not sure why exactly it happened, but the resulting tree is the same...

@vcunat vcunat closed this Jun 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vcunat vcunat vcunat approved these changes

@lovek323 lovek323 Awaiting requested review from lovek323

Assignees
No one assigned
Labels
1.severity: security 8.has: package (update) 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@picnoir @vcunat @mweinelt @dasJ