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 (cherry picked from commit 7b27e1c)
NixOS · Mar 20, 2017 · 6db771b · 6db771b
1 parent fe5da11
commit 6db771b
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -12,15 +12,15 @@ 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 {
   name = "wireshark-${variant}-${version}";
 
   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 ''