diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-03-20 14:37:22 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-03-20 14:43:15 +0100 |
| commit | 7b27e1c3c9b3069239b11f8c62f8ef6e95a4fb48 (patch) | |
| tree | 3fe383967b3875b942b0d57ee1aa9f03ee7d37b4 /pkgs/applications/networking/sniffers | |
| parent | f9e8ef7e6d8b9df759a9cb6f7a1c3218684331ee (diff) | |
| download | nixlib-7b27e1c3c9b3069239b11f8c62f8ef6e95a4fb48.tar nixlib-7b27e1c3c9b3069239b11f8c62f8ef6e95a4fb48.tar.gz nixlib-7b27e1c3c9b3069239b11f8c62f8ef6e95a4fb48.tar.bz2 nixlib-7b27e1c3c9b3069239b11f8c62f8ef6e95a4fb48.tar.lz nixlib-7b27e1c3c9b3069239b11f8c62f8ef6e95a4fb48.tar.xz nixlib-7b27e1c3c9b3069239b11f8c62f8ef6e95a4fb48.tar.zst nixlib-7b27e1c3c9b3069239b11f8c62f8ef6e95a4fb48.zip | |
wireshark: 2.2.4 -> 2.2.5 for multiple CVEs
Fixes: * CVE-2017-5596 * CVE-2017-5597 * CVE-2017-6467 * CVE-2017-6468 * CVE-2017-6469 * CVE-2017-6470 * CVE-2017-6471 * CVE-2017-6472 * CVE-2017-6473 * CVE-2017-6474
Diffstat (limited to 'pkgs/applications/networking/sniffers')
| -rw-r--r-- | pkgs/applications/networking/sniffers/wireshark/default.nix | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 375a948c1f20..c8880e630a6d 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt5 != null; with stdenv.lib; let - version = "2.2.4"; + version = "2.2.5"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.bz2"; - sha256 = "049r5962yrajhhz9r4dsnx403dab50d6091y2mw298ymxqszp9s2"; + sha256 = "1j4sc3pmy8l6k41007spglcqiabjlzc7f85pn3jmjr9ksv9qipbm"; }; nativeBuildInputs = [ @@ -35,13 +35,7 @@ in stdenv.mkDerivation { ++ optionals stdenv.isLinux [ libcap libnl ] ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]; - 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"; - }) - ]; + patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]; postInstall = optionalString (withQt || withGtk) '' ${optionalString withGtk '' |