From nobody Fri Sep 29 10:33:36 2023 X-Original-To: dev-commits-ports-all@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 4RxmsX39rcz4tkMk; Fri, 29 Sep 2023 10:33:36 +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 4RxmsX2xfqz3Mcj; Fri, 29 Sep 2023 10:33:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695983616; 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=mGcdp6AqVoVvXLBMW0a85tLddIPbhnA/9rEuRKuBc/8=; b=atrGZHD5m6etNygKfqMEbzqwsNhFqgCJGVdZ4PDi8+sHIU+06xZ746UPjN4gpxLZtRBbuC 02CrfgQwhI9xPjoX45AivGaxDkLzsQG1kcJ4Oi5BUoJM0JRJx7iHNO93ruTzOSTSXgHZ1R ChO0jG/wmNy/FrFURgtlZXd7C8A5l7CIvytLUj3NK4ujMhcvtlMUv2oWJGtsXmosHCfHHv 5haKm53uhc6Gp2O+lx5dHfnWXTE2/I2h47RNFvOLmo3ZYbx5ScN9CNW/IKgNTPHJd1/EsP Cv/yOD77n2/ofGRxLCS3s/9n/3gHBDAw6g96VIgK1UkXaAQ/5EppdtXAA+o55g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695983616; a=rsa-sha256; cv=none; b=XDyCtrN3L1+yFjZaq6bZAP+Z+nC3APYKBRXKbO4wg+6jGKMJrOyeicHS80ZpmqnkBe/GL6 Gj/l5PVkot1lVcp/vWVMBIwnkk/f9yRUtkLpjYJqznT/liksVucWqntaznuXdMVmP6BfNH iCQO650TNuqsYDKwi63/PR4/kGefAPTK1oLxRLuXh8sjExJETecByXoq0MKtY/3Z2sSLL0 nyMyWhPjl2wJKmLf9nN4mJ4f8u9dGPj/cW44KAVgKM3lXX72rvm1MSCWO+z0y8BW17TVfw k4L+DAHSSzGXr484Ep9hGCTpxtEohInRElgdiQZkBOAzR8BeJ3Ef4ZnD1rDAMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695983616; 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=mGcdp6AqVoVvXLBMW0a85tLddIPbhnA/9rEuRKuBc/8=; b=UZYdl4obdpcIcmooQRo8KP3KEdES3A+4744c+Z+dmwJB+LbMtdDIfBzYDw0bB/iaG12WY8 +nagecYPMzCmOhSZRe32gVA7sWWdzy4abSsEZyfWMX4INHQyTga2z8RuAJFLlhug9Ury/N woK9TI9FB7MjqwDihGiL6r/etWfZG4VvRiFoTWRDEysqsSlqArU12PfB9mBU59YSDUP9os PPjCbIrQydihEPqFSlE3s96nMJCPSol14F5oIKOmH4YIkxzFISVzJQZFbQCtlkOQkugqcH x4ySDWKYGTvlqRujCY2yuF7+KG0PNmdXyohuSIipoJtb8CHLYhzr1h3oM+Y5sw== 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 4RxmsX1j4Lz11L9; Fri, 29 Sep 2023 10:33:36 +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 38TAXa3f084380; Fri, 29 Sep 2023 10:33:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38TAXaO9084377; Fri, 29 Sep 2023 10:33:36 GMT (envelope-from git) Date: Fri, 29 Sep 2023 10:33:36 GMT Message-Id: <202309291033.38TAXaO9084377@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: e55df4c8f8e0 - 2023Q3 - www/*chromium: update to 117.0.5938.132 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/2023Q3 X-Git-Reftype: branch X-Git-Commit: e55df4c8f8e0abf4f83177d75c24ffacfef2fd11 Auto-Submitted: auto-generated The branch 2023Q3 has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=e55df4c8f8e0abf4f83177d75c24ffacfef2fd11 commit e55df4c8f8e0abf4f83177d75c24ffacfef2fd11 Author: Robert Nagy AuthorDate: 2023-09-29 10:30:53 +0000 Commit: Robert Nagy CommitDate: 2023-09-29 10:33:28 +0000 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) --- www/chromium/Makefile | 2 +- www/chromium/distinfo | 14 +++++++------- .../files/patch-chrome_app_generated__resources.grd | 12 ++++++------ ...xtensions_api_runtime_chrome__runtime__api__delegate.cc | 13 +++++++++++++ ...rome_browser_ui_views_frame_tab__strip__region__view.cc | 4 ++-- ...nents_password__manager_core_browser_login__database.cc | 8 ++++---- www/chromium/files/patch-net_dns_address__info.cc | 9 +++++++-- www/ungoogled-chromium/Makefile | 2 +- www/ungoogled-chromium/distinfo | 14 +++++++------- .../files/patch-chrome_app_generated__resources.grd | 12 ++++++------ ...xtensions_api_runtime_chrome__runtime__api__delegate.cc | 13 +++++++++++++ ...nents_password__manager_core_browser_login__database.cc | 8 ++++---- .../files/patch-net_dns_address__info.cc | 9 +++++++-- 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 @@ Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available. -@@ -10361,7 +10361,7 @@ Check your passwords anytime in Update @@ -54,7 +54,7 @@ Finish update -@@ -10700,7 +10700,7 @@ Check your passwords anytime in @@ -63,7 +63,7 @@ Use system title bar and borders -@@ -11685,7 +11685,7 @@ Check your passwords anytime in @@ -72,7 +72,7 @@ Share information about your device? -@@ -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 @@ -81,7 +81,7 @@ Minimize -@@ -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 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 @@ Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available. -@@ -10361,7 +10361,7 @@ Check your passwords anytime in Update @@ -54,7 +54,7 @@ Finish update -@@ -10700,7 +10700,7 @@ Check your passwords anytime in @@ -63,7 +63,7 @@ Use system title bar and borders -@@ -11685,7 +11685,7 @@ Check your passwords anytime in @@ -72,7 +72,7 @@ Share information about your device? -@@ -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 @@ -81,7 +81,7 @@ Minimize -@@ -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 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 +