diff options
| author | Robin Gloster <mail@glob.in> | 2015-12-02 11:42:04 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2015-12-23 22:10:01 +0000 |
| commit | 99b1b464b45ce84dd1b0eb8a48b75780322d8a49 (patch) | |
| tree | 295642b8df32c06e1e2d5deb6bc6627faf524917 /pkgs/development/libraries | |
| parent | 562ba769750ba11052d668a531b84ff7696a7df5 (diff) | |
| download | nixpkgs-99b1b464b45ce84dd1b0eb8a48b75780322d8a49.tar nixpkgs-99b1b464b45ce84dd1b0eb8a48b75780322d8a49.tar.gz nixpkgs-99b1b464b45ce84dd1b0eb8a48b75780322d8a49.tar.bz2 nixpkgs-99b1b464b45ce84dd1b0eb8a48b75780322d8a49.tar.lz nixpkgs-99b1b464b45ce84dd1b0eb8a48b75780322d8a49.tar.xz nixpkgs-99b1b464b45ce84dd1b0eb8a48b75780322d8a49.tar.zst nixpkgs-99b1b464b45ce84dd1b0eb8a48b75780322d8a49.zip | |
qt55.qtbase: add patch to build with libressl 2.3
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.5/qtbase/libressl.patch | 36 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.5/qtbase/series | 1 |
2 files changed, 37 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/libressl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/libressl.patch new file mode 100644 index 00000000000..e483ad14e05 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/libressl.patch @@ -0,0 +1,36 @@ +From 81494e67eccba04fc3fe554d76a9ca6fe7f2250e Mon Sep 17 00:00:00 2001 +From: hasufell <hasufell@gentoo.org> +Date: Sat, 10 Oct 2015 01:15:01 +0200 +Subject: [PATCH] Fix compilation with libressl + +By additionally checking for defined(SSL_CTRL_SET_CURVES), which +is defined in openssl, but not in libressl. +--- + src/network/ssl/qsslcontext_openssl.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/qtbase/src/network/ssl/qsslcontext_openssl.cpp b/qtbase/src/network/ssl/qsslcontext_openssl.cpp +index b88ab54..cfc4f6d 100644 +--- a/qtbase/src/network/ssl/qsslcontext_openssl.cpp ++++ b/qtbase/src/network/ssl/qsslcontext_openssl.cpp +@@ -338,7 +338,7 @@ init_context: + + const QVector<QSslEllipticCurve> qcurves = sslContext->sslConfiguration.ellipticCurves(); + if (!qcurves.isEmpty()) { +-#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) ++#if OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC) + // Set the curves to be used + if (q_SSLeay() >= 0x10002000L) { + // SSL_CTX_ctrl wants a non-const pointer as last argument, +@@ -352,7 +352,7 @@ init_context: + return sslContext; + } + } else +-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) ++#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC) + { + // specific curves requested, but not possible to set -> error + sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version too old, need at least v1.0.2")); +-- +2.6.0 + diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/series b/pkgs/development/libraries/qt-5/5.5/qtbase/series index 3cfa50e85b7..2196d838375 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/series +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/series @@ -6,3 +6,4 @@ dlopen-dbus.patch xdg-config-dirs.patch nix-profiles-library-paths.patch compose-search-path.patch +libressl.patch |