Hello community, here is the log from the commit of package libqt5-qtbase for openSUSE:Factory checked in at 2020-09-14 12:05:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtbase (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtbase.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtbase" Mon Sep 14 12:05:40 2020 rev:109 rq:833635 version:5.15.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtbase/libqt5-qtbase.changes 2020-07-09 13:16:04.252644447 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtbase.new.4249/libqt5-qtbase.changes 2020-09-14 12:07:21.839874805 +0200 @@ -1,0 +2,13 @@ +Thu Sep 10 07:57:00 UTC 2020 - Fabian Vogt <fab...@ritter-vogt.de> + +- Update to 5.15.1: + * New bugfix release + * Fixes CVE-2020-17507 + * For more details please see: + http://code.qt.io/cgit/qt/qtbase.git/plain/dist/changes-5.15.1/?h=5.15.1 +- Drop patches, now upstream: + * 0001-Do-not-multithread-if-already-in-a-global-threadpool.patch + * 0001-Fix-QToolButton-menus-showing-on-primary-screens-in-.patch +- Adjust fix-build-openssl-1.1.0.patch + +------------------------------------------------------------------- Old: ---- 0001-Do-not-multithread-if-already-in-a-global-threadpool.patch 0001-Fix-QToolButton-menus-showing-on-primary-screens-in-.patch qtbase-everywhere-src-5.15.0.tar.xz New: ---- qtbase-everywhere-src-5.15.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtbase.spec ++++++ --- /var/tmp/diff_new_pack.YwttoU/_old 2020-09-14 12:07:44.363897959 +0200 +++ /var/tmp/diff_new_pack.YwttoU/_new 2020-09-14 12:07:44.363897959 +0200 @@ -36,16 +36,16 @@ %endif Name: libqt5-qtbase -Version: 5.15.0 +Version: 5.15.1 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 -%define so_version 5.15.0 -%define tar_version qtbase-everywhere-src-5.15.0 +%define real_version 5.15.1 +%define so_version 5.15.1 +%define tar_version qtbase-everywhere-src-5.15.1 Source: https://download.qt.io/official_releases/qt/5.15/%{real_version}/submodules/%{tar_version}.tar.xz # to get mtime of file: Source1: libqt5-qtbase.changes @@ -67,12 +67,9 @@ Patch21: 0001-Don-t-white-list-recent-Mesa-versions-for-multithrea.patch Patch24: fix-fixqt4headers.patch # patches 1000-2000 and above from upstream 5.15 branch # -Patch1000: 0001-Do-not-multithread-if-already-in-a-global-threadpool.patch # patches 2000-3000 and above from upstream qt6/dev branch # # Not accepted yet, https://codereview.qt-project.org/c/qt/qtbase/+/255384 Patch2001: 0002-Synthesize-Enter-LeaveEvent-for-accepted-QTabletEven.patch -# Not accepted yet, https://codereview.qt-project.org/c/qt/qtbase/+/303786 -Patch2002: 0001-Fix-QToolButton-menus-showing-on-primary-screens-in-.patch BuildRequires: alsa-devel BuildRequires: cups-devel BuildRequires: double-conversion-devel ++++++ fix-build-openssl-1.1.0.patch ++++++ --- /var/tmp/diff_new_pack.YwttoU/_old 2020-09-14 12:07:44.419898017 +0200 +++ /var/tmp/diff_new_pack.YwttoU/_new 2020-09-14 12:07:44.419898017 +0200 @@ -3,11 +3,21 @@ 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 +Index: qtbase-everywhere-src-5.15.1/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 +--- qtbase-everywhere-src-5.15.1.orig/src/network/ssl/qsslsocket_openssl_symbols.cpp ++++ qtbase-everywhere-src-5.15.1/src/network/ssl/qsslsocket_openssl_symbols.cpp +@@ -146,7 +146,9 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, + DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return) + DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return) + DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return) ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L + DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return) ++#endif + DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return) + DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return) + DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return) +@@ -376,7 +378,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) @@ -16,11 +26,21 @@ 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 +Index: qtbase-everywhere-src-5.15.1/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 * +--- qtbase-everywhere-src-5.15.1.orig/src/network/ssl/qsslsocket_openssl_symbols_p.h ++++ qtbase-everywhere-src-5.15.1/src/network/ssl/qsslsocket_openssl_symbols_p.h +@@ -235,7 +235,9 @@ int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CT + Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a); + EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e); + void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx); ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L + int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx); ++#endif + int q_EVP_PKEY_base_id(EVP_PKEY *a); + int q_RSA_bits(RSA *a); + Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a); +@@ -519,7 +521,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); ++++++ qtbase-everywhere-src-5.15.0.tar.xz -> qtbase-everywhere-src-5.15.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/libqt5-qtbase/qtbase-everywhere-src-5.15.0.tar.xz /work/SRC/openSUSE:Factory/.libqt5-qtbase.new.4249/qtbase-everywhere-src-5.15.1.tar.xz differ: char 26, line 1
