Hi ports@, Here is a diff to update slowhttptest to 1.7 and take maintainership.
Notable changes: - SlowHTTPTest is now hosted on GitHub - Remove both patches, as upstream fixed those issues, see links below https://github.com/shekyan/slowhttptest/commit/e30645b279a83278d158e0b024b74abf714e76ff https://github.com/shekyan/slowhttptest/commit/af5dbb5aaa74ecb30cf2e650b913eb83fd048002 Comments? OK? Index: Makefile =================================================================== RCS file: /cvs/ports/www/slowhttptest/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- Makefile 12 Jul 2019 20:51:05 -0000 1.12 +++ Makefile 3 Oct 2019 07:45:45 -0000 @@ -2,26 +2,22 @@ COMMENT= test tool for slow HTTP reads/posts -DISTNAME = slowhttptest-1.6 -REVISION = 3 +GH_ACCOUNT= shekyan +GH_PROJECT= slowhttptest +GH_TAGNAME= v1.7 CATEGORIES= www security -HOMEPAGE= https://slowhttptest.googlecode.com/ +MAINTAINER= Frederic Cambus <fcam...@openbsd.org> # Apache 2.0 PERMIT_PACKAGE= Yes -WANTLIB += c crypto m ssl ${COMPILER_LIBCXX} +WANTLIB += c m ssl ${COMPILER_LIBCXX} COMPILER = base-clang ports-gcc base-gcc -MASTER_SITES= ${HOMEPAGE}files/ - SEPARATE_BUILD= simple CONFIGURE_STYLE= gnu -LDFLAGS+= -lcrypto -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" -MAKE_FLAGS= LDFLAGS="${LDFLAGS}" .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/www/slowhttptest/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo 1 Dec 2013 05:43:54 -0000 1.3 +++ distinfo 3 Oct 2019 07:45:45 -0000 @@ -1,2 +1,2 @@ -SHA256 (slowhttptest-1.6.tar.gz) = d8VKZM+l8SqEcpgz2bmNXyf4KPUaXkKtWRRILQsr0NY= -SIZE (slowhttptest-1.6.tar.gz) = 109829 +SHA256 (slowhttptest-1.7.tar.gz) = n9POSwp92i6WIQseQ4wMjskkoT5mmUEKyFMCJLKc+44= +SIZE (slowhttptest-1.7.tar.gz) = 117115 Index: patches/patch-src_slowhttptest_cc =================================================================== RCS file: patches/patch-src_slowhttptest_cc diff -N patches/patch-src_slowhttptest_cc --- patches/patch-src_slowhttptest_cc 8 Apr 2018 19:35:24 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,36 +0,0 @@ -$OpenBSD: patch-src_slowhttptest_cc,v 1.1 2018/04/08 19:35:24 jasper Exp $ - -error: invalid suffix on literal; C++11 requires a space between literal and identifier - -Index: src/slowhttptest.cc ---- src/slowhttptest.cc.orig -+++ src/slowhttptest.cc -@@ -560,20 +560,20 @@ void SlowHTTPTest::report_status(bool to_stats) { - !is_dosed_ * num_connections_); - } - } else { -- slowlog(LOG_INFO, cLGN"\nslow HTTP test status on "cGRN"%d"cLGN"th second:\n\n" -- cLGN"initializing:" cLGN" %d\n" -- cLGN"pending: " cLGN" %d\n" -- cLGN"connected: " cLGN" %d\n" -- cLGN"error: " cLGN" %d\n" -- cLGN"closed: " cLGN" %d\n" -- cLGN"service available:"cLGN" %s\n"cRST, -+ slowlog(LOG_INFO, cLGN "\nslow HTTP test status on " cGRN "%d" cLGN "th second:\n\n" -+ cLGN "initializing:" cLGN " %d\n" -+ cLGN "pending: " cLGN " %d\n" -+ cLGN "connected: " cLGN " %d\n" -+ cLGN "error: " cLGN " %d\n" -+ cLGN "closed: " cLGN " %d\n" -+ cLGN "service available:" cLGN " %s\n" cRST, - seconds_passed_, - initializing_, - connecting_, - connected_, - errored_, - closed_, -- is_dosed_ ? cLRD"NO"cRST: cLGN"YES"cRST); -+ is_dosed_ ? cLRD "NO" cRST: cLGN "YES" cRST); - } - } - Index: patches/patch-src_slowhttptestmain_cc =================================================================== RCS file: patches/patch-src_slowhttptestmain_cc diff -N patches/patch-src_slowhttptestmain_cc --- patches/patch-src_slowhttptestmain_cc 25 Apr 2018 20:13:04 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,29 +0,0 @@ -$OpenBSD: patch-src_slowhttptestmain_cc,v 1.2 2018/04/25 20:13:04 naddy Exp $ - -error: invalid suffix on literal; C++11 requires a space between literal and identifier - -Index: src/slowhttptestmain.cc ---- src/slowhttptestmain.cc.orig -+++ src/slowhttptestmain.cc -@@ -44,10 +44,10 @@ static void info() { - } - static void usage() { - printf( -- "\n"PACKAGE", a tool to test for slow HTTP " -+ "\n" PACKAGE ", a tool to test for slow HTTP " - "DoS vulnerabilities - version " VERSION "\n" - "Usage: " -- PACKAGE" [options ...]" -+ PACKAGE " [options ...]" - "\n" - "Test modes:\n" - " -H slow headers a.k.a. Slowloris (default)\n" -@@ -158,7 +158,7 @@ int main(int argc, char **argv) { - SlowTestType type = slowhttptest::eHeader; - ProxyType proxy_type = slowhttptest::eNoProxy; - long tmp; -- char o; -+ int o; - while((o = getopt(argc, argv, ":HBRXgha:b:c:d:e:i:k:l:n:o:p:r:s:t:u:v:w:x:y:z:")) != -1) { - switch (o) { - case 'a':
