mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-17 19:39:43 +00:00
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 c47361598b
)
This commit is contained in:
parent
5a28438c6e
commit
e55df4c8f8
@ -1,5 +1,5 @@
|
|||||||
PORTNAME= chromium
|
PORTNAME= chromium
|
||||||
PORTVERSION= 117.0.5938.92
|
PORTVERSION= 117.0.5938.132
|
||||||
CATEGORIES= www wayland
|
CATEGORIES= www wayland
|
||||||
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
|
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
|
||||||
https://nerd.hu/distfiles/:external
|
https://nerd.hu/distfiles/:external
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
TIMESTAMP = 1695449336
|
TIMESTAMP = 1695982966
|
||||||
SHA256 (chromium-117.0.5938.92.tar.xz) = 65ca491927902557cafc384c879b567c3728b06fc8ea0c46c45e2f0ce543342c
|
SHA256 (chromium-117.0.5938.132.tar.xz) = 28f077123a51942839a9ec518a64930cbc192186e799ef8ccdef19c93ddbaead
|
||||||
SIZE (chromium-117.0.5938.92.tar.xz) = 3139036620
|
SIZE (chromium-117.0.5938.132.tar.xz) = 3141005880
|
||||||
SHA256 (chrome-linux-117.0.5938.92-llvm13.profdata.tar.xz) = ab400b9b453a90da93eb1f8599e2b2fc489eaea13041b2588b68e7bfbb8d33a1
|
SHA256 (chrome-linux-117.0.5938.132-llvm13.profdata.tar.xz) = 89d863f4e7b7b19a09cf92cf2f40bede07c0bbff557f130b60d59fd731ce40f2
|
||||||
SIZE (chrome-linux-117.0.5938.92-llvm13.profdata.tar.xz) = 28701408
|
SIZE (chrome-linux-117.0.5938.132-llvm13.profdata.tar.xz) = 28667668
|
||||||
SHA256 (chromium-117.0.5938.92-testdata.tar.xz) = b4e532a5a6b4d2d170357ad2cfe95102a3b3ee69b535a46df9aed3a64c700444
|
SHA256 (chromium-117.0.5938.132-testdata.tar.xz) = bc297e44601f9d9320723d715329e53ed69f3683930edc56671ac626b24248ec
|
||||||
SIZE (chromium-117.0.5938.92-testdata.tar.xz) = 269661528
|
SIZE (chromium-117.0.5938.132-testdata.tar.xz) = 269841680
|
||||||
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
|
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
|
||||||
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
|
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
|
||||||
|
@ -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
|
+++ chrome/app/generated_resources.grd
|
||||||
@@ -2,7 +2,7 @@
|
@@ -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.">
|
<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.
|
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>
|
</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.">
|
<message name="IDS_APP_MENU_BUTTON_UPDATE" desc="Short label next to app-menu button when an update is available.">
|
||||||
Update
|
Update
|
||||||
</message>
|
</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.">
|
<message name="IDS_APP_MENU_BUTTON_UPDATE_ALT1" desc="Alternate short label next to app-menu button when an update is available.">
|
||||||
Finish update
|
Finish update
|
||||||
</message>
|
</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
|
Google Pay
|
||||||
</message>
|
</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.">
|
<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
|
Use system title bar and borders
|
||||||
</message>
|
</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>
|
</message>
|
||||||
|
|
||||||
<!-- Device Trust Consent dialog -->
|
<!-- 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.">
|
<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?
|
Share information about your device?
|
||||||
</message>
|
</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
|
Set as default
|
||||||
</message>
|
</message>
|
||||||
|
|
||||||
@ -81,7 +81,7 @@
|
|||||||
<message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
|
<message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
|
||||||
Minimize
|
Minimize
|
||||||
</message>
|
</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
|
Open Anyway
|
||||||
</message>
|
</message>
|
||||||
|
|
||||||
|
@ -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 {
|
@ -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
|
+++ 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
|
// TODO(crbug.com/1052397): Revisit the macro expression once build flag
|
||||||
// switch of lacros-chrome is complete.
|
// switch of lacros-chrome is complete.
|
||||||
|
@ -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
|
+++ 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;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -9,7 +9,7 @@
|
|||||||
// Fills |form| with necessary data required to be removed from the database
|
// Fills |form| with necessary data required to be removed from the database
|
||||||
// and returns it.
|
// and returns it.
|
||||||
PasswordForm GetFormForRemoval(sql::Statement& statement) {
|
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
|
// Whether we should try to return the decryptable passwords while the
|
||||||
// encryption service fails for some passwords.
|
// encryption service fails for some passwords.
|
||||||
bool ShouldReturnPartialPasswords() {
|
bool ShouldReturnPartialPasswords() {
|
||||||
@ -18,7 +18,7 @@
|
|||||||
return base::FeatureList::IsEnabled(features::kSkipUndecryptablePasswords);
|
return base::FeatureList::IsEnabled(features::kSkipUndecryptablePasswords);
|
||||||
#else
|
#else
|
||||||
return false;
|
return false;
|
||||||
@@ -1832,7 +1832,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() {
|
@@ -1918,7 +1918,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() {
|
||||||
}
|
}
|
||||||
|
|
||||||
DatabaseCleanupResult LoginDatabase::DeleteUndecryptableLogins() {
|
DatabaseCleanupResult LoginDatabase::DeleteUndecryptableLogins() {
|
||||||
|
@ -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
|
+++ net/dns/address_info.cc
|
||||||
@@ -77,7 +77,7 @@ AddressInfo::AddressInfoAndResult AddressInfo::Get(
|
@@ -77,8 +77,12 @@ AddressInfo::AddressInfoAndResult AddressInfo::Get(
|
||||||
// error.
|
// error.
|
||||||
// http://crbug.com/134142
|
// http://crbug.com/134142
|
||||||
err = ERR_NAME_NOT_RESOLVED;
|
err = ERR_NAME_NOT_RESOLVED;
|
||||||
-#elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_FREEBSD)
|
-#elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_FREEBSD)
|
||||||
+#elif BUILDFLAG(IS_POSIX)
|
+#elif BUILDFLAG(IS_POSIX)
|
||||||
|
+#ifdef EAI_NODATA
|
||||||
if (os_error != EAI_NONAME && os_error != EAI_NODATA)
|
if (os_error != EAI_NONAME && os_error != EAI_NODATA)
|
||||||
|
+#else
|
||||||
|
+ if (os_error != EAI_NONAME)
|
||||||
|
+#endif
|
||||||
err = ERR_NAME_RESOLUTION_FAILED;
|
err = ERR_NAME_RESOLUTION_FAILED;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
PORTNAME= ungoogled-chromium
|
PORTNAME= ungoogled-chromium
|
||||||
PORTVERSION= 117.0.5938.92
|
PORTVERSION= 117.0.5938.132
|
||||||
UGVERSION= ${DISTVERSION}-1
|
UGVERSION= ${DISTVERSION}-1
|
||||||
CATEGORIES= www wayland
|
CATEGORIES= www wayland
|
||||||
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
|
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
TIMESTAMP = 1695642703
|
TIMESTAMP = 1695983108
|
||||||
SHA256 (chromium-117.0.5938.92.tar.xz) = 65ca491927902557cafc384c879b567c3728b06fc8ea0c46c45e2f0ce543342c
|
SHA256 (chromium-117.0.5938.132.tar.xz) = 28f077123a51942839a9ec518a64930cbc192186e799ef8ccdef19c93ddbaead
|
||||||
SIZE (chromium-117.0.5938.92.tar.xz) = 3139036620
|
SIZE (chromium-117.0.5938.132.tar.xz) = 3141005880
|
||||||
SHA256 (ungoogled-chromium-117.0.5938.92-1.tar.gz) = e2def21268ba379e5cba3709239f9ce57b7aa4fc4e54709372529284793d49c2
|
SHA256 (ungoogled-chromium-117.0.5938.132-1.tar.gz) = f987bf804a78707b76676476dc07d61508e36acbb5bd99f07d6934c823109d91
|
||||||
SIZE (ungoogled-chromium-117.0.5938.92-1.tar.gz) = 651900
|
SIZE (ungoogled-chromium-117.0.5938.132-1.tar.gz) = 651922
|
||||||
SHA256 (chromium-117.0.5938.92-testdata.tar.xz) = b4e532a5a6b4d2d170357ad2cfe95102a3b3ee69b535a46df9aed3a64c700444
|
SHA256 (chromium-117.0.5938.132-testdata.tar.xz) = bc297e44601f9d9320723d715329e53ed69f3683930edc56671ac626b24248ec
|
||||||
SIZE (chromium-117.0.5938.92-testdata.tar.xz) = 269661528
|
SIZE (chromium-117.0.5938.132-testdata.tar.xz) = 269841680
|
||||||
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
|
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
|
||||||
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
|
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
|
||||||
|
@ -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
|
+++ chrome/app/generated_resources.grd
|
||||||
@@ -2,7 +2,7 @@
|
@@ -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.">
|
<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.
|
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>
|
</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.">
|
<message name="IDS_APP_MENU_BUTTON_UPDATE" desc="Short label next to app-menu button when an update is available.">
|
||||||
Update
|
Update
|
||||||
</message>
|
</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.">
|
<message name="IDS_APP_MENU_BUTTON_UPDATE_ALT1" desc="Alternate short label next to app-menu button when an update is available.">
|
||||||
Finish update
|
Finish update
|
||||||
</message>
|
</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
|
Google Pay
|
||||||
</message>
|
</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.">
|
<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
|
Use system title bar and borders
|
||||||
</message>
|
</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>
|
</message>
|
||||||
|
|
||||||
<!-- Device Trust Consent dialog -->
|
<!-- 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.">
|
<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?
|
Share information about your device?
|
||||||
</message>
|
</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
|
Set as default
|
||||||
</message>
|
</message>
|
||||||
|
|
||||||
@ -81,7 +81,7 @@
|
|||||||
<message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
|
<message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
|
||||||
Minimize
|
Minimize
|
||||||
</message>
|
</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
|
Open Anyway
|
||||||
</message>
|
</message>
|
||||||
|
|
||||||
|
@ -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 {
|
@ -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
|
+++ 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;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -9,7 +9,7 @@
|
|||||||
// Fills |form| with necessary data required to be removed from the database
|
// Fills |form| with necessary data required to be removed from the database
|
||||||
// and returns it.
|
// and returns it.
|
||||||
PasswordForm GetFormForRemoval(sql::Statement& statement) {
|
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
|
// Whether we should try to return the decryptable passwords while the
|
||||||
// encryption service fails for some passwords.
|
// encryption service fails for some passwords.
|
||||||
bool ShouldReturnPartialPasswords() {
|
bool ShouldReturnPartialPasswords() {
|
||||||
@ -18,7 +18,7 @@
|
|||||||
return base::FeatureList::IsEnabled(features::kSkipUndecryptablePasswords);
|
return base::FeatureList::IsEnabled(features::kSkipUndecryptablePasswords);
|
||||||
#else
|
#else
|
||||||
return false;
|
return false;
|
||||||
@@ -1832,7 +1832,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() {
|
@@ -1918,7 +1918,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() {
|
||||||
}
|
}
|
||||||
|
|
||||||
DatabaseCleanupResult LoginDatabase::DeleteUndecryptableLogins() {
|
DatabaseCleanupResult LoginDatabase::DeleteUndecryptableLogins() {
|
||||||
|
@ -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
|
+++ net/dns/address_info.cc
|
||||||
@@ -77,7 +77,7 @@ AddressInfo::AddressInfoAndResult AddressInfo::Get(
|
@@ -77,8 +77,12 @@ AddressInfo::AddressInfoAndResult AddressInfo::Get(
|
||||||
// error.
|
// error.
|
||||||
// http://crbug.com/134142
|
// http://crbug.com/134142
|
||||||
err = ERR_NAME_NOT_RESOLVED;
|
err = ERR_NAME_NOT_RESOLVED;
|
||||||
-#elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_FREEBSD)
|
-#elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_FREEBSD)
|
||||||
+#elif BUILDFLAG(IS_POSIX)
|
+#elif BUILDFLAG(IS_POSIX)
|
||||||
|
+#ifdef EAI_NODATA
|
||||||
if (os_error != EAI_NONAME && os_error != EAI_NODATA)
|
if (os_error != EAI_NONAME && os_error != EAI_NODATA)
|
||||||
|
+#else
|
||||||
|
+ if (os_error != EAI_NONAME)
|
||||||
|
+#endif
|
||||||
err = ERR_NAME_RESOLUTION_FAILED;
|
err = ERR_NAME_RESOLUTION_FAILED;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user