Index: head/benchmarks/httperf/Makefile =================================================================== --- head/benchmarks/httperf/Makefile (revision 519199) +++ head/benchmarks/httperf/Makefile (revision 519200) @@ -1,42 +1,35 @@ # Created by: Will Andrews # $FreeBSD$ PORTNAME= httperf -PORTVERSION= 0.9.0.1 +PORTVERSION= 0.9.1 CATEGORIES= benchmarks www MAINTAINER= jlaffaye@FreeBSD.org COMMENT= Tool for measuring webserver performance LICENSE= GPLv2 GNU_CONFIGURE= yes USES= autoreconf gmake libtool ssl USE_GITHUB= yes -GH_TAGNAME= dcfb746 +GH_TAGNAME= 568322e MAKE_ARGS= LIBUTIL_OBJS=ssl_writev.o \ exec_prefix=${PREFIX} PLIST_FILES= bin/httperf \ man/man1/httperf.1.gz PORTDOCS= ChangeLog NEWS README TODO OPTIONS_DEFINE= DOCS -.include - -.if ${SSL_DEFAULT} == base -BROKEN_FreeBSD_12= error: incomplete definition of type 'struct ssl_cipher_st' -BROKEN_FreeBSD_13= error: incomplete definition of type 'struct ssl_cipher_st' -.endif - do-install: ${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1 ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} -.include +.include Index: head/benchmarks/httperf/distinfo =================================================================== --- head/benchmarks/httperf/distinfo (revision 519199) +++ head/benchmarks/httperf/distinfo (revision 519200) @@ -1,2 +1,3 @@ -SHA256 (httperf-httperf-0.9.0.1-dcfb746_GH0.tar.gz) = 72294a3cbfd78b48f38b077f7a380ef24b69f3bc24f6ec87875f2f069153677d -SIZE (httperf-httperf-0.9.0.1-dcfb746_GH0.tar.gz) = 103950 +TIMESTAMP = 1567099566 +SHA256 (httperf-httperf-0.9.1-568322e_GH0.tar.gz) = 03fea35c6a1ce4c4a5461b45708659ffc48906b63816721eec20cc01f9d2d1c0 +SIZE (httperf-httperf-0.9.1-568322e_GH0.tar.gz) = 107694 Index: head/benchmarks/httperf/files/patch-nossl23 =================================================================== --- head/benchmarks/httperf/files/patch-nossl23 (revision 519199) +++ head/benchmarks/httperf/files/patch-nossl23 (nonexistent) @@ -1,45 +0,0 @@ ---- src/httperf.c -+++ src/httperf.c -@@ -664,10 +664,14 @@ main(int argc, char **argv) - { - if (strcasecmp (optarg, "auto") == 0) - param.ssl_protocol = 0; -+#ifndef OPENSSL_NO_SSL2 - else if (strcasecmp (optarg, "SSLv2") == 0) - param.ssl_protocol = 2; -+#endif -+#ifndef OPENSSL_NO_SSL3 - else if (strcasecmp (optarg, "SSLv3") == 0) - param.ssl_protocol = 3; -+#endif - else if (strcasecmp (optarg, "TLSv1") == 0) - param.ssl_protocol = 4; - else -@@ -997,10 +1001,14 @@ main(int argc, char **argv) - { - /* 0/auto for SSLv23 */ - case 0: ssl_ctx = SSL_CTX_new (SSLv23_client_method ()); break; -+#ifndef OPENSSL_NO_SSL2 - /* 2/SSLv2 */ - case 2: ssl_ctx = SSL_CTX_new (SSLv2_client_method ()); break; -+#endif -+#ifndef OPENSSL_NO_SSL3 - /* 3/SSLv3 */ - case 3: ssl_ctx = SSL_CTX_new (SSLv3_client_method ()); break; -+#endif - /* 4/TLSv1 */ - case 4: ssl_ctx = SSL_CTX_new (TLSv1_client_method ()); break; - } -@@ -1204,8 +1212,12 @@ main(int argc, char **argv) - switch (param.ssl_protocol) - { - case 0: printf (" --ssl-protocol=auto"); break; -+#ifndef OPENSSL_NO_SSL2 - case 2: printf (" --ssl-protocol=SSLv2"); break; -+#endif -+#ifndef OPENSSL_NO_SSL3 - case 3: printf (" --ssl-protocol=SSLv3"); break; -+#endif - case 4: printf (" --ssl-protocol=TLSv1"); break; - } - #endif Property changes on: head/benchmarks/httperf/files/patch-nossl23 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/httperf/files/patch-src_core.c =================================================================== --- head/benchmarks/httperf/files/patch-src_core.c (nonexistent) +++ head/benchmarks/httperf/files/patch-src_core.c (revision 519200) @@ -0,0 +1,30 @@ +--- src/core.c.orig 2019-08-29 17:26:06 UTC ++++ src/core.c +@@ -651,7 +651,7 @@ recv_done(Call * call) + static void + do_recv(Conn * s) + { +- char *cp, buf[8193]; ++ char *cp, buf[16385]; + Call *c = s->recvq; + int i, saved_errno; + ssize_t nread = 0; +@@ -1062,8 +1062,7 @@ core_ssl_connect(Conn * s) + exit(-1); + } + +- ssl_err = SSL_connect(s->ssl); +- if (ssl_err < 0) { ++ while ((ssl_err = SSL_connect(s->ssl)) < 0) { + int reason = SSL_get_error(s->ssl, ssl_err); + + if (reason == SSL_ERROR_WANT_READ +@@ -1083,7 +1082,7 @@ core_ssl_connect(Conn * s) + clear_active(s, READ); + set_active(s, WRITE); + } +- return; ++ continue; + } + fprintf(stderr, + "%s: failed to connect to SSL server (err=%d, reason=%d)\n", Property changes on: head/benchmarks/httperf/files/patch-src_core.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property