diff options
author | Cristian Iorga <cristian.iorga@intel.com> | 2013-06-05 18:09:07 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-07 16:48:29 +0100 |
commit | 03fdd2c26ca90334f8a11cee3b35adf76d88caa1 (patch) | |
tree | 3f9e66088599d98d7fedc7e3b88a796351fc8ee6 /meta/recipes-connectivity/libpcap/libpcap-1.3.0 | |
parent | d3e982a6c49e1df631b6326710b216f23dca221c (diff) | |
download | poky-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/libpcap-1.3.0')
5 files changed, 0 insertions, 307 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 1e5e2878f7..0000000000 --- a/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-Fix-disable-canusb.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | From ccf671f5b7fbbef53d9cfd3091229b0b2a25159d Mon Sep 17 00:00:00 2001 | ||
4 | From: Edward Sheldrake <ejs1920@sourceforge.net> | ||
5 | Date: Wed, 13 Jun 2012 12:09:21 -0700 | ||
6 | Subject: [PATCH] Fix --disable-canusb. | ||
7 | |||
8 | Reviewed-By: Guy Harris <guy@alum.mit.edu> | ||
9 | |||
10 | sgw - Removed configure part of the patch since it could change | ||
11 | Signed-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 | |||
17 | diff --git a/config.h.in b/config.h.in | ||
18 | index 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 e077a29ecd..0000000000 --- a/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-The-leading-comma-looked-weird-remove-it.patch +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | From fffa60a0693182085a7d4351150137eda26dbf82 Mon Sep 17 00:00:00 2001 | ||
4 | From: Guy Harris <guy@alum.mit.edu> | ||
5 | Date: Wed, 13 Jun 2012 12:20:19 -0700 | ||
6 | Subject: [PATCH] The leading comma looked weird; remove it. | ||
7 | |||
8 | That might be how the --disable-canusb bug got in. Hopefully this will | ||
9 | make the code look a little clearer and possibly avoid future bugs of | ||
10 | that sort. | ||
11 | |||
12 | sgw - Cleaned up the patch based on another patch | ||
13 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
14 | --- | ||
15 | configure.in | 9 ++++++--- | ||
16 | 1 file changed, 6 insertions(+), 3 deletions(-) | ||
17 | |||
18 | Index: 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 e7456b799b..0000000000 --- a/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-canusb-needs-lpthread.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | From 2259a62edaf667d4bc9d1a28e612e3a7c0011545 Mon Sep 17 00:00:00 2001 | ||
4 | From: Gustavo Zacarias <gustavo@zacarias.com.ar> | ||
5 | Date: Sat, 30 Jun 2012 10:48:14 -0700 | ||
6 | Subject: [PATCH] canusb: needs -lpthread | ||
7 | |||
8 | canusb uses pthreads, but -lpthread is never added to LIBS hence missing | ||
9 | from pcap-config, causing build failures. Fix this. | ||
10 | |||
11 | sgw - Removed configure part of the patch since it could change | ||
12 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
13 | --- | ||
14 | configure.in | 2 +- | ||
15 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/configure.in b/configure.in | ||
18 | index 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 | -- | ||
31 | 1.7.9.5 | ||
32 | |||
diff --git a/meta/recipes-connectivity/libpcap/libpcap-1.3.0/aclocal.patch b/meta/recipes-connectivity/libpcap/libpcap-1.3.0/aclocal.patch deleted file mode 100644 index 469d122eeb..0000000000 --- a/meta/recipes-connectivity/libpcap/libpcap-1.3.0/aclocal.patch +++ /dev/null | |||
@@ -1,167 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | diff -ruN libpcap-1.1.1-orig/aclocal.m4 libpcap-1.1.1/aclocal.m4 | ||
4 | --- libpcap-1.1.1-orig/aclocal.m4 2010-06-29 10:46:32.815117569 +0800 | ||
5 | +++ libpcap-1.1.1/aclocal.m4 2010-06-29 10:49:17.150149949 +0800 | ||
6 | @@ -37,7 +37,7 @@ | ||
7 | dnl AC_LBL_C_INIT. Now, we run AC_LBL_C_INIT_BEFORE_CC, AC_PROG_CC, | ||
8 | dnl and AC_LBL_C_INIT at the top level. | ||
9 | dnl | ||
10 | -AC_DEFUN(AC_LBL_C_INIT_BEFORE_CC, | ||
11 | +AC_DEFUN([AC_LBL_C_INIT_BEFORE_CC], | ||
12 | [AC_PREREQ(2.50) | ||
13 | AC_BEFORE([$0], [AC_LBL_C_INIT]) | ||
14 | AC_BEFORE([$0], [AC_PROG_CC]) | ||
15 | @@ -90,7 +90,7 @@ | ||
16 | dnl ac_cv_lbl_gcc_vers | ||
17 | dnl LBL_CFLAGS | ||
18 | dnl | ||
19 | -AC_DEFUN(AC_LBL_C_INIT, | ||
20 | +AC_DEFUN([AC_LBL_C_INIT], | ||
21 | [AC_PREREQ(2.50) | ||
22 | AC_BEFORE([$0], [AC_LBL_FIXINCLUDES]) | ||
23 | AC_BEFORE([$0], [AC_LBL_DEVEL]) | ||
24 | @@ -217,7 +217,7 @@ | ||
25 | dnl V_SONAME_OPT | ||
26 | dnl V_RPATH_OPT | ||
27 | dnl | ||
28 | -AC_DEFUN(AC_LBL_SHLIBS_INIT, | ||
29 | +AC_DEFUN([AC_LBL_SHLIBS_INIT], | ||
30 | [AC_PREREQ(2.50) | ||
31 | if test "$GCC" = yes ; then | ||
32 | # | ||
33 | @@ -361,7 +361,7 @@ | ||
34 | # Make sure we use the V_CCOPT flags, because some of those might | ||
35 | # disable inlining. | ||
36 | # | ||
37 | -AC_DEFUN(AC_LBL_C_INLINE, | ||
38 | +AC_DEFUN([AC_LBL_C_INLINE], | ||
39 | [AC_MSG_CHECKING(for inline) | ||
40 | save_CFLAGS="$CFLAGS" | ||
41 | CFLAGS="$V_CCOPT" | ||
42 | @@ -407,7 +407,7 @@ | ||
43 | dnl | ||
44 | dnl AC_LBL_FIXINCLUDES | ||
45 | dnl | ||
46 | -AC_DEFUN(AC_LBL_FIXINCLUDES, | ||
47 | +AC_DEFUN([AC_LBL_FIXINCLUDES], | ||
48 | [if test "$GCC" = yes ; then | ||
49 | AC_MSG_CHECKING(for ANSI ioctl definitions) | ||
50 | AC_CACHE_VAL(ac_cv_lbl_gcc_fixincludes, | ||
51 | @@ -453,7 +453,7 @@ | ||
52 | dnl $2 (yacc appended) | ||
53 | dnl $3 (optional flex and bison -P prefix) | ||
54 | dnl | ||
55 | -AC_DEFUN(AC_LBL_LEX_AND_YACC, | ||
56 | +AC_DEFUN([AC_LBL_LEX_AND_YACC], | ||
57 | [AC_ARG_WITH(flex, [ --without-flex don't use flex]) | ||
58 | AC_ARG_WITH(bison, [ --without-bison don't use bison]) | ||
59 | if test "$with_flex" = no ; then | ||
60 | @@ -506,7 +506,7 @@ | ||
61 | dnl | ||
62 | dnl DECLWAITSTATUS (defined) | ||
63 | dnl | ||
64 | -AC_DEFUN(AC_LBL_UNION_WAIT, | ||
65 | +AC_DEFUN([AC_LBL_UNION_WAIT], | ||
66 | [AC_MSG_CHECKING(if union wait is used) | ||
67 | AC_CACHE_VAL(ac_cv_lbl_union_wait, | ||
68 | AC_TRY_COMPILE([ | ||
69 | @@ -535,7 +535,7 @@ | ||
70 | dnl | ||
71 | dnl HAVE_SOCKADDR_SA_LEN (defined) | ||
72 | dnl | ||
73 | -AC_DEFUN(AC_LBL_SOCKADDR_SA_LEN, | ||
74 | +AC_DEFUN([AC_LBL_SOCKADDR_SA_LEN], | ||
75 | [AC_MSG_CHECKING(if sockaddr struct has the sa_len member) | ||
76 | AC_CACHE_VAL(ac_cv_lbl_sockaddr_has_sa_len, | ||
77 | AC_TRY_COMPILE([ | ||
78 | @@ -560,7 +560,7 @@ | ||
79 | dnl | ||
80 | dnl HAVE_SOCKADDR_STORAGE (defined) | ||
81 | dnl | ||
82 | -AC_DEFUN(AC_LBL_SOCKADDR_STORAGE, | ||
83 | +AC_DEFUN([AC_LBL_SOCKADDR_STORAGE], | ||
84 | [AC_MSG_CHECKING(if sockaddr_storage struct exists) | ||
85 | AC_CACHE_VAL(ac_cv_lbl_has_sockaddr_storage, | ||
86 | AC_TRY_COMPILE([ | ||
87 | @@ -593,7 +593,7 @@ | ||
88 | dnl won't be using code that would use that member, or we wouldn't | ||
89 | dnl compile in any case). | ||
90 | dnl | ||
91 | -AC_DEFUN(AC_LBL_HP_PPA_INFO_T_DL_MODULE_ID_1, | ||
92 | +AC_DEFUN([AC_LBL_HP_PPA_INFO_T_DL_MODULE_ID_1], | ||
93 | [AC_MSG_CHECKING(if dl_hp_ppa_info_t struct has dl_module_id_1 member) | ||
94 | AC_CACHE_VAL(ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1, | ||
95 | AC_TRY_COMPILE([ | ||
96 | @@ -619,7 +619,7 @@ | ||
97 | dnl | ||
98 | dnl ac_cv_lbl_have_run_path (yes or no) | ||
99 | dnl | ||
100 | -AC_DEFUN(AC_LBL_HAVE_RUN_PATH, | ||
101 | +AC_DEFUN([AC_LBL_HAVE_RUN_PATH], | ||
102 | [AC_MSG_CHECKING(for ${CC-cc} -R) | ||
103 | AC_CACHE_VAL(ac_cv_lbl_have_run_path, | ||
104 | [echo 'main(){}' > conftest.c | ||
105 | @@ -644,7 +644,7 @@ | ||
106 | dnl | ||
107 | dnl LBL_ALIGN (DEFINED) | ||
108 | dnl | ||
109 | -AC_DEFUN(AC_LBL_UNALIGNED_ACCESS, | ||
110 | +AC_DEFUN([AC_LBL_UNALIGNED_ACCESS], | ||
111 | [AC_MSG_CHECKING(if unaligned accesses fail) | ||
112 | AC_CACHE_VAL(ac_cv_lbl_unaligned_fail, | ||
113 | [case "$host_cpu" in | ||
114 | @@ -749,7 +749,7 @@ | ||
115 | dnl HAVE_OS_PROTO_H (defined) | ||
116 | dnl os-proto.h (symlinked) | ||
117 | dnl | ||
118 | -AC_DEFUN(AC_LBL_DEVEL, | ||
119 | +AC_DEFUN([AC_LBL_DEVEL], | ||
120 | [rm -f os-proto.h | ||
121 | if test "${LBL_CFLAGS+set}" = set; then | ||
122 | $1="$$1 ${LBL_CFLAGS}" | ||
123 | @@ -886,7 +886,7 @@ | ||
124 | dnl statically and happen to have a libresolv.a lying around (and no | ||
125 | dnl libnsl.a). | ||
126 | dnl | ||
127 | -AC_DEFUN(AC_LBL_LIBRARY_NET, [ | ||
128 | +AC_DEFUN([AC_LBL_LIBRARY_NET], [ | ||
129 | # Most operating systems have gethostbyname() in the default searched | ||
130 | # libraries (i.e. libc): | ||
131 | # Some OSes (eg. Solaris) place it in libnsl | ||
132 | @@ -909,7 +909,7 @@ | ||
133 | dnl Test for __attribute__ | ||
134 | dnl | ||
135 | |||
136 | -AC_DEFUN(AC_C___ATTRIBUTE__, [ | ||
137 | +AC_DEFUN([AC_C___ATTRIBUTE__], [ | ||
138 | AC_MSG_CHECKING(for __attribute__) | ||
139 | AC_CACHE_VAL(ac_cv___attribute__, [ | ||
140 | AC_COMPILE_IFELSE( | ||
141 | @@ -947,7 +947,7 @@ | ||
142 | dnl | ||
143 | dnl -Scott Barron | ||
144 | dnl | ||
145 | -AC_DEFUN(AC_LBL_TPACKET_STATS, | ||
146 | +AC_DEFUN([AC_LBL_TPACKET_STATS], | ||
147 | [AC_MSG_CHECKING(if if_packet.h has tpacket_stats defined) | ||
148 | AC_CACHE_VAL(ac_cv_lbl_tpacket_stats, | ||
149 | AC_TRY_COMPILE([ | ||
150 | @@ -976,7 +976,7 @@ | ||
151 | dnl doesn't have that member (which is OK, as either we won't be using | ||
152 | dnl code that would use that member, or we wouldn't compile in any case). | ||
153 | dnl | ||
154 | -AC_DEFUN(AC_LBL_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI, | ||
155 | +AC_DEFUN([AC_LBL_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI], | ||
156 | [AC_MSG_CHECKING(if tpacket_auxdata struct has tp_vlan_tci member) | ||
157 | AC_CACHE_VAL(ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1, | ||
158 | AC_TRY_COMPILE([ | ||
159 | @@ -1003,7 +1003,7 @@ | ||
160 | dnl | ||
161 | dnl HAVE_DLPI_PASSIVE (defined) | ||
162 | dnl | ||
163 | -AC_DEFUN(AC_LBL_DL_PASSIVE_REQ_T, | ||
164 | +AC_DEFUN([AC_LBL_DL_PASSIVE_REQ_T], | ||
165 | [AC_MSG_CHECKING(if dl_passive_req_t struct exists) | ||
166 | AC_CACHE_VAL(ac_cv_lbl_has_dl_passive_req_t, | ||
167 | AC_TRY_COMPILE([ | ||
diff --git a/meta/recipes-connectivity/libpcap/libpcap-1.3.0/ieee80215-arphrd.patch b/meta/recipes-connectivity/libpcap/libpcap-1.3.0/ieee80215-arphrd.patch deleted file mode 100644 index 2f5cd213bc..0000000000 --- a/meta/recipes-connectivity/libpcap/libpcap-1.3.0/ieee80215-arphrd.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Index: 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> */ | ||