From owner-svn-ports-head@freebsd.org Sun May 15 10:04:13 2016 Return-Path: Delivered-To: svn-ports-head@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 54F92B39CDC; Sun, 15 May 2016 10:04:13 +0000 (UTC) (envelope-from matthew@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 2C64417C9; Sun, 15 May 2016 10:04:13 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4FA4COR081517; Sun, 15 May 2016 10:04:12 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4FA4CpP081514; Sun, 15 May 2016 10:04:12 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201605151004.u4FA4CpP081514@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Sun, 15 May 2016 10:04:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415226 - in head/lang/phantomjs: . 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-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 May 2016 10:04:13 -0000 Author: matthew Date: Sun May 15 10:04:11 2016 New Revision: 415226 URL: https://svnweb.freebsd.org/changeset/ports/415226 Log: Add support for compiling in a no-SSLv3 environment. PR: 207437 Submitted by: matthew Approved by: maintainer-timeout (kuriyama, >90days) Added: head/lang/phantomjs/files/patch-src_qt_qtbase_src_network_ssl_qsslcontext.cpp (contents, props changed) head/lang/phantomjs/files/patch-src_qt_qtbase_src_network_ssl_qsslsocket__openssl__symbols.cpp (contents, props changed) Modified: head/lang/phantomjs/Makefile Modified: head/lang/phantomjs/Makefile ============================================================================== --- head/lang/phantomjs/Makefile Sun May 15 09:04:07 2016 (r415225) +++ head/lang/phantomjs/Makefile Sun May 15 10:04:11 2016 (r415226) @@ -2,6 +2,7 @@ PORTNAME= phantomjs PORTVERSION= 2.0.0 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= https://bitbucket.org/ariya/phantomjs/downloads/ DISTNAME= ${PORTNAME}-${PORTVERSION}-source Added: head/lang/phantomjs/files/patch-src_qt_qtbase_src_network_ssl_qsslcontext.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/phantomjs/files/patch-src_qt_qtbase_src_network_ssl_qsslcontext.cpp Sun May 15 10:04:11 2016 (r415226) @@ -0,0 +1,14 @@ +--- src/qt/qtbase/src/network/ssl/qsslcontext.cpp.orig 2015-01-24 02:19:52 UTC ++++ src/qt/qtbase/src/network/ssl/qsslcontext.cpp +@@ -142,7 +142,11 @@ init_context: + #endif + break; + case QSsl::SslV3: ++#ifndef OPENSSL_NO_SSL3 + sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method()); ++#else ++ sslContext->ctx = 0; // SSL 3 not supported by the system, but chosen deliberately -> error ++#endif + break; + case QSsl::SecureProtocols: // SslV2 will be disabled below + case QSsl::TlsV1SslV3: // SslV2 will be disabled below Added: head/lang/phantomjs/files/patch-src_qt_qtbase_src_network_ssl_qsslsocket__openssl__symbols.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/phantomjs/files/patch-src_qt_qtbase_src_network_ssl_qsslsocket__openssl__symbols.cpp Sun May 15 10:04:11 2016 (r415226) @@ -0,0 +1,22 @@ +--- src/qt/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2015-01-24 02:19:52 UTC ++++ src/qt/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp +@@ -266,7 +266,9 @@ DEFINEFUNC(SSL_SESSION*, SSL_get_session + #ifndef OPENSSL_NO_SSL2 + DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) + #endif ++#ifndef OPENSSL_NO_SSL3 + DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) ++#endif + DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) + DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return) + #if OPENSSL_VERSION_NUMBER >= 0x10001000L +@@ -276,7 +278,9 @@ DEFINEFUNC(const SSL_METHOD *, TLSv1_2_c + #ifndef OPENSSL_NO_SSL2 + DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return) + #endif ++#ifndef OPENSSL_NO_SSL3 + DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return) ++#endif + DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return) + DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return) + #if OPENSSL_VERSION_NUMBER >= 0x10001000L