<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/33ce2eae3a950728a152e50a7bab38156a56469d">https://github.com/macports/macports-ports/commit/33ce2eae3a950728a152e50a7bab38156a56469d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 33ce2eae3a9 qt5, py-pyside2: update to 5.15.12
</span>33ce2eae3a9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 33ce2eae3a950728a152e50a7bab38156a56469d
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Mon Dec 25 16:11:38 2023 -0600
<span style='display:block; white-space:pre;color:#404040;'> qt5, py-pyside2: update to 5.15.12
</span>---
aqua/qt5/Portfile | 230 +++++++++++++------------
aqua/qt5/files/CVE-2023-51714-qtbase-5.15.diff | 99 +++++++++++
aqua/qt5/files/mysql-plugin-qtbug-109832.patch | 36 ++++
python/py-pyside2/Portfile | 8 +-
4 files changed, 257 insertions(+), 116 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5f31deab96b..a1bc0ec2f0c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@ license {LGPL-3 GPL-3 OpenSSLException}
</span> homepage https://www.qt.io
# When updating, also update py-pyside2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set qt_version 5.15.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set qt_version 5.15.12
</span> version ${qt_version}
set middle_name everywhere-opensource
set worksrcdir_middle_name everywhere
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -189,9 +189,9 @@ set llvm_version 17
</span> array set modules {
qt3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 610d9fe405b3edeb75d559a7cdb9d73d1236132c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 76e1c779b6744029b39035c28980153fd43d1d9c9b25112f7f6c2a6c7554eb4c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 118260068
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2c83ae296e3427bdbfcf571905d5bbb97f8a0abe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d058c53e72dd7caa92e6c1a4a2ed301aee55a9bd92828136752f0a1299fe694b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 118298584
</span> }
""
"port:assimp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -204,9 +204,9 @@ array set modules {
</span> }
qtbase {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2e25040776f81fae490e6ae4cbb75863ae7d37ab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 425ad301acd91ca66c10c0dabee0704e2d0cd2801a6b670115800cbb95f84846
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 50825756
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 674d1a2fd0748110832ac6037fea792c6f7dfd61
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4c01b7b0f1f3c1e05ae6bf53c66e49c65c6b3872475bac26b0fb228136914af0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 50840192
</span> }
""
"port:zlib port:libpng path:include/turbojpeg.h:libjpeg-turbo port:freetype path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 path:lib/pkgconfig/icu-uc.pc:icu port:pcre2 path:lib/pkgconfig/harfbuzz.pc:harfbuzz port:double-conversion port:zstd"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -214,14 +214,14 @@ array set modules {
</span> {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtcharts {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- c6842cc320412fd3f5278df774eafef08a57ebb0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 48bc3ba505c9e7400edb92a33788e8dc6215400a28695e5ddf82caffdfe1ea2d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4254628
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1d97f2eae0b7e51a53ac375e5d875fe2e2e76ede
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 97ad0afca7eab9440d3a6908f5499b29a78401a04503c4f9fc4fa87287dda8e2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4254676
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -234,9 +234,9 @@ array set modules {
</span> }
qtconnectivity {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- b84fa2942b4ead902bd95b9a66e2c4de7de9e3dc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 31e7d2d5c2cfeba9fba921b8588bc839f7e081f61bf9d9bf4d753f6f25ec2178
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2829704
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 403877bfc62aed148ac99e6aeafda138706e6821
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cfaed2d7a0520491cf1ef95de689b25cbb0304b22fefab4e95307647ea6d48b4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2829264
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -249,9 +249,9 @@ array set modules {
</span> }
qtdatavis3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 3bfb5631a3bc4a8a92fa7e73ef02bb574746a9d3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6e46688bcecc2920a73e575279e782ebf233e4e5fcd9d469a8c63a6f9df47fe2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5193556
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a0540fb2684e58cdebb2322ce6e10ee8297c43d3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0d8bfd1bd973c50adf62dd96a070dc7089b9466ddb2c7385c3bfbbf88a71efcb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5193584
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -264,9 +264,9 @@ array set modules {
</span> }
qtdeclarative {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 4e5685f01ee642a5463443e38b80513ea6f7029b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 491e8473808ee3c5700081a68cc2095fee6bd3e36da07e444a37f2e5daa432c8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 21601640
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 959076cce268de06d9f38e0b231562e2fe56fdab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 03b920dfba5ad8b741d7610ad2e37336b4d669c6613fca64426244b7e7f9df9e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 21602960
</span> }
"port:python311"
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -279,9 +279,9 @@ array set modules {
</span> }
qtdoc {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5256aaeb622778c268661cc9abcb9aee6574d802
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bf29e985dccf597527ea4420c3f7aaa5e7ef3ecbfd385115b9958872c258337b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5751308
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 82ed62dd4ca72dea4b3327037d6387823eb551dd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f0bd34f8d92f807a50118d353e1c8e6ce987a70c8a33bb7233723a3f2bb5cc44
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5751304
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -294,9 +294,9 @@ array set modules {
</span> }
qtgamepad {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 81397664d007f163fda0ebcaa8693c6ec58759e9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 968bffc57d5ea7872d7850e3a319a94fb249603d81414b210e2df87e20346d22
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 389848
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2a40ddffc2e932e669d3c08d50ee4a7047f24ce7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 58653d5fb2e989ebac25be73bb0eec8d646625ecab1cb419b2ec00a5d1fe4f2e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 389876
</span> }
""
"port:libsdl2"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -309,9 +309,9 @@ array set modules {
</span> }
qtgraphicaleffects {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- d265c1c920207b161180668c4800fe5950b1e1e1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f52223a3e8b0c371eb1a47211ca740f0cbf8e6a93793da6c649002288ac479de
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 14045384
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 02242ca34e7db919d7156ac15a26301542eb8a5c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4664b1096c848d3679b91df3062508a1992ce75eaa0eb292947dfae2b61ad4e9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 14045416
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -324,9 +324,9 @@ array set modules {
</span> }
qtimageformats {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- c7647ddb4bb33a13cd83ebe4573b54e2daeb0e47
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 12fb3a15f927b46178e73891efed3e63313997b025129cdf053fd211fdc9b47f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1869312
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5d08fe5565a67748c5279b9c119990f95940ce8b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f5125e32ff40fe8688872cbd92b56127d17edda4471d41605da0a5bbf7adb489
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1865016
</span> }
""
"port:jasper port:libmng port:tiff port:webp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -339,9 +339,9 @@ array set modules {
</span> }
qtlocation {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 25de8a61755ee751dd31c44649dc29e493e2f5da
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- aa3bed8e93b5d675c4fecac5dfe1fe6c5a50bd6d8dd72bcbcff8c88334845c14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6554216
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 45f0868f30edc6b5d104bffdade41f03bc76d7a2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1315d04bc488575918bc3e480e7c02e6721f4d1a57849241615534ecf56cc9b1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6553488
</span> }
""
"path:lib/pkgconfig/icu-uc.pc:icu port:zlib"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -349,14 +349,14 @@ array set modules {
</span> {"Qt Location" "Qt Positioning"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtlottie {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 668bba203b968f311779bf9fd676e7d732ad7977
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fe4ef65c47d7f109dbe43d0e30b7d2b9ea6c58c3fe2a5031b66284d0ef5299e5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 85352
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 96761b4a3ecd5b1e9aaa17e82be02b46e0e3a965
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8e44fe071ccaa2bf039e1e9af2b7c6c0221182fb2395ac1682e49d8077c320d8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 85336
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -369,9 +369,9 @@ array set modules {
</span> }
qtmacextras {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 90a59af85037a622740e3ad4c62a19a11cf6d4c8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 763d119175be7a9a726ba17d32429074123db62f8f2a723e725a03a6a477d8e0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 72468
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 85c8d1233ff94834bca6a0748d266f79cb4e374f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 207c93712f8df6cdb71544595b2aa6b9b7b082cd759fea8640f31f45cf19dcd8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 72488
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -384,9 +384,9 @@ array set modules {
</span> }
qtmultimedia {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 9ffdc4b5754ade50fa8cd4c0d577ec50c7145a81
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 28ba35efe904c05f2d28c275ec9bd90a00b3f5857457bbd21c6d3c55c2aa521c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3849160
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e3e3929ef8cc840d4f615c2355b28bb0523e7d85
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1040585c91f9da6768973d9c81d31d571c152464a9f5021b5270a5ab1e874429
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3830956
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -399,9 +399,9 @@ array set modules {
</span> }
qtnetworkauth {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8769bc62aa2d70ee8dc6c2fd113f4b4e6c70ee42
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- af17a868bbb2a6ffc9425b9d8ef46c4e9089a5b4d4f16ee877252490ca893f75
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 144768
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c839d626d5aaf0fadc17f5a7797922ba9c29ea52
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 797626e86d3ecfe6c319ed3f2e26017c8dbdf7fdcb6b22317b00371ee67988d3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 144752
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -414,9 +414,9 @@ array set modules {
</span> }
qtpurchasing {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 57de89c1a56383738869772fd38bcd6d402fcc00
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ffc8e4616e84567c9a507d4464e68b6a81b0aeec856690d1ccd219650c6e7e1e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 309824
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0fe179ae64c6db572509539dc69dc9b66609217c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c97e5efc015d31d6a3ef38038438735e44b9d34e524ab6632d48a11f776fe24e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 309768
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -429,9 +429,9 @@ array set modules {
</span> }
qtquick3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 391853f9fdb2d32f36c436d5f0dc89274a6c8d28
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c35d40d08649cc78e8f518e26a0c5276c03dbbd84c46fa1757e16fa302e6f3a2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 55746080
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ af6c40e3fb6c0bb8be360ceeaf88c7c72ae5d7c6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ df71f11bf032e3ddbba777ecedf159a5b7cccc48147801f22e64ecb224447af3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 55764980
</span> }
""
"port:assimp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -444,9 +444,9 @@ array set modules {
</span> }
qtquickcontrols {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 45c7b3b00c7f053aaf92999642ef47a7bfe42334
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 45585cca7bdc751f2622824fa45b44e3ae381e1dae78511c57075bdc19075195
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5984928
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 46fd24771c4e4354163fb036777d15018dde89e7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6321844236fd7ef25a89b147bb6b0c3f8aaea51e88e156cf2c81ab4e321ea164
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5982828
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -459,9 +459,9 @@ array set modules {
</span> }
qtquickcontrols2 {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 15ed912d2acc2a874dc25760590b96f1203e4702
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 263d3b8751007a45ed083ebc585b572552ab36e2fdc28468994ff29f384c6ad2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8294208
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9621d9122d617409ab84f6c650ceac2981ece5a9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4d9ef0ba0369b1bb83abe71d62ae3261d908a3c039bb63556cb0901450ccb4bb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8294356
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -474,9 +474,9 @@ array set modules {
</span> }
qtquicktimeline {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- e61b2e8b4b5765b983e1784dd0e1e5e90241ae79
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ded99ca86a384a2483aa34b152e682188a114f9e44583b11475aeaf09a8052a4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 105592
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0ff6d8b85d8c17b7fea2793e7803a9546d741a7f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 861603b09e9b9c6505b0b8091cf03e19e59ea7647559b660434838fdc1529270
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 105600
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -489,9 +489,9 @@ array set modules {
</span> }
qtremoteobjects {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 81c2bd91f4ad75b41eebc685c8cc8b2b4d74a071
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ba7ba0dcefe1290cbca046f452dfab62b33f18dd601787a222b6e4a3f664ea0e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 379452
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1a6f540b3613ec8ff28c3f7e6528191edc8dc378
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 755ee0d45aa4f374088d793336ea5837a1cfe26ad9b69ee0a857f58451723bf3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 379368
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -504,9 +504,9 @@ array set modules {
</span> }
qtscript {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0764b70eb74b0142ea7ed6dca5920c8abad675a5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b6feb447f41dea3967f07bdae0aa0d6be264bc4b5c0f3e20e7867425e1de9f3b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2666016
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5d3e1da4c5604fde986ab1d128e99cdfdd5591b3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b9fc94c913958a416a3f671bf9ff4cc237f966706e46738ed57d7c5ef0b03ef5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2664960
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -519,9 +519,9 @@ array set modules {
</span> }
qtscxml {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- da9eb2b877fe2445a336637bf093039abc644a4c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- e96a6db3423af6b4643e8e170905926642379537fe5d023ec989bd07b3c7f0ec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 437492
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c214ab35cb94f71d98afa625fd48ea57a9404e4e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5a67ee5fe2a0f311d2c37ecce1854ea927ee7daab73f361b9e5531314f0baae2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 437972
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -534,9 +534,9 @@ array set modules {
</span> }
qtsensors {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- a3c9ae6dbc8b27e85b86187bae99b39f7c587e89
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 90a1569b050897951035bcf8d3ac01267669717eb913c64fa3b580c5d6d5056b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2060032
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 995cf0f58caf8ce542b3642150c90e8bc0c10ccf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8b2f4ee921d6b5d1c5893e1813b6e59d0cae9397832d8747aa8bcf34c369bc67
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2059976
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -549,9 +549,9 @@ array set modules {
</span> }
qtserialbus {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2b9fb1fd03b4ff7595862549b13987df8ea984ba
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b5d4262f58bbf5f52d0de4a6ee24bae27b952f64a186addd70a03617a0dce975
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 359464
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6f57211a828195fc7915302e41c53f1d27a77568
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6104dbb447ec475337ca96a07bf26d4fb3d06a6ff710a00892a16952a76aebf1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 359492
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -564,9 +564,9 @@ array set modules {
</span> }
qtserialport {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1e51dac7890a4010ac3dd406e3f8d4c9a2a83270
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 54d25d62278b6dab4e18f6a8005cd6af0b28310580b7f0e17962c351809ab243
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 323460
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b85af133d1ae591b416854661a36f4c7461746c3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0474d9ffc599491fef8ba28f222ffe5bba7f07be0591deb99ea819e991225914
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 323500
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -579,9 +579,9 @@ array set modules {
</span> }
qtspeech {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1aed47616f70aad0d03cf9ea94b7997e6483a093
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3e0e9b2df656b86c18a00f74aa123aa3aa854c0b07cfcde97ff4f1ec2e70a42d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 104996
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fd6fb842581d6fc78139de43b224e59aa2613870
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6fd4426e53ef5d20d764c4a7694e030c08496e2873fcc4dc13ac862e681c9456
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 104816
</span> }
""
"port:flite"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -589,14 +589,14 @@ array set modules {
</span> {"Qt Speech"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtsvg {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- d58677480cbcd9a7ca97fc6ada0ba1ae839812d8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- da80c8f0842544481e7bea8693c03fbba480cb3bd9da59ba03e3ce38eba64afa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1890072
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6f51637493a7a11eac7ec1d8a3fa6782a812b178
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 32a63a865b1bf13bf1b61ee946b2bd456c45567eea31598038632587a3f1ef9d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1890112
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -609,9 +609,9 @@ array set modules {
</span> }
qttools {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 991ab813fdacd4cc403ea6087a0c7580b320834c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7cd847ae6ff09416df617136eadcaf0eb98e3bc9b89979219a3ea8111fb8d339
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8898428
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1ecb9595f3c2de3b483d24296622ba4b4455bf01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9a4084fee80a2acebb6415efa5a28dd666960129895a0bb7d97468a9f0c66506
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8900672
</span> }
""
"port:clang-${llvm_version}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -624,9 +624,9 @@ array set modules {
</span> }
qttranslations {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 55ce25cd6891d3951135876e1ac7aec2c52c1a7d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a31785948c640b7c66d9fe2db4993728ca07f64e41c560b3625ad191b276ff20
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1635932
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b034a16da4eba6cea57ceb48889d4345d8255619
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a830ba6158ccb36fdae97ebfa33ac7c2c92f4b609786717830d65aa2e0e77612
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1635924
</span> }
"port:qt5-qttools"
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -639,9 +639,9 @@ array set modules {
</span> }
qtvirtualkeyboard {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 970cd491f63a5ceab1f9ba7f4c264e220ca04e9c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 69cb4206f7ee01907d7bc7e8df539d355f2fc19ccb144815d3e7f18fef5d099b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10960552
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bb28ef438fe3c50a738a1077023508e5f2040e40
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 376880f79135dfde95b636d251b1b88667f2ba4fedbca8d702b3283ba45b5e22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10959460
</span> }
""
"port:hunspell"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -654,9 +654,9 @@ array set modules {
</span> }
qtwebchannel {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2b6e504205701e4462f3a9024151132943446c51
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cf3fedfd05709fe29bac3ec3b2a3309c6a5abc6ad91507da0e9428a88f1b3dec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 211992
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4be5ff890a469e511407c35d5ab599b7292c370f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 72d1998983b1e442673e5d1a2b51c4a0fd8ccd2c14501aac5927da02bbd180e5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 211996
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -680,9 +680,9 @@ array set modules {
</span> }
qtwebglplugin {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- c8d88d6491a856d3bcf935f860f0ffa8de336a70
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 05332df01b9d40c39dcdf266babf7ab5b95cc08e653a98925004c0af089f0458
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 77116
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2e0b1838b7ac70b1c59575928377176e52bf5b76
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0cde7de221c1b017169c7ae63a665db3d475d517705859c60044b3f074742cd0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 77120
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -725,9 +725,9 @@ array set modules {
</span> }
qtwebsockets {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 9c8d0ac8e3be59d7b4fbfc24073994e7c0d01fb7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1e31a5854ea987cabb195b704d36396a3eea9c4d1414749d3625c48d2262a478
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 261948
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 13fb1c51121fe19c3d54b38caa13c3bc0ea76802
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 49ea6431986575ce184ff77753802bcee8b24a9e6ab37c7bc053819fdb20b567
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 261924
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -740,9 +740,9 @@ array set modules {
</span> }
qtwebview {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 22d07bf75724828b84a1aa8d09347fc07ac20e8f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a2f9dc0bbf917f5fdd71943aecdb19d295aa1d563457fbf04e2242432f0673fb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 136856
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c11934a1c50db29008462a10dd96c36a64a06672
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f86e13d32fc2ea7032501bd55bfef64cddae9bd0dcebe2541260cc006297a7d8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 136852
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -755,9 +755,9 @@ array set modules {
</span> }
qtxmlpatterns {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- a8f57d99650662f951ebc0a826303498d34b7cdc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ea7ea2e63a57b296b362009b35e200d7bc497abfa1d278582d4acea914c4c7e8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5192940
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8de6038308004c22ea0665be0f23b5c3762dda30
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 758e5b69d579932b645858fac8e6df657598bfdac566e35d372e9b3acca7f908
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5192924
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1098,6 +1098,7 @@ foreach {module module_info} [array get modules] {
</span> CVE-2023-33285-qtbase-5.15.diff
CVE-2023-37369-qtbase-5.15.diff
CVE-2023-38197-qtbase-5.15.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVE-2023-51714-qtbase-5.15.diff
</span> }
# see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270715
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2048,6 +2049,11 @@ foreach {sql_names sql_info} [array get sql_plugins] {
</span> patchfiles-append patch-sql_plugins.diff
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://bugreports.qt.io/browse/QTBUG-109832
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${driver} eq "mysql"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append mysql-plugin-qtbug-109832.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # if there is more than one version of the database system, create variants for each version
if { [llength ${sql_info}] > 1 } {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/CVE-2023-51714-qtbase-5.15.diff b/aqua/qt5/files/CVE-2023-51714-qtbase-5.15.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..376a01bc856
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/CVE-2023-51714-qtbase-5.15.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,99 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From ea63c28efc1d2ecb467b83a34923d12462efa96f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Marc Mutz <marc.mutz@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 12 Dec 2023 20:51:56 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] HPack: fix a Yoda Condition
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Putting the variable on the LHS of a relational operation makes the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+expression easier to read. In this case, we find that the whole
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+expression is nonsensical as an overflow protection, because if
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name.size() + value.size() overflows, the result will exactly _not_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+be > max() - 32, because UB will have happened.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To be fixed in a follow-up commit.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+As a drive-by, add parentheses around the RHS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Change-Id: I35ce598884c37c51b74756b3bd2734b9aad63c09
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit 658607a34ead214fbacbc2cca44915655c318ea9)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit 4f7efd41740107f90960116700e3134f5e433867)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit 13c16b756900fe524f6d9534e8a07aa003c05e0c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit 1d4788a39668fb2dc5912a8d9c4272dc40e99f92)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit 87de75b5cc946d196decaa6aef4792a6cac0b6db)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/network/access/http2/hpacktable.cpp b/src/network/access/http2/hpacktable.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 834214f..ab166a6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/network/access/http2/hpacktable.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/network/access/http2/hpacktable.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -63,7 +63,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // 32 octets of overhead."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const unsigned sum = unsigned(name.size() + value.size());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (std::numeric_limits<unsigned>::max() - 32 < sum)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (sum > (std::numeric_limits<unsigned>::max() - 32))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return HeaderSize();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return HeaderSize(true, quint32(sum + 32));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 23c3fc483e8b6e21012a61f0bea884446f727776 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Marc Mutz <marc.mutz@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 12 Dec 2023 22:08:07 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] HPack: fix incorrect integer overflow check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This code never worked:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+For the comparison with max() - 32 to trigger, on 32-bit platforms (or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Qt 5) signed interger overflow would have had to happen in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+addition of the two sizes. The compiler can therefore remove the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+overflow check as dead code.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+On Qt 6 and 64-bit platforms, the signed integer addition would be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+very unlikely to overflow, but the following truncation to uint32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+would yield the correct result only in a narrow 32-value window just
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+below UINT_MAX, if even that.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix by using the proper tool, qAddOverflow.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Manual conflict resolutions:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - qAddOverflow doesn't exist in Qt 5, use private add_overflow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ predecessor API instead
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Change-Id: I7599f2e75ff7f488077b0c60b81022591005661c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit ee5da1f2eaf8932aeca02ffea6e4c618585e29e3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit debeb8878da2dc706ead04b6072ecbe7e5313860)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Marc Mutz <marc.mutz@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit 811b9eef6d08d929af8708adbf2a5effb0eb62d7)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit f931facd077ce945f1e42eaa3bead208822d3e00)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit 9ef4ca5ecfed771dab890856130e93ef5ceabef5)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/network/access/http2/hpacktable.cpp b/src/network/access/http2/hpacktable.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ab166a6..de91fc0 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/network/access/http2/hpacktable.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/network/access/http2/hpacktable.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,6 +40,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "hpacktable_p.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QtCore/qdebug.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QtCore/private/qnumeric_p.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <algorithm>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cstddef>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,7 +63,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // for counting the number of references to the name and value would have
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // 32 octets of overhead."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const unsigned sum = unsigned(name.size() + value.size());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ size_t sum;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (add_overflow(size_t(name.size()), size_t(value.size()), &sum))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return HeaderSize();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (sum > (std::numeric_limits<unsigned>::max() - 32))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return HeaderSize();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return HeaderSize(true, quint32(sum + 32));
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/mysql-plugin-qtbug-109832.patch b/aqua/qt5/files/mysql-plugin-qtbug-109832.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..154678f8a3d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/mysql-plugin-qtbug-109832.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 5bc61ec5d028d57640b9c4cd515ed7dfebac945c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 12 Feb 2023 17:09:20 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] ODBC/MySQL: fix compilation with MySQL < 5.7.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MYSQL_TYPE_JSON was introduced in MySQL 5.7.9 but our documentation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+states that we still support 5.6 so we have to define this value by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ourself for the older versions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Pick-to: 5.15 6.2 6.4 6.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes: QTBUG-109832
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Change-Id: I935edb14495d162ed58109610946b2805d37bbc4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/plugins/sqldrivers/mysql/qsql_mysql.cpp | 5 +++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 5 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 24cab8a04ec..63fddf2d63f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qsql_mysql.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qsql_mysql.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,6 +29,11 @@ Q_DECLARE_METATYPE(MYSQL_RES*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_DECLARE_METATYPE(MYSQL*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_DECLARE_METATYPE(MYSQL_STMT*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// MYSQL_TYPE_JSON was introduced with MySQL 5.7.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(MYSQL_VERSION_ID) && MYSQL_VERSION_ID < 50709
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define MYSQL_TYPE_JSON 245
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // MySQL above version 8 removed my_bool typedef while MariaDB kept it,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // by redefining it we can regain source compatibility.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using my_bool = decltype(mysql_stmt_bind_result(nullptr, nullptr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GitLab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyside2/Portfile b/python/py-pyside2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6c1c7d944c8..4850bd5a9e4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyside2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyside2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup python 1.0
name py-pyside2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.15.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.15.12
</span> revision 0
categories-append devel aqua
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,9 +18,9 @@ master_sites https://download.qt.io/official_releases/QtForPython/pys
</span> distname pyside-setup-opensource-src-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 7f5725800c28998c6600b8360caab88bc137b11d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 da567cd3b7854d27a0b4afe3e89de8b2f98b7a6d57393be56f1fc13f770faf29 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3584760
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6490e24dcc3ec3195003f8fd48b2b5ca0c8092ac \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9c53a111ca5779064593e690db0da43ce0d5dad25369931b7a4f593886259ff4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3585204
</span>
python.versions 37 38 39 310 311
</pre><pre style='margin:0'>
</pre>