From 3857bccca5e59dfe90fc5b5823bfe672a1847cd5 Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Thu, 17 Mar 2022 17:38:22 +0100 Subject: [PATCH] package/qt5/qt5base: remove leftover patch CVE-2021-38593 fixes originally missed a usecase that was covered by the to-be-removed patch. However, this patch was incorrect and added some issues on its own, which was then fixed by now-removed 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch. Unfortunately for us, the to-be-removed patch (fixed by 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch) can actually be applied (with fuzz; by `patch` only) on top of the now-removed patch. When the move to KDE Qt fork was made, some patches were removed as they were already part of the new git fork. However, the to-be-removed patch was not. This means the 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch was actually undone when Buildroot patched qt5base. Let's remove this patch to fix this oversight. As a reference: e7ea2ed27c Improve fix for avoiding huge number of tiny dashes fixed by 65b3aa6a1c Refix for avoiding huge number of tiny dashes in the git repo. Fixes: 5770a645a3a49 "package/qt5: bump packages to latest kde submodule versions" Cc: Quentin Schulz Signed-off-by: Quentin Schulz [Arnout: renumber patches 0007 and 0008] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ....patch => 0006-Fix-build-on-riscv32.patch} | 0 ...-avoiding-huge-number-of-tiny-dashes.patch | 37 ------------------- ...igure.json-fix-atomicfptr-detection.patch} | 0 3 files changed, 37 deletions(-) rename package/qt5/qt5base/{0007-Fix-build-on-riscv32.patch => 0006-Fix-build-on-riscv32.patch} (100%) delete mode 100644 package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch rename package/qt5/qt5base/{0008-src-corelib-configure.json-fix-atomicfptr-detection.patch => 0007-src-corelib-configure.json-fix-atomicfptr-detection.patch} (100%) diff --git a/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch similarity index 100% rename from package/qt5/qt5base/0007-Fix-build-on-riscv32.patch rename to package/qt5/qt5base/0006-Fix-build-on-riscv32.patch diff --git a/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch deleted file mode 100644 index 16e0f20200..0000000000 --- a/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 856d11f695fb6effe26a359f9ad0efdf24067085 Mon Sep 17 00:00:00 2001 -From: Eirik Aavitsland -Date: Fri, 23 Jul 2021 15:53:56 +0200 -Subject: [PATCH] Improve fix for avoiding huge number of tiny dashes -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Some pathological cases were not caught by the previous fix. - -Fixes: QTBUG-95239 -Pick-to: 6.2 6.1 5.15 -Change-Id: I0337ee3923ff93ccb36c4d7b810a9c0667354cc5 -Reviewed-by: Robert Löhning -(cherry picked from commit 6b400e3147dcfd8cc3a393ace1bd118c93762e0c) -[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/fed5713eeba5bf8e0ee413cb4e77109bfa7c2bce] -Signed-off-by: Quentin Schulz ---- - src/gui/painting/qpaintengineex.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp -index 55fdb0c2a0..19e4b23423 100644 ---- a/src/gui/painting/qpaintengineex.cpp -+++ b/src/gui/painting/qpaintengineex.cpp -@@ -426,7 +426,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) - patternLength *= pen.widthF(); - if (qFuzzyIsNull(patternLength)) { - pen.setStyle(Qt::NoPen); -- } else if (extent / patternLength > 10000) { -+ } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { - // approximate stream of tiny dashes with semi-transparent solid line - pen.setStyle(Qt::SolidLine); - QColor color(pen.color()); --- -2.34.1 - diff --git a/package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch b/package/qt5/qt5base/0007-src-corelib-configure.json-fix-atomicfptr-detection.patch similarity index 100% rename from package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch rename to package/qt5/qt5base/0007-src-corelib-configure.json-fix-atomicfptr-detection.patch