gentoo resync : 20.10.2021

3 files changed, 0 insertions, 180 deletions

diff --git a/dev-qt/qtcore/files/qtcore-5.15.2-fix-UB-in-QDateTime.patch b/dev-qt/qtcore/files/qtcore-5.15.2-fix-UB-in-QDateTime.patch
deleted file mode 100644
index b131b7af3657..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.15.2-fix-UB-in-QDateTime.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From d2c0fc2b5f1c07c1e0acb1c0127578066b6f9b8e Mon Sep 17 00:00:00 2001
-From: Edward Welbourne <edward.welbourne@qt.io>
-Date: Tue, 24 Nov 2020 12:45:11 +0100
-Subject: [PATCH] Bounds-check time-zone offsets when parsing
-
-Parsing of time-zone offsets should check the offset string conforms
-to the expected format and has valid values in its fields. The
-QDateTime parser, fromOffsetString(), neglected the bounds check on
-hours; the QTzTimeZonePrivate parser, parsePosixTime(), neglected all
-upper bounds checks, only checking against negative valus.
-
-Drive-by - refined phrasing of a comment.
-
-Fixes: QTBUG-88656
-Change-Id: If04cdbe65064108eaa87c42310527783ad21b4c0
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-(cherry picked from commit 380d97e1bd15e753907c378a070bdf7f1c1cf06e)
-Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
----
- src/corelib/time/qdatetime.cpp           |  2 +-
- src/corelib/time/qtimezoneprivate_tz.cpp | 27 ++++++++++++++++-----------
- 2 files changed, 17 insertions(+), 12 deletions(-)
-
-diff --git a/src/corelib/time/qdatetime.cpp b/src/corelib/time/qdatetime.cpp
-index e824787880c..a2816e87f4a 100644
---- a/src/corelib/time/qdatetime.cpp
-+++ b/src/corelib/time/qdatetime.cpp
-@@ -240,7 +240,7 @@ static int fromOffsetString(QStringView offsetString, bool *valid) noexcept
-     const QStringView hhRef = time.left(qMin(hhLen, time.size()));
-     bool ok = false;
-     const int hour = C.toInt(hhRef, &ok);
--    if (!ok)
-+    if (!ok || hour > 23) // More generous than QTimeZone::MaxUtcOffsetSecs
-         return 0;
- 
-     const QStringView mmRef = time.mid(qMin(mmIndex, time.size()));
-diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp
-index b816b4ecff2..adc590878d7 100644
---- a/src/corelib/time/qtimezoneprivate_tz.cpp
-+++ b/src/corelib/time/qtimezoneprivate_tz.cpp
-@@ -394,29 +394,34 @@ static int parsePosixTime(const char *begin, const char *end)
-     // Format "hh[:mm[:ss]]"
-     int hour, min = 0, sec = 0;
- 
--    // Note that the calls to qstrtoll do *not* check the end pointer, which
--    // means they proceed until they find a non-digit. We check that we're
--    // still in range at the end, but we may have read from past end. It's the
--    // caller's responsibility to ensure that begin is part of a
--    // null-terminated string.
-+    // Note that the calls to qstrtoll do *not* check against the end pointer,
-+    // which means they proceed until they find a non-digit. We check that we're
-+    // still in range at the end, but we may have read past end. It's the
-+    // caller's responsibility to ensure that begin is part of a null-terminated
-+    // string.
- 
-+    const int maxHour = QTimeZone::MaxUtcOffsetSecs / 3600;
-     bool ok = false;
--    hour = qstrtoll(begin, &begin, 10, &ok);
--    if (!ok || hour < 0)
-+    const char *cut = begin;
-+    hour = qstrtoll(begin, &cut, 10, &ok);
-+    if (!ok || hour < 0 || hour > maxHour || cut > begin + 2)
-         return INT_MIN;
-+    begin = cut;
-     if (begin < end && *begin == ':') {
-         // minutes
-         ++begin;
--        min = qstrtoll(begin, &begin, 10, &ok);
--        if (!ok || min < 0)
-+        min = qstrtoll(begin, &cut, 10, &ok);
-+        if (!ok || min < 0 || min > 59 || cut > begin + 2)
-             return INT_MIN;
- 
-+        begin = cut;
-         if (begin < end && *begin == ':') {
-             // seconds
-             ++begin;
--            sec = qstrtoll(begin, &begin, 10, &ok);
--            if (!ok || sec < 0)
-+            sec = qstrtoll(begin, &cut, 10, &ok);
-+            if (!ok || sec < 0 || sec > 59 || cut > begin + 2)
-                 return INT_MIN;
-+            begin = cut;
-         }
-     }
- 
--- 
-2.16.3
diff --git a/dev-qt/qtcore/files/qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch b/dev-qt/qtcore/files/qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch
deleted file mode 100644
index 892d89d2948c..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 6485b6d45ad165cf976138cf8ab683c42515e794 Mon Sep 17 00:00:00 2001
-From: Kai Koehne <kai.koehne@qt.io>
-Date: Tue, 13 Oct 2020 15:47:31 +0200
-Subject: [PATCH] Fix allocated memory of QByteArray returned by
- QIODevice::readLine
-
-If the maxSize argument is 0 (the default), QIODevice::readLine will
-allocate a QByteArray with the size of the next chunk of data, which
-may be quite large. Before returning, it then resizes the byte array
-to the actual size that was read.
-
-But since change 6b884d2aa129, QByteArray::resize() does no
-longer shrink the capacity. This means that the returned QByteArray
-keeps it's maximum size as allocated memory. This can lead to
-excessive memory consumption, especially if the returned QByteArray's
-are stored for further processing in the client code.
-
-Fix this by explicitly calling QByteArray::squeeze() before returning.
-
-[ChangeLog][QtCore][QIODevice] Fixes a regression in Qt 5.15 causing
-QByteArray's that are returned by QIODevice::readLine() to
-consume large amounts of memory.
-
-Fixes: QTBUG-87010
-Change-Id: I1f95fc4098849e900680fc945238bfeda881022c
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-(cherry picked from commit 263b29eedb223dec1ecaee193302070af87a1852,
-limited squeeze() call if bytes are actually read to preserve retVal.isNull()
-behavior in 5.15)
----
- src/corelib/io/qiodevice.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp
-index cc1d1102522..0f11c2e805c 100644
---- a/src/corelib/io/qiodevice.cpp
-+++ b/src/corelib/io/qiodevice.cpp
-@@ -1480,10 +1480,12 @@ QByteArray QIODevice::readLine(qint64 maxSize)
-     } else
-         readBytes = readLine(result.data(), result.size());
- 
--    if (readBytes <= 0)
-+    if (readBytes <= 0) {
-         result.clear();
--    else
-+    } else {
-         result.resize(readBytes);
-+        result.squeeze();
-+    }
- 
-     return result;
- }
--- 
-2.16.3
diff --git a/dev-qt/qtcore/files/qtcore-5.15.2-gcc11.patch b/dev-qt/qtcore/files/qtcore-5.15.2-gcc11.patch
deleted file mode 100644
index 9d391311c345..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.15.2-gcc11.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: include <limits> to fix some GCC 11 build issues
-Origin: upstream, commits:
- https://code.qt.io/cgit/qt/qtbase.git/commit/?id=813a928c7c3cf986
- https://code.qt.io/cgit/qt/qtbase.git/commit/?id=9c56d4da2ff631a8
-Last-Update: 2021-01-26
-
---- a/src/corelib/global/qendian.h
-+++ b/src/corelib/global/qendian.h
-@@ -44,6 +44,8 @@
- #include <QtCore/qfloat16.h>
- #include <QtCore/qglobal.h>
- 
-+#include <limits>
-+
- // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems
- #include <stdlib.h>
- #include <string.h>
---- a/src/corelib/global/qfloat16.h
-+++ b/src/corelib/global/qfloat16.h
-@@ -43,6 +43,7 @@
- 
- #include <QtCore/qglobal.h>
- #include <QtCore/qmetatype.h>
-+#include <limits>
- #include <string.h>
- 
- #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)
---- a/src/corelib/text/qbytearraymatcher.h
-+++ b/src/corelib/text/qbytearraymatcher.h
-@@ -42,6 +42,8 @@
- 
- #include <QtCore/qbytearray.h>
- 
-+#include <limits>
-+
- QT_BEGIN_NAMESPACE
- 
-