aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpsykose <alice@ayaya.dev>2022-06-23 01:52:47 +0000
committeralice <alice@ayaya.dev>2022-06-23 01:53:23 +0000
commit495b837359ab6b93a8fc0ea8898c3dd5eb3dd091 (patch)
tree44303d68770b3306d3f8d0b15db110a9861fffc1
parent4f7034a7f2a6e3eefc6e3c507707f1b60d5c4534 (diff)
downloadaports-495b837359ab6b93a8fc0ea8898c3dd5eb3dd091.tar.gz
aports-495b837359ab6b93a8fc0ea8898c3dd5eb3dd091.tar.bz2
aports-495b837359ab6b93a8fc0ea8898c3dd5eb3dd091.tar.xz
community/chromium: upgrade to 103.0.5060.53
-rw-r--r--community/chromium/APKBUILD35
-rw-r--r--community/chromium/chromium-102-fenced_frame_utils-include.patch26
-rw-r--r--community/chromium/chromium-102-regex_pattern-array.patch15
-rw-r--r--community/chromium/iwyu-add-utility-for-std-exchange.patch28
-rw-r--r--community/chromium/libxml-unbundle.patch11
-rw-r--r--community/chromium/quiche-arena-size.patch2
6 files changed, 19 insertions, 98 deletions
diff --git a/community/chromium/APKBUILD b/community/chromium/APKBUILD
index 81f724b0bc..ad72282b4c 100644
--- a/community/chromium/APKBUILD
+++ b/community/chromium/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=chromium
-pkgver=102.0.5005.115
+pkgver=103.0.5060.53
pkgrel=0
pkgdesc="Chromium web browser"
url="https://www.chromium.org/Home"
@@ -131,17 +131,23 @@ source="https://commondatastorage.googleapis.com/chromium-browser-official/chrom
musl-tid-caching.patch
memory-tagging-arm64.patch
- libxml-unbundle.patch
fix-missing-cstdint-include-musl.patch
- iwyu-add-utility-for-std-exchange.patch
roll-src-third_party-ffmpeg.patch
remove-no-opaque-pointers-flag.patch
- chromium-102-fenced_frame_utils-include.patch
- chromium-102-regex_pattern-array.patch
"
# secfixes:
+# 103.0.5060.115-r0:
+# - CVE-2022-2156
+# - CVE-2022-2157
+# - CVE-2022-2158
+# - CVE-2022-2160
+# - CVE-2022-2161
+# - CVE-2022-2162
+# - CVE-2022-2163
+# - CVE-2022-2164
+# - CVE-2022-2165
# 102.0.5005.61-r0:
# - CVE-2022-1853
# - CVE-2022-1854
@@ -517,6 +523,10 @@ build() {
local _google_api_key _google_default_client_id _google_default_client_secret
eval "$(base64 -d < $srcdir/google-api.keys)"
+ # silence really annoying warning on every compiler invocation
+ export CFLAGS="$CFLAGS -O2 -Wno-unknown-warning-option"
+ export CXXFLAGS="$CXXFLAGS -O2 -Wno-unknown-warning-option"
+
msg "Bootstrapping GN"
# AR="ar" CC="${CC:-gcc}" CXX="${CXX:-g++}" LD="${CXX:-g++}" \
@@ -550,7 +560,7 @@ build() {
is_clang=true \
is_component_build=false \
is_debug=false \
- is_official_build=true\
+ is_official_build=true \
link_pulseaudio=true \
proprietary_codecs=true \
rtc_use_pipewire=true \
@@ -584,16 +594,11 @@ build() {
AR="ar" CC="clang" CXX="clang++" LD="clang++" NM=/usr/bin/nm \
out/Release/gn gen out/$_buildtype --args="$_c $_ca"
- # Make xcbgen available to ui/gfx/x/gen_xproto.py running under Python 2
- ln -sf /usr/lib/python3.*/site-packages/xcbgen .
- export PYTHONPATH="$PWD"
-
msg "Ninja turtles GO!"
# final link needs lots of file descriptors
ulimit -n 4096
- # finish rest of the build
ninja -C out/$_buildtype chrome chrome_sandbox chromedriver chrome_crashpad_handler
if [ -n "$CHECK" ]; then
@@ -831,7 +836,7 @@ angle() {
}
sha512sums="
-37f7789a3fe1d3ffc741fce346b4de25cec6fb21106a3013283a273300409b16115d193036f168a46a6524043a9ed5d4d0276ad1ad469cc347659fa20b678426 chromium-102.0.5005.115.tar.xz
+6a312f85e4fda49fc63b1b6bc74b1d6ea5be5a9db98f22c88ab0394968399df49daf1dfab19922b69a04a5afacc16eb9aa3f8af350f4cb1d2b0824c74efcf835 chromium-103.0.5060.53.tar.xz
f554ccc5d8a5c066634357878c89944cc591809ea6f6c6ef5b35e970e9674e0b3be8fddb06c0d333ddc65211fa09ae5e0b4b483ca70048156c29607c5487c017 test_fonts-cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb.tar.gz
b9a810416dd7a8ffc3a5ced85ad9acebda1665bd08a57eec7b189698cc5f74d2c3fd69044e20fcb83297a43214b2772a1312b2c6122ea0eb716abacf39524d60 chromium-launcher.sh
f6d962b9e4c22dd42183df3db5d3202dab33eccecafb1bf63ca678147289581262db1e5e64cbe8f9c212beefb0a6717bb8d311e497f56b55fe95b8bab2db493f chromium.conf
@@ -858,17 +863,13 @@ c4654d5b23c6f5d9502507e534fe1951d6749c62251e49b6adfe10d1569431e7f7a5a6fa5ff09ec3
8d11b2ba811fdd6280784bfafcef073238324941b4c33e7c9a5ccfde8506242d06e5136d697f047bab3838b43a666f1da404af7b4f4ff9a0c6bf6bdb8448e5b2 scoped-file.patch
91dafba2138175b6618ec4c96c7ea39f3a26f6a09b69adabad4f9355dd84d436f3de3274b31465d5f46deeb452fde64e4cfbbda0bb4ed7e9a25d953e1b73e5d2 remove-strip_binary.patch
82f2bd4aa613e792d3af6e7a8632e0920cf48504a7572fb97d5480ea182fa125fe526e7df1ce4311b5d139a3f78da0f0b54605fbd09d7cd43135906a7639e47f gdbinit.patch
-c7fc8a1a079224b9ed6a1f8331cef901833bec04f337fa122381e0a65a1acdd529368f6653dc6d03475381659e07e6e31dd2ec0530257606480f06d15faf3aaf quiche-arena-size.patch
+b72905bcb775920939b6ac69e22166745daf1154fec46377988c329e0e073d14ff85ae93386fc0d345cd47d3dcfd6b8be56e39277c40637315151bca28f1b904 quiche-arena-size.patch
2fdd0b2fd403dd4440533288f7e08bb8480702c42c7571ea764aac18ba5eaf72494793c77e4244991d12f45e5acfceae0772995b11d323916c07cb53c43a2f59 revert-use-ffile-compilation-dir.patch
0fc131ef4ad32964815744080f40cc2566c70da1cd4ddaf1da8456d1c86e67e3ebf38f43208d17d40b646744e8e662f5b314e236a1c90bc6f8b936313e42a3cf chromium-VirtualCursor-standard-layout.patch
274858323d040ac8c51bac90b6ef91bb075d7b8d92d73952ed700c10a8bae2c2115fb2a9cc6912de79be226c141d7106839fc3486e22c0206e75cb6d8ff65ee6 credentials-header.patch
a018cf58b9e34f73d588961f2f9a36de67267060fb2e77ebc562974c6c92a59009161e374cf9bbdc35e8bf1a7e90f0b90117a0d494dcd2e2bb2f5e6534925d0b musl-tid-caching.patch
63e5b25c49af484964b3ac723da1c2f348812572a2e24ad412d2fb9eb7eec9ddc0e76568e76d1f352cdc562bc5003c93e04ee519a82e8568f48484d1682e237f memory-tagging-arm64.patch
-17b54042c58cd448c7e26dca1504bb48d85fdd7c2385930e639c283493a5e430923041f01cde5a5dfaa32fbb7f0a645baca55b202d56d3f245fb4febdf026da2 libxml-unbundle.patch
8bebf4a9d5225c6e47edc5b07c4b97be24a45cc221f49632836915ceeb4ecb69b7f79a31ea7f82171cde3443f45fec541f409892542cf1014e81aa6acd01566d fix-missing-cstdint-include-musl.patch
-4d268992ddb341e70f4e730c82c676c0c95b3958bc9553bbe83383cebde7373c79a8e9aeef47c7af2add8353263b02ccfd7e5bd864f544a584361a02d30374ec iwyu-add-utility-for-std-exchange.patch
128ec0fd14349e065c8bb0910d53cbea7423182a06e06f7b7765f3cba1e5ba5e7a8bccbcdab079335b5235abb7bf0d46dee21ecc8c221be7e1c5c6d9795f958e roll-src-third_party-ffmpeg.patch
c8e892e36e7292cd6db36017fff994a0fbc00dd83ea9010422c21cd56da89c9eddd1712e4ff4b3fec354fa595ce3cc403b96fc13525e74fe6538461d5c2d9b50 remove-no-opaque-pointers-flag.patch
-459910ac11dfd2953240a72836aac55c33d914906194897b38328f482173a101930cad1656906df0bc1c903d41199eee8089f474f5d8b056cfb12c8f2b0acffb chromium-102-fenced_frame_utils-include.patch
-a6f066e0cbb4e0644733b48013f150647b3c431dc5ebcbff611b3214c86739726208874f67cb339140045e7934e7636f7514bd7aec603545d47c7ab6ca205be4 chromium-102-regex_pattern-array.patch
"
diff --git a/community/chromium/chromium-102-fenced_frame_utils-include.patch b/community/chromium/chromium-102-fenced_frame_utils-include.patch
deleted file mode 100644
index 81304f55d9..0000000000
--- a/community/chromium/chromium-102-fenced_frame_utils-include.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Patch-Source: https://github.com/stha09/chromium-patches/blob/chromium-102-patchset-6/chromium-102-fenced_frame_utils-include.patch
-From 7c135a291184b59a59643ed6a8c40b4405ac0175 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Wed, 27 Apr 2022 16:01:01 +0000
-Subject: [PATCH] IWYU: add cstring for std::strlen in fenced_frame_utils
-
----
- third_party/blink/common/fenced_frame/fenced_frame_utils.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/third_party/blink/common/fenced_frame/fenced_frame_utils.cc b/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
-index 9e2d3ad..68f4823 100644
---- a/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
-+++ b/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
-@@ -4,6 +4,8 @@
-
- #include "third_party/blink/public/common/fenced_frame/fenced_frame_utils.h"
-
-+#include <cstring>
-+
- #include "base/guid.h"
- #include "base/strings/string_util.h"
-
---
-2.35.1
-
diff --git a/community/chromium/chromium-102-regex_pattern-array.patch b/community/chromium/chromium-102-regex_pattern-array.patch
deleted file mode 100644
index a6c1f899f7..0000000000
--- a/community/chromium/chromium-102-regex_pattern-array.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Patch-Source: https://github.com/stha09/chromium-patches/blob/chromium-102-patchset-6/chromium-102-regex_pattern-array.patch
---- a/components/autofill/core/browser/BUILD.gn
-+++ b/components/autofill/core/browser/BUILD.gn
-@@ -54,6 +54,11 @@ action("regex_patterns_inl_h") {
- }
-
- static_library("browser") {
-+ if (is_clang) {
-+ cflags = [
-+ "-fbracket-depth=1000",
-+ ]
-+ }
- sources = [
- "address_normalization_manager.cc",
- "address_normalization_manager.h",
diff --git a/community/chromium/iwyu-add-utility-for-std-exchange.patch b/community/chromium/iwyu-add-utility-for-std-exchange.patch
deleted file mode 100644
index b79206d0f9..0000000000
--- a/community/chromium/iwyu-add-utility-for-std-exchange.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Patch-Source: https://chromium-review.googlesource.com/c/chromium/src/+/3604643
-From 9dd0503835dc875807ab63efb1f477bffed2a852 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Mon, 25 Apr 2022 23:18:30 +0000
-Subject: [PATCH] IWYU: add utility for std::exchange
-
-Bug: 957519
-Change-Id: I307d520fdc34d2452018ed32a505e7e519739410
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3604643
-Reviewed-by: Wez <wez@chromium.org>
-Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
-Cr-Commit-Position: refs/heads/main@{#995855}
----
- base/third_party/symbolize/symbolize.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/base/third_party/symbolize/symbolize.h b/base/third_party/symbolize/symbolize.h
-index 99029a968d5..278078f6071 100644
---- a/base/third_party/symbolize/symbolize.h
-+++ b/base/third_party/symbolize/symbolize.h
-@@ -61,6 +61,7 @@
- #ifdef HAVE_SYMBOLIZE
-
- #include <algorithm>
-+#include <utility>
-
- #if defined(__ELF__) // defined by gcc
- #if defined(__OpenBSD__)
diff --git a/community/chromium/libxml-unbundle.patch b/community/chromium/libxml-unbundle.patch
deleted file mode 100644
index 2644823225..0000000000
--- a/community/chromium/libxml-unbundle.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Patch-Source: https://chromium-review.googlesource.com/c/chromium/src/+/3488058
---- a/build/linux/unbundle/libxml.gn
-+++ b/build/linux/unbundle/libxml.gn
-@@ -19,6 +19,7 @@ static_library("libxml_utils") {
- ":xml_reader",
- ":xml_writer",
- "//base/test:test_support",
-+ "//services/data_decoder:lib",
- "//services/data_decoder:xml_parser_fuzzer_deps",
- ]
- sources = [
diff --git a/community/chromium/quiche-arena-size.patch b/community/chromium/quiche-arena-size.patch
index ed82104c60..1c9182dbc8 100644
--- a/community/chromium/quiche-arena-size.patch
+++ b/community/chromium/quiche-arena-size.patch
@@ -4,7 +4,7 @@
// QuicConnections currently use around 1KB of polymorphic types which would
// ordinarily be on the heap. Instead, store them inline in an arena.
--using QuicConnectionArena = QuicOneBlockArena<1152>;
+-using QuicConnectionArena = QuicOneBlockArena<1248>;
+using QuicConnectionArena = QuicOneBlockArena<1504>;
} // namespace quic