From e3c87f1637896f37246a6ad962af2d36a598359a Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Thu, 5 Dec 2024 01:16:09 +0300 Subject: [PATCH] import chromium-131.0.6778.108-1.el9 --- .chromium.metadata | 2 +- .gitignore | 2 +- SOURCES/chromium-131-qt-ui.patch | 12 +++++++ ...ert-decommit-pooled-pages-by-default.patch | 32 +++++++++++++++++++ SOURCES/clean_ffmpeg.sh | 6 ++++ SPECS/chromium.spec | 21 ++++++++++-- 6 files changed, 71 insertions(+), 4 deletions(-) create mode 100644 SOURCES/chromium-131-qt-ui.patch create mode 100644 SOURCES/chromium-131-revert-decommit-pooled-pages-by-default.patch diff --git a/.chromium.metadata b/.chromium.metadata index 3195a309..eb382158 100644 --- a/.chromium.metadata +++ b/.chromium.metadata @@ -1,3 +1,3 @@ -0e4eddd04ec167cb3e60ab5e2d6aafb759a62f8c SOURCES/chromium-131.0.6778.85-clean.tar.xz +2eff2cce3fdc518b5fb4859d27cdbdeb5fb56485 SOURCES/chromium-131.0.6778.108-clean.tar.xz 7e5d2c7864c5c83ec789b59c77cd9c20d2594916 SOURCES/linux-arm64-0.19.2.tgz dea187019741602d57aaf189a80abba261fbd2aa SOURCES/linux-x64-0.19.2.tgz diff --git a/.gitignore b/.gitignore index 65a881b4..5104563c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -SOURCES/chromium-131.0.6778.85-clean.tar.xz +SOURCES/chromium-131.0.6778.108-clean.tar.xz SOURCES/linux-arm64-0.19.2.tgz SOURCES/linux-x64-0.19.2.tgz diff --git a/SOURCES/chromium-131-qt-ui.patch b/SOURCES/chromium-131-qt-ui.patch new file mode 100644 index 00000000..a8343477 --- /dev/null +++ b/SOURCES/chromium-131-qt-ui.patch @@ -0,0 +1,12 @@ +diff -up chromium-131.0.6778.85/ui/qt/qt_shim.cc.me chromium-131.0.6778.85/ui/qt/qt_shim.cc +--- chromium-131.0.6778.85/ui/qt/qt_shim.cc.me 2024-11-23 10:04:16.789121846 +0100 ++++ chromium-131.0.6778.85/ui/qt/qt_shim.cc 2024-11-23 11:40:02.905064702 +0100 +@@ -265,7 +265,7 @@ FontRenderParams QtShim::GetFontRenderPa + FontDescription QtShim::GetFontDescription() const { + QFont font = app_.font(); + return { +- .family = String(font.family().toStdString().c_str()), ++ .family = String(font.family().toUtf8().constData()), + .size_pixels = font.pixelSize(), + .size_points = font.pointSize(), + .is_italic = IsStyleItalic(font.style()), diff --git a/SOURCES/chromium-131-revert-decommit-pooled-pages-by-default.patch b/SOURCES/chromium-131-revert-decommit-pooled-pages-by-default.patch new file mode 100644 index 00000000..4639b416 --- /dev/null +++ b/SOURCES/chromium-131-revert-decommit-pooled-pages-by-default.patch @@ -0,0 +1,32 @@ +commit 1ab1a14ad97394d384d8dc6de51bb229625e66d6 +Author: Benoît Lizé +Date: Mon Sep 16 12:01:14 2024 +0200 + + [cppgc] Decommit pooled pages by default + + This reduces committed memory by a large amount, which matters on + Windows. See the field trial results, which measure committed memory: + https://screenshot.googleplex.com/kEBAScqJSEXuRoy + + Bug: chromium:326303884 + Change-Id: I619257871bcdb7ed50a71f41af341d0df634428a + Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5864909 + Reviewed-by: Michael Lippautz + Reviewed-by: Anton Bikineev + Commit-Queue: Anton Bikineev + Auto-Submit: Benoit Lize + Cr-Commit-Position: refs/heads/main@{#96107} + +diff --git a/v8/src/flags/flag-definitions.h b/v8/src/flags/flag-definitions.h +index 69946faf5ed..85c4b68612e 100644 +--- a/v8/src/flags/flag-definitions.h ++++ b/v8/src/flags/flag-definitions.h +@@ -821,7 +821,7 @@ DEFINE_BOOL(trace_block_coverage, false, + "trace collected block coverage information") + DEFINE_BOOL(trace_protector_invalidation, false, + "trace protector cell invalidations") +-DEFINE_BOOL(decommit_pooled_pages, false, ++DEFINE_BOOL(decommit_pooled_pages, true, + "decommit, rather than discard pooled pages") + + #ifdef V8_MINORMS_STRING_SHORTCUTTING diff --git a/SOURCES/clean_ffmpeg.sh b/SOURCES/clean_ffmpeg.sh index 07460ce6..2e21b733 100755 --- a/SOURCES/clean_ffmpeg.sh +++ b/SOURCES/clean_ffmpeg.sh @@ -72,6 +72,7 @@ header_files=" libavcodec/x86/inline_asm.h \ libavcodec/aacpsdsp.h \ libavcodec/aacsbrdata.h \ libavcodec/aac_ac3_parser.h \ + libavcodec/parser.h \ libavcodec/aac_defines.h \ libavcodec/ac3.h \ libavcodec/ac3defs.h \ @@ -99,6 +100,7 @@ header_files=" libavcodec/x86/inline_asm.h \ libavcodec/get_bits.h \ libavcodec/h263dsp.h \ libavcodec/h264chroma.h \ + libavcodec/hevc/hevc.h \ libavcodec/hpeldsp.h \ libavcodec/hwaccels.h \ libavcodec/hwaccel_internal.h \ @@ -124,6 +126,8 @@ header_files=" libavcodec/x86/inline_asm.h \ libavcodec/mpegvideo.h \ libavcodec/mpegvideodata.h \ libavcodec/mpegvideoencdsp.h \ + libavcodec/opus/enc.h \ + libavcodec/opus/opus.h \ libavcodec/options_table.h \ libavcodec/packet.h \ libavcodec/packet_internal.h \ @@ -180,6 +184,7 @@ header_files=" libavcodec/x86/inline_asm.h \ libavformat/iamf_reader.h \ libavformat/iamf.h \ libavutil/aarch64/cpu.h \ + libavutil/aarch64/intreadwrite.h \ libavutil/x86/asm.h \ libavutil/x86/bswap.h \ libavutil/x86/cpu.h \ @@ -250,6 +255,7 @@ manual_files=" libavcodec/aarch64/h264pred_neon.S \ libavcodec/hpel_template.c \ libavcodec/hpeldsp.c \ libavcodec/options.c \ + libavcodec/parser.c \ libavcodec/pcm.c \ libavcodec/pel_template.c \ libavcodec/utils.c \ diff --git a/SPECS/chromium.spec b/SPECS/chromium.spec index 50e84779..ffa0daac 100644 --- a/SPECS/chromium.spec +++ b/SPECS/chromium.spec @@ -157,7 +157,7 @@ %endif # enable qt backend -%global enable_qt 0 +%global enable_qt 1 %global use_qt6 0 %global use_qt 0 @@ -279,7 +279,7 @@ %endif Name: chromium%{chromium_channel} -Version: 131.0.6778.85 +Version: 131.0.6778.108 Release: 1%{?dist} Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use Url: http://www.chromium.org/Home @@ -335,6 +335,10 @@ Patch141: chromium-118-dma_buf_export_sync_file-conflict.patch # add correct path for Qt6Gui header and libs Patch150: chromium-124-qt6.patch +Patch151: chromium-131-qt-ui.patch + +# revert, it causes ramdom crash on aarch64 +Patch300: chromium-131-revert-decommit-pooled-pages-by-default.patch # disable memory tagging (epel8 on aarch64) due to new feature IFUNC-Resolver # it is not supported in old glibc < 2.30, error: fatal error: 'sys/ifunc.h' file not found @@ -1047,6 +1051,11 @@ Qt6 UI for chromium. %if 0%{?rhel} > 9 || 0%{?fedora} > 39 %patch -P150 -p1 -b .qt6 +%patch -P151 -p1 -b .qt-ui +%endif + +%ifarch aarch64 ppc64le +%patch -P300 -p1 -R -b .revert-decommit-pooled-pages-by-default %endif %if 0%{?rhel} == 8 @@ -1924,6 +1933,14 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %endif %changelog +* Wed Dec 04 2024 Than Ngo - 131.0.6778.108-1 +- Update to 131.0.6778.108 + * High CVE-2024-12053: Type Confusion in V8 + +* Sat Nov 23 2024 Than Ngo - 131.0.6778.85-2 +- Enable qt-ui +- Workaround for random crash + * Wed Nov 20 2024 Than Ngo - 131.0.6778.85-1 - Update to 131.0.6778.85 * High CVE-2024-11395: Type Confusion in V8