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

Merge pull request #105235 from mweinelt/x11vnc 

x11vnc: fix CVE-2020-29074
This commit is contained in:
Sandro 2020-11-28 21:29:13 +01:00 committed by GitHub
parent 747f3a1acf 1c414c565b
commit 0e76c846a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/X11/x11vnc/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, { stdenv, fetchFromGitHub, fetchpatch,
openssl, zlib, libjpeg, xorg, coreutils, libvncserver, openssl, zlib, libjpeg, xorg, coreutils, libvncserver,
autoreconfHook, pkgconfig }: autoreconfHook, pkgconfig }:
@ -13,6 +13,14 @@ stdenv.mkDerivation rec {
sha256 = "1g652mmi79pfq4p5p7spaswa164rpzjhc5rn2phy5pm71lm0vib1"; sha256 = "1g652mmi79pfq4p5p7spaswa164rpzjhc5rn2phy5pm71lm0vib1";
}; };
patches = [
(fetchpatch {
name = "CVE-2020-29074.patch";
url = "https://github.com/LibVNC/x11vnc/commit/69eeb9f7baa14ca03b16c9de821f9876def7a36a.patch";
sha256 = "0hdhp32g2i5m0ihmaxkxhsn3d5f2qasadvwpgxify4xnzabmyb2d";
})
];
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = buildInputs =