Skip to content
Snippets Groups Projects
Commit 4c400045 authored by alice's avatar alice
Browse files

community/chromium: upgrade to 108.0.5359.71

try some pgo again, since we have latest clang

patches:
- jsoncpp is now upstreamed
- dns-resolver rebasing
- __NR_sched_* defaultallowlisting is a bit different now-
  https://source.chromium.org/chromium/chromium/src/+/df99866b5421c102e7140e84abfd1b3d056bfaf8
  moves them all to a different file, we keep the override in _linux.cc
parent 8414ccdb
No related branches found
No related tags found
No related merge requests found
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org> # Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: psykose <alice@ayaya.dev> # Maintainer: psykose <alice@ayaya.dev>
pkgname=chromium pkgname=chromium
pkgver=107.0.5304.121 pkgver=108.0.5359.71
pkgrel=1 pkgrel=0
pkgdesc="Chromium web browser" pkgdesc="Chromium web browser"
url="https://www.chromium.org/Home" url="https://www.chromium.org/Home"
arch="aarch64 x86_64" # x86: ./v8_context_snapshot_generator segfaults arch="aarch64 x86_64" # x86: ./v8_context_snapshot_generator segfaults
...@@ -115,7 +115,6 @@ source="https://commondatastorage.googleapis.com/chromium-browser-official/chrom ...@@ -115,7 +115,6 @@ source="https://commondatastorage.googleapis.com/chromium-browser-official/chrom
fix-missing-cstdint-include-musl.patch fix-missing-cstdint-include-musl.patch
fix-narrowing-cast.patch fix-narrowing-cast.patch
gdbinit.patch gdbinit.patch
jsoncpp.patch
lto-core-count.patch lto-core-count.patch
memory-tagging-arm64.patch memory-tagging-arm64.patch
musl-sandbox.patch musl-sandbox.patch
...@@ -539,8 +538,8 @@ build() { ...@@ -539,8 +538,8 @@ build() {
eval "$(base64 -d < $srcdir/google-api.keys)" eval "$(base64 -d < $srcdir/google-api.keys)"
# silence really annoying warning on every compiler invocation, reproducible extras # silence really annoying warning on every compiler invocation, reproducible extras
export CFLAGS="${CFLAGS/-g/} -O2 -Wno-unknown-warning-option -Wno-builtin-macro-redefined" export CFLAGS="${CFLAGS/-g/} -O2 -Wno-unknown-warning-option -Wno-builtin-macro-redefined -Wno-deprecated-declarations"
export CXXFLAGS="${CXXFLAGS/-g/} -O2 -Wno-unknown-warning-option -Wno-builtin-macro-redefined" export CXXFLAGS="${CXXFLAGS/-g/} -O2 -Wno-unknown-warning-option -Wno-builtin-macro-redefined -Wno-deprecated-declarations"
export CPPFLAGS="${CPPFLAGS/-g/} -D__DATE__= -D__TIME__= -D__TIMESTAMP__=" export CPPFLAGS="${CPPFLAGS/-g/} -D__DATE__= -D__TIME__= -D__TIMESTAMP__="
export AR="llvm-ar" export AR="llvm-ar"
...@@ -555,7 +554,6 @@ build() { ...@@ -555,7 +554,6 @@ build() {
local gn_config=" local gn_config="
blink_enable_generated_code_formatting=false blink_enable_generated_code_formatting=false
chrome_pgo_phase=0
clang_base_path=\"/usr\" clang_base_path=\"/usr\"
clang_use_chrome_plugins=false clang_use_chrome_plugins=false
custom_toolchain=\"//build/toolchain/linux/unbundle:default\" custom_toolchain=\"//build/toolchain/linux/unbundle:default\"
...@@ -591,7 +589,7 @@ build() { ...@@ -591,7 +589,7 @@ build() {
use_system_lcms2=true use_system_lcms2=true
use_system_libdrm=true use_system_libdrm=true
use_system_libjpeg=true use_system_libjpeg=true
use_system_libwayland_server=true use_system_libwayland=true
use_system_wayland_scanner=true use_system_wayland_scanner=true
use_system_wayland_scanner=true use_system_wayland_scanner=true
use_system_zlib=true use_system_zlib=true
...@@ -841,7 +839,7 @@ swiftshader() { ...@@ -841,7 +839,7 @@ swiftshader() {
} }
sha512sums=" sha512sums="
c0d233ed18d95554d5b05102b24d92711b940f3897fd5252422d10bf1e8500c3875033aa4a211a11fd9b01ca5e65bd487aa0b0814da70a337a692d3cefb74081 chromium-107.0.5304.121.tar.xz 1f35d914e528df7c6ced391e1746678de79c9843a1ddf8425d682164f4cbb2c4cb676ce814e5136509308439a5b079c9a17ef44bf774b1f827737a24aaa1816e chromium-108.0.5359.71.tar.xz
f554ccc5d8a5c066634357878c89944cc591809ea6f6c6ef5b35e970e9674e0b3be8fddb06c0d333ddc65211fa09ae5e0b4b483ca70048156c29607c5487c017 test_fonts-cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb.tar.gz f554ccc5d8a5c066634357878c89944cc591809ea6f6c6ef5b35e970e9674e0b3be8fddb06c0d333ddc65211fa09ae5e0b4b483ca70048156c29607c5487c017 test_fonts-cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb.tar.gz
b9a810416dd7a8ffc3a5ced85ad9acebda1665bd08a57eec7b189698cc5f74d2c3fd69044e20fcb83297a43214b2772a1312b2c6122ea0eb716abacf39524d60 chromium-launcher.sh b9a810416dd7a8ffc3a5ced85ad9acebda1665bd08a57eec7b189698cc5f74d2c3fd69044e20fcb83297a43214b2772a1312b2c6122ea0eb716abacf39524d60 chromium-launcher.sh
9cfcb41d69c5a515b6f9fe2a629579fa499e1f48eb58a0ce4ec8e5029d450bcafb6d963019aaac9a6838244bee9f9ba7fe5ef6146a0ca6b20fcda4ab7f059476 chromium.conf 9cfcb41d69c5a515b6f9fe2a629579fa499e1f48eb58a0ce4ec8e5029d450bcafb6d963019aaac9a6838244bee9f9ba7fe5ef6146a0ca6b20fcda4ab7f059476 chromium.conf
...@@ -853,15 +851,14 @@ c4654d5b23c6f5d9502507e534fe1951d6749c62251e49b6adfe10d1569431e7f7a5a6fa5ff09ec3 ...@@ -853,15 +851,14 @@ c4654d5b23c6f5d9502507e534fe1951d6749c62251e49b6adfe10d1569431e7f7a5a6fa5ff09ec3
904f9b145f64f18930a2f482b8fa8516126c994ee5a971e3cd38869327641efaa369f63427c043745b152ad272102d68e3ea66b5c64fef060e339c9e58c30ad5 chromium-use-alpine-target.patch 904f9b145f64f18930a2f482b8fa8516126c994ee5a971e3cd38869327641efaa369f63427c043745b152ad272102d68e3ea66b5c64fef060e339c9e58c30ad5 chromium-use-alpine-target.patch
274858323d040ac8c51bac90b6ef91bb075d7b8d92d73952ed700c10a8bae2c2115fb2a9cc6912de79be226c141d7106839fc3486e22c0206e75cb6d8ff65ee6 credentials-sys-types-header.patch 274858323d040ac8c51bac90b6ef91bb075d7b8d92d73952ed700c10a8bae2c2115fb2a9cc6912de79be226c141d7106839fc3486e22c0206e75cb6d8ff65ee6 credentials-sys-types-header.patch
22da17c649ae9845d6a174187f2b666245a10db8a997169fc214c430fbba10143cfb57f8f6ece5acf856cd9ea09f293a1aca90cdf3e64fd9423b78beac53f517 default-pthread-stacksize.patch 22da17c649ae9845d6a174187f2b666245a10db8a997169fc214c430fbba10143cfb57f8f6ece5acf856cd9ea09f293a1aca90cdf3e64fd9423b78beac53f517 default-pthread-stacksize.patch
cd7719c30518aeb659e9b7dc126241f897afe1a231e601271b63ba170e811a93b514c4d2a77680cdf0c846f81fa6db766ac619aa200efb32cbdfff6732a63893 dns-resolver.patch 082d5391c177f6e559963f19f79b6d5277af8dd3d9df600b2450e3fcc12025ade76ad97ee147a0b77442824714bfd9ef17ac5b105281ec008a144d58129b3ca2 dns-resolver.patch
9d1edb1e0624ee61825e3af23fbb8c5dbc09d2b92d7769d19f8ca618edae8de8a3e051fedf4ad92c230e1373dc8495922c46971aef93a580c04ad80bc33516c0 fix-crashpad.patch 9d1edb1e0624ee61825e3af23fbb8c5dbc09d2b92d7769d19f8ca618edae8de8a3e051fedf4ad92c230e1373dc8495922c46971aef93a580c04ad80bc33516c0 fix-crashpad.patch
8bebf4a9d5225c6e47edc5b07c4b97be24a45cc221f49632836915ceeb4ecb69b7f79a31ea7f82171cde3443f45fec541f409892542cf1014e81aa6acd01566d fix-missing-cstdint-include-musl.patch 8bebf4a9d5225c6e47edc5b07c4b97be24a45cc221f49632836915ceeb4ecb69b7f79a31ea7f82171cde3443f45fec541f409892542cf1014e81aa6acd01566d fix-missing-cstdint-include-musl.patch
efe97b9dd2ec5965fa0cdf1b2a3c01253835c2df710da7ea105c4ce008c11f9caaf8b4321736a2b91f06d8d61972c08e225b16509dc05176a2c39337688ad5b9 fix-narrowing-cast.patch efe97b9dd2ec5965fa0cdf1b2a3c01253835c2df710da7ea105c4ce008c11f9caaf8b4321736a2b91f06d8d61972c08e225b16509dc05176a2c39337688ad5b9 fix-narrowing-cast.patch
82f2bd4aa613e792d3af6e7a8632e0920cf48504a7572fb97d5480ea182fa125fe526e7df1ce4311b5d139a3f78da0f0b54605fbd09d7cd43135906a7639e47f gdbinit.patch 82f2bd4aa613e792d3af6e7a8632e0920cf48504a7572fb97d5480ea182fa125fe526e7df1ce4311b5d139a3f78da0f0b54605fbd09d7cd43135906a7639e47f gdbinit.patch
fa2637f92f851614347e296fbab744af2c5d7edcbb444aeb4a5d3182a8ec2549593d75e717d7e78e9b2a7257e693b48fc88c149c1591052d7ae802f4fda0a775 jsoncpp.patch
1e004d2390a8031125345d39a98e03aab7fa5120317b632cfb250f705bd2983292f41e9c29637b2ea284d095b5747ac2d9664bf0a309e13967283b505f134a29 lto-core-count.patch 1e004d2390a8031125345d39a98e03aab7fa5120317b632cfb250f705bd2983292f41e9c29637b2ea284d095b5747ac2d9664bf0a309e13967283b505f134a29 lto-core-count.patch
63e5b25c49af484964b3ac723da1c2f348812572a2e24ad412d2fb9eb7eec9ddc0e76568e76d1f352cdc562bc5003c93e04ee519a82e8568f48484d1682e237f memory-tagging-arm64.patch 63e5b25c49af484964b3ac723da1c2f348812572a2e24ad412d2fb9eb7eec9ddc0e76568e76d1f352cdc562bc5003c93e04ee519a82e8568f48484d1682e237f memory-tagging-arm64.patch
e5c8a31abcf6b73fd67bd27537391a5b52e5561f2ff986ca246b66a4938b2f9a646871b781de49f299ce729b59de6855b1b3308bbb03c50498a9d1552e94f6a8 musl-sandbox.patch 28d5fc208bba81bda3a7a2a93528dfac15fc649ea0df46887facc1b32951b3c99907b5c06590b05fecea4fc7e327c35834a6260095a38e8fb530fa990d6597b3 musl-sandbox.patch
a018cf58b9e34f73d588961f2f9a36de67267060fb2e77ebc562974c6c92a59009161e374cf9bbdc35e8bf1a7e90f0b90117a0d494dcd2e2bb2f5e6534925d0b musl-tid-caching.patch a018cf58b9e34f73d588961f2f9a36de67267060fb2e77ebc562974c6c92a59009161e374cf9bbdc35e8bf1a7e90f0b90117a0d494dcd2e2bb2f5e6534925d0b musl-tid-caching.patch
556cc2ba28184a75745f13c673605327f5be590be179eb3f941dc0abded854a814e5da1432a28fb8d4dcdcd66ffd4c94ee1a8824d2cd93b632f48e9310dbc3fa musl-v8-monotonic-pthread-cont_timedwait.patch 556cc2ba28184a75745f13c673605327f5be590be179eb3f941dc0abded854a814e5da1432a28fb8d4dcdcd66ffd4c94ee1a8824d2cd93b632f48e9310dbc3fa musl-v8-monotonic-pthread-cont_timedwait.patch
3f90f888f015efd04636eee0e8431d41e073d432563553298d7b8be7650c397eb7d43a5bf682df1f66ffd7182852d4b836adb7dcd934f9b45247cdd99046e45c no-execinfo.patch 3f90f888f015efd04636eee0e8431d41e073d432563553298d7b8be7650c397eb7d43a5bf682df1f66ffd7182852d4b836adb7dcd934f9b45247cdd99046e45c no-execinfo.patch
......
--- ./net/dns/host_resolver_manager.cc.orig --- a/net/dns/dns_reloader.cc
+++ ./net/dns/host_resolver_manager.cc +++ b/net/dns/dns_reloader.cc
@@ -3014,8 +3014,7 @@
NetworkChangeNotifier::AddConnectionTypeObserver(this);
if (system_dns_config_notifier_)
system_dns_config_notifier_->AddObserver(this);
-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \
- !BUILDFLAG(IS_ANDROID)
+#if defined(__GLIBC__)
EnsureDnsReloaderInit();
#endif
--- ./net/dns/dns_reloader.cc.orig
+++ ./net/dns/dns_reloader.cc
@@ -6,8 +6,7 @@ @@ -6,8 +6,7 @@
#include "build/build_config.h" #include "build/build_config.h"
...@@ -22,9 +10,19 @@ ...@@ -22,9 +10,19 @@
#include <resolv.h> #include <resolv.h>
--- ./net/dns/host_resolver_proc.cc.orig --- a/net/dns/host_resolver_system_task.cc
+++ ./net/dns/host_resolver_proc.cc +++ b/net/dns/host_resolver_system_task.cc
@@ -176,8 +176,7 @@ @@ -310,8 +310,7 @@
}
void EnsureSystemHostResolverCallReady() {
-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \
- !BUILDFLAG(IS_ANDROID)
+#if defined(__GLIBC__)
EnsureDnsReloaderInit();
#elif BUILDFLAG(IS_WIN)
EnsureWinsockInit();
@@ -396,8 +396,7 @@
base::ScopedBlockingCall scoped_blocking_call(FROM_HERE, base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
base::BlockingType::WILL_BLOCK); base::BlockingType::WILL_BLOCK);
...@@ -33,4 +31,4 @@ ...@@ -33,4 +31,4 @@
+#if defined(__GLIBC__) +#if defined(__GLIBC__)
DnsReloaderMaybeReload(); DnsReloaderMaybeReload();
#endif #endif
absl::optional<AddressInfo> ai; auto [ai, err, os_error] = AddressInfo::Get(host, hints, nullptr, network);
Patch-Source: https://github.com/archlinux/svntogit-packages/blob/bf2401407df5bcc938382eb03748fbef41e41c89/trunk/unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch
From ed8d931e35f81d8566835a579caf7d61368f85b7 Mon Sep 17 00:00:00 2001
From: Evangelos Foutras <evangelos@foutrelis.com>
Date: Tue, 27 Sep 2022 22:20:41 +0000
Subject: [PATCH] unbundle/jsoncpp: avoid CFI faults with is_cfi=true
Ensure jsoncpp symbols have public visibility and are thus excluded from
CFI checks and whole-program optimization. This is achieved by defining
JSON_DLL_BUILD which in turn causes json/config.h to define JSON_API as
__attribute__((visibility("default"))). The latter macro is used to tag
jsoncpp classes and namespace functions throughout jsoncpp's headers.
BUG=1365218
Change-Id: I56277737b7d9ecaeb5e17c8d21a2e55f3d5d5bc9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3919652
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1052077}
---
build/linux/unbundle/jsoncpp.gn | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/build/linux/unbundle/jsoncpp.gn b/build/linux/unbundle/jsoncpp.gn
index 544f9d13c9..e84a0ef27a 100644
--- a/build/linux/unbundle/jsoncpp.gn
+++ b/build/linux/unbundle/jsoncpp.gn
@@ -3,6 +3,11 @@ import("//build/shim_headers.gni")
pkg_config("jsoncpp_config") {
packages = [ "jsoncpp" ]
+
+ # Defining JSON_DLL_BUILD applies public visibility to jsoncpp classes
+ # thus deactivating CFI checks for them. This avoids CFI violations in
+ # virtual calls to system jsoncpp library (https://crbug.com/1365218).
+ defines = [ "JSON_DLL_BUILD" ]
}
shim_headers("jsoncpp_shim") {
...@@ -78,7 +78,7 @@ index d9d1882..0567557 100644 ...@@ -78,7 +78,7 @@ index d9d1882..0567557 100644
diff --git a/sandbox/linux/system_headers/linux_syscalls.h ./sandbox/linux/system_headers/linux_syscalls.h diff --git a/sandbox/linux/system_headers/linux_syscalls.h ./sandbox/linux/system_headers/linux_syscalls.h
index 2b78a0c..b6fedb5 100644 index 2b78a0c..b6fedb5 100644
--- a/sandbox/linux/system_headers/linux_syscalls.h --- a/sandbox/linux/system_headers/linux_syscalls.h
+++ ./sandbox/linux/system_headers/linux_syscalls.h +++ b/sandbox/linux/system_headers/linux_syscalls.h
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
#define SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_ #define SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
...@@ -87,21 +87,15 @@ index 2b78a0c..b6fedb5 100644 ...@@ -87,21 +87,15 @@ index 2b78a0c..b6fedb5 100644
#if defined(__x86_64__) #if defined(__x86_64__)
#include "sandbox/linux/system_headers/x86_64_linux_syscalls.h" #include "sandbox/linux/system_headers/x86_64_linux_syscalls.h"
diff --git a/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc ./services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
index a85c0ea..715aa1e 100644
--- a/sandbox/policy/linux/bpf_renderer_policy_linux.cc --- a/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+++ ./sandbox/policy/linux/bpf_renderer_policy_linux.cc +++ b/sandbox/policy/linux/bpf_renderer_policy_linux.cc
@@ -102,11 +102,11 @@ @@ -94,6 +94,9 @@
#if defined(__arm__) || defined(__aarch64__) case __NR_pwrite64:
case __NR_getcpu: case __NR_sched_get_priority_max:
#endif case __NR_sched_get_priority_min:
- return Allow(); + case __NR_sched_getparam:
- case __NR_sched_getaffinity: + case __NR_sched_getscheduler:
case __NR_sched_getparam: + case __NR_sched_setscheduler:
case __NR_sched_getscheduler: case __NR_sysinfo:
case __NR_sched_setscheduler: case __NR_times:
+ return Allow(); case __NR_uname:
+ case __NR_sched_getaffinity:
return RestrictSchedTarget(GetPolicyPid(), sysno);
case __NR_prlimit64:
// See crbug.com/662450 and setrlimit comment above.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment