kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Update to 0.9.1 pre-release [2]

Browse source 
- 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
This commit is contained in:
Ryan Steinmetz 2016-01-08 02:30:45 +00:00
parent 7e6947b279
commit 6aa6a27cdc
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=405507
4 changed files with 60 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
benchmarks/httperf/Makefile
View file

@ -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}

4
benchmarks/httperf/distinfo
View file

@ -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

45
benchmarks/httperf/files/patch-nossl23 Normal file
View file

@ -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