pool/libqt5-qtbase
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 942364 from KDE:Qt:5.15

Browse Source 
- Update to version 5.15.2+kde268:
  * Adapt for q_EVP_PKEY_base_id → q_EVP_PKEY_get_base_id rename in OpenSSL 3
  * Don't use a deprecated function if built/linked with OpenSSL v3
  * Diffie-Hellman parameters: remove useless 'fix'
  * Dont's use DTLS_MAX_VERSION when setting SSL_CTX
  * Avoid mixing atomic futex changes and QAtomic
  * Fix qtdeclarative baseline test failure for text tables
  * Don't let text table cells shrink below their minimum width (boo#1176530)
  * Don't shrink a column when it spans multiple columns
  * Use icon themes in QPrintPreviewDialog [if they exist]
  * QAbstractFileEngine: fix UB (data race) on qt_file_engine_handlers_in_use
  * Increment reference count when restoring reference
  * Reject truncated and corrupt ascii pnm images
  * Fix handling of Sunday in POSIX time-zone rules
  * Fix developer build
- Drop patches, support for OpenSSL < 1.1.0 is no longer necessary:
  * 0001-Lower-required-version-of-OpenSSL-to-1.1.0.patch
  * fix-build-openssl-1.1.0.patch

OBS-URL: https://build.opensuse.org/request/show/942364
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=123
This commit is contained in:
Dominique Leuenberger 2021-12-25 19:16:39 +00:00 committed by Git OBS Bridge
commit e6622d0b85
8 changed files with 30 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
0001-Lower-required-version-of-OpenSSL-to-1.1.0.patch
View File

@ -1,44 +0,0 @@
From 5fbcd6b8f1635916c0a2669649d3c96312b54288 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Tue, 14 Apr 2020 11:33:23 +0200
Subject: [PATCH] Lower required version of OpenSSL to 1.1.0
SLE 15 until SP2 (so Leap < 15.2) ships 1.1.0 which won't get upgraded.
---
src/network/configure.json | 4 ++--
src/network/ssl/qsslsocket_openssl.cpp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/network/configure.json b/src/network/configure.json
index 289d84fbb4..c414e729d7 100644
--- a/src/network/configure.json
+++ b/src/network/configure.json
@@ -61,8 +61,8 @@
"export": "openssl",
"test": {
"tail": [
- "#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10101000L",
- "# error OpenSSL >= 1.1.1 is required",
+ "#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L",
+ "# error OpenSSL >= 1.1.0 is required",
"#endif",
"#if !defined(OPENSSL_NO_EC) && !defined(SSL_CTRL_SET_CURVES)",
"# error OpenSSL was reported as >= 1.1.1 but is missing required features, possibly it's libressl which is unsupported",
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
index 9b28d52e21..daddea1feb 100644
--- a/src/network/ssl/qsslsocket_openssl.cpp
+++ b/src/network/ssl/qsslsocket_openssl.cpp
@@ -1943,8 +1943,8 @@ bool QSslSocketPrivate::ensureLibraryLoaded()
if (q_OPENSSL_init_ssl(0, nullptr) != 1)
return false;
- if (q_OpenSSL_version_num() < 0x10101000L) {
- qCWarning(lcSsl, "QSslSocket: OpenSSL >= 1.1.1 is required; %s was found instead", q_OpenSSL_version(OPENSSL_VERSION));
+ if (q_OpenSSL_version_num() < 0x10100000L) {
+ qCWarning(lcSsl, "QSslSocket: OpenSSL >= 1.1.0 is required; %s was found instead", q_OpenSSL_version(OPENSSL_VERSION));
return false;
}
--
2.25.1

2
_servicedata
View File

@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://invent.kde.org/qt/qt/qtbase.git</param>
<param name="changesrevision">c9fde86b0a2440133bc08f4811b6ca793be47f0a</param></service></servicedata>
<param name="changesrevision">edb0f568ca1380623325cb18365b0af81cbf65bf</param></service></servicedata>

51
fix-build-openssl-1.1.0.patch
View File

@ -1,51 +0,0 @@
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.1/src/network/ssl/qsslsocket_openssl_symbols.cpp
===================================================================
--- 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)
-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.1/src/network/ssl/qsslsocket_openssl_symbols_p.h
===================================================================
--- 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);
-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);

22
libqt5-qtbase.changes
View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Fri Dec 24 11:45:16 UTC 2021 - fabian@ritter-vogt.de
- Update to version 5.15.2+kde268:
* Adapt for q_EVP_PKEY_base_id → q_EVP_PKEY_get_base_id rename in OpenSSL 3
* Don't use a deprecated function if built/linked with OpenSSL v3
* Diffie-Hellman parameters: remove useless 'fix'
* Dont's use DTLS_MAX_VERSION when setting SSL_CTX
* Avoid mixing atomic futex changes and QAtomic
* Fix qtdeclarative baseline test failure for text tables
* Don't let text table cells shrink below their minimum width (boo#1176530)
* Don't shrink a column when it spans multiple columns
* Use icon themes in QPrintPreviewDialog [if they exist]
* QAbstractFileEngine: fix UB (data race) on qt_file_engine_handlers_in_use
* Increment reference count when restoring reference
* Reject truncated and corrupt ascii pnm images
* Fix handling of Sunday in POSIX time-zone rules
* Fix developer build
- Drop patches, support for OpenSSL < 1.1.0 is no longer necessary:
* 0001-Lower-required-version-of-OpenSSL-to-1.1.0.patch
* fix-build-openssl-1.1.0.patch
-------------------------------------------------------------------
Thu Oct 28 07:14:35 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>

4
libqt5-qtbase.spec
View File

@ -29,7 +29,7 @@
%bcond_without harfbuzz
Name: libqt5-qtbase
Version: 5.15.2+kde254
Version: 5.15.2+kde268
Release: 0
Summary: C++ Program Library, Core Components
License: LGPL-3.0-only or GPL-3.0-with-Qt-Company-Qt-exception-1.1
@ -47,8 +47,6 @@ Source3: baselibs.conf
Source4: qtlogging.ini
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
Patch3: 0001-Revert-QMenu-hide-when-a-QWidgetAction-fires-the-tri.patch
# Proposed: https://bugreports.qt.io/browse/QTBUG-88491
Patch4: 0001-Avoid-SIGABRT-on-platform-plugin-initialization-fail.patch

3
qtbase-everywhere-src-5.15.2+kde254.obscpio
View File

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

3
qtbase-everywhere-src-5.15.2+kde268.obscpio Normal file
View File

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

6
qtbase-everywhere-src.obsinfo
View File

@ -1,5 +1,5 @@
name: qtbase-everywhere-src
version: 5.15.2+kde254
mtime: 1635027294
commit: c9fde86b0a2440133bc08f4811b6ca793be47f0a
version: 5.15.2+kde268
mtime: 1640345034
commit: edb0f568ca1380623325cb18365b0af81cbf65bf