aboutsummaryrefslogtreecommitdiffstats
path: root/benchmarks
diff options
context:
space:
mode:
authorzi <zi@FreeBSD.org>2016-01-08 10:30:45 +0800
committerzi <zi@FreeBSD.org>2016-01-08 10:30:45 +0800
commitfc57a02ba2e2a1ec16ba4c16b6b1243f06fb88ad (patch)
tree967a0062f322bb345734228f18c27d37cd524501 /benchmarks
parent6db34d2aa848bee4981808bf5811270b3711a53c (diff)
downloadfreebsd-ports-gnome-fc57a02ba2e2a1ec16ba4c16b6b1243f06fb88ad.tar.gz
freebsd-ports-gnome-fc57a02ba2e2a1ec16ba4c16b6b1243f06fb88ad.tar.zst
freebsd-ports-gnome-fc57a02ba2e2a1ec16ba4c16b6b1243f06fb88ad.zip
- 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
Diffstat (limited to 'benchmarks')
-rw-r--r--benchmarks/httperf/Makefile8
-rw-r--r--benchmarks/httperf/distinfo4
-rw-r--r--benchmarks/httperf/files/patch-nossl2345
-rw-r--r--benchmarks/httperf/pkg-descr16
4 files changed, 60 insertions, 13 deletions
diff --git a/benchmarks/httperf/Makefile b/benchmarks/httperf/Makefile
index 045a5e4738ba..34ea0a16bacf 100644
--- a/benchmarks/httperf/Makefile
+++ b/benchmarks/httperf/Makefile
@@ -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}
diff --git a/benchmarks/httperf/distinfo b/benchmarks/httperf/distinfo
index a654873e796c..d8795a901555 100644
--- a/benchmarks/httperf/distinfo
+++ b/benchmarks/httperf/distinfo
@@ -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
diff --git a/benchmarks/httperf/files/patch-nossl23 b/benchmarks/httperf/files/patch-nossl23
new file mode 100644
index 000000000000..5325a68ba8e3
--- /dev/null
+++ b/benchmarks/httperf/files/patch-nossl23
@@ -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
diff --git a/benchmarks/httperf/pkg-descr b/benchmarks/httperf/pkg-descr
index b41af6a8377f..1ac179797d82 100644
--- a/benchmarks/httperf/pkg-descr
+++ b/benchmarks/httperf/pkg-descr
@@ -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/