diff --git a/srcpkgs/phantomjs/patches/SSLv3-optional.patch b/srcpkgs/phantomjs/patches/SSLv3-optional.patch new file mode 100644 index 00000000000..f062eed023d --- /dev/null +++ b/srcpkgs/phantomjs/patches/SSLv3-optional.patch @@ -0,0 +1,72 @@ +--- src/qt/qtbase/src/network/ssl/qsslcontext.cpp ++++ src/qt/qtbase/src/network/ssl/qsslcontext.cpp +@@ -142,7 +142,11 @@ + #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 2 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 +--- src/qt/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp ++++ src/qt/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp +@@ -266,7 +266,9 @@ + #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 @@ + #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 +@@ -285,11 +289,15 @@ + #endif + #else + DEFINEFUNC(SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) ++#ifndef OPENSSL_NO_SSL3 + DEFINEFUNC(SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) ++#endif + DEFINEFUNC(SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) + DEFINEFUNC(SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return) + DEFINEFUNC(SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return) ++#ifndef OPENSSL_NO_SSL3 + DEFINEFUNC(SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return) ++#endif + DEFINEFUNC(SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return) + DEFINEFUNC(SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return) + #endif +@@ -767,7 +775,9 @@ + #ifndef OPENSSL_NO_SSL2 + RESOLVEFUNC(SSLv2_client_method) + #endif ++#ifndef OPENSSL_NO_SSL3 + RESOLVEFUNC(SSLv3_client_method) ++#endif + RESOLVEFUNC(SSLv23_client_method) + RESOLVEFUNC(TLSv1_client_method) + #if OPENSSL_VERSION_NUMBER >= 0x10001000L +@@ -777,7 +787,9 @@ + #ifndef OPENSSL_NO_SSL2 + RESOLVEFUNC(SSLv2_server_method) + #endif ++#ifndef OPENSSL_NO_SSL3 + RESOLVEFUNC(SSLv3_server_method) ++#endif + RESOLVEFUNC(SSLv23_server_method) + RESOLVEFUNC(TLSv1_server_method) + #if OPENSSL_VERSION_NUMBER >= 0x10001000L diff --git a/srcpkgs/phantomjs/template b/srcpkgs/phantomjs/template index ea87c53803e..f1cbc945d8c 100644 --- a/srcpkgs/phantomjs/template +++ b/srcpkgs/phantomjs/template @@ -17,8 +17,6 @@ nopie=yes nocross=yes do_configure() { - sed -i 's,SSLv3_,SSLv23_,g' src/qt/qtbase/src/network/ssl/qsslcontext.cpp \ - src/qt/qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h sed -e "s|-O2|${CXXFLAGS}|" \ -i src/qt/qtbase/mkspecs/common/{g++,gcc}-base.conf sed -e "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" \