diff --git a/.chromium.metadata b/.chromium.metadata index 72235794..4d890331 100644 --- a/.chromium.metadata +++ b/.chromium.metadata @@ -1,4 +1,4 @@ -6059aa905ef290916716f47ca091a9f4e29940db SOURCES/chromium-124.0.6367.155-clean.tar.xz +d2e88897fba7702a6ac076290b5e3f6da0381da1 SOURCES/chromium-124.0.6367.201-clean.tar.xz 7e5d2c7864c5c83ec789b59c77cd9c20d2594916 SOURCES/linux-arm64-0.19.2.tgz dea187019741602d57aaf189a80abba261fbd2aa SOURCES/linux-x64-0.19.2.tgz 3e94bb4f999c636293bc745b02d98e7925da5616 SOURCES/node-v20.6.1-linux-arm64.tar.xz diff --git a/.gitignore b/.gitignore index 44dfdc4e..a6e01e61 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -SOURCES/chromium-124.0.6367.155-clean.tar.xz +SOURCES/chromium-124.0.6367.201-clean.tar.xz SOURCES/linux-arm64-0.19.2.tgz SOURCES/linux-x64-0.19.2.tgz SOURCES/node-v20.6.1-linux-arm64.tar.xz diff --git a/SOURCES/chromium-124-qt6.patch b/SOURCES/chromium-124-qt6.patch new file mode 100644 index 00000000..5c600c5b --- /dev/null +++ b/SOURCES/chromium-124-qt6.patch @@ -0,0 +1,11 @@ +diff -up chromium-124.0.6367.155/ui/qt/BUILD.gn.me chromium-124.0.6367.155/ui/qt/BUILD.gn +--- chromium-124.0.6367.155/ui/qt/BUILD.gn.me 2024-05-08 18:15:34.178627040 +0200 ++++ chromium-124.0.6367.155/ui/qt/BUILD.gn 2024-05-08 18:29:31.162513709 +0200 +@@ -61,6 +61,7 @@ template("qt_shim") { + packages = [ + "Qt" + invoker.qt_version + "Core", + "Qt" + invoker.qt_version + "Widgets", ++ "Qt" + invoker.qt_version + "Gui", + ] + } + diff --git a/SPECS/chromium.spec b/SPECS/chromium.spec index 33f33ece..8c7473c0 100644 --- a/SPECS/chromium.spec +++ b/SPECS/chromium.spec @@ -187,11 +187,12 @@ %global use_qt6 0 %global use_qt 0 -%if 0%{?rhel} > 9 || 0%{?fedora} +%if 0%{?rhel} > 9 || 0%{?fedora} > 39 %global use_qt6 1 %global use_qt 1 %else -%if 0%{?rhel} == 8 +%if 0%{?rhel} == 8 || 0%{?rhel} == 9 || 0%{?fedora} +%global use_qt6 0 %global use_qt 1 %endif %endif @@ -313,8 +314,8 @@ %endif Name: chromium%{chromium_channel} -Version: 124.0.6367.155 -Release: 1%{?dist} +Version: 124.0.6367.201 +Release: 2%{?dist} Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use Url: http://www.chromium.org/Home License: BSD-3-Clause AND LGPL-2.1-or-later AND Apache-2.0 AND IJG AND MIT AND GPL-2.0-or-later AND ISC AND OpenSSL AND (MPL-1.1 OR GPL-2.0-only OR LGPL-2.0-only) @@ -442,6 +443,9 @@ Patch140: chromium-122-revert-av1enc-el9.patch # file conflict with old kernel on el8/el9 Patch141: chromium-118-dma_buf_export_sync_file-conflict.patch +# add correct path for Qt6Gui header and libs +Patch150: chromium-124-qt6.patch + # disable memory tagging in epel7 and epel8 on aarch64 due to new feature IFUNC-Resolver # not supported in old glibc < 2.30, error: fatal error: 'sys/ifunc.h' file not found Patch305: chromium-124-arm64-memory_tagging.patch @@ -1214,6 +1218,10 @@ udev. %patch -P141 -p1 -b .dma_buf_export_sync_file-conflict %endif +%if 0%{?rhel} > 9 || 0%{?fedora} > 39 +%patch -P150 -p1 -b .qt6 +%endif + %if 0%{?rhel} && 0%{?rhel} <= 8 %ifarch aarch64 %patch -P305 -p1 -b .memory_tagging @@ -1890,7 +1898,7 @@ popd %if %{build_headless} pushd %{headlessbuilddir} - cp -a headless_lib_data.pak headless_lib_strings.pak headless_shell %{buildroot}%{chromium_path} + cp -a *.pak headless_shell %{buildroot}%{chromium_path} popd %endif @@ -2082,8 +2090,7 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %if %{build_headless} %files headless %{chromium_path}/headless_shell -%{chromium_path}/headless_lib_data.pak -%{chromium_path}/headless_lib_strings.pak +%{chromium_path}/headless_*.pak %endif %if %{build_remoting} @@ -2113,6 +2120,13 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %endif %changelog +* Sat May 11 2024 Than Ngo - 124.0.6367.201-2 +- include headless_command_resources.pak for head_shell + +* Fri May 10 2024 Than Ngo - 124.0.6367.201-1 +- update to 124.0.6367.201 + * High CVE-2024-4671: Use after free in Visuals + * Wed May 08 2024 Than Ngo - 124.0.6367.155-1 - update to 124.0.6367.155 * High CVE-2024-4558: Use after free in ANGLE