From nobody Fri Feb 09 18:41:12 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TWjNn1SK3z5B8JL; Fri, 9 Feb 2024 18:41:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TWjNn1FXzz4fPg; Fri, 9 Feb 2024 18:41:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707504073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OxeGByVyofw9/aDTRHz+GgQVCpgDgEa1D5uPtnZXWfU=; b=aANqZJqtx+ESqTkJX1yGq9LEhQ2WnD+pVGa4zxSmaMQ0M8+aiP1LroIVZ3pBWYBh+nofE4 oEFgC6xnPZDP6bcuPua1zIwA6FblyUxrjchC4V05hmXkVrd7kX+20/D3Oneb8NL7wa1k/O nfCZ6zKwIIxn2Ikoi0c36a4tFwZuyaBDtxHfV8w1+qeC0yDC4UD2aiXy2A0BffJzIa8Ov7 UoaOT/JCgxJ3ywuDjRLDWOSe3zyUY8w73ACsKLhkFufpK1DuCvejr2QxyrjIfLWwhL8C8A g4Rdwxj6fzOxydBid7e/hD+TxpFxqwLPH6P0kpfTyDGS3RabxJ6UwRC6hyEeiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707504073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OxeGByVyofw9/aDTRHz+GgQVCpgDgEa1D5uPtnZXWfU=; b=EPbgrpRmdJuhpEFAQLts9JAAH/PIskm8fw3q9zUO6hcnvYOKZcmHCsZBxqGGDFFQoJTQuR 7ieNhb7xIYXDvmDCzEB7cuSaV2LKO776F8ScfkeB0SFTv0HYYLSX7Shy9eceGAYxlLnDb3 8LNAwY9C+VdR9VSGsLPRIZGwlNSjAuZA5+z6SWfqoHBOXVUJUUNnDWrUs2tOt5DyWxOohe zpzXZqqIzEbrGhdMd02pBI6ymTRqIaZzQTTamJY6u7UBhb9QPZ9tZwoT+Ei3AVYj2J+qoS oZQktU2+3usQCbudoyFvO+x0r9JlFk/0eY0bjzDCX5/1RtAcPlKo/cWW1G4uEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707504073; a=rsa-sha256; cv=none; b=MFm2T9EB12F5OVkWg0SLKdJLfQZWsCPquNA2vSP48XxDJiBENisxIJfrdT4R0X639ANwpu hp3JHuq+nFLY+hpwhpdsr2fXT50X7zaP5h319dXN9rmKaZYALJ1Mu7EBdpJSB2S4eTlrTS kUqHdYk2pKAwg28SOKY4MKsIXu2JPICty7fvkI/jjkGE8TlsbKmVYJs9artY717Gc/EedJ +xRMk8VK6eduDlV0SFplWwN2ZjtOiROV0oUeGlJZ4V6ou9jmyult2188f8amHYu3dJCfVw 8oXyrArc7w9ECIW0nf+i2gXJ7QKtJaKvj6zz8TLQ8gZyCw67YbzrfkxmcU+9Kg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TWjNn0KGHzkm0; Fri, 9 Feb 2024 18:41:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 419IfClk049115; Fri, 9 Feb 2024 18:41:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 419IfCws049112; Fri, 9 Feb 2024 18:41:12 GMT (envelope-from git) Date: Fri, 9 Feb 2024 18:41:12 GMT Message-Id: <202402091841.419IfCws049112@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Nagy Subject: git: dc5b1a2538e6 - 2024Q1 - www/ungoogled-chromium: update to 121.0.6167.160 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rnagy X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: dc5b1a2538e6028d31cee23e98ee29696cde87a9 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=dc5b1a2538e6028d31cee23e98ee29696cde87a9 commit dc5b1a2538e6028d31cee23e98ee29696cde87a9 Author: Robert Nagy AuthorDate: 2024-02-09 18:39:34 +0000 Commit: Robert Nagy CommitDate: 2024-02-09 18:41:06 +0000 www/ungoogled-chromium: update to 121.0.6167.160 Security: https://vuxml.freebsd.org/freebsd/19047673-c680-11ee-86bb-a8a1599412c6.html (cherry picked from commit 5c8f11b7ced5cd5d7a08c429fe7f12ea017a4e99) --- www/ungoogled-chromium/Makefile | 2 +- www/ungoogled-chromium/distinfo | 14 +++++++------- .../files/patch-chrome_app_generated__resources.grd | 12 ++++++------ www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn | 4 ++-- ...atch-chrome_browser_chrome__content__browser__client.cc | 6 +++--- ...rowser_ui_webui_chrome__web__ui__controller__factory.cc | 8 ++++---- .../files/patch-chrome_common_pref__names.h | 12 ++++++------ .../files/patch-chrome_common_webui__url__constants.cc | 4 ++-- www/ungoogled-chromium/files/patch-chrome_test_BUILD.gn | 4 ++-- 9 files changed, 33 insertions(+), 33 deletions(-) diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile index c630062506b9..5b15548a2c02 100644 --- a/www/ungoogled-chromium/Makefile +++ b/www/ungoogled-chromium/Makefile @@ -1,5 +1,5 @@ PORTNAME= ungoogled-chromium -PORTVERSION= 121.0.6167.139 +PORTVERSION= 121.0.6167.160 UGVERSION= ${DISTVERSION}-1 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo index 67fae4ef012a..9c9459e4935d 100644 --- a/www/ungoogled-chromium/distinfo +++ b/www/ungoogled-chromium/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1706973655 -SHA256 (chromium-121.0.6167.139.tar.xz) = e12cc967bef7a79630828792f02d95297a06eb905c98e4c6e065fd5e74d6f9ff -SIZE (chromium-121.0.6167.139.tar.xz) = 3340424948 -SHA256 (ungoogled-chromium-121.0.6167.139-1.tar.gz) = a4f389f9159effbbe47a07ade0b8b9b86ebb64a56230ea7a4b43664cd499f829 -SIZE (ungoogled-chromium-121.0.6167.139-1.tar.gz) = 666180 -SHA256 (chromium-121.0.6167.139-testdata.tar.xz) = ea1431ca694fd314ec542642f1ef5112df737792106dd991edf46eb012732a15 -SIZE (chromium-121.0.6167.139-testdata.tar.xz) = 272290844 +TIMESTAMP = 1707503871 +SHA256 (chromium-121.0.6167.160.tar.xz) = 4586673899383d30e9d95fa3a9c5f8160f32a9d5789e40be82abf3e4dd9cc3df +SIZE (chromium-121.0.6167.160.tar.xz) = 3342749076 +SHA256 (ungoogled-chromium-121.0.6167.160-1.tar.gz) = ac6b04003f23f3aabb08b478eb9b3eb7d79b518dc632f48d1f24dc38d5d3eba7 +SIZE (ungoogled-chromium-121.0.6167.160-1.tar.gz) = 666294 +SHA256 (chromium-121.0.6167.160-testdata.tar.xz) = d012877a371ce93f73261d62cd55a2387bf7019fe5e5ece570fc786dd13792c8 +SIZE (chromium-121.0.6167.160-testdata.tar.xz) = 268766968 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734 diff --git a/www/ungoogled-chromium/files/patch-chrome_app_generated__resources.grd b/www/ungoogled-chromium/files/patch-chrome_app_generated__resources.grd index 5e1c92e4ad19..f8443647c64e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_app_generated__resources.grd +++ b/www/ungoogled-chromium/files/patch-chrome_app_generated__resources.grd @@ -1,4 +1,4 @@ ---- chrome/app/generated_resources.grd.orig 2024-02-03 15:42:55 UTC +--- chrome/app/generated_resources.grd.orig 2024-02-09 10:34:36 UTC +++ chrome/app/generated_resources.grd @@ -2,7 +2,7 @@ @@ -45,7 +45,7 @@ Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available. -@@ -10956,7 +10956,7 @@ Check your passwords anytime in Update @@ -54,7 +54,7 @@ Finish update -@@ -11303,7 +11303,7 @@ Check your passwords anytime in @@ -63,7 +63,7 @@ Use system title bar and borders -@@ -12301,7 +12301,7 @@ Check your passwords anytime in @@ -72,7 +72,7 @@ Share information about your device? -@@ -12709,7 +12709,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -12718,7 +12718,7 @@ Please help our engineers fix this problem. Tell us wh Set as default @@ -81,7 +81,7 @@ Minimize -@@ -14940,7 +14940,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -14949,7 +14949,7 @@ Please help our engineers fix this problem. Tell us wh Open Anyway diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn b/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn index b471a7a1320d..62c8d3e44f5b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/BUILD.gn.orig 2024-02-03 15:42:55 UTC +--- chrome/browser/BUILD.gn.orig 2024-02-09 10:34:36 UTC +++ chrome/browser/BUILD.gn -@@ -6515,6 +6515,13 @@ static_library("browser") { +@@ -6514,6 +6514,13 @@ static_library("browser") { } } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc index 56ceeeb1ed88..98c30d605cf4 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,4 +1,4 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2024-02-03 15:42:55 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2024-02-09 10:34:36 UTC +++ chrome/browser/chrome_content_browser_client.cc @@ -458,7 +458,7 @@ #include "storage/browser/file_system/external_mount_points.h" @@ -109,7 +109,7 @@ command_line); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && !BUILDFLAG(IS_BSD) // Opt into a hardened stack canary mitigation if it hasn't already been // force-disabled. if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { @@ -149,7 +149,7 @@ MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -7105,7 +7107,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS +@@ -7109,7 +7111,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() { // This enterprise policy is supported on Android, but the feature will not be // launched there. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index 33468735a7fc..c589f1e91be1 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2024-02-03 15:42:55 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2024-02-09 10:34:36 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc @@ -210,7 +210,7 @@ #include "chrome/browser/ui/webui/chromeos/chrome_url_disabled/chrome_url_disabled_ui.h" @@ -39,7 +39,7 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -653,7 +653,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -651,7 +651,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUIMobileSetupHost) return &NewWebUI; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -48,7 +48,7 @@ if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) return &NewWebUI; #endif -@@ -718,7 +718,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -716,7 +716,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI; #endif @@ -57,7 +57,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) -@@ -779,27 +779,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -777,27 +777,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we } #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h b/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h index 691e3358409a..97cea7fb863e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h @@ -1,4 +1,4 @@ ---- chrome/common/pref_names.h.orig 2024-02-03 15:42:55 UTC +--- chrome/common/pref_names.h.orig 2024-02-09 10:34:36 UTC +++ chrome/common/pref_names.h @@ -1330,7 +1330,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u @@ -27,7 +27,7 @@ inline constexpr char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; #endif -@@ -2439,14 +2439,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s +@@ -2441,14 +2441,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s inline constexpr char kMediaCdmOriginData[] = "media.cdm.origin_data"; #endif // BUILDFLAG(IS_WIN) @@ -44,7 +44,7 @@ // Records whether the user has seen an HTTP auth "negotiate" header. inline constexpr char kReceivedHttpAuthNegotiateHeader[] = "net.received_http_auth_negotiate_headers"; -@@ -2524,7 +2524,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM +@@ -2526,7 +2526,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM inline constexpr char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; @@ -53,7 +53,7 @@ // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected // along with kAuthNegotiateDelegateAllowlist. inline constexpr char kAuthNegotiateDelegateByKdcPolicy[] = -@@ -3563,7 +3563,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes +@@ -3565,7 +3565,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes inline constexpr char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; @@ -62,7 +62,7 @@ // Boolean that indicates if system notifications are allowed to be used in // place of Chrome notifications. inline constexpr char kAllowSystemNotifications[] = -@@ -3612,7 +3612,7 @@ inline constexpr char kCACertificateManagementAllowed[ +@@ -3614,7 +3614,7 @@ inline constexpr char kCACertificateManagementAllowed[ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -71,7 +71,7 @@ inline constexpr char kEnforceLocalAnchorConstraintsEnabled[] = "enforce_local_anchor_constraints_enabled"; #endif -@@ -3924,7 +3924,7 @@ inline constexpr char kThrottleNonVisibleCrossOriginIf +@@ -3926,7 +3926,7 @@ inline constexpr char kThrottleNonVisibleCrossOriginIf inline constexpr char kNewBaseUrlInheritanceBehaviorAllowed[] = "new_base_url_inheritance_behavior_allowed"; diff --git a/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.cc b/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.cc index 2d368eb9196d..f42b457c2206 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.cc @@ -1,4 +1,4 @@ ---- chrome/common/webui_url_constants.cc.orig 2024-02-03 15:42:55 UTC +--- chrome/common/webui_url_constants.cc.orig 2024-02-09 10:34:36 UTC +++ chrome/common/webui_url_constants.cc @@ -508,18 +508,18 @@ const char kOsUIShortcutCustomizationAppURL[] = "os:// const char kOsUIVersionURL[] = "os://version"; @@ -57,7 +57,7 @@ const char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; const char kChromeUIWebAppSettingsHost[] = "app-settings"; #endif -@@ -877,7 +877,7 @@ const char* const kChromeDebugURLs[] = { +@@ -876,7 +876,7 @@ const char* const kChromeDebugURLs[] = { blink::kChromeUIGpuJavaCrashURL, kChromeUIJavaCrashURL, #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_test_BUILD.gn b/www/ungoogled-chromium/files/patch-chrome_test_BUILD.gn index 8bb63e912baf..6eda85b9ad21 100644 --- a/www/ungoogled-chromium/files/patch-chrome_test_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-chrome_test_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/test/BUILD.gn.orig 2024-02-03 15:42:55 UTC +--- chrome/test/BUILD.gn.orig 2024-02-09 10:34:36 UTC +++ chrome/test/BUILD.gn -@@ -11475,7 +11475,7 @@ test("chrome_app_unittests") { +@@ -11472,7 +11472,7 @@ test("chrome_app_unittests") { "//components/heap_profiling/in_process", "//components/safe_browsing:buildflags", ]