tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

Merge pull request #52414 from marsam/libvncserver-cve-patch

libvncserver: add CVE-2018-7225 patch

authored by

Franz Pletz and committed by
GitHub 9ca65482 b439f903

+8 -1
unified split
+8 -1
pkgs/development/libraries/libvncserver/default.nix
··· 1 - {stdenv, fetchurl, 2 libtool, libjpeg, openssl, zlib, libgcrypt, autoreconfHook, pkgconfig, libpng, 3 systemd 4 }: ··· 18 src = fetchurl { 19 inherit (s) url sha256; 20 }; 21 preConfigure = '' 22 sed -e 's@/usr/include/linux@${stdenv.cc.libc}/include/linux@g' -i configure 23 '';
··· 1 + {stdenv, fetchurl, fetchpatch, 2 libtool, libjpeg, openssl, zlib, libgcrypt, autoreconfHook, pkgconfig, libpng, 3 systemd 4 }: ··· 18 src = fetchurl { 19 inherit (s) url sha256; 20 }; 21 + patches = [ 22 + # CVE-2018-7225. Remove with the next release 23 + (fetchpatch { 24 + url = https://salsa.debian.org/debian/libvncserver/raw/master/debian/patches/CVE-2018-7225.patch; 25 + sha256 = "1hj1lzxsrdmzzl061vg0ncdpvfmvvkrpk8q12mp70qvszcqa7ja3"; 26 + }) 27 + ]; 28 preConfigure = '' 29 sed -e 's@/usr/include/linux@${stdenv.cc.libc}/include/linux@g' -i configure 30 '';