diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2020-01-02 15:19:30 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-02 15:19:30 +0000 |
| commit | 5338dd7ac8ba1884b80cd219ede0fee1495b3280 (patch) | |
| tree | b8e20842ecf3af5d28060e5a0748fd479938eb76 /pkgs/applications/virtualization | |
| parent | 143260e343db38f77936773698315e7a3f777ab6 (diff) | |
| parent | f5c0d150e7d3d4b6d6b37ebb70618eb9d8137996 (diff) | |
| download | nixpkgs-5338dd7ac8ba1884b80cd219ede0fee1495b3280.tar nixpkgs-5338dd7ac8ba1884b80cd219ede0fee1495b3280.tar.gz nixpkgs-5338dd7ac8ba1884b80cd219ede0fee1495b3280.tar.bz2 nixpkgs-5338dd7ac8ba1884b80cd219ede0fee1495b3280.tar.lz nixpkgs-5338dd7ac8ba1884b80cd219ede0fee1495b3280.tar.xz nixpkgs-5338dd7ac8ba1884b80cd219ede0fee1495b3280.tar.zst nixpkgs-5338dd7ac8ba1884b80cd219ede0fee1495b3280.zip | |
Merge pull request #76065 from risicle/ris-qemu-4.2.0
qemu: 4.1.0 -> 4.2.0, including patch for minor CVE-2019-15890
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/qemu/no-etc-install.patch | 11 |
2 files changed, 14 insertions, 8 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index f90873c6e33..67aa36b7827 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -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 { diff --git a/pkgs/applications/virtualization/qemu/no-etc-install.patch b/pkgs/applications/virtualization/qemu/no-etc-install.patch index 57e190f5ae7..5bab930d06a 100644 --- a/pkgs/applications/virtualization/qemu/no-etc-install.patch +++ b/pkgs/applications/virtualization/qemu/no-etc-install.patch @@ -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),) |