summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/gatling/Makefile12
-rw-r--r--package/gatling/patches/patch-GNUmakefile16
-rw-r--r--package/gatling/patches/patch-http_c19
3 files changed, 32 insertions, 15 deletions
diff --git a/package/gatling/Makefile b/package/gatling/Makefile
index 300d1690a..356ea4c3a 100644
--- a/package/gatling/Makefile
+++ b/package/gatling/Makefile
@@ -4,16 +4,15 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= gatling
-PKG_VERSION:= 0.11
+PKG_VERSION:= 0.16
PKG_RELEASE:= 1
-PKG_HASH:= 9e1cb18612905b63755b0f463e6c5268789b3ab47db364bebe1ad077583e7571
+PKG_HASH:= 5f96438ee201d7f1f6c2e0849ff273b196bdc7493f29a719ce8ed08c8be6365b
PKG_DESCR:= small non-forking webserver
PKG_SECTION:= net/http
PKG_BUILDDEP:= libowfat
-PKG_URL:= http://www.fefe.de/gatling/
-PKG_SITES:= http://dl.fefe.de/
-
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+PKG_NEEDS:= iconv
+PKG_URL:= https://www.fefe.de/gatling/
+PKG_SITES:= https://www.fefe.de/gatling/
include ${ADK_TOPDIR}/mk/package.mk
@@ -24,7 +23,6 @@ INSTALL_STYLE:= manual
MAKE_FILE:= GNUmakefile
ALL_TARGET:= gatling
-TARGET_CPPFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/owfat
XAKE_FLAGS+= CC='${TARGET_CC}' \
CFLAGS='${TARGET_CPPFLAGS} ${TARGET_CFLAGS}' \
ZLIB=0 DIET= prefix='${WRKINST}/usr'
diff --git a/package/gatling/patches/patch-GNUmakefile b/package/gatling/patches/patch-GNUmakefile
index 723400f5a..4c81b6a99 100644
--- a/package/gatling/patches/patch-GNUmakefile
+++ b/package/gatling/patches/patch-GNUmakefile
@@ -1,16 +1,16 @@
$Id$
---- gatling-0.11.orig/GNUmakefile 2008-12-05 13:31:01.000000000 +0100
-+++ gatling-0.11/GNUmakefile 2011-01-15 14:10:40.000000000 +0100
-@@ -17,7 +17,7 @@ CROSS=
- #CROSS=i686-mingw32-
- CC=$(CROSS)gcc
+--- gatling-0.16.orig/GNUmakefile 2020-05-13 15:53:27.000000000 +0200
++++ gatling-0.16/GNUmakefile 2024-02-23 04:29:47.451896784 +0100
+@@ -25,7 +25,7 @@ CC=$(CROSS)gcc
+ endif
+
CFLAGS=-pipe -Wall
-LDFLAGS=
+LDFLAGS?=
- path = $(subst :, ,$(PATH))
- diet_path = $(foreach dir,$(path),$(wildcard $(dir)/diet))
-@@ -147,9 +147,10 @@ havesetresuid.h: trysetresuid.c
+ #CFLAGS+=-DSTATE_DEBUG -DMOREDEBUG -DDEBUG_EVENTS -DSMDEBUG
+
+@@ -194,9 +194,10 @@ havesetresuid.h: trysetresuid.c
dummy.c:
touch $@
diff --git a/package/gatling/patches/patch-http_c b/package/gatling/patches/patch-http_c
new file mode 100644
index 000000000..7e7c9ff93
--- /dev/null
+++ b/package/gatling/patches/patch-http_c
@@ -0,0 +1,19 @@
+--- gatling-0.16.orig/http.c 2020-11-26 16:36:13.000000000 +0100
++++ gatling-0.16/http.c 2024-02-23 05:17:40.115857819 +0100
+@@ -2202,16 +2202,9 @@ static void get_md5_randomness(const uin
+ static int initialized;
+ if (!initialized) {
+ unsigned char buf[16];
+-#if defined(__linux__) || defined(__OpenBSD__)
+- if (getentropy(buf, sizeof buf)) {
+- buffer_putsflush(buffer_2, "getentropy failed (should never happen)\n");
+- // carry on with bad randomness
+- }
+-#else
+ int fd=open("/dev/urandom",O_RDONLY);
+ read(fd,buf,16);
+ close(fd);
+-#endif
+ MD5Init(&md5_ctx);
+ MD5Update(&md5_ctx,buf,16);
+ initialized=1;