mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
Merge pull request #119005 from LeSuisse/tcpdump-4.9.99
tcpdump: 4.9.3 -> 4.99.0
This commit is contained in:
commit
7e736eb80c
1 changed files with 8 additions and 16 deletions
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue