From 24fd814c326e282c4321965c31f341dad77e270d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Jan 2021 11:28:34 +0000 Subject: gentoo resync : 08.01.2021 --- dev-qt/qtcore/Manifest | 4 +- .../files/qtcore-5.15.2-fix-UB-in-QDateTime.patch | 88 +++++++++++++++++ ...qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch | 54 +++++++++++ dev-qt/qtcore/qtcore-5.15.2-r2.ebuild | 106 +++++++++++++++++++++ dev-qt/qtcore/qtcore-5.15.2.ebuild | 104 -------------------- 5 files changed, 251 insertions(+), 105 deletions(-) create mode 100644 dev-qt/qtcore/files/qtcore-5.15.2-fix-UB-in-QDateTime.patch create mode 100644 dev-qt/qtcore/files/qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch create mode 100644 dev-qt/qtcore/qtcore-5.15.2-r2.ebuild delete mode 100644 dev-qt/qtcore/qtcore-5.15.2.ebuild (limited to 'dev-qt/qtcore') diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest index 6cda18c59ec0..8f4125f7d560 100644 --- a/dev-qt/qtcore/Manifest +++ b/dev-qt/qtcore/Manifest @@ -1,8 +1,10 @@ AUX qtcore-5.14.1-cmake-macro-backward-compat.patch 2555 BLAKE2B 5fe2b70232722416cb85ecce8a0742b57503c520482aa0386042f43d4cf20926a874b9a92f90c656cfe0bf93883c286b6b08c0ad2568f3a6746c776dcf208995 SHA512 c7ba0bfa6d462504ba9421abfb7f502265fd8c6bd7469326612925cd7b7667daba3350f714aa5a516aa83e5352ec6d18fc02af9ebf5494af10a4b6f8f7c47d5b AUX qtcore-5.15.1-timezone-1.patch 9484 BLAKE2B aa36362fcc6ea1ab144e97dfa1e023e4fbad64f8702e817ee2431ac271aefd637609d14a265c2d6e58bedbdb3f635b4b979c9bf1463a29370ae05bb2610e131b SHA512 1edfe267827225279b0ecad60a5a350b825ed9bd84574d0e5470e71bac75668c0655aa0db2f001e26e331f85e0cf0a68412ba5a9541581bf39a0e954313672b2 AUX qtcore-5.15.1-timezone-2.patch 1933 BLAKE2B 479f82c90d2132291bc298491d61d7144e08a6db8b36d7d1a89f368c894e41902ae964aaa2819010c485dc5aedd937f2dd00b4efa99d3393d11368e0ea258481 SHA512 c978ffadf15629ab562a53cc24d31e33f4df861962b927ea37061747cb74a7b677d7ae3a617b526c4f48085fe73ebb89fbf5a44748433426dd74e5691a238097 +AUX qtcore-5.15.2-fix-UB-in-QDateTime.patch 3707 BLAKE2B 7b1ed1b539d04e299b3148acf85d69c014a8a76882a682910b323117e176c68dab8b48de12c0a5c885508dd6d97a4ae9da4a27162323ba743d25f9a83319b367 SHA512 62beec1be070ff6136f1b52c1789e31f877bf728ca12c54c90de6302f6c35008d0d9e939f99a92465ca14ee977faed507b2acdea553d8904eb201aed41a97805 +AUX qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch 1944 BLAKE2B 71f3a02d89e3604cec0f021fe28bddc0ab43e242742d0f5af17a46bbfdc444f7d3244fe995195ef0c1c9119313a472bd7e64a6fd02986f7cb6cb544553fbd36d SHA512 6f9f57eb2b374b56576fe0046518810e07482aae1a74f45c9692ffbd797ad1653aedfcd896d89909ade4572564164e92698de64da9f98ce876952c2c96b15aa3 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 EBUILD qtcore-5.15.1-r1.ebuild 2329 BLAKE2B 334f653646aa77c793cfb5de180980e1d2e8d7fde149256de83c944fff0498fb6f323b623bbe1af0028a5a4dfa872c4907c779396b8afce34ba810addd840d60 SHA512 15a004f1ffafe87d13b1bc309b193239891a785e640ee5042262a35b780efdd7ba6ab9201cd346c05f8b46323771174188160f33025a17e61bd22ab1e7f6a643 -EBUILD qtcore-5.15.2.ebuild 2293 BLAKE2B ceb633d3f4e3de49d530b507c6f9f6a50ca7b1a33ca4febcb45e604817fbc4007f61ea59ad0c3fc2234780d234cc26b3a2597fc78bfbfd9104354b8d169492a6 SHA512 dcad7b7c421e270277ff595cd66407a93c0dd126b96597dd1eda5dafe87b2616dd7562591208efae9858c8f54f50f2dae4f0ee0c84e91d88e26e0bd4c94b8d44 +EBUILD qtcore-5.15.2-r2.ebuild 2421 BLAKE2B 97ab233d49d73f948a1d3253b0db404420c6180b2c31009a9da16c2fa2884ba493b1c7606e39b8ed2a72e4bcc93e2303c2e2c1e12e27beb9dd781a6cdf305777 SHA512 018c8e842bb9d44c02c1662e88520a710133a35581a9aa9ce89ceedc1ad8088a4a4638d8afbbafdfb21381d59e69040f71c53818bf0915160a9c7fbb7c97a43b MISC metadata.xml 832 BLAKE2B 20f3ca80bc8aea1203ca8c3f34314fb599151eed5639cb9ba6cee97b70a04152ce8c06a4bf1f41058515a3a9d32242bcdf84b6fc75b68b7183951f7c9747396d SHA512 ea1c7dfef8c3afeda436a1de09ee2002441b7d13b3aa40bda02324668f3664fceafcf276f87c897e83f49e246e9fb3ffcefa95098ccb2f5a8b503779686e1b3e 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 new file mode 100644 index 000000000000..b131b7af3657 --- /dev/null +++ b/dev-qt/qtcore/files/qtcore-5.15.2-fix-UB-in-QDateTime.patch @@ -0,0 +1,88 @@ +From d2c0fc2b5f1c07c1e0acb1c0127578066b6f9b8e Mon Sep 17 00:00:00 2001 +From: Edward Welbourne +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 +(cherry picked from commit 380d97e1bd15e753907c378a070bdf7f1c1cf06e) +Reviewed-by: Edward Welbourne +--- + 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 new file mode 100644 index 000000000000..892d89d2948c --- /dev/null +++ b/dev-qt/qtcore/files/qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch @@ -0,0 +1,54 @@ +From 6485b6d45ad165cf976138cf8ab683c42515e794 Mon Sep 17 00:00:00 2001 +From: Kai Koehne +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 +(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/qtcore-5.15.2-r2.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r2.ebuild new file mode 100644 index 000000000000..3fce1aceac5d --- /dev/null +++ b/dev-qt/qtcore/qtcore-5.15.2-r2.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +QT5_MODULE="qtbase" +inherit linux-info qt5-build + +DESCRIPTION="Cross-platform application development framework" +SLOT=5/$(ver_cut 1-3) + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +fi + +IUSE="icu old-kernel systemd" + +DEPEND=" + dev-libs/double-conversion:= + dev-libs/glib:2 + dev-libs/libpcre2[pcre16,unicode] + sys-libs/zlib:= + icu? ( dev-libs/icu:= ) + !icu? ( virtual/libiconv ) + systemd? ( sys-apps/systemd:= ) +" +RDEPEND="${DEPEND} + !> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die + + #if defined(QT_NO_${flag}) && defined(QT_${flag}) + # undef QT_NO_${flag} + #elif !defined(QT_NO_${flag}) && !defined(QT_${flag}) + # define QT_NO_${flag} + #endif + _EOF_ + done +} diff --git a/dev-qt/qtcore/qtcore-5.15.2.ebuild b/dev-qt/qtcore/qtcore-5.15.2.ebuild deleted file mode 100644 index 930bd912dbd9..000000000000 --- a/dev-qt/qtcore/qtcore-5.15.2.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qtbase" -inherit linux-info qt5-build - -DESCRIPTION="Cross-platform application development framework" -SLOT=5/$(ver_cut 1-3) - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -fi - -IUSE="icu old-kernel systemd" - -DEPEND=" - dev-libs/double-conversion:= - dev-libs/glib:2 - dev-libs/libpcre2[pcre16,unicode] - sys-libs/zlib:= - icu? ( dev-libs/icu:= ) - !icu? ( virtual/libiconv ) - systemd? ( sys-apps/systemd:= ) -" -RDEPEND="${DEPEND} - !> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die - - #if defined(QT_NO_${flag}) && defined(QT_${flag}) - # undef QT_NO_${flag} - #elif !defined(QT_NO_${flag}) && !defined(QT_${flag}) - # define QT_NO_${flag} - #endif - _EOF_ - done -} -- cgit v1.2.3