diff options
| author | matthew <matthew@FreeBSD.org> | 2016-05-15 18:04:11 +0800 |
|---|---|---|
| committer | matthew <matthew@FreeBSD.org> | 2016-05-15 18:04:11 +0800 |
| commit | 5dc4a377d5bd3bb07ab8eda936bde85d6a35bf5a (patch) | |
| tree | ff56649521483a67edf95f87b9bd4d83c9fc047d /lang | |
| parent | 3406c7273e3353d9852dd95f31f606e37c894964 (diff) | |
| download | freebsd-ports-gnome-5dc4a377d5bd3bb07ab8eda936bde85d6a35bf5a.tar.gz freebsd-ports-gnome-5dc4a377d5bd3bb07ab8eda936bde85d6a35bf5a.tar.zst freebsd-ports-gnome-5dc4a377d5bd3bb07ab8eda936bde85d6a35bf5a.zip | |
Add support for compiling in a no-SSLv3 environment.
PR: 207437
Submitted by: matthew
Approved by: maintainer-timeout (kuriyama, >90days)
Diffstat (limited to 'lang')
3 files changed, 37 insertions, 0 deletions
diff --git a/lang/phantomjs/Makefile b/lang/phantomjs/Makefile index b9e9e20258a0..154402b3cea5 100644 --- a/lang/phantomjs/Makefile +++ b/lang/phantomjs/Makefile @@ -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 diff --git a/lang/phantomjs/files/patch-src_qt_qtbase_src_network_ssl_qsslcontext.cpp b/lang/phantomjs/files/patch-src_qt_qtbase_src_network_ssl_qsslcontext.cpp new file mode 100644 index 000000000000..ce7911f555f7 --- /dev/null +++ b/lang/phantomjs/files/patch-src_qt_qtbase_src_network_ssl_qsslcontext.cpp @@ -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 diff --git a/lang/phantomjs/files/patch-src_qt_qtbase_src_network_ssl_qsslsocket__openssl__symbols.cpp b/lang/phantomjs/files/patch-src_qt_qtbase_src_network_ssl_qsslsocket__openssl__symbols.cpp new file mode 100644 index 000000000000..4575862882ee --- /dev/null +++ b/lang/phantomjs/files/patch-src_qt_qtbase_src_network_ssl_qsslsocket__openssl__symbols.cpp @@ -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 |