fpm 1.15.1 → 1.17.0

data/lib/fpm/package/rpm.rb

@@ -156,7 +156,7 @@ class FPM::Package::RPM < FPM::Package
 
   option "--macro-expansion", :flag,
            "install-time macro expansion in %pre %post %preun %postun scripts " \
-           "(see: https://rpm.org/user_doc/scriptlet_expansion.html)", :default => false
+           "(see: https://rpm-software-management.github.io/rpm/manual/scriptlet_expansion.html)", :default => false
 
   option "--verifyscript", "FILE",
     "a script to be run on verification" do |val|
@@ -175,7 +175,7 @@ class FPM::Package::RPM < FPM::Package
      rpm_trigger = []
      option "--trigger-#{trigger_type}", "'[OPT]PACKAGE: FILEPATH'", "Adds a rpm trigger script located in FILEPATH, " \
             "having 'OPT' options and linking to 'PACKAGE'. PACKAGE can be a comma seperated list of packages. " \
-            "See: http://rpm.org/api/4.4.2.2/triggers.html" do |trigger|
+            "See: https://rpm-software-management.github.io/rpm/manual/triggers.html" do |trigger|
        match = trigger.match(/^(\[.*\]|)(.*): (.*)$/)
        @logger.fatal("Trigger '#{trigger_type}' definition can't be parsed ('#{trigger}')") unless match
        opt, pkg, file = match.captures
@@ -185,6 +185,9 @@ class FPM::Package::RPM < FPM::Package
      end
    end
 
+  option "--old-perl-dependency-name", :flag,
+    "Use older 'perl' depdency name. Newer Red Hat (and derivatives) use a dependency named 'perl-interpreter'."
+
   private
 
   # Fix path name
@@ -196,8 +199,8 @@ class FPM::Package::RPM < FPM::Package
   # If and only if any of the above are done, then also replace ' with \', " with \", and \ with \\\\
   #   to accommodate escape and quote processing that rpm will perform in that case (but not otherwise)
   def rpm_fix_name(name)
-    if name.match?(/[ \t*?%$\[\]]/)
-      name = name.gsub(/(\ |\t|\[|\]|\*|\?|\%|\$|'|"|\\)/, {
+    if name.match?(/[ \t*?%${}\[\]]/)
+      name = name.gsub(/(\ |\t|\[|\]|\*|\?|\%|\$|'|"|\{|\}|\\)/, {
         ' '  => '?',
         "\t" => '?',
         '%'  => '[%]',
@@ -206,6 +209,10 @@ class FPM::Package::RPM < FPM::Package
         '*'  => '[*]',
         '['  => '[\[]',
         ']'  => '[\]]',
+        #'{'  => '[\{]',
+        #'}'  => '[\}]',
+        '{'  => '?',
+        '}'  => '?',
         '"'  => '\\"',
         "'"  => "\\'",
         '\\' => '\\\\\\\\',
@@ -275,9 +282,41 @@ class FPM::Package::RPM < FPM::Package
     return @iteration ? @iteration : 1
   end # def iteration
 
+  # Generate a generic changelog or return an existing definition
+  def changelog
+    if attributes[:rpm_changelog]
+      return attributes[:rpm_changelog]
+    end
+
+    reldate = if attributes[:source_date_epoch].nil?
+                Time.now()
+              else
+                Time.at(attributes[:source_date_epoch].to_i)
+              end
+    changed = reldate.strftime("%a %b %_e %Y")
+    changev = "#{version}-#{iteration}"
+    changev += "%{?dist}" if attributes[:rpm_dist]
+
+    "* #{changed}  #{maintainer} - #{changev}\n- Package created with FPM\n"
+  end
+
   # See FPM::Package#converted_from
   def converted_from(origin)
-    if origin == FPM::Package::Gem
+    if origin == FPM::Package::CPAN
+      if !attributes[:rpm_old_perl_dependency_name?]
+        fixed_deps = []
+        self.dependencies.collect do |dep|
+          # RPM package "perl" is a metapackage which install all the Perl bits and core modules, then gcc...
+          # this must be replaced by perl-interpreter
+          if name=/^perl([\s<>=].*)$/.match(dep)
+            fixed_deps.push("perl-interpreter#{name[1]}")
+          else
+            fixed_deps.push(dep)
+          end
+        end
+        self.dependencies = fixed_deps
+      end
+    elsif origin == FPM::Package::Gem
       fixed_deps = []
       self.dependencies.collect do |dep|
         # Gem dependency operator "~>" is not compatible with rpm. Translate any found.
@@ -473,6 +512,7 @@ class FPM::Package::RPM < FPM::Package
     args += ["--define", "dist .#{attributes[:rpm_dist]}"] if attributes[:rpm_dist]
 
     args += [
+      "--buildroot", "#{build_path}/BUILD",
       "--define", "buildroot #{build_path}/BUILD",
       "--define", "_topdir #{build_path}",
       "--define", "_sourcedir #{build_path}",

data/lib/fpm/package/virtualenv.rb

@@ -36,7 +36,7 @@ class FPM::Package::Virtualenv < FPM::Package
     :default => nil
 
   option "--setup-install", :flag, "After building virtualenv run setup.py install "\
-  "useful when building a virtualenv for packages and including their requirements from "
+  "useful when building a virtualenv for packages and including their requirements from "\
   "requirements.txt"
 
   option "--system-site-packages", :flag, "Give the virtual environment access to the "\
@@ -158,6 +158,31 @@ class FPM::Package::Virtualenv < FPM::Package
       end
     end
 
+    # [2025-09-30] virtualenv-tools seems broken?
+    # The --update-path will look for a VIRTUAL_ENV= line in bin/activate,
+    # however, the version I tested looks for it with quotations, like VIRTUAL_ENV='
+    # And at time of writing, my `virtualenv` tool doesn't use quotations on this variable
+    #
+    # Maybe best case we can patch it here instead. The path update tool
+    # looks for the original virtualenv path and I think updates any bin 
+    # files which point to it.
+    patched = []
+    activate_bin = File.join(virtualenv_build_folder, "bin/activate")
+    fd = File.open(activate_bin)
+    fd.each_line do |line|
+      re = /^VIRTUAL_ENV=([^'"].*)$/
+      match = line.match(re)
+      if match
+        # Quote the VIRTUAL_ENV var assignment to help virtualenv-tools work?
+        patched << "VIRTUAL_ENV='#{match}'\n"
+      else
+        patched << line
+      end
+    end
+    fd.close
+    File.write(activate_bin, patched.join)
+
+    # Rewrite the base path inside the virtualenv to prepare it to be packaged.
     ::Dir.chdir(virtualenv_build_folder) do
       safesystem("virtualenv-tools", "--update-path", virtualenv_folder)
     end
@@ -191,7 +216,6 @@ class FPM::Package::Virtualenv < FPM::Package
     dir.input(".")
     @staging_path = dir.staging_path
     dir.cleanup_build
-
   end # def input
 
   # Delete python precompiled files found in a given folder.

data/lib/fpm/package.rb

@@ -3,7 +3,6 @@ require "fpm/util" # local
 require "pathname" # stdlib
 require "find"
 require "tmpdir" # stdlib
-require "ostruct"
 require "backports/latest"
 require "socket" # stdlib, for Socket.gethostname
 require "shellwords" # stdlib, for Shellwords.escape

data/lib/fpm/rake_task.rb

@@ -1,13 +1,39 @@
 require "fpm/namespace"
-require "ostruct"
 require "rake"
 require "rake/tasklib"
 
 class FPM::RakeTask < Rake::TaskLib
+  class Options
+    attr_accessor :args
+
+    def initialize(defaults=nil)
+      if defaults.nil?
+        @h = Hash.new
+      else
+        @h = defaults
+      end
+    end
+
+    def method_missing(m, *args)
+      if m.end_with?("=")
+        raise ArgumentError, "#{self.class.name}##{m} ... Expected 1 arg, got #{args.length}" if args.length != 1
+        @h[m[0...-1]] = args[0]
+      else
+        raise ArgumentError, "Expected 0 arg, got #{args.length}" if args.length != 0
+        return @h[m]
+      end
+    end
+
+    def to_h
+      return @h
+    end
+  end # Options
+
   attr_reader :options
 
   def initialize(package_name, opts = {}, &block)
-    @options = OpenStruct.new(:name => package_name.to_s)
+    #@options = OpenStruct.new(:name => package_name.to_s)
+    @options = Options.new(:name => package_name.to_s)
     @source, @target = opts.values_at(:source, :target).map(&:to_s)
     @directory = File.expand_path(opts[:directory].to_s)
 
@@ -18,8 +44,8 @@ class FPM::RakeTask < Rake::TaskLib
 
     task(options.name) do |_, task_args|
       block.call(*[options, task_args].first(block.arity)) if block_given?
-      abort("Must specify args") unless options.respond_to?(:args)
-      @args = options.delete_field(:args)
+      abort("Must specify args") if options.args.nil?
+      @args = options.args
       run_cli
     end
   end

data/lib/fpm/util.rb

@@ -1,5 +1,6 @@
 require "fpm/namespace"
 require "fileutils"
+require "stud/temporary"
 
 # Some utility functions
 module FPM::Util
@@ -135,7 +136,7 @@ module FPM::Util
       raise ExecutableNotFound.new(program)
     end
 
-    logger.debug("Running command", :args => args2)
+    logger.info("Running command", :args => args2)
 
     stdout_r, stdout_w = IO.pipe
     stderr_r, stderr_w = IO.pipe
@@ -229,15 +230,18 @@ module FPM::Util
     @@ar_cmd_deterministic = false
 
     # FIXME: don't assume current directory writeable
-    FileUtils.touch(["fpm-dummy.tmp"])
+    emptyfile = Stud::Temporary.pathname
+    testarchive = Stud::Temporary.pathname
+    FileUtils.touch([emptyfile])
+
     ["ar", "gar"].each do |ar|
       ["-qc", "-qcD"].each do |ar_create_opts|
-        FileUtils.rm_f(["fpm-dummy.ar.tmp"])
+        FileUtils.rm_f([testarchive])
         # Return this combination if it creates archives without uids or timestamps.
         # Exitstatus will be nonzero if the archive can't be created,
         # or its table of contents doesn't match the regular expression.
         # Be extra-careful about locale and timezone when matching output.
-        system("#{ar} #{ar_create_opts} fpm-dummy.ar.tmp fpm-dummy.tmp 2>/dev/null && env TZ=UTC LANG=C LC_TIME=C #{ar} -tv fpm-dummy.ar.tmp | grep '0/0.*1970' > /dev/null 2>&1")
+        system("#{ar} #{ar_create_opts} #{testarchive} #{emptyfile} 2>/dev/null && env TZ=UTC LANG=C LC_TIME=C #{ar} -tv #{testarchive} | grep '0/0.*1970' > /dev/null 2>&1")
         if $?.exitstatus == 0
            @@ar_cmd = [ar, ar_create_opts]
            @@ar_cmd_deterministic = true
@@ -247,10 +251,8 @@ module FPM::Util
     end
     # If no combination of ar and options omits timestamps, fall back to default.
     @@ar_cmd = ["ar", "-qc"]
+    FileUtils.rm_f([testarchive, emptyfile])
     return @@ar_cmd
-  ensure
-    # Clean up
-    FileUtils.rm_f(["fpm-dummy.ar.tmp", "fpm-dummy.tmp"])
   end # def ar_cmd
 
   # Return whether the command returned by ar_cmd can create deterministic archives
@@ -264,7 +266,10 @@ module FPM::Util
     return @@tar_cmd if defined? @@tar_cmd
 
     # FIXME: don't assume current directory writeable
-    FileUtils.touch(["fpm-dummy.tmp"])
+    emptyfile = Stud::Temporary.pathname
+    testarchive = Stud::Temporary.pathname
+
+    FileUtils.touch([emptyfile])
 
     # Prefer tar that supports more of the features we want, stop if we find tar of our dreams
     best="tar"
@@ -276,7 +281,7 @@ module FPM::Util
       opts=[]
       score=0
       ["--sort=name", "--mtime=@0"].each do |opt|
-        system("#{tar} #{opt} -cf fpm-dummy.tar.tmp fpm-dummy.tmp > /dev/null 2>&1")
+        system("#{tar} #{opt} -cf #{testarchive} #{emptyfile} > /dev/null 2>&1")
         if $?.exitstatus == 0
           opts << opt
           score += 1
@@ -292,10 +297,9 @@ module FPM::Util
       end
     end
     @@tar_cmd = best
+    FileUtils.rm_f([testarchive, emptyfile])
+
     return @@tar_cmd
-  ensure
-    # Clean up
-    FileUtils.rm_f(["fpm-dummy.tar.tmp", "fpm-dummy.tmp"])
   end # def tar_cmd
 
   # Return whether the command returned by tar_cmd can create deterministic archives
@@ -328,7 +332,15 @@ module FPM::Util
 
 
   def copy_entry(src, dst, preserve=false, remove_destination=false)
-    case File.ftype(src)
+    st = File.lstat(src)
+
+    filetype = if st.ftype == "file" && st.nlink > 1
+      "hardlink"
+    else
+      st.ftype
+    end
+
+    case filetype
     when 'fifo'
       if File.respond_to?(:mkfifo)
         File.mkfifo(dst)
@@ -346,18 +358,23 @@ module FPM::Util
       raise  UnsupportedSpecialFile.new("File is device which fpm doesn't know how to copy (#{File.ftype(src)}): #{src}")
     when 'directory'
       FileUtils.mkdir(dst) unless File.exist? dst
-    else
-      # if the file with the same dev and inode has been copied already -
+    when 'hardlink'
+      # Handle hardlinks
+      # if the file with the same dev and inode has been copied already.
       # hard link it's copy to `dst`, otherwise make an actual copy
-      st = File.lstat(src)
       known_entry = copied_entries[[st.dev, st.ino]]
       if known_entry
         FileUtils.ln(known_entry, dst)
+        logger.debug("Copying hardlink", :src => src, :dst => dst, :link => known_entry)
       else
         FileUtils.copy_entry(src, dst, preserve, false,
                              remove_destination)
         copied_entries[[st.dev, st.ino]] = dst
       end
+    else
+      # Normal file, just copy it.
+      FileUtils.copy_entry(src, dst, preserve, false,
+                           remove_destination)
     end # else...
   end # def copy_entry
 

data/lib/fpm/version.rb

@@ -1,3 +1,3 @@
 module FPM
-  VERSION = "1.15.1"
+  VERSION = "1.17.0"
 end

data/templates/rpm.erb

@@ -260,4 +260,4 @@ fi
 <% end -%>
 
 %changelog
-<%= attributes[:rpm_changelog] %>
+<%= changelog %>

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 1.15.1
+  version: 1.17.0
 platform: ruby
 authors:
 - Jordan Sissel
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-01 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cabin
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: backports
   requirement: !ruby/object:Gem::Requirement
@@ -56,14 +55,14 @@ dependencies:
   name: clamp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
@@ -114,14 +113,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.13.0
 - !ruby/object:Gem::Dependency
   name: insist
   requirement: !ruby/object:Gem::Requirement
@@ -199,6 +198,7 @@ files:
 - lib/fpm/package/puppet.rb
 - lib/fpm/package/pyfpm/__init__.py
 - lib/fpm/package/pyfpm/get_metadata.py
+- lib/fpm/package/pyfpm/parse_requires.py
 - lib/fpm/package/python.rb
 - lib/fpm/package/rpm.rb
 - lib/fpm/package/sh.rb
@@ -238,7 +238,6 @@ homepage: https://github.com/jordansissel/fpm
 licenses:
 - MIT-like
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -254,8 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: fpm - package building and mangling
 test_files: []