summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2014-08-29 13:10:41 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-31 22:40:48 (GMT)
commit243837b39da90fcda9444af4675df35fc3e2349d (patch)
treeb6a675374d6325166e9ea1777a12bf3eb7e6e5c1 /meta/recipes-connectivity
parentb31b04d50cd72d7846694d59d434ba68b698913a (diff)
downloadpoky-243837b39da90fcda9444af4675df35fc3e2349d.tar.gz
libpcap: upgrade to 1.6.1
- Still BSD licensed, some changes into pcap triggered a checksum change; - ieee80215-arphrd.patch removed, obsolete. - switched to ${BP} variable; Changelog from previous version: Saturday Jul. 19, 2014 mcr@sandelman.ca Summary for 1.6.1 libpcap release some fixes for the any device changes for how --enable-XXX works Wednesday Jul. 2, 2014 mcr@sandelman.ca Summary for 1.6.0 libpcap release Don't support D-Bus sniffing on OS X fixes for byte order issues with NFLOG captures Handle using cooked mode for DLT_NETLINK in activate_new(). on platforms where you can not capture on down interfaces, do not list them but: do list interfaces which are down, if you can capture on them! (From OE-Core rev: ff962963de4dea9143f11ded480d0cca79a66d99) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap.inc4
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap/ieee80215-arphrd.patch24
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap_1.6.1.bb (renamed from meta/recipes-connectivity/libpcap/libpcap_1.5.3.bb)8
3 files changed, 5 insertions, 31 deletions
diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc
index 92d6eff..a12eb16 100644
--- a/meta/recipes-connectivity/libpcap/libpcap.inc
+++ b/meta/recipes-connectivity/libpcap/libpcap.inc
@@ -7,7 +7,7 @@ BUGTRACKER = "http://sourceforge.net/tracker/?group_id=53067&atid=469577"
7SECTION = "libs/network" 7SECTION = "libs/network"
8LICENSE = "BSD" 8LICENSE = "BSD"
9LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867 \ 9LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867 \
10 file://pcap.h;beginline=1;endline=34;md5=8d6cf7e17d5745010d633e30bc529ea9" 10 file://pcap.h;beginline=1;endline=32;md5=39af3510e011f34b8872f120b1dc31d2"
11DEPENDS = "flex-native bison-native" 11DEPENDS = "flex-native bison-native"
12 12
13PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}" 13PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}"
@@ -17,7 +17,7 @@ PACKAGECONFIG[libnl] = "--with-libnl,--without-libnl,libnl"
17 17
18INC_PR = "r5" 18INC_PR = "r5"
19 19
20SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz" 20SRC_URI = "http://www.tcpdump.org/release/${BP}.tar.gz"
21 21
22BINCONFIG = "${bindir}/pcap-config" 22BINCONFIG = "${bindir}/pcap-config"
23 23
diff --git a/meta/recipes-connectivity/libpcap/libpcap/ieee80215-arphrd.patch b/meta/recipes-connectivity/libpcap/libpcap/ieee80215-arphrd.patch
deleted file mode 100644
index 2f5cd21..0000000
--- a/meta/recipes-connectivity/libpcap/libpcap/ieee80215-arphrd.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1Upstream-Status: Pending
2
3Index: libpcap-1.0.0/pcap-linux.c
4===================================================================
5--- libpcap-1.0.0.orig/pcap-linux.c 2009-01-28 11:58:54.000000000 +0300
6+++ libpcap-1.0.0/pcap-linux.c 2009-01-28 11:59:04.000000000 +0300
7@@ -1616,6 +1616,17 @@
8 * so let's use "Linux-cooked" mode. Jean II */
9 //handle->md.cooked = 1;
10 break;
11+#ifndef ARPHRD_IEEE80215
12+#define ARPHRD_IEEE80215 805
13+#endif
14+#ifndef ARPHRD_IEEE80215_PHY
15+#define ARPHRD_IEEE80215_PHY 806
16+#endif
17+
18+ case ARPHRD_IEEE80215:
19+ case ARPHRD_IEEE80215_PHY:
20+ handle->linktype = DLT_IEEE802_15_4;
21+ break;
22
23 /* ARPHRD_LAPD is unofficial and randomly allocated, if reallocation
24 * is needed, please report it to <daniele@orlandi.com> */
diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.5.3.bb b/meta/recipes-connectivity/libpcap/libpcap_1.6.1.bb
index 3ba3caa..f570ebb 100644
--- a/meta/recipes-connectivity/libpcap/libpcap_1.5.3.bb
+++ b/meta/recipes-connectivity/libpcap/libpcap_1.6.1.bb
@@ -1,10 +1,8 @@
1require libpcap.inc 1require libpcap.inc
2 2
3SRC_URI += "file://aclocal.patch \ 3SRC_URI += "file://aclocal.patch"
4 file://ieee80215-arphrd.patch \ 4SRC_URI[md5sum] = "5eb05edf6b6c6e63d536d1c9fbfb2f7c"
5 " 5SRC_URI[sha256sum] = "116cbb3ac9e96d5dd7b39638a2f894a67fa3dcf06d794e6dae2b9a942ad13476"
6SRC_URI[md5sum] = "7e7321fb3aff2f2bb05c8229f3795d4a"
7SRC_URI[sha256sum] = "9ae92159c1060f15e6a90f2c4ad227268b6aaa382c316fa49a31c496b9979e93"
8 6
9# 7#
10# make install doesn't cover the shared lib 8# make install doesn't cover the shared lib