From: Alexandru Ardelean <redacted>
Date: Wed, 17 Jul 2024 11:12:13 +0000 (+0300)
Subject: tcpreplay: bump to version 4.5.1
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=c986d6758f0dd1c0aa55403fb1b51ade67763ef0;p=openwrt-packages.git

tcpreplay: bump to version 4.5.1

Dropped CVE patch.
It's included.

Signed-off-by: Alexandru Ardelean <redacted>
---

diff --git a/net/tcpreplay/Makefile b/net/tcpreplay/Makefile
index 2ffb016c8..55c4d33c8 100644
--- a/net/tcpreplay/Makefile
+++ b/net/tcpreplay/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tcpreplay
-PKG_VERSION:=4.4.4
-PKG_RELEASE:=2
+PKG_VERSION:=4.5.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/appneta/tcpreplay/releases/download/v$(PKG_VERSION)
-PKG_HASH:=3ff9753cc43bb15e77832cee657e3030dbcdd957fa247e6abacc605689e24051
+PKG_HASH:=5126613f783062b43f514b05ad981376050a8fee35b03c8de4445ddeefd95049
 
 PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILES:=docs/LICENSE
diff --git a/net/tcpreplay/patches/010-CVE-2023-4256.patch b/net/tcpreplay/patches/010-CVE-2023-4256.patch
deleted file mode 100644
index ac82875bf..000000000
--- a/net/tcpreplay/patches/010-CVE-2023-4256.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 55ad9d1d701e644ed5b8821456e31acf2e72920c Mon Sep 17 00:00:00 2001
-From: Gabriel Ganne <gabriel.ganne@gmail.com>
-Date: Sun, 28 Jan 2024 10:02:30 +0100
-Subject: [PATCH] allow recursice call to tcpedit_dlt_cleanup()
-
-This is just a quick hack to prevent a double-free should
-tcpedit_dlt_cleanup() call itself, which can hapen through dlt_jnpr_ether_cleanup()
-
-Ref: #813
----
- src/tcpedit/plugins/dlt_jnpr_ether/jnpr_ether.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/src/tcpedit/plugins/dlt_jnpr_ether/jnpr_ether.c
-+++ b/src/tcpedit/plugins/dlt_jnpr_ether/jnpr_ether.c
-@@ -164,8 +164,10 @@ 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->subctx != NULL) {
-+            ctx->decoded_extra = NULL;
-             tcpedit_dlt_cleanup(config->subctx);
-+        }
-         safe_free(plugin->config);
-         plugin->config = NULL;
-         plugin->config_size = 0;