From 329e73e56b227c5c9fb00e2201fdf1099607b473 Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Wed, 5 Jun 2013 18:09:07 +0300 Subject: 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. Signed-off-by: Cristian Iorga Signed-off-by: Saul Wold --- .../libpcap-1.3.0/0001-Fix-disable-canusb.patch | 30 ---- ...-The-leading-comma-looked-weird-remove-it.patch | 54 ------- .../libpcap-1.3.0/0001-canusb-needs-lpthread.patch | 32 ---- .../libpcap/libpcap-1.3.0/aclocal.patch | 167 --------------------- .../libpcap/libpcap-1.3.0/ieee80215-arphrd.patch | 24 --- .../libpcap/libpcap/aclocal.patch | 167 +++++++++++++++++++++ .../libpcap/libpcap/ieee80215-arphrd.patch | 24 +++ meta/recipes-connectivity/libpcap/libpcap_1.3.0.bb | 24 --- meta/recipes-connectivity/libpcap/libpcap_1.4.0.bb | 27 ++++ 9 files changed, 218 insertions(+), 331 deletions(-) delete mode 100644 meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-Fix-disable-canusb.patch delete mode 100644 meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-The-leading-comma-looked-weird-remove-it.patch delete mode 100644 meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-canusb-needs-lpthread.patch delete mode 100644 meta/recipes-connectivity/libpcap/libpcap-1.3.0/aclocal.patch delete mode 100644 meta/recipes-connectivity/libpcap/libpcap-1.3.0/ieee80215-arphrd.patch create mode 100644 meta/recipes-connectivity/libpcap/libpcap/aclocal.patch create mode 100644 meta/recipes-connectivity/libpcap/libpcap/ieee80215-arphrd.patch delete mode 100644 meta/recipes-connectivity/libpcap/libpcap_1.3.0.bb create mode 100644 meta/recipes-connectivity/libpcap/libpcap_1.4.0.bb (limited to 'meta/recipes-connectivity') 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 @@ -Upstream-Status: Backport - -From ccf671f5b7fbbef53d9cfd3091229b0b2a25159d Mon Sep 17 00:00:00 2001 -From: Edward Sheldrake -Date: Wed, 13 Jun 2012 12:09:21 -0700 -Subject: [PATCH] Fix --disable-canusb. - -Reviewed-By: Guy Harris - -sgw - Removed configure part of the patch since it could change -Signed-off-by: Saul Wold ---- - config.h.in | 3 - - configure |10672 ++++++++++++++++++++++++++++++++++++++++------------------ - 3 files changed, 7308 insertions(+), 3369 deletions(-) - -diff --git a/config.h.in b/config.h.in -index bd5177c..aed5c37 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -232,9 +232,6 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - --/* Define to the home page for this package. */ --#undef PACKAGE_URL -- - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - 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 @@ -Upstream-Status: Backport - -From fffa60a0693182085a7d4351150137eda26dbf82 Mon Sep 17 00:00:00 2001 -From: Guy Harris -Date: Wed, 13 Jun 2012 12:20:19 -0700 -Subject: [PATCH] The leading comma looked weird; remove it. - -That might be how the --disable-canusb bug got in. Hopefully this will -make the code look a little clearer and possibly avoid future bugs of -that sort. - -sgw - Cleaned up the patch based on another patch -Signed-off-by: Saul Wold ---- - configure.in | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -Index: libpcap-1.3.0/configure.in -=================================================================== ---- libpcap-1.3.0.orig/configure.in -+++ libpcap-1.3.0/configure.in -@@ -1371,7 +1371,8 @@ AC_SUBST(NETFILTER_SRC) - - AC_ARG_ENABLE([bluetooth], - [AC_HELP_STRING([--enable-bluetooth],[enable Bluetooth support @<:@default=yes, if support available@:>@])], --,enable_bluetooth=yes) -+ [], -+ [enable_bluetooth=yes]) - - if test "x$enable_bluetooth" != "xno" ; then - dnl check for Bluetooth sniffing support -@@ -1395,8 +1396,10 @@ if test "x$enable_bluetooth" != "xno" ; - fi - - AC_ARG_ENABLE([canusb], --[AC_HELP_STRING([--enable-canusb],[enable canusb support @<:@default=yes, if support available@:>@])] --,enable_canusb=yes) -+[AC_HELP_STRING([--enable-canusb],[enable canusb support @<:@default=yes, if support available@:>@])], -+ [], -+ [enable_canusb=yes]) -+ - - if test "x$enable_canusb" != "xno" ; then - dnl check for canusb support -@@ -1422,7 +1425,8 @@ fi - - AC_ARG_ENABLE([can], - [AC_HELP_STRING([--enable-can],[enable CAN support @<:@default=yes, if support available@:>@])], --,enable_can=yes) -+ [], -+ [enable_can=yes]) - - if test "x$enable_can" != "xno" ; then - 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 @@ -Upstream-Status: Backport - -From 2259a62edaf667d4bc9d1a28e612e3a7c0011545 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Sat, 30 Jun 2012 10:48:14 -0700 -Subject: [PATCH] canusb: needs -lpthread - -canusb uses pthreads, but -lpthread is never added to LIBS hence missing -from pcap-config, causing build failures. Fix this. - -sgw - Removed configure part of the patch since it could change -Signed-off-by: Saul Wold ---- - configure.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.in b/configure.in -index ba5b64e..47e0b70 100644 ---- a/configure.in -+++ b/configure.in -@@ -1408,7 +1408,7 @@ if test "x$enable_canusb" != "xno" ; then - [ - AC_DEFINE(PCAP_SUPPORT_CANUSB, 1, [target host supports canusb]) - CANUSB_SRC=pcap-canusb-linux.c -- LIBS="-lusb-1.0 $LIBS" -+ LIBS="-lusb-1.0 -lpthread $LIBS" - AC_MSG_NOTICE(canusb sniffing is supported) - ], - AC_MSG_NOTICE(canusb sniffing is not supported; install libusb1.0 lib devel to enable it) --- -1.7.9.5 - 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 @@ -Upstream-Status: Inappropriate [configuration] - -diff -ruN libpcap-1.1.1-orig/aclocal.m4 libpcap-1.1.1/aclocal.m4 ---- libpcap-1.1.1-orig/aclocal.m4 2010-06-29 10:46:32.815117569 +0800 -+++ libpcap-1.1.1/aclocal.m4 2010-06-29 10:49:17.150149949 +0800 -@@ -37,7 +37,7 @@ - dnl AC_LBL_C_INIT. Now, we run AC_LBL_C_INIT_BEFORE_CC, AC_PROG_CC, - dnl and AC_LBL_C_INIT at the top level. - dnl --AC_DEFUN(AC_LBL_C_INIT_BEFORE_CC, -+AC_DEFUN([AC_LBL_C_INIT_BEFORE_CC], - [AC_PREREQ(2.50) - AC_BEFORE([$0], [AC_LBL_C_INIT]) - AC_BEFORE([$0], [AC_PROG_CC]) -@@ -90,7 +90,7 @@ - dnl ac_cv_lbl_gcc_vers - dnl LBL_CFLAGS - dnl --AC_DEFUN(AC_LBL_C_INIT, -+AC_DEFUN([AC_LBL_C_INIT], - [AC_PREREQ(2.50) - AC_BEFORE([$0], [AC_LBL_FIXINCLUDES]) - AC_BEFORE([$0], [AC_LBL_DEVEL]) -@@ -217,7 +217,7 @@ - dnl V_SONAME_OPT - dnl V_RPATH_OPT - dnl --AC_DEFUN(AC_LBL_SHLIBS_INIT, -+AC_DEFUN([AC_LBL_SHLIBS_INIT], - [AC_PREREQ(2.50) - if test "$GCC" = yes ; then - # -@@ -361,7 +361,7 @@ - # Make sure we use the V_CCOPT flags, because some of those might - # disable inlining. - # --AC_DEFUN(AC_LBL_C_INLINE, -+AC_DEFUN([AC_LBL_C_INLINE], - [AC_MSG_CHECKING(for inline) - save_CFLAGS="$CFLAGS" - CFLAGS="$V_CCOPT" -@@ -407,7 +407,7 @@ - dnl - dnl AC_LBL_FIXINCLUDES - dnl --AC_DEFUN(AC_LBL_FIXINCLUDES, -+AC_DEFUN([AC_LBL_FIXINCLUDES], - [if test "$GCC" = yes ; then - AC_MSG_CHECKING(for ANSI ioctl definitions) - AC_CACHE_VAL(ac_cv_lbl_gcc_fixincludes, -@@ -453,7 +453,7 @@ - dnl $2 (yacc appended) - dnl $3 (optional flex and bison -P prefix) - dnl --AC_DEFUN(AC_LBL_LEX_AND_YACC, -+AC_DEFUN([AC_LBL_LEX_AND_YACC], - [AC_ARG_WITH(flex, [ --without-flex don't use flex]) - AC_ARG_WITH(bison, [ --without-bison don't use bison]) - if test "$with_flex" = no ; then -@@ -506,7 +506,7 @@ - dnl - dnl DECLWAITSTATUS (defined) - dnl --AC_DEFUN(AC_LBL_UNION_WAIT, -+AC_DEFUN([AC_LBL_UNION_WAIT], - [AC_MSG_CHECKING(if union wait is used) - AC_CACHE_VAL(ac_cv_lbl_union_wait, - AC_TRY_COMPILE([ -@@ -535,7 +535,7 @@ - dnl - dnl HAVE_SOCKADDR_SA_LEN (defined) - dnl --AC_DEFUN(AC_LBL_SOCKADDR_SA_LEN, -+AC_DEFUN([AC_LBL_SOCKADDR_SA_LEN], - [AC_MSG_CHECKING(if sockaddr struct has the sa_len member) - AC_CACHE_VAL(ac_cv_lbl_sockaddr_has_sa_len, - AC_TRY_COMPILE([ -@@ -560,7 +560,7 @@ - dnl - dnl HAVE_SOCKADDR_STORAGE (defined) - dnl --AC_DEFUN(AC_LBL_SOCKADDR_STORAGE, -+AC_DEFUN([AC_LBL_SOCKADDR_STORAGE], - [AC_MSG_CHECKING(if sockaddr_storage struct exists) - AC_CACHE_VAL(ac_cv_lbl_has_sockaddr_storage, - AC_TRY_COMPILE([ -@@ -593,7 +593,7 @@ - dnl won't be using code that would use that member, or we wouldn't - dnl compile in any case). - dnl --AC_DEFUN(AC_LBL_HP_PPA_INFO_T_DL_MODULE_ID_1, -+AC_DEFUN([AC_LBL_HP_PPA_INFO_T_DL_MODULE_ID_1], - [AC_MSG_CHECKING(if dl_hp_ppa_info_t struct has dl_module_id_1 member) - AC_CACHE_VAL(ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1, - AC_TRY_COMPILE([ -@@ -619,7 +619,7 @@ - dnl - dnl ac_cv_lbl_have_run_path (yes or no) - dnl --AC_DEFUN(AC_LBL_HAVE_RUN_PATH, -+AC_DEFUN([AC_LBL_HAVE_RUN_PATH], - [AC_MSG_CHECKING(for ${CC-cc} -R) - AC_CACHE_VAL(ac_cv_lbl_have_run_path, - [echo 'main(){}' > conftest.c -@@ -644,7 +644,7 @@ - dnl - dnl LBL_ALIGN (DEFINED) - dnl --AC_DEFUN(AC_LBL_UNALIGNED_ACCESS, -+AC_DEFUN([AC_LBL_UNALIGNED_ACCESS], - [AC_MSG_CHECKING(if unaligned accesses fail) - AC_CACHE_VAL(ac_cv_lbl_unaligned_fail, - [case "$host_cpu" in -@@ -749,7 +749,7 @@ - dnl HAVE_OS_PROTO_H (defined) - dnl os-proto.h (symlinked) - dnl --AC_DEFUN(AC_LBL_DEVEL, -+AC_DEFUN([AC_LBL_DEVEL], - [rm -f os-proto.h - if test "${LBL_CFLAGS+set}" = set; then - $1="$$1 ${LBL_CFLAGS}" -@@ -886,7 +886,7 @@ - dnl statically and happen to have a libresolv.a lying around (and no - dnl libnsl.a). - dnl --AC_DEFUN(AC_LBL_LIBRARY_NET, [ -+AC_DEFUN([AC_LBL_LIBRARY_NET], [ - # Most operating systems have gethostbyname() in the default searched - # libraries (i.e. libc): - # Some OSes (eg. Solaris) place it in libnsl -@@ -909,7 +909,7 @@ - dnl Test for __attribute__ - dnl - --AC_DEFUN(AC_C___ATTRIBUTE__, [ -+AC_DEFUN([AC_C___ATTRIBUTE__], [ - AC_MSG_CHECKING(for __attribute__) - AC_CACHE_VAL(ac_cv___attribute__, [ - AC_COMPILE_IFELSE( -@@ -947,7 +947,7 @@ - dnl - dnl -Scott Barron - dnl --AC_DEFUN(AC_LBL_TPACKET_STATS, -+AC_DEFUN([AC_LBL_TPACKET_STATS], - [AC_MSG_CHECKING(if if_packet.h has tpacket_stats defined) - AC_CACHE_VAL(ac_cv_lbl_tpacket_stats, - AC_TRY_COMPILE([ -@@ -976,7 +976,7 @@ - dnl doesn't have that member (which is OK, as either we won't be using - dnl code that would use that member, or we wouldn't compile in any case). - dnl --AC_DEFUN(AC_LBL_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI, -+AC_DEFUN([AC_LBL_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI], - [AC_MSG_CHECKING(if tpacket_auxdata struct has tp_vlan_tci member) - AC_CACHE_VAL(ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1, - AC_TRY_COMPILE([ -@@ -1003,7 +1003,7 @@ - dnl - dnl HAVE_DLPI_PASSIVE (defined) - dnl --AC_DEFUN(AC_LBL_DL_PASSIVE_REQ_T, -+AC_DEFUN([AC_LBL_DL_PASSIVE_REQ_T], - [AC_MSG_CHECKING(if dl_passive_req_t struct exists) - AC_CACHE_VAL(ac_cv_lbl_has_dl_passive_req_t, - 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 @@ -Upstream-Status: Pending - -Index: libpcap-1.0.0/pcap-linux.c -=================================================================== ---- libpcap-1.0.0.orig/pcap-linux.c 2009-01-28 11:58:54.000000000 +0300 -+++ libpcap-1.0.0/pcap-linux.c 2009-01-28 11:59:04.000000000 +0300 -@@ -1616,6 +1616,17 @@ - * so let's use "Linux-cooked" mode. Jean II */ - //handle->md.cooked = 1; - break; -+#ifndef ARPHRD_IEEE80215 -+#define ARPHRD_IEEE80215 805 -+#endif -+#ifndef ARPHRD_IEEE80215_PHY -+#define ARPHRD_IEEE80215_PHY 806 -+#endif -+ -+ case ARPHRD_IEEE80215: -+ case ARPHRD_IEEE80215_PHY: -+ handle->linktype = DLT_IEEE802_15_4; -+ break; - - /* ARPHRD_LAPD is unofficial and randomly allocated, if reallocation - * is needed, please report it to */ diff --git a/meta/recipes-connectivity/libpcap/libpcap/aclocal.patch b/meta/recipes-connectivity/libpcap/libpcap/aclocal.patch new file mode 100644 index 0000000000..469d122eeb --- /dev/null +++ b/meta/recipes-connectivity/libpcap/libpcap/aclocal.patch @@ -0,0 +1,167 @@ +Upstream-Status: Inappropriate [configuration] + +diff -ruN libpcap-1.1.1-orig/aclocal.m4 libpcap-1.1.1/aclocal.m4 +--- libpcap-1.1.1-orig/aclocal.m4 2010-06-29 10:46:32.815117569 +0800 ++++ libpcap-1.1.1/aclocal.m4 2010-06-29 10:49:17.150149949 +0800 +@@ -37,7 +37,7 @@ + dnl AC_LBL_C_INIT. Now, we run AC_LBL_C_INIT_BEFORE_CC, AC_PROG_CC, + dnl and AC_LBL_C_INIT at the top level. + dnl +-AC_DEFUN(AC_LBL_C_INIT_BEFORE_CC, ++AC_DEFUN([AC_LBL_C_INIT_BEFORE_CC], + [AC_PREREQ(2.50) + AC_BEFORE([$0], [AC_LBL_C_INIT]) + AC_BEFORE([$0], [AC_PROG_CC]) +@@ -90,7 +90,7 @@ + dnl ac_cv_lbl_gcc_vers + dnl LBL_CFLAGS + dnl +-AC_DEFUN(AC_LBL_C_INIT, ++AC_DEFUN([AC_LBL_C_INIT], + [AC_PREREQ(2.50) + AC_BEFORE([$0], [AC_LBL_FIXINCLUDES]) + AC_BEFORE([$0], [AC_LBL_DEVEL]) +@@ -217,7 +217,7 @@ + dnl V_SONAME_OPT + dnl V_RPATH_OPT + dnl +-AC_DEFUN(AC_LBL_SHLIBS_INIT, ++AC_DEFUN([AC_LBL_SHLIBS_INIT], + [AC_PREREQ(2.50) + if test "$GCC" = yes ; then + # +@@ -361,7 +361,7 @@ + # Make sure we use the V_CCOPT flags, because some of those might + # disable inlining. + # +-AC_DEFUN(AC_LBL_C_INLINE, ++AC_DEFUN([AC_LBL_C_INLINE], + [AC_MSG_CHECKING(for inline) + save_CFLAGS="$CFLAGS" + CFLAGS="$V_CCOPT" +@@ -407,7 +407,7 @@ + dnl + dnl AC_LBL_FIXINCLUDES + dnl +-AC_DEFUN(AC_LBL_FIXINCLUDES, ++AC_DEFUN([AC_LBL_FIXINCLUDES], + [if test "$GCC" = yes ; then + AC_MSG_CHECKING(for ANSI ioctl definitions) + AC_CACHE_VAL(ac_cv_lbl_gcc_fixincludes, +@@ -453,7 +453,7 @@ + dnl $2 (yacc appended) + dnl $3 (optional flex and bison -P prefix) + dnl +-AC_DEFUN(AC_LBL_LEX_AND_YACC, ++AC_DEFUN([AC_LBL_LEX_AND_YACC], + [AC_ARG_WITH(flex, [ --without-flex don't use flex]) + AC_ARG_WITH(bison, [ --without-bison don't use bison]) + if test "$with_flex" = no ; then +@@ -506,7 +506,7 @@ + dnl + dnl DECLWAITSTATUS (defined) + dnl +-AC_DEFUN(AC_LBL_UNION_WAIT, ++AC_DEFUN([AC_LBL_UNION_WAIT], + [AC_MSG_CHECKING(if union wait is used) + AC_CACHE_VAL(ac_cv_lbl_union_wait, + AC_TRY_COMPILE([ +@@ -535,7 +535,7 @@ + dnl + dnl HAVE_SOCKADDR_SA_LEN (defined) + dnl +-AC_DEFUN(AC_LBL_SOCKADDR_SA_LEN, ++AC_DEFUN([AC_LBL_SOCKADDR_SA_LEN], + [AC_MSG_CHECKING(if sockaddr struct has the sa_len member) + AC_CACHE_VAL(ac_cv_lbl_sockaddr_has_sa_len, + AC_TRY_COMPILE([ +@@ -560,7 +560,7 @@ + dnl + dnl HAVE_SOCKADDR_STORAGE (defined) + dnl +-AC_DEFUN(AC_LBL_SOCKADDR_STORAGE, ++AC_DEFUN([AC_LBL_SOCKADDR_STORAGE], + [AC_MSG_CHECKING(if sockaddr_storage struct exists) + AC_CACHE_VAL(ac_cv_lbl_has_sockaddr_storage, + AC_TRY_COMPILE([ +@@ -593,7 +593,7 @@ + dnl won't be using code that would use that member, or we wouldn't + dnl compile in any case). + dnl +-AC_DEFUN(AC_LBL_HP_PPA_INFO_T_DL_MODULE_ID_1, ++AC_DEFUN([AC_LBL_HP_PPA_INFO_T_DL_MODULE_ID_1], + [AC_MSG_CHECKING(if dl_hp_ppa_info_t struct has dl_module_id_1 member) + AC_CACHE_VAL(ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1, + AC_TRY_COMPILE([ +@@ -619,7 +619,7 @@ + dnl + dnl ac_cv_lbl_have_run_path (yes or no) + dnl +-AC_DEFUN(AC_LBL_HAVE_RUN_PATH, ++AC_DEFUN([AC_LBL_HAVE_RUN_PATH], + [AC_MSG_CHECKING(for ${CC-cc} -R) + AC_CACHE_VAL(ac_cv_lbl_have_run_path, + [echo 'main(){}' > conftest.c +@@ -644,7 +644,7 @@ + dnl + dnl LBL_ALIGN (DEFINED) + dnl +-AC_DEFUN(AC_LBL_UNALIGNED_ACCESS, ++AC_DEFUN([AC_LBL_UNALIGNED_ACCESS], + [AC_MSG_CHECKING(if unaligned accesses fail) + AC_CACHE_VAL(ac_cv_lbl_unaligned_fail, + [case "$host_cpu" in +@@ -749,7 +749,7 @@ + dnl HAVE_OS_PROTO_H (defined) + dnl os-proto.h (symlinked) + dnl +-AC_DEFUN(AC_LBL_DEVEL, ++AC_DEFUN([AC_LBL_DEVEL], + [rm -f os-proto.h + if test "${LBL_CFLAGS+set}" = set; then + $1="$$1 ${LBL_CFLAGS}" +@@ -886,7 +886,7 @@ + dnl statically and happen to have a libresolv.a lying around (and no + dnl libnsl.a). + dnl +-AC_DEFUN(AC_LBL_LIBRARY_NET, [ ++AC_DEFUN([AC_LBL_LIBRARY_NET], [ + # Most operating systems have gethostbyname() in the default searched + # libraries (i.e. libc): + # Some OSes (eg. Solaris) place it in libnsl +@@ -909,7 +909,7 @@ + dnl Test for __attribute__ + dnl + +-AC_DEFUN(AC_C___ATTRIBUTE__, [ ++AC_DEFUN([AC_C___ATTRIBUTE__], [ + AC_MSG_CHECKING(for __attribute__) + AC_CACHE_VAL(ac_cv___attribute__, [ + AC_COMPILE_IFELSE( +@@ -947,7 +947,7 @@ + dnl + dnl -Scott Barron + dnl +-AC_DEFUN(AC_LBL_TPACKET_STATS, ++AC_DEFUN([AC_LBL_TPACKET_STATS], + [AC_MSG_CHECKING(if if_packet.h has tpacket_stats defined) + AC_CACHE_VAL(ac_cv_lbl_tpacket_stats, + AC_TRY_COMPILE([ +@@ -976,7 +976,7 @@ + dnl doesn't have that member (which is OK, as either we won't be using + dnl code that would use that member, or we wouldn't compile in any case). + dnl +-AC_DEFUN(AC_LBL_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI, ++AC_DEFUN([AC_LBL_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI], + [AC_MSG_CHECKING(if tpacket_auxdata struct has tp_vlan_tci member) + AC_CACHE_VAL(ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1, + AC_TRY_COMPILE([ +@@ -1003,7 +1003,7 @@ + dnl + dnl HAVE_DLPI_PASSIVE (defined) + dnl +-AC_DEFUN(AC_LBL_DL_PASSIVE_REQ_T, ++AC_DEFUN([AC_LBL_DL_PASSIVE_REQ_T], + [AC_MSG_CHECKING(if dl_passive_req_t struct exists) + AC_CACHE_VAL(ac_cv_lbl_has_dl_passive_req_t, + AC_TRY_COMPILE([ diff --git a/meta/recipes-connectivity/libpcap/libpcap/ieee80215-arphrd.patch b/meta/recipes-connectivity/libpcap/libpcap/ieee80215-arphrd.patch new file mode 100644 index 0000000000..2f5cd213bc --- /dev/null +++ b/meta/recipes-connectivity/libpcap/libpcap/ieee80215-arphrd.patch @@ -0,0 +1,24 @@ +Upstream-Status: Pending + +Index: libpcap-1.0.0/pcap-linux.c +=================================================================== +--- libpcap-1.0.0.orig/pcap-linux.c 2009-01-28 11:58:54.000000000 +0300 ++++ libpcap-1.0.0/pcap-linux.c 2009-01-28 11:59:04.000000000 +0300 +@@ -1616,6 +1616,17 @@ + * so let's use "Linux-cooked" mode. Jean II */ + //handle->md.cooked = 1; + break; ++#ifndef ARPHRD_IEEE80215 ++#define ARPHRD_IEEE80215 805 ++#endif ++#ifndef ARPHRD_IEEE80215_PHY ++#define ARPHRD_IEEE80215_PHY 806 ++#endif ++ ++ case ARPHRD_IEEE80215: ++ case ARPHRD_IEEE80215_PHY: ++ handle->linktype = DLT_IEEE802_15_4; ++ break; + + /* ARPHRD_LAPD is unofficial and randomly allocated, if reallocation + * is needed, please report it to */ diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.3.0.bb b/meta/recipes-connectivity/libpcap/libpcap_1.3.0.bb deleted file mode 100644 index efbe2bc081..0000000000 --- a/meta/recipes-connectivity/libpcap/libpcap_1.3.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -require libpcap.inc - -PR = "${INC_PR}.0" - -SRC_URI += "file://aclocal.patch \ - file://ieee80215-arphrd.patch \ - file://0001-Fix-disable-canusb.patch \ - file://0001-The-leading-comma-looked-weird-remove-it.patch \ - file://0001-canusb-needs-lpthread.patch \ - " - -SRC_URI[md5sum] = "f78455a92622b7a3c05c58b6ad1cec7e" -SRC_URI[sha256sum] = "41cbd9ed68383afd9f1fda279cb78427d36879d9e34ee707e31a16a1afd872b9" - -# -# make install doesn't cover the shared lib -# make install-shared is just broken (no symlinks) -# -do_install_prepend () { - install -d ${D}${libdir} - install -d ${D}${bindir} - oe_runmake install-shared DESTDIR=${D} - oe_libinstall -a -so libpcap ${D}${libdir} -} diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.4.0.bb b/meta/recipes-connectivity/libpcap/libpcap_1.4.0.bb new file mode 100644 index 0000000000..75a540ecb4 --- /dev/null +++ b/meta/recipes-connectivity/libpcap/libpcap_1.4.0.bb @@ -0,0 +1,27 @@ +require libpcap.inc + +PR = "${INC_PR}.0" + +SRC_URI += "file://aclocal.patch \ + file://ieee80215-arphrd.patch \ + " + +SRC_URI[md5sum] = "56e88a5aabdd1e04414985ac24f7e76c" +SRC_URI[sha256sum] = "7c6a2a4f71e8ab09804e6b4fb3aff998c5583108ac42c0e2967eee8e1dbc7406" + +# +# make install doesn't cover the shared lib +# make install-shared is just broken (no symlinks) +# + +do_configure_prepend () { + #remove hardcoded references to /usr/include + sed 's|\([ "^'\''I]\+\)/usr/include/|\1${STAGING_INCDIR}/|g' -i ${S}/configure.in +} + +do_install_prepend () { + install -d ${D}${libdir} + install -d ${D}${bindir} + oe_runmake install-shared DESTDIR=${D} + oe_libinstall -a -so libpcap ${D}${libdir} +} -- cgit v1.2.3