commit wrk for openSUSE:Factory
Hello community, here is the log from the commit of package wrk for openSUSE:Factory checked in at 2016-04-30 23:31:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wrk (Old) and /work/SRC/openSUSE:Factory/.wrk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wrk" Changes: -------- --- /work/SRC/openSUSE:Factory/wrk/wrk.changes 2016-01-28 17:23:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.wrk.new/wrk.changes 2016-04-30 23:31:18.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Apr 27 11:13:53 UTC 2016 - mpluskal@suse.com + +- Update to 4.0.2 + * Send hostname using TLS SNI. + * Add optional WITH_OPENSSL and WITH_LUAJIT to use system libs. + * Bundle OpenSSL 1.0.2. + * delay() can return milliseconds to delay sending next request. +- Use pretty source name +- Refresh wrk-3.1.2_distrofixes.patch + +------------------------------------------------------------------- Old: ---- 4.0.1.tar.gz New: ---- wrk-4.0.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wrk.spec ++++++ --- /var/tmp/diff_new_pack.Xey2b0/_old 2016-04-30 23:31:19.000000000 +0200 +++ /var/tmp/diff_new_pack.Xey2b0/_new 2016-04-30 23:31:19.000000000 +0200 @@ -17,16 +17,18 @@ Name: wrk -Version: 4.0.1 +Version: 4.0.2 Release: 0 Summary: Modern HTTP benchmarking tool License: Apache-2.0 Group: Productivity/Networking/Web/Utilities Url: https://github.com/wg/wrk -Source: https://github.com/wg/wrk/archive/%{version}.tar.gz +Source: https://github.com/wg/wrk/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Patch0: wrk-3.1.2_distrofixes.patch -BuildRequires: openssl-devel BuildRequires: pkg-config +BuildRequires: pkgconfig +#BuildRequires: pkgconfig(luajit) +BuildRequires: pkgconfig(openssl) BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: aarch64 ppc ppc64 ppc64le @@ -37,15 +39,17 @@ An optional LuaJIT script can perform HTTP request generation, response processing, and custom reporting. Several example scripts are located in -scripts/ +scripts. %prep %setup -q %patch0 %build -make %{?_smp_mflags} -C deps/luajit/src BUILDMODE=static CCOPT="%{optflags} -fomit-frame-pointer" -make %{?_smp_mflags} OPTFLAGS="%{optflags}" +# current luajit in TW seems to be broken +# sed -i 's|luajit-2.0|luajit-5_1-2.0|g' src/* +# make %{?_smp_mflags} OPTFLAGS="%{optflags}" WITH_OPENSSL=/usr WITH_LUAJIT=/usr +make %{?_smp_mflags} OPTFLAGS="%{optflags}" WITH_OPENSSL=%{_prefix} %install install -D -m 0755 wrk %{buildroot}%{_bindir}/wrk ++++++ wrk-3.1.2_distrofixes.patch ++++++ --- /var/tmp/diff_new_pack.Xey2b0/_old 2016-04-30 23:31:19.000000000 +0200 +++ /var/tmp/diff_new_pack.Xey2b0/_new 2016-04-30 23:31:19.000000000 +0200 @@ -3,34 +3,18 @@ --- Makefile.orig +++ Makefile @@ -1,4 +1,4 @@ --CFLAGS := -std=c99 -Wall -O2 -D_REENTRANT +-CFLAGS += -std=c99 -Wall -O2 -D_REENTRANT +CFLAGS := -std=c99 -Wall -O2 -D_REENTRANT $(OPTFLAGS) - LIBS := -lpthread -lm -lcrypto -lssl + LIBS := -lpthread -lm -lssl -lcrypto TARGET := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown) -@@ -49,8 +49,7 @@ $(ODIR)/bytecode.o: src/wrk.lua - @$(SHELL) -c 'cd $(LDIR) && ./luajit -b $(CURDIR)/$< $(CURDIR)/$@' +@@ -66,8 +66,7 @@ $(ODIR)/version.o: + @echo 'const char *VERSION="$(VER)";' | $(CC) -xc -c -o $@ - $(ODIR)/%.o : %.c - @echo CC $< - @$(CC) $(CFLAGS) -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< - $(LDIR)/libluajit.a: - @echo Building LuaJIT... -Index: deps/luajit/src/Makefile -=================================================================== ---- deps/luajit/src/Makefile.orig -+++ deps/luajit/src/Makefile -@@ -559,9 +559,9 @@ endif - endif - endif + # Dependencies --Q= @ -+#Q= @ - E= @echo --#Q= -+Q= - #E= @: - - ##############################################################################
participants (1)
-
root@hilbert.suse.de