Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: 0a7673d2029ef69175b8e3ce41677965edde371b
https://github.com/NixOS/nixpkgs/commit/0a7673d2029ef69175b8e3ce41677965edde371b
Author: aszlig <[email protected]>
Date: 2017-03-11 (Sat, 11 Mar 2017)
Changed paths:
M pkgs/applications/virtualization/qemu/default.nix
M pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch
Log Message:
-----------
qemu_test: Rebase force-uid0-on-9p.patch
This reverts commit 3a4e2376e444fd7664102af00a34c65b47e271ec.
The reverted commit caused the fix for CVE-2016-9602 not to be applied
for qemu_test because it conflicts with the force-uid0-on-9p.patch.
So with the rebase of the patch on top of the changes of the
CVE-2016-9602.patch, both patches no longer conflict with each other.
I've tested this with the "misc" NixOS test and it succeeds.
Signed-off-by: aszlig <[email protected]>
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
