diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-03-11 19:37:49 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-03-11 19:37:49 +0000 |
commit | 446b01489a217d9a6e370a59edb9d85cc39a8bd0 (patch) | |
tree | df70578a941f678fb7cfb2b56ebee1968486370f /pkgs/development/libraries/libpcap | |
parent | 0752b1e3d722c768f1ea8a968dd8fc43f5990557 (diff) | |
download | nixlib-446b01489a217d9a6e370a59edb9d85cc39a8bd0.tar nixlib-446b01489a217d9a6e370a59edb9d85cc39a8bd0.tar.gz nixlib-446b01489a217d9a6e370a59edb9d85cc39a8bd0.tar.bz2 nixlib-446b01489a217d9a6e370a59edb9d85cc39a8bd0.tar.lz nixlib-446b01489a217d9a6e370a59edb9d85cc39a8bd0.tar.xz nixlib-446b01489a217d9a6e370a59edb9d85cc39a8bd0.tar.zst nixlib-446b01489a217d9a6e370a59edb9d85cc39a8bd0.zip |
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
Diffstat (limited to 'pkgs/development/libraries/libpcap')
-rw-r--r-- | pkgs/development/libraries/libpcap/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/libpcap/libpcap_amd64.patch | 26 |
2 files changed, 2 insertions, 30 deletions
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); |