sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (c10b9fa323b8a5a89a1a782a6c70037d7107e514)
- From: Treeve Jelbert <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (c10b9fa323b8a5a89a1a782a6c70037d7107e514)
- Date: Wed, 16 Jul 2025 07:11:09 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
qt6/qt6base/DETAILS | 2
qt6/qt6base/HISTORY | 4 +
qt6/qt6base/NOTES | 8 --
qt6/qt6base/QT6 | 61
---------------------
qt6/qt6base/patches/CVE-2025-5992-qtbase-6.9.patch | 36 ++++++++++++
5 files changed, 41 insertions(+), 70 deletions(-)
New commits:
commit c10b9fa323b8a5a89a1a782a6c70037d7107e514
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qt6base - SECURITY FIX
commit 26d71411a05ce6f8673a63cb59408364033e9c66
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qt6base - delete junk files
diff --git a/qt6/qt6base/DETAILS b/qt6/qt6base/DETAILS
index 7543561..bd3761b 100755
--- a/qt6/qt6base/DETAILS
+++ b/qt6/qt6base/DETAILS
@@ -2,7 +2,7 @@
source $GRIMOIRE/$SECTION/QT6_VERSIONS
- SECURITY_PATCH=5
+ SECURITY_PATCH=6
ENTERED=20210115
SHORT="Qt6 simplifies writing and maintaining GUI release-service"
cat << EOF
diff --git a/qt6/qt6base/HISTORY b/qt6/qt6base/HISTORY
index 3d1983b..2d52853 100644
--- a/qt6/qt6base/HISTORY
+++ b/qt6/qt6base/HISTORY
@@ -1,3 +1,7 @@
+2025-0715 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++ fix CVE-2025-5992
+ * CVE-2025-5992-qtbase-6.9.patch: added
+
2024-09-24 Treeve Jelbert <treeve AT sourcemage.org>
* CVE-2024-39936-qtbase-6.7.patch: deleted
diff --git a/qt6/qt6base/NOTES b/qt6/qt6base/NOTES
deleted file mode 100644
index ef13bd1..0000000
--- a/qt6/qt6base/NOTES
+++ /dev/null
@@ -1,8 +0,0 @@
-needs is not yet in libressl
-X509_STORE_CTX_verify_cb
-
-use the name field from configure.json
-check flags for md4c, openssl
-
-how to handle sub-depends stuff
-rename some options as TQ6*
diff --git a/qt6/qt6base/QT6 b/qt6/qt6base/QT6
deleted file mode 100644
index 4ff1fa3..0000000
--- a/qt6/qt6base/QT6
+++ /dev/null
@@ -1,61 +0,0 @@
-Compatability with Qt6
-
-In most cases programs built with qt6 can run on a qt5 desktop, and vice
versa,
-provided that both versions of qt are installed.
-However only one version of kde-frameworks can be be installed in smgl.
-Such programs can also run on non-qt desktops.
-
-kde-22-12
- ark
- elisa
- gwenview
- kdenlive
- kleopatra
- konversation
- libkexiv2
-
-kde-22.08
- dolphin kate konsole spectacle
- kshishen kmahjongg
-kde-22.04
- skanlite skanpage
-kde-frameworks 5.94+
-
-Others
- qcoro-5.1
- libreoffice-7.3
- poppler
- drumstick dmidiplayer
- rosegarden-22.06
- mlt-7.6
- sigil
- qca
- grantlee5
-
-In progress
- digikam-8.0
- okular
- plasma/*
- pianobooster
- phonon
- quaternion
- kmail
- libquotient
- viper
- qtkeychain
- vlc ??
- gpgme
- xca
- kde5-pim/* 22.08 - partailly blocked by gpgme
- kde-games*
- plasma-mobile/* 22.12
-depend on qtmultimedia(major change):
- kwave
-
-
-Qt6 only
- ktexttemplate
-
-Qt5 only
- lxqt*
- falkon
diff --git a/qt6/qt6base/patches/CVE-2025-5992-qtbase-6.9.patch
b/qt6/qt6base/patches/CVE-2025-5992-qtbase-6.9.patch
new file mode 100644
index 0000000..e3c3010
--- /dev/null
+++ b/qt6/qt6base/patches/CVE-2025-5992-qtbase-6.9.patch
@@ -0,0 +1,36 @@
+diff --git a/src/gui/painting/qcolortransfergeneric_p.h
b/src/gui/painting/qcolortransfergeneric_p.h
+index 6caebceb1a4c..c2ebd937a445 100644
+--- a/src/gui/painting/qcolortransfergeneric_p.h
++++ b/src/gui/painting/qcolortransfergeneric_p.h
+@@ -65,6 +65,7 @@ private:
+ // HLG from linear [0-12] -> [0-1]
+ static float hlgFromLinear(float x)
+ {
++ x = std::clamp(x, 0.f, 12.f);
+ if (x > 1.f)
+ return m_hlg_a * std::log(x - m_hlg_b) + m_hlg_c;
+ return std::sqrt(x * 0.25f);
+@@ -73,6 +74,7 @@ private:
+ // HLG to linear [0-1] -> [0-12]
+ static float hlgToLinear(float x)
+ {
++ x = std::clamp(x, 0.f, 1.f);
+ if (x < 0.5f)
+ return (x * x) * 4.f;
+ return std::exp((x - m_hlg_c) / m_hlg_a) + m_hlg_b;
+@@ -86,6 +88,7 @@ private:
+ // PQ to linear [0-1] -> [0-64]
+ static float pqToLinear(float e)
+ {
++ e = std::clamp(e, 0.f, 1.f);
+ // m2-th root of E'
+ const float eRoot = std::pow(e, 1.f / m_pq_m2);
+ // rational transform
+@@ -99,6 +102,7 @@ private:
+ // PQ from linear [0-64] -> [0-1]
+ static float pqFromLinear(float fd)
+ {
++ fd = std::clamp(fd, 0.f, 64.f);
+ // scale Fd to Y
+ const float y = fd * (1.f / m_pq_f);
+ // yRoot = Y^m1 -- "root" because m1 is <1
- [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (c10b9fa323b8a5a89a1a782a6c70037d7107e514), Treeve Jelbert, 07/16/2025
Archive powered by MHonArc 2.6.24.