ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-17 06:06:13 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #76065 from risicle/ris-qemu-4.2.0

Browse Source 
qemu: 4.1.0 -> 4.2.0, including patch for minor CVE-2019-15890
This commit is contained in:
Franz Pletz 2020-01-02 15:19:30 +00:00 committed by GitHub
commit 5338dd7ac8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/virtualization/qemu/default.nix
View File

@ -35,7 +35,7 @@ let
in
stdenv.mkDerivation rec {
version = "4.1.0";
version = "4.2.0";
pname = "qemu"
+ stdenv.lib.optionalString xenSupport "-xen"
+ stdenv.lib.optionalString hostCpuOnly "-host-cpu-only"
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://wiki.qemu.org/download/qemu-${version}.tar.bz2";
sha256 = "1bpl6hwiw1jdxk4xmqp10qgki0dji0l2rzr10dyhyk8d85vxxw29";
sha256 = "1gczv8hn3wqci86css3mhzrppp3z8vppxw25l08j589k6bvz7x1w";
};
nativeBuildInputs = [ python python.pkgs.sphinx pkgconfig flex bison ];
@ -77,6 +77,13 @@ stdenv.mkDerivation rec {
./no-etc-install.patch
./fix-qemu-ga.patch
./9p-ignore-noatime.patch
(fetchpatch {
name = "CVE-2019-15890.patch";
url = "https://git.qemu.org/?p=libslirp.git;a=patch;h=c59279437eda91841b9d26079c70b8a540d41204";
sha256 = "1q2rc67mfdz034mk81z9bw105x9zad7n954sy3kq068b1svrf7iy";
stripLen = 1;
extraPrefix = "slirp/";
})
] ++ optional nixosTestRunner ./force-uid0-on-9p.patch
++ optionals stdenv.hostPlatform.isMusl [
(fetchpatch {

11
pkgs/applications/virtualization/qemu/no-etc-install.patch
View File

@ -1,13 +1,12 @@
diff --git a/Makefile b/Makefile
index 85862fb8..ed52c5ec 100644
--- a/Makefile
+++ b/Makefile
@@ -841,7 +841,7 @@ endif
@@ -867,7 +867,7 @@ install-includedir:
$(INSTALL_DIR) "$(DESTDIR)$(includedir)"
ICON_SIZES=16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512
-install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstatedir \
+install: all $(if $(BUILD_DOCS),install-doc) install-datadir \
install: all $(if $(BUILD_DOCS),install-doc) \
- install-datadir install-localstatedir install-includedir \
+ install-datadir install-includedir \
$(if $(INSTALL_BLOBS),$(edk2-decompressed)) \
recurse-install
ifneq ($(TOOLS),)