From owner-svn-ports-head@freebsd.org Sat Dec 7 11:39:36 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CE2B01D1295; Sat, 7 Dec 2019 11:39:36 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47VSD84nxlz3DXh; Sat, 7 Dec 2019 11:39:36 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 83BF41942B; Sat, 7 Dec 2019 11:39:36 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xB7BdaZs015892; Sat, 7 Dec 2019 11:39:36 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xB7BdZeH015887; Sat, 7 Dec 2019 11:39:35 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201912071139.xB7BdZeH015887@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Sat, 7 Dec 2019 11:39:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r519200 - in head/benchmarks/httperf: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/benchmarks/httperf: . files X-SVN-Commit-Revision: 519200 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Dec 2019 11:39:36 -0000 Author: danfe Date: Sat Dec 7 11:39:35 2019 New Revision: 519200 URL: https://svnweb.freebsd.org/changeset/ports/519200 Log: - Update to the latest GitHub commit: current version is from 2015 and is not compatible with modern OpenSSL implementations - Set PORTVERSION to the version number as reported by `httperf -V' - Increase buffer size in do_recv() to match TLS record size which can be up to 16kB [1] - When using TLS 1.1 or TLS 1.2, the first SSL_connect() may often return error, while subsequent requests work fine -- to mitigate this, try to SSL_connect() a little harder [2] Approved by: maintainer timeout PR: 230680 [1], 230681 [2] Added: head/benchmarks/httperf/files/patch-src_core.c (contents, props changed) Deleted: head/benchmarks/httperf/files/patch-nossl23 Modified: head/benchmarks/httperf/Makefile head/benchmarks/httperf/distinfo Modified: head/benchmarks/httperf/Makefile ============================================================================== --- head/benchmarks/httperf/Makefile Sat Dec 7 11:37:36 2019 (r519199) +++ head/benchmarks/httperf/Makefile Sat Dec 7 11:39:35 2019 (r519200) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= httperf -PORTVERSION= 0.9.0.1 +PORTVERSION= 0.9.1 CATEGORIES= benchmarks www MAINTAINER= jlaffaye@FreeBSD.org @@ -13,7 +13,7 @@ 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} @@ -23,13 +23,6 @@ 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 @@ -39,4 +32,4 @@ do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} -.include +.include Modified: head/benchmarks/httperf/distinfo ============================================================================== --- head/benchmarks/httperf/distinfo Sat Dec 7 11:37:36 2019 (r519199) +++ head/benchmarks/httperf/distinfo Sat Dec 7 11:39:35 2019 (r519200) @@ -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 Added: head/benchmarks/httperf/files/patch-src_core.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/benchmarks/httperf/files/patch-src_core.c Sat Dec 7 11:39:35 2019 (r519200) @@ -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",