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-06-05 18:06:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chromium (Old) and /work/SRC/openSUSE:Factory/.chromium.new.15902 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chromium" Mon Jun 5 18:06:20 2023 rev:383 rq:1090770 version:114.0.5735.90 Changes: -------- --- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2023-06-04 00:13:38.393906104 +0200 +++ /work/SRC/openSUSE:Factory/.chromium.new.15902/chromium.changes 2023-06-05 18:06:43.603175832 +0200 @@ -1,0 +2,29 @@ +Sun Jun 4 18:52:01 UTC 2023 - Callum Farmer <gm...@opensuse.org> + +- Chromium 114.0.5735.90 (boo#1211843): + * CSS text-wrap: balance is available + * Cookies partitioned by top level site (CHIPS) + * New Popover API +- Security fixes: + * CVE-2023-2929: Out of bounds write in Swiftshader + * CVE-2023-2930: Use after free in Extensions + * CVE-2023-2931: Use after free in PDF + * CVE-2023-2932: Use after free in PDF + * CVE-2023-2933: Use after free in PDF + * CVE-2023-2934: Out of bounds memory access in Mojo + * CVE-2023-2935: Type Confusion in V8 + * CVE-2023-2936: Type Confusion in V8 + * CVE-2023-2937: Inappropriate implementation in Picture In Picture + * CVE-2023-2938: Inappropriate implementation in Picture In Picture + * CVE-2023-2939: Insufficient data validation in Installer + * CVE-2023-2940: Inappropriate implementation in Downloads + * CVE-2023-2941: Inappropriate implementation in Extensions API +- Drop patches: + * chromium-103-VirtualCursor-std-layout.patch + * chromium-113-system-zlib.patch + * chromium-113-workaround_clang_bug-structured_binding.patch +- Add patches + * chromium-114-workaround_clang_bug-structured_binding.patch + * chromium-114-lld-argument.patch + +------------------------------------------------------------------- Old: ---- chromium-103-VirtualCursor-std-layout.patch chromium-113-system-zlib.patch chromium-113-workaround_clang_bug-structured_binding.patch chromium-113.0.5672.126.tar.xz New: ---- chromium-114-lld-argument.patch chromium-114-workaround_clang_bug-structured_binding.patch chromium-114.0.5735.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chromium.spec ++++++ --- /var/tmp/diff_new_pack.UDJT2W/_old 2023-06-05 18:06:51.487222392 +0200 +++ /var/tmp/diff_new_pack.UDJT2W/_new 2023-06-05 18:06:51.491222415 +0200 @@ -20,6 +20,7 @@ %define rname chromium %define outputdir out +%bcond_with is_beta # CHANNEL SWITCH # bsc#1108175 %define __provides_exclude ^lib.*\\.so.*$ %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400 @@ -66,8 +67,16 @@ %else %define ffmpeg_version 58 %endif -Name: chromium -Version: 113.0.5672.126 +# Package names +%if %{with is_beta} +%define chromedriver_name %{name}-chromedriver +%define n_suffix -beta +%else +%define chromedriver_name chromedriver +%define n_suffix %{nil} +%endif +Name: chromium%{n_suffix} +Version: 114.0.5735.90 Release: 0 Summary: Google's open source browser project License: BSD-3-Clause AND LGPL-2.1-or-later @@ -105,7 +114,6 @@ Patch87: chromium-98-gtk4-build.patch Patch90: chromium-100-InMilliseconds-constexpr.patch Patch98: chromium-102-regex_pattern-array.patch -Patch103: chromium-103-VirtualCursor-std-layout.patch Patch201: chromium-86-fix-vaapi-on-intel.patch # PATCH-FIX-SUSE: allow prop codecs to be set with chromium branding Patch202: chromium-prop-codecs.patch @@ -117,8 +125,8 @@ 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 -Patch218: chromium-113-system-zlib.patch +Patch217: chromium-114-workaround_clang_bug-structured_binding.patch +Patch218: chromium-114-lld-argument.patch BuildRequires: SDL-devel BuildRequires: bison BuildRequires: cups-devel @@ -178,6 +186,7 @@ BuildRequires: pkgconfig(libdc1394-2) BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libelf) +BuildRequires: pkgconfig(libevdev) BuildRequires: pkgconfig(libevent) BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(libffi) @@ -325,12 +334,16 @@ %description Chromium is the open-source project behind Google Chrome. We invite you to join us in our effort to help build a safer, faster, and more stable way for all Internet users to experience the web, and to create a powerful platform for developing a new generation of web applications. -%package -n chromedriver +%package -n %{chromedriver_name} Summary: WebDriver for Google Chrome/Chromium License: BSD-3-Clause Requires: %{name} = %{version} +%if %{with is_beta} +Provides: chromedriver = %{version}-%{release} +Conflicts: chromedriver +%endif -%description -n chromedriver +%description -n %{chromedriver_name} 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 @@ -581,7 +594,6 @@ third_party/utf third_party/vulkan third_party/wayland - third_party/web-animations-js third_party/webdriver third_party/webgpu-cts third_party/webrtc @@ -804,6 +816,7 @@ myconf_gn+=" rtc_use_h264=false" myconf_gn+=" use_v8_context_snapshot=true" myconf_gn+=" v8_use_external_startup_data=true" +myconf_gn+=" enable_rust=false" %if %{with gtk4} myconf_gn+=" gtk_version=4" %endif @@ -912,7 +925,7 @@ %{_bindir}/chromium %{_mandir}/man1/chromium-browser.1%{?ext_man} -%files -n chromedriver +%files -n %{chromedriver_name} %{_libdir}/chromium/chromedriver %{_bindir}/chromedriver ++++++ chromium-110-compiler.patch ++++++ --- /var/tmp/diff_new_pack.UDJT2W/_old 2023-06-05 18:06:51.555222794 +0200 +++ /var/tmp/diff_new_pack.UDJT2W/_new 2023-06-05 18:06:51.559222818 +0200 @@ -7,10 +7,10 @@ build/config/compiler/BUILD.gn | 134 +++++---------------------------- 1 file changed, 17 insertions(+), 117 deletions(-) -Index: chromium-113.0.5672.53/build/config/compiler/BUILD.gn +Index: chromium-114.0.5735.90/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 +--- chromium-114.0.5735.90.orig/build/config/compiler/BUILD.gn ++++ chromium-114.0.5735.90/build/config/compiler/BUILD.gn @@ -289,9 +289,7 @@ config("compiler") { configs += [ @@ -59,7 +59,7 @@ # C11/C++11 compiler flags setup. # --------------------------- if (is_linux || is_chromeos || is_android || (is_nacl && is_clang) || -@@ -1337,46 +1304,6 @@ config("compiler_deterministic") { +@@ -1346,46 +1313,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. -@@ -1395,27 +1322,6 @@ config("compiler_deterministic") { +@@ -1404,27 +1331,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 -@@ -1705,7 +1611,7 @@ config("chromium_code") { +@@ -1714,7 +1620,7 @@ config("chromium_code") { defines = [ "_HAS_NODISCARD" ] } } else { @@ -143,7 +143,7 @@ if (treat_warnings_as_errors) { cflags += [ "-Werror" ] -@@ -1714,10 +1620,6 @@ config("chromium_code") { +@@ -1723,10 +1629,6 @@ config("chromium_code") { # well. ldflags = [ "-Werror" ] } @@ -154,7 +154,7 @@ if (treat_warnings_as_errors) { # Turn rustc warnings into the "deny" lint level, which produce compiler -@@ -1735,16 +1637,6 @@ config("chromium_code") { +@@ -1744,16 +1646,6 @@ config("chromium_code") { "__STDC_FORMAT_MACROS", ] @@ -168,10 +168,10 @@ - defines += [ "_FORTIFY_SOURCE=2" ] - } - - if (is_mac) { - cflags_objc = [ "-Wobjc-missing-property-synthesis" ] - cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] -@@ -2113,7 +2005,8 @@ config("default_stack_frames") { + if (is_apple) { + cflags_objc = [ "-Wimplicit-retain-self" ] + cflags_objcc = [ "-Wimplicit-retain-self" ] +@@ -2122,7 +2014,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. -@@ -2172,7 +2065,8 @@ config("optimize") { +@@ -2181,7 +2074,8 @@ config("optimize") { } # Turn off optimizations. @@ -191,7 +191,7 @@ if (is_win) { cflags = [ "/Od", # Disable optimization. -@@ -2212,7 +2106,8 @@ config("no_optimize") { +@@ -2221,7 +2115,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: -@@ -2245,7 +2140,8 @@ config("optimize_max") { +@@ -2254,7 +2149,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: -@@ -2271,7 +2167,8 @@ config("optimize_speed") { +@@ -2280,7 +2176,8 @@ config("optimize_speed") { } } @@ -221,17 +221,17 @@ cflags = [ "-O1" ] + common_optimize_on_cflags rustflags = [ "-Copt-level=1" ] ldflags = common_optimize_on_ldflags -@@ -2396,7 +2293,8 @@ config("win_pdbaltpath") { +@@ -2405,7 +2302,8 @@ config("win_pdbaltpath") { } # Full symbols. -config("symbols") { +config("symbols") { } +config("xsymbols") { + rustflags = [] if (is_win) { if (is_clang) { - cflags = [ -@@ -2536,7 +2434,8 @@ config("symbols") { +@@ -2548,7 +2446,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 = [] -@@ -2610,7 +2509,8 @@ config("minimal_symbols") { +@@ -2622,7 +2521,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 ++++++ --- /var/tmp/diff_new_pack.UDJT2W/_old 2023-06-05 18:06:51.571222888 +0200 +++ /var/tmp/diff_new_pack.UDJT2W/_new 2023-06-05 18:06:51.571222888 +0200 @@ -36,4 +36,30 @@ SortedItems<Item>& cache, IterMap<Id, Item>& iter_map); +diff --git a/print_backend_service_manager.h b/print_backend_service_manager.h.new +index d812f3b..3352148 100644 +--- a/chrome/browser/printing/print_backend_service_manager.h ++++ b/chrome/browser/printing/print_backend_service_manager.h +@@ -587,7 +587,7 @@ class PrintBackendServiceManager { + template <class... T> + void RunSavedCallbacks(RemoteSavedCallbacks<T...>& saved_callbacks, + const RemoteId& remote_id, +- std::remove_reference<T>::type... result); ++ typename std::remove_reference<T>::type... result); + + // Test support for client ID management. + static void SetClientsForTesting( +diff --git a/print_backend_service_manager.cc b/print_backend_service_manager.cc.new +index b5a4b52..224369c 100644 +--- a/chrome/browser/printing/print_backend_service_manager.cc ++++ b/chrome/browser/printing/print_backend_service_manager.cc +@@ -1477,7 +1477,7 @@ template <class... T> + void PrintBackendServiceManager::RunSavedCallbacks( + RemoteSavedCallbacks<T...>& saved_callbacks, + const RemoteId& remote_id, +- std::remove_reference<T>::type... result) { ++ typename std::remove_reference<T>::type... result) { + auto found_callbacks_map = saved_callbacks.find(remote_id); + if (found_callbacks_map == saved_callbacks.end()) + return; // No callbacks to run. ++++++ chromium-113-webauth-include-variant.patch ++++++ --- /var/tmp/diff_new_pack.UDJT2W/_old 2023-06-05 18:06:51.579222935 +0200 +++ /var/tmp/diff_new_pack.UDJT2W/_new 2023-06-05 18:06:51.583222959 +0200 @@ -1,13 +1,13 @@ -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 +Index: chromium-114.0.5735.90/chrome/browser/webauthn/authenticator_request_dialog_model.h +=================================================================== +--- chromium-114.0.5735.90.orig/chrome/browser/webauthn/authenticator_request_dialog_model.h ++++ chromium-114.0.5735.90/chrome/browser/webauthn/authenticator_request_dialog_model.h @@ -7,6 +7,7 @@ #include <memory> #include <string> +#include <variant> #include <vector> + #include <variant> - #include "base/containers/span.h" ++++++ chromium-114-lld-argument.patch ++++++ diff --git a/BUILD.gn b/BUILD.gn.new index 28c2255..7f89fe6 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn @@ -727,13 +727,6 @@ config("compiler") { ldflags += [ "-Wl,-mllvm,-import-instr-limit=$import_instr_limit" ] - if (!is_chromeos) { - # TODO(https://crbug.com/972449): turn on for ChromeOS when that - # toolchain has this flag. - # We only use one version of LLVM within a build so there's no need to - # upgrade debug info, which can be expensive since it runs the verifier. - ldflags += [ "-Wl,-mllvm,-disable-auto-upgrade-debug-info" ] - } } # TODO(https://crbug.com/1211155): investigate why this isn't effective on ++++++ chromium-113-workaround_clang_bug-structured_binding.patch -> chromium-114-workaround_clang_bug-structured_binding.patch ++++++ --- /work/SRC/openSUSE:Factory/chromium/chromium-113-workaround_clang_bug-structured_binding.patch 2023-05-11 12:33:33.514724414 +0200 +++ /work/SRC/openSUSE:Factory/.chromium.new.15902/chromium-114-workaround_clang_bug-structured_binding.patch 2023-06-05 18:06:25.291067689 +0200 @@ -1,30 +1,81 @@ -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 +diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc +--- chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding 2023-05-11 03:36:27.000000000 +0200 ++++ chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc 2023-05-14 11:49:42.558129164 +0200 +@@ -238,7 +238,10 @@ const NGLayoutResult* NGGridLayoutAlgori + : BuildGridSizingTree(&oof_children); + + LayoutUnit intrinsic_block_size; +- auto& [grid_items, layout_data, tree_size] = grid_sizing_tree.TreeRootData(); ++ auto& [g_i, l_d, t_s] = grid_sizing_tree.TreeRootData(); ++ auto& grid_items = g_i; ++ auto& layout_data = l_d; ++ auto& tree_size = t_s; + + if (IsBreakInside(BreakToken())) { + // TODO(layout-dev): When we support variable inline-size fragments we'll +@@ -520,8 +523,10 @@ 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; +- sizing_tree->CreateSizingData(opt_subgrid_data); ++ auto& [g_i, l_d, s_s] = sizing_tree->CreateSizingData(opt_subgrid_data); ++ auto& grid_items = g_i; ++ auto& layout_data = l_d; ++ auto& subtree_size = s_s; 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()); +@@ -650,8 +655,10 @@ NGGridSizingTree NGGridLayoutAlgorithm:: + NGGridSizingTree sizing_tree; + + if (const auto* layout_subtree = ConstraintSpace().GridLayoutSubtree()) { +- auto& [grid_items, layout_data, subtree_size] = +- sizing_tree.CreateSizingData(); ++ auto& [g_i, l_d, s_s] = sizing_tree.CreateSizingData(); ++ auto& grid_items = g_i; ++ auto& layout_data = l_d; ++ auto& subtree_size = s_s; + + const auto& node = Node(); + grid_items = +@@ -1640,8 +1647,10 @@ void NGGridLayoutAlgorithm::InitializeTr + const absl::optional<GridTrackSizingDirection>& opt_track_direction) const { + DCHECK(sizing_subtree); - 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; +- sizing_subtree.SubtreeRootData(); ++ auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData(); ++ auto& grid_items = g_i; ++ auto& layout_data = l_d; ++ auto& subtree_size = s_s; auto InitAndCacheTrackSizes = [&](GridTrackSizingDirection track_direction) { InitializeTrackCollection(opt_subgrid_data, track_direction, &layout_data); +@@ -1825,8 +1834,10 @@ void NGGridLayoutAlgorithm::CompleteTrac + bool* opt_needs_additional_pass) const { + DCHECK(sizing_subtree); + +- auto& [grid_items, layout_data, subtree_size] = +- sizing_subtree.SubtreeRootData(); ++ auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData(); ++ auto& grid_items = g_i; ++ auto& layout_data = l_d; ++ auto& subtree_size = s_s; + + const bool is_for_columns = track_direction == kForColumns; + const bool has_non_definite_track = +diff -up chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc +--- chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me 2023-05-14 17:35:00.446844465 +0200 ++++ chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc 2023-05-14 17:39:22.991733926 +0200 +@@ -94,7 +94,9 @@ void CdmPromiseAdapter::RejectPromise(ui + void CdmPromiseAdapter::Clear(ClearReason reason) { + // Reject all outstanding promises. + DCHECK(thread_checker_.CalledOnValidThread()); +- for (auto& [promise_id, promise] : promises_) { ++ for (auto& [p_i, p_e] : promises_) { ++ auto& promise_id = p_i; ++ auto& promise = p_e; + TRACE_EVENT_NESTABLE_ASYNC_END1( + "media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id), + "status", "cleared"); ++++++ chromium-113.0.5672.126.tar.xz -> chromium-114.0.5735.90.tar.xz ++++++ /work/SRC/openSUSE:Factory/chromium/chromium-113.0.5672.126.tar.xz /work/SRC/openSUSE:Factory/.chromium.new.15902/chromium-114.0.5735.90.tar.xz differ: char 15, line 1 ++++++ chromium-norar.patch ++++++ --- /var/tmp/diff_new_pack.UDJT2W/_old 2023-06-05 18:06:51.647223337 +0200 +++ /var/tmp/diff_new_pack.UDJT2W/_new 2023-06-05 18:06:51.651223361 +0200 @@ -1,7 +1,41 @@ -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") { +diff -up chromium-114.0.5735.35/chrome/browser/safe_browsing/download_protection/file_analyzer.cc.nounrar chromium-114.0.5735.35/chrome/browser/safe_browsing/download_protection/file_analyzer.cc +--- chromium-114.0.5735.35/chrome/browser/safe_browsing/download_protection/file_analyzer.cc.nounrar 2023-05-18 00:37:47.000000000 +0200 ++++ chromium-114.0.5735.35/chrome/browser/safe_browsing/download_protection/file_analyzer.cc 2023-05-21 18:12:30.368425080 +0200 +@@ -77,8 +77,6 @@ void FileAnalyzer::Start(const base::Fil + + if (inspection_type == DownloadFileType::ZIP) { + StartExtractZipFeatures(); +- } else if (inspection_type == DownloadFileType::RAR) { +- StartExtractRarFeatures(); + #if BUILDFLAG(IS_MAC) + } else if (inspection_type == DownloadFileType::DMG) { + StartExtractDmgFeatures(); +diff -up chromium-114.0.5735.35/chrome/common/safe_browsing/archive_analyzer.cc.nounrar chromium-114.0.5735.35/chrome/common/safe_browsing/archive_analyzer.cc +--- chromium-114.0.5735.35/chrome/common/safe_browsing/archive_analyzer.cc.nounrar 2023-05-18 00:37:48.000000000 +0200 ++++ chromium-114.0.5735.35/chrome/common/safe_browsing/archive_analyzer.cc 2023-05-21 18:11:14.870058635 +0200 +@@ -8,7 +8,6 @@ + #include "build/build_config.h" + #include "build/buildflag.h" + #include "chrome/common/safe_browsing/archive_analyzer_results.h" +-#include "chrome/common/safe_browsing/rar_analyzer.h" + #include "chrome/common/safe_browsing/seven_zip_analyzer.h" + #include "chrome/common/safe_browsing/zip_analyzer.h" + #include "components/safe_browsing/content/common/proto/download_file_types.pb.h" +@@ -23,9 +22,7 @@ namespace safe_browsing { + // static + std::unique_ptr<ArchiveAnalyzer> ArchiveAnalyzer::CreateForArchiveType( + DownloadFileType_InspectionType file_type) { +- if (file_type == DownloadFileType::RAR) { +- return std::make_unique<RarAnalyzer>(); +- } else if (file_type == DownloadFileType::ZIP) { ++ if (file_type == DownloadFileType::ZIP) { + return std::make_unique<ZipAnalyzer>(); + } else if (file_type == DownloadFileType::SEVEN_ZIP) { + return std::make_unique<SevenZipAnalyzer>(); +diff -up chromium-114.0.5735.35/chrome/common/safe_browsing/BUILD.gn.nounrar chromium-114.0.5735.35/chrome/common/safe_browsing/BUILD.gn +--- chromium-114.0.5735.35/chrome/common/safe_browsing/BUILD.gn.nounrar 2023-05-18 00:37:48.000000000 +0200 ++++ chromium-114.0.5735.35/chrome/common/safe_browsing/BUILD.gn 2023-05-21 18:11:14.869058617 +0200 +@@ -145,8 +145,6 @@ source_set("safe_browsing") { "protobuf_message_log_macros.h", "protobuf_message_read_macros.h", "protobuf_message_write_macros.h", @@ -10,7 +44,7 @@ "seven_zip_analyzer.cc", "seven_zip_analyzer.h", "zip_analyzer.cc", -@@ -160,7 +158,6 @@ source_set("safe_browsing") { +@@ -162,7 +160,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", @@ -18,22 +52,21 @@ ] 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", - "+third_party/protobuf", -- "+third_party/unrar", - "+third_party/zlib", - "+third_party/lzma_sdk/google", - ] -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 +diff -up chromium-114.0.5735.35/chrome/common/safe_browsing/zip_analyzer.cc.nounrar chromium-114.0.5735.35/chrome/common/safe_browsing/zip_analyzer.cc +--- chromium-114.0.5735.35/chrome/common/safe_browsing/zip_analyzer.cc.nounrar 2023-05-18 00:37:48.000000000 +0200 ++++ chromium-114.0.5735.35/chrome/common/safe_browsing/zip_analyzer.cc 2023-05-21 18:11:14.869058617 +0200 +@@ -18,7 +18,6 @@ + #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 "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" +diff -up chromium-114.0.5735.35/chrome/services/file_util/safe_archive_analyzer.cc.nounrar chromium-114.0.5735.35/chrome/services/file_util/safe_archive_analyzer.cc +--- chromium-114.0.5735.35/chrome/services/file_util/safe_archive_analyzer.cc.nounrar 2023-05-18 00:37:48.000000000 +0200 ++++ chromium-114.0.5735.35/chrome/services/file_util/safe_archive_analyzer.cc 2023-05-21 18:11:14.870058635 +0200 +@@ -71,6 +71,7 @@ void SafeArchiveAnalyzer::AnalyzeRarFile base::File rar_file, mojo::PendingRemote<chrome::mojom::TemporaryFileGetter> temp_file_getter, AnalyzeRarFileCallback callback) { @@ -41,76 +74,33 @@ DCHECK(rar_file.IsValid()); 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_); +@@ -86,6 +87,9 @@ void SafeArchiveAnalyzer::AnalyzeRarFile + rar_analyzer_.Analyze(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 @@ +diff -up chromium-114.0.5735.35/chrome/services/file_util/safe_archive_analyzer.h.nounrar chromium-114.0.5735.35/chrome/services/file_util/safe_archive_analyzer.h +--- chromium-114.0.5735.35/chrome/services/file_util/safe_archive_analyzer.h.nounrar 2023-05-18 00:37:48.000000000 +0200 ++++ chromium-114.0.5735.35/chrome/services/file_util/safe_archive_analyzer.h 2023-05-21 18:11:14.870058635 +0200 +@@ -6,7 +6,6 @@ #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/common/safe_browsing/seven_zip_analyzer.h" + #include "chrome/common/safe_browsing/zip_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 +@@ -63,7 +62,6 @@ 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_; + safe_browsing::SevenZipAnalyzer seven_zip_analyzer_; + #if BUILDFLAG(IS_MAC) + safe_browsing::dmg::DMGAnalyzer dmg_analyzer_; ++++++ gcc13-fix.patch ++++++ ++++ 816 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/chromium/gcc13-fix.patch ++++ and /work/SRC/openSUSE:Factory/.chromium.new.15902/gcc13-fix.patch ++++++ system-libdrm.patch ++++++ --- /var/tmp/diff_new_pack.UDJT2W/_old 2023-06-05 18:06:51.715223739 +0200 +++ /var/tmp/diff_new_pack.UDJT2W/_new 2023-06-05 18:06:51.719223762 +0200 @@ -1,7 +1,7 @@ -Index: chromium-109.0.5414.46/build/linux/unbundle/libdrm.gn +Index: chromium-114.0.5735.90/build/linux/unbundle/libdrm.gn =================================================================== ---- chromium-109.0.5414.46.orig/build/linux/unbundle/libdrm.gn -+++ chromium-109.0.5414.46/build/linux/unbundle/libdrm.gn +--- chromium-114.0.5735.90.orig/build/linux/unbundle/libdrm.gn ++++ chromium-114.0.5735.90/build/linux/unbundle/libdrm.gn @@ -11,7 +11,10 @@ pkg_config("system_libdrm") { shim_headers("libdrm_shim") { @@ -14,10 +14,10 @@ } source_set("libdrm") { -Index: chromium-109.0.5414.46/ui/ozone/platform/drm/gpu/hardware_display_controller.cc +Index: chromium-114.0.5735.90/ui/ozone/platform/drm/gpu/hardware_display_controller.cc =================================================================== ---- chromium-109.0.5414.46.orig/ui/ozone/platform/drm/gpu/hardware_display_controller.cc -+++ chromium-109.0.5414.46/ui/ozone/platform/drm/gpu/hardware_display_controller.cc +--- chromium-114.0.5735.90.orig/ui/ozone/platform/drm/gpu/hardware_display_controller.cc ++++ chromium-114.0.5735.90/ui/ozone/platform/drm/gpu/hardware_display_controller.cc @@ -18,7 +18,7 @@ #include "base/metrics/histogram_macros.h" #include "base/ranges/algorithm.h" @@ -27,12 +27,12 @@ #include "third_party/perfetto/include/perfetto/tracing/traced_value.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkImage.h" -Index: chromium-109.0.5414.46/media/gpu/chromeos/video_decoder_pipeline_unittest.cc +Index: chromium-114.0.5735.90/media/gpu/chromeos/video_decoder_pipeline_unittest.cc =================================================================== ---- chromium-109.0.5414.46.orig/media/gpu/chromeos/video_decoder_pipeline_unittest.cc -+++ chromium-109.0.5414.46/media/gpu/chromeos/video_decoder_pipeline_unittest.cc +--- chromium-114.0.5735.90.orig/media/gpu/chromeos/video_decoder_pipeline_unittest.cc ++++ chromium-114.0.5735.90/media/gpu/chromeos/video_decoder_pipeline_unittest.cc @@ -25,7 +25,7 @@ - #include "media/gpu/chromeos/mailbox_video_frame_converter.h" + #include "media/gpu/chromeos/dmabuf_video_frame_pool.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/libdrm/src/include/drm/drm_fourcc.h"