diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2020-11-28 21:29:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-28 21:29:13 +0100 |
| commit | 0e76c846a83c14ca7d89367dd5b1f973ca3f4f50 (patch) | |
| tree | 17a289f9e38fb5647088efb281ab6b47221370a1 /pkgs/tools/X11 | |
| parent | 747f3a1acf1e45ba2bb7823fa2adbfd821446b6a (diff) | |
| parent | 1c414c565baeac77a81d781a51e1f3b34de5fc04 (diff) | |
| download | nixlib-0e76c846a83c14ca7d89367dd5b1f973ca3f4f50.tar nixlib-0e76c846a83c14ca7d89367dd5b1f973ca3f4f50.tar.gz nixlib-0e76c846a83c14ca7d89367dd5b1f973ca3f4f50.tar.bz2 nixlib-0e76c846a83c14ca7d89367dd5b1f973ca3f4f50.tar.lz nixlib-0e76c846a83c14ca7d89367dd5b1f973ca3f4f50.tar.xz nixlib-0e76c846a83c14ca7d89367dd5b1f973ca3f4f50.tar.zst nixlib-0e76c846a83c14ca7d89367dd5b1f973ca3f4f50.zip | |
Merge pull request #105235 from mweinelt/x11vnc
x11vnc: fix CVE-2020-29074
Diffstat (limited to 'pkgs/tools/X11')
| -rw-r--r-- | pkgs/tools/X11/x11vnc/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index 2f7b0d7697e5..5ed827b5a546 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, +{ stdenv, fetchFromGitHub, fetchpatch, openssl, zlib, libjpeg, xorg, coreutils, libvncserver, autoreconfHook, pkgconfig }: @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { sha256 = "1g652mmi79pfq4p5p7spaswa164rpzjhc5rn2phy5pm71lm0vib1"; }; + patches = [ + (fetchpatch { + name = "CVE-2020-29074.patch"; + url = "https://github.com/LibVNC/x11vnc/commit/69eeb9f7baa14ca03b16c9de821f9876def7a36a.patch"; + sha256 = "0hdhp32g2i5m0ihmaxkxhsn3d5f2qasadvwpgxify4xnzabmyb2d"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = |