Date: Fri, 8 Jan 2016 02:30:46 +0000 (UTC) From: Ryan Steinmetz <zi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405507 - in head/benchmarks/httperf: . files Message-ID: <201601080230.u082UkUk046887@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zi Date: Fri Jan 8 02:30:45 2016 New Revision: 405507 URL: https://svnweb.freebsd.org/changeset/ports/405507 Log: - Update to 0.9.1 pre-release [2] - Add support for building when SSLv2 or SSLv3 are disabled [1] PR: 203675 [1], 205900 [2] Submitted by: brnrd@ [1], zi@ [2] Reviewed by: jlaffaye@ (maintainer) Approved by: jlaffaye@ (maintainer) Obtained from: upstream github Added: head/benchmarks/httperf/files/patch-nossl23 (contents, props changed) Modified: head/benchmarks/httperf/Makefile head/benchmarks/httperf/distinfo head/benchmarks/httperf/pkg-descr Modified: head/benchmarks/httperf/Makefile ============================================================================== --- head/benchmarks/httperf/Makefile Fri Jan 8 02:17:41 2016 (r405506) +++ head/benchmarks/httperf/Makefile Fri Jan 8 02:30:45 2016 (r405507) @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= httperf -PORTVERSION= 0.9.0 +PORTVERSION= 0.9.0.1 CATEGORIES= benchmarks www -MASTER_SITES= GOOGLE_CODE +#MASTER_SITES= GOOGLE_CODE MAINTAINER= jlaffaye@FreeBSD.org COMMENT= Tool for measuring webserver performance @@ -13,7 +13,9 @@ LICENSE= GPLv2 USE_OPENSSL= yes GNU_CONFIGURE= yes -USES= gmake +USES= autoreconf gmake libtool +USE_GITHUB= yes +GH_TAGNAME= dcfb746 MAKE_ARGS= LIBUTIL_OBJS=ssl_writev.o \ exec_prefix=${PREFIX} Modified: head/benchmarks/httperf/distinfo ============================================================================== --- head/benchmarks/httperf/distinfo Fri Jan 8 02:17:41 2016 (r405506) +++ head/benchmarks/httperf/distinfo Fri Jan 8 02:30:45 2016 (r405507) @@ -1,2 +1,2 @@ -SHA256 (httperf-0.9.0.tar.gz) = e1a0bf56bcb746c04674c47b6cfa531fad24e45e9c6de02aea0d1c5f85a2bf1c -SIZE (httperf-0.9.0.tar.gz) = 425297 +SHA256 (httperf-httperf-0.9.0.1-dcfb746_GH0.tar.gz) = 72294a3cbfd78b48f38b077f7a380ef24b69f3bc24f6ec87875f2f069153677d +SIZE (httperf-httperf-0.9.0.1-dcfb746_GH0.tar.gz) = 103950 Added: head/benchmarks/httperf/files/patch-nossl23 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/benchmarks/httperf/files/patch-nossl23 Fri Jan 8 02:30:45 2016 (r405507) @@ -0,0 +1,45 @@ +--- 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 Modified: head/benchmarks/httperf/pkg-descr ============================================================================== --- head/benchmarks/httperf/pkg-descr Fri Jan 8 02:17:41 2016 (r405506) +++ head/benchmarks/httperf/pkg-descr Fri Jan 8 02:30:45 2016 (r405507) @@ -1,11 +1,11 @@ -Httperf is a tool for measuring web server performance. It provides a flexible -facility for generating various HTTP workloads and for measuring server +Httperf is a tool for measuring web server performance. It provides a flexible +facility for generating various HTTP workloads and for measuring server performance. -The focus of httperf is not on implementing one particular benchmark but on -providing a robust, high-performance tool that facilitates the construction of +The focus of httperf is not on implementing one particular benchmark but on +providing a robust, high-performance tool that facilitates the construction of both micro- and macro-level benchmarks. The three distinguishing characteristics -of httperf are its robustness, which includes the ability to generate and -sustain server overload, support for the HTTP/1.1 and SSL protocols, and its -extensibility to new workload generators and performance measurements. +of httperf are its robustness, which includes the ability to generate and +sustain server overload, support for the HTTP/1.1 and SSL protocols, and its +extensibility to new workload generators and performance measurements. -WWW: http://code.google.com/p/httperf/ +WWW: http://code.google.com/p/httperf/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601080230.u082UkUk046887>