Commit 3256bcaf authored by Lionel Landwerlin's avatar Lionel Landwerlin Committed by Peter Korsgaard
Browse files

libpcap: bump to 1.1.1



This new release avoids problems when running autoreconf.

Signed-off-by: default avatarLionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent c58027b5
Loading
Loading
Loading
Loading
+0 −26
Original line number Diff line number Diff line
[PATCH]: pcap-linux: fix build with wireless support

Based on ba23aa7b upstream.

linux/wireless.h includes linux/if.h, which conflicts with net/if.h as
they both define if* structures. Fix build by simply using linux/if.h
instead of net/if.h.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 pcap-linux.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: libpcap-1.0.0/pcap-linux.c
===================================================================
--- libpcap-1.0.0.orig/pcap-linux.c
+++ libpcap-1.0.0/pcap-linux.c
@@ -93,7 +93,7 @@ static const char rcsid[] _U_ =
 #include <sys/ioctl.h>
 #include <sys/utsname.h>
 #include <sys/mman.h>
-#include <net/if.h>
+#include <linux/if.h>
 #include <netinet/in.h>
 #include <linux/if_ether.h>
 #include <net/if_arp.h>
+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
#
#############################################################

LIBPCAP_VERSION:=1.0.0
LIBPCAP_VERSION:=1.1.1
LIBPCAP_SITE:=http://www.tcpdump.org/release
LIBPCAP_SOURCE:=libpcap-$(LIBPCAP_VERSION).tar.gz
LIBPCAP_INSTALL_STAGING:=YES