Qt 5.15.0 RC

OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/libqt5-qtbase?expand=0&rev=7

fix-build-openssl-1.1.0.patch

@@ -0,0 +1,31 @@
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Subject: Fix build against OpenSSL 1.1.0
+
+Leap 15.1 still has it and we can't switch away without breaking the world.
+
+Index: qtbase-everywhere-src-5.15.0-rc/src/network/ssl/qsslsocket_openssl_symbols.cpp
+===================================================================
+--- qtbase-everywhere-src-5.15.0-rc.orig/src/network/ssl/qsslsocket_openssl_symbols.cpp
++++ qtbase-everywhere-src-5.15.0-rc/src/network/ssl/qsslsocket_openssl_symbols.cpp
+@@ -373,7 +373,7 @@ DEFINEFUNC3(void, SSL_set_bio, SSL *a, a
+ DEFINEFUNC(void, SSL_set_accept_state, SSL *a, a, return, DUMMYARG)
+ DEFINEFUNC(void, SSL_set_connect_state, SSL *a, a, return, DUMMYARG)
+ DEFINEFUNC(int, SSL_shutdown, SSL *a, a, return -1, return)
+-DEFINEFUNC(int, SSL_in_init, const SSL *a, a, return 0, return)
++DEFINEFUNC(int, SSL_in_init, SSL *a, a, return 0, return)
+ DEFINEFUNC(int, SSL_get_shutdown, const SSL *ssl, ssl, return 0, return)
+ DEFINEFUNC2(int, SSL_set_session, SSL* to, to, SSL_SESSION *session, session, return -1, return)
+ DEFINEFUNC(void, SSL_SESSION_free, SSL_SESSION *ses, ses, return, DUMMYARG)
+Index: qtbase-everywhere-src-5.15.0-rc/src/network/ssl/qsslsocket_openssl_symbols_p.h
+===================================================================
+--- qtbase-everywhere-src-5.15.0-rc.orig/src/network/ssl/qsslsocket_openssl_symbols_p.h
++++ qtbase-everywhere-src-5.15.0-rc/src/network/ssl/qsslsocket_openssl_symbols_p.h
+@@ -516,7 +516,7 @@ void q_SSL_set_bio(SSL *a, BIO *b, BIO *
+ void q_SSL_set_accept_state(SSL *a);
+ void q_SSL_set_connect_state(SSL *a);
+ int q_SSL_shutdown(SSL *a);
+-int q_SSL_in_init(const SSL *s);
++int q_SSL_in_init(SSL *s);
+ int q_SSL_get_shutdown(const SSL *ssl);
+ int q_SSL_set_session(SSL *to, SSL_SESSION *session);
+ void q_SSL_SESSION_free(SSL_SESSION *ses);

libqt5-qtbase.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed May  6 11:26:35 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 5.15.0-rc:
+  * New bugfix release
+  * For the changes between 5.14.2 and 5.15.0 please see:
+    http://code.qt.io/cgit/qt/qtbase.git/plain/dist/changes-5.15.0/?h=5.15.0
+- Drop patches, now upstream:
+  * 0001-QTextMarkdownImporter-fix-use-after-free-add-fuzz-ge.patch
+- Add patch to fix build on Leap 15.1:
+  * fix-build-openssl-1.1.0.patch
+
+-------------------------------------------------------------------
+Mon Apr 27 12:45:07 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Add patch to fix use-after-free (boo#1170582, CVE-2020-12267):
+  * 0001-QTextMarkdownImporter-fix-use-after-free-add-fuzz-ge.patch
+
 -------------------------------------------------------------------
 Fri Apr 24 07:11:04 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
 

libqt5-qtbase.spec

@@ -36,16 +36,16 @@
 %endif
 
 Name:           libqt5-qtbase
-Version:        5.15.0~beta4
+Version:        5.15.0~rc
 Release:        0
 Summary:        C++ Program Library, Core Components
 License:        LGPL-3.0-only or GPL-3.0-with-Qt-Company-Qt-exception-1.1
 Group:          System/Libraries
 Url:            https://www.qt.io
 %define base_name libqt5
-%define real_version 5.15.0-beta4
+%define real_version 5.15.0-rc
 %define so_version 5.15.0
-%define tar_version qtbase-everywhere-src-5.15.0-beta4
+%define tar_version qtbase-everywhere-src-5.15.0-rc
 Source:         https://download.qt.io/development_releases/qt/5.15/%{real_version}/submodules/%{tar_version}.tar.xz
 # to get mtime of file:
 Source1:        libqt5-qtbase.changes
@@ -54,6 +54,7 @@ Source3:        baselibs.conf
 Source99:       libqt5-qtbase-rpmlintrc
 # patches 0-1000 are openSUSE and/or non-upstream(able) patches #
 Patch1:         0001-Lower-required-version-of-OpenSSL-to-1.1.0.patch
+Patch2:         fix-build-openssl-1.1.0.patch
 # PATCH-FIX-OPENSUSE disable-rc4-ciphers-bnc865241.diff bnc#865241-- Exclude rc4 ciphers from being used by default
 Patch6:         disable-rc4-ciphers-bnc865241.diff
 Patch8:         tell-the-truth-about-private-api.patch

qtbase-everywhere-src-5.15.0-beta4.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:77c59eb2de03f63ae98c0394db8f4574c97e53c50033b004e78971e3c0a891ee
-size 49928780

qtbase-everywhere-src-5.15.0-rc.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:adde0de674a5e22a34fbf1034926e9e338cc3f1208286df5614543269d1778af
+size 49951072