diff --git a/Make-the-debug-package-compile.patch b/Make-the-debug-package-compile.patch deleted file mode 100644 index 744ee40..0000000 --- a/Make-the-debug-package-compile.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 4521b0de64177b030dc946adf1f6e1622bea85fc Mon Sep 17 00:00:00 2001 -From: hht8 -Date: Mon, 28 Jun 2021 17:03:12 +0800 -Subject: [PATCH] 1 - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index d555f0a..2a4c264 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,4 +1,4 @@ --CFLAGS += -std=c99 -Wall -O2 -D_REENTRANT -+CFLAGS += -std=c99 -Wall -O2 -D_REENTRANT $(OPTFLAGS) - LIBS := -lpthread -lm -lssl -lcrypto - - TARGET := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown) --- -2.23.0 - diff --git a/fix-wrk-version-or-v-error.patch b/fix-wrk-version-or-v-error.patch index 75e38ca..e983135 100644 --- a/fix-wrk-version-or-v-error.patch +++ b/fix-wrk-version-or-v-error.patch @@ -15,7 +15,7 @@ index 2d0ac84..20e79ec 100644 #include "ae.h" #include "http_parser.h" -+#define VERSION "4.1.0" ++#define VERSION "4.2.0" #define RECVBUF 8192 #define MAX_THREAD_RATE_S 10000000 diff --git a/wrk-4.1.0.tar.gz b/wrk-4.1.0.tar.gz deleted file mode 100644 index 0b7bf3e..0000000 Binary files a/wrk-4.1.0.tar.gz and /dev/null differ diff --git a/wrk-4.2.0.tar.gz b/wrk-4.2.0.tar.gz new file mode 100644 index 0000000..01ff67f Binary files /dev/null and b/wrk-4.2.0.tar.gz differ diff --git a/wrk-4.2.0_distrofixes.patch b/wrk-4.2.0_distrofixes.patch new file mode 100644 index 0000000..79553cf --- /dev/null +++ b/wrk-4.2.0_distrofixes.patch @@ -0,0 +1,19 @@ +diff --color -ur wrk-4.2.0.orig/Makefile wrk-4.2.0/Makefile +--- wrk-4.2.0.orig/Makefile 2021-02-07 08:13:05.000000000 +0100 ++++ wrk-4.2.0/Makefile 2023-01-10 17:01:58.610896091 +0100 +@@ -1,4 +1,4 @@ +-CFLAGS += -std=c99 -Wall -O2 -D_REENTRANT ++CFLAGS += -std=c99 -Wall -O2 -D_REENTRANT $(OPTFLAGS) + LIBS := -lm -lssl -lcrypto -lpthread + + TARGET := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown) +@@ -67,8 +67,7 @@ + @echo 'const char *VERSION="$(VER)";' | $(CC) -xc -c -o $@ - + + $(ODIR)/%.o : %.c +- @echo CC $< +- @$(CC) $(CFLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS) -c -o $@ $< + + # Dependencies + diff --git a/wrk.spec b/wrk.spec index b157240..da73641 100644 --- a/wrk.spec +++ b/wrk.spec @@ -1,11 +1,11 @@ Name: wrk -Version: 4.1.0 -Release: 2 +Version: 4.2.0 +Release: 1 Summary: Modern HTTP benchmarking tool License: Apache-2.0 URL: https://github.com/wg/wrk Source0: https://github.com/wg/wrk/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch0: Make-the-debug-package-compile.patch +Patch0: wrk-4.2.0_distrofixes.patch Patch1: fix-wrk-version-or-v-error.patch BuildRequires: pkgconf openssl-devel %description @@ -31,6 +31,9 @@ install -D -m 0755 wrk %{buildroot}%{_bindir}/wrk %{_bindir}/wrk %changelog +* Wed Oct 25 2023 liyanan - 4.2.0-1 +- Update to 4.2.0 + * Thu Oct 14 2021 wangyue - 4.1.0-2 - fix wrk --version/-v error