gatling: Bump to 0.16
This commit is contained in:
parent
c4d677f779
commit
090244b05e
|
@ -5,24 +5,41 @@ diff -uNr gatling-0.13/GNUmakefile gatling-0.13.mod/GNUmakefile
|
|||
man1dir=$(MANDIR)/man1
|
||||
|
||||
TARGETS=gatling httpbench bindbench dl ioerr bench tlsgatling_nofail \
|
||||
-pthreadbench cgi ptlsgatling_nofail
|
||||
+pthreadbench cgi
|
||||
-pthreadbench cgi ptlsgatling_nofail tlsdl_nofail ptlsdl_nofail
|
||||
+pthreadbench cgi tlsdl_nofail
|
||||
TARGETS2=mktestdata mmapbench manymapbench forkbench forksbench
|
||||
ALLTARGETS=$(TARGETS) acc hcat referrer hitprofile matchiprange getlinks \
|
||||
rellink $(TARGETS2)
|
||||
@@ -15,9 +15,8 @@
|
||||
|
||||
CROSS=
|
||||
#CROSS=i686-mingw32-
|
||||
@@ -19,13 +19,13 @@
|
||||
path = $(subst :, ,$(PATH))
|
||||
gcc_path = $(foreach dir,$(path),$(wildcard $(dir)/$(CROSS)gcc))
|
||||
ifeq ($(strip $(gcc_path)),)
|
||||
-CC=$(CROSS)clang
|
||||
+CC?=$(CROSS)clang
|
||||
else
|
||||
-CC=$(CROSS)gcc
|
||||
+CC?=$(CROSS)gcc
|
||||
endif
|
||||
|
||||
-CFLAGS=-pipe -Wall
|
||||
-LDFLAGS=
|
||||
+CC=$(CROSS)clang
|
||||
+CFLAGS=-pipe -Wall $(CPPFLAGS)
|
||||
+CFLAGS?=-pipe -Wall
|
||||
+LDFLAGS?=
|
||||
|
||||
#CFLAGS+=-DSTATE_DEBUG -DMOREDEBUG -DDEBUG_EVENTS -DSMDEBUG
|
||||
|
||||
@@ -70,10 +69,10 @@
|
||||
@@ -47,10 +47,7 @@
|
||||
CFLAGS+=-g -Og
|
||||
LDFLAGS+=-g
|
||||
else
|
||||
-CFLAGS+=-O2 -fomit-frame-pointer -I/usr/local/include
|
||||
-LDFLAGS+=-s
|
||||
ifneq ($(DIET),)
|
||||
-DIET+=-Os
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -81,10 +78,10 @@
|
||||
CC:=$(DIET) $(CC)
|
||||
|
||||
pthreadbench: pthreadbench.o
|
||||
|
|
|
@ -2,20 +2,18 @@ TERMUX_PKG_HOMEPAGE=https://www.fefe.de/gatling/
|
|||
TERMUX_PKG_DESCRIPTION="A high performance http, ftp and smb server"
|
||||
TERMUX_PKG_LICENSE="GPL-2.0"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
TERMUX_PKG_VERSION=0.15
|
||||
TERMUX_PKG_REVISION=3
|
||||
TERMUX_PKG_VERSION=0.16
|
||||
TERMUX_PKG_SRCURL=https://www.fefe.de/gatling/gatling-$TERMUX_PKG_VERSION.tar.xz
|
||||
TERMUX_PKG_SHA256=6fa329d0ced0c80deb8dde5460e9d9e984bee94f265043d7fdec0e253dce9aa4
|
||||
TERMUX_PKG_SHA256=5f96438ee201d7f1f6c2e0849ff273b196bdc7493f29a719ce8ed08c8be6365b
|
||||
TERMUX_PKG_DEPENDS="libcrypt, libiconv, openssl, zlib"
|
||||
TERMUX_PKG_BUILD_DEPENDS="libowfat"
|
||||
TERMUX_PKG_BUILD_DEPENDS="libcap, libowfat"
|
||||
TERMUX_PKG_BUILD_IN_SRC=true
|
||||
TERMUX_PKG_EXTRA_MAKE_ARGS="
|
||||
prefix=$TERMUX_PREFIX
|
||||
MANDIR=$TERMUX_PREFIX/share/man
|
||||
"
|
||||
|
||||
termux_step_make() {
|
||||
CPPFLAGS+=" -I$TERMUX_PREFIX/include/libowfat"
|
||||
termux_step_pre_configure() {
|
||||
CFLAGS+=" $CPPFLAGS"
|
||||
LDFLAGS+=" -lcrypt -lcrypto -liconv"
|
||||
make -j $TERMUX_MAKE_PROCESSES CROSS="${CC/clang}"
|
||||
}
|
||||
|
||||
termux_step_make_install() {
|
||||
make install prefix=$TERMUX_PREFIX MANDIR=$TERMUX_PREFIX/share/man
|
||||
}
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
--- ./dirfd.h.orig 2022-02-16 19:00:47.650173530 +0530
|
||||
+++ ./dirfd.h 2022-02-16 19:01:03.830173524 +0530
|
||||
@@ -21,7 +21,7 @@
|
||||
* given dir, and it will return the fd or -1 on error. */
|
||||
|
||||
#ifdef __linux__
|
||||
-int ifd; /* inotify fd */
|
||||
+extern int ifd; /* inotify fd */
|
||||
#endif
|
||||
|
||||
struct dircacheentry {
|
|
@ -0,0 +1,11 @@
|
|||
--- a/http.c
|
||||
+++ b/http.c
|
||||
@@ -2202,7 +2202,7 @@
|
||||
static int initialized;
|
||||
if (!initialized) {
|
||||
unsigned char buf[16];
|
||||
-#if defined(__linux__) || defined(__OpenBSD__)
|
||||
+#if defined(__linux__) && (!defined(__ANDROID__) || __ANDROID_API__ >= 28) || defined(__OpenBSD__)
|
||||
if (getentropy(buf, sizeof buf)) {
|
||||
buffer_putsflush(buffer_2, "getentropy failed (should never happen)\n");
|
||||
// carry on with bad randomness
|
Loading…
Reference in New Issue