5.15.15

.gitignore

@@ -7,3 +7,5 @@
 /kde-5.15-rollup-20220304.patch.gz
 /qtbase-everywhere-opensource-src-5.15.4.tar.xz
 /kde-5.15-rollup-20220516.patch.gz
+/qtbase-everywhere-opensource-src-5.15.5.tar.xz
+/kde-5.15-rollup-20220713.patch.gz

qt5-qtbase-fix-invalid-number-of-concurrent-stream.patch

@@ -1,43 +0,0 @@
-diff --git a/src/network/access/http2/http2protocol_p.h b/src/network/access/http2/http2protocol_p.h
-index b0af5aa91921bf5229e2d54284687bafb1969eb1..ed5f2bf561f2bd62c6ef7fd1fde29e867d374603 100644
---- a/src/network/access/http2/http2protocol_p.h
-+++ b/src/network/access/http2/http2protocol_p.h
-@@ -133,9 +133,6 @@ enum Http2PredefinedParameters
-     maxPayloadSize = (1 << 24) - 1, // HTTP/2 6.5.2
- 
-     defaultSessionWindowSize = 65535, // HTTP/2 6.5.2
--    // Using 1000 (rather arbitrarily), just to
--    // impose *some* upper limit:
--    maxPeerConcurrentStreams  = 1000,
-     maxConcurrentStreams = 100 // HTTP/2, 6.5.2
- };
- 
-diff --git a/src/network/access/qhttp2protocolhandler.cpp b/src/network/access/qhttp2protocolhandler.cpp
-index f513139304bba375ea3c345c74f2c889b5a13938..21f1c91e29513acff83c45b6717cd5aa25609d62 100644
---- a/src/network/access/qhttp2protocolhandler.cpp
-+++ b/src/network/access/qhttp2protocolhandler.cpp
-@@ -393,7 +393,8 @@ bool QHttp2ProtocolHandler::sendRequest()
-         initReplyFromPushPromise(message, key);
-     }
- 
--    const auto streamsToUse = std::min<quint32>(maxConcurrentStreams - activeStreams.size(),
-+    const auto streamsToUse = std::min<quint32>(maxConcurrentStreams > activeStreams.size()
-+                                                ? maxConcurrentStreams - activeStreams.size() : 0,
-                                                 requests.size());
-     auto it = requests.begin();
-     for (quint32 i = 0; i < streamsToUse; ++i) {
-@@ -1084,13 +1085,8 @@ bool QHttp2ProtocolHandler::acceptSetting(Http2::Settings identifier, quint32 ne
-         QMetaObject::invokeMethod(this, "resumeSuspendedStreams", Qt::QueuedConnection);
-     }
- 
--    if (identifier == Settings::MAX_CONCURRENT_STREAMS_ID) {
--        if (newValue > maxPeerConcurrentStreams) {
--            connectionError(PROTOCOL_ERROR, "SETTINGS invalid number of concurrent streams");
--            return false;
--        }
-+    if (identifier == Settings::MAX_CONCURRENT_STREAMS_ID)
-         maxConcurrentStreams = newValue;
--    }
- 
-     if (identifier == Settings::MAX_FRAME_SIZE_ID) {
-         if (newValue < Http2::minPayloadLimit || newValue > Http2::maxPayloadSize) {

qt5-qtbase.spec

@@ -60,8 +60,8 @@ BuildRequires: pkgconfig(libsystemd)
 
 Name:    qt5-qtbase
 Summary: Qt5 - QtBase components
-Version: 5.15.4
+Version: 5.15.5
-Release: 4%{?dist}
+Release: 1%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -144,14 +144,13 @@ Patch90: %{name}-gcc11.patch
 
 ## upstream patches
 # https://invent.kde.org/qt/qt/qtbase, kde/5.15 branch
-# git diff v5.15.4-lts-lgpl..HEAD | gzip > kde-5.15-rollup-$(date +%Y%m%d).patch.gz
+# git diff v5.15.5-lts-lgpl..HEAD | gzip > kde-5.15-rollup-$(date +%Y%m%d).patch.gz
 # patch100 in lookaside cache due to large'ish size -- rdieter
-Patch100: kde-5.15-rollup-20220516.patch.gz
+Patch100: kde-5.15-rollup-20220713.patch.gz
 # HACK to make 'fedpkg sources' consider it 'used"
-Source100: kde-5.15-rollup-20220516.patch.gz
+Source100: kde-5.15-rollup-20220713.patch.gz
 # CVS-2021-38593
 Patch101: qtbase-everywhere-src-5.15.4-cve-2021-38593.patch
-Patch102: qt5-qtbase-fix-invalid-number-of-concurrent-stream.patch
 
 # Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires.
 # Those themes are there for platform integration. If the required libraries are
@@ -430,7 +429,6 @@ Qt5 libraries used for drawing widgets and OpenGL items.
 ## upstream patches
 %patch100 -p1
 %patch101 -p1
-%patch102 -p1
 
 # move some bundled libs to ensure they're not accidentally used
 pushd src/3rdparty
@@ -592,7 +590,7 @@ translationdir=%{_qt5_translationdir}
 
 Name: Qt5
 Description: Qt5 Configuration
-Version: 5.15.4
+Version: 5.15.5
 EOF
 
 # rpm macros
@@ -1108,6 +1106,9 @@ fi
 
 
 %changelog
+* Wed Jul 13 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.5-1
+- 5.15.5
+
 * Tue Jun 21 2022 Than Ngo <than@redhat.com> - 5.15.4-4
 - bz#2099267, backport patch to fix download problem from Settings 
 

sources

@@ -1,2 +1,2 @@
-SHA512 (qtbase-everywhere-opensource-src-5.15.4.tar.xz) = 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
+SHA512 (qtbase-everywhere-opensource-src-5.15.5.tar.xz) = ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
-SHA512 (kde-5.15-rollup-20220516.patch.gz) = a56a97b67a82dcd15ea282cf15dce23ac1fda530fdfdf36f805d7f9380a04de8a80d876fb6b277888af63ccaf417c8db6fe5814bf5dc91d9a71b513c22427371
+SHA512 (kde-5.15-rollup-20220713.patch.gz) = ad352cf917e77c6ff77ed981e96ad423c2fed6b61d03d36231b0d5d1609fb1d09bc1eaeced19f0b3d3aee317135f345ce1f7b1886ae6a63d16043c4c1b879649