From 8bde96a5f0562eba4a50f62f40bb780c36af9ae3 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 5 Oct 2016 06:18:11 +0000 Subject: main/qt: rebuild against libressl --- main/qt/APKBUILD | 14 ++++++---- main/qt/qtcore-4.8.5-libressl.patch | 52 +++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 5 deletions(-) create mode 100644 main/qt/qtcore-4.8.5-libressl.patch (limited to 'main/qt') diff --git a/main/qt/APKBUILD b/main/qt/APKBUILD index 08a5a0ab8d..ff53cff9a1 100644 --- a/main/qt/APKBUILD +++ b/main/qt/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa pkgname=qt pkgver=4.8.7 -pkgrel=0 +pkgrel=1 pkgdesc="A cross-platform application and UI framework" url="http://qt-project.org/" arch="all" @@ -14,7 +14,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-assistant $pkgname-config $pkgname-lang" depends_dev="mesa-dev libice-dev libsm-dev libx11-dev libxext-dev - libxrender-dev alsa-lib-dev openssl-dev fontconfig-dev freetype-dev + libxrender-dev alsa-lib-dev libressl-dev fontconfig-dev freetype-dev glib-dev libpng-dev zlib-dev sqlite-dev dbus-dev" makedepends="$depends_dev postgresql-dev mariadb-dev unixodbc-dev cups-dev gtk+-dev tiff-dev libmng-dev libxrandr-dev libxv-dev libxi-dev perl @@ -33,6 +33,7 @@ source="http://download.qt-project.org/official_releases/qt/4.8/$pkgver/qt-every qsettings-recursive-global-mutex.patch qt-everywhere-opensource-src-4.8.7-gcc6.patch qt-aarch64.patch + qtcore-4.8.5-libressl.patch " _builddir="$srcdir"/qt-everywhere-opensource-src-$pkgver @@ -289,7 +290,8 @@ bc83dc99f866423b4803453a0e2949d2 qt-musl.patch 14549e243772acfe2e9e0bf5d8d001f3 qt-clucene-timeb.patch 7467e168418c50b2737b4b2fab4448fe qsettings-recursive-global-mutex.patch 8ba77cd8f325c38daca8eadc982395a4 qt-everywhere-opensource-src-4.8.7-gcc6.patch -2a9572f3b758fc3ca9ff5fc40012a2a4 qt-aarch64.patch" +2a9572f3b758fc3ca9ff5fc40012a2a4 qt-aarch64.patch +5fb430ea26cc72dcb16164bd952c1b91 qtcore-4.8.5-libressl.patch" sha256sums="e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 qt-everywhere-opensource-src-4.8.7.tar.gz 1094300e3d69e55eb69d87cbaac6724f68b0618938c6eb1b0ddd22ba99c7f8a2 assistant.desktop 74c2c5d27a1c1ad08ab01122bcf333f75d0a014b4755d3ddd8764c2425f6e320 designer.desktop @@ -301,7 +303,8 @@ e70bdddf67c358c02099bebee460e3c5456666562bff9ef9ebaacf9f4ea7a6df qt-musl.patch 0c74a82080bcb8f4a700e907f4f1ed98a0338c6954620ee42c82002b199acedc qt-clucene-timeb.patch 8ef97783ff93a515a31c1e27c6b3b22e2ad2fd9cf0fa94965e5c413ae579e64c qsettings-recursive-global-mutex.patch aaa073195b6fc47ebdc241574da4a29e7ba0a1ae51bdf9a64b866c683f30684a qt-everywhere-opensource-src-4.8.7-gcc6.patch -9269bd8552688b75be1468eaca6afdc0c054e644a73a9cffddb6855a96faf86f qt-aarch64.patch" +9269bd8552688b75be1468eaca6afdc0c054e644a73a9cffddb6855a96faf86f qt-aarch64.patch +0efa3b6f7f25e775874a5f2e09c4111143aafcf9b17b4494b0922a501750bc2c qtcore-4.8.5-libressl.patch" sha512sums="f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 qt-everywhere-opensource-src-4.8.7.tar.gz 005ed6fe50b237e4541c0f30cbd87ec5425eff7e7c8d55d2b9b24ea8469e75e1fc8a3f26296841ab4cbd566517b3f1aa1fa7b36e1a9677d284cfff615fd24614 assistant.desktop 731aae6a0d776c1be5a49dadc5480b205ba5c8e056d108e2bb96a19dd52b6c6ca22387b37505cf97a2575228cd5dd65c773d0fde1c26299e47fdc11a49f651fd designer.desktop @@ -313,4 +316,5 @@ a185ea5e984d2636e3f9f6c4ed8fad66a17575da0679724da60a3dc519468ab45aa9369f43ce5c64 a4947c7210f5b9a39f78b1056d2fe87bc9e25dda7d6287f138f8889ae8a3a8687ed7346261f219e9e39afb5143e895b52804347484d10c42907868c4eac9ef0a qt-clucene-timeb.patch 277e5ceec4fcc5d77a8591eafdb24125a54770576b7997aee6df39d85a7f1deabf8547fb42127cb118ebb8e7f81e3a3624a75d461581052dadf7abb99f1c9bd7 qsettings-recursive-global-mutex.patch dd58096123e99d8cdd1a29dfca45d1f23c912a21edc6074a5398637ecca29b8b3535d862043c5d15b4ab44609d674242d93c31fcae835fede4ddfcc36e63ea26 qt-everywhere-opensource-src-4.8.7-gcc6.patch -c76f7cb83e3e48e9798ada7c1d2406d560294fe7c38a73e42317db8f83ff9e86fdf7c18bd408cf658c07782733b72dcf03328b267db30cb9bccc11394b2ee93a qt-aarch64.patch" +c76f7cb83e3e48e9798ada7c1d2406d560294fe7c38a73e42317db8f83ff9e86fdf7c18bd408cf658c07782733b72dcf03328b267db30cb9bccc11394b2ee93a qt-aarch64.patch +bde982ca01a6ee6a5d10a08babd8474e67e84932d996b1e19970e75fa4a9b71a08e81065a13f0a1cce1ac681d44d2e559562ee5ab92e9dfd5fd2cafe28370a74 qtcore-4.8.5-libressl.patch" diff --git a/main/qt/qtcore-4.8.5-libressl.patch b/main/qt/qtcore-4.8.5-libressl.patch new file mode 100644 index 0000000000..8019dd5f98 --- /dev/null +++ b/main/qt/qtcore-4.8.5-libressl.patch @@ -0,0 +1,52 @@ +--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2015-11-25 01:38:42.103898399 -0500 ++++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp 2015-11-25 01:40:50.146247648 -0500 +@@ -224,13 +224,17 @@ + #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) + #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) + #else +@@ -818,13 +822,17 @@ + #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) + #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) + RESOLVEFUNC(X509_NAME_entry_count) +--- a/src/network/ssl/qsslsocket_openssl.cpp.orig 2015-11-25 01:44:55.235087906 -0500 ++++ b/src/network/ssl/qsslsocket_openssl.cpp 2015-11-25 01:45:45.194443818 -0500 +@@ -263,7 +263,11 @@ + #endif + break; + case QSsl::SslV3: ++#ifndef OPENSSL_NO_SSL3 + ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method()); ++#else ++ 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 -- cgit v1.2.3