| Message ID | 20220328101751.1606988-1-foss+buildroot@0leil.net |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v3,1/2] package/qt5/qt5base: security bump | expand |
On 28/03/2022 12:17, Quentin Schulz wrote: > From: Quentin Schulz <quentin.schulz@theobroma-systems.com> > > This fixes CVE-2022-25255 and CVE-2022-25634. > > Cc: Quentin Schulz <foss+buildroot@0leil.net> > Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> Applied both to master, thanks. Regards, Arnout > --- > > v3: rebased on top of master branch > v2: http://lists.busybox.net/pipermail/buildroot/2022-March/638898.html > - point to newer commit in KDE branch instead of including Qt diff > v1: http://lists.busybox.net/pipermail/buildroot/2022-March/638184.html > > package/qt5/qt5base/qt5base.hash | 2 +- > package/qt5/qt5base/qt5base.mk | 6 +++++- > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash > index 1b9ff43ab2..c031f71c77 100644 > --- a/package/qt5/qt5base/qt5base.hash > +++ b/package/qt5/qt5base/qt5base.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 96b1c96041ae7b5186c94f231979217bd50e3c0a4caeba32982faa8054a6d113 qtbase-d16bf02a11953dcac01dca73e6f3778f293adefe.tar.bz2 > +sha256 18c17d441fbefa9dd13d1d6bfb5f542c986ba86cc37930247f9e4d782df2244b qtbase-f31e001a9399e4e620847ea2c3e90749350140ae.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index 4418f0d3ba..5f158bd6f2 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5BASE_VERSION = d16bf02a11953dcac01dca73e6f3778f293adefe > +QT5BASE_VERSION = f31e001a9399e4e620847ea2c3e90749350140ae > QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) > QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 > > @@ -14,6 +14,10 @@ QT5BASE_SYNC_QT_HEADERS = YES > > # 0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch > QT5BASE_IGNORE_CVES += CVE-2021-38593 > +# From commit 2766b2cba6ca4b1c430304df5437e2a6c874b107 "QProcess/Unix: ensure we don't accidentally execute something from CWD" > +QT5BASE_IGNORE_CVES += CVE-2022-25255 > +# From commit e68ca8e51375d963b2391715f70b42707992dbd8 "Windows: use QSystemLibrary instead of LoadLibrary directly" > +QT5BASE_IGNORE_CVES += CVE-2022-25634 > > # A few comments: > # * -no-pch to workaround the issue described at
diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index 1b9ff43ab2..c031f71c77 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 96b1c96041ae7b5186c94f231979217bd50e3c0a4caeba32982faa8054a6d113 qtbase-d16bf02a11953dcac01dca73e6f3778f293adefe.tar.bz2 +sha256 18c17d441fbefa9dd13d1d6bfb5f542c986ba86cc37930247f9e4d782df2244b qtbase-f31e001a9399e4e620847ea2c3e90749350140ae.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 4418f0d3ba..5f158bd6f2 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5BASE_VERSION = d16bf02a11953dcac01dca73e6f3778f293adefe +QT5BASE_VERSION = f31e001a9399e4e620847ea2c3e90749350140ae QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 @@ -14,6 +14,10 @@ QT5BASE_SYNC_QT_HEADERS = YES # 0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch QT5BASE_IGNORE_CVES += CVE-2021-38593 +# From commit 2766b2cba6ca4b1c430304df5437e2a6c874b107 "QProcess/Unix: ensure we don't accidentally execute something from CWD" +QT5BASE_IGNORE_CVES += CVE-2022-25255 +# From commit e68ca8e51375d963b2391715f70b42707992dbd8 "Windows: use QSystemLibrary instead of LoadLibrary directly" +QT5BASE_IGNORE_CVES += CVE-2022-25634 # A few comments: # * -no-pch to workaround the issue described at