diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-05-29 23:02:24 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2011-05-30 11:28:58 +0200 |
commit | 83245fde83671e583fb4ecdc80a225a89e532ed9 (patch) | |
tree | 6ef1072224007085f05336e184fb09561e927ae7 /meta-oe/recipes-support/tcpdump/tcpdump-4.1.1 | |
parent | 1998f8ef89ed3ff22460465768907ced0c356383 (diff) | |
download | meta-openembedded-83245fde83671e583fb4ecdc80a225a89e532ed9.tar.gz |
tcpdump: import from OE rev d4f0211e2078d5033ae0dee74664de5520d8392d
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/tcpdump/tcpdump-4.1.1')
4 files changed, 134 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/tcpdump/tcpdump-4.1.1/0001-minimal-IEEE802.15.4-allowed.patch b/meta-oe/recipes-support/tcpdump/tcpdump-4.1.1/0001-minimal-IEEE802.15.4-allowed.patch new file mode 100644 index 0000000000..9d3d60d4d7 --- /dev/null +++ b/meta-oe/recipes-support/tcpdump/tcpdump-4.1.1/0001-minimal-IEEE802.15.4-allowed.patch @@ -0,0 +1,22 @@ +From: Sergey Lapin <slapin@slind.org> +Date: Wed, 28 Jan 2009 16:34:15 +0300 +Subject: [PATCH] minimal IEEE802.15.4 allowed + +--- + tcpdump.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/tcpdump.c b/tcpdump.c +index 06683af..fbc944c 100644 +--- a/tcpdump.c ++++ b/tcpdump.c +@@ -282,6 +282,9 @@ static struct printer printers[] = { + #ifdef DLT_MFR + { mfr_if_print, DLT_MFR }, + #endif ++#ifdef DLT_IEEE802_15_4 ++ { raw_if_print, DLT_IEEE802_15_4 }, ++#endif + #if defined(DLT_BLUETOOTH_HCI_H4_WITH_PHDR) && defined(HAVE_PCAP_BLUETOOTH_H) + { bt_if_print, DLT_BLUETOOTH_HCI_H4_WITH_PHDR}, + #endif diff --git a/meta-oe/recipes-support/tcpdump/tcpdump-4.1.1/configure.patch b/meta-oe/recipes-support/tcpdump/tcpdump-4.1.1/configure.patch new file mode 100644 index 0000000000..3697420fd3 --- /dev/null +++ b/meta-oe/recipes-support/tcpdump/tcpdump-4.1.1/configure.patch @@ -0,0 +1,29 @@ +--- + aclocal.m4 | 1 - + configure.in | 1 + + 2 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 40b5866..0c662b0 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -40,7 +40,6 @@ dnl + 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]) + AC_BEFORE([$0], [AC_LBL_FIXINCLUDES]) + AC_BEFORE([$0], [AC_LBL_DEVEL]) + AC_ARG_WITH(gcc, [ --without-gcc don't use gcc]) +diff --git a/configure.in b/configure.in +index 11257c9..7f9591c 100644 +--- a/configure.in ++++ b/configure.in +@@ -19,6 +19,7 @@ AC_REVISION($Revision: 1.204 $) + AC_PREREQ(2.50) + AC_INIT(tcpdump.c) + ++AC_PROG_CC + AC_CANONICAL_HOST + + AC_LBL_C_INIT_BEFORE_CC(V_CCOPT, V_INCLS) diff --git a/meta-oe/recipes-support/tcpdump/tcpdump-4.1.1/ipv6-cross.patch b/meta-oe/recipes-support/tcpdump/tcpdump-4.1.1/ipv6-cross.patch new file mode 100644 index 0000000000..7eba2c5a6d --- /dev/null +++ b/meta-oe/recipes-support/tcpdump/tcpdump-4.1.1/ipv6-cross.patch @@ -0,0 +1,41 @@ +--- + configure.in | 12 ++++++++---- + 1 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/configure.in b/configure.in +index eb3e5e8..11257c9 100644 +--- a/configure.in ++++ b/configure.in +@@ -181,8 +181,9 @@ yes) AC_MSG_RESULT(yes) + ipv6=no + ;; + esac ], +- +- AC_TRY_RUN([ /* AF_INET6 available check */ ++[ ++ if test x"$cross_compiling" != "xyes"; then ++ AC_TRY_RUN([ /* AF_INET6 avalable check */ + #include <sys/types.h> + #include <sys/socket.h> + main() +@@ -201,7 +202,10 @@ main() + ipv6=no], + [ AC_MSG_RESULT(no) + ipv6=no] +-)) ++ ) ++else ++ AC_MSG_FAILURE([Unable to check for ipv6 when crosscompiling, please specify.]) ++fi]) + + ipv6type=unknown + ipv6lib=none +@@ -316,7 +320,7 @@ if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then + fi + + +-if test "$ipv6" = "yes"; then ++if test x"$cross_compiling" != "xyes" -a "$ipv6" = "yes"; then + # + # XXX - on Tru64 UNIX 5.1, there is no "getaddrinfo()" + # function in libc; there are "ngetaddrinfo()" and diff --git a/meta-oe/recipes-support/tcpdump/tcpdump-4.1.1/tcpdump_configure_no_-O2.patch b/meta-oe/recipes-support/tcpdump/tcpdump-4.1.1/tcpdump_configure_no_-O2.patch new file mode 100644 index 0000000000..7929da5b1f --- /dev/null +++ b/meta-oe/recipes-support/tcpdump/tcpdump-4.1.1/tcpdump_configure_no_-O2.patch @@ -0,0 +1,42 @@ +--- + configure | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index cb51d19..73d51af 100755 +--- a/configure ++++ b/configure +@@ -2691,13 +2691,13 @@ if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS + elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then +- CFLAGS="-g -O2" ++ CFLAGS="-g" + else + CFLAGS="-g" + fi + else + if test "$GCC" = yes; then +- CFLAGS="-O2" ++ CFLAGS="" + else + CFLAGS= + fi +@@ -2830,7 +2830,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test "$GCC" = yes ; then + if test "$SHLICC2" = yes ; then + ac_cv_lbl_gcc_vers=2 +- V_CCOPT="-O2" ++ V_CCOPT="" + else + { echo "$as_me:$LINENO: checking gcc version" >&5 + echo $ECHO_N "checking gcc version... $ECHO_C" >&6; } +@@ -2847,7 +2847,7 @@ fi + { echo "$as_me:$LINENO: result: $ac_cv_lbl_gcc_vers" >&5 + echo "${ECHO_T}$ac_cv_lbl_gcc_vers" >&6; } + if test $ac_cv_lbl_gcc_vers -gt 1 ; then +- V_CCOPT="-O2" ++ V_CCOPT="" + fi + fi + else |