1 files changed, 35 insertions, 41 deletions

diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/doh-changes.patch b/www/chromium-uc/patches/core/ungoogled-chromium/doh-changes.patch
index 9784907..4ee53be 100644
--- a/www/chromium-uc/patches/core/ungoogled-chromium/doh-changes.patch
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/doh-changes.patch
@@ -1,59 +1,53 @@
---- a/chrome/common/chrome_features.cc
-+++ b/chrome/common/chrome_features.cc
-@@ -332,12 +332,7 @@ const base::Feature kKeepForceInstalledP
+--- chrome/common/chrome_features.cc.orig
++++ chrome/common/chrome_features.cc
+@@ -323,12 +323,7 @@ const base::Feature kDesktopPWAsWebBundl
  // Enable DNS over HTTPS (DoH).
  const base::Feature kDnsOverHttps {
    "DnsOverHttps",
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
+-#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
+-    defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
 -      base::FEATURE_ENABLED_BY_DEFAULT
 -#else
        base::FEATURE_DISABLED_BY_DEFAULT
 -#endif
  };
  
- // Set whether fallback to insecure DNS is allowed by default. This setting may
---- a/net/dns/public/doh_provider_entry.cc
-+++ b/net/dns/public/doh_provider_entry.cc
-@@ -149,30 +149,6 @@ const DohProviderEntry::List& DohProvide
+ // Provides a mechanism to remove providers from the dropdown list in the
+--- net/dns/public/doh_provider_entry.cc.orig
++++ net/dns/public/doh_provider_entry.cc
+@@ -117,24 +117,6 @@ const DohProviderEntry::List& DohProvide
+           /*privacy_policy=*/"https://dns.sb/privacy/",
            /*display_globally=*/false, /*display_countries=*/{"EE", "DE"},
            LoggingLevel::kNormal),
-       new DohProviderEntry(
--          "Google",
--          base::Feature{"DohProviderGoogle", base::FEATURE_ENABLED_BY_DEFAULT},
--          DohProviderIdForHistogram::kGoogle,
--          {"8.8.8.8", "8.8.4.4", "2001:4860:4860::8888",
--           "2001:4860:4860::8844"},
--          /*dns_over_tls_hostnames=*/
--          {"dns.google", "dns.google.com", "8888.google"},
--          "https://dns.google/dns-query{?dns}",
--          /*ui_name=*/"Google (Public DNS)",
--          "https://developers.google.com/speed/public-dns/"
--          /*privacy_policy=*/"privacy",
--          /*display_globally=*/true, /*display_countries=*/{},
--          LoggingLevel::kExtra),
--      new DohProviderEntry("GoogleDns64",
--                           base::Feature{"DohProviderGoogleDns64",
--                                         base::FEATURE_ENABLED_BY_DEFAULT},
--                           /*provider_id_for_histogram=*/absl::nullopt,
--                           {"2001:4860:4860::64", "2001:4860:4860::6464"},
--                           /*dns_over_tls_hostnames=*/{"dns64.dns.google"},
--                           "https://dns64.dns.google/dns-query{?dns}",
--                           /*ui_name=*/"", /*privacy_policy=*/"",
--                           /*display_globally=*/false,
--                           /*display_countries=*/{}, LoggingLevel::kNormal),
+-      new DohProviderEntry("Google", DohProviderIdForHistogram::kGoogle,
+-                           {"8.8.8.8", "8.8.4.4", "2001:4860:4860::8888",
+-                            "2001:4860:4860::8844"},
+-                           {"dns.google", "dns.google.com",
+-                            "8888.google"} /* dns_over_tls_hostnames */,
+-                           "https://dns.google/dns-query{?dns}",
+-                           "Google (Public DNS)" /* ui_name */,
+-                           "https://developers.google.com/speed/public-dns/"
+-                           "privacy" /* privacy_policy */,
+-                           true /* display_globally */,
+-                           {} /* display_countries */, LoggingLevel::kExtra),
 -      new DohProviderEntry(
-           "Iij",
-           base::Feature{"DohProviderIij", base::FEATURE_ENABLED_BY_DEFAULT},
-           DohProviderIdForHistogram::kIij, /*ip_strs=*/{},
---- a/services/network/public/cpp/features.cc
-+++ b/services/network/public/cpp/features.cc
-@@ -92,12 +92,7 @@ const base::Feature kSplitAuthCacheByNet
+-          "GoogleDns64", absl::nullopt /* provider_id_for_histogram */,
+-          {"2001:4860:4860::64", "2001:4860:4860::6464"},
+-          {"dns64.dns.google"} /* dns_over_tls_hostnames */,
+-          "https://dns64.dns.google/dns-query{?dns}", "" /* ui_name */,
+-          "" /* privacy_policy */, false /* display_globally */,
+-          {} /* display_countries */, LoggingLevel::kNormal),
+       new DohProviderEntry("Iij", DohProviderIdForHistogram::kIij,
+                            {} /* ip_strs */, {} /* dns_over_tls_hostnames */,
+                            "https://public.dns.iij.jp/dns-query",
+--- services/network/public/cpp/features.cc.orig
++++ services/network/public/cpp/features.cc
+@@ -114,12 +114,7 @@ const base::Feature kSplitAuthCacheByNet
  // Enable usage of hardcoded DoH upgrade mapping for use in automatic mode.
  const base::Feature kDnsOverHttpsUpgrade {
    "DnsOverHttpsUpgrade",
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
+-#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC) || defined(OS_ANDROID) || \
+-    defined(OS_WIN)
 -      base::FEATURE_ENABLED_BY_DEFAULT
 -#else
        base::FEATURE_DISABLED_BY_DEFAULT