aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Nagy <rnagy@FreeBSD.org>2023-09-29 10:30:53 +0000
committerRobert Nagy <rnagy@FreeBSD.org>2023-09-29 10:33:28 +0000
commite55df4c8f8e0abf4f83177d75c24ffacfef2fd11 (patch)
treeeffc91034ba3952d46e02792924e08da428b34f2
parent5a28438c6ebb86b3b3534cd6556bb32c853aae1f (diff)
downloadports-e55df4c8f8e0abf4f83177d75c24ffacfef2fd11.tar.gz
ports-e55df4c8f8e0abf4f83177d75c24ffacfef2fd11.zip
www/*chromium: update to 117.0.5938.132
Security: https://vuxml.freebsd.org/freebsd/6d9c6aae-5eb1-11ee-8290-a8a1599412c6.html PR: 274139, 274136 (cherry picked from commit c47361598b73b5e6e180b3ee1bbbaca833dbac63)
Diffstat
-rw-r--r--www/chromium/Makefile2
-rw-r--r--www/chromium/distinfo14
-rw-r--r--www/chromium/files/patch-chrome_app_generated__resources.grd12
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc13
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc4
-rw-r--r--www/chromium/files/patch-components_password__manager_core_browser_login__database.cc8
-rw-r--r--www/chromium/files/patch-net_dns_address__info.cc9
-rw-r--r--www/ungoogled-chromium/Makefile2
-rw-r--r--www/ungoogled-chromium/distinfo14
-rw-r--r--www/ungoogled-chromium/files/patch-chrome_app_generated__resources.grd12
-rw-r--r--www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc13
-rw-r--r--www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database.cc8
-rw-r--r--www/ungoogled-chromium/files/patch-net_dns_address__info.cc9
13 files changed, 78 insertions, 42 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index b32852fb85ef..1ed5f4eb01f6 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -1,5 +1,5 @@
PORTNAME= chromium
-PORTVERSION= 117.0.5938.92
+PORTVERSION= 117.0.5938.132
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
https://nerd.hu/distfiles/:external
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index 4716215d8955..b1cde70ac691 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1695449336
-SHA256 (chromium-117.0.5938.92.tar.xz) = 65ca491927902557cafc384c879b567c3728b06fc8ea0c46c45e2f0ce543342c
-SIZE (chromium-117.0.5938.92.tar.xz) = 3139036620
-SHA256 (chrome-linux-117.0.5938.92-llvm13.profdata.tar.xz) = ab400b9b453a90da93eb1f8599e2b2fc489eaea13041b2588b68e7bfbb8d33a1
-SIZE (chrome-linux-117.0.5938.92-llvm13.profdata.tar.xz) = 28701408
-SHA256 (chromium-117.0.5938.92-testdata.tar.xz) = b4e532a5a6b4d2d170357ad2cfe95102a3b3ee69b535a46df9aed3a64c700444
-SIZE (chromium-117.0.5938.92-testdata.tar.xz) = 269661528
+TIMESTAMP = 1695982966
+SHA256 (chromium-117.0.5938.132.tar.xz) = 28f077123a51942839a9ec518a64930cbc192186e799ef8ccdef19c93ddbaead
+SIZE (chromium-117.0.5938.132.tar.xz) = 3141005880
+SHA256 (chrome-linux-117.0.5938.132-llvm13.profdata.tar.xz) = 89d863f4e7b7b19a09cf92cf2f40bede07c0bbff557f130b60d59fd731ce40f2
+SIZE (chrome-linux-117.0.5938.132-llvm13.profdata.tar.xz) = 28667668
+SHA256 (chromium-117.0.5938.132-testdata.tar.xz) = bc297e44601f9d9320723d715329e53ed69f3683930edc56671ac626b24248ec
+SIZE (chromium-117.0.5938.132-testdata.tar.xz) = 269841680
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd
index 7da694c59894..cf16059907eb 100644
--- a/www/chromium/files/patch-chrome_app_generated__resources.grd
+++ b/www/chromium/files/patch-chrome_app_generated__resources.grd
@@ -1,4 +1,4 @@
---- chrome/app/generated_resources.grd.orig 2023-09-13 12:11:42 UTC
+--- chrome/app/generated_resources.grd.orig 2023-09-29 10:14:06 UTC
+++ chrome/app/generated_resources.grd
@@ -2,7 +2,7 @@
@@ -45,7 +45,7 @@
<message name="IDS_DEPRECATED_APPS_MONITOR_RENDERER" desc="Dialog content that educates users that Chrome Apps will soon no longer launch.">
Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available.
</message>
-@@ -10361,7 +10361,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
+@@ -10364,7 +10364,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
<message name="IDS_APP_MENU_BUTTON_UPDATE" desc="Short label next to app-menu button when an update is available.">
Update
</message>
@@ -54,7 +54,7 @@
<message name="IDS_APP_MENU_BUTTON_UPDATE_ALT1" desc="Alternate short label next to app-menu button when an update is available.">
Finish update
</message>
-@@ -10700,7 +10700,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
+@@ -10703,7 +10703,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
Google Pay
</message>
@@ -63,7 +63,7 @@
<message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders.">
Use system title bar and borders
</message>
-@@ -11685,7 +11685,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
+@@ -11688,7 +11688,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
</message>
<!-- Device Trust Consent dialog -->
@@ -72,7 +72,7 @@
<message name="IDS_DEVICE_SIGNALS_CONSENT_DIALOG_TITLE" desc="Title of the dialog shown when user consent is required to share device signals.">
Share information about your device?
</message>
-@@ -12084,7 +12084,7 @@ Please help our engineers fix this problem. Tell us wh
+@@ -12087,7 +12087,7 @@ Please help our engineers fix this problem. Tell us wh
Set as default
</message>
@@ -81,7 +81,7 @@
<message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
Minimize
</message>
-@@ -14306,7 +14306,7 @@ Please help our engineers fix this problem. Tell us wh
+@@ -14309,7 +14309,7 @@ Please help our engineers fix this problem. Tell us wh
Open Anyway
</message>
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc b/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
new file mode 100644
index 000000000000..ac5b348a935c
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
@@ -0,0 +1,13 @@
+--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2023-09-29 10:14:06 UTC
++++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
+@@ -280,7 +280,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
+ } else if (strcmp(os, "linux") == 0) {
+ info->os = extensions::api::runtime::PlatformOs::kLinux;
+ } else if (strcmp(os, "openbsd") == 0) {
+- info->os = extensions::api::runtime::PlatformOs::kOpenbsd;
++ info->os = extensions::api::runtime::PlatformOs::kLinux;
++ } else if (strcmp(os, "freebsd") == 0) {
++ info->os = extensions::api::runtime::PlatformOs::kLinux;
+ } else if (strcmp(os, "fuchsia") == 0) {
+ info->os = extensions::api::runtime::PlatformOs::kFuchsia;
+ } else {
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc
index ecbeba596fc7..3a0e69da12dc 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/frame/tab_strip_region_view.cc.orig 2023-09-13 12:11:42 UTC
+--- chrome/browser/ui/views/frame/tab_strip_region_view.cc.orig 2023-09-29 10:14:06 UTC
+++ chrome/browser/ui/views/frame/tab_strip_region_view.cc
-@@ -164,7 +164,7 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr
+@@ -170,7 +170,7 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr
// TODO(crbug.com/1052397): Revisit the macro expression once build flag
// switch of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc b/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc
index ed36ad37ed75..6887c6d2dae6 100644
--- a/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc
+++ b/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc
@@ -1,6 +1,6 @@
---- components/password_manager/core/browser/login_database.cc.orig 2023-09-13 12:11:42 UTC
+--- components/password_manager/core/browser/login_database.cc.orig 2023-09-29 10:14:06 UTC
+++ components/password_manager/core/browser/login_database.cc
-@@ -960,7 +960,7 @@ std::string GeneratePlaceholders(size_t count) {
+@@ -1046,7 +1046,7 @@ std::string GeneratePlaceholders(size_t count) {
return result;
}
@@ -9,7 +9,7 @@
// Fills |form| with necessary data required to be removed from the database
// and returns it.
PasswordForm GetFormForRemoval(sql::Statement& statement) {
-@@ -977,7 +977,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme
+@@ -1063,7 +1063,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme
// Whether we should try to return the decryptable passwords while the
// encryption service fails for some passwords.
bool ShouldReturnPartialPasswords() {
@@ -18,7 +18,7 @@
return base::FeatureList::IsEnabled(features::kSkipUndecryptablePasswords);
#else
return false;
-@@ -1832,7 +1832,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() {
+@@ -1918,7 +1918,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() {
}
DatabaseCleanupResult LoginDatabase::DeleteUndecryptableLogins() {
diff --git a/www/chromium/files/patch-net_dns_address__info.cc b/www/chromium/files/patch-net_dns_address__info.cc
index 13f42edbaa93..828513f87d1c 100644
--- a/www/chromium/files/patch-net_dns_address__info.cc
+++ b/www/chromium/files/patch-net_dns_address__info.cc
@@ -1,11 +1,16 @@
---- net/dns/address_info.cc.orig 2023-09-13 12:11:42 UTC
+--- net/dns/address_info.cc.orig 2023-09-29 10:14:06 UTC
+++ net/dns/address_info.cc
-@@ -77,7 +77,7 @@ AddressInfo::AddressInfoAndResult AddressInfo::Get(
+@@ -77,8 +77,12 @@ AddressInfo::AddressInfoAndResult AddressInfo::Get(
// error.
// http://crbug.com/134142
err = ERR_NAME_NOT_RESOLVED;
-#elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_FREEBSD)
+#elif BUILDFLAG(IS_POSIX)
++#ifdef EAI_NODATA
if (os_error != EAI_NONAME && os_error != EAI_NODATA)
++#else
++ if (os_error != EAI_NONAME)
++#endif
err = ERR_NAME_RESOLUTION_FAILED;
#endif
+
diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile
index 4524dd2b3f1d..5aa46d166efa 100644
--- a/www/ungoogled-chromium/Makefile
+++ b/www/ungoogled-chromium/Makefile
@@ -1,5 +1,5 @@
PORTNAME= ungoogled-chromium
-PORTVERSION= 117.0.5938.92
+PORTVERSION= 117.0.5938.132
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 4b077d22e216..9d176ba180d6 100644
--- a/www/ungoogled-chromium/distinfo
+++ b/www/ungoogled-chromium/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1695642703
-SHA256 (chromium-117.0.5938.92.tar.xz) = 65ca491927902557cafc384c879b567c3728b06fc8ea0c46c45e2f0ce543342c
-SIZE (chromium-117.0.5938.92.tar.xz) = 3139036620
-SHA256 (ungoogled-chromium-117.0.5938.92-1.tar.gz) = e2def21268ba379e5cba3709239f9ce57b7aa4fc4e54709372529284793d49c2
-SIZE (ungoogled-chromium-117.0.5938.92-1.tar.gz) = 651900
-SHA256 (chromium-117.0.5938.92-testdata.tar.xz) = b4e532a5a6b4d2d170357ad2cfe95102a3b3ee69b535a46df9aed3a64c700444
-SIZE (chromium-117.0.5938.92-testdata.tar.xz) = 269661528
+TIMESTAMP = 1695983108
+SHA256 (chromium-117.0.5938.132.tar.xz) = 28f077123a51942839a9ec518a64930cbc192186e799ef8ccdef19c93ddbaead
+SIZE (chromium-117.0.5938.132.tar.xz) = 3141005880
+SHA256 (ungoogled-chromium-117.0.5938.132-1.tar.gz) = f987bf804a78707b76676476dc07d61508e36acbb5bd99f07d6934c823109d91
+SIZE (ungoogled-chromium-117.0.5938.132-1.tar.gz) = 651922
+SHA256 (chromium-117.0.5938.132-testdata.tar.xz) = bc297e44601f9d9320723d715329e53ed69f3683930edc56671ac626b24248ec
+SIZE (chromium-117.0.5938.132-testdata.tar.xz) = 269841680
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 4a3d91253802..59453848edd5 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 2023-09-17 07:59:53 UTC
+--- chrome/app/generated_resources.grd.orig 2023-09-29 10:30:11 UTC
+++ chrome/app/generated_resources.grd
@@ -2,7 +2,7 @@
@@ -45,7 +45,7 @@
<message name="IDS_DEPRECATED_APPS_MONITOR_RENDERER" desc="Dialog content that educates users that Chrome Apps will soon no longer launch.">
Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available.
</message>
-@@ -10361,7 +10361,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
+@@ -10364,7 +10364,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
<message name="IDS_APP_MENU_BUTTON_UPDATE" desc="Short label next to app-menu button when an update is available.">
Update
</message>
@@ -54,7 +54,7 @@
<message name="IDS_APP_MENU_BUTTON_UPDATE_ALT1" desc="Alternate short label next to app-menu button when an update is available.">
Finish update
</message>
-@@ -10700,7 +10700,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
+@@ -10703,7 +10703,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
Google Pay
</message>
@@ -63,7 +63,7 @@
<message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders.">
Use system title bar and borders
</message>
-@@ -11685,7 +11685,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
+@@ -11688,7 +11688,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
</message>
<!-- Device Trust Consent dialog -->
@@ -72,7 +72,7 @@
<message name="IDS_DEVICE_SIGNALS_CONSENT_DIALOG_TITLE" desc="Title of the dialog shown when user consent is required to share device signals.">
Share information about your device?
</message>
-@@ -12084,7 +12084,7 @@ Please help our engineers fix this problem. Tell us wh
+@@ -12087,7 +12087,7 @@ Please help our engineers fix this problem. Tell us wh
Set as default
</message>
@@ -81,7 +81,7 @@
<message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
Minimize
</message>
-@@ -14306,7 +14306,7 @@ Please help our engineers fix this problem. Tell us wh
+@@ -14309,7 +14309,7 @@ Please help our engineers fix this problem. Tell us wh
Open Anyway
</message>
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
new file mode 100644
index 000000000000..c86dc93edaed
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
@@ -0,0 +1,13 @@
+--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2023-09-29 10:30:11 UTC
++++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
+@@ -280,7 +280,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
+ } else if (strcmp(os, "linux") == 0) {
+ info->os = extensions::api::runtime::PlatformOs::kLinux;
+ } else if (strcmp(os, "openbsd") == 0) {
+- info->os = extensions::api::runtime::PlatformOs::kOpenbsd;
++ info->os = extensions::api::runtime::PlatformOs::kLinux;
++ } else if (strcmp(os, "freebsd") == 0) {
++ info->os = extensions::api::runtime::PlatformOs::kLinux;
+ } else if (strcmp(os, "fuchsia") == 0) {
+ info->os = extensions::api::runtime::PlatformOs::kFuchsia;
+ } else {
diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database.cc
index f14e2dfd24f5..ceae6b32158e 100644
--- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database.cc
+++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database.cc
@@ -1,6 +1,6 @@
---- components/password_manager/core/browser/login_database.cc.orig 2023-09-17 07:59:53 UTC
+--- components/password_manager/core/browser/login_database.cc.orig 2023-09-29 10:30:11 UTC
+++ components/password_manager/core/browser/login_database.cc
-@@ -960,7 +960,7 @@ std::string GeneratePlaceholders(size_t count) {
+@@ -1046,7 +1046,7 @@ std::string GeneratePlaceholders(size_t count) {
return result;
}
@@ -9,7 +9,7 @@
// Fills |form| with necessary data required to be removed from the database
// and returns it.
PasswordForm GetFormForRemoval(sql::Statement& statement) {
-@@ -977,7 +977,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme
+@@ -1063,7 +1063,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme
// Whether we should try to return the decryptable passwords while the
// encryption service fails for some passwords.
bool ShouldReturnPartialPasswords() {
@@ -18,7 +18,7 @@
return base::FeatureList::IsEnabled(features::kSkipUndecryptablePasswords);
#else
return false;
-@@ -1832,7 +1832,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() {
+@@ -1918,7 +1918,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() {
}
DatabaseCleanupResult LoginDatabase::DeleteUndecryptableLogins() {
diff --git a/www/ungoogled-chromium/files/patch-net_dns_address__info.cc b/www/ungoogled-chromium/files/patch-net_dns_address__info.cc
index 2174e2bc246a..a9cb9a42ab9c 100644
--- a/www/ungoogled-chromium/files/patch-net_dns_address__info.cc
+++ b/www/ungoogled-chromium/files/patch-net_dns_address__info.cc
@@ -1,11 +1,16 @@
---- net/dns/address_info.cc.orig 2023-09-17 07:59:53 UTC
+--- net/dns/address_info.cc.orig 2023-09-29 10:30:11 UTC
+++ net/dns/address_info.cc
-@@ -77,7 +77,7 @@ AddressInfo::AddressInfoAndResult AddressInfo::Get(
+@@ -77,8 +77,12 @@ AddressInfo::AddressInfoAndResult AddressInfo::Get(
// error.
// http://crbug.com/134142
err = ERR_NAME_NOT_RESOLVED;
-#elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_FREEBSD)
+#elif BUILDFLAG(IS_POSIX)
++#ifdef EAI_NODATA
if (os_error != EAI_NONAME && os_error != EAI_NODATA)
++#else
++ if (os_error != EAI_NONAME)
++#endif
err = ERR_NAME_RESOLUTION_FAILED;
#endif
+
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 16:31:33 +0000