4 files changed, 1 insertions, 164 deletions

diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-do-not-run-conftest-in-case-of-cross-co.patch b/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-do-not-run-conftest-in-case-of-cross-co.patch
deleted file mode 100644
index 08cb3b88fa..0000000000
--- a/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-do-not-run-conftest-in-case-of-cross-co.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 42f7bbc1ce4913fe2c0bc76293c5445d31690f5d Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-Date: Thu, 7 Mar 2024 21:02:07 -0800
-Subject: [PATCH] configure.ac: do not run conftest in case of cross
- compilation
-
-It'll give us nothing but error like below:
-
-  ./conftest: cannot execute binary file: Exec format error
-  ...
-  ./configure: line 23950: test: -eq: unary operator expected
-
-The version check only has effect on Apple systems. We'd better
-avoid error like above when cross compilation.
-
-Also, in case of cross compilation, instead of having the above
-Exec format error and resulting in unaligned_cv_fail to yes, set
-it directly to yes.
-
-Upstream-Status: Submitted [https://github.com/appneta/tcpreplay/pull/849]
-
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 387219de..15201601 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -928,7 +928,7 @@ cat >conftest.c <<EOF
- EOF
- ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LPCAPLIB \
-     conftest.c $LIBS >/dev/null 2>&1
--if test -x conftest ; then
-+if test -x conftest -a "$cross_compiling" != "yes"; then
-     full_libpcap_version=$(LD_LIBRARY_PATH="$LPCAP_LD_LIBRARY_PATH" ./conftest)
-     libpcap_version=$(echo "$full_libpcap_version" | ${CUT} -d' ' -f3)
-     pcap_version_ok=yes
-@@ -1709,7 +1709,7 @@ case "$host_os" in
- EOF
-         ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS \
-             conftest.c $LIBS >/dev/null 2>&1
--        if test ! -x conftest ; then
-+        if test ! -x conftest -o "$cross_compiling" = "yes" ; then
-             dnl failed to compile for some reason
-             unaligned_cv_fail=yes
-         else
--- 
-2.42.0
-
diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch b/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch
deleted file mode 100644
index 709d2cccbc..0000000000
--- a/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 5f8c78362b3b1e06f5adff2d4b140509c4799894 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Sun, 3 Sep 2023 12:31:59 +0200
-Subject: [PATCH] configure.ac: unify search dirs for pcap and add lib32
-
-* add lib32 because when building lib32-tcpreplay it's
-  impossible to set --with-libpcap so that it would find
-  both include files as well as the library in lib32 directory
-
-* maybe it would be beneficial to split --with-libpcap
-  into --with-libpcap-includedir --with-libpcap-libdir as this
-  already searches in the --with-libpcap value with and
-  without any "lib" prefix, but include files always expect
-  "include" dir there
-
-* most of this code was added in:
-  https://github.com/appneta/tcpreplay/commit/202b8e82f9fd3c84ce5804577caeb36a33baabe7#diff-49473dca262eeab3b4a43002adb08b4db31020d190caaad1594b47f1d5daa810R570
-
-* then search for
-  ${host_cpu} lib/${host_cpu} (without -${host_os} suffix)
-  and ${build_arch}-${host_os} lib/${build_arch}-${host_os}
-  was added, but only for search of dynamic library in:
-  https://github.com/appneta/tcpreplay/commit/c3d5236563985a99f8bb02c3f1bd6950e3929047
-
-* ${build_arch}-${host_os} lib/${build_arch}-${host_os}
-  was later replaced with:
-  lib/${MULTIARCH} ${MULTIARCH}
-  and it was added to static library search as well
-
-  but for dynamic library it was searching in reversed order:
-  ${MULTIARCH} lib/${MULTIARCH}
-  https://github.com/appneta/tcpreplay/commit/ed9e3a818bde04813144014561e62f018c9eb85f
-
-  I don't think this reversed order was intentional, just unify all 4 cases
-  to use the same directories in the same order
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-Upstream-Status: Submitted [https://github.com/appneta/tcpreplay/pull/819]
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 387219de..26ba31a5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -671,7 +671,7 @@ AC_ARG_WITH(libpcap,
-         LPCAPINCDIR=${testdir}
-         if test $dynamic_link = yes; then
-             for ext in .dylib .so .tbd ; do
--                for dir in . lib lib64 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do
-+                for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do
-                     sharefile=$(ls ${testdir}/$dir/libpcap${ext}* 2> /dev/null | sort | head -n1)
-                     if test -n "${sharefile}"; then
-                         LPCAP_LD_LIBRARY_PATH="$(dirname ${sharefile})"
-@@ -690,7 +690,7 @@ AC_ARG_WITH(libpcap,
-             dnl If dynamic library not found, try static
-             dnl
-             for ext in ${libext} .a .A.tbd ; do
--                for dir in . lib lib64 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do
-+                for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do
-                     staticfile=$(ls ${testdir}/$dir/libpcap${ext} 2> /dev/null | sort | head -n1)
-                     if test -n "${staticfile}"; then
-                         LPCAPLIB="${staticfile}"
-@@ -771,7 +771,7 @@ AC_ARG_WITH(libpcap,
-                 LPCAPINCDIR="${testdir}/include"
-                 if test $dynamic_link = yes; then
-                     for ext in .dylib .so .tbd; do
--                        for dir in . lib lib64 ${host_cpu} lib/${host_cpu} ${host_cpu}-${host_os} lib/${host_cpu}-${host_os} ${MULTIARCH} lib/${MULTIARCH}; do
-+                        for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do
-                             sharefile=$(ls "${testdir}/$dir/libpcap${ext}" 2> /dev/null | sort | head -n1)
-                             if test -n "${sharefile}"; then
-                                 LPCAPLIB="-L$(dirname ${sharefile}) -lpcap"
-@@ -790,7 +790,7 @@ AC_ARG_WITH(libpcap,
-                     dnl If dynamic library not found, try static
-                     dnl
-                     for ext in ${libext} .a .A.tbd ; do
--                        for dir in . lib lib64 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do
-+                        for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do
-                             staticfile=$(ls "${testdir}/$dir/libpcap${ext}" 2> /dev/null | sort | head -n1)
-                             if test -n "${staticfile}"; then
-                                 LPCAPLIB="${staticfile}"
diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay/CVE-2023-4256.patch b/meta-networking/recipes-support/tcpreplay/tcpreplay/CVE-2023-4256.patch
deleted file mode 100644
index 2e4eee025b..0000000000
--- a/meta-networking/recipes-support/tcpreplay/tcpreplay/CVE-2023-4256.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 62bc10d4f1d2c9e2833ef2898fb0170e9300a9dd Mon Sep 17 00:00:00 2001
-From: Marsman1996 <lqliuyuwei@outlook.com>
-Date: Tue, 2 Apr 2024 17:29:21 +0800
-Subject: [PATCH] dlt_jnpr_ether_cleanup: check config before cleanup
-
-CVE: CVE-2023-4256
-Upstream-Status: Backport [https://github.com/appneta/tcpreplay/pull/851]
-Signed-off-by: Poonam Jadhav <poonam.jadhav@kpit.com>
----
- src/tcpedit/plugins/dlt_jnpr_ether/jnpr_ether.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/tcpedit/plugins/dlt_jnpr_ether/jnpr_ether.c b/src/tcpedit/plugins/dlt_jnpr_ether/jnpr_ether.c
-index c53ec297..9642a2c2 100644
---- a/src/tcpedit/plugins/dlt_jnpr_ether/jnpr_ether.c
-+++ b/src/tcpedit/plugins/dlt_jnpr_ether/jnpr_ether.c
-@@ -164,8 +164,9 @@ dlt_jnpr_ether_cleanup(tcpeditdlt_t *ctx)
-         jnpr_ether_config_t *config;
- 
-         config = (jnpr_ether_config_t *)ctx->encoder->config;
--        if (config->subctx != NULL)
-+        if (config != NULL && config->subctx != NULL) {
-             tcpedit_dlt_cleanup(config->subctx);
-+        }
-         safe_free(plugin->config);
-         plugin->config = NULL;
-         plugin->config_size = 0;
diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.4.bb b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.1.bb
index 16cff2f0e4..f01bbb95a5 100644
--- a/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.4.bb
+++ b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.1.bb
@@ -9,12 +9,9 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=10f0474a2f0e5dccfca20f69d6598ad8"
 
 SRC_URI = "https://github.com/appneta/${BPN}/releases/download/v${PV}/${BP}.tar.gz \
     file://0001-libopts.m4-set-POSIX_SHELL-to-bin-sh.patch \
-    file://0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch \
-    file://0001-configure.ac-do-not-run-conftest-in-case-of-cross-co.patch \
-    file://CVE-2023-4256.patch \
 "
 
-SRC_URI[sha256sum] = "44f18fb6d3470ecaf77a51b901a119dae16da5be4d4140ffbb2785e37ad6d4bf"
+SRC_URI[sha256sum] = "2de79bfd67ec92ca9ae2ffb50456dd1d53ff40f3fa71b422c65e8062013c9e85"
 
 UPSTREAM_CHECK_URI = "https://github.com/appneta/tcpreplay/releases"