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

curl: 7.60.0 -> 7.61.0 #43639

Merged
merged 1 commit into from Jul 17, 2018
Merged

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Jul 16, 2018

https://curl.haxx.se/changes.html#7_61_0

(including CVE-2018-0500 fix)

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: curl

Partial log (click to expand)

patching script interpreter paths in /nix/store/yl4rbpmwaz6aa7wp82wliass6z9qpks6-curl-7.61.0-man
checking for references to /build in /nix/store/yl4rbpmwaz6aa7wp82wliass6z9qpks6-curl-7.61.0-man...
shrinking RPATHs of ELF executables and libraries in /nix/store/kxlsydzylpfk3y6r887wbzgaj6p38nvs-curl-7.61.0-devdoc
gzipping man pages under /nix/store/kxlsydzylpfk3y6r887wbzgaj6p38nvs-curl-7.61.0-devdoc/share/man/
patching script interpreter paths in /nix/store/kxlsydzylpfk3y6r887wbzgaj6p38nvs-curl-7.61.0-devdoc
checking for references to /build in /nix/store/kxlsydzylpfk3y6r887wbzgaj6p38nvs-curl-7.61.0-devdoc...
shrinking RPATHs of ELF executables and libraries in /nix/store/6lcv32ly2v5zy0cdbyc542rdpg2mngln-curl-7.61.0-debug
patching script interpreter paths in /nix/store/6lcv32ly2v5zy0cdbyc542rdpg2mngln-curl-7.61.0-debug
checking for references to /build in /nix/store/6lcv32ly2v5zy0cdbyc542rdpg2mngln-curl-7.61.0-debug...
/nix/store/gihnz23599cdg3i95dls510viyzkv18c-curl-7.61.0-bin

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: curl

Partial log (click to expand)

strip is /nix/store/qvj6bdvy7vdaxi3my0nq8ghf14njh8wk-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/j7hqypqkfxl7ky3jhwf8wsrfz8g0i5c3-curl-7.61.0/lib
patching script interpreter paths in /nix/store/j7hqypqkfxl7ky3jhwf8wsrfz8g0i5c3-curl-7.61.0
gzipping man pages under /nix/store/8p4x9mamvhi9wyx5izxg15ys6gd5gxvh-curl-7.61.0-man/share/man/
strip is /nix/store/qvj6bdvy7vdaxi3my0nq8ghf14njh8wk-cctools-binutils-darwin/bin/strip
patching script interpreter paths in /nix/store/8p4x9mamvhi9wyx5izxg15ys6gd5gxvh-curl-7.61.0-man
gzipping man pages under /nix/store/xjbyfxpx2zagvr1g674x9b8q4f1wr9fq-curl-7.61.0-devdoc/share/man/
strip is /nix/store/qvj6bdvy7vdaxi3my0nq8ghf14njh8wk-cctools-binutils-darwin/bin/strip
patching script interpreter paths in /nix/store/xjbyfxpx2zagvr1g674x9b8q4f1wr9fq-curl-7.61.0-devdoc
/nix/store/xnpfyar1zp9hg2ki8pizrv7dhlrpi4j3-curl-7.61.0-bin

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: curl

Partial log (click to expand)

patching script interpreter paths in /nix/store/vc3kgn2zhxrki87vyc0sxgdzjfq6kq7s-curl-7.61.0-man
checking for references to /build in /nix/store/vc3kgn2zhxrki87vyc0sxgdzjfq6kq7s-curl-7.61.0-man...
shrinking RPATHs of ELF executables and libraries in /nix/store/fpnvawy5p904d5n40aw51xwv5ckpm2qd-curl-7.61.0-devdoc
gzipping man pages under /nix/store/fpnvawy5p904d5n40aw51xwv5ckpm2qd-curl-7.61.0-devdoc/share/man/
patching script interpreter paths in /nix/store/fpnvawy5p904d5n40aw51xwv5ckpm2qd-curl-7.61.0-devdoc
checking for references to /build in /nix/store/fpnvawy5p904d5n40aw51xwv5ckpm2qd-curl-7.61.0-devdoc...
shrinking RPATHs of ELF executables and libraries in /nix/store/gkhzf06b79zqilw7xhn1aak7djmgh273-curl-7.61.0-debug
patching script interpreter paths in /nix/store/gkhzf06b79zqilw7xhn1aak7djmgh273-curl-7.61.0-debug
checking for references to /build in /nix/store/gkhzf06b79zqilw7xhn1aak7djmgh273-curl-7.61.0-debug...
/nix/store/hsy86fzzfcqvjff4aiqg478hfgzp60lk-curl-7.61.0-bin

@NeQuissimus
Copy link
Member

Does this fix #41312 ?
If so, we can point nix back at the latest curl and remove 7.59

@dtzWill
Copy link
Member Author

dtzWill commented Jul 16, 2018

In my testing, no. I don't think it's considered a "bug" (and so is unlikely to be fixed without some action on our part).

@dtzWill
Copy link
Member Author

dtzWill commented Jul 17, 2018

@GrahamcOfBorg build pkgsMusl.curl

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: pkgsMusl.curl

Partial log (click to expand)

Cannot nix-instantiate `pkgsMusl.curl' because:
�[31;1merror:�[0m Musl libc only supports Linux systems.

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: pkgsMusl.curl

Partial log (click to expand)

cannot build derivation '/nix/store/vpdy9nh176vqgv9rcmc9x48x14nd0305-c-ares-1.14.0.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/n39k6dpjy2rksqmjimix633qnn1d8kl4-libev-4.24.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/784i5jkprhhkf3av8yn834c6kqcjcp1a-perl-5.24.4.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/j5x44bdpfwpri8gl2wcpyj0d5nkzpv14-pkg-config-0.29.2.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/aqmcdnjz0s38qpj0vvs6az0rjljqhzcr-openssl-1.0.2o.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/mga8mldl5c18w70laccyb6k4xs5nl3wl-libkrb5-1.15.2.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/8yvg885ww9m6qx6zgnbv7hwc0g5dqjx8-libssh2-1.8.0.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/9ql8vms7gn0rpz3ygfwpxycdiq3kapja-nghttp2-1.32.0.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/d8qaqsgdnjpm66zsrc0d4d9f8vg42vcx-curl-7.61.0.drv': 8 dependencies couldn't be built
error: build of '/nix/store/d8qaqsgdnjpm66zsrc0d4d9f8vg42vcx-curl-7.61.0.drv' failed

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: pkgsMusl.curl

Partial log (click to expand)

patching script interpreter paths in /nix/store/9v7lcmcsi4vfa6sr87r8hma4vmrjxvsw-curl-7.61.0-man
checking for references to /build in /nix/store/9v7lcmcsi4vfa6sr87r8hma4vmrjxvsw-curl-7.61.0-man...
shrinking RPATHs of ELF executables and libraries in /nix/store/l3li12p28m02ggl1amqm864p8yizxxcb-curl-7.61.0-devdoc
gzipping man pages under /nix/store/l3li12p28m02ggl1amqm864p8yizxxcb-curl-7.61.0-devdoc/share/man/
patching script interpreter paths in /nix/store/l3li12p28m02ggl1amqm864p8yizxxcb-curl-7.61.0-devdoc
checking for references to /build in /nix/store/l3li12p28m02ggl1amqm864p8yizxxcb-curl-7.61.0-devdoc...
shrinking RPATHs of ELF executables and libraries in /nix/store/92y3sdm44sc50jm62ckzk1ha8lvhdxpg-curl-7.61.0-debug
patching script interpreter paths in /nix/store/92y3sdm44sc50jm62ckzk1ha8lvhdxpg-curl-7.61.0-debug
checking for references to /build in /nix/store/92y3sdm44sc50jm62ckzk1ha8lvhdxpg-curl-7.61.0-debug...
/nix/store/kvj81kqgjvwhj3qz6aln72mrjfzc3379-curl-7.61.0-bin

@NeQuissimus NeQuissimus merged commit 6075fa8 into NixOS:staging Jul 17, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants