update tcpdump to 4.1.0, libpcap to 1.1.0
svn path=/nixpkgs/trunk/; revision=20938
This commit is contained in:
parent
155515f076
commit
f7ab7efff1
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, flex, bison }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libpcap-1.0.0";
|
||||
name = "libpcap-1.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.tcpdump.org/release/${name}.tar.gz";
|
||||
sha256 = "1h3kmj485qz1i08xs4sc3a0bmhs1rvq0h7gycs7paap2szhw8552";
|
||||
sha256 = "073hy17pvm203c0z3zpkp1b37sblcgf49c6a03az7kbniizbc07b";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ flex bison ];
|
||||
|
|
|
@ -1,17 +1,15 @@
|
|||
{ stdenv, fetchurl, libpcap, enableStatic ? false }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tcpdump-4.0.0";
|
||||
name = "tcpdump-4.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.tcpdump.org/release/${name}.tar.gz";
|
||||
sha256 = "112j0d12l5zsq56akn4n23i98pwblfb7qhblk567ddbl0bz9xsaz";
|
||||
sha256 = "1yhmz23cb0qx16nwnmyk2v7nnqai20lzcc4lx34v728qdpkmc1in";
|
||||
};
|
||||
|
||||
buildInputs = [ libpcap ];
|
||||
|
||||
patches = [ ./disable-ipv6.patch ];
|
||||
|
||||
crossAttrs = {
|
||||
LDFLAGS = if enableStatic then "-static" else "";
|
||||
configureFlags = [ "ac_cv_linux_vers=2" ] ++ (stdenv.lib.optional
|
||||
|
|
|
@ -1,17 +0,0 @@
|
|||
Needed for proper building with ipv6 disabled
|
||||
http://marc.info/?l=tcpdump-workers&m=122606195828825&w=2
|
||||
--- a/print-enc.c 2008-11-04 16:24:30 +0000
|
||||
+++ b/print-enc.c 2008-11-04 16:45:04 +0000
|
||||
@@ -77,9 +77,11 @@
|
||||
case AF_INET:
|
||||
ip_print(gndo, p, length);
|
||||
break;
|
||||
+#ifdef INET6
|
||||
case AF_INET6:
|
||||
ip6_print(p, length);
|
||||
break;
|
||||
+#endif /*INET6*/
|
||||
}
|
||||
|
||||
out:
|
||||
|
Loading…
Reference in a new issue