From a2b2f2c85189e15fb5f5b7119432439e4ae31214 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Fri, 24 Jan 2025 01:38:00 +0300 Subject: [PATCH] import chromium-132.0.6834.110-1.el8 --- .chromium.metadata | 2 +- .gitignore | 2 +- SOURCES/chromium-132-el8-ffmpeg.patch | 52 --------------------------- SOURCES/clean_ffmpeg.sh | 5 +++ SPECS/chromium.spec | 13 +++---- 5 files changed, 14 insertions(+), 60 deletions(-) delete mode 100644 SOURCES/chromium-132-el8-ffmpeg.patch diff --git a/.chromium.metadata b/.chromium.metadata index 6eab8f61..f6deaf83 100644 --- a/.chromium.metadata +++ b/.chromium.metadata @@ -1,4 +1,4 @@ -70242bc02c1ad7f7ee0320becdc6620c9d76792c SOURCES/chromium-132.0.6834.83-clean.tar.xz +54ef3c4645db0db0a23aaceb38afd6f0b26842e6 SOURCES/chromium-132.0.6834.110-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 8c557217..e2eac270 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -SOURCES/chromium-132.0.6834.83-clean.tar.xz +SOURCES/chromium-132.0.6834.110-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-132-el8-ffmpeg.patch b/SOURCES/chromium-132-el8-ffmpeg.patch deleted file mode 100644 index d824d69f..00000000 --- a/SOURCES/chromium-132-el8-ffmpeg.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- /dev/null 2025-01-15 17:59:31.105999986 +0100 -+++ chromium-132.0.6834.83/third_party/ffmpeg/libavcodec/aarch64/autorename_libavcodec_aarch64_vorbisdsp_init.c 2025-01-07 20:49:01.000000000 +0100 -@@ -0,0 +1,2 @@ -+// Automatically generated on Tue Oct 22 17:56:01 2024. See crbug.com/495833. -+#include "vorbisdsp_init.c" ---- /dev/null 2025-01-15 23:08:30.985344485 +0100 -+++ chromium-132.0.6834.83/third_party/ffmpeg/libavutil/aarch64/autorename_libavutil_aarch64_cpu.c 2025-01-07 20:49:01.000000000 +0100 -@@ -0,0 +1,2 @@ -+// Automatically generated on Tue Oct 22 17:56:01 2024. See crbug.com/495833. -+#include "cpu.c" ---- /dev/null 2025-01-16 08:50:44.906000351 +0100 -+++ chromium-132.0.6834.83/third_party/ffmpeg/libavutil/aarch64/autorename_libavutil_aarch64_float_dsp_init.c 2025-01-07 20:49:01.000000000 +0100 -@@ -0,0 +1,2 @@ -+// Automatically generated on Tue Oct 22 17:56:01 2024. See crbug.com/495833. -+#include "float_dsp_init.c" ---- /dev/null 2025-01-16 08:50:44.906000351 +0100 -+++ chromium-132.0.6834.83/third_party/ffmpeg/libavcodec/aarch64/autorename_libavcodec_aarch64_videodsp_init.c 2025-01-07 20:49:01.000000000 +0100 -@@ -0,0 +1,2 @@ -+// Automatically generated on Tue Oct 22 17:56:01 2024. See crbug.com/495833. -+#include "videodsp_init.c" ---- /dev/null 2025-01-16 10:42:07.086999986 +0100 -+++ chromium-132.0.6834.83/third_party/ffmpeg/libavutil/aarch64/cpu_sve.S 2025-01-07 20:49:01.000000000 +0100 -@@ -0,0 +1,29 @@ -+/* -+ * Copyright (c) 2023 Martin Storsjo -+ * -+ * This file is part of FFmpeg. -+ * -+ * FFmpeg is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * FFmpeg is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with FFmpeg; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ */ -+ -+#include "config.h" -+#include "asm.S" -+ -+ENABLE_SVE -+ -+function ff_aarch64_sve_length, export=1 -+ cntb x0 -+ ret -+endfunc diff --git a/SOURCES/clean_ffmpeg.sh b/SOURCES/clean_ffmpeg.sh index 4b3de8a4..f26b2fe0 100755 --- a/SOURCES/clean_ffmpeg.sh +++ b/SOURCES/clean_ffmpeg.sh @@ -236,6 +236,8 @@ manual_files=" libavcodec/aarch64/h264pred_neon.S \ libavcodec/aarch64/neon.S \ libavcodec/aarch64/vorbisdsp_neon.S \ libavcodec/aarch64/autorename_libavcodec_aarch64_vorbisdsp_neon.S \ + libavcodec/aarch64/autorename_libavcodec_aarch64_vorbisdsp_init.c \ + libavcodec/aarch64/autorename_libavcodec_aarch64_videodsp_init.c \ libavcodec/aarch64/vorbisdsp_init.c \ libavcodec/aarch64/vp8dsp_neon.S \ libavcodec/x86/hpeldsp.asm \ @@ -271,8 +273,11 @@ manual_files=" libavcodec/aarch64/h264pred_neon.S \ libavformat/version.c \ libavutil/aarch64/asm.S \ libavutil/aarch64/cpu.c \ + libavutil/aarch64/cpu_sve.S \ libavutil/aarch64/float_dsp_init.c \ libavutil/aarch64/float_dsp_neon.S \ + libavutil/aarch64/autorename_libavutil_aarch64_cpu.c \ + libavutil/aarch64/autorename_libavutil_aarch64_float_dsp_init.c \ libavutil/aarch64/autorename_libavutil_aarch64_float_dsp_neon.S \ libavutil/aarch64/tx_float_neon.S \ libavutil/aarch64/timer.h \ diff --git a/SPECS/chromium.spec b/SPECS/chromium.spec index 47b4082c..cf9d3d57 100644 --- a/SPECS/chromium.spec +++ b/SPECS/chromium.spec @@ -276,8 +276,8 @@ %endif Name: chromium%{chromium_channel} -Version: 132.0.6834.83 -Release: 2%{?dist} +Version: 132.0.6834.110 +Release: 1%{?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) @@ -331,9 +331,6 @@ Patch151: chromium-131-qt-ui.patch # revert, it causes ramdom crash on aarch64 Patch300: chromium-131-revert-decommit-pooled-pages-by-default.patch -# Workaround for build error on el8 aarch64 -Patch304: chromium-132-el8-ffmpeg.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 Patch305: chromium-124-el8-arm64-memory_tagging.patch @@ -1046,7 +1043,6 @@ Qt6 UI for chromium. %if 0%{?rhel} == 8 %ifarch aarch64 -%patch -P304 -p1 -b .el8-ffmpeg %patch -P305 -p1 -b .el8-memory_tagging %patch -P306 -p1 -b .el8-ifunc-header %endif @@ -1923,6 +1919,11 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %endif %changelog +* Thu Jan 23 2025 Than Ngo - 132.0.6834.110-1 +- Update to 132.0.6834.110 + * High CVE-2025-0611: Object corruption in V8 + * High CVE-2025-0612: Out of bounds memory access in V8 + * Thu Jan 16 2025 Fedora Release Engineering - 132.0.6834.83-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild