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

libvncserver: add CVE-2018-7225 patch
This commit is contained in:
Franz Pletz 2018-12-17 01:04:26 +00:00 committed by GitHub
commit 9ca654825f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, {stdenv, fetchurl, fetchpatch,
libtool, libjpeg, openssl, zlib, libgcrypt, autoreconfHook, pkgconfig, libpng, libtool, libjpeg, openssl, zlib, libgcrypt, autoreconfHook, pkgconfig, libpng,
systemd systemd
}: }:
@ -18,6 +18,13 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
inherit (s) url sha256; 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 = '' preConfigure = ''
sed -e 's@/usr/include/linux@${stdenv.cc.libc}/include/linux@g' -i configure sed -e 's@/usr/include/linux@${stdenv.cc.libc}/include/linux@g' -i configure
''; '';