Merge pull request #102 from greatfire/doh_updates_dec_2024

re-order the DNS servers again to put Cloudflare on top; update to 108.0.5359.243 though there's no real change for that :)
greatfire · Dec 18, 2024 · ee4599a · ee4599a
2 parents 952ef9f + aa59e87
commit ee4599a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/native/ECH_DOH_108.patch b/native/ECH_DOH_108.patch
@@ -3,7 +3,7 @@
  2 files changed, 55 insertions(+), 1 deletion(-)
 
 diff --git a/components/cronet/url_request_context_config.cc b/components/cronet/url_request_context_config.cc
-index 6db7ba3482d4d..db916fe2ee341 100644
+index 080cd057d8ed6..79aa2092acc0d 100644
 --- a/components/cronet/url_request_context_config.cc
 +++ b/components/cronet/url_request_context_config.cc
 @@ -29,6 +29,7 @@
@@ -14,7 +14,7 @@ index 6db7ba3482d4d..db916fe2ee341 100644
  #include "net/http/http_network_session.h"
  #include "net/http/http_server_properties.h"
  #include "net/log/net_log.h"
-@@ -886,6 +887,59 @@ void URLRequestContextConfig::ConfigureURLRequestContextBuilder(
+@@ -928,6 +929,59 @@ void URLRequestContextConfig::ConfigureURLRequestContextBuilder(
    SetContextBuilderExperimentalOptions(context_builder, &session_params,
                                         quic_context->params(), bound_network);
 
@@ -30,11 +30,18 @@ index 6db7ba3482d4d..db916fe2ee341 100644
 +  overrides.dns_over_https_config = net::DnsOverHttpsConfig::FromString(R"(
 +    {
 +      "servers": [{
-+        "template": "https://doh.dns.sb/dns-query",
++        "template": "https://chrome.cloudflare-dns.com/dns-query",
 +        "endpoints": [{
-+          "ips": ["45.11.45.11"]
++          "ips": ["1.1.1.1", "2606:4700:4700::1111"]
 +        }, {
-+          "ips": ["185.222.222.222"]
++          "ips": ["1.0.0.1", "2606:4700:4700::1001"]
++        }]
++      },{
++        "template": "https://chromium.dns.nextdns.io",
++        "endpoints": [{
++          "ips": ["209.209.57.165", "2001:19f0:ac01:170:5400:2ff:fec8:72c8"]
++        },{
++          "ips": ["104.238.181.28", "2a0e:6901:410:25:5054:ff:fe1c:7c81"]
 +        }]
 +      },{
 +        "template": "https://dns.quad9.net/dns-query",
@@ -44,18 +51,11 @@ index 6db7ba3482d4d..db916fe2ee341 100644
 +          "ips": ["149.112.112.112", "2620:fe::9"]
 +        }]
 +      },{
-+        "template": "https://chrome.cloudflare-dns.com/dns-query",
++        "template": "https://doh.dns.sb/dns-query",
 +        "endpoints": [{
-+          "ips": ["1.1.1.1", "2606:4700:4700::1111"]
++          "ips": ["45.11.45.11"]
 +        }, {
-+          "ips": ["1.0.0.1", "2606:4700:4700::1001"]
-+        }]
-+      },{
-+        "template": "https://chromium.dns.nextdns.io",
-+        "endpoints": [{
-+          "ips": ["209.209.57.165", "2001:19f0:ac01:170:5400:2ff:fec8:72c8"]
-+        },{
-+          "ips": ["104.238.181.28", "2a0e:6901:410:25:5054:ff:fe1c:7c81"]
++          "ips": ["185.222.222.222"]
 +        }]
 +      }]
 +    }

diff --git a/native/checkout-to-tag.sh b/native/checkout-to-tag.sh
@@ -8,7 +8,7 @@ export DEPOT_TOOLS_UPDATE=0
 CHROMIUM_SRC_ROOT=${CHROMIUM_SRC_ROOT:-/root/chromium/src}
 DEPOT_TOOLS_ROOT=${DEPOT_TOOLS_ROOT:-/root/depot_tools}
 export PATH="$DEPOT_TOOLS_ROOT:$PATH"
-TAG=${1:-102.0.5005.195}
+TAG=${1:-108.0.5359.243}
 
 cd "$CHROMIUM_SRC_ROOT" || exit 1