Merge branch 'rawhide' into epel8

9 months ago · d443260e94
parent aa9d0cfb78 24c28b9af1
commit d443260e94
4 changed files with 47 additions and 3 deletions
--- a/chromium-122-clang-build-flags.patch
+++ b/chromium-122-clang-build-flags.patch
@ -0,0 +1,17 @@
+diff -up chromium-122.0.6261.57/build/config/compiler/BUILD.gn.me chromium-122.0.6261.57/build/config/compiler/BUILD.gn
+--- chromium-122.0.6261.57/build/config/compiler/BUILD.gn.me	2024-02-23 12:32:11.248584653 +0100
+++ chromium-122.0.6261.57/build/config/compiler/BUILD.gn	2024-02-23 12:45:26.672302958 +0100
+@@ -399,6 +399,13 @@ config("compiler") {
+       }
+     }
+ 
+    if (is_clang) {
+      cflags += [ "-ftrivial-auto-var-init=zero" ]
+      if (!is_ubsan && !is_ubsan_security) {
+        cflags += [ "-fwrapv" ]
+      }
+    }
+
+     # Linker warnings.
+     if (fatal_linker_warnings && !is_apple && current_os != "aix" &&
+         current_os != "zos") {
--- a/chromium-122-python3-assignment-expressions.patch
+++ b/chromium-122-python3-assignment-expressions.patch
@ -0,0 +1,13 @@
+diff -up chromium-122.0.6261.57/tools/json_to_struct/json_to_struct.py.me chromium-122.0.6261.57/tools/json_to_struct/json_to_struct.py
+--- chromium-122.0.6261.57/tools/json_to_struct/json_to_struct.py.me	2024-02-23 12:04:45.451423995 +0100
+++ chromium-122.0.6261.57/tools/json_to_struct/json_to_struct.py	2024-02-23 12:18:04.099824392 +0100
+@@ -124,7 +124,8 @@ def _GenerateH(basepath, fileroot, head,
+     f.write(u'#include <cstddef>\n')
+     f.write(u'\n')
+ 
+-    if system_headers := schema.get(u'system-headers', []):
+    system_headers = schema.get(u'system-headers', [])
+    if system_headers:
+       for header in system_headers:
+         f.write(u'#include <%s>\n' % header)
+       f.write(u'\n')
--- a/chromium.spec
+++ b/chromium.spec
@ -300,7 +300,7 @@
 %endif

 Name:	chromium%{chromium_channel}
-Version: 122.0.6261.57
+Version: 122.0.6261.69
 Release: 1%{?dist}
 Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use
 Url: http://www.chromium.org/Home
@ -452,6 +452,12 @@ Patch312: chromium-119-fstack-protector-strong.patch
 Patch313: chromium-122-static-assert.patch
 Patch314: chromium-122-clang16-buildflags.patch

+# assignment-expressions not suport in python < 3.8 on el 7/8
+Patch315: chromium-122-python3-assignment-expressions.patch
+
+# add -ftrivial-auto-var-init=zero and -fwrapv
+Patch316: chromium-122-clang-build-flags.patch
+
 # build error
 Patch351: chromium-121-mnemonic-error.patch

@ -1119,8 +1125,9 @@ udev.
 %patch -P130 -p1 -b .revert-av1enc
 %endif

-%ifarch aarch64
 %if 0%{?rhel} <= 8
+%patch -P315 -p1 -b .assignment-expressions
+%ifarch aarch64
 %patch -P305 -p1 -b .memory_tagging
 %endif
 %endif
@ -1136,6 +1143,7 @@ udev.
 %patch -P310 -p1 -b .missing-header-files
 %patch -P311 -p1 -b .clang-warnings
 %patch -P312 -p1 -b .fstack-protector-strong
+%patch -P316 -p1 -b .clang-build-flags

 %patch -P351 -p1 -b .mnemonic-error

@ -1934,6 +1942,12 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
 %{chromium_path}/chromedriver

 %changelog
+* Fri Feb 23 2024 Than Ngo <than@redhat.com> - 122.0.6261.69-1
+- update to 122.0.6261.69
+- fix build error on el8
+- bz#2265039, built with -fwrapv for improved memory safety
+- bz#2265043, built with -ftrivial-auto-var-init=zero for improved security and preditability
+
 * Wed Feb 21 2024 Than Ngo <than@redhat.com> - 122.0.6261.57-1
 - update to 122.0.6261.57
   * High CVE-2024-1669: Out of bounds memory access in Blink
--- a/2
+++ b/2
@ -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-122.0.6261.57-clean.tar.xz) = 343ae0250614fcf744fef05ea6f7c7b9d06637bf56eb86acc04672da1206f38c88805bf696b793176cdd751ccdcea959d30e517550bcce806026c90c90573c6b
+SHA512 (chromium-122.0.6261.69-clean.tar.xz) = 93e17a65a23d09447463bd2df5332de843b9e7c65bd2860a92891200b05b5710b4eddca9e93b5a23d732c8fe72c568ac8b7f0961d9518d4cd22bd24c17e84917