diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock index d9387fba20..b53780ae26 100644 --- a/Library/Homebrew/Gemfile.lock +++ b/Library/Homebrew/Gemfile.lock @@ -158,6 +158,7 @@ GEM PLATFORMS aarch64-linux + arm-linux arm64-darwin x86_64-darwin x86_64-linux diff --git a/Library/Homebrew/vendor/bundle/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb index 2a5750bef2..818aa27033 100644 --- a/Library/Homebrew/vendor/bundle/bundler/setup.rb +++ b/Library/Homebrew/vendor/bundle/bundler/setup.rb @@ -65,7 +65,7 @@ $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rainbow-3.1.1/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-runtime-0.5.11353/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.5.0/lib") +$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/patchelf-1.5.1/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}/extensions/arm64-darwin-20/#{Gem.extension_api_version}/prism-0.24.0") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/prism-0.24.0/lib") diff --git a/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.0/lib/patchelf.rb b/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.1/lib/patchelf.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.0/lib/patchelf.rb rename to Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.1/lib/patchelf.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.0/lib/patchelf/alt_saver.rb b/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.1/lib/patchelf/alt_saver.rb similarity index 98% rename from Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.0/lib/patchelf/alt_saver.rb rename to Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.1/lib/patchelf/alt_saver.rb index 7937d14e6e..9ac3886491 100644 --- a/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.0/lib/patchelf/alt_saver.rb +++ b/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.1/lib/patchelf/alt_saver.rb @@ -451,10 +451,10 @@ module PatchELF begin new_index = new_section_idx(old_shndx) - next unless new_index rescue ArgumentError Logger.warn "entry #{entry} in symbol table refers to a non existing section, skipping" end + next unless new_index sym[pack[:st_shndx]] = new_index @@ -561,11 +561,12 @@ module PatchELF if needed_space > start_offset needed_space += seg_num_bytes # new load segment is required - needed_pages = Helper.alignup(needed_space - start_offset, page_size) / page_size + extra_bytes = needed_space - start_offset + needed_pages = Helper.alignup(extra_bytes, page_size) / page_size Logger.debug "needed pages is #{needed_pages}" raise PatchError, 'virtual address space underrun' if needed_pages * page_size > first_page - shift_file(needed_pages, start_offset) + shift_file(needed_pages, start_offset, extra_bytes) first_page -= needed_pages * page_size start_offset += needed_pages * page_size @@ -776,7 +777,7 @@ module PatchELF end # rubocop:enable Metrics/PerceivedComplexity - def shift_file(extra_pages, start_offset) + def shift_file(extra_pages, start_offset, extra_bytes) raise PatchError, "start_offset(#{start_offset}) < ehdr.num_bytes" if start_offset < ehdr.num_bytes oldsz = @buffer.size @@ -799,8 +800,8 @@ module PatchELF p_offset: split_phdr.p_offset - split_shift - shift, p_vaddr: split_phdr.p_vaddr - split_shift - shift, p_paddr: split_phdr.p_paddr - split_shift - shift, - p_filesz: split_shift + shift, - p_memsz: split_shift + shift, + p_filesz: split_shift + extra_bytes, + p_memsz: split_shift + extra_bytes, p_flags: ELFTools::Constants::PF_R | ELFTools::Constants::PF_W, p_align: page_size ) diff --git a/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.0/lib/patchelf/cli.rb b/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.1/lib/patchelf/cli.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.0/lib/patchelf/cli.rb rename to Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.1/lib/patchelf/cli.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.0/lib/patchelf/exceptions.rb b/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.1/lib/patchelf/exceptions.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.0/lib/patchelf/exceptions.rb rename to Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.1/lib/patchelf/exceptions.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.0/lib/patchelf/helper.rb b/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.1/lib/patchelf/helper.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.0/lib/patchelf/helper.rb rename to Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.1/lib/patchelf/helper.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.0/lib/patchelf/logger.rb b/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.1/lib/patchelf/logger.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.0/lib/patchelf/logger.rb rename to Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.1/lib/patchelf/logger.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.0/lib/patchelf/mm.rb b/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.1/lib/patchelf/mm.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.0/lib/patchelf/mm.rb rename to Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.1/lib/patchelf/mm.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.0/lib/patchelf/patcher.rb b/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.1/lib/patchelf/patcher.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.0/lib/patchelf/patcher.rb rename to Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.1/lib/patchelf/patcher.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.0/lib/patchelf/saver.rb b/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.1/lib/patchelf/saver.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.0/lib/patchelf/saver.rb rename to Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.1/lib/patchelf/saver.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.0/lib/patchelf/version.rb b/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.1/lib/patchelf/version.rb similarity index 73% rename from Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.0/lib/patchelf/version.rb rename to Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.1/lib/patchelf/version.rb index 73e384afa1..0389d29916 100644 --- a/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.0/lib/patchelf/version.rb +++ b/Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/patchelf-1.5.1/lib/patchelf/version.rb @@ -2,5 +2,5 @@ module PatchELF # Current gem version. - VERSION = '1.5.0'.freeze + VERSION = '1.5.1'.freeze end