From cd808983bc7e4833d255646af433f2a0e6295d7c Mon Sep 17 00:00:00 2001
From: Bo Anderson <mail@boanderson.me>
Date: Thu, 21 Oct 2021 02:24:50 +0100
Subject: [PATCH 1/2] Portable Ruby 2.6.8

---
 Library/Homebrew/cmd/vendor-install.sh        | 10 +++++-----
 Library/Homebrew/vendor/portable-ruby-version |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Library/Homebrew/cmd/vendor-install.sh b/Library/Homebrew/cmd/vendor-install.sh
index 327b3b0521..7a13aea315 100644
--- a/Library/Homebrew/cmd/vendor-install.sh
+++ b/Library/Homebrew/cmd/vendor-install.sh
@@ -16,15 +16,15 @@ if [[ -n "${HOMEBREW_MACOS}" ]]
 then
   if [[ "${HOMEBREW_PROCESSOR}" == "Intel" ]]
   then
-    ruby_FILENAME="portable-ruby-2.6.3_2.yosemite.bottle.tar.gz"
-    ruby_SHA="b065e5e3783954f3e65d8d3a6377ca51649bfcfa21b356b0dd70490f74c6bd86"
+    ruby_FILENAME="portable-ruby-2.6.8.yosemite.bottle.tar.gz"
+    ruby_SHA="0cb1cc7af109437fe0e020c9f3b7b95c3c709b140bde9f991ad2c1433496dd42"
   fi
 elif [[ -n "${HOMEBREW_LINUX}" ]]
 then
   case "${HOMEBREW_PROCESSOR}" in
     x86_64)
-      ruby_FILENAME="portable-ruby-2.6.3_2.x86_64_linux.bottle.tar.gz"
-      ruby_SHA="97e639a64dcec285392b53ad804b5334c324f1d2a8bdc2b5087b8bf8051e332f"
+      ruby_FILENAME="portable-ruby-2.6.8.x86_64_linux.bottle.tar.gz"
+      ruby_SHA="cd7fffb18ef9338baa670fc5e8fce99b0e3cc0f0fd7627bcbb56f3c8d54161d4"
       ;;
     *) ;;
   esac
@@ -45,7 +45,7 @@ then
   fi
   ruby_URLs+=(
     "https://ghcr.io/v2/homebrew/portable-ruby/portable-ruby/blobs/sha256:${ruby_SHA}"
-    "https://github.com/Homebrew/homebrew-portable-ruby/releases/download/2.6.3_2/${ruby_FILENAME}"
+    "https://github.com/Homebrew/homebrew-portable-ruby/releases/download/2.6.8/${ruby_FILENAME}"
   )
   ruby_URL="${ruby_URLs[0]}"
 fi
diff --git a/Library/Homebrew/vendor/portable-ruby-version b/Library/Homebrew/vendor/portable-ruby-version
index 6df7d17e80..743af5e125 100644
--- a/Library/Homebrew/vendor/portable-ruby-version
+++ b/Library/Homebrew/vendor/portable-ruby-version
@@ -1 +1 @@
-2.6.3_2
+2.6.8

From 943b79d2fbf6776067594a3f670bf7e045960707 Mon Sep 17 00:00:00 2001
From: Bo Anderson <mail@boanderson.me>
Date: Thu, 21 Oct 2021 02:31:32 +0100
Subject: [PATCH 2/2] os/mac/diagnostic: allow Ruby 2.6.8

---
 Library/Homebrew/extend/os/mac/diagnostic.rb | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb
index df96a3b35c..17b19f27fa 100644
--- a/Library/Homebrew/extend/os/mac/diagnostic.rb
+++ b/Library/Homebrew/extend/os/mac/diagnostic.rb
@@ -201,12 +201,19 @@ module Homebrew
       end
 
       def check_ruby_version
-        return if RUBY_VERSION == HOMEBREW_REQUIRED_RUBY_VERSION
+        # TODO: require 2.6.8 for everyone once enough have updated to Monterey
+        required_version = if MacOS.version >= :monterey ||
+                              ENV["HOMEBREW_RUBY_PATH"].to_s.include?("/vendor/portable-ruby/")
+          "2.6.8"
+        else
+          HOMEBREW_REQUIRED_RUBY_VERSION
+        end
+        return if RUBY_VERSION == required_version
         return if Homebrew::EnvConfig.developer? && OS::Mac.version.prerelease?
 
         <<~EOS
           Ruby version #{RUBY_VERSION} is unsupported on #{MacOS.version}. Homebrew
-          is developed and tested on Ruby #{HOMEBREW_REQUIRED_RUBY_VERSION}, and may not work correctly
+          is developed and tested on Ruby #{required_version}, and may not work correctly
           on other Rubies. Patches are accepted as long as they don't cause breakage
           on supported Rubies.
         EOS