Skip to content

Comments

[staging-23.05] curl: apply patch for CVE-2023-38039#254962

Merged
mweinelt merged 2 commits intoNixOS:staging-23.05from
yayayayaka:curl-fix-CVE-2023-38039
Sep 14, 2023
Merged

[staging-23.05] curl: apply patch for CVE-2023-38039#254962
mweinelt merged 2 commits intoNixOS:staging-23.05from
yayayayaka:curl-fix-CVE-2023-38039

Conversation

@yayayayaka
Copy link
Member

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.11 Release Notes (or backporting 23.05 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.

@yayayayaka yayayayaka added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Sep 13, 2023
@yayayayaka yayayayaka mentioned this pull request Sep 13, 2023
12 tasks
@mweinelt mweinelt self-assigned this Sep 13, 2023
@ofborg ofborg bot added the 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. label Sep 13, 2023
@ofborg ofborg bot requested a review from lovek323 September 13, 2023 15:53
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Sep 13, 2023
@mweinelt
Copy link
Member

mweinelt commented Sep 13, 2023

Built curl.tests on aarch64-linux and x86_64-linux and up to curl on aarch64-darwin and x86_64-darwin.

Couldn't reach curlFull on darwin because openldap tests fail. Could be a problem with the builder I'm using, not sure.

>>>>> 00:00:03 Starting test000-rootdse for mdb...
running defines.sh
Starting slapd on TCP/IP port 9011...
Using ldapsearch to retrieve the root DSE...
Waiting 5 seconds for slapd to start...
Waiting 5 seconds for slapd to start...
Waiting 5 seconds for slapd to start...
Waiting 5 seconds for slapd to start...
Waiting 5 seconds for slapd to start...
Waiting 5 seconds for slapd to start...
./scripts/test000-rootdse: line 61: kill: (23329) - No such process
ldap_sasl_bind(SIMPLE): Can't contact LDAP server (-1)
>>>>> Test failed
>>>>> 00:00:39 Failed   test000-rootdse for mdb after 36 seconds
(exit 255)
make[2]: *** [Makefile:320: mdb-yes] Error 255
make[2]: Leaving directory '/private/tmp/nix-build-openldap-2.6.4.drv-0/openldap-2.6.4/tests'
make[1]: *** [Makefile:287: test] Error 2
make[1]: Leaving directory '/private/tmp/nix-build-openldap-2.6.4.drv-0/openldap-2.6.4/tests'
make: *** [Makefile:298: test] Error 2

Can repro on release-23.05, but hydra apparently can build it.

@yayayayaka yayayayaka force-pushed the curl-fix-CVE-2023-38039 branch from 3c9e018 to 52d2d1a Compare September 14, 2023 00:08
@mweinelt mweinelt merged commit b3b7a41 into NixOS:staging-23.05 Sep 14, 2023
@yayayayaka yayayayaka deleted the curl-fix-CVE-2023-38039 branch September 14, 2023 00:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

1.severity: security Issues which raise a security issue, or PRs that fix one 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants