diff options
author | Roy Li <rongqing.li@windriver.com> | 2015-04-23 16:08:53 +0800 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2015-05-13 09:51:27 -0400 |
commit | 53d55216c8c721d3b66ec8f968737bf081def870 (patch) | |
tree | f0e15b51e38306eb3677e49e8d5350f8a20e73a3 /meta-networking/recipes-support/tcpdump | |
parent | 031e1027a652da2f6a591c6c80d5b6673101492b (diff) | |
download | meta-openembedded-contrib-53d55216c8c721d3b66ec8f968737bf081def870.tar.gz |
tcpdump: upgrade to 4.7.4
Remove two unneeded patches, configure.patch and tcpdump-cross-getaddrinfo.patch
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-support/tcpdump')
-rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/configure.patch | 29 | ||||
-rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/tcpdump-cross-getaddrinfo.patch | 23 | ||||
-rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch (renamed from meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/add-ptest.patch) | 0 | ||||
-rwxr-xr-x | meta-networking/recipes-support/tcpdump/tcpdump/run-ptest (renamed from meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/run-ptest) | 0 | ||||
-rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpdump/tcpdump-configure-dlpi.patch (renamed from meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/tcpdump-configure-dlpi.patch) | 0 | ||||
-rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch (renamed from meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/unnecessary-to-check-libpcap.patch) | 0 | ||||
-rw-r--r-- | meta-networking/recipes-support/tcpdump/tcpdump_4.7.4.bb (renamed from meta-networking/recipes-support/tcpdump/tcpdump_4.6.1.bb) | 6 |
7 files changed, 2 insertions, 56 deletions
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/configure.patch b/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/configure.patch deleted file mode 100644 index 3697420fd3..0000000000 --- a/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/configure.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- - 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-networking/recipes-support/tcpdump/tcpdump-4.6.1/tcpdump-cross-getaddrinfo.patch b/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/tcpdump-cross-getaddrinfo.patch deleted file mode 100644 index b414b72e9d..0000000000 --- a/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/tcpdump-cross-getaddrinfo.patch +++ /dev/null @@ -1,23 +0,0 @@ -Fix getaddinfo check when cross compiling - -Upstream-Status: Pending. - -AC_TRY_RUN defaults to td_cv_buggygetaddrinfo=yes when -cross-compiling. So this change indicates that we -are cross-compiling. - -Signed-of-by: Aws Ismail <aws.ismail@windriver.com> - -diff --git a/configure.in b/configure.in -index ca277c0..283035e 100644 ---- a/configure.in -+++ b/configure.in -@@ -434,7 +434,7 @@ main() - ], - td_cv_buggygetaddrinfo=no, - td_cv_buggygetaddrinfo=yes, -- td_cv_buggygetaddrinfo=yes)]) -+ td_cv_buggygetaddrinfo=cross)]) - if test "$td_cv_buggygetaddrinfo" = no; then - AC_MSG_RESULT(good) - else diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/add-ptest.patch b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch index 358f6050f6..358f6050f6 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/add-ptest.patch +++ b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/run-ptest b/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest index c03a8b8ef3..c03a8b8ef3 100755 --- a/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/run-ptest +++ b/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/tcpdump-configure-dlpi.patch b/meta-networking/recipes-support/tcpdump/tcpdump/tcpdump-configure-dlpi.patch index 50e2d54399..50e2d54399 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/tcpdump-configure-dlpi.patch +++ b/meta-networking/recipes-support/tcpdump/tcpdump/tcpdump-configure-dlpi.patch diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/unnecessary-to-check-libpcap.patch b/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch index d7a3ac23b1..d7a3ac23b1 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump-4.6.1/unnecessary-to-check-libpcap.patch +++ b/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch diff --git a/meta-networking/recipes-support/tcpdump/tcpdump_4.6.1.bb b/meta-networking/recipes-support/tcpdump/tcpdump_4.7.4.bb index 1fdaf308d8..e01f5fb963 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump_4.6.1.bb +++ b/meta-networking/recipes-support/tcpdump/tcpdump_4.7.4.bb @@ -7,15 +7,13 @@ DEPENDS = "libpcap" SRC_URI = " \ http://www.tcpdump.org/release/${BP}.tar.gz \ - file://configure.patch \ file://unnecessary-to-check-libpcap.patch \ file://tcpdump-configure-dlpi.patch \ - file://tcpdump-cross-getaddrinfo.patch \ file://add-ptest.patch \ file://run-ptest \ " -SRC_URI[md5sum] = "dab267ec30216a069747d10314079ec7" -SRC_URI[sha256sum] = "4c88c2a9aeb4047074f344fc9b2b6577b219972d359e192f6d12ccf983a13fd7" +SRC_URI[md5sum] = "58af728de36f499341918fc4b8e827c3" +SRC_URI[sha256sum] = "6be520269a89036f99c0b2126713a60965953eab921002b07608ccfc0c47d9af" export LIBS=" -lpcap" inherit autotools-brokensep ptest |