summary refs log tree commit diff
diff options
context:
space:
mode:
authorThomas Gerbet <thomas@gerbet.me>2021-04-10 12:39:25 +0200
committerThomas Gerbet <thomas@gerbet.me>2021-04-11 09:39:59 +0200
commitda55ee488f735b1ea2cbaa3a85b770a7e3b3daff (patch)
tree2b09af8d2879e164ecf42bd9e9f0d8e53139f912
parentecd2d63dfded6ebe8020143d59c130d2939c42d0 (diff)
downloadnixpkgs-da55ee488f735b1ea2cbaa3a85b770a7e3b3daff.tar
nixpkgs-da55ee488f735b1ea2cbaa3a85b770a7e3b3daff.tar.gz
nixpkgs-da55ee488f735b1ea2cbaa3a85b770a7e3b3daff.tar.bz2
nixpkgs-da55ee488f735b1ea2cbaa3a85b770a7e3b3daff.tar.lz
nixpkgs-da55ee488f735b1ea2cbaa3a85b770a7e3b3daff.tar.xz
nixpkgs-da55ee488f735b1ea2cbaa3a85b770a7e3b3daff.tar.zst
nixpkgs-da55ee488f735b1ea2cbaa3a85b770a7e3b3daff.zip
tcpdump: 4.9.3 -> 4.99.0
Changelog:
https://www.tcpdump.org/tcpdump-changes.txt
-rw-r--r--pkgs/tools/networking/tcpdump/default.nix24
1 files changed, 8 insertions, 16 deletions
diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix
index 71c435df0c5..f1fe0527639 100644
--- a/pkgs/tools/networking/tcpdump/default.nix
+++ b/pkgs/tools/networking/tcpdump/default.nix
@@ -1,22 +1,14 @@
-{ lib, stdenv, fetchurl, libpcap, perl, fetchpatch }:
+{ lib, stdenv, fetchurl, libpcap, perl }:
 
 stdenv.mkDerivation rec {
   pname = "tcpdump";
-  version = "4.9.3";
+  version = "4.99.0";
 
   src = fetchurl {
     url = "http://www.tcpdump.org/release/${pname}-${version}.tar.gz";
-    sha256 = "0434vdcnbqaia672rggjzdn4bb8p8dchz559yiszzdk0sjrprm1c";
+    sha256 = "0hmqh2fx8rgs9v1mk3vpywj61xvkifz260q685xllxr8jmxg3wlc";
   };
 
-  patches = [
-    # Patch for CVE-2020-8037
-    (fetchpatch {
-      url = "https://github.com/the-tcpdump-group/tcpdump/commit/32027e199368dad9508965aae8cd8de5b6ab5231.patch";
-      sha256 = "sha256-bO3aV032ru9+M/9isBRjmH8jTZLKj9Zf9ha2rmOaZwc=";
-    })
-  ];
-
   postPatch = ''
     patchShebangs tests
   '';
@@ -29,11 +21,11 @@ stdenv.mkDerivation rec {
     (stdenv.hostPlatform != stdenv.buildPlatform)
     "ac_cv_linux_vers=2";
 
-  meta = {
+  meta = with lib; {
     description = "Network sniffer";
-    homepage = "http://www.tcpdump.org/";
-    license = "BSD-style";
-    maintainers = with lib.maintainers; [ globin ];
-    platforms = lib.platforms.unix;
+    homepage = "https://www.tcpdump.org/";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ globin ];
+    platforms = platforms.unix;
   };
 }