ruby-macho 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 669b2133517dc564c92df8ebdc0b2f6fdc91869939cd6a642cfbc2b1c6e20a09
-  data.tar.gz: 0077afabc9c4be7d891e5c7e5a8b4ec173223b00f73d550fc96fb7cf4f103c1d
+  metadata.gz: cf1e87b27661d19099f8a7160c774dab716e37be7dec050f84c701e9fc6c1ea6
+  data.tar.gz: 18d7705d4204bd10bd593b7ab8759058d2cea94eadeed9d7edce06b96d303a9b
 SHA512:
-  metadata.gz: 4e8bd64595d93d50c0046c5bd292010a51a9d4154cbcda3a0a0a962882475e61d631d55da106e4655ba31a32011f583222d5b147129230e08ad11d12a34ee8e6
-  data.tar.gz: ccc53798eb56f378f5688ad7141636ecca274e552e8ad62f4fab5600b6a6fddcac0e5ffc75ed4924e62538a6b3ac7b291667870b6cd02bf0edf6286da1a4e62a
+  metadata.gz: 0c6007d3ef6a175bf58c6b900a42aacdfd557d1f283f3e144828c25a3207f4791ef031c3313ace7a4f807b62ecf05ffb7944ca39d746d6446d23d20c0c4a6166
+  data.tar.gz: d7345efc2941999717f803ae9740067ee4a53cec738fd44c0ea5cee610f1b7d28bac8bf572f5558ff02f63a590ce323f024b9e2fd6e55977fc521dcb39ca2c03

data/README.md

@@ -2,7 +2,7 @@ ruby-macho
 ================
 
 [![Gem Version](https://badge.fury.io/rb/ruby-macho.svg)](http://badge.fury.io/rb/ruby-macho)
-[![Build Status](https://travis-ci.org/Homebrew/ruby-macho.svg?branch=master)](https://travis-ci.org/Homebrew/ruby-macho)
+[![CI](https://github.com/Homebrew/ruby-macho/actions/workflows/tests.yml/badge.svg)](https://github.com/Homebrew/ruby-macho/actions/workflows/tests.yml)
 [![Coverage Status](https://codecov.io/gh/Homebrew/ruby-macho/branch/master/graph/badge.svg)](https://codecov.io/gh/Homebrew/ruby-macho)
 
 A Ruby library for examining and modifying Mach-O files.

data/lib/macho/load_commands.rb

@@ -65,6 +65,7 @@ module MachO
       (LC_REQ_DYLD | 0x33) => :LC_DYLD_EXPORTS_TRIE,
       (LC_REQ_DYLD | 0x34) => :LC_DYLD_CHAINED_FIXUPS,
       (LC_REQ_DYLD | 0x35) => :LC_FILESET_ENTRY,
+      0x36 => :LC_ATOM_INFO,
     }.freeze
 
     # association of symbol representations to load command constants
@@ -110,7 +111,7 @@ module MachO
       # "reserved for internal use only", no public struct
       :LC_PREPAGE => "LoadCommand",
       :LC_DYSYMTAB => "DysymtabCommand",
-      :LC_LOAD_DYLIB => "DylibCommand",
+      :LC_LOAD_DYLIB => "DylibUseCommand",
       :LC_ID_DYLIB => "DylibCommand",
       :LC_LOAD_DYLINKER => "DylinkerCommand",
       :LC_ID_DYLINKER => "DylinkerCommand",
@@ -122,7 +123,7 @@ module MachO
       :LC_SUB_LIBRARY => "SubLibraryCommand",
       :LC_TWOLEVEL_HINTS => "TwolevelHintsCommand",
       :LC_PREBIND_CKSUM => "PrebindCksumCommand",
-      :LC_LOAD_WEAK_DYLIB => "DylibCommand",
+      :LC_LOAD_WEAK_DYLIB => "DylibUseCommand",
       :LC_SEGMENT_64 => "SegmentCommand64",
       :LC_ROUTINES_64 => "RoutinesCommand64",
       :LC_UUID => "UUIDCommand",
@@ -153,6 +154,7 @@ module MachO
       :LC_DYLD_EXPORTS_TRIE => "LinkeditDataCommand",
       :LC_DYLD_CHAINED_FIXUPS => "LinkeditDataCommand",
       :LC_FILESET_ENTRY => "FilesetEntryCommand",
+      :LC_ATOM_INFO => "LinkeditDataCommand",
     }.freeze
 
     # association of segment name symbols to names
@@ -193,6 +195,20 @@ module MachO
       :SG_READ_ONLY => 0x10,
     }.freeze
 
+    # association of dylib use flag symbols to values
+    # @api private
+    DYLIB_USE_FLAGS = {
+      :DYLIB_USE_WEAK_LINK => 0x1,
+      :DYLIB_USE_REEXPORT => 0x2,
+      :DYLIB_USE_UPWARD => 0x4,
+      :DYLIB_USE_DELAYED_INIT => 0x8,
+    }.freeze
+
+    # the marker used to denote a newer style dylib use command.
+    # the value is the timestamp 24 January 1984 18:12:16
+    # @api private
+    DYLIB_USE_MARKER = 0x1a741800
+
     # The top-level Mach-O load command structure.
     #
     # This is the most generic load command -- only the type ID and size are
@@ -231,6 +247,13 @@ module MachO
         # cmd will be filled in, view and cmdsize will be left unpopulated
         klass_arity = klass.min_args - 3
 
+        # macOS 15 introduces a new dylib load command that adds a flags field to the end.
+        # It uses the same commands with it dynamically being created if the dylib has a flags field
+        if klass == DylibUseCommand && (args[1] != DYLIB_USE_MARKER || args.size <= DylibCommand.min_args - 3)
+          klass = DylibCommand
+          klass_arity = klass.min_args - 3
+        end
+
         raise LoadCommandCreationArityError.new(cmd_sym, klass_arity, args.size) if klass_arity > args.size
 
         klass.new(nil, cmd, nil, *args)
@@ -526,6 +549,23 @@ module MachO
       # @return [Integer] the library's compatibility version number
       field :compatibility_version, :uint32
 
+      # @example
+      #  puts "this dylib is weakly loaded" if dylib_command.flag?(:DYLIB_USE_WEAK_LINK)
+      # @param flag [Symbol] a dylib use command flag symbol
+      # @return [Boolean] true if `flag` applies to this dylib command
+      def flag?(flag)
+        case cmd
+        when LOAD_COMMAND_CONSTANTS[:LC_LOAD_WEAK_DYLIB]
+          flag == :DYLIB_USE_WEAK_LINK
+        when LOAD_COMMAND_CONSTANTS[:LC_REEXPORT_DYLIB]
+          flag == :DYLIB_USE_REEXPORT
+        when LOAD_COMMAND_CONSTANTS[:LC_LOAD_UPWARD_DYLIB]
+          flag == :DYLIB_USE_UPWARD
+        else
+          false
+        end
+      end
+
       # @param context [SerializationContext]
       #  the context
       # @return [String] the serialized fields of the load command
@@ -551,6 +591,65 @@ module MachO
       end
     end
 
+    # The newer format of load command representing some aspect of shared libraries,
+    # depending on filetype. Corresponds to LC_LOAD_DYLIB or LC_LOAD_WEAK_DYLIB.
+    class DylibUseCommand < DylibCommand
+      # @return [Integer] any flags associated with this dylib use command
+      field :flags, :uint32
+
+      alias marker timestamp
+
+      # Instantiates a new DylibCommand or DylibUseCommand.
+      # macOS 15 and later use a new format for dylib commands (DylibUseCommand),
+      # which is determined based on a special timestamp and the name offset.
+      # @param view [MachO::MachOView] the load command's raw view
+      # @return [DylibCommand] the new dylib load command
+      # @api private
+      def self.new_from_bin(view)
+        dylib_command = DylibCommand.new_from_bin(view)
+
+        if dylib_command.timestamp == DYLIB_USE_MARKER &&
+           dylib_command.name.to_i == DylibUseCommand.bytesize
+          super(view)
+        else
+          dylib_command
+        end
+      end
+
+      # @example
+      #  puts "this dylib is weakly loaded" if dylib_command.flag?(:DYLIB_USE_WEAK_LINK)
+      # @param flag [Symbol] a dylib use command flag symbol
+      # @return [Boolean] true if `flag` applies to this dylib command
+      def flag?(flag)
+        flag = DYLIB_USE_FLAGS[flag]
+
+        return false if flag.nil?
+
+        flags & flag == flag
+      end
+
+      # @param context [SerializationContext]
+      #  the context
+      # @return [String] the serialized fields of the load command
+      # @api private
+      def serialize(context)
+        format = Utils.specialize_format(self.class.format, context.endianness)
+        string_payload, string_offsets = Utils.pack_strings(self.class.bytesize,
+                                                            context.alignment,
+                                                            :name => name.to_s)
+        cmdsize = self.class.bytesize + string_payload.bytesize
+        [cmd, cmdsize, string_offsets[:name], marker, current_version,
+         compatibility_version, flags].pack(format) + string_payload
+      end
+
+      # @return [Hash] a hash representation of this {DylibUseCommand}
+      def to_h
+        {
+          "flags" => flags,
+        }.merge super
+      end
+    end
+
     # A load command representing some aspect of the dynamic linker, depending
     # on filetype. Corresponds to LC_ID_DYLINKER, LC_LOAD_DYLINKER, and
     # LC_DYLD_ENVIRONMENT.
@@ -958,7 +1057,7 @@ module MachO
     # the __LINKEDIT segment. Corresponds to LC_CODE_SIGNATURE,
     # LC_SEGMENT_SPLIT_INFO, LC_FUNCTION_STARTS, LC_DATA_IN_CODE,
     # LC_DYLIB_CODE_SIGN_DRS, LC_LINKER_OPTIMIZATION_HINT, LC_DYLD_EXPORTS_TRIE,
-    # or LC_DYLD_CHAINED_FIXUPS.
+    # LC_DYLD_CHAINED_FIXUPS, or LC_ATOM_INFO.
     class LinkeditDataCommand < LoadCommand
       # @return [Integer] offset to the data in the __LINKEDIT segment
       field :dataoff, :uint32

data/lib/macho/macho_file.rb

@@ -411,9 +411,15 @@ module MachO
 
     # Delete the given runtime path from the Mach-O.
     # @example
-    #  file.rpaths # => ["/lib"]
-    #  file.delete_rpath("/lib")
-    #  file.rpaths # => []
+    #  file1.rpaths # => ["/lib", "/usr/lib", "/lib"]
+    #  file1.delete_rpath("/lib")
+    #  file1.rpaths # => ["/usr/lib", "/lib"]
+    #  file2.rpaths # => ["foo", "foo"]
+    #  file2.delete_rpath("foo", :uniq => true)
+    #  file2.rpaths # => []
+    #  file3.rpaths # => ["foo", "bar", "foo"]
+    #  file3.delete_rpath("foo", :last => true)
+    #  file3.rpaths # => ["foo", "bar"]
     # @param path [String] the runtime path to delete
     # @param options [Hash]
     # @option options [Boolean] :uniq (false) if true, also delete
@@ -421,7 +427,7 @@ module MachO
     #  instance (by offset) of the requested path, unless :last is true.
     #  Incompatible with :last.
     # @option options [Boolean] :last (false) if true, delete the last
-    # instance (by offset) of the requested path. Incompatible with :uniq.
+    #  instance (by offset) of the requested path. Incompatible with :uniq.
     # @return void
     # @raise [RpathUnknownError] if no such runtime path exists
     # @raise [ArgumentError] if both :uniq and :last are true

data/lib/macho/structure.rb

@@ -131,7 +131,7 @@ module MachO
 
       # @param name [Symbol] name of internal field
       # @param type [Symbol] type of field in terms of binary size
-      # @param options [Hash] set of additonal options
+      # @param options [Hash] set of additional options
       # Expected options
       #   :size [Integer] size in bytes
       #   :mask [Integer] bitmask
@@ -236,7 +236,7 @@ module MachO
       # Generates a reader method for fields that need further unpacking.
       # @param name [Symbol] name of internal field
       # @param idx [Integer] the index of the field value in the @values array
-      # @param unpack [String] the format code used for futher binary unpacking
+      # @param unpack [String] the format code used for further binary unpacking
       # @api private
       def def_unpack_reader(name, idx, unpack)
         define_method(name) do

data/lib/macho.rb

@@ -16,7 +16,7 @@ require_relative "macho/tools"
 # The primary namespace for ruby-macho.
 module MachO
   # release version
-  VERSION = "4.0.0"
+  VERSION = "4.1.0"
 
   # Opens the given filename as a MachOFile or FatFile, depending on its magic.
   # @param filename [String] the file being opened

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-macho
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - William Woodruff
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-25 00:00:00.000000000 Z
+date: 2024-06-11 00:00:00.000000000 Z
 dependencies: []
 description: A library for viewing and manipulating Mach-O files in Ruby.
 email: william@yossarian.net
@@ -35,7 +35,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -51,7 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.10
-signing_key:
+signing_key: 
 specification_version: 4
 summary: ruby-macho - Mach-O file analyzer.
 test_files: []