patchelf 1.2.0 → 1.4.0

data/lib/patchelf/cli.rb

@@ -139,7 +139,7 @@ module PatchELF
           @options[:set][:soname] = soname
         end
 
-        opts.on('--version', 'Show current gem\'s version.') {}
+        opts.on('--version', 'Show current gem\'s version.')
       end
     end
 

data/lib/patchelf/exceptions.rb

@@ -6,8 +6,10 @@ require 'elftools/exceptions'
 module PatchELF
   # Raised on an error during ELF modification.
   class PatchError < ELFTools::ELFError; end
+
   # Raised when Dynamic Tag is missing
   class MissingTagError < PatchError; end
+
   # Raised on missing Program Header(segment)
   class MissingSegmentError < PatchError; end
 end

data/lib/patchelf/helper.rb

@@ -3,9 +3,6 @@
 module PatchELF
   # Helper methods for internal usage.
   module Helper
-    # The size of one page.
-    PAGE_SIZE = 0x1000
-
     module_function
 
     # Color codes for pretty print.
@@ -16,6 +13,23 @@ module PatchELF
       error: "\e[38;5;196m" # heavy red
     }.freeze
 
+    # The size of one page.
+    def page_size(e_machine = nil)
+      # Different architectures have different minimum section alignments.
+      case e_machine
+      when ELFTools::Constants::EM_SPARC,
+           ELFTools::Constants::EM_MIPS,
+           ELFTools::Constants::EM_PPC,
+           ELFTools::Constants::EM_PPC64,
+           ELFTools::Constants::EM_AARCH64,
+           ELFTools::Constants::EM_TILEGX,
+           ELFTools::Constants::EM_LOONGARCH
+        0x10000
+      else
+        0x1000
+      end
+    end
+
     # For wrapping string with color codes for prettier inspect.
     # @param [String] str
     #   Content to colorize.
@@ -48,7 +62,7 @@ module PatchELF
     #   #=> 32
     #   aligndown(0x10, 0x8)
     #   #=> 16
-    def aligndown(val, align = PAGE_SIZE)
+    def aligndown(val, align = page_size)
       val - (val & (align - 1))
     end
 
@@ -63,7 +77,7 @@ module PatchELF
     #   #=> 64
     #   alignup(0x10, 0x8)
     #   #=> 16
-    def alignup(val, align = PAGE_SIZE)
+    def alignup(val, align = page_size)
       (val & (align - 1)).zero? ? val : (aligndown(val, align) + align)
     end
   end

data/lib/patchelf/logger.rb

@@ -15,7 +15,7 @@ module PatchELF
       end
     end
 
-    %i[info warn error].each do |sym|
+    %i[debug info warn error level=].each do |sym|
       define_method(sym) do |msg|
         @logger.__send__(sym, msg)
         nil

data/lib/patchelf/mm.rb

@@ -115,7 +115,7 @@ module PatchELF
       # prefer backward than forward
       return extend_backward(loads[idx - 1]) if writable?(loads[idx - 1])
 
-      # note: loads[idx].file_head has been changed in shift_attributes
+      # NOTE: loads[idx].file_head has been changed in shift_attributes
       extend_forward(loads[idx], @extend_size)
     end
 
@@ -161,7 +161,7 @@ module PatchELF
 
         seg.header.p_offset += extend_size
         # We have to change align of LOAD segment since ld.so checks it.
-        seg.header.p_align = Helper::PAGE_SIZE if seg.is_a?(ELFTools::Segments::LoadSegment)
+        seg.header.p_align = Helper.page_size if seg.is_a?(ELFTools::Segments::LoadSegment)
       end
 
       @elf.header.e_shoff += extend_size if @elf.header.e_shoff >= threshold

data/lib/patchelf/patcher.rb

@@ -30,7 +30,7 @@ module PatchELF
       @elf = ELFTools::ELFFile.new(File.open(filename))
       @set = {}
       @rpath_sym = :runpath
-      @on_error = !logging ? :exception : on_error
+      @on_error = logging ? on_error : :exception
 
       on_error_syms = %i[exception log silent]
       raise ArgumentError, "on_error must be one of #{on_error_syms}" unless on_error_syms.include?(@on_error)
@@ -173,13 +173,20 @@ module PatchELF
     # Save the patched ELF as +out_file+.
     # @param [String?] out_file
     #   If +out_file+ is +nil+, the original input file will be modified.
+    # @param [Boolean] patchelf_compatible
+    #   When +patchelf_compatible+ is true, tries to produce same ELF as the one produced by NixOS/patchelf.
     # @return [void]
-    def save(out_file = nil)
+    def save(out_file = nil, patchelf_compatible: false)
       # If nothing is modified, return directly.
       return if out_file.nil? && !dirty?
 
       out_file ||= @in_file
-      saver = PatchELF::Saver.new(@in_file, out_file, @set)
+      saver = if patchelf_compatible
+                require 'patchelf/alt_saver'
+                PatchELF::AltSaver.new(@in_file, out_file, @set)
+              else
+                PatchELF::Saver.new(@in_file, out_file, @set)
+              end
 
       saver.save!
     end

data/lib/patchelf/saver.rb

@@ -53,8 +53,8 @@ module PatchELF
     def patch_interpreter
       return if @set[:interpreter].nil?
 
-      new_interp = @set[:interpreter] + "\x00"
-      old_interp = @elf.segment_by_type(:interp).interp_name + "\x00"
+      new_interp = "#{@set[:interpreter]}\x00"
+      old_interp = "#{@elf.segment_by_type(:interp).interp_name}\x00"
       return if old_interp == new_interp
 
       # These headers must be found here but not in the proc.
@@ -121,30 +121,27 @@ module PatchELF
     def patch_needed
       original_needs = dynamic.tags_by_type(:needed)
       @set[:needed].uniq!
+
+      original = original_needs.map(&:name)
+      replace = @set[:needed]
+
       # 3 sets:
       # 1. in original and in needs - remain unchanged
       # 2. in original but not in needs - remove
       # 3. not in original and in needs - append
-      original_needs.each do |n|
-        next if @set[:needed].include?(n.name)
-
-        n.header.d_tag = IGNORE # temporarily mark
-      end
-
-      extra = @set[:needed] - original_needs.map(&:name)
-      original_needs.each do |n|
-        break if extra.empty?
-        next if n.header.d_tag != IGNORE
+      append = replace - original
+      remove = original - replace
 
-        n.header.d_tag = ELFTools::Constants::DT_NEEDED
-        reg_str_table(extra.shift) { |idx| n.header.d_val = idx }
+      ignored_dyns = remove.each_with_object([]) do |name, ignored|
+        dyn = original_needs.find { |n| n.name == name }.header
+        dyn.d_tag = IGNORE
+        ignored << dyn
       end
-      return if extra.empty?
 
-      # no spaces, need append
-      extra.each do |name|
-        tag = lazy_dyn(:needed)
-        reg_str_table(name) { |idx| tag.d_val = idx }
+      append.zip(ignored_dyns) do |name, ignored_dyn|
+        dyn = ignored_dyn || lazy_dyn(:needed)
+        dyn.d_tag = ELFTools::Constants::DT_NEEDED
+        reg_str_table(name) { |idx| dyn.d_val = idx }
       end
     end
 
@@ -187,7 +184,7 @@ module PatchELF
       need_size = strtab_string.size + @strtab_extend_requests.reduce(0) { |sum, (str, _)| sum + str.size + 1 }
       dynstr = section_header('.dynstr')
       @mm.malloc(need_size) do |off, vaddr|
-        new_str = strtab_string + @strtab_extend_requests.map(&:first).join("\x00") + "\x00"
+        new_str = "#{strtab_string}#{@strtab_extend_requests.map(&:first).join("\x00")}\x00"
         inline_patch(off, new_str)
         cur = strtab_string.size
         @strtab_extend_requests.each do |str, block|
@@ -209,7 +206,7 @@ module PatchELF
     # @yieldparam [Integer] idx
     # @yieldreturn [void]
     def reg_str_table(str, &block)
-      idx = strtab_string.index(str + "\x00")
+      idx = strtab_string.index("#{str}\x00")
       # Request string is already exist
       return yield idx if idx
 

data/lib/patchelf/version.rb

@@ -2,5 +2,5 @@
 
 module PatchELF
   # Current gem version.
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.4.0'.freeze
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: patchelf
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - david942j
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2022-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elftools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.62'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.62'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -73,6 +73,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.17'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -80,6 +83,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.17'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: tty-platform
   requirement: !ruby/object:Gem::Requirement
@@ -121,6 +127,7 @@ files:
 - README.md
 - bin/patchelf.rb
 - lib/patchelf.rb
+- lib/patchelf/alt_saver.rb
 - lib/patchelf/cli.rb
 - lib/patchelf/exceptions.rb
 - lib/patchelf/helper.rb
@@ -132,7 +139,8 @@ files:
 homepage: https://github.com/david942j/patchelf.rb
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -141,14 +149,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: patchelf