public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #91516 from wamserma/bump-libvncserver

Browse Source 
libvncserver: 0.9.12 -> 0.9.13 (security)
This commit is contained in:
Michael Raskin 2020-06-27 06:58:41 +00:00 committed by GitHub
commit e93a63bd30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/libraries/libvncserver/default.nix
View File

@ -7,9 +7,9 @@ let
s = # Generated upstream information s = # Generated upstream information
rec { rec {
pname = "libvncserver"; pname = "libvncserver";
version = "0.9.12"; version = "0.9.13";
url = "https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${version}.tar.gz"; url = "https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${version}.tar.gz";
sha256 = "1226hb179l914919f5nm2mlf8rhaarqbf48aa649p4rwmghyx9vm"; # unpacked archive checksum sha256 = "0zz0hslw8b1p3crnfy3xnmrljik359h83dpk64s697dqdcrzy141"; # unpacked archive checksum
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -17,18 +17,7 @@ stdenv.mkDerivation {
src = fetchzip { src = fetchzip {
inherit (s) url sha256; inherit (s) url sha256;
}; };
patches = [
(fetchpatch {
name = "CVE-2018-20750.patch";
url = "https://github.com/LibVNC/libvncserver/commit/09e8fc02f59f16e2583b34fe1a270c238bd9ffec.patch";
sha256 = "004h50786nvjl3y3yazpsi2b767vc9gqrwm1ralj3zgy47kwfhqm";
})
(fetchpatch {
name = "CVE-2019-15681.patch";
url = "https://github.com/LibVNC/libvncserver/commit/d01e1bb4246323ba6fcee3b82ef1faa9b1dac82a.patch";
sha256 = "0hf0ss7all2m50z2kan4mck51ws44yim4ymn8p0d991y465y6l9s";
})
];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ buildInputs = [
libjpeg openssl libgcrypt libpng libjpeg openssl libgcrypt libpng