[Buildroot] [PATCH 14/14] tcpreplay: bump to version 4.0.3

Chris Packham judge.packham at gmail.com
Tue Mar 11 03:48:19 UTC 2014


Hi,

On Tue, Mar 11, 2014 at 9:26 AM, Gustavo Zacarias
<gustavo at zacarias.com.ar> wrote:
> Patch removed, already upstream.
>
> Signed-off-by: Gustavo Zacarias <gustavo at zacarias.com.ar>
> ---
>  ...ild-errors-when-ENABLE_VERBOSE-is-not-set.patch | 54 ----------------------
>  package/tcpreplay/tcpreplay.mk                     |  2 +-
>  2 files changed, 1 insertion(+), 55 deletions(-)
>  delete mode 100644 package/tcpreplay/tcpreplay-0001-Fix-build-errors-when-ENABLE_VERBOSE-is-not-set.patch

Beat me to it :)

Looks good to me

Reviewed-by: Chris Packham <judge.packham at gmail.com>

>
> diff --git a/package/tcpreplay/tcpreplay-0001-Fix-build-errors-when-ENABLE_VERBOSE-is-not-set.patch b/package/tcpreplay/tcpreplay-0001-Fix-build-errors-when-ENABLE_VERBOSE-is-not-set.patch
> deleted file mode 100644
> index cbc829d..0000000
> --- a/package/tcpreplay/tcpreplay-0001-Fix-build-errors-when-ENABLE_VERBOSE-is-not-set.patch
> +++ /dev/null
> @@ -1,54 +0,0 @@
> -From 12d0d0876a9a9bf2818ba24ecb5646952b958c39 Mon Sep 17 00:00:00 2001
> -From: Chris Packham <judge.packham at gmail.com>
> -Date: Wed, 22 Jan 2014 20:37:04 +1300
> -Subject: [PATCH] Fix build errors when ENABLE_VERBOSE is not set
> -
> -Upstream: https://github.com/cpackham/tcpreplay/commit/12d0d0876a9a9
> -Fixes #59
> -
> -When ENABLE_VERBOSE is not set some additional calls to tcpreplay_seterr
> -are made. When conforming to C99 variadic macros at least one argument is
> -required after the format string[1]. To avoid this problem update the
> -calls to tcpreplay_seterr to use a "%s" format string.
> -
> -[1] - http://gcc.gnu.org/onlinedocs/cpp/Variadic-Macros.html
> -
> -Signed-off-by: Chris Packham <judge.packham at gmail.com>
> ----
> - src/tcpreplay_api.c | 6 +++---
> - 1 file changed, 3 insertions(+), 3 deletions(-)
> -
> -diff --git a/src/tcpreplay_api.c b/src/tcpreplay_api.c
> -index 6b81bcc..de67080 100644
> ---- a/src/tcpreplay_api.c
> -+++ b/src/tcpreplay_api.c
> -@@ -690,7 +690,7 @@ tcpreplay_set_verbose(tcpreplay_t *ctx, bool value)
> -     ctx->options->verbose = value;
> -     return 0;
> - #else
> --    tcpreplay_seterr(ctx, "verbose mode not supported");
> -+    tcpreplay_seterr(ctx, "%s", "verbose mode not supported");
> -     return -1;
> - #endif
> - }
> -@@ -710,7 +710,7 @@ tcpreplay_set_tcpdump_args(tcpreplay_t *ctx, char *value)
> -     ctx->options->tcpdump_args = safe_strdup(value);
> -     return 0;
> - #else
> --    tcpreplay_seterr(ctx, "verbose mode not supported");
> -+    tcpreplay_seterr(ctx, "%s", "verbose mode not supported");
> -     return -1;
> - #endif
> - }
> -@@ -731,7 +731,7 @@ tcpreplay_set_tcpdump(tcpreplay_t *ctx, tcpdump_t *value)
> -     ctx->options->tcpdump = value;
> -     return 0;
> - #else
> --    tcpreplay_seterr(ctx, "verbose mode not supported");
> -+    tcpreplay_seterr(ctx, "%s", "verbose mode not supported");
> -     return -1;
> - #endif
> - }
> ---
> -1.8.5.2
> -
> diff --git a/package/tcpreplay/tcpreplay.mk b/package/tcpreplay/tcpreplay.mk
> index fdb42a5..e1ff1f5 100644
> --- a/package/tcpreplay/tcpreplay.mk
> +++ b/package/tcpreplay/tcpreplay.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>
> -TCPREPLAY_VERSION = 4.0.2
> +TCPREPLAY_VERSION = 4.0.3
>  TCPREPLAY_SITE = http://downloads.sourceforge.net/project/tcpreplay/tcpreplay/$(TCPREPLAY_VERSION)
>  TCPREPLAY_LICENSE = GPLv3
>  TCPREPLAY_LICENSE_FILES = docs/LICENSE
> --
> 1.8.3.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot


More information about the buildroot mailing list