Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 15 May 2016 10:04:12 +0000 (UTC)
From:      Matthew Seaman <matthew@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r415226 - in head/lang/phantomjs: . files
Message-ID:  <201605151004.u4FA4CpP081514@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605151004.u4FA4CpP081514>