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

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;

pkgs/development/libraries/libpcap/libpcap_amd64.patch

@@ -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);

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 ];