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

uriparser: 0.9.0 backport to 18.09 #49586

Merged
merged 3 commits into from
Nov 10, 2018
Merged

uriparser: 0.9.0 backport to 18.09 #49586

merged 3 commits into from
Nov 10, 2018
+8 −25

Conversation

periklis
Copy link
Contributor

@periklis periklis commented Nov 1, 2018

Motivation for this change

Backport request for #49274

cc @jtojnar

Things done
  • 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.

Sorry, something went wrong.

@c0bw3b c0bw3b added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Nov 1, 2018
@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 1, 2018

Did you intend to embed the two other commits for gmock and gtest ?

@periklis
Copy link
Contributor Author

periklis commented Nov 1, 2018

@c0bw3b Yes, because uriparser depends on googletest from 0.9.0 on. See #49310 and #49306

@fpletz
Copy link
Member

fpletz commented Nov 1, 2018

Please use git cherry-pick -x to backport commits from master in the future (see https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches).

r-ryantm and others added 3 commits November 2, 2018 08:20
@r-ryantm @periklis
gmock: 1.8.0 -> 1.8.1 (NixOS#46273)
d976450 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
gtest

(cherry picked from commit 9cfbcc2)
Reason: Pre-Requisite to backport uriparser 0.9.0, which patches
security issues of the 0.8.x branch.
@periklis
gtest: Use native cmake/ninja builder

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
ff43959 
Clean up the expression and add pkgconfig support

(cherry picked from commit 9ac64e5)
Reason: Pre-Requisite to backport uriparser 0.9.0, which patches
security issues of the 0.8.x branch.
@periklis
uriparser: 0.8.6 -> 0.9.0
4292214 
(cherry picked from commit 2783ca5)
Reason: Provides security fixes for the 0.8.x branch.
@periklis periklis force-pushed the backport-uriparser-18.09 branch from c2cb6b2 to 4292214 Compare November 2, 2018 07:23
@periklis
Copy link
Contributor Author

periklis commented Nov 2, 2018

@fpletz Thank you very much for this hint. I really appreciate that. I had not noticed the linked section in the manual before, but it makes senses for maintainers.

@samueldr
Copy link
Member

samueldr commented Nov 7, 2018 •
edited
Loading

@GrahamcOfBorg build uriparser mumble mxnet

edit: ×2 due to previous ofborg hiccup

samueldr
samueldr approved these changes Nov 7, 2018
View reviewed changes
Copy link
Member

@samueldr samueldr left a comment

Choose a reason for hiding this comment

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

uriparser itself builds fine. AFAICT there's nothing depending on uriparser, which makes the security issue much less pressing.

The annoying amount of rebuilds seems to be entirely based on how gtest is used much more. Though picking a random sampling (mumble and mxnet) it seems to work right here.

(Approving before ofborg finishes building, chances are IMHO low it would fail on other platforms.)

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: uriparser, mumble, mxnet

Partial log (click to expand)

shrinking /nix/store/i809ifbyp37878b83sxcf2lw55mg52mc-mumble-1.2.19/lib/libcelt0.so.0.11.0
shrinking /nix/store/i809ifbyp37878b83sxcf2lw55mg52mc-mumble-1.2.19/lib/liblink.so
shrinking /nix/store/i809ifbyp37878b83sxcf2lw55mg52mc-mumble-1.2.19/lib/libmanual.so
shrinking /nix/store/i809ifbyp37878b83sxcf2lw55mg52mc-mumble-1.2.19/lib/libmumble.so.1.2.19
gzipping man pages under /nix/store/i809ifbyp37878b83sxcf2lw55mg52mc-mumble-1.2.19/share/man/
strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/i809ifbyp37878b83sxcf2lw55mg52mc-mumble-1.2.19/lib  /nix/store/i809ifbyp37878b83sxcf2lw55mg52mc-mumble-1.2.19/bin
patching script interpreter paths in /nix/store/i809ifbyp37878b83sxcf2lw55mg52mc-mumble-1.2.19
checking for references to /build in /nix/store/i809ifbyp37878b83sxcf2lw55mg52mc-mumble-1.2.19...
error: build of '/nix/store/f69msjq3p2fvdwy8x2m5bqir4v93gzwb-mxnet-1.2.1.drv' failed

@GrahamcOfBorg
Copy link

Timed out, unknown build status on x86_64-linux (full log)

Attempted: uriparser, mumble, mxnet

Partial log (click to expand)

make[1]: Leaving directory '/build/uriparser-0.9.0/doc'
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/5ic4f66678rcbqi1z71va6qc87lbzqh2-uriparser-0.9.0
shrinking /nix/store/5ic4f66678rcbqi1z71va6qc87lbzqh2-uriparser-0.9.0/lib/liburiparser.so.1.0.23
shrinking /nix/store/5ic4f66678rcbqi1z71va6qc87lbzqh2-uriparser-0.9.0/bin/uriparse
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/5ic4f66678rcbqi1z71va6qc87lbzqh2-uriparser-0.9.0/lib  /nix/store/5ic4f66678rcbqi1z71va6qc87lbzqh2-uriparser-0.9.0/bin
patching script interpreter paths in /nix/store/5ic4f66678rcbqi1z71va6qc87lbzqh2-uriparser-0.9.0
checking for references to /build in /nix/store/5ic4f66678rcbqi1z71va6qc87lbzqh2-uriparser-0.9.0...
error: build of '/nix/store/b13n8gjz82ipbj5g0yw8pdy1wp3xgnh7-mxnet-1.2.1.drv' failed

@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: uriparser, mumble, mxnet

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@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: uriparser, mumble, mxnet

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: uriparser, mumble, mxnet

Partial log (click to expand)

shrinking /nix/store/i809ifbyp37878b83sxcf2lw55mg52mc-mumble-1.2.19/lib/libcelt0.so.0.11.0
shrinking /nix/store/i809ifbyp37878b83sxcf2lw55mg52mc-mumble-1.2.19/lib/liblink.so
shrinking /nix/store/i809ifbyp37878b83sxcf2lw55mg52mc-mumble-1.2.19/lib/libmanual.so
shrinking /nix/store/i809ifbyp37878b83sxcf2lw55mg52mc-mumble-1.2.19/lib/libmumble.so.1.2.19
gzipping man pages under /nix/store/i809ifbyp37878b83sxcf2lw55mg52mc-mumble-1.2.19/share/man/
strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/i809ifbyp37878b83sxcf2lw55mg52mc-mumble-1.2.19/lib  /nix/store/i809ifbyp37878b83sxcf2lw55mg52mc-mumble-1.2.19/bin
patching script interpreter paths in /nix/store/i809ifbyp37878b83sxcf2lw55mg52mc-mumble-1.2.19
checking for references to /build in /nix/store/i809ifbyp37878b83sxcf2lw55mg52mc-mumble-1.2.19...
error: build of '/nix/store/f69msjq3p2fvdwy8x2m5bqir4v93gzwb-mxnet-1.2.1.drv' failed

@samueldr
Copy link
Member

And due to the noise from the failure (multiple unverified attributes on aarch64) let's confirm for uriparser :/

@GrahamcOfBorg build uriparser

@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: uriparser

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: uriparser

Partial log (click to expand)

/nix/store/wpvq0dizr1hyr03zhfj7qm1yizdaq8ha-uriparser-0.9.0

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: uriparser

Partial log (click to expand)

make[1]: Leaving directory '/build/uriparser-0.9.0/doc'
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/5ic4f66678rcbqi1z71va6qc87lbzqh2-uriparser-0.9.0
shrinking /nix/store/5ic4f66678rcbqi1z71va6qc87lbzqh2-uriparser-0.9.0/bin/uriparse
shrinking /nix/store/5ic4f66678rcbqi1z71va6qc87lbzqh2-uriparser-0.9.0/lib/liburiparser.so.1.0.23
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/5ic4f66678rcbqi1z71va6qc87lbzqh2-uriparser-0.9.0/lib  /nix/store/5ic4f66678rcbqi1z71va6qc87lbzqh2-uriparser-0.9.0/bin
patching script interpreter paths in /nix/store/5ic4f66678rcbqi1z71va6qc87lbzqh2-uriparser-0.9.0
checking for references to /build in /nix/store/5ic4f66678rcbqi1z71va6qc87lbzqh2-uriparser-0.9.0...
/nix/store/5ic4f66678rcbqi1z71va6qc87lbzqh2-uriparser-0.9.0

@samueldr samueldr merged commit 6118089 into NixOS:release-18.09 Nov 10, 2018
@samueldr
Copy link
Member

Sorry for the noise!

@GrahamcOfBorg
Copy link

Timed out, unknown build status on x86_64-linux (full log)

Attempted: uriparser, mumble, mxnet

Partial log (click to expand)

[ 34%] Building CXX object CMakeFiles/mxnet_static.dir/src/operator/tensor/control_flow_op.cc.o
[ 34%] Building CXX object CMakeFiles/mxnet_static.dir/src/operator/tensor/dot.cc.o
[ 35%] Building CXX object CMakeFiles/mxnet_static.dir/src/operator/tensor/elemwise_binary_broadcast_op_basic.cc.o
[ 35%] Building CXX object CMakeFiles/mxnet_static.dir/src/operator/tensor/elemwise_binary_broadcast_op_extended.cc.o
[ 35%] Building CXX object CMakeFiles/mxnet_static.dir/src/operator/tensor/elemwise_binary_broadcast_op_logic.cc.o
[ 35%] Building CXX object CMakeFiles/mxnet_static.dir/src/operator/tensor/elemwise_binary_op.cc.o
[ 36%] Building CXX object CMakeFiles/mxnet_static.dir/src/operator/tensor/elemwise_binary_op_basic.cc.o
[ 36%] Building CXX object CMakeFiles/mxnet_static.dir/src/operator/tensor/elemwise_binary_op_extended.cc.o
building of '/nix/store/b13n8gjz82ipbj5g0yw8pdy1wp3xgnh7-mxnet-1.2.1.drv' timed out after 3600 seconds
error: build of '/nix/store/b13n8gjz82ipbj5g0yw8pdy1wp3xgnh7-mxnet-1.2.1.drv' failed

@periklis periklis deleted the backport-uriparser-18.09 branch November 11, 2018 20:45
@edolstra
Copy link
Member

edolstra commented Nov 20, 2018 •
edited
Loading

Commit ff43959 breaks movit (and stuff that depends on it like kdenlive): https://hydra.nixos.org/build/83867621.

@jtojnar
Copy link
Member

jtojnar commented Nov 20, 2018

@edolstra 6daa193 needs backport as well.

@edolstra
Copy link
Member

@jtojnar Thanks, done.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@samueldr samueldr

Assignees
No one assigned
Labels
1.severity: security Issues which raise a security issue, or PRs that fix one 10.rebuild-darwin: 101-500 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@periklis @c0bw3b @fpletz @samueldr @GrahamcOfBorg @edolstra @jtojnar @r-ryantm