From 2c4b282bff3a97e9cc5022cbec76db0959e59fbe Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Fri, 20 Oct 2023 19:43:41 -0400 Subject: [PATCH 1/4] chore(global): update safari user-agent to latest Signed-off-by: Rui Chen --- Library/Homebrew/global.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb index 70506170f8..c3d00b2322 100644 --- a/Library/Homebrew/global.rb +++ b/Library/Homebrew/global.rb @@ -47,8 +47,8 @@ HOMEBREW_USER_AGENT_CURL = ENV.fetch("HOMEBREW_USER_AGENT_CURL").freeze HOMEBREW_USER_AGENT_RUBY = "#{ENV.fetch("HOMEBREW_USER_AGENT")} ruby/#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}" HOMEBREW_USER_AGENT_FAKE_SAFARI = - "Mozilla/5.0 (Macintosh; Intel Mac OS X 13_5_1) AppleWebKit/605.1.15 " \ - "(KHTML, like Gecko) Version/16.5 Safari/605.1.15" + "Mozilla/5.0 (Macintosh; Intel Mac OS X 14_0) AppleWebKit/605.1.15 " \ + "(KHTML, like Gecko) Version/17.0 Safari/605.1.15" HOMEBREW_GITHUB_PACKAGES_AUTH = ENV.fetch("HOMEBREW_GITHUB_PACKAGES_AUTH").freeze HOMEBREW_DEFAULT_PREFIX = ENV.fetch("HOMEBREW_GENERIC_DEFAULT_PREFIX").freeze From 4232cb6c902c79e7ece24a7428e5bf3735abf788 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Fri, 20 Oct 2023 20:46:22 -0400 Subject: [PATCH 2/4] curl_spec: update test Signed-off-by: Rui Chen --- Library/Homebrew/test/download_strategies/curl_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/test/download_strategies/curl_spec.rb b/Library/Homebrew/test/download_strategies/curl_spec.rb index 2fe3dab6ad..a9a31f3b8d 100644 --- a/Library/Homebrew/test/download_strategies/curl_spec.rb +++ b/Library/Homebrew/test/download_strategies/curl_spec.rb @@ -75,7 +75,7 @@ describe CurlDownloadStrategy do /curl/, hash_including(args: array_including_cons( "--user-agent", - a_string_matching(/Mozilla.*Mac OS X 13.*AppleWebKit/), + a_string_matching(/Mozilla.*Mac OS X 14.*AppleWebKit/), )), ) .at_least(:once) From 20b8a7490668cade1995aff81022f64b2121bfee Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sat, 21 Oct 2023 09:37:57 +0100 Subject: [PATCH 3/4] global: use correct user-agent. --- Library/Homebrew/global.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb index c3d00b2322..3597cfe82f 100644 --- a/Library/Homebrew/global.rb +++ b/Library/Homebrew/global.rb @@ -47,7 +47,9 @@ HOMEBREW_USER_AGENT_CURL = ENV.fetch("HOMEBREW_USER_AGENT_CURL").freeze HOMEBREW_USER_AGENT_RUBY = "#{ENV.fetch("HOMEBREW_USER_AGENT")} ruby/#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}" HOMEBREW_USER_AGENT_FAKE_SAFARI = - "Mozilla/5.0 (Macintosh; Intel Mac OS X 14_0) AppleWebKit/605.1.15 " \ + # Don't update this beyond 10.15.7 until Safari actually updates their + # user agent to be beyond 10.15.7 (not the case as-of macOS 14) + "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 " \ "(KHTML, like Gecko) Version/17.0 Safari/605.1.15" HOMEBREW_GITHUB_PACKAGES_AUTH = ENV.fetch("HOMEBREW_GITHUB_PACKAGES_AUTH").freeze From 4436a663f26f7ab3cc793a58bba5b3e20f46c339 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sat, 21 Oct 2023 09:41:35 +0100 Subject: [PATCH 4/4] download_strategies/curl_spec: fix test. --- Library/Homebrew/test/download_strategies/curl_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/test/download_strategies/curl_spec.rb b/Library/Homebrew/test/download_strategies/curl_spec.rb index a9a31f3b8d..ff94c94f7e 100644 --- a/Library/Homebrew/test/download_strategies/curl_spec.rb +++ b/Library/Homebrew/test/download_strategies/curl_spec.rb @@ -75,7 +75,7 @@ describe CurlDownloadStrategy do /curl/, hash_including(args: array_including_cons( "--user-agent", - a_string_matching(/Mozilla.*Mac OS X 14.*AppleWebKit/), + a_string_matching(/Mozilla.*Mac OS X 10_15_7.*AppleWebKit/), )), ) .at_least(:once)