diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2017-02-22 14:16:35 +0100 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2017-02-22 14:17:02 +0100 |
| commit | 194d137bd3646b8e73901d5c01ee4e90d3dcf2a4 (patch) | |
| tree | 48089f9355bb3a901f8c54b96803d754aad5990f /pkgs/applications/networking/sniffers | |
| parent | a8bf87681cfbbbe285facc4972baf89979f8cf81 (diff) | |
wireshark: patch for CVE-2017-6041
Diffstat (limited to 'pkgs/applications/networking/sniffers')
| -rw-r--r-- | pkgs/applications/networking/sniffers/wireshark/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index d3c3b27860707..7315b84d7f377 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -31,7 +31,13 @@ in stdenv.mkDerivation { ++ optionals stdenv.isLinux [ libcap libnl ] ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]; - patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]; + patches = [ ./wireshark-lookup-dumpcap-in-path.patch + (fetchurl { + url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commitdiff_plain;h=c7042bedbb3b12c5f4e19e59e52da370d4ffe62f;hp=bc2b135677110d8065ba1174f09bc7f5ba73b9e9"; + sha256 = "1m70akywf2r52lhlvzr720vl1i7ng9cqbzaiif8s81xs4g4nn2rz"; + name = "wireshark-CVE-2017-6014.patch"; + }) + ]; postInstall = optionalString (withQt || withGtk) '' ${optionalString withGtk '' |