summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2016-10-26 10:40:43 +0200
committerJeroen Roovers <jer@gentoo.org>2016-10-26 11:04:03 +0200
commit1a038df6df11743fe6ff4eaad6c029c974949ea2 (patch)
tree63020c4b4f0d916fa313fc11814a43947cf8837b /net-libs/libpcap/files
parentkde-misc/colord-kde: version bump (diff)
downloadgentoo-1a038df6df11743fe6ff4eaad6c029c974949ea2.tar.gz
gentoo-1a038df6df11743fe6ff4eaad6c029c974949ea2.tar.bz2
gentoo-1a038df6df11743fe6ff4eaad6c029c974949ea2.zip
net-libs/libpcap: Version bump.
Package-Manager: portage-2.3.2
Diffstat (limited to 'net-libs/libpcap/files')
-rw-r--r--net-libs/libpcap/files/libpcap-1.8.1-cross-compile.patch16
-rw-r--r--net-libs/libpcap/files/libpcap-1.8.1-darwin.patch15
-rw-r--r--net-libs/libpcap/files/libpcap-1.8.1-libnl.patch22
3 files changed, 53 insertions, 0 deletions
diff --git a/net-libs/libpcap/files/libpcap-1.8.1-cross-compile.patch b/net-libs/libpcap/files/libpcap-1.8.1-cross-compile.patch
new file mode 100644
index 000000000000..361cdeb5ec50
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.8.1-cross-compile.patch
@@ -0,0 +1,16 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -291,7 +291,12 @@
+ dnl XXX This could be done for cross-compiling, but for now it's not.
+ dnl
+ if test -z "$with_pcap" && test "$cross_compiling" = yes; then
+- AC_MSG_ERROR(pcap type not determined when cross-compiling; use --with-pcap=...)
++ if test -z "$with_pcap" ; then
++ case $host in
++ *-linux*) with_pcap="linux";;
++ *) AC_MSG_ERROR(pcap type not determined when cross-compiling; use --with-pcap=...);;
++ esac
++ fi
+ fi
+ AC_ARG_WITH(pcap,
+ AC_HELP_STRING([--with-pcap=TYPE],[use packet capture TYPE]))
diff --git a/net-libs/libpcap/files/libpcap-1.8.1-darwin.patch b/net-libs/libpcap/files/libpcap-1.8.1-darwin.patch
new file mode 100644
index 000000000000..650bea82518a
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.8.1-darwin.patch
@@ -0,0 +1,15 @@
+Prefix' Darwin systems are single arch, hijack Darwin7 case which assumes this setup
+Check for bluetooth/mgmt.h before use
+
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1117,7 +1117,7 @@
+ if test "$enable_universal" != "no"; then
+ case "$host_os" in
+
+- darwin[0-7].*)
++ darwin**)
+ #
+ # Pre-Tiger. Build only for 32-bit PowerPC; no
+ # need for any special compiler or linker flags.
diff --git a/net-libs/libpcap/files/libpcap-1.8.1-libnl.patch b/net-libs/libpcap/files/libpcap-1.8.1-libnl.patch
new file mode 100644
index 000000000000..61dfc4e201d9
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.8.1-libnl.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -453,10 +453,6 @@
+
+ incdir=-I/usr/include/libnl3
+ libnldir=
+- if test x$withval != x ; then
+- libnldir=-L${withval}/lib/.libs
+- incdir=-I${withval}/include
+- fi
+
+ #
+ # Try libnl 3.x first.
+@@ -471,7 +467,7 @@
+ AC_DEFINE(HAVE_LIBNL_3_x,1,[if libnl exists and is version 3.x])
+ AC_DEFINE(HAVE_LIBNL_NLE,1,[libnl has NLE_FAILURE])
+ AC_DEFINE(HAVE_LIBNL_SOCKETS,1,[libnl has new-style socket api])
+- V_INCLS="$V_INCLS ${incdir}"
++ V_INCLS="${incdir} $V_INCLS"
+ have_any_nl="yes"
+ ],[], ${incdir} ${libnldir} -lnl-genl-3 -lnl-3 )
+