mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-15 16:07:26 +00:00
tcpreplay: upgrade to 4.1.1
* Upgrade tcpreplay from 3.4.4 to 4.1.1 * Update the LICENSE file checksum as the LICENSE updated to implement GPLv3 license * Remove the backport and unapplicable patches - tcpreplay-3.4.4-cross-compile.patch - tcpreplay-3.4.4-no-bfp-support.patch - tcpreplay-3.4.4-fix-unable-to-link-libpcap-issue.patch - tcpreplay-3.4.4-improve-search-for-libpcap.patch are Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
Mingli Yu
Joe MacDonald
@@ -1,92 +0,0 @@
|
|||||||
Uptream-Status: Pending
|
|
||||||
|
|
||||||
Signed-off-by: Zongchun Yu <Zongchun.Yu@freescale.com>
|
|
||||||
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -402,7 +402,6 @@
|
|
||||||
|
|
||||||
dnl 0.9.6 (which is still thinks it is 0.9.5 due to a bug) introduces an important
|
|
||||||
dnl fix for OSX. See: http://tcpreplay.synfin.net/trac/ticket/167
|
|
||||||
-libpcap_version_096=no
|
|
||||||
AC_RUN_IFELSE(AC_LANG_PROGRAM([[
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
@@ -419,11 +418,12 @@
|
|
||||||
exit(0);
|
|
||||||
|
|
||||||
exit(1);
|
|
||||||
-]]), [
|
|
||||||
- libpcap_version_096=yes
|
|
||||||
-])
|
|
||||||
+]]),
|
|
||||||
+ [libpcap_version_096=yes],
|
|
||||||
+ [libpcap_version_096=no],
|
|
||||||
+ [libpcap_version_096=yes]
|
|
||||||
+)
|
|
||||||
|
|
||||||
-libpcap_ver8=no
|
|
||||||
AC_RUN_IFELSE(AC_LANG_PROGRAM([[
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
@@ -444,13 +444,12 @@
|
|
||||||
exit(0);
|
|
||||||
|
|
||||||
exit(1);
|
|
||||||
-]]), [
|
|
||||||
- libpcap_ver8=yes
|
|
||||||
-], [
|
|
||||||
- libpcap_ver8=no
|
|
||||||
-])
|
|
||||||
+]]),
|
|
||||||
+ [libpcap_ver8=yes],
|
|
||||||
+ [libpcap_ver8=no],
|
|
||||||
+ [libpcap_ver8=yes]
|
|
||||||
+)
|
|
||||||
|
|
||||||
-libpcap_ver7=no
|
|
||||||
AC_RUN_IFELSE(AC_LANG_PROGRAM([[
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
@@ -469,11 +468,11 @@
|
|
||||||
exit(0);
|
|
||||||
|
|
||||||
exit(1);
|
|
||||||
-]]), [
|
|
||||||
- libpcap_ver7=yes
|
|
||||||
-], [
|
|
||||||
- libpcap_ver7=no
|
|
||||||
-])
|
|
||||||
+]]),
|
|
||||||
+ [libpcap_ver7=yes],
|
|
||||||
+ [libpcap_ver7=no],
|
|
||||||
+ [libpcap_ver7=yes]
|
|
||||||
+)
|
|
||||||
|
|
||||||
if test x$libpcap_ver8 = xyes ; then
|
|
||||||
AC_MSG_RESULT(>= 0.8.0)
|
|
||||||
@@ -761,8 +760,8 @@
|
|
||||||
|
|
||||||
have_bpf=no
|
|
||||||
dnl Check for BSD's BPF
|
|
||||||
-AC_MSG_CHECKING(for BPF device sending support)
|
|
||||||
-AC_TRY_RUN([
|
|
||||||
+AC_CACHE_CHECK([for BPF device sending support], ac_cv_have_bpf,
|
|
||||||
+[AC_TRY_RUN([
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
@@ -796,8 +795,11 @@
|
|
||||||
[Do we have BPF device support?])
|
|
||||||
AC_MSG_RESULT(yes)
|
|
||||||
have_bpf=yes
|
|
||||||
-],[
|
|
||||||
- AC_MSG_RESULT(no)
|
|
||||||
+],
|
|
||||||
+[AC_MSG_RESULT(no)],
|
|
||||||
+[AC_MSG_ERROR([cross-compiling,
|
|
||||||
+ presetting ac_cv_have_bpf=(yes|no) will help])]
|
|
||||||
+)
|
|
||||||
])
|
|
||||||
|
|
||||||
|
|
||||||
-17
@@ -1,17 +0,0 @@
|
|||||||
Uptream-Status: Pending
|
|
||||||
|
|
||||||
Signed-off-by: Zongchun Yu <Zongchun.Yu@freescale.com>
|
|
||||||
|
|
||||||
Index: tcpreplay-3.4.4/configure.ac
|
|
||||||
===================================================================
|
|
||||||
--- tcpreplay-3.4.4.orig/configure.ac
|
|
||||||
+++ tcpreplay-3.4.4/configure.ac
|
|
||||||
@@ -389,7 +389,7 @@ CFLAGS="$CFLAGS -I$LPCAPINCDIR"
|
|
||||||
AC_SEARCH_LIBS([pcap_close], [pcap],
|
|
||||||
LPCAPLIB="$LIBS",
|
|
||||||
AC_ERROR([Unable to link libpcap in ${foundpcap}]),
|
|
||||||
- -lnl)
|
|
||||||
+ -lnl-3)
|
|
||||||
|
|
||||||
AC_SUBST(LPCAPINC)
|
|
||||||
AC_SUBST(LPCAPLIB)
|
|
||||||
-33
@@ -1,33 +0,0 @@
|
|||||||
tcpreplay: improve search for libpcap
|
|
||||||
|
|
||||||
Add a test which will find libpcap if $testdir/.. is a sysroot.
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
|
||||||
|
|
||||||
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -350,14 +350,20 @@ for testdir in $trypcapdir /usr/local /o
|
|
||||||
if test -f "${testdir}/include/pcap.h" -a $foundpcap = no ; then
|
|
||||||
LPCAPINC="${testdir}/include/pcap.h"
|
|
||||||
LPCAPINCDIR="${testdir}/include"
|
|
||||||
+ # If testdir/.. is a sysroot, then sDir should point to where the libraries are.
|
|
||||||
+ sDir=$(readlink -m ${testdir}/../${libdir})
|
|
||||||
if test $dynamic_link = yes; then
|
|
||||||
- if test -f "${testdir}/lib64/libpcap${shrext_cmds}" ; then
|
|
||||||
+ if test -f "${sDir}/libpcap${shrext_cmds}" ; then
|
|
||||||
+ LPCAPLIB="-L${sDir} -lpcap"
|
|
||||||
+ elif test -f "${testdir}/lib64/libpcap${shrext_cmds}" ; then
|
|
||||||
LPCAPLIB="-L${testdir}/lib64 -lpcap"
|
|
||||||
elif test -f "${testdir}/lib/libpcap${shrext_cmds}" ; then
|
|
||||||
LPCAPLIB="-L${testdir}/lib -lpcap"
|
|
||||||
else
|
|
||||||
AC_ERROR([Unable to find libpcap in ${testdir}])
|
|
||||||
fi
|
|
||||||
+ elif test -f "${sDir}/libpcap.${libext}" ; then
|
|
||||||
+ LPCAPLIB="${sDir}/libpcap.${libext}"
|
|
||||||
elif test -f "${testdir}/lib64/libpcap.${libext}" ; then
|
|
||||||
LPCAPLIB="${testdir}/lib64/libpcap.${libext}"
|
|
||||||
elif test -f "${testdir}/lib/libpcap.${libext}" ; then
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
Uptream-Status: Pending
|
|
||||||
|
|
||||||
Signed-off-by: Zongchun Yu <Zongchun.Yu@freescale.com>
|
|
||||||
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -758,6 +758,8 @@
|
|
||||||
AC_MSG_RESULT(no)
|
|
||||||
])
|
|
||||||
|
|
||||||
+ac_cv_have_bpf=no
|
|
||||||
+
|
|
||||||
have_bpf=no
|
|
||||||
dnl Check for BSD's BPF
|
|
||||||
AC_CACHE_CHECK([for BPF device sending support], ac_cv_have_bpf,
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
SUMMARY = "Use previously captured traffic to test network devices"
|
|
||||||
|
|
||||||
HOMEPAGE = "http://tcpreplay.synfin.net/"
|
|
||||||
SECTION = "net"
|
|
||||||
|
|
||||||
LICENSE = "GPLv3"
|
|
||||||
LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=c33cccf72cc1603e8a72a84811ae3ac8"
|
|
||||||
|
|
||||||
SRC_URI = "http://prdownloads.sourceforge.net/tcpreplay/${PV}/tcpreplay-${PV}.tar.gz \
|
|
||||||
file://tcpreplay-3.4.4-cross-compile.patch \
|
|
||||||
file://tcpreplay-3.4.4-no-bfp-support.patch \
|
|
||||||
file://tcpreplay-3.4.4-fix-unable-to-link-libpcap-issue.patch \
|
|
||||||
file://tcpreplay-3.4.4-improve-search-for-libpcap.patch \
|
|
||||||
"
|
|
||||||
SRC_URI[md5sum] = "22725feb9b2590809f9350308ec65180"
|
|
||||||
SRC_URI[sha256sum] = "7a809c58ddec86407fd6e5597ac883d7874a19bea81d716bb2b1c6e3b0e7b58f"
|
|
||||||
|
|
||||||
DEPENDS = "libpcap"
|
|
||||||
|
|
||||||
EXTRA_OECONF += "--with-libpcap=${STAGING_DIR_HOST}/usr"
|
|
||||||
|
|
||||||
inherit siteinfo autotools-brokensep
|
|
||||||
|
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
SUMMARY = "Use previously captured traffic to test network devices"
|
||||||
|
|
||||||
|
HOMEPAGE = "http://tcpreplay.synfin.net/"
|
||||||
|
SECTION = "net"
|
||||||
|
|
||||||
|
LICENSE = "GPLv3"
|
||||||
|
LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=890b830b22fd632e9ffd996df20338f8"
|
||||||
|
|
||||||
|
SRC_URI = "http://prdownloads.sourceforge.net/tcpreplay/${PV}/tcpreplay-${PV}.tar.gz \
|
||||||
|
"
|
||||||
|
SRC_URI[md5sum] = "80394c33fe697b53b69eac9bb0968ae9"
|
||||||
|
SRC_URI[sha256sum] = "61b916ef91049cad2a9ddc8de6f5e3e3cc5d9998dbb644dc91cf3a798497ffe4"
|
||||||
|
|
||||||
|
DEPENDS = "libpcap"
|
||||||
|
|
||||||
|
EXTRA_OECONF += "--with-libpcap=${STAGING_DIR_HOST}/usr"
|
||||||
|
|
||||||
|
inherit siteinfo autotools-brokensep
|
||||||
|
|
||||||
Reference in New Issue
Block a user