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

mpv: fix CVE-2018-6460 #34692

Merged
merged 1 commit into from Feb 7, 2018
Merged

mpv: fix CVE-2018-6460 #34692

merged 1 commit into from Feb 7, 2018

Conversation

andir
Copy link
Member

@andir andir commented Feb 7, 2018 •
edited

Motivation for this change

Upstream has fixed this in a series of commits ontop of 0.28.0. Debian
has backported the fixes to 0.27.0.

Upstream issue: mpv-player/mpv#5456
Debian bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=888654#8

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@andir
mpv: fix CVE-2018-6460
95f4d6b 
Upstream has fixed this in a series of commits ontop of 0.28.0. Debian
has backported the fixes to 0.27.0.

Upstream issue: mpv-player/mpv#5456
Debian bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=888654#8
@andir
Copy link
Member Author

andir commented Feb 7, 2018

@GrahamcOfBorg build mpv

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

Package ‘libpciaccess-0.14’ in /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/servers/x11/xorg/default.nix:1115 is not supported on ‘x86_64-darwin’, refusing to evaluate.

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

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

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/lph5xarhqmmx4vf5w4bs5dakfkbk5yi7-mpv-0.27.0
shrinking /nix/store/lph5xarhqmmx4vf5w4bs5dakfkbk5yi7-mpv-0.27.0/lib/libmpv.so.1.25.0
shrinking /nix/store/lph5xarhqmmx4vf5w4bs5dakfkbk5yi7-mpv-0.27.0/bin/.mpv-wrapped
gzipping man pages under /nix/store/lph5xarhqmmx4vf5w4bs5dakfkbk5yi7-mpv-0.27.0/share/man/
strip is /nix/store/5qj61lcvzlap87rf6blvf8p577d482bv-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/lph5xarhqmmx4vf5w4bs5dakfkbk5yi7-mpv-0.27.0/lib  /nix/store/lph5xarhqmmx4vf5w4bs5dakfkbk5yi7-mpv-0.27.0/bin 
patching script interpreter paths in /nix/store/lph5xarhqmmx4vf5w4bs5dakfkbk5yi7-mpv-0.27.0
checking for references to /tmp/nix-build-mpv-0.27.0.drv-0 in /nix/store/lph5xarhqmmx4vf5w4bs5dakfkbk5yi7-mpv-0.27.0...
/nix/store/lph5xarhqmmx4vf5w4bs5dakfkbk5yi7-mpv-0.27.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/m61dl96rfihn1jjr7jpinsc26bspwy35-mpv-0.27.0
shrinking /nix/store/m61dl96rfihn1jjr7jpinsc26bspwy35-mpv-0.27.0/bin/.mpv-wrapped
shrinking /nix/store/m61dl96rfihn1jjr7jpinsc26bspwy35-mpv-0.27.0/lib/libmpv.so.1.25.0
gzipping man pages under /nix/store/m61dl96rfihn1jjr7jpinsc26bspwy35-mpv-0.27.0/share/man/
strip is /nix/store/xmpjypwjmp2qi1chs5kr0hacnh161ls4-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/m61dl96rfihn1jjr7jpinsc26bspwy35-mpv-0.27.0/lib  /nix/store/m61dl96rfihn1jjr7jpinsc26bspwy35-mpv-0.27.0/bin
patching script interpreter paths in /nix/store/m61dl96rfihn1jjr7jpinsc26bspwy35-mpv-0.27.0
checking for references to /build in /nix/store/m61dl96rfihn1jjr7jpinsc26bspwy35-mpv-0.27.0...
/nix/store/m61dl96rfihn1jjr7jpinsc26bspwy35-mpv-0.27.0

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

Package ‘libpciaccess-0.14’ in /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/servers/x11/xorg/default.nix:1115 is not supported on ‘x86_64-darwin’, refusing to evaluate.

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

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

@andir andir merged commit 93cf067 into NixOS:master Feb 7, 2018
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

/nix/store/m61dl96rfihn1jjr7jpinsc26bspwy35-mpv-0.27.0

@andir andir deleted the mpv branch February 7, 2018 09:16
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/lph5xarhqmmx4vf5w4bs5dakfkbk5yi7-mpv-0.27.0
shrinking /nix/store/lph5xarhqmmx4vf5w4bs5dakfkbk5yi7-mpv-0.27.0/bin/.mpv-wrapped
shrinking /nix/store/lph5xarhqmmx4vf5w4bs5dakfkbk5yi7-mpv-0.27.0/lib/libmpv.so.1.25.0
gzipping man pages under /nix/store/lph5xarhqmmx4vf5w4bs5dakfkbk5yi7-mpv-0.27.0/share/man/
strip is /nix/store/5qj61lcvzlap87rf6blvf8p577d482bv-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/lph5xarhqmmx4vf5w4bs5dakfkbk5yi7-mpv-0.27.0/lib  /nix/store/lph5xarhqmmx4vf5w4bs5dakfkbk5yi7-mpv-0.27.0/bin 
patching script interpreter paths in /nix/store/lph5xarhqmmx4vf5w4bs5dakfkbk5yi7-mpv-0.27.0
checking for references to /tmp/nix-build-mpv-0.27.0.drv-0 in /nix/store/lph5xarhqmmx4vf5w4bs5dakfkbk5yi7-mpv-0.27.0...
/nix/store/lph5xarhqmmx4vf5w4bs5dakfkbk5yi7-mpv-0.27.0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@andir @GrahamcOfBorg