Index: head/benchmarks/postal/Makefile =================================================================== --- head/benchmarks/postal/Makefile (revision 425390) +++ head/benchmarks/postal/Makefile (revision 425391) @@ -1,48 +1,50 @@ # Created by: Ying-Chieh Liao # $FreeBSD$ PORTNAME= postal PORTVERSION= 0.73 PORTREVISION= 3 CATEGORIES= benchmarks mail MASTER_SITES= http://www.coker.com.au/postal/ MAINTAINER= ports@FreeBSD.org COMMENT= Benchmark SMTP/POP servers LICENSE= GPLv3 USES= gmake tar:tgz GNU_CONFIGURE= yes PLIST_FILES= bin/postal-list \ man/man1/postal-list.1.gz \ man/man8/bhm.8.gz \ man/man8/postal.8.gz \ man/man8/rabid.8.gz \ sbin/bhm \ sbin/postal \ sbin/rabid OPTIONS_RADIO= TLS OPTIONS_RADIO_TLS= GNUTLS OPENSSL OPTIONS_DEFAULT= OPENSSL GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_USES= pkgconfig GNUTLS_CONFIGURE_OFF= --disable-gnutls GNUTLS_CPPFLAGS= $$(pkg-config --cflags gnutls) GNUTLS_LDFLAGS= $$(pkg-config --libs gnutls) OPENSSL_USE= OPENSSL=yes OPENSSL_CONFIGURE_OFF= --disable-openssl +OPENSSL_CPPFLAGS= -I${OPENSSLINC} +OPENSSL_LDFLAGS= -L${OPENSSLLIB} post-patch: @${REINPLACE_CMD} -e \ 's|-lpthread|-pthread| ; \ s|-lgcrypt||' ${WRKSRC}/configure @${REINPLACE_CMD} -e \ 's|-pedantic|| ; \ s|-O2 -g|$$(CPPFLAGS)| ; \ s|-lstdc++|$$(LDFLAGS)|' ${WRKSRC}/Makefile.in .include Index: head/benchmarks/postal/files/patch-basictcp.cpp =================================================================== --- head/benchmarks/postal/files/patch-basictcp.cpp (revision 425390) +++ head/benchmarks/postal/files/patch-basictcp.cpp (revision 425391) @@ -1,15 +1,23 @@ --- basictcp.cpp.orig 2012-01-01 11:36:27 UTC +++ basictcp.cpp -@@ -102,10 +102,10 @@ int base_tcp::ConnectTLS() +@@ -102,10 +102,18 @@ int base_tcp::ConnectTLS() m_sslMeth = NULL; m_sslCtx = NULL; m_ssl = NULL; - m_sslMeth = SSLv2_client_method(); ++#ifndef OPENSSL_NO_SSL3 + m_sslMeth = SSLv3_client_method(); ++#else ++ m_sslMeth = SSLv23_client_method(); ++#endif if(m_sslMeth == NULL) { - fprintf(stderr, "Can't get SSLv2_client_method.\n"); ++#ifndef OPENSSL_NO_SSL3 + fprintf(stderr, "Can't get SSLv3_client_method.\n"); ++#else ++ fprintf(stderr, "Can't get SSLv23_client_method.\n"); ++#endif return 2; } m_sslCtx = SSL_CTX_new(m_sslMeth); Index: head/benchmarks/postal/files/patch-tcp.cpp =================================================================== --- head/benchmarks/postal/files/patch-tcp.cpp (revision 425390) +++ head/benchmarks/postal/files/patch-tcp.cpp (revision 425391) @@ -1,15 +1,23 @@ --- tcp.cpp.orig 2012-01-01 11:24:45 UTC +++ tcp.cpp -@@ -178,10 +178,10 @@ int tcp::ConnectTLS() +@@ -178,10 +178,18 @@ int tcp::ConnectTLS() #ifdef USE_OPENSSL m_sslCtx = NULL; m_ssl = NULL; - m_sslMeth = SSLv2_client_method(); ++#ifndef OPENSSL_NO_SSL3 + m_sslMeth = SSLv3_client_method(); ++#else ++ m_sslMeth = SSLv23_client_method(); ++#endif if(m_sslMeth == NULL) { - fprintf(stderr, "Can't get SSLv2_client_method.\n"); ++#ifndef OPENSSL_NO_SSL3 + fprintf(stderr, "Can't get SSLv3_client_method.\n"); ++#else ++ fprintf(stderr, "Can't get SSLv23_client_method.\n"); ++#endif error(); return 2; }