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-05-11 12:32:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chromium (Old)
and /work/SRC/openSUSE:Factory/.chromium.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chromium"
Thu May 11 12:32:56 2023 rev:380 rq:1086090 version:113.0.5672.92
Changes:
--------
--- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2023-04-21
14:16:46.750502511 +0200
+++ /work/SRC/openSUSE:Factory/.chromium.new.1533/chromium.changes
2023-05-11 12:33:59.062849975 +0200
@@ -1,0 +2,22 @@
+Tue May 9 19:14:20 UTC 2023 - Andreas Stieger <andreas.stie...@gmx.de>
+
+- Chromium 113.0.5672.92 (boo#1211211)
+- Multiple security fixes (boo#1211036):
+ * CVE-2023-2459: Inappropriate implementation in Prompts
+ * CVE-2023-2460: Insufficient validation of untrusted input in Extensions
+ * CVE-2023-2461: Use after free in OS Inputs
+ * CVE-2023-2462: Inappropriate implementation in Prompts
+ * CVE-2023-2463: Inappropriate implementation in Full Screen Mode
+ * CVE-2023-2464: Inappropriate implementation in PictureInPicture
+ * CVE-2023-2465: Inappropriate implementation in CORS
+ * CVE-2023-2466: Inappropriate implementation in Prompts
+ * CVE-2023-2467: Inappropriate implementation in Prompts
+ * CVE-2023-2468: Inappropriate implementation in PictureInPicture
+- drop chromium-94-sql-no-assert.patch
+- drop no-location-leap151.patch
+- add chromium-113-webview-namespace.patch
+- add chromium-113-webauth-include-variant.patch
+- add chromium-113-typename.patch
+- add chromium-113-workaround_clang_bug-structured_binding.patch
+
+-------------------------------------------------------------------
Old:
----
chromium-112.0.5615.165.tar.xz
chromium-94-sql-no-assert.patch
no-location-leap151.patch
New:
----
chromium-113-typename.patch
chromium-113-webauth-include-variant.patch
chromium-113-webview-namespace.patch
chromium-113-workaround_clang_bug-structured_binding.patch
chromium-113.0.5672.92.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ chromium.spec ++++++
--- /var/tmp/diff_new_pack.qv2mtS/_old 2023-05-11 12:34:06.794887975 +0200
+++ /var/tmp/diff_new_pack.qv2mtS/_new 2023-05-11 12:34:06.798887995 +0200
@@ -79,7 +79,7 @@
%define ffmpeg_version 58
%endif
Name: chromium
-Version: 112.0.5615.165
+Version: 113.0.5672.92
Release: 0
Summary: Google's open source browser project
License: BSD-3-Clause AND LGPL-2.1-or-later
@@ -107,8 +107,6 @@
Patch6: gcc-enable-lto.patch
# Do not use unrar code, it is non-free
Patch7: chromium-norar.patch
-# revert location on old GCC on 15.1, 15.2 gets it right tho
-Patch8: no-location-leap151.patch
Patch9: system-libdrm.patch
Patch10: chromium-disable-parallel-gold.patch
Patch11: chromium-lp151-old-drm.patch
@@ -118,7 +116,6 @@
Patch50: chromium-clang-nomerge.patch
Patch62: chromium-93-ffmpeg-4.4.patch
Patch63: chromium-ffmpeg-lp152.patch
-Patch65: chromium-94-sql-no-assert.patch
Patch68: chromium-94-ffmpeg-roll.patch
Patch87: chromium-98-gtk4-build.patch
Patch90: chromium-100-InMilliseconds-constexpr.patch
@@ -134,6 +131,10 @@
Patch210: chromium-110-system-libffi.patch
Patch211: gcc13-fix.patch
Patch213: chromium-112-default-comparison-operators.patch
+Patch214: chromium-113-webview-namespace.patch
+Patch215: chromium-113-webauth-include-variant.patch
+Patch216: chromium-113-typename.patch
+Patch217: chromium-113-workaround_clang_bug-structured_binding.patch
BuildRequires: SDL-devel
BuildRequires: bison
BuildRequires: cups-devel
@@ -613,7 +614,7 @@
third_party/x11proto
third_party/xcbproto
third_party/xnnpack
- third_party/zlib/google
+ third_party/zlib
third_party/zxcvbn-cpp
url/third_party/mozilla
v8/src/third_party/siphash
@@ -746,7 +747,7 @@
opus
re2
snappy
- zlib
+# zlib (broken since 113.0.5672.63)
)
%if %{with system_harfbuzz}
gn_system_libraries+=(
++++++ chromium-110-compiler.patch ++++++
--- /var/tmp/diff_new_pack.qv2mtS/_old 2023-05-11 12:34:06.886888427 +0200
+++ /var/tmp/diff_new_pack.qv2mtS/_new 2023-05-11 12:34:06.890888447 +0200
@@ -7,10 +7,10 @@
build/config/compiler/BUILD.gn | 134 +++++----------------------------
1 file changed, 17 insertions(+), 117 deletions(-)
-Index: chromium-112.0.5615.20/build/config/compiler/BUILD.gn
+Index: chromium-113.0.5672.53/build/config/compiler/BUILD.gn
===================================================================
---- chromium-112.0.5615.20.orig/build/config/compiler/BUILD.gn
-+++ chromium-112.0.5615.20/build/config/compiler/BUILD.gn
+--- chromium-113.0.5672.53.orig/build/config/compiler/BUILD.gn
++++ chromium-113.0.5672.53/build/config/compiler/BUILD.gn
@@ -289,9 +289,7 @@ config("compiler") {
configs += [
@@ -56,10 +56,10 @@
- }
- }
-
- # Rust compiler setup (for either clang or rustc).
- if (enable_rust) {
- defines += [ "RUST_ENABLED" ]
-@@ -1350,46 +1317,6 @@ config("compiler_deterministic") {
+ # C11/C++11 compiler flags setup.
+ # ---------------------------
+ if (is_linux || is_chromeos || is_android || (is_nacl && is_clang) ||
+@@ -1337,46 +1304,6 @@ config("compiler_deterministic") {
}
}
@@ -106,7 +106,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.
-@@ -1408,27 +1335,6 @@ config("compiler_deterministic") {
+@@ -1395,27 +1322,6 @@ config("compiler_deterministic") {
}
}
@@ -134,7 +134,7 @@
config("rustc_revision") {
if (rustc_revision != "") {
# Similar to the above config, this is here so that all files get
recompiled
-@@ -1718,7 +1624,7 @@ config("chromium_code") {
+@@ -1705,7 +1611,7 @@ config("chromium_code") {
defines = [ "_HAS_NODISCARD" ]
}
} else {
@@ -143,7 +143,7 @@
if (treat_warnings_as_errors) {
cflags += [ "-Werror" ]
-@@ -1727,10 +1633,6 @@ config("chromium_code") {
+@@ -1714,10 +1620,6 @@ config("chromium_code") {
# well.
ldflags = [ "-Werror" ]
}
@@ -152,9 +152,9 @@
- cflags += [ "-Wextra" ]
- }
- # In Chromium code, we define __STDC_foo_MACROS in order to get the
- # C99 macros on Mac and Linux.
-@@ -1739,16 +1641,6 @@ config("chromium_code") {
+ if (treat_warnings_as_errors) {
+ # Turn rustc warnings into the "deny" lint level, which produce compiler
+@@ -1735,16 +1637,6 @@ config("chromium_code") {
"__STDC_FORMAT_MACROS",
]
@@ -171,7 +171,7 @@
if (is_mac) {
cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
-@@ -2117,7 +2009,8 @@ config("default_stack_frames") {
+@@ -2113,7 +2005,8 @@ config("default_stack_frames") {
}
# Default "optimization on" config.
@@ -181,7 +181,7 @@
if (is_win) {
if (chrome_pgo_phase != 2) {
# Favor size over speed, /O1 must be before the common flags.
-@@ -2176,7 +2069,8 @@ config("optimize") {
+@@ -2172,7 +2065,8 @@ config("optimize") {
}
# Turn off optimizations.
@@ -191,7 +191,7 @@
if (is_win) {
cflags = [
"/Od", # Disable optimization.
-@@ -2216,7 +2110,8 @@ config("no_optimize") {
+@@ -2212,7 +2106,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.
@@ -201,7 +201,7 @@
if (is_nacl && is_nacl_irt) {
# The NaCl IRT is a special case and always wants its own config.
# Various components do:
-@@ -2249,7 +2144,8 @@ config("optimize_max") {
+@@ -2245,7 +2140,8 @@ config("optimize_max") {
#
# TODO(crbug.com/621335) - rework how all of these configs are related
# so that we don't need this disclaimer.
@@ -211,7 +211,7 @@
if (is_nacl && is_nacl_irt) {
# The NaCl IRT is a special case and always wants its own config.
# Various components do:
-@@ -2275,7 +2171,8 @@ config("optimize_speed") {
+@@ -2271,7 +2167,8 @@ config("optimize_speed") {
}
}
@@ -221,7 +221,7 @@
cflags = [ "-O1" ] + common_optimize_on_cflags
rustflags = [ "-Copt-level=1" ]
ldflags = common_optimize_on_ldflags
-@@ -2398,7 +2295,8 @@ config("win_pdbaltpath") {
+@@ -2396,7 +2293,8 @@ config("win_pdbaltpath") {
}
# Full symbols.
@@ -231,7 +231,7 @@
if (is_win) {
if (is_clang) {
cflags = [
-@@ -2538,7 +2436,8 @@ config("symbols") {
+@@ -2536,7 +2434,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.
@@ -241,7 +241,7 @@
if (is_win) {
# Functions, files, and line tables only.
cflags = []
-@@ -2612,7 +2511,8 @@ config("minimal_symbols") {
+@@ -2610,7 +2509,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.
++++++ chromium-113-typename.patch ++++++
diff -up
chromium-113.0.5672.63/chrome/browser/download/bubble/download_bubble_update_service.cc.me
chromium-113.0.5672.63/chrome/browser/download/bubble/download_bubble_update_service.cc
---
chromium-113.0.5672.63/chrome/browser/download/bubble/download_bubble_update_service.cc.me
2023-05-03 17:46:37.194000834 +0200
+++
chromium-113.0.5672.63/chrome/browser/download/bubble/download_bubble_update_service.cc
2023-05-03 17:48:05.170317575 +0200
@@ -87,7 +87,7 @@ ItemSortKey GetSortKey(const Item& item)
// Helper to get an iterator to the last element in the cache. The cache
// must not be empty.
template <typename Item>
-SortedItems<Item>::iterator GetLastIter(SortedItems<Item>& cache) {
+typename SortedItems<Item>::iterator GetLastIter(SortedItems<Item>& cache) {
CHECK(!cache.empty());
auto it = cache.end();
return std::prev(it);
@@ -789,9 +789,9 @@ bool DownloadBubbleUpdateService::Remove
}
template <typename Id, typename Item>
-SortedItems<Item>::iterator
+typename SortedItems<Item>::iterator
DownloadBubbleUpdateService::RemoveItemFromCacheByIter(
- SortedItems<Item>::iterator iter,
+ typename SortedItems<Item>::iterator iter,
SortedItems<Item>& cache,
IterMap<Id, Item>& iter_map) {
CHECK(iter != cache.end());
diff -up
chromium-113.0.5672.63/chrome/browser/download/bubble/download_bubble_update_service.h.me
chromium-113.0.5672.63/chrome/browser/download/bubble/download_bubble_update_service.h
---
chromium-113.0.5672.63/chrome/browser/download/bubble/download_bubble_update_service.h.me
2023-05-03 17:48:14.079551820 +0200
+++
chromium-113.0.5672.63/chrome/browser/download/bubble/download_bubble_update_service.h
2023-05-03 17:49:24.702387180 +0200
@@ -208,8 +208,8 @@ class DownloadBubbleUpdateService
// Removes item if we already have the iterator to it. Returns next iterator.
template <typename Id, typename Item>
- SortedItems<Item>::iterator RemoveItemFromCacheByIter(
- SortedItems<Item>::iterator iter,
+ typename SortedItems<Item>::iterator RemoveItemFromCacheByIter(
+ typename SortedItems<Item>::iterator iter,
SortedItems<Item>& cache,
IterMap<Id, Item>& iter_map);
++++++ chromium-113-webauth-include-variant.patch ++++++
diff --git a/authenticator_request_dialog_model.h
b/authenticator_request_dialog_model.h.new
index f4992a7..45cabe3 100644
--- a/chrome/browser/webauthn/authenticator_request_dialog_model.h
+++ b/chrome/browser/webauthn/authenticator_request_dialog_model.h
@@ -7,6 +7,7 @@
#include <memory>
#include <string>
+#include <variant>
#include <vector>
#include "base/containers/span.h"
++++++ chromium-113-webview-namespace.patch ++++++
diff --git a/web_view_impl.cc b/web_view_impl.cc.new
index f726627..c1d4d14 100644
--- a/chrome/test/chromedriver/chrome/web_view_impl.cc
+++ b/chrome/test/chromedriver/chrome/web_view_impl.cc
@@ -75,7 +75,7 @@ absl::optional<std::pair<std::string, int>> GetElementId(
if (element_id == nullptr) {
return absl::nullopt;
}
- static const size_t separator_length = std::strlen(kElementIdSeparator);
+ static const size_t separator_length = strlen(kElementIdSeparator);
const size_t separator_pos = element_id->rfind(
kElementIdSeparator, std::string::npos, separator_length);
if (separator_pos == std::string::npos) {
++++++ chromium-113-workaround_clang_bug-structured_binding.patch ++++++
diff -up
chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.me
chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
---
chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.me
2023-05-03 16:30:34.244612573 +0200
+++
chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
2023-05-03 16:37:36.732278590 +0200
@@ -516,8 +516,11 @@ wtf_size_t NGGridLayoutAlgorithm::BuildG
row_auto_repetitions);
bool has_nested_subgrid = false;
- auto& [grid_items, layout_data, subtree_size] =
- sizing_tree->CreateSizingData();
+
+ auto& workaround_clang_bug = sizing_tree->CreateSizingData();
+ auto& grid_items = workaround_clang_bug.grid_items;
+ auto& layout_data = workaround_clang_bug.layout_data;
+ auto& subtree_size = workaround_clang_bug.subtree_size;
if (!must_ignore_children) {
// Construct grid items that are not subgridded.
@@ -1540,8 +1543,10 @@ void NGGridLayoutAlgorithm::InitializeTr
NGGridSizingTree* sizing_tree) const {
DCHECK(sizing_tree && current_grid_index < sizing_tree->Size());
- auto& [grid_items, layout_data, subtree_size] =
- sizing_tree->At(current_grid_index);
+ auto& workaround_clang_bug = sizing_tree->At(current_grid_index);
+ auto& grid_items = workaround_clang_bug.grid_items;
+ auto& layout_data = workaround_clang_bug.layout_data;
+ auto& subtree_size = workaround_clang_bug.subtree_size;
auto InitAndCacheTrackSizes = [&](GridTrackSizingDirection track_direction) {
InitializeTrackCollection(opt_subgrid_data, track_direction, &layout_data);
++++++ chromium-112.0.5615.165.tar.xz -> chromium-113.0.5672.92.tar.xz ++++++
/work/SRC/openSUSE:Factory/chromium/chromium-112.0.5615.165.tar.xz
/work/SRC/openSUSE:Factory/.chromium.new.1533/chromium-113.0.5672.92.tar.xz
differ: char 15, line 1
++++++ chromium-disable-GlobalMediaControlsCastStartStop.patch ++++++
--- /var/tmp/diff_new_pack.qv2mtS/_old 2023-05-11 12:34:06.994888958 +0200
+++ /var/tmp/diff_new_pack.qv2mtS/_new 2023-05-11 12:34:06.998888978 +0200
@@ -1,14 +1,14 @@
-Index:
chromium-109.0.5414.46/chrome/browser/media/router/media_router_feature.cc
+Index:
chromium-113.0.5672.53/chrome/browser/media/router/media_router_feature.cc
===================================================================
----
chromium-109.0.5414.46.orig/chrome/browser/media/router/media_router_feature.cc
-+++ chromium-109.0.5414.46/chrome/browser/media/router/media_router_feature.cc
-@@ -55,7 +55,7 @@ BASE_FEATURE(kGlobalMediaControlsCastSta
+---
chromium-113.0.5672.53.orig/chrome/browser/media/router/media_router_feature.cc
++++ chromium-113.0.5672.53/chrome/browser/media/router/media_router_feature.cc
+@@ -68,7 +68,7 @@ BASE_FEATURE(kGlobalMediaControlsCastSta
#else
BASE_FEATURE(kGlobalMediaControlsCastStartStop,
"GlobalMediaControlsCastStartStop",
- base::FEATURE_ENABLED_BY_DEFAULT);
+ base::FEATURE_DISABLED_BY_DEFAULT);
#endif // BUILDFLAG(IS_CHROMEOS)
-
#endif // BUILDFLAG(IS_ANDROID)
+
++++++ chromium-norar.patch ++++++
--- /var/tmp/diff_new_pack.qv2mtS/_old 2023-05-11 12:34:07.022889096 +0200
+++ /var/tmp/diff_new_pack.qv2mtS/_new 2023-05-11 12:34:07.026889115 +0200
@@ -1,45 +1,26 @@
-Index: chromium-112.0.5615.20/chrome/common/safe_browsing/BUILD.gn
-===================================================================
---- chromium-112.0.5615.20.orig/chrome/common/safe_browsing/BUILD.gn
-+++ chromium-112.0.5615.20/chrome/common/safe_browsing/BUILD.gn
-@@ -58,25 +58,6 @@ if (safe_browsing_mode == 1) {
- public_deps = [ "//components/safe_browsing/core/common/proto:csd_proto" ]
- }
-
-- source_set("rar_analyzer") {
-- sources = [
+diff -up chromium-113.0.5672.24/chrome/common/safe_browsing/BUILD.gn.nounrar
chromium-113.0.5672.24/chrome/common/safe_browsing/BUILD.gn
+--- chromium-113.0.5672.24/chrome/common/safe_browsing/BUILD.gn.nounrar
2023-04-07 13:11:59.495927476 +0200
++++ chromium-113.0.5672.24/chrome/common/safe_browsing/BUILD.gn
2023-04-07 13:47:57.004758029 +0200
+@@ -143,8 +143,6 @@ source_set("safe_browsing") {
+ "protobuf_message_log_macros.h",
+ "protobuf_message_read_macros.h",
+ "protobuf_message_write_macros.h",
- "rar_analyzer.cc",
- "rar_analyzer.h",
-- ]
--
-- deps = [
-- ":archive_analyzer_results",
-- ":download_type_util",
-- "//base",
-- "//base:i18n",
-- "//components/safe_browsing/content/common:file_type_policies",
-- "//components/safe_browsing/core/common",
-- "//third_party/unrar:unrar",
-- ]
--
-- public_deps = [ "//components/safe_browsing/core/common/proto:csd_proto" ]
-- }
--
- if (is_linux || is_win) {
- source_set("document_analyzer") {
- sources = [
-@@ -172,7 +153,6 @@ source_set("safe_browsing") {
- ":archive_analyzer_results",
- ":binary_feature_extractor",
- ":download_type_util",
-- ":rar_analyzer",
+ "seven_zip_analyzer.cc",
+ "seven_zip_analyzer.h",
+ "zip_analyzer.cc",
+@@ -160,7 +158,6 @@ source_set("safe_browsing") {
+ "//components/safe_browsing/content/common:file_type_policies",
"//components/safe_browsing/core/common",
"//third_party/lzma_sdk/google:seven_zip_reader",
+- "//third_party/unrar:unrar",
]
-Index: chromium-112.0.5615.20/chrome/common/safe_browsing/DEPS
-===================================================================
---- chromium-112.0.5615.20.orig/chrome/common/safe_browsing/DEPS
-+++ chromium-112.0.5615.20/chrome/common/safe_browsing/DEPS
+
+ if (is_linux) {
+diff -up chromium-113.0.5672.24/chrome/common/safe_browsing/DEPS.nounrar
chromium-113.0.5672.24/chrome/common/safe_browsing/DEPS
+--- chromium-113.0.5672.24/chrome/common/safe_browsing/DEPS.nounrar
2023-04-04 20:41:26.000000000 +0200
++++ chromium-113.0.5672.24/chrome/common/safe_browsing/DEPS 2023-04-07
13:11:59.495927476 +0200
@@ -3,7 +3,6 @@ include_rules = [
"+components/safe_browsing/core/common",
"+third_party/maldoca",
@@ -48,37 +29,88 @@
"+third_party/zlib",
"+third_party/lzma_sdk/google",
]
-Index: chromium-112.0.5615.20/chrome/services/file_util/BUILD.gn
-===================================================================
---- chromium-112.0.5615.20.orig/chrome/services/file_util/BUILD.gn
-+++ chromium-112.0.5615.20/chrome/services/file_util/BUILD.gn
-@@ -60,7 +60,6 @@ source_set("file_util") {
- deps += [
- "//chrome/common/safe_browsing",
- "//chrome/common/safe_browsing:archive_analyzer_results",
-- "//chrome/common/safe_browsing:rar_analyzer",
- ]
-
- if (is_linux || is_win) {
-Index:
chromium-112.0.5615.20/chrome/services/file_util/safe_archive_analyzer.cc
-===================================================================
----
chromium-112.0.5615.20.orig/chrome/services/file_util/safe_archive_analyzer.cc
-+++ chromium-112.0.5615.20/chrome/services/file_util/safe_archive_analyzer.cc
-@@ -45,12 +45,16 @@ void SafeArchiveAnalyzer::AnalyzeDmgFile
- void SafeArchiveAnalyzer::AnalyzeRarFile(base::File rar_file,
- base::File temporary_file,
- AnalyzeRarFileCallback callback) {
+diff -up chromium-113.0.5672.24/chrome/services/file_util/BUILD.gn.nounrar
chromium-113.0.5672.24/chrome/services/file_util/BUILD.gn
+diff -up
chromium-113.0.5672.24/chrome/services/file_util/safe_archive_analyzer.cc.nounrar
chromium-113.0.5672.24/chrome/services/file_util/safe_archive_analyzer.cc
+---
chromium-113.0.5672.24/chrome/services/file_util/safe_archive_analyzer.cc.nounrar
2023-04-07 13:11:59.495927476 +0200
++++ chromium-113.0.5672.24/chrome/services/file_util/safe_archive_analyzer.cc
2023-04-07 13:52:52.998109006 +0200
+@@ -61,6 +61,7 @@ void SafeArchiveAnalyzer::AnalyzeRarFile
+ base::File rar_file,
+ mojo::PendingRemote<chrome::mojom::TemporaryFileGetter> temp_file_getter,
+ AnalyzeRarFileCallback callback) {
+#if 0
DCHECK(rar_file.IsValid());
-
- safe_browsing::ArchiveAnalyzerResults results;
- safe_browsing::rar_analyzer::AnalyzeRarFile(
- std::move(rar_file), std::move(temporary_file), &results);
- std::move(callback).Run(results);
+ temp_file_getter_.Bind(std::move(temp_file_getter));
+ callback_ = std::move(callback);
+@@ -76,6 +77,9 @@ void SafeArchiveAnalyzer::AnalyzeRarFile
+ rar_analyzer_.Init(std::move(rar_file), base::FilePath(),
+ std::move(analysis_finished_callback),
+ std::move(temp_file_getter_callback), &results_);
+#else
+ NOTREACHED();
+#endif
}
void SafeArchiveAnalyzer::AnalyzeSevenZipFile(
+diff -up chromium-113.0.5672.53/chrome/common/safe_browsing/zip_analyzer.cc.me
chromium-113.0.5672.53/chrome/common/safe_browsing/zip_analyzer.cc
+--- chromium-113.0.5672.53/chrome/common/safe_browsing/zip_analyzer.cc.me
2023-04-23 18:10:06.103858362 +0200
++++ chromium-113.0.5672.53/chrome/common/safe_browsing/zip_analyzer.cc
2023-04-23 18:12:05.428092347 +0200
+@@ -18,7 +18,7 @@
+ #include "base/time/time.h"
+ #include "build/build_config.h"
+ #include "chrome/common/safe_browsing/archive_analyzer_results.h"
+-#include "chrome/common/safe_browsing/rar_analyzer.h"
++//#include "chrome/common/safe_browsing/rar_analyzer.h"
+ #include "components/safe_browsing/content/common/file_type_policies.h"
+ #include "components/safe_browsing/core/common/features.h"
+ #include "components/safe_browsing/core/common/proto/csd.pb.h"
+@@ -132,14 +132,14 @@ bool ZipAnalyzer::AnalyzeNestedArchive(
+ std::move(nested_analysis_finished_callback),
+ get_temp_file_callback_, results_);
+ return true;
+- } else if (file_type == DownloadFileType::RAR) {
++ } /* else if (file_type == DownloadFileType::RAR) {
+ nested_rar_analyzer_ = std::make_unique<safe_browsing::RarAnalyzer>();
+ nested_rar_analyzer_->Init(temp_file_.Duplicate(),
+ root_zip_path_.Append(path),
+ std::move(nested_analysis_finished_callback),
+ get_temp_file_callback_, results_);
+ return true;
+- }
++ }*/
+ return false;
+ }
+
+diff -up chromium-113.0.5672.53/chrome/common/safe_browsing/zip_analyzer.h.me
chromium-113.0.5672.53/chrome/common/safe_browsing/zip_analyzer.h
+--- chromium-113.0.5672.53/chrome/common/safe_browsing/zip_analyzer.h.me
2023-04-23 18:12:11.316203496 +0200
++++ chromium-113.0.5672.53/chrome/common/safe_browsing/zip_analyzer.h
2023-04-23 18:12:26.827498082 +0200
+@@ -78,7 +78,7 @@ class ZipAnalyzer {
+ // DFS.
+ // TODO(crbug.com/1426164) Create a common class to hold all analyzers.
+ std::unique_ptr<safe_browsing::ZipAnalyzer> nested_zip_analyzer_;
+- std::unique_ptr<safe_browsing::RarAnalyzer> nested_rar_analyzer_;
++// std::unique_ptr<safe_browsing::RarAnalyzer> nested_rar_analyzer_;
+
+ base::WeakPtrFactory<ZipAnalyzer> weak_factory_{this};
+ };
+diff -up
chromium-113.0.5672.53/chrome/services/file_util/safe_archive_analyzer.h.me
chromium-113.0.5672.53/chrome/services/file_util/safe_archive_analyzer.h
+---
chromium-113.0.5672.53/chrome/services/file_util/safe_archive_analyzer.h.me
2023-04-23 18:06:26.476791520 +0200
++++ chromium-113.0.5672.53/chrome/services/file_util/safe_archive_analyzer.h
2023-04-23 18:08:58.594606171 +0200
+@@ -6,7 +6,7 @@
+ #define CHROME_SERVICES_FILE_UTIL_SAFE_ARCHIVE_ANALYZER_H_
+
+ #include "chrome/common/safe_browsing/archive_analyzer_results.h"
+-#include "chrome/common/safe_browsing/rar_analyzer.h"
++//#include "chrome/common/safe_browsing/rar_analyzer.h"
+ #include
"chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom.h"
+ #include "mojo/public/cpp/bindings/remote.h"
+
+@@ -59,7 +59,7 @@ class SafeArchiveAnalyzer : public chrom
+ void Timeout();
+
+ safe_browsing::ZipAnalyzer zip_analyzer_;
+- safe_browsing::RarAnalyzer rar_analyzer_;
++// safe_browsing::RarAnalyzer rar_analyzer_;
+
+ // A timer to ensure no archive takes too long to unpack.
+ base::OneShotTimer timeout_timer_;
++++++ gcc13-fix.patch ++++++
++++ 691 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/chromium/gcc13-fix.patch
++++ and /work/SRC/openSUSE:Factory/.chromium.new.1533/gcc13-fix.patch
