summary refs log tree commit diff
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2018-12-16 19:37:12 -0500
committerMario Rodas <marsam@users.noreply.github.com>2018-12-16 19:46:58 -0500
commit03fddb139eff8d83ad279c073029872ecf4cede4 (patch)
treecdc1d606640f010d9b40076071e9869a03c52194
parent9be286ecb7aea4751a8a853e7a561176c2f7c60f (diff)
downloadnixpkgs-03fddb139eff8d83ad279c073029872ecf4cede4.tar
nixpkgs-03fddb139eff8d83ad279c073029872ecf4cede4.tar.gz
nixpkgs-03fddb139eff8d83ad279c073029872ecf4cede4.tar.bz2
nixpkgs-03fddb139eff8d83ad279c073029872ecf4cede4.tar.lz
nixpkgs-03fddb139eff8d83ad279c073029872ecf4cede4.tar.xz
nixpkgs-03fddb139eff8d83ad279c073029872ecf4cede4.tar.zst
nixpkgs-03fddb139eff8d83ad279c073029872ecf4cede4.zip
libvncserver: add CVE-2018-7225 patch
-rw-r--r--pkgs/development/libraries/libvncserver/default.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix
index b325c9b246c..0a7819743e0 100644
--- a/pkgs/development/libraries/libvncserver/default.nix
+++ b/pkgs/development/libraries/libvncserver/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl,
+{stdenv, fetchurl, fetchpatch,
  libtool, libjpeg, openssl, zlib, libgcrypt, autoreconfHook, pkgconfig, libpng,
  systemd
 }:
@@ -18,6 +18,13 @@ stdenv.mkDerivation {
   src = fetchurl {
     inherit (s) url sha256;
   };
+  patches = [
+    # CVE-2018-7225. Remove with the next release
+    (fetchpatch {
+      url = https://salsa.debian.org/debian/libvncserver/raw/master/debian/patches/CVE-2018-7225.patch;
+      sha256 = "1hj1lzxsrdmzzl061vg0ncdpvfmvvkrpk8q12mp70qvszcqa7ja3";
+    })
+  ];
   preConfigure = ''
     sed -e 's@/usr/include/linux@${stdenv.cc.libc}/include/linux@g' -i configure
   '';