Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package chromium for openSUSE:Factory
checked in at 2021-10-30 23:13:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chromium (Old)
and /work/SRC/openSUSE:Factory/.chromium.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chromium"
Sat Oct 30 23:13:04 2021 rev:307 rq:927179 version:95.0.4638.54
Changes:
--------
--- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2021-10-12
21:49:19.263868949 +0200
+++ /work/SRC/openSUSE:Factory/.chromium.new.1890/chromium.changes
2021-10-30 23:14:03.883071308 +0200
@@ -1,0 +2,37 @@
+Sun Oct 24 11:10:51 UTC 2021 - Callum Farmer <gm...@opensuse.org>
+
+- Chromium 95.0.4638.54 (boo#1191844):
+ * CVE-2021-37981: Heap buffer overflow in Skia
+ * CVE-2021-37982: Use after free in Incognito
+ * CVE-2021-37983: Use after free in Dev Tools
+ * CVE-2021-37984: Heap buffer overflow in PDFium
+ * CVE-2021-37985: Use after free in V8
+ * CVE-2021-37986: Heap buffer overflow in Settings
+ * CVE-2021-37987: Use after free in Network APIs
+ * CVE-2021-37988: Use after free in Profiles
+ * CVE-2021-37989: Inappropriate implementation in Blink
+ * CVE-2021-37990: Inappropriate implementation in WebView
+ * CVE-2021-37991: Race in V8
+ * CVE-2021-37992: Out of bounds read in WebAudio
+ * CVE-2021-37993: Use after free in PDF Accessibility
+ * CVE-2021-37996: Insufficient validation of untrusted input in Downloads
+ * CVE-2021-37994: Inappropriate implementation in iFrame Sandbox
+ * CVE-2021-37995: Inappropriate implementation in WebApp Installer
+- Added patches:
+ * chromium-95-BitstreamReader-namespace.patch
+ * chromium-95-compiler.patch
+ * chromium-95-libyuv-aarch64.patch
+ * chromium-95-quiche-include.patch
+ * chromium-95-system-zlib.patch
+- Removed patches:
+ * chromium-94-compiler.patch
+ * chromium-91-libyuv-aarch64.patch
+ * chromium-90-ruy-include.patch
+ * chromium-94-CustomSpaces-include.patch
+
+-------------------------------------------------------------------
+Sat Oct 16 13:13:25 UTC 2021 - Callum Farmer <gm...@opensuse.org>
+
+- Remove Python 2 requirement
+
+-------------------------------------------------------------------
Old:
----
chromium-90-ruy-include.patch
chromium-91-libyuv-aarch64.patch
chromium-94-CustomSpaces-include.patch
chromium-94-compiler.patch
chromium-94.0.4606.81.tar.xz
highway-0.12.2.tar.gz
New:
----
chromium-95-BitstreamReader-namespace.patch
chromium-95-compiler.patch
chromium-95-libyuv-aarch64.patch
chromium-95-quiche-include.patch
chromium-95-system-zlib.patch
chromium-95.0.4638.54.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ chromium.spec ++++++
--- /var/tmp/diff_new_pack.eggcHG/_old 2021-10-30 23:14:09.283075653 +0200
+++ /var/tmp/diff_new_pack.eggcHG/_new 2021-10-30 23:14:09.283075653 +0200
@@ -17,6 +17,7 @@
%define rname chromium
+%define outputdir ${TMPOUT}
# bsc#1108175
%define __provides_exclude ^lib.*\\.so.*$
%if 0%{?suse_version} > 1500
@@ -27,10 +28,8 @@
%bcond_with system_vpx
%endif
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
-%bcond_without system_harfbuzz
%bcond_without pipewire
%else
-%bcond_with system_harfbuzz
%bcond_with pipewire
%endif
%bcond_without system_ffmpeg
@@ -40,21 +39,25 @@
%else
%bcond_without swiftshader
%endif
+%if 0%{?suse_version} > 1500
+%bcond_without system_harfbuzz
+%else
+%bcond_with system_harfbuzz
+%endif
%bcond_with lto
%bcond_without clang
Name: chromium
-Version: 94.0.4606.81
+Version: 95.0.4638.54
Release: 0
Summary: Google's open source browser project
License: BSD-3-Clause AND LGPL-2.1-or-later
URL: https://www.chromium.org/
Source0:
https://commondatastorage.googleapis.com/chromium-browser-official/%{rname}-%{version}.tar.xz
Source1: README.SUSE
-Source2:
https://github.com/google/highway/archive/refs/tags/0.12.2.tar.gz#/highway-0.12.2.tar.gz
# Toolchain definitions
Source30: master_preferences
Source104: chromium-symbolic.svg
-#
https://github.com/chromium/chromium/tree/%%{version}/chrome/installer/linux/common/installer.include
+#
https://source.chromium.org/chromium/chromium/src/+/refs/tags/%%{version}:chrome/installer/linux/common/installer.include
Source105: INSTALL.sh
#
Patch0: chromium-libusb_interrupt_event_handler.patch
@@ -77,7 +80,7 @@
# gentoo/fedora/arch patchset
Patch12: chromium-78-protobuf-RepeatedPtrField-export.patch
Patch13: chromium-80-QuicStreamSendBuffer-deleted-move-constructor.patch
-Patch15: chromium-94-compiler.patch
+Patch15: chromium-95-compiler.patch
Patch17: chromium-86-ImageMemoryBarrierData-init.patch
Patch18: chromium-86-nearby-explicit.patch
Patch19: chromium-86-nearby-include.patch
@@ -86,20 +89,21 @@
Patch25: chromium-90-fseal.patch
Patch29: chromium-93-EnumTable-crash.patch
Patch31: chromium-89-missing-cstring-header.patch
-Patch36: chromium-90-ruy-include.patch
Patch40: chromium-91-java-only-allowed-in-android-builds.patch
-Patch44: chromium-91-libyuv-aarch64.patch
+Patch44: chromium-95-libyuv-aarch64.patch
Patch46: chromium-91-sql-standard-layout-type.patch
Patch50: chromium-clang-nomerge.patch
Patch51: chromium-glibc-2.34.patch
Patch62: chromium-93-ffmpeg-4.4.patch
Patch63: chromium-ffmpeg-lp152.patch
-Patch64: chromium-94-CustomSpaces-include.patch
Patch65: chromium-94-sql-no-assert.patch
Patch67: chromium-older-harfbuzz.patch
Patch68: chromium-94-ffmpeg-roll.patch
Patch69: chromium-93-InkDropHost-crash.patch
Patch70: pipewire-do-not-typecheck-the-portal-session_handle.patch
+Patch71: chromium-95-BitstreamReader-namespace.patch
+Patch72: chromium-95-quiche-include.patch
+Patch73: chromium-95-system-zlib.patch
# Google seem not too keen on merging this but GPU accel is quite important
# https://chromium-review.googlesource.com/c/chromium/src/+/532294
#
https://github.com/saiarcot895/chromium-ubuntu-build/tree/master/debian/patches
@@ -134,7 +138,6 @@
BuildRequires: nodejs >= 8.0
BuildRequires: pam-devel
BuildRequires: pkgconfig
-BuildRequires: python
BuildRequires: python3
BuildRequires: python3-setuptools
BuildRequires: snappy-devel
@@ -282,17 +285,12 @@
WebDriver is an open source tool for automated testing of webapps across many
browsers. It provides capabilities for navigating to web pages, user input,
JavaScript execution, and more. ChromeDriver is a standalone server which
implements WebDriver's wire protocol for Chromium. It is being developed by
members of the Chromium and WebDriver teams.
%prep
-%ifarch aarch64
-%setup -q -T -D -b2 -n highway-0.12.2
-%endif
%setup -q -n %{rname}-%{version}
%autopatch -p1
%build
-%ifarch aarch64
-rm -rf third_party/highway/src/*
-mv ../highway-0.12.2/* third_party/highway/src
-%endif
+mktemp -d -t chromium-XXXXXXXXXX > temp.txt
+export TMPOUT=`cat temp.txt`
# Fix the path to nodejs binary
mkdir -p third_party/node/linux/node-linux-x64/bin
ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/node
@@ -441,6 +439,8 @@
third_party/lss
third_party/lzma_sdk
third_party/mako
+ third_party/maldoca
+ third_party/maldoca/src/third_party
third_party/markupsafe
third_party/mesa
third_party/metrics_proto
@@ -601,6 +601,7 @@
export CXXFLAGS="${CXXFLAGS} -I/usr/include/wayland
-I/usr/include/libxkbcommon"
%if %{with clang}
export LDFLAGS="${LDFLAGS} -Wl,--build-id=sha1"
+export CXXFLAGS="${CXXFLAGS} -Wno-unused-command-line-argument
-Wno-unknown-warning-option"
%endif
%ifarch aarch64
%if %{without clang}
@@ -726,7 +727,6 @@
myconf_gn+=" enable_vulkan=true"
%if %{with pipewire}
myconf_gn+=" rtc_use_pipewire=true rtc_link_pipewire=true"
-myconf_gn+=" rtc_pipewire_version=\"0.3\""
%endif
%if %{with clang}
myconf_gn+=" is_clang=true clang_base_path=\"/usr\"
clang_use_chrome_plugins=false"
@@ -763,18 +763,15 @@
# GN does not support passing cflags:
# https://bugs.chromium.org/p/chromium/issues/detail?id=642016
-gn gen --args="${myconf_gn}" out/Release
-
-# bundled xcb proto for python2
-export PYTHONPATH="$PWD/xcb-proto-1.14${PYTHONPATH+:}${PYTHONPATH}"
+gn gen --args="${myconf_gn}" %{outputdir}
-ninja -v %{?_smp_mflags} -C out/Release chrome chromedriver
+ninja -v %{?_smp_mflags} -C %{outputdir} chrome chromedriver
%install
-export OUTPUTDIR="out/Release"
-bash %{SOURCE105} -s %{buildroot} -l %{_libdir} %{!?with_system_icu:-i true}
+export TMPOUT=`cat temp.txt`
+bash %{SOURCE105} -s %{buildroot} -l %{_libdir} %{!?with_system_icu:-i true}
-o %{outputdir}
# chromedriver
-cp -a ${OUTPUTDIR}/chromedriver.unstripped
%{buildroot}%{_libdir}/chromium/chromedriver
+cp -a %{outputdir}/chromedriver.unstripped
%{buildroot}%{_libdir}/chromium/chromedriver
ln -s %{_libdir}/chromium/chromedriver %{buildroot}%{_bindir}/chromedriver
# link to browser plugin path. Plugin patch doesn't work. Why?
mkdir -p %{buildroot}%{_libdir}/browser-plugins
++++++ INSTALL.sh ++++++
--- /var/tmp/diff_new_pack.eggcHG/_old 2021-10-30 23:14:09.307075672 +0200
+++ /var/tmp/diff_new_pack.eggcHG/_new 2021-10-30 23:14:09.307075672 +0200
@@ -1,14 +1,14 @@
#!/bin/bash
set -x
-while getopts s:l:i: option
+while getopts s:o:l:i: option
do
case "${option}" in
s) STAGEDIR=${OPTARG};;
+o) OUTPUTDIR=${OPTARG};;
l) LIBDIR=${OPTARG};;
i) ICUDATAFILE=${OPTARG};;
esac
done
-OUTPUTDIR="out/Release"
SHLIB_PERMS="755"
PROGNAME="chrome"
PACKAGE="chromium-browser"
++++++ chromium-95-BitstreamReader-namespace.patch ++++++
>From c23f09d436b566934d02c26a19e3cf5d31545855 Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <sth...@googlemail.com>
Date: Sat, 4 Sep 2021 17:02:00 +0000
Subject: [PATCH] GCC: fix template specialization in webrtc::BitstreamReader
GCC complains that explicit specialization in non-namespace scope
is happening for webrtc::BitstreamReader::Read(). However, specialization
for bool isn't used because std::is_unsigned<bool>::value returns true.
Add std::is_same for bool check and enable second specialization only
for bool types.
---
third_party/webrtc/rtc_base/bitstream_reader.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/third_party/webrtc/rtc_base/bitstream_reader.h
b/third_party/webrtc/rtc_base/bitstream_reader.h
index 8c0f66f..cd8537f 100644
--- a/third_party/webrtc/rtc_base/bitstream_reader.h
+++ b/third_party/webrtc/rtc_base/bitstream_reader.h
@@ -61,14 +61,16 @@ class BitstreamReader {
// Reads unsigned integer of fixed width.
template <typename T,
typename std::enable_if<std::is_unsigned<T>::value &&
+ !std::is_same<T, bool>::value &&
sizeof(T) <= 8>::type* = nullptr>
ABSL_MUST_USE_RESULT T Read() {
return rtc::dchecked_cast<T>(ReadBits(sizeof(T) * 8));
}
// Reads single bit as boolean.
- template <>
- ABSL_MUST_USE_RESULT bool Read<bool>() {
+ template <typename T,
+ typename std::enable_if<std::is_same<T, bool>::value>::type* =
nullptr>
+ ABSL_MUST_USE_RESULT bool Read() {
return ReadBit() != 0;
}
--
2.32.0
++++++ chromium-94-compiler.patch -> chromium-95-compiler.patch ++++++
--- /work/SRC/openSUSE:Factory/chromium/chromium-94-compiler.patch
2021-10-04 18:39:46.882039629 +0200
+++ /work/SRC/openSUSE:Factory/.chromium.new.1890/chromium-95-compiler.patch
2021-10-30 23:13:13.499030767 +0200
@@ -1,6 +1,6 @@
From f4d0b0eb899005b4b8b6388e1d8bb82cc0018fc8 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <flop...@gentoo.org>
-Date: Sun, 8 Aug 2021 08:50:00 +0000
+Date: Sat, 4 Sep 2021 15:13:20 +0000
Subject: [PATCH] Disable various compiler configs
---
@@ -8,10 +8,10 @@
1 file changed, 17 insertions(+), 88 deletions(-)
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 0bb155a..e95c023 100644
+index 219a2be..7565c83 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
-@@ -291,8 +291,6 @@ config("compiler") {
+@@ -292,8 +292,6 @@ config("compiler") {
configs += [
# See the definitions below.
@@ -20,7 +20,7 @@
":compiler_codegen",
":compiler_deterministic",
]
-@@ -530,31 +528,6 @@ config("compiler") {
+@@ -531,31 +529,6 @@ config("compiler") {
ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
}
@@ -52,7 +52,7 @@
# C11/C++11 compiler flags setup.
# ---------------------------
if (is_linux || is_chromeos || is_android || (is_nacl && is_clang) ||
-@@ -1216,45 +1189,6 @@ config("compiler_deterministic") {
+@@ -1246,45 +1219,6 @@ config("compiler_deterministic") {
}
}
@@ -98,7 +98,7 @@
# Tells the compiler not to use absolute paths when passing the default
# paths to the tools it invokes. We don't want this because we don't
# really need it and it can mess up the goma cache entries.
-@@ -1658,7 +1592,7 @@ config("chromium_code") {
+@@ -1704,7 +1638,7 @@ config("chromium_code") {
defines = [ "_HAS_NODISCARD" ]
}
} else {
@@ -107,7 +107,7 @@
if (treat_warnings_as_errors) {
cflags += [ "-Werror" ]
-@@ -1667,10 +1601,6 @@ config("chromium_code") {
+@@ -1713,10 +1647,6 @@ config("chromium_code") {
# well.
ldflags = [ "-Werror" ]
}
@@ -118,7 +118,7 @@
# In Chromium code, we define __STDC_foo_MACROS in order to get the
# C99 macros on Mac and Linux.
-@@ -1679,15 +1609,6 @@ config("chromium_code") {
+@@ -1725,15 +1655,6 @@ config("chromium_code") {
"__STDC_FORMAT_MACROS",
]
@@ -134,7 +134,7 @@
if (is_mac) {
cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
-@@ -2077,7 +1998,8 @@ config("default_stack_frames") {
+@@ -2101,7 +2022,8 @@ config("default_stack_frames") {
}
# Default "optimization on" config.
@@ -144,7 +144,7 @@
if (is_win) {
if (chrome_pgo_phase != 2) {
# Favor size over speed, /O1 must be before the common flags.
-@@ -2112,7 +2034,8 @@ config("optimize") {
+@@ -2141,7 +2063,8 @@ config("optimize") {
}
# Turn off optimizations.
@@ -154,7 +154,7 @@
if (is_win) {
cflags = [
"/Od", # Disable optimization.
-@@ -2152,7 +2075,8 @@ config("no_optimize") {
+@@ -2181,7 +2104,8 @@ config("no_optimize") {
# Turns up the optimization level. On Windows, this implies whole program
# optimization and link-time code generation which is very expensive and
should
# be used sparingly.
@@ -164,7 +164,7 @@
if (is_nacl && is_nacl_irt) {
# The NaCl IRT is a special case and always wants its own config.
# Various components do:
-@@ -2184,7 +2108,8 @@ config("optimize_max") {
+@@ -2214,7 +2138,8 @@ config("optimize_max") {
#
# TODO(crbug.com/621335) - rework how all of these configs are related
# so that we don't need this disclaimer.
@@ -174,7 +174,7 @@
if (is_nacl && is_nacl_irt) {
# The NaCl IRT is a special case and always wants its own config.
# Various components do:
-@@ -2209,7 +2134,8 @@ config("optimize_speed") {
+@@ -2240,7 +2165,8 @@ config("optimize_speed") {
}
}
@@ -182,9 +182,9 @@
+config("optimize_fuzzing") { }
+config("xoptimize_fuzzing") {
cflags = [ "-O1" ] + common_optimize_on_cflags
+ rustflags = [ "-Copt-level=1" ]
ldflags = common_optimize_on_ldflags
- visibility = [ ":default_optimization" ]
-@@ -2328,7 +2254,8 @@ config("win_pdbaltpath") {
+@@ -2360,7 +2286,8 @@ config("win_pdbaltpath") {
}
# Full symbols.
@@ -194,7 +194,7 @@
if (is_win) {
if (is_clang) {
cflags = [ "/Z7" ] # Debug information in the .obj files.
-@@ -2431,7 +2358,8 @@ config("symbols") {
+@@ -2474,7 +2401,8 @@ config("symbols") {
# Minimal symbols.
# This config guarantees to hold symbol for stack trace which are shown to
user
# when crash happens in unittests running on buildbot.
@@ -204,7 +204,7 @@
if (is_win) {
# Functions, files, and line tables only.
cflags = []
-@@ -2496,7 +2424,8 @@ config("minimal_symbols") {
+@@ -2546,7 +2474,8 @@ config("minimal_symbols") {
# This configuration contains function names only. That is, the compiler is
# told to not generate debug information and the linker then just puts
function
# names in the final debug information.
@@ -215,4 +215,5 @@
ldflags = [ "/DEBUG" ]
--
-2.31.1
+2.32.0
+
++++++ chromium-91-libyuv-aarch64.patch -> chromium-95-libyuv-aarch64.patch
++++++
--- /work/SRC/openSUSE:Factory/chromium/chromium-91-libyuv-aarch64.patch
2021-06-06 22:39:44.159306186 +0200
+++
/work/SRC/openSUSE:Factory/.chromium.new.1890/chromium-95-libyuv-aarch64.patch
2021-10-30 23:13:13.779030992 +0200
@@ -28,64 +28,3 @@
+ : "Q"(kShuffleAB64ToARGB) // %3
: "cc", "memory", "v0", "v1", "v2", "v3", "v4");
}
-
-diff --git a/third_party/libyuv/source/scale_neon64.cc
b/third_party/libyuv/source/scale_neon64.cc
-index 8656fec..9f9636e 100644
---- a/third_party/libyuv/source/scale_neon64.cc
-+++ b/third_party/libyuv/source/scale_neon64.cc
-@@ -601,8 +601,8 @@ void ScaleRowUp2_Bilinear_NEON(const uint8_t* src_ptr,
- "umlal v4.8h, v1.8b, v31.8b \n" // 3*near+far (2, odd)
- "umlal v5.8h, v0.8b, v31.8b \n" // 3*near+far (2, even)
-
-- "mov v0.8h, v4.8h \n"
-- "mov v1.8h, v5.8h \n"
-+ "mov v0.16b, v4.16b \n"
-+ "mov v1.16b, v5.16b \n"
- "mla v4.8h, v2.8h, v30.8h \n" // 9 3 3 1 (1, odd)
- "mla v5.8h, v3.8h, v30.8h \n" // 9 3 3 1 (1, even)
- "mla v2.8h, v0.8h, v30.8h \n" // 9 3 3 1 (2, odd)
-@@ -642,7 +642,7 @@ void ScaleRowUp2_Linear_12_NEON(const uint16_t* src_ptr,
- "ld1 {v1.8h}, [%1], #16 \n" // 12345678 (16b)
- "prfm pldl1keep, [%0, 448] \n" // prefetch 7 lines
ahead
-
-- "mov v2.8h, v0.8h \n"
-+ "mov v2.16b, v0.16b \n"
- "mla v0.8h, v1.8h, v31.8h \n" // 3*near+far (odd)
- "mla v1.8h, v2.8h, v31.8h \n" // 3*near+far (even)
-
-@@ -679,7 +679,7 @@ void ScaleRowUp2_Bilinear_12_NEON(const uint16_t* src_ptr,
- "ld1 {v3.8h}, [%2], #16 \n" // 12345678 (16b)
- "prfm pldl1keep, [%0, 448] \n" // prefetch 7 lines
ahead
-
-- "mov v0.8h, v2.8h \n"
-+ "mov v0.16b, v2.16b \n"
- "mla v2.8h, v3.8h, v31.8h \n" // 3*near+far (odd)
- "mla v3.8h, v0.8h, v31.8h \n" // 3*near+far (even)
-
-@@ -687,12 +687,12 @@ void ScaleRowUp2_Bilinear_12_NEON(const uint16_t*
src_ptr,
- "ld1 {v5.8h}, [%3], #16 \n" // 12345678 (16b)
- "prfm pldl1keep, [%1, 448] \n" // prefetch 7 lines
ahead
-
-- "mov v0.8h, v4.8h \n"
-+ "mov v0.16b, v4.16b \n"
- "mla v4.8h, v5.8h, v31.8h \n" // 3*near+far (odd)
- "mla v5.8h, v0.8h, v31.8h \n" // 3*near+far (even)
-
-- "mov v0.8h, v4.8h \n"
-- "mov v1.8h, v5.8h \n"
-+ "mov v0.16b, v4.16b \n"
-+ "mov v1.16b, v5.16b \n"
- "mla v4.8h, v2.8h, v31.8h \n" // 9 3 3 1 (1, odd)
- "mla v5.8h, v3.8h, v31.8h \n" // 9 3 3 1 (1, even)
- "mla v2.8h, v0.8h, v31.8h \n" // 9 3 3 1 (2, odd)
-@@ -887,8 +887,8 @@ void ScaleUVRowUp2_Bilinear_NEON(const uint8_t* src_ptr,
- "umlal v4.8h, v1.8b, v31.8b \n" // 3*near+far (2, odd)
- "umlal v5.8h, v0.8b, v31.8b \n" // 3*near+far (2, even)
-
-- "mov v0.8h, v4.8h \n"
-- "mov v1.8h, v5.8h \n"
-+ "mov v0.16b, v4.16b \n"
-+ "mov v1.16b, v5.16b \n"
- "mla v4.8h, v2.8h, v30.8h \n" // 9 3 3 1 (1, odd)
- "mla v5.8h, v3.8h, v30.8h \n" // 9 3 3 1 (1, even)
- "mla v2.8h, v0.8h, v30.8h \n" // 9 3 3 1 (2, odd)
++++++ chromium-95-quiche-include.patch ++++++
>From a9d986203bcfbaab84f270c1dc6c3abb4c450ee1 Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <sth...@googlemail.com>
Date: Fri, 17 Sep 2021 14:57:33 +0000
Subject: [PATCH] IWYU: add stddef.h for size_t in WindowManager
---
net/third_party/quiche/src/http2/adapter/window_manager.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/third_party/quiche/src/http2/adapter/window_manager.h
b/net/third_party/quiche/src/http2/adapter/window_manager.h
index f15982d..5a7701e 100644
--- a/net/third_party/quiche/src/http2/adapter/window_manager.h
+++ b/net/third_party/quiche/src/http2/adapter/window_manager.h
@@ -1,6 +1,8 @@
#ifndef QUICHE_HTTP2_ADAPTER_WINDOW_MANAGER_H_
#define QUICHE_HTTP2_ADAPTER_WINDOW_MANAGER_H_
+#include <stddef.h>
+
#include <functional>
#include "common/platform/api/quiche_export.h"
--
2.32.0
++++++ chromium-95-system-zlib.patch ++++++
>From 0aa878b7839141077071db97ba1cd30edf486827 Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <sth...@googlemail.com>
Date: Wed, 15 Sep 2021 17:14:14 +0000
Subject: [PATCH] maldoca: depend on zlib instead of headers only
There is no zlib_common_headers target for unbundled zlib
and in the end code links against zlib static library anyways.
Bug: None
Change-Id: I50b8bb5b480770b637904de00aecc3a629f09471
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3162976
Reviewed-by: Daniel Rubery <drub...@chromium.org>
Commit-Queue: Stephan Hartmann <sth...@googlemail.com>
Cr-Commit-Position: refs/heads/main@{#921717}
---
third_party/maldoca/BUILD.gn | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/third_party/maldoca/BUILD.gn b/third_party/maldoca/BUILD.gn
index eeab2056b5fb8..29a0a2ca492a5 100644
--- a/third_party/maldoca/BUILD.gn
+++ b/third_party/maldoca/BUILD.gn
@@ -224,7 +224,7 @@ source_set("maldoca-ole") {
"//third_party/libxml",
"//third_party/protobuf:protobuf_lite",
"//third_party/re2",
- "//third_party/zlib:zlib_common_headers",
+ "//third_party/zlib:zlib",
"//third_party/zlib/google:zip",
]
++++++ chromium-94.0.4606.81.tar.xz -> chromium-95.0.4638.54.tar.xz ++++++
/work/SRC/openSUSE:Factory/chromium/chromium-94.0.4606.81.tar.xz
/work/SRC/openSUSE:Factory/.chromium.new.1890/chromium-95.0.4638.54.tar.xz
differ: char 27, line 1
++++++ chromium-glibc-2.34.patch ++++++
--- /var/tmp/diff_new_pack.eggcHG/_old 2021-10-30 23:14:09.431075772 +0200
+++ /var/tmp/diff_new_pack.eggcHG/_new 2021-10-30 23:14:09.431075772 +0200
@@ -14,7 +14,7 @@
--- a/sandbox/linux/services/credentials.cc
+++ b/sandbox/linux/services/credentials.cc
@@ -98,7 +98,9 @@
- // attempt this optimization.
+ // TODO(crbug.com/1247458) Broken in MSan builds after LLVM f1bb30a4956f.
clone_flags |= CLONE_VM | CLONE_VFORK | CLONE_SETTLS;
- char tls_buf[PTHREAD_STACK_MIN] = {0};
++++++ chromium-norar.patch ++++++
--- /var/tmp/diff_new_pack.eggcHG/_old 2021-10-30 23:14:09.443075782 +0200
+++ /var/tmp/diff_new_pack.eggcHG/_new 2021-10-30 23:14:09.443075782 +0200
@@ -38,8 +38,8 @@
- public_deps = [ "//components/safe_browsing/core/common/proto:csd_proto" ]
- }
-
- if (is_mac) {
- source_set("disk_image_type_sniffer_mac") {
+ if (is_linux || is_win) {
+ source_set("document_analyzer") {
sources = [
@@ -149,7 +116,6 @@ source_set("safe_browsing") {
":archive_analyzer_results",
@@ -53,8 +53,8 @@
--- chromium-93.0.4577.63/chrome/common/safe_browsing/DEPS.nounrar
2021-09-02 08:22:31.280927364 -0400
+++ chromium-93.0.4577.63/chrome/common/safe_browsing/DEPS 2021-09-02
08:23:56.092293262 -0400
@@ -2,6 +2,5 @@ include_rules = [
- "+components/safe_browsing/content/common",
"+components/safe_browsing/core/common",
+ "+third_party/maldoca",
"+third_party/protobuf",
- "+third_party/unrar",
"+third_party/zlib",
@@ -68,8 +68,8 @@
"//chrome/common/safe_browsing:archive_analyzer_results",
- "//chrome/common/safe_browsing:rar_analyzer",
]
- }
+ if (is_linux || is_win) {
diff -up
chromium-93.0.4577.63/chrome/services/file_util/safe_archive_analyzer.cc.nounrar
chromium-93.0.4577.63/chrome/services/file_util/safe_archive_analyzer.cc
---
chromium-93.0.4577.63/chrome/services/file_util/safe_archive_analyzer.cc.nounrar
2021-08-31 21:39:29.000000000 -0400
+++ chromium-93.0.4577.63/chrome/services/file_util/safe_archive_analyzer.cc
2021-09-02 08:22:31.281927369 -0400
++++++ chromium-older-harfbuzz.patch ++++++
--- /var/tmp/diff_new_pack.eggcHG/_old 2021-10-30 23:14:09.451075788 +0200
+++ /var/tmp/diff_new_pack.eggcHG/_new 2021-10-30 23:14:09.455075792 +0200
@@ -1,26 +1,176 @@
-From: Fabian Vogt <fv...@suse.com>
-Subject: Fix build with harfbuzz < 2.9.0
+From 9e00e702633c47c590a869bc66b5c2ceec09da50 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dominik=20R=C3=B6ttsches?= <dr...@chromium.org>
+Date: Tue, 28 Sep 2021 15:31:50 +0000
+Subject: [PATCH] Roll src/third_party/harfbuzz-ng/src/ 6602cbb70..a52c6df38
+ (80 commits)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
-Index:
qtwebengine-everywhere-src-5.15.6/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc
-===================================================================
+Fixes an issue with subsetting of the DFKai font on Windows.
+
+https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git/+log/6602cbb7062b..a52c6df38a38
+
+$ git log 6602cbb70..a52c6df38 --date=short --no-merges --format='%ad %ae %s'
+2021-09-27 grieger [subset] Fix bug in composite operation counting.
+2021-09-24 grieger [repacker] fix bug in subgraph isolation.
+2021-09-23 behdad [getn-hb-version.py] Open old output in UTF-8 mode as well
+2021-09-22 grieger [repacker] s/0/HB_TAG_NONE
+2021-09-10 grieger [repacker] handle a couple of duplication edge cases.
+2021-09-09 grieger [repacker] reduce the bits used by order by 2 to give more
bits to distance.
+2021-09-09 grieger [repacker] add repacker isolation test on real font.
+2021-09-09 grieger [repacker] add a couple more complex isolation tests.
+2021-09-09 grieger [repacker] correctly update incoming_edges in duplicate.
+2021-09-08 grieger [repacker] default space to 0.
+2021-09-08 grieger [repacker] put each 32 bit subgraph into it's own packing
space.
+2021-09-08 grieger [repacker] Add repacker test for subgraph isolation.
+2021-09-08 grieger [repacker] recursively duplicate nodes during isolation.
+2021-09-08 grieger [repacker] do extension subtable isolation before starting
resolution attempts.
+2021-09-07 grieger [repacker] extract overflows processing into its own method.
+2021-09-07 grieger [repacker] begin implementing the ability to isolate
extension subtables.
+2021-09-07 grieger Add a debug message when offset overflow resolution fails.
+2021-07-30 bungeman [mutex] Add hb_mutex_t std::mutex implementation
+2021-09-22 behdad [atomic] Cannot fail anymore
+2021-09-20 qxliu [subset] subset MATH table
+2021-09-22 grieger [subset] Fix subset_offset_array adding unused space to
serializer.
+2021-09-12 qxliu [subset] fix find_duplicate_features
+2021-09-19 qxliu [subset] add closure_glyphs () method for MATH table
+2021-09-21 behdad [set-digest] Use using instead of typedef
+2021-09-20 simon Add support for Pwo Karen / Ason Chin medial la
+2021-09-20 behdad [khmer] Towards separating Khmer from Indic table
+2021-09-20 behdad [myanmar] Towards separating Myanmar from Indic table
+2021-09-20 khaled Make the file UTF-8 again
+2021-09-19 behdad Add stub HBUINT15
+2021-09-19 behdad Rename HBGlyphID to HBGlyphID16
+2021-09-17 grieger [repacker] fix heap use after free in repacker.
+2021-09-18 ActuallyaDeviloper Make the code able to compile with MSVC++ from
Visual Studio 2015 (Version 14.0.25431.01, Update 3) sucessfully again.
+2021-09-18 khaled [doc] Add missing version tags
+2021-09-17 khaled 3.0.0
+2021-09-17 behdad Centralize math include
+2021-09-15 khaled [ci] meson 0.55.0 didn???t work for harfbuzz
+2021-09-15 khaled [ci] Ragel subproject requires meson 0.55.0
+2021-09-15 khaled [ci] Build ragel on the Linux CI job
+2021-09-15 khaled [meson] Add ragel_subproject option
+2021-09-16 grieger [subset] restore hb_subset_input_unicode/glyph_set () to
documentation.
+2021-09-16 grieger [subset] In preperation for 3.0.0 release remove legacy
subsetting api methods.
+2021-09-15 nfeodonit CMake: Detect pthread with module FindThread
+2021-09-15 behdad [style] Change tag type to hb_style_tag_t
+2021-09-14 corbett.dav [USE] Send Khitan Small Script and Yezidi to USE
+2021-09-14 khaled [meson] Add ragel subproject
+2021-09-14 khaled [ragel] Regenerate state machine files with 6.10
+2021-09-14 khaled [meson] Require ragel 6.10
+2021-09-14 corbett.dav [Unicode 14] Update the Arabic joining script list
+2021-09-14 corbett.dav [Unicode 14] Add tests
+2021-09-14 corbett.dav [Unicode 14] Send all the new scripts to USE
+2021-09-14 corbett.dav [Unicode 14] Update the USE table
+2021-09-14 corbett.dav [Unicode 14] Update the emoji table
+2021-09-14 corbett.dav [Unicode 14] Update the vowel constraint table
+2021-09-14 corbett.dav [Unicode 14] Update the Indic table
+2021-09-14 corbett.dav [Unicode 14] Update the Arabic table
+2021-09-14 corbett.dav [Unicode 14] Update the script direction list
+2021-09-14 corbett.dav [Unicode 14] Update the UCD table
+2021-09-14 corbett.dav [Unicode 14] Add new `hb_script_t` values
+2021-09-14 behdad [util] Fix leak of an hb_font_t
+2021-09-14 behdad [util/shape-consumer] Simplify font tracking
+2021-09-14 behdad Add fallback atexit implementation using template descrutors
+2021-09-14 behdad [style] Fix another float conversion warning
+2021-09-14 behdad [ot-shape] Enabled two more features: 'Harf' and 'Buzz'
+2021-09-14 behdad Call atexit() via hb_atexit()
+2021-09-14 behdad [style] Fix float conversion warning
+2021-09-13 behdad [style] Change private slant tag
+2021-09-11 khaled [style] Try harder to fix MSVC build
+2021-09-11 khaled [style] Try to fix MSVC build
+2021-09-11 khaled [style] Fix documentation
+2021-09-11 khaled [style] Prepare for release
+2021-09-11 khaled Fix build with -Dexperimental_api=true
+2021-09-09 behdad [style] Add HB_STYLE_TAG_SLANT_RATIO
+2021-09-09 behdad [style] Rename HB_STYLE_TAG_SLANT to HB_STYLE_TAG_SLANT_ANGLE
+2021-09-09 behdad [style] Fall back to GPOS 'size' feature for optical size in
style API
+2021-09-02 qxliu [subset] fox for (Chain)ContextFormat3: subset lookupRecord
+2021-09-08 khaled [subset] Improve alignment of --help-all message
+2021-09-07 khaled [docs] Fix subset documentation
+2021-09-07 khaled [ci] Use different executer for win64 jobs
+2021-09-07 khaled Typo
+2021-09-07 khaled 2.9.1
+
+Created with:
+ roll-dep src/third_party/harfbuzz-ng/src
+R=ba...@chromium.org,beh...@chromium.org,bunge...@chromium.org,dr...@chromium.org,js...@chromium.org,ko...@chromium.org
+
+Fixed: 1252284
+Change-Id: Ie2ff99da5e41ca97b8881e1bd3e158881f4d5a8e
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3190252
+Commit-Queue: Dominik R??ttsches <dr...@chromium.org>
+Commit-Queue: Calder Kitagawa <ckitag...@chromium.org>
+Auto-Submit: Dominik R??ttsches <dr...@chromium.org>
+Reviewed-by: Calder Kitagawa <ckitag...@chromium.org>
+Reviewed-by: Anders Hartvoll Ruud <andr...@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#925776}
+---
+ DEPS | 2 +-
+ components/paint_preview/common/subset_font.cc | 2 +-
+ third_party/harfbuzz-ng/README.chromium | 8 ++++----
+ third_party/harfbuzz-ng/fuzz/hb_subset_fuzzer.cc | 6 +++---
+ 4 files changed, 9 insertions(+), 9 deletions(-)
+diff --git a/components/paint_preview/common/subset_font.cc
b/components/paint_preview/common/subset_font.cc
+index 45daea7b1529d..43a448ec10191 100644
--- a/components/paint_preview/common/subset_font.cc
+++ b/components/paint_preview/common/subset_font.cc
-@@ -71,11 +71,18 @@ sk_sp<SkData> SubsetFont(SkTypeface* typ
- hb_set_t* glyphs =
- hb_subset_input_glyph_set(input.get()); // Owned by |input|.
- usage.ForEach(base::BindRepeating(&AddGlyphs, base::Unretained(glyphs)));
-+#if HB_VERSION_ATLEAST(2,9,0)
- hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS);
+@@ -79,7 +79,11 @@
+ // Retain all variation information for OpenType variation fonts. See:
+ // https://docs.microsoft.com/en-us/typography/opentype/spec/otvaroverview
+ hb_set_t* skip_subset =
++#if HB_VERSION_ATLEAST(3,0,0)
++ hb_subset_input_set(input.get(), HB_SUBSET_SETS_NO_SUBSET_TABLE_TAG);
++#else
+ hb_subset_input_no_subset_tables_set(input.get()); // Owned by |input|.
++#endif
+ hb_set_add(skip_subset, HB_TAG('a', 'v', 'a', 'r'));
+ hb_set_add(skip_subset, HB_TAG('c', 'v', 'a', 'r'));
+ hb_set_add(skip_subset, HB_TAG('f', 'v', 'a', 'r'));
+diff --git a/third_party/harfbuzz-ng/README.chromium
b/third_party/harfbuzz-ng/README.chromium
+index 030fcb4154557..e1eddcd49ff0d 100644
+--- a/third_party/harfbuzz-ng/README.chromium
++++ b/third_party/harfbuzz-ng/README.chromium
+@@ -1,10 +1,10 @@
+ Name: harfbuzz-ng
+ Short Name: harfbuzz-ng
+ URL: http://harfbuzz.org
+-Version: 2.9.0-122
+-CPEPrefix: cpe:/a:harfbuzz_project:harfbuzz:2.9.0
+-Date: 20210907
+-Revision: 6602cbb7062bf92e6824ae6bc0e5d3aad4b85939
++Version: 3.0.0-33
++CPEPrefix: cpe:/a:harfbuzz_project:harfbuzz:3.0.0
++Date: 20210928
++Revision: a52c6df38a38c4e36ff991dfb4b7d92e48a44553
+ Security Critical: yes
+ License: MIT
+ License File: src/COPYING
+diff --git a/third_party/harfbuzz-ng/fuzz/hb_subset_fuzzer.cc
b/third_party/harfbuzz-ng/fuzz/hb_subset_fuzzer.cc
+index 7631ccf9eb07e..d0df26572e6a3 100644
+--- a/third_party/harfbuzz-ng/fuzz/hb_subset_fuzzer.cc
++++ b/third_party/harfbuzz-ng/fuzz/hb_subset_fuzzer.cc
+@@ -32,11 +32,23 @@ void TrySubset(hb_face_t* face,
+ hb_set_t* codepoints = hb_subset_input_unicode_set(input.get());
- HbScoped<hb_face_t> subset_face(hb_subset_or_fail(face.get(), input.get()));
- if (!subset_face)
- return nullptr;
+ if (!drop_layout) {
++#if HB_VERSION_ATLEAST(3,0,0)
++ hb_set_del(hb_subset_input_set(input.get(),
HB_SUBSET_SETS_DROP_TABLE_TAG),
++#else
+ hb_set_del(hb_subset_input_drop_tables_set(input.get()),
++#endif
+ HB_TAG('G', 'S', 'U', 'B'));
++#if HB_VERSION_ATLEAST(3,0,0)
++ hb_set_del(hb_subset_input_set(input.get(),
HB_SUBSET_SETS_DROP_TABLE_TAG),
++#else
+ hb_set_del(hb_subset_input_drop_tables_set(input.get()),
++#endif
+ HB_TAG('G', 'P', 'O', 'S'));
++#if HB_VERSION_ATLEAST(3,0,0)
++ hb_set_del(hb_subset_input_set(input.get(),
HB_SUBSET_SETS_DROP_TABLE_TAG),
+#else
-+ hb_subset_input_set_retain_gids(input.get(), true);
-+
-+ HbScoped<hb_face_t> subset_face(hb_subset(face.get(), input.get()));
+ hb_set_del(hb_subset_input_drop_tables_set(input.get()),
+#endif
-+
- HbScoped<hb_blob_t> subset_blob(hb_face_reference_blob(subset_face.get()));
- if (!subset_blob)
- return nullptr;
+ HB_TAG('G', 'D', 'E', 'F'));
+ }
