public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #70249 from dtzWill/update/pcap-tcpdump-security-2019 

libpcap, tcpdump: 1.9.1 and 4.9.3 for many security fixes
This commit is contained in:
Will Dietz 2019-10-07 18:46:45 -05:00 committed by GitHub
parent 37e7f09f65 dd42253a40
commit 5935d5a45e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/libraries/libpcap/default.nix
View File

@ -1,11 +1,12 @@
{ stdenv, fetchurl, fetchpatch, flex, bison }: { stdenv, fetchurl, flex, bison }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libpcap-1.9.0"; pname = "libpcap";
version = "1.9.1";
src = fetchurl { src = fetchurl {
url = "https://www.tcpdump.org/release/${name}.tar.gz"; url = "https://www.tcpdump.org/release/${pname}-${version}.tar.gz";
sha256 = "06bhydl4vr4z9c3vahl76f2j96z1fbrcl7wwismgs4sris08inrf"; sha256 = "153h1378diqyc27jjgz6gg5nxmb4ddk006d9xg69nqavgiikflk3";
}; };
nativeBuildInputs = [ flex bison ]; nativeBuildInputs = [ flex bison ];
@ -27,15 +28,6 @@ stdenv.mkDerivation rec {
substituteInPlace configure --replace " -arch i386" "" substituteInPlace configure --replace " -arch i386" ""
''; '';
patches = [
# https://github.com/the-tcpdump-group/libpcap/pull/735
(fetchpatch {
name = "add-missing-limits-h-include-pr735.patch";
url = https://github.com/the-tcpdump-group/libpcap/commit/aafa3512b7b742f5e66a5543e41974cc5e7eebfa.patch;
sha256 = "05zb4hx9g24gx07bi02rprk2rn7fdc1ss3249dv5x36qkasnfhvf";
})
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://www.tcpdump.org; homepage = https://www.tcpdump.org;
description = "Packet Capture Library"; description = "Packet Capture Library";

15
pkgs/tools/networking/tcpdump/default.nix
View File

@ -1,20 +1,13 @@
{ stdenv, fetchurl, libpcap, perl }: { stdenv, fetchurl, libpcap, perl }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
pname = "tcpdump"; pname = "tcpdump";
version = "4.9.2"; version = "4.9.3";
# leaked embargoed security update
src = fetchurl { src = fetchurl {
url = "https://src.fedoraproject.org/lookaside/pkgs/tcpdump/tcpdump-4.9.2.tar.gz/sha512/e1bc19a5867d6e3628f3941bdf3ec831bf13784f1233ca1bccc46aac1702f47ee9357d7ff0ca62cddf211b3c8884488c21144cabddd92c861e32398cd8f7c44b/tcpdump-4.9.2.tar.gz"; url = "http://www.tcpdump.org/release/${pname}-${version}.tar.gz";
sha256 = "0ygy0layzqaj838r5xd613iraz09wlfgpyh7pc6cwclql8v3b2vr"; sha256 = "0434vdcnbqaia672rggjzdn4bb8p8dchz559yiszzdk0sjrprm1c";
}; };
# src = fetchFromGitHub rec {
# owner = "the-tcpdump-group";
# repo = "tcpdump";
# rev = "${repo}-${version}";
# sha256 = "1vzrvn1q7x28h18yskqc390y357pzpg5xd3pzzj4xz3llnvsr64p";
# };
postPatch = '' postPatch = ''
patchShebangs tests patchShebangs tests