diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock index eeecdb0f87..72612f6998 100644 --- a/Library/Homebrew/Gemfile.lock +++ b/Library/Homebrew/Gemfile.lock @@ -52,7 +52,7 @@ GEM racc patchelf (1.4.0) elftools (>= 1.2) - plist (3.7.0) + plist (3.7.1) prettier_print (1.2.1) prism (0.19.0) pry (0.14.2) diff --git a/Library/Homebrew/api.rb b/Library/Homebrew/api.rb index db13468e4f..fdf80e98ec 100644 --- a/Library/Homebrew/api.rb +++ b/Library/Homebrew/api.rb @@ -4,6 +4,7 @@ require "api/analytics" require "api/cask" require "api/formula" +require "base64" # TODO: Add this to the Gemfile or remove it before moving to Ruby 3.4. require "extend/cachable" module Homebrew diff --git a/Library/Homebrew/sorbet/rbi/gems/plist@3.7.0.rbi b/Library/Homebrew/sorbet/rbi/gems/plist@3.7.1.rbi similarity index 96% rename from Library/Homebrew/sorbet/rbi/gems/plist@3.7.0.rbi rename to Library/Homebrew/sorbet/rbi/gems/plist@3.7.1.rbi index 8b58e3a3d8..bff5bc5f90 100644 --- a/Library/Homebrew/sorbet/rbi/gems/plist@3.7.0.rbi +++ b/Library/Homebrew/sorbet/rbi/gems/plist@3.7.1.rbi @@ -4,13 +4,13 @@ # This is an autogenerated file for types exported from the `plist` gem. # Please instead update this file by running `bin/tapioca gem plist`. -# source://plist//lib/plist/generator.rb#174 +# source://plist//lib/plist/generator.rb#172 class Array include ::Enumerable include ::Plist::Emit end -# source://plist//lib/plist/generator.rb#178 +# source://plist//lib/plist/generator.rb#176 class Hash include ::Enumerable include ::Plist::Emit @@ -92,7 +92,7 @@ module Plist::Emit # source://plist//lib/plist/generator.rb#55 def save_plist(obj, filename, options = T.unsafe(nil)); end - # source://plist//lib/plist/generator.rb#162 + # source://plist//lib/plist/generator.rb#160 def wrap(contents); end end end @@ -112,16 +112,16 @@ class Plist::Emit::PlistBuilder private - # source://plist//lib/plist/generator.rb#157 + # source://plist//lib/plist/generator.rb#155 def comment_tag(content); end # source://plist//lib/plist/generator.rb#125 def data_tag(data, level); end - # source://plist//lib/plist/generator.rb#144 + # source://plist//lib/plist/generator.rb#142 def element_type(item); end - # source://plist//lib/plist/generator.rb#140 + # source://plist//lib/plist/generator.rb#138 def indent(str, level); end # source://plist//lib/plist/generator.rb#113 @@ -171,9 +171,9 @@ class Plist::PArray < ::Plist::PTag def to_ruby; end end -# source://plist//lib/plist/parser.rb#250 +# source://plist//lib/plist/parser.rb#249 class Plist::PData < ::Plist::PTag - # source://plist//lib/plist/parser.rb#251 + # source://plist//lib/plist/parser.rb#250 def to_ruby; end end diff --git a/Library/Homebrew/vendor/bundle/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb index dc1774b1ba..f5cd0336e7 100644 --- a/Library/Homebrew/vendor/bundle/bundler/setup.rb +++ b/Library/Homebrew/vendor/bundle/bundler/setup.rb @@ -74,7 +74,7 @@ $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-runtime-0.5.11155/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/parlour-8.1.0/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/patchelf-1.4.0/lib") -$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/plist-3.7.0/lib") +$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/plist-3.7.1/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/prettier_print-1.2.1/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/x86_64-darwin-15/#{Gem.extension_api_version}/prism-0.19.0") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/prism-0.19.0/lib") diff --git a/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.0/LICENSE.txt b/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.1/LICENSE.txt similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.0/LICENSE.txt rename to Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.1/LICENSE.txt diff --git a/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.0/lib/plist.rb b/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.1/lib/plist.rb similarity index 95% rename from Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.0/lib/plist.rb rename to Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.1/lib/plist.rb index 2304992dfa..0939cb359a 100644 --- a/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.0/lib/plist.rb +++ b/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.1/lib/plist.rb @@ -9,7 +9,6 @@ # Distributed under the MIT License # -require 'base64' require 'cgi' require 'stringio' diff --git a/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.0/lib/plist/generator.rb b/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.1/lib/plist/generator.rb similarity index 96% rename from Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.0/lib/plist/generator.rb rename to Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.1/lib/plist/generator.rb index 0b8af54b3f..5d17d55f5f 100644 --- a/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.0/lib/plist/generator.rb +++ b/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.1/lib/plist/generator.rb @@ -124,11 +124,9 @@ module Plist def data_tag(data, level) # note that apple plists are wrapped at a different length then - # what ruby's base64 wraps by default. - # I used #encode64 instead of #b64encode (which allows a length arg) - # because b64encode is b0rked and ignores the length arg. + # what ruby's pack wraps by default. tag('data', nil, level) do - Base64.encode64(data) + [data].pack("m") # equivalent to Base64.encode64(data) .gsub(/\s+/, '') .scan(/.{1,68}/o) .collect { |line| indent(line, level) } diff --git a/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.0/lib/plist/parser.rb b/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.1/lib/plist/parser.rb similarity index 98% rename from Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.0/lib/plist/parser.rb rename to Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.1/lib/plist/parser.rb index 6b83ed42ed..038b194387 100755 --- a/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.0/lib/plist/parser.rb +++ b/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.1/lib/plist/parser.rb @@ -246,10 +246,10 @@ module Plist end end - require 'base64' class PData < PTag def to_ruby - data = Base64.decode64(text.gsub(/\s+/, '')) unless text.nil? + # unpack("m")[0] is equivalent to Base64.decode64 + data = text.gsub(/\s+/, '').unpack("m")[0] unless text.nil? begin return Marshal.load(data) if options[:marshal] rescue Exception diff --git a/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.0/lib/plist/version.rb b/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.1/lib/plist/version.rb similarity index 57% rename from Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.0/lib/plist/version.rb rename to Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.1/lib/plist/version.rb index 4d1d5685f6..6417e8f9b4 100644 --- a/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.0/lib/plist/version.rb +++ b/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.1/lib/plist/version.rb @@ -1,5 +1,5 @@ # encoding: utf-8 module Plist - VERSION = '3.7.0'.freeze + VERSION = '3.7.1'.freeze end