diff options
| author | Armijn Hemel <armijn@gpl-violations.org> | 2010-04-04 14:57:26 +0000 |
|---|---|---|
| committer | Armijn Hemel <armijn@gpl-violations.org> | 2010-04-04 14:57:26 +0000 |
| commit | f7ab7efff1cf9bf01330075e0c1058fdef5fbb75 (patch) | |
| tree | ff76574c3ffbd86771b68f8531422824bbe036a7 /pkgs | |
| parent | 155515f0767a8cb824441779e4c98275fa7f5d61 (diff) | |
| download | nixlib-f7ab7efff1cf9bf01330075e0c1058fdef5fbb75.tar nixlib-f7ab7efff1cf9bf01330075e0c1058fdef5fbb75.tar.gz nixlib-f7ab7efff1cf9bf01330075e0c1058fdef5fbb75.tar.bz2 nixlib-f7ab7efff1cf9bf01330075e0c1058fdef5fbb75.tar.lz nixlib-f7ab7efff1cf9bf01330075e0c1058fdef5fbb75.tar.xz nixlib-f7ab7efff1cf9bf01330075e0c1058fdef5fbb75.tar.zst nixlib-f7ab7efff1cf9bf01330075e0c1058fdef5fbb75.zip | |
update tcpdump to 4.1.0, libpcap to 1.1.0
svn path=/nixpkgs/trunk/; revision=20938
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/libpcap/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/tcpdump/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/networking/tcpdump/disable-ipv6.patch | 17 |
3 files changed, 4 insertions, 23 deletions
diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 0b91460e8e3f..0c20c44ef908 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.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 ]; diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 939bc400eae7..640b305591e2 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -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 diff --git a/pkgs/tools/networking/tcpdump/disable-ipv6.patch b/pkgs/tools/networking/tcpdump/disable-ipv6.patch deleted file mode 100644 index 0c869369faad..000000000000 --- a/pkgs/tools/networking/tcpdump/disable-ipv6.patch +++ /dev/null @@ -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: - |