From d8daa47044db65cca212017c7c417bf5c2bfb66a Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: Fri, 31 May 2024 11:13:13 +0200
Subject: [PATCH] - update to 125.0.6422.141   * High CVE-2024-5493: Heap
 buffer overflow in WebRTC   * High CVE-2024-5494: Use after free in Dawn   *
 High CVE-2024-5495: Use after free in Dawn   * High CVE-2024-5496: Use after
 free in Media Session   * High CVE-2024-5497: Out of bounds memory access in
 Keyboard Inputs   * High CVE-2024-5498: Use after free in Presentation API  
 * High CVE-2024-5499: Out of bounds write in Streams API - fixed rhbz#2264332
 - Chromium is unable to send/receive video on MS Teams - cleanup
 chromium.conf

---
 chromium.conf | 27 +++++++++++++--------------
 chromium.spec | 16 ++++++++++++++--
 sources       |  2 +-
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/chromium.conf b/chromium.conf
index cadab280..4bf85435 100644
--- a/chromium.conf
+++ b/chromium.conf
@@ -7,43 +7,42 @@ GRAPHIC_DRIVER=default
 WEB_DARKMODE=off
 
 CHROMIUM_FLAGS=""
-CHROMIUM_FLAGS+=" --disable-features=AudioServiceSandbox"
 CHROMIUM_FLAGS+=" --enable-native-gpu-memory-buffers"
 CHROMIUM_FLAGS+=" --enable-gpu-memory-buffer-video-frames"
 CHROMIUM_FLAGS+=" --enable-zero-copy"
-CHROMIUM_FLAGS+=" --use-gl=angle"
 CHROMIUM_FLAGS+=" --ignore-gpu-blocklist --disable-gpu-driver-bug-workaround"
 CHROMIUM_FLAGS+=" --enable-chrome-browser-cloud-management"
 
+FEATURES=""
+
 case "$GRAPHIC_DRIVER" in
    amd)
       # Need new mesa with AMD multi planes support, is not yet supported in fedora
       # see https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26165
-      CHROMIUM_FLAGS+=" --use-angle=vulkan --enable-accelerated-video-decode"
-      CHROMIUM_FLAGS+=" --enable-features=Vulkan,VulkanFromANGLE,DefaultANGLEVulkan,VaapiIgnoreDriverChecks,VaapiVideoDecoder,UseMultiPlaneFormatForHardwareVideo"
+      CHROMIUM_FLAGS+=" --use-gl=angle --use-angle=vulkan --enable-accelerated-video-decode"
+      FEATURES+="Vulkan,VulkanFromANGLE,DefaultANGLEVulkan,VaapiIgnoreDriverChecks,VaapiVideoDecoder,UseMultiPlaneFormatForHardwareVideo"
       ;;
    nvidia)
       # The NVIDIA VaAPI drivers are known to not support Chromium
       # see https://crbug.com/1492880. This feature switch is
       # provided for developers to test VaAPI drivers on NVIDIA GPUs
-      CHROMIUM_FLAGS+=" --use-angle=gl"
-      CHROMIUM_FLAGS+=" --enable-features=VaapiVideoDecodeLinuxGL,VaapiVideoEncoder,VaapiOnNvidiaGPUs"
+      CHROMIUM_FLAGS+=" --use-gl=angle --use-angle=gl"
+      FEATURES+="VaapiVideoDecodeLinuxGL,VaapiVideoEncoder,VaapiOnNvidiaGPUs"
       ;;
    intel)
-      CHROMIUM_FLAGS+=" --use-angle=gl"
-      CHROMIUM_FLAGS+=" --enable-features=VaapiVideoEncoder,VaapiVideoDecodeLinuxGL"
+      CHROMIUM_FLAGS+=" --use-gl=angle --use-angle=gl"
+      FEATURES+="VaapiVideoEncoder,VaapiVideoDecodeLinuxGL"
       ;;
    *)
-      CHROMIUM_FLAGS=""
+      CHROMIUM_FLAGS+=" --use-gl=angle --use-angle=gl"
+      FEATURES+="VaapiVideoEncoder,VaapiVideoDecodeLinuxGL"
       ;;
 esac
        
 # Web Dark mode
 if [ "$WEB_DARKMODE" == "on" ] ; then
    darktype="WebContentsForceDark:inversion_method/cielab_based/image_behavior/none/foreground_lightness_threshold/150/background_lightness_threshold/205"
-   if [ -z "$CHROMIUM_FLAGS" ] ; then
-      CHROMIUM_FLAGS+=" --enable-features=$darktype"
-   else
-      CHROMIUM_FLAGS+=",$darktype"
-   fi
+   FEATURES+=",$darktype"
 fi
+
+CHROMIUM_FLAGS+=" --enable-features=$FEATURES"
diff --git a/chromium.spec b/chromium.spec
index d4c3e97f..f52d2c48 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -315,8 +315,8 @@
 %endif
 
 Name:	chromium%{chromium_channel}
-Version: 125.0.6422.112
-Release: 3%{?dist}
+Version: 125.0.6422.141
+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)
@@ -2127,6 +2127,18 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
 %endif
 
 %changelog
+* Fri May 31 2024 Than Ngo <than@redhat.com> - 125.0.6422.141-1
+- update to 125.0.6422.141
+  * High CVE-2024-5493: Heap buffer overflow in WebRTC
+  * High CVE-2024-5494: Use after free in Dawn
+  * High CVE-2024-5495: Use after free in Dawn
+  * High CVE-2024-5496: Use after free in Media Session
+  * High CVE-2024-5497: Out of bounds memory access in Keyboard Inputs
+  * High CVE-2024-5498: Use after free in Presentation API
+  * High CVE-2024-5499: Out of bounds write in Streams API
+- fixed rhbz#2264332 - Chromium is unable to send/receive video on MS Teams
+- cleanup chromium.conf
+
 * Wed May 29 2024 Than Ngo <than@redhat.com> - 125.0.6422.112-3
 - build against noopenh264
 
diff --git a/sources b/sources
index 61b5529c..4a1f6a31 100644
--- a/sources
+++ b/sources
@@ -2,4 +2,4 @@ SHA512 (node-v20.6.1-linux-arm64.tar.xz) = adfcaf2c22614797fd69fb46d94c1cbf64dea
 SHA512 (node-v20.6.1-linux-x64.tar.xz) = 7e15c05041a9a50f0046266aadb2e092a5aefbec19be1c7c809471add520cb57c7df3c47d88b1888b29bf2979dca3c92adddfd965370fa2a9da4ea02186464fd
 SHA512 (linux-arm64-0.19.2.tgz) = 8a0d8fec6786fffcd6954d00820037a55d61e60762c74300df0801f8db27057562c221a063bedfb8df56af9ba80abb366336987e881782c5996e6f871abd3dc6
 SHA512 (linux-x64-0.19.2.tgz) = a31cc74c4bfa54f9b75d735a1cfc944d3b5efb7c06bfba9542da9a642ae0b2d235ea00ae84d3ad0572c406405110fe7b61377af0fd15803806ef78d20fc6f05d
-SHA512 (chromium-125.0.6422.112-clean.tar.xz) = e10413e1c07195b2702c44f3c867d1b3d2c1993584dd41e1ffbbd7f09e416a6678f9bd225a25ed6e244e2b5f9b607156631f35481cd085e3db11218db5ce5d52
+SHA512 (chromium-125.0.6422.141-clean.tar.xz) = d3933731cad4ca2ce32e5343709dcff6c60769b43ccc0bdb982f846477a6439974aaeeafac740ddbdc4132e92e3510e4663d9095cc9a02d4a7cad63269adebdb