From 446b01489a217d9a6e370a59edb9d85cc39a8bd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 11 Mar 2012 19:37:49 +0000
Subject: [PATCH] Updating tcpdump and libpcap. I also remove a patch of
 libpcap I don't know what's for. It builds and runs equally for me with or
 without it. I couldn't find notes in svn log about it.

svn path=/nixpkgs/trunk/; revision=32996
---
 .../development/libraries/libpcap/default.nix |  6 ++---
 .../libraries/libpcap/libpcap_amd64.patch     | 26 -------------------
 pkgs/tools/networking/tcpdump/default.nix     |  4 +--
 3 files changed, 4 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/development/libraries/libpcap/libpcap_amd64.patch

diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix
index c6446ab27a54..8f786469a555 100644
--- a/pkgs/development/libraries/libpcap/default.nix
+++ b/pkgs/development/libraries/libpcap/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, flex, bison }:
 
 stdenv.mkDerivation rec {
-  name = "libpcap-1.1.1";
+  name = "libpcap-1.2.1";
   
   src = fetchurl {
     url = "http://www.tcpdump.org/release/${name}.tar.gz";
-    sha256 = "11asds0r0vd9skbwfbgb1d2hqxr1d92kif4qhhqx2mbyahawm32h";
+    sha256 = "1gfy00zv6blplw3405q46khmjhdnp6ylblvygjjjk5skgvpscdd1";
   };
   
   buildNativeInputs = [ flex bison ];
@@ -14,8 +14,6 @@ stdenv.mkDerivation rec {
 
   preInstall = ''mkdir -p $out/bin'';
   
-  patches = [ ./libpcap_amd64.patch ];
-
   crossAttrs = {
     # Stripping hurts in static libraries
     dontStrip = true;
diff --git a/pkgs/development/libraries/libpcap/libpcap_amd64.patch b/pkgs/development/libraries/libpcap/libpcap_amd64.patch
deleted file mode 100644
index 6b563e15d2d5..000000000000
--- a/pkgs/development/libraries/libpcap/libpcap_amd64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/pcap.c b/pcap.c
-index 010ef74..0bfb191 100644
---- a/pcap.c
-+++ b/pcap.c
-@@ -211,7 +211,7 @@ pcap_set_buffer_size(pcap_t *p, int buffer_size)
- 	return 0;
- }
- 
--int
-+pcap_t *
- pcap_activate(pcap_t *p)
- {
- 	int status;
-diff --git a/pcap/pcap.h b/pcap/pcap.h
-index ea18edc..3910a2d 100644
---- a/pcap/pcap.h
-+++ b/pcap/pcap.h
-@@ -263,7 +263,7 @@ int	pcap_can_set_rfmon(pcap_t *);
- int	pcap_set_rfmon(pcap_t *, int);
- int	pcap_set_timeout(pcap_t *, int);
- int	pcap_set_buffer_size(pcap_t *, int);
--int	pcap_activate(pcap_t *);
-+pcap_t	*pcap_activate(pcap_t *);
- 
- pcap_t	*pcap_open_live(const char *, int, int, int, char *);
- pcap_t	*pcap_open_dead(int, int);
diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix
index e9e55f48beec..b4b96a549e14 100644
--- a/pkgs/tools/networking/tcpdump/default.nix
+++ b/pkgs/tools/networking/tcpdump/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpcap, enableStatic ? false }:
 
 stdenv.mkDerivation rec {
-  name = "tcpdump-4.1.1";
+  name = "tcpdump-4.2.1";
 
   src = fetchurl {
     url = "http://www.tcpdump.org/release/${name}.tar.gz";
-    sha256 = "02kz3sghpg16p26dhid8ma67pxil8x5jqdd83fvdnypcc6ylpkg6";
+    sha256 = "1zwv9zp169dwqwwwi6lfd3fhiayiq81ijqmwi0pfdvw63skfjmsl";
   };
 
   buildInputs = [ libpcap ];