From owner-svn-ports-all@freebsd.org Sat Nov 5 14:16:30 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1C297C30E64; Sat, 5 Nov 2016 14:16:30 +0000 (UTC) (envelope-from marino@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 mx1.freebsd.org (Postfix) with ESMTPS id CFD5FA4F; Sat, 5 Nov 2016 14:16:29 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA5EGTNu023198; Sat, 5 Nov 2016 14:16:29 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA5EGSXn023195; Sat, 5 Nov 2016 14:16:28 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201611051416.uA5EGSXn023195@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sat, 5 Nov 2016 14:16:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r425391 - in head/benchmarks/postal: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Nov 2016 14:16:30 -0000 Author: marino Date: Sat Nov 5 14:16:28 2016 New Revision: 425391 URL: https://svnweb.freebsd.org/changeset/ports/425391 Log: benchmarks/postal: Support DEFAULT_VERSIONS+=ssl The newest version of OpenSSL doesn't have SSLv3_method, similar to LibreSSL, so update the patches to support both. Modified: head/benchmarks/postal/Makefile head/benchmarks/postal/files/patch-basictcp.cpp head/benchmarks/postal/files/patch-tcp.cpp Modified: head/benchmarks/postal/Makefile ============================================================================== --- head/benchmarks/postal/Makefile Sat Nov 5 13:44:27 2016 (r425390) +++ head/benchmarks/postal/Makefile Sat Nov 5 14:16:28 2016 (r425391) @@ -35,6 +35,8 @@ GNUTLS_CPPFLAGS= $$(pkg-config --cflags 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 \ Modified: head/benchmarks/postal/files/patch-basictcp.cpp ============================================================================== --- head/benchmarks/postal/files/patch-basictcp.cpp Sat Nov 5 13:44:27 2016 (r425390) +++ head/benchmarks/postal/files/patch-basictcp.cpp Sat Nov 5 14:16:28 2016 (r425391) @@ -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); Modified: head/benchmarks/postal/files/patch-tcp.cpp ============================================================================== --- head/benchmarks/postal/files/patch-tcp.cpp Sat Nov 5 13:44:27 2016 (r425390) +++ head/benchmarks/postal/files/patch-tcp.cpp Sat Nov 5 14:16:28 2016 (r425391) @@ -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; }