Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package chromium for openSUSE:Factory checked in at 2023-10-11 23:54:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chromium (Old) and /work/SRC/openSUSE:Factory/.chromium.new.1807 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chromium" Wed Oct 11 23:54:58 2023 rev:403 rq:1116803 version:118.0.5993.70 Changes: -------- --- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2023-10-08 12:23:54.426215433 +0200 +++ /work/SRC/openSUSE:Factory/.chromium.new.1807/chromium.changes 2023-10-12 11:38:26.373069113 +0200 @@ -1,0 +2,23 @@ +Tue Oct 10 20:18:54 UTC 2023 - Andreas Stieger <andreas.stie...@gmx.de> + +- Chromium 118.0.5993.70 (boo#1216111) + * CVE-2023-5218: Use after free in Site Isolation + * CVE-2023-5487: Inappropriate implementation in Fullscreen + * CVE-2023-5484: Inappropriate implementation in Navigation + * CVE-2023-5475: Inappropriate implementation in DevTools + * CVE-2023-5483: Inappropriate implementation in Intents + * CVE-2023-5481: Inappropriate implementation in Downloads + * CVE-2023-5476: Use after free in Blink History + * CVE-2023-5474: Heap buffer overflow in PDF + * CVE-2023-5479: Inappropriate implementation in Extensions API + * CVE-2023-5485: Inappropriate implementation in Autofill + * CVE-2023-5478: Inappropriate implementation in Autofill + * CVE-2023-5477: Inappropriate implementation in Installer + * CVE-2023-5486: Inappropriate implementation in Input + * CVE-2023-5473: Use after free in Cast +- Build with system freetype (again), and zstd +- add patches: + * chromium-118-system-freetype.patch + * chromium-117-system-zstd.patch + +------------------------------------------------------------------- Old: ---- chromium-118.0.5993.54.tar.xz New: ---- chromium-117-system-zstd.patch chromium-118-system-freetype.patch chromium-118.0.5993.70.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chromium.spec ++++++ --- /var/tmp/diff_new_pack.76V0bN/_old 2023-10-12 11:38:40.881598470 +0200 +++ /var/tmp/diff_new_pack.76V0bN/_new 2023-10-12 11:38:40.885598616 +0200 @@ -36,16 +36,20 @@ %endif %if 0%{?suse_version} >= 1599 %bcond_without system_harfbuzz +%bcond_without system_freetype %bcond_without arm_bti %bcond_without system_icu %bcond_without ffmpeg_51 %bcond_without qt6 +%bcond_without system_zstd %else %bcond_with system_harfbuzz +%bcond_with system_freetype %bcond_with arm_bti %bcond_with system_icu %bcond_with ffmpeg_51 %bcond_with qt6 +%bcond_with system_zstd %endif # LLVM version %define llvm_version 15 @@ -66,7 +70,6 @@ %bcond_without lto %bcond_without pipewire %bcond_without system_ffmpeg -%bcond_with system_freetype %bcond_without system_zlib %bcond_with system_vpx # FFmpeg version @@ -84,7 +87,7 @@ %define n_suffix %{nil} %endif Name: chromium%{n_suffix} -Version: 118.0.5993.54 +Version: 118.0.5993.70 Release: 0 Summary: Google's open source browser project License: BSD-3-Clause AND LGPL-2.1-or-later @@ -143,6 +146,8 @@ Patch240: chromium-117-string-convert.patch Patch241: chromium-117-lp155-typename.patch Patch242: chromium-118-includes.patch +Patch243: chromium-118-system-freetype.patch +Patch244: chromium-117-system-zstd.patch BuildRequires: (python3 >= 3.7 or python3-dataclasses) BuildRequires: (python3-importlib-metadata if python3-base < 3.8) BuildRequires: SDL-devel @@ -333,6 +338,9 @@ %if %{with system_webp} BuildRequires: pkgconfig(libwebp) >= 0.4.0 %endif +%if %{with system_zstd} +BuildRequires: pkgconfig(libzstd) = 1.5.5 +%endif %if %{with clang} %if 0%{?suse_version} < 1550 BuildRequires: clang%{llvm_version} @@ -635,7 +643,6 @@ third_party/xcbproto third_party/xnnpack third_party/zlib/google - third_party/zstd third_party/zxcvbn-cpp url/third_party/mozilla v8/src/third_party/siphash @@ -686,6 +693,9 @@ %if !%{with system_webp} keeplibs+=( third_party/libwebp ) %endif +%if !%{with system_zstd} +keeplibs+=( third_party/zstd ) +%endif build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove # GN sets lto on its own and we need just ldflag options, not cflags @@ -803,6 +813,9 @@ %if %{with system_webp} gn_system_libraries+=( libwebp ) %endif +%if %{with system_zstd} +gn_system_libraries+=( zstd ) +%endif build/linux/unbundle/replace_gn_files.py --system-libraries ${gn_system_libraries[@]} # Create the configuration for GN ++++++ README.SUSE ++++++ --- /var/tmp/diff_new_pack.76V0bN/_old 2023-10-12 11:38:40.933600367 +0200 +++ /var/tmp/diff_new_pack.76V0bN/_new 2023-10-12 11:38:40.937600513 +0200 @@ -6,4 +6,5 @@ Gentoo - https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files Fedora - https://src.fedoraproject.org/rpms/chromium/tree/rawhide Arch - https://github.com/archlinux/svntogit-packages/tree/packages/chromium/trunk +Arch: https://gitlab.com/Matt.Jolly/chromium-patches/ ++++++ chromium-117-system-zstd.patch ++++++ >From ae3ae3711784865bdc38bf119a6182a7b8dae91c Mon Sep 17 00:00:00 2001 From: Matt Jolly <Matt.Jolly@footclan.ninja> Date: Sun, 17 Sep 2023 16:51:42 +1000 Subject: [PATCH] Add system-zstd --- a/build/linux/unbundle/replace_gn_files.py +++ b/build/linux/unbundle/replace_gn_files.py @@ -74,6 +74,7 @@ REPLACEMENTS = { # 'woff2': 'third_party/woff2/BUILD.gn', 'zlib': 'third_party/zlib/BUILD.gn', + 'zstd': 'third_party/zstd/BUILD.gn', } --- /dev/null +++ b/build/linux/unbundle/zstd.gn @@ -0,0 +1,25 @@ +import("//build/config/linux/pkg_config.gni") +import("//build/shim_headers.gni") + +pkg_config("system_zstd") { + packages = [ "libzstd" ] +} + +shim_headers("zstd_shim") { + root_path = "src/lib" + headers = [ + "zdict.h", + "zstd.h", + "zstd_errors.h", + ] +} + +source_set("zstd") { + deps = [ ":zstd_shim" ] + public_configs = [ ":system_zstd" ] +} + +source_set("decompress") { + deps = [ ":zstd_shim" ] + public_configs = [ ":system_zstd" ] +} -- 2.42.0 ++++++ chromium-118-system-freetype.patch ++++++ https://github.com/chromium/chromium/commit/ed354d00aeda84693611b14baa56a287557a26b5 >From ed354d00aeda84693611b14baa56a287557a26b5 Mon Sep 17 00:00:00 2001 From: Munira Tursunova <moon...@google.com> Date: Tue, 12 Sep 2023 11:54:48 +0000 Subject: [PATCH] Add check for use_system_freetype when importing private freetype header MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In [0] the include of private freetype header was added, which caused build breakage when use_system_freetype=true, see [1]. This CL fixes the breakage by introducing USE_SYSTEM_FREETYPE build flag. [0] https://chromium-review.googlesource.com/c/chromium/src/+/4717485 [1] https://chromium-review.googlesource.com/c/chromium/src/+/4717485/comments/cdfca7b9_8e61b2e0 Bug: 1429581 Change-Id: I7f7de4cdb2dc46092a91a47d766bedb58ddccb7c Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4843428 Commit-Queue: Munira Tursunova <moon...@google.com> Reviewed-by: Dominik Röttsches <dr...@chromium.org> Reviewed-by: Rick Byers <rby...@chromium.org> Cr-Commit-Position: refs/heads/main@{#1195323} --- third_party/BUILD.gn | 6 ++++++ third_party/blink/renderer/platform/BUILD.gn | 1 + .../renderer/platform/fonts/simple_font_data.cc | 12 +++++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn index 7b086f95413ffd0..4ce797ebad72211 100644 --- a/third_party/BUILD.gn +++ b/third_party/BUILD.gn @@ -2,6 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//build/buildflag_header.gni") import("//build/config/features.gni") import("//build/config/freetype/freetype.gni") import("//third_party/harfbuzz-ng/harfbuzz.gni") @@ -65,3 +66,8 @@ component("freetype_harfbuzz") { public_deps += [ "//third_party/harfbuzz-ng:harfbuzz_source" ] } } + +buildflag_header("freetype_buildflags") { + header = "freetype_buildflags.h" + flags = [ "USE_SYSTEM_FREETYPE=$use_system_freetype" ] +} diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn index 591d2f939605b01..f6a2cd2168d1ee5 100644 --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn @@ -1717,6 +1717,7 @@ component("platform") { "//services/viz/public/cpp/gpu", "//skia", "//skia:skcms", + "//third_party:freetype_buildflags", "//third_party:freetype_harfbuzz", "//third_party/abseil-cpp:absl", "//third_party/blink/public:image_resources", diff --git a/third_party/blink/renderer/platform/fonts/simple_font_data.cc b/third_party/blink/renderer/platform/fonts/simple_font_data.cc index abe06f35c14a5e0..b2bfd88f0d85db5 100644 --- a/third_party/blink/renderer/platform/fonts/simple_font_data.cc +++ b/third_party/blink/renderer/platform/fonts/simple_font_data.cc @@ -48,7 +48,7 @@ #include "third_party/blink/renderer/platform/wtf/math_extras.h" #include "third_party/blink/renderer/platform/wtf/text/character_names.h" #include "third_party/blink/renderer/platform/wtf/text/unicode.h" -#include "third_party/freetype/src/src/autofit/afws-decl.h" +#include "third_party/freetype_buildflags.h" #include "third_party/skia/include/core/SkFontMetrics.h" #include "third_party/skia/include/core/SkPath.h" #include "third_party/skia/include/core/SkTypeface.h" @@ -57,12 +57,22 @@ #include "ui/gfx/geometry/skia_conversions.h" #include "v8/include/v8.h" +#if !BUILDFLAG(USE_SYSTEM_FREETYPE) +#include "third_party/freetype/src/src/autofit/afws-decl.h" +#endif + namespace blink { constexpr float kSmallCapsFontSizeMultiplier = 0.7f; constexpr float kEmphasisMarkFontSizeMultiplier = 0.5f; + +#if !BUILDFLAG(USE_SYSTEM_FREETYPE) constexpr int32_t kFontObjectsMemoryConsumption = std::max(sizeof(AF_LatinMetricsRec), sizeof(AF_CJKMetricsRec)); +#else +// sizeof(AF_LatinMetricsRec) = 2128 +constexpr int32_t kFontObjectsMemoryConsumption = 2128; +#endif SimpleFontData::SimpleFontData(const FontPlatformData& platform_data, scoped_refptr<CustomFontData> custom_data, ++++++ chromium-118.0.5993.54.tar.xz -> chromium-118.0.5993.70.tar.xz ++++++ /work/SRC/openSUSE:Factory/chromium/chromium-118.0.5993.54.tar.xz /work/SRC/openSUSE:Factory/.chromium.new.1807/chromium-118.0.5993.70.tar.xz differ: char 15, line 1