summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/libpcap
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2013-06-05 15:09:07 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-07 15:48:29 (GMT)
commit03fdd2c26ca90334f8a11cee3b35adf76d88caa1 (patch)
tree3f9e66088599d98d7fedc7e3b88a796351fc8ee6 /meta/recipes-connectivity/libpcap
parentd3e982a6c49e1df631b6326710b216f23dca221c (diff)
downloadpoky-03fdd2c26ca90334f8a11cee3b35adf76d88caa1.tar.gz
libpcap: upgrade to 1.4.0
0001-Fix-disable-canusb.patch, 0001-The-leading-comma-looked-weird-remove-it.patch, 0001-canusb-needs-lpthread.patch patches included in upstream, no longer needed. (From OE-Core rev: 329e73e56b227c5c9fb00e2201fdf1099607b473) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/libpcap')
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-Fix-disable-canusb.patch30
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-The-leading-comma-looked-weird-remove-it.patch54
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-canusb-needs-lpthread.patch32
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap/aclocal.patch (renamed from meta/recipes-connectivity/libpcap/libpcap-1.3.0/aclocal.patch)0
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap/ieee80215-arphrd.patch (renamed from meta/recipes-connectivity/libpcap/libpcap-1.3.0/ieee80215-arphrd.patch)0
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap_1.4.0.bb (renamed from meta/recipes-connectivity/libpcap/libpcap_1.3.0.bb)13
6 files changed, 8 insertions, 121 deletions
diff --git a/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-Fix-disable-canusb.patch b/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-Fix-disable-canusb.patch
deleted file mode 100644
index 1e5e287..0000000
--- a/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-Fix-disable-canusb.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1Upstream-Status: Backport
2
3From ccf671f5b7fbbef53d9cfd3091229b0b2a25159d Mon Sep 17 00:00:00 2001
4From: Edward Sheldrake <ejs1920@sourceforge.net>
5Date: Wed, 13 Jun 2012 12:09:21 -0700
6Subject: [PATCH] Fix --disable-canusb.
7
8Reviewed-By: Guy Harris <guy@alum.mit.edu>
9
10sgw - Removed configure part of the patch since it could change
11Signed-off-by: Saul Wold <sgw@linux.intel.com>
12---
13 config.h.in | 3 -
14 configure |10672 ++++++++++++++++++++++++++++++++++++++++------------------
15 3 files changed, 7308 insertions(+), 3369 deletions(-)
16
17diff --git a/config.h.in b/config.h.in
18index bd5177c..aed5c37 100644
19--- a/config.h.in
20+++ b/config.h.in
21@@ -232,9 +232,6 @@
22 /* Define to the one symbol short name of this package. */
23 #undef PACKAGE_TARNAME
24
25-/* Define to the home page for this package. */
26-#undef PACKAGE_URL
27-
28 /* Define to the version of this package. */
29 #undef PACKAGE_VERSION
30
diff --git a/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-The-leading-comma-looked-weird-remove-it.patch b/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-The-leading-comma-looked-weird-remove-it.patch
deleted file mode 100644
index e077a29..0000000
--- a/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-The-leading-comma-looked-weird-remove-it.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1Upstream-Status: Backport
2
3From fffa60a0693182085a7d4351150137eda26dbf82 Mon Sep 17 00:00:00 2001
4From: Guy Harris <guy@alum.mit.edu>
5Date: Wed, 13 Jun 2012 12:20:19 -0700
6Subject: [PATCH] The leading comma looked weird; remove it.
7
8That might be how the --disable-canusb bug got in. Hopefully this will
9make the code look a little clearer and possibly avoid future bugs of
10that sort.
11
12sgw - Cleaned up the patch based on another patch
13Signed-off-by: Saul Wold <sgw@linux.intel.com>
14---
15 configure.in | 9 ++++++---
16 1 file changed, 6 insertions(+), 3 deletions(-)
17
18Index: libpcap-1.3.0/configure.in
19===================================================================
20--- libpcap-1.3.0.orig/configure.in
21+++ libpcap-1.3.0/configure.in
22@@ -1371,7 +1371,8 @@ AC_SUBST(NETFILTER_SRC)
23
24 AC_ARG_ENABLE([bluetooth],
25 [AC_HELP_STRING([--enable-bluetooth],[enable Bluetooth support @<:@default=yes, if support available@:>@])],
26-,enable_bluetooth=yes)
27+ [],
28+ [enable_bluetooth=yes])
29
30 if test "x$enable_bluetooth" != "xno" ; then
31 dnl check for Bluetooth sniffing support
32@@ -1395,8 +1396,10 @@ if test "x$enable_bluetooth" != "xno" ;
33 fi
34
35 AC_ARG_ENABLE([canusb],
36-[AC_HELP_STRING([--enable-canusb],[enable canusb support @<:@default=yes, if support available@:>@])]
37-,enable_canusb=yes)
38+[AC_HELP_STRING([--enable-canusb],[enable canusb support @<:@default=yes, if support available@:>@])],
39+ [],
40+ [enable_canusb=yes])
41+
42
43 if test "x$enable_canusb" != "xno" ; then
44 dnl check for canusb support
45@@ -1422,7 +1425,8 @@ fi
46
47 AC_ARG_ENABLE([can],
48 [AC_HELP_STRING([--enable-can],[enable CAN support @<:@default=yes, if support available@:>@])],
49-,enable_can=yes)
50+ [],
51+ [enable_can=yes])
52
53 if test "x$enable_can" != "xno" ; then
54 dnl check for CAN sniffing support
diff --git a/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-canusb-needs-lpthread.patch b/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-canusb-needs-lpthread.patch
deleted file mode 100644
index e7456b7..0000000
--- a/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-canusb-needs-lpthread.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1Upstream-Status: Backport
2
3From 2259a62edaf667d4bc9d1a28e612e3a7c0011545 Mon Sep 17 00:00:00 2001
4From: Gustavo Zacarias <gustavo@zacarias.com.ar>
5Date: Sat, 30 Jun 2012 10:48:14 -0700
6Subject: [PATCH] canusb: needs -lpthread
7
8canusb uses pthreads, but -lpthread is never added to LIBS hence missing
9from pcap-config, causing build failures. Fix this.
10
11sgw - Removed configure part of the patch since it could change
12Signed-off-by: Saul Wold <sgw@linux.intel.com>
13---
14 configure.in | 2 +-
15 2 files changed, 2 insertions(+), 2 deletions(-)
16
17diff --git a/configure.in b/configure.in
18index ba5b64e..47e0b70 100644
19--- a/configure.in
20+++ b/configure.in
21@@ -1408,7 +1408,7 @@ if test "x$enable_canusb" != "xno" ; then
22 [
23 AC_DEFINE(PCAP_SUPPORT_CANUSB, 1, [target host supports canusb])
24 CANUSB_SRC=pcap-canusb-linux.c
25- LIBS="-lusb-1.0 $LIBS"
26+ LIBS="-lusb-1.0 -lpthread $LIBS"
27 AC_MSG_NOTICE(canusb sniffing is supported)
28 ],
29 AC_MSG_NOTICE(canusb sniffing is not supported; install libusb1.0 lib devel to enable it)
30--
311.7.9.5
32
diff --git a/meta/recipes-connectivity/libpcap/libpcap-1.3.0/aclocal.patch b/meta/recipes-connectivity/libpcap/libpcap/aclocal.patch
index 469d122..469d122 100644
--- a/meta/recipes-connectivity/libpcap/libpcap-1.3.0/aclocal.patch
+++ b/meta/recipes-connectivity/libpcap/libpcap/aclocal.patch
diff --git a/meta/recipes-connectivity/libpcap/libpcap-1.3.0/ieee80215-arphrd.patch b/meta/recipes-connectivity/libpcap/libpcap/ieee80215-arphrd.patch
index 2f5cd21..2f5cd21 100644
--- a/meta/recipes-connectivity/libpcap/libpcap-1.3.0/ieee80215-arphrd.patch
+++ b/meta/recipes-connectivity/libpcap/libpcap/ieee80215-arphrd.patch
diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.3.0.bb b/meta/recipes-connectivity/libpcap/libpcap_1.4.0.bb
index efbe2bc..75a540e 100644
--- a/meta/recipes-connectivity/libpcap/libpcap_1.3.0.bb
+++ b/meta/recipes-connectivity/libpcap/libpcap_1.4.0.bb
@@ -4,18 +4,21 @@ PR = "${INC_PR}.0"
4 4
5SRC_URI += "file://aclocal.patch \ 5SRC_URI += "file://aclocal.patch \
6 file://ieee80215-arphrd.patch \ 6 file://ieee80215-arphrd.patch \
7 file://0001-Fix-disable-canusb.patch \
8 file://0001-The-leading-comma-looked-weird-remove-it.patch \
9 file://0001-canusb-needs-lpthread.patch \
10 " 7 "
11 8
12SRC_URI[md5sum] = "f78455a92622b7a3c05c58b6ad1cec7e" 9SRC_URI[md5sum] = "56e88a5aabdd1e04414985ac24f7e76c"
13SRC_URI[sha256sum] = "41cbd9ed68383afd9f1fda279cb78427d36879d9e34ee707e31a16a1afd872b9" 10SRC_URI[sha256sum] = "7c6a2a4f71e8ab09804e6b4fb3aff998c5583108ac42c0e2967eee8e1dbc7406"
14 11
15# 12#
16# make install doesn't cover the shared lib 13# make install doesn't cover the shared lib
17# make install-shared is just broken (no symlinks) 14# make install-shared is just broken (no symlinks)
18# 15#
16
17do_configure_prepend () {
18 #remove hardcoded references to /usr/include
19 sed 's|\([ "^'\''I]\+\)/usr/include/|\1${STAGING_INCDIR}/|g' -i ${S}/configure.in
20}
21
19do_install_prepend () { 22do_install_prepend () {
20 install -d ${D}${libdir} 23 install -d ${D}${libdir}
21 install -d ${D}${bindir} 24 install -d ${D}${bindir}