Merge pull request Homebrew#1469 from woodruffw/ruby-macho-revendor

vendor: Update ruby-macho to 0.2.6.

Library/Homebrew/os/mac/linkage_checker.rb

@@ -23,7 +23,10 @@ def check_dylibs
     @keg.find do |file|
       next if file.symlink? || file.directory?
       next unless file.dylib? || file.mach_o_executable? || file.mach_o_bundle?
-      file.dynamically_linked_libraries.each do |dylib|
+
+      # weakly loaded dylibs may not actually exist on disk, so skip them
+      # when checking for broken linkage
+      file.dynamically_linked_libraries(except: :LC_LOAD_WEAK_DYLIB).each do |dylib|
         @reverse_links[dylib] << file
         if dylib.start_with? "@"
           @variable_dylibs << dylib

Library/Homebrew/os/mac/mach.rb

@@ -1,7 +1,7 @@
 require "vendor/macho/macho"
 require "os/mac/architecture_list"
 
-module MachO
+module MachOShim
   # @private
   def macho
     @macho ||= begin
@@ -51,8 +51,10 @@ def mach_data
     end
   end
 
-  def dynamically_linked_libraries
-    macho.linked_dylibs
+  def dynamically_linked_libraries(except: :none)
+    lcs = macho.dylib_load_commands.reject { |lc| lc.type == except }
+
+    lcs.map(&:name).map(&:to_s)
   end
 
   def dylib_id

Library/Homebrew/os/mac/pathname.rb

@@ -1,5 +1,5 @@
 require "os/mac/mach"
 
 class Pathname
-  include MachO
+  include MachOShim
 end

Library/Homebrew/vendor/README.md

@@ -5,7 +5,7 @@ Vendored Dependencies
 
 * [plist](https://github.com/bleything/plist), version 3.1.0
 
-* [ruby-macho](https://github.com/Homebrew/ruby-macho), version 0.2.5
+* [ruby-macho](https://github.com/Homebrew/ruby-macho), version 0.2.6
 
 ## Licenses:
 

Library/Homebrew/vendor/macho/macho.rb

@@ -13,5 +13,5 @@
 # The primary namespace for ruby-macho.
 module MachO
   # release version
-  VERSION = "0.2.5".freeze
+  VERSION = "0.2.6".freeze
 end

Library/Homebrew/vendor/macho/macho/fat_file.rb

@@ -34,9 +34,7 @@ def initialize(filename)
 
       @filename = filename
       @raw_data = File.open(@filename, "rb", &:read)
-      @header = populate_fat_header
-      @fat_archs = populate_fat_archs
-      @machos = populate_machos
+      populate_fields
     end
 
     # Initializes a new FatFile instance from a binary string.
@@ -45,9 +43,7 @@ def initialize(filename)
     def initialize_from_bin(bin)
       @filename = nil
       @raw_data = bin
-      @header = populate_fat_header
-      @fat_archs = populate_fat_archs
-      @machos = populate_machos
+      populate_fields
     end
 
     # The file's raw fat data.
@@ -122,6 +118,21 @@ def filetype
       machos.first.filetype
     end
 
+    # Populate the instance's fields with the raw Fat Mach-O data.
+    # @return [void]
+    # @note This method is public, but should (almost) never need to be called.
+    def populate_fields
+      @header = populate_fat_header
+      @fat_archs = populate_fat_archs
+      @machos = populate_machos
+    end
+
+    # All load commands responsible for loading dylibs in the file's Mach-O's.
+    # @return [Array<MachO::DylibCommand>] an array of DylibCommands
+    def dylib_load_commands
+      machos.map(&:dylib_load_commands).flatten
+    end
+
     # The file's dylib ID. If the file is not a dylib, returns `nil`.
     # @example
     #  file.dylib_id # => 'libBar.dylib'
@@ -149,7 +160,7 @@ def change_dylib_id(new_id, options = {})
         macho.change_dylib_id(new_id, options)
       end
 
-      synchronize_raw_data
+      repopulate_raw_machos
     end
 
     alias dylib_id= change_dylib_id
@@ -180,7 +191,7 @@ def change_install_name(old_name, new_name, options = {})
         macho.change_install_name(old_name, new_name, options)
       end
 
-      synchronize_raw_data
+      repopulate_raw_machos
     end
 
     alias change_dylib change_install_name
@@ -206,7 +217,7 @@ def change_rpath(old_path, new_path, options = {})
         macho.change_rpath(old_path, new_path, options)
       end
 
-      synchronize_raw_data
+      repopulate_raw_machos
     end
 
     # Add the given runtime path to the file's Mach-Os.
@@ -221,7 +232,7 @@ def add_rpath(path, options = {})
         macho.add_rpath(path, options)
       end
 
-      synchronize_raw_data
+      repopulate_raw_machos
     end
 
     # Delete the given runtime path from the file's Mach-Os.
@@ -236,7 +247,7 @@ def delete_rpath(path, options = {})
         macho.delete_rpath(path, options)
       end
 
-      synchronize_raw_data
+      repopulate_raw_machos
     end
 
     # Extract a Mach-O with the given CPU type from the file.
@@ -324,6 +335,17 @@ def populate_machos
       machos
     end
 
+    # Repopulate the raw Mach-O data with each internal Mach-O object.
+    # @return [void]
+    # @api private
+    def repopulate_raw_machos
+      machos.each_with_index do |macho, i|
+        arch = fat_archs[i]
+
+        @raw_data[arch.offset, arch.size] = macho.serialize
+      end
+    end
+
     # Yield each Mach-O object in the file, rescuing and accumulating errors.
     # @param options [Hash]
     # @option options [Boolean] :strict (true) whether or not to fail loudly
@@ -351,16 +373,5 @@ def each_macho(options = {})
       # Non-strict mode: Raise first error if *all* Mach-O slices failed.
       raise errors.first if errors.size == machos.size
     end
-
-    # Synchronize the raw file data with each internal Mach-O object.
-    # @return [void]
-    # @api private
-    def synchronize_raw_data
-      machos.each_with_index do |macho, i|
-        arch = fat_archs[i]
-
-        @raw_data[arch.offset, arch.size] = macho.serialize
-      end
-    end
   end
 end

Library/Homebrew/vendor/macho/macho/load_commands.rb

@@ -612,52 +612,14 @@ def initialize(view, cmd, cmdsize, init_address, init_module, reserved1,
   # A load command containing the address of the dynamic shared library
   # initialization routine and an index into the module table for the module
   # that defines the routine. Corresponds to LC_ROUTINES_64.
-  class RoutinesCommand64 < LoadCommand
-    # @return [Fixnum] the address of the initialization routine
-    attr_reader :init_address
-
-    # @return [Fixnum] the index into the module table that the init routine is defined in
-    attr_reader :init_module
-
-    # @return [void]
-    attr_reader :reserved1
-
-    # @return [void]
-    attr_reader :reserved2
-
-    # @return [void]
-    attr_reader :reserved3
-
-    # @return [void]
-    attr_reader :reserved4
-
-    # @return [void]
-    attr_reader :reserved5
-
-    # @return [void]
-    attr_reader :reserved6
-
+  class RoutinesCommand64 < RoutinesCommand
     # @see MachOStructure::FORMAT
     # @api private
     FORMAT = "L=2Q=8".freeze
 
     # @see MachOStructure::SIZEOF
     # @api private
     SIZEOF = 72
-
-    # @api private
-    def initialize(view, cmd, cmdsize, init_address, init_module, reserved1,
-                   reserved2, reserved3, reserved4, reserved5, reserved6)
-      super(view, cmd, cmdsize)
-      @init_address = init_address
-      @init_module = init_module
-      @reserved1 = reserved1
-      @reserved2 = reserved2
-      @reserved3 = reserved3
-      @reserved4 = reserved4
-      @reserved5 = reserved5
-      @reserved6 = reserved6
-    end
   end
 
   # A load command signifying membership of a subframework containing the name