Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 37e7f09f654d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5935d5a45e53
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 7, 2019

  1. libpcap: 1.9.0 -> 1.9.1 (security!) 

    http://www.tcpdump.org/libpcap-changes.txt

> Five CVE-2019-15161, CVE-2019-15162, CVE-2019-15163, CVE-2019-15164, CVE-2019-15165
> Fixes for CVE-2018-16301,

Drop the included patch as well.
    @dtzWill
    dtzWill committed Oct 7, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dtzWill Will Dietz
    GPG key ID: EBB0EA4124809D02
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4db088d View commit details

  2. tcpdump: 4.9.2 -> 4.9.3 (security!) 

    So many CVE's, see:

http://www.tcpdump.org/tcpdump-changes.txt
    @dtzWill
    dtzWill committed Oct 7, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dtzWill Will Dietz
    GPG key ID: EBB0EA4124809D02
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    dd42253 View commit details

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

    libpcap, tcpdump: 1.9.1 and 4.9.3 for many security fixes
    @dtzWill
    dtzWill authored Oct 7, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5935d5a View commit details
Showing with 9 additions and 24 deletions.
  1. +5 −13 pkgs/development/libraries/libpcap/default.nix
  2. +4 −11 pkgs/tools/networking/tcpdump/default.nix
18 changes: 5 additions & 13 deletions pkgs/development/libraries/libpcap/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, fetchpatch, flex, bison }:
{ stdenv, fetchurl, flex, bison }:

stdenv.mkDerivation rec {
name = "libpcap-1.9.0";
pname = "libpcap";
version = "1.9.1";

src = fetchurl {
url = "https://www.tcpdump.org/release/${name}.tar.gz";
sha256 = "06bhydl4vr4z9c3vahl76f2j96z1fbrcl7wwismgs4sris08inrf";
url = "https://www.tcpdump.org/release/${pname}-${version}.tar.gz";
sha256 = "153h1378diqyc27jjgz6gg5nxmb4ddk006d9xg69nqavgiikflk3";
};

nativeBuildInputs = [ flex bison ];
@@ -27,15 +28,6 @@ stdenv.mkDerivation rec {
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; {
homepage = https://www.tcpdump.org;
description = "Packet Capture Library";
15 changes: 4 additions & 11 deletions pkgs/tools/networking/tcpdump/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
{ stdenv, fetchurl, libpcap, perl }:

stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "tcpdump";
version = "4.9.2";
version = "4.9.3";

# leaked embargoed security update
src = fetchurl {
url = "https://src.fedoraproject.org/lookaside/pkgs/tcpdump/tcpdump-4.9.2.tar.gz/sha512/e1bc19a5867d6e3628f3941bdf3ec831bf13784f1233ca1bccc46aac1702f47ee9357d7ff0ca62cddf211b3c8884488c21144cabddd92c861e32398cd8f7c44b/tcpdump-4.9.2.tar.gz";
sha256 = "0ygy0layzqaj838r5xd613iraz09wlfgpyh7pc6cwclql8v3b2vr";
url = "http://www.tcpdump.org/release/${pname}-${version}.tar.gz";
sha256 = "0434vdcnbqaia672rggjzdn4bb8p8dchz559yiszzdk0sjrprm1c";
};
# src = fetchFromGitHub rec {
# owner = "the-tcpdump-group";
# repo = "tcpdump";
# rev = "${repo}-${version}";
# sha256 = "1vzrvn1q7x28h18yskqc390y357pzpg5xd3pzzj4xz3llnvsr64p";
# };

postPatch = ''
patchShebangs tests