fpm 1.14.1 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '079f0bd8cc1fe2a84b6e5dfc38cc0ae2e509d271d9752e0fb739c7cde79c746b'
-  data.tar.gz: 28ed14320c22c0dc5767781d3f325cd4e817b16e42999b0a2d1e2713522d0761
+  metadata.gz: ea647fcf022326ec4218db722e99c134664446ef0f5ce1885a7440acb1bc6a85
+  data.tar.gz: 8fa7b284c275629fac6d598211c2c54628c527435afbc835582279c760162786
 SHA512:
-  metadata.gz: b6287a7079c1f00a327d92a268f46df825cdbcc5008d719a23a4dd8f4fdba574bedf735f559207781794c7c29cf39153092d1f1452d8d3ddd4d23f808a8856ae
-  data.tar.gz: 4c90779c8b7990818a76dc4fd60035311fe8ad461e7717271abd11318d1cad10bff03783468ee78fa17bc8455d692deabd69c41bb0ffef8195d6c4be61a56d6e
+  metadata.gz: a8f4c7e20bc10732d29febc59824562d2da5d1273d6ca96788d0e033b08b9b4dad1fac8281f8030f70a65dd465fbffc194448f13291cc51105172e35370c1800
+  data.tar.gz: 4fcd3503b21ec04b1edb28ffca688898799d35f437cf097f4a3938adab78644bd0294bf9a4af327827bea63df04028150ada442727a0a41c005b59911c2d7a42

data/CHANGELOG.rst

@@ -1,6 +1,38 @@
 Release Notes and Change Log
 ============================
 
+1.15.0 (November 13, 2022)
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+* New flag ``--fpm-options-file path/to/file`` which allows you to specify additional fpm flags in an external file of your choosing. (`#1905`_, `#1902`_, `#1827`_; Jordan Sissel, Will Furnell, hjpotter92)
+* deb: Periods are now accepted in package names (`#1899`_; C. Cooke)
+* Fix bug where fpm would crash if ``--workdir`` pointed at a path that didn't
+  exist. (`#1959`_; Jordan Sissel)
+* osxpkg: this package format now supports the fpm ``--prefix`` flag(`#1909`_, `#1908`_; Jordan Sissel, mcataga)
+* cpan: Fix bug where fpm would fail on certain Perl modules due to their source tarball structure (`#1940`_; Nicholas Hubbard, William N. Braswell, Jr.)
+* cpan: Fix crash on certain CPAN modules where the author field was blank (`#1942`_, `#1937`_, `#1523`_, `#1528`_; Nicholas Hubbard, William N. Braswell, Jr.)
+* deb: The distribution field of the debian changelog and changes files will now use the value set by ``--deb-dist`` (default is "unstable") (`#1934`_; Chabert Loïc)
+* python: Fix errors in how fpm invoked ``pip``. Previously, fpm would use pip's ``--build`` flag, but this was removed a while ago, and fpm is now aware! (`#1896`_, `#1831`_, `#1893`_, `#1916`_; Jordan Sissel, Svyatogor Chuykov)
+* pleaserun: Add ``--pleaserun-user`` flag. (`#1912`_; Evgeny Stambulchik)
+* deb: The default ``--deb-priority`` is now "optional" instead of "extra" (`#1913`_; Chris Novakovic)
+* https://github.com/jordansissel/fpm/pull/1897 (`#1897`_; Jordan Sissel)
+* Enable installation of fpm on older versions of ruby. This change removed ``git`` rubygem dependency. (`#1946`_, `#1923`_; Jordan Sissel, Andreas Wirooks, Ruslan Kuprieiev, jamshid, Lorenzo Castellino, Sam Hughes)
+* Enable operation of fpm on very old versions of ruby (as old as Ruby 1.9.3). This changed removed ``json`` rubygem dependency. (`#1950`_, `#1949`_, `#1741`_, `#1264`_, `#1798`_, `#1800`_, `#1784`_; Jordan Sissel and many others)
+* Fix bug where subprocesses could hang waiting for input (`#1955`_, `#1519`_, `#1522`_; Nicholas Hubbard, William N. Braswell, Jr.)
+* Update Dockerfile to use ubuntu:20.04 (`#1935`_; Gnought)
+* internal: Fix a code typo (`#1948`_; Nicholas Hubbard)
+* internal tests: Support newer versions of lintian (`#1939`_, `#1907`_; Jordan Sissel)
+* Improve support for Ruby 3.1.0 and newer that would previously crash with an error mentioning Psych::DisallowedClass (`#1898`_, `#1895`_; Jordan Sissel, Alexandre ZANNI)
+* Improve support for Ruby 3.1.0 and newer that changed the API for ERB
+
+1.14.2 (March 30, 2022)
+^^^^^^^^^^^^^^^^^^^^^^^
+* deb: fix bug causing ``--deb-compression none`` to invoke ``tar`` incorrectly (`#1879`_; John Howard)
+* rpm: Better support for paths that have spaces and mixed quotation marks in them. (`#1882`_, `#1886`_, `#1385`_; John Bollinger and Jordan Sissel)
+* pacman: Fix typo preventing the use of ``--pacman-compression xz`` (`#1876`_; mszprejda)
+* docs: All supported package types now have dedicated documentation pages. Some pages are small stubs and would benefit from future improvement. (`#1884`_; mcandre, Jordan Sissel)
+* docs: Small but lovely documentation fixes (`#1875`_ by Corey Quinn, `#1864`_ by Geoff Beier)
+* Fixed mistake causing the test suite to fail when ``rake`` wasn't available. (`#1877`_; Jordan Sissel)
+
 1.14.1 (November 10, 2021)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 * Fix a bug that impacted fpm api usage (from other ruby programs) that caused an error "NameError: uninitialized constant FPM::Package::CPAN" when trying to output a Deb package. (`#1854`_, `#1856`_; Karol Bucek, Jordan Sissel)

data/lib/fpm/command.rb

@@ -247,6 +247,13 @@ class FPM::Command < Clamp::Command
     "See https://reproducible-builds.org/specs/source-date-epoch ",
     :environment_variable => "SOURCE_DATE_EPOCH"
 
+  option "--fpm-options-file", "FPM_OPTIONS_FILE",
+    "A file that contains additional fpm options. Any fpm flag format is valid in this file. " \
+    "This can be useful on build servers where you want to use a common configuration or " \
+    "inject other parameters from a file instead of from a command-line flag.." do |path|
+    load_options(path)
+  end
+
   parameter "[ARGS] ...",
     "Inputs to the source package type. For the 'dir' type, this is the files" \
     " and directories you want to include in the package. For others, like " \
@@ -291,6 +298,15 @@ class FPM::Command < Clamp::Command
       args << "."
     end
 
+    if !File.exists?(workdir)
+      logger.fatal("Given --workdir=#{workdir} is not a path that exists.")
+      raise FPM::Package::InvalidArgument, "The given workdir '#{workdir}' does not exist."
+    end
+    if !File.directory?(workdir)
+      logger.fatal("Given --workdir=#{workdir} must be a directory")
+      raise FPM::Package::InvalidArgument, "The given workdir '#{workdir}' must be a directory."
+    end
+
     logger.info("Setting workdir", :workdir => workdir)
     ENV["TMP"] = workdir
 
@@ -571,12 +587,86 @@ class FPM::Command < Clamp::Command
 
     ARGV.unshift(*flags)
     ARGV.push(*args)
+
     super(run_args)
   rescue FPM::Package::InvalidArgument => e
     logger.error("Invalid package argument: #{e}")
     return 1
   end # def run
 
+  def load_options(path)
+    @loaded_files ||= []
+
+    if @loaded_files.include?(path)
+      #logger.error("Options file was already loaded once. Refusing to load a second time.", :path => path)
+      raise FPM::Package::InvalidArgument, "Options file already loaded once. Refusing to load a second time. Maybe a file tries to load itself? Path: #{path}"
+    end
+
+    if !File.exist?(path)
+      logger.fatal("Cannot load options from file because the file doesn't exist.", :path => path)
+    end
+
+    if !File.readable?(path)
+      logger.fatal("Cannot load options from file because the file isn't readable.", :path => path)
+    end
+
+    @loaded_files << path
+
+    logger.info("Loading flags from file", :path => path)
+
+    # Safety check, abort if the file is huge. Arbitrarily chosen limit is 100kb
+    stat = File.stat(path)
+    max = 100 * 1024
+    if stat.size > max
+      logger.fatal("Refusing to load options from file because the file seems pretty large.", :path => path, :size => stat.size)
+      raise FPM::Package::InvalidArgument, "Options file given to --fpm-options-file is seems too large. For safety, fpm is refusing to load this. Path: #{path} - Size: #{stat.size}, maximum allowed size #{max}."
+    end
+
+    File.read(path).split($/).each do |line|
+      logger.info("Processing flags from file", :path => path, :line => line)
+      # With apologies for this hack to mdub (Mike Williams, author of Clamp)...
+      # The following code will read a file and parse the file
+      # as flags as if they were in same argument position as the given --fpm-options-file option.
+
+      args = Shellwords.split(line)
+      while args.any?
+        arg = args.shift
+
+        # Lookup the Clamp option by its --flag-name or short  name like -f
+        if arg =~ /^-/
+          # Single-letter options like -a or -z
+          if single_letter = arg.match(/^(-[A-Za-z0-9])(.*)$/)
+            option = self.class.find_option(single_letter.match(1))
+            arg, remainder = single_letter.match(1), single_letter.match(2)
+            if option.flag?
+              # Flags aka switches take no arguments, so we push the rest of the 'arg' entry back onto the args list
+
+              # For combined letter flags, like `-abc`, we want to consume the
+              # `-a` and then push `-bc` back to be processed.
+              # Only do this if there's more flags, like, not for `-a` but yes for `-abc`
+              args.unshift("-" + remainder) unless remainder.empty?
+            else
+              # Single letter options that take arguments, like `-ohello` same as `-o hello`
+
+              # For single letter flags with values, like `-ofilename` aka `-o filename`, push the remainder ("filename")
+              # back onto the args list so that it is consumed when we extract the flag value.
+              args.unshift(remainder) unless remainder.empty?
+            end
+          elsif arg.match(/^--/)
+            # Lookup the flag by its long --flag-name
+            option = self.class.find_option(arg)
+          end
+        end
+
+        # Extract the flag value, if any, from the remaining args list.
+        value = option.extract_value(arg, args)
+
+        # Process the flag into `self`
+        option.of(self).take(value)
+      end
+    end
+  end
+
   # A simple flag validator
   #
   # The goal of this class is to ensure the flags and arguments given

data/lib/fpm/package/cpan.rb

@@ -112,6 +112,7 @@ class FPM::Package::CPAN < FPM::Package
     self.vendor = case metadata["author"]
       when String; metadata["author"]
       when Array; metadata["author"].join(", ")
+      when NilClass; "No Vendor Or Author Provided"
       else
         raise FPM::InvalidPackageConfiguration, "Unexpected CPAN 'author' field type: #{metadata["author"].class}. This is a bug."
     end if metadata.include?("author")
@@ -304,7 +305,7 @@ class FPM::Package::CPAN < FPM::Package
     directory = build_path("module")
     ::Dir.mkdir(directory)
     args = [ "-C", directory, "-zxf", tarball,
-      "--strip-components", "1" ]
+             %q{--transform=s,[./]*[^/]*/,,} ]
     safesystem("tar", *args)
     return directory
   end

data/lib/fpm/package/deb.rb

@@ -33,12 +33,17 @@ class FPM::Package::Deb < FPM::Package
   # Example value with version relationship: libc6 (>= 2.2.1)
   # Example value: libc6
 
+  # Package name docs here: https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-source
+  # Package names (both source and binary, see Package) must consist only of lower case letters (a-z),
+  # digits (0-9), plus (+) and minus (-) signs, and periods (.).
+  # They must be at least two characters long and must start with an alphanumeric character.
+
   # Version string docs here: https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-version
   # The format is: [epoch:]upstream_version[-debian_revision].
   # epoch - This is a single (generally small) unsigned integer
   # upstream_version - must contain only alphanumerics 6 and the characters . + - ~
   # debian_revision - only alphanumerics and the characters + . ~
-  RELATIONSHIP_FIELD_PATTERN = /^(?<name>[A-z0-9_-]+)(?: *\((?<relation>[<>=]+) *(?<version>(?:[0-9]+:)?[0-9A-Za-z+~.-]+(?:-[0-9A-Za-z+~.]+)?)\))?$/
+  RELATIONSHIP_FIELD_PATTERN = /^(?<name>[A-z0-9][A-z0-9_.-]+)(?: *\((?<relation>[<>=]+) *(?<version>(?:[0-9]+:)?[0-9A-Za-z+~.-]+(?:-[0-9A-Za-z+~.]+)?)\))?$/
 
   option "--ignore-iteration-in-dependencies", :flag,
             "For '=' (equal) dependencies, allow iterations on the specified " \
@@ -93,7 +98,7 @@ class FPM::Package::Deb < FPM::Package
   end
 
   option "--priority", "PRIORITY",
-    "The debian package 'priority' value.", :default => "extra"
+    "The debian package 'priority' value.", :default => "optional"
 
   option "--use-file-permissions", :flag,
     "Use existing file permissions when defining ownership and modes"
@@ -216,7 +221,7 @@ class FPM::Package::Deb < FPM::Package
 
   def initialize(*args)
     super(*args)
-    attributes[:deb_priority] = "extra"
+    attributes[:deb_priority] = "optional"
   end # def initialize
 
   private
@@ -613,25 +618,24 @@ class FPM::Package::Deb < FPM::Package
       when "gz", nil
         datatar = build_path("data.tar.gz")
         controltar = build_path("control.tar.gz")
-        compression = "-z"
+        compression_flags = ["-z"]
       when "bzip2"
         datatar = build_path("data.tar.bz2")
         controltar = build_path("control.tar.gz")
-        compression = "-j"
+        compression_flags = ["-j"]
       when "xz"
         datatar = build_path("data.tar.xz")
         controltar = build_path("control.tar.xz")
-        compression = "-J"
+        compression_flags = ["-J"]
       when "none"
         datatar = build_path("data.tar")
         controltar = build_path("control.tar")
-        compression = ""
+        compression_flags = []
       else
         raise FPM::InvalidPackageConfiguration,
           "Unknown compression type '#{self.attributes[:deb_compression]}'"
     end
-
-    args = [ tar_cmd, "-C", staging_path, compression ] + data_tar_flags + [ "-cf", datatar, "." ]
+    args = [ tar_cmd, "-C", staging_path ] + compression_flags + data_tar_flags + [ "-cf", datatar, "." ]
     if tar_cmd_supports_sort_names_and_set_mtime? and not attributes[:source_date_epoch].nil?
       # Use gnu tar options to force deterministic file order and timestamp
       args += ["--sort=name", ("--mtime=@%s" % attributes[:source_date_epoch])]
@@ -906,13 +910,13 @@ class FPM::Package::Deb < FPM::Package
     case self.attributes[:deb_compression]
       when "gz", "bzip2", nil
         controltar = "control.tar.gz"
-        compression = "-z"
+        compression_flags = ["-z"]
       when "xz"
         controltar = "control.tar.xz"
-        compression = "-J"
+        compression_flags = ["-J"]
       when "none"
         controltar = "control.tar"
-        compression = ""
+        compression_flags = []
       else
         raise FPM::InvalidPackageConfiguration,
           "Unknown compression type '#{self.attributes[:deb_compression]}'"
@@ -922,7 +926,7 @@ class FPM::Package::Deb < FPM::Package
     build_path(controltar).tap do |controltar|
       logger.info("Creating", :path => controltar, :from => control_path)
 
-      args = [ tar_cmd, "-C", control_path, compression, "-cf", controltar,
+      args = [ tar_cmd, "-C", control_path ] + compression_flags + [ "-cf", controltar,
         "--owner=0", "--group=0", "--numeric-owner", "." ]
       if tar_cmd_supports_sort_names_and_set_mtime? and not attributes[:source_date_epoch].nil?
         # Force deterministic file order and timestamp

data/lib/fpm/package/gem.rb

@@ -104,19 +104,18 @@ class FPM::Package::Gem < FPM::Package
     FileUtils.mkdir(download_dir) unless File.directory?(download_dir)
 
     if attributes[:gem_git_repo]
-      require "git"
       logger.debug("Git cloning in directory #{download_dir}")
-      g = Git.clone(attributes[:gem_git_repo],gem_name,:path => download_dir)
+      safesystem("git", "-C", download_dir, "clone", attributes[:gem_git_repo], ".")
       if attributes[:gem_git_branch]
-        g.branch(attributes[:gem_git_branch]).checkout
-        g.pull('origin',attributes[:gem_git_branch])
+        safesystem("git", "-C", download_dir, "checkout", attributes[:gem_git_branch])
       end
-      gem_build = [ "#{attributes[:gem_gem]}", "build", "#{g.dir.to_s}/#{gem_name}.gemspec"]
-      ::Dir.chdir(g.dir.to_s) do |dir|
+
+      gem_build = [ "#{attributes[:gem_gem]}", "build", "#{download_dir}/#{gem_name}.gemspec"]
+      ::Dir.chdir(download_dir) do |dir|
         logger.debug("Building in directory #{dir}")
         safesystem(*gem_build)
       end
-      gem_files = ::Dir.glob(File.join(g.dir.to_s, "*.gem"))
+      gem_files = ::Dir.glob(File.join(download_dir, "*.gem"))
     else
       gem_fetch = [ "#{attributes[:gem_gem]}", "fetch", gem_name]
       gem_fetch += ["--prerelease"] if attributes[:gem_prerelease?]
@@ -135,9 +134,19 @@ class FPM::Package::Gem < FPM::Package
     return gem_files.first
   end # def download
 
+  GEMSPEC_YAML_CLASSES = [ ::Gem::Specification, ::Gem::Version, Time, ::Gem::Dependency, ::Gem::Requirement, Symbol ]
   def load_package_info(gem_path)
-
-    spec = YAML.load(%x{#{attributes[:gem_gem]} specification #{gem_path} --yaml})
+    # TODO(sissel): Maybe we should check if `safe_load` method exists instead of this version check?
+    if ::Gem::Version.new(RUBY_VERSION) >= ::Gem::Version.new("3.1.0")
+      # Ruby 3.1.0 switched to a Psych/YAML version that defaults to "safe" loading
+      # and unfortunately `gem specification --yaml` emits YAML that requires
+      # class loaders to process correctly
+      spec = YAML.load(%x{#{attributes[:gem_gem]} specification #{gem_path} --yaml},
+                      :permitted_classes => GEMSPEC_YAML_CLASSES)
+    else
+      # Older versions of ruby call this method YAML.safe_load
+      spec = YAML.safe_load(%x{#{attributes[:gem_gem]} specification #{gem_path} --yaml}, GEMSPEC_YAML_CLASSES)
+    end
 
     if !attributes[:gem_package_prefix].nil?
       attributes[:gem_package_name_prefix] = attributes[:gem_package_prefix]

data/lib/fpm/package/osxpkg.rb

@@ -4,7 +4,6 @@ require "fileutils"
 require "fpm/package/dir"
 require 'tempfile'  # stdlib
 require 'pathname'  # stdlib
-require 'rexml/document'  # stdlib
 
 # Use an OS X pkg built with pkgbuild.
 #
@@ -103,6 +102,7 @@ class FPM::Package::OSXpkg < FPM::Package
 
   # Extract name and version from PackageInfo XML
   def extract_info(package)
+    require 'rexml/document'
     build_path("expand").tap do |path|
       doc = REXML::Document.new File.open(File.join(path, "PackageInfo"))
       pkginfo_elem = doc.elements["pkg-info"]
@@ -148,6 +148,11 @@ class FPM::Package::OSXpkg < FPM::Package
       write_scripts
       args += ["--scripts", scripts_path]
     end
+
+    if attributes[:prefix]
+      args += ["--install-location", attributes[:prefix]]
+    end
+
     args << output_path
 
     safesystem("pkgbuild", *args)

data/lib/fpm/package/pacman.rb

@@ -234,7 +234,7 @@ class FPM::Package::Pacman < FPM::Package
         return ""
       when "gz"
         return ".gz"
-      when "zx"
+      when "xz"
         return ".xz"
       when "bzip2"
         return ".bz2"

data/lib/fpm/package/pleaserun.rb

@@ -18,6 +18,7 @@ class FPM::Package::PleaseRun < FPM::Package
 
   option "--name", "SERVICE_NAME", "The name of the service you are creating"
   option "--chdir", "CHDIR", "The working directory used by the service"
+  option "--user", "USER", "The user to use for executing this program."
 
   private
   def input(command)

data/lib/fpm/package/python.rb

@@ -162,13 +162,22 @@ class FPM::Package::Python < FPM::Package
         ]
       end
 
-      setup_cmd += [
-        "--build",
-        target,
-        want_pkg,
-      ]
-      
+      setup_cmd << want_pkg
+
       safesystem(*setup_cmd)
+
+      # Pip removed the --build flag sometime in 2021, it seems: https://github.com/pypa/pip/issues/8333
+      # A workaround for pip removing the `--build` flag. Previously, `pip download --build ...` would leave
+      # behind a directory with the Python package extracted and ready to be used.
+      # For example, `pip download ... Django` puts `Django-4.0.4.tar.tz` into the build_path directory.
+      # If we expect `pip` to leave an unknown-named file in the `build_path` directory, let's check for
+      # a single file and unpack it.  I don't know if it will /always/ be a .tar.gz though.
+      files = ::Dir.glob(File.join(build_path, "*.tar.gz"))
+      if files.length != 1
+        raise "Unexpected directory layout after `pip download ...`. This might be an fpm bug? The directory is #{build_path}"
+      end
+
+      safesystem("tar", "-zxf", files[0], "-C", target)
     else
       # no pip, use easy_install
       logger.debug("no pip, defaulting to easy_install", :easy_install => attributes[:python_easyinstall])

data/lib/fpm/package/rpm.rb

@@ -192,17 +192,26 @@ class FPM::Package::RPM < FPM::Package
   # Replace * with [*] to make rpm not use globs
   # Replace ? with [?] to make rpm not use globs
   # Replace % with [%] to make rpm not expand macros
+  # Replace whitespace with ? to make rpm not split the filename
+  # 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)
-    name = name.gsub(/(\ |\[|\]|\*|\?|\%|\$|')/, {
-      ' ' => '?',
-      '%' => '[%]',
-      '$' => '[$]',
-      '?' => '[?]',
-      '*' => '[*]',
-      '[' => '[\[]',
-      ']' => '[\]]',
-      "'" => "\\'",
-    })
+    if name.match?(/[ \t*?%$\[\]]/)
+      name = name.gsub(/(\ |\t|\[|\]|\*|\?|\%|\$|'|"|\\)/, {
+        ' '  => '?',
+        "\t" => '?',
+        '%'  => '[%]',
+        '$'  => '[$]',
+        '?'  => '[?]',
+        '*'  => '[*]',
+        '['  => '[\[]',
+        ']'  => '[\]]',
+        '"'  => '\\"',
+        "'"  => "\\'",
+        '\\' => '\\\\\\\\',
+      })
+    end
+    name
   end
 
   def rpm_file_entry(file)

data/lib/fpm/package.rb

@@ -331,11 +331,12 @@ class FPM::Package
     template_path = File.join(template_dir, path)
     template_code = File.read(template_path)
     logger.info("Reading template", :path => template_path)
-    erb = ERB.new(template_code, nil, "-")
+    erb = erbnew(template_code)
     erb.filename = template_path
     return erb
   end # def template
 
+
   #######################################
   # The following methods are provided to
   # easily override particular substitut-
@@ -518,7 +519,7 @@ class FPM::Package
   # flag), then apply it as an ERB template.
   def script(script_name)
     if attributes[:template_scripts?]
-      erb = ERB.new(scripts[script_name], nil, "-")
+      erb = erbnew(scripts[script_name])
       # TODO(sissel): find the original file name for the file.
       erb.filename = "script(#{script_name})"
       return erb.result(binding)

data/lib/fpm/util.rb

@@ -154,10 +154,13 @@ module FPM::Util
 
       yield(*args3)
 
-      stdin_w_close                 if opts[:stdin] and not stdin_w.closed?
+      stdin_w.close                 if opts[:stdin] and not stdin_w.closed?
       stdout_r.close                unless stdout_r.closed?
       stderr_r.close                unless stderr_r.closed?
     else
+      # If no block given (not interactive) we should close stdin_w because we
+      # won't be able to give input which may cause a hang.
+      stdin_w.close
       # Log both stdout and stderr as 'info' because nobody uses stderr for
       # actually reporting errors and as a result 'stderr' is a misnomer.
       logger.pipe(stdout_r => :info, stderr_r => :info)
@@ -406,6 +409,33 @@ module FPM::Util
   def logger
     @logger ||= Cabin::Channel.get
   end # def logger
+
+  def erbnew(template_code)
+    # In Ruby 2.6(?), Ruby changed how ERB::new is invoked.
+    # First, it added keyword args like `ERB.new(..., trim_mode: "-")`
+    # Later, it deprecated then removed the safe_level feature.
+    # As of Ruby 3.1, warnings are printed at runtime when ERB.new is called with the old syntax.
+    # Ruby 2.5 and older does not support the ERB.new keyword args.
+    #
+    # My tests showed:
+    # * Ruby 2.3.0 through 3.0 work correctly with the old syntax.
+    # * Ruby 3.1.0 and newer (at time of writing, Ruby 3.2) require the new syntax
+    # Therefore, in order to support the most versions of ruby, we need to do a version check
+    # to invoke ERB.new correctly and without printed warnings.
+    # References: https://github.com/jordansissel/fpm/issues/1894
+    # Honestly, I'm not sure if Gem::Version is correct to use in this situation, but it works.
+
+    # on older versions of Ruby, RUBY_VERSION is a frozen string, and
+    # Gem::Version.new calls String#strip! which throws an exception.
+    # so we have to call String#dup to get an unfrozen copy.
+    if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new("3.1.0")
+      # Ruby 3.0.x and older
+      return ERB.new(template_code, nil, "-")
+    else
+      # Ruby 3.1.0 and newer
+      return ERB.new(template_code, trim_mode: "-")
+    end
+  end
 end # module FPM::Util
 
 require 'fpm/util/tar_writer'

data/lib/fpm/version.rb

@@ -1,3 +1,3 @@
 module FPM
-  VERSION = "1.14.1"
+  VERSION = "1.15.0"
 end

data/templates/deb/changelog.erb

@@ -1,4 +1,4 @@
-<%= name %> (<%= "#{epoch}:" if epoch %><%= version %><%= "-" + iteration.to_s if iteration %>) whatever; urgency=medium
+<%= name %> (<%= "#{epoch}:" if epoch %><%= version %><%= "-" + iteration.to_s if iteration %>) <%= distribution %>; urgency=medium
 
   * Package created with FPM.
 

data/templates/deb/deb.changes.erb

@@ -14,7 +14,7 @@ Description: <%= firstline %>
 <%= remainder.collect { |l| l =~ /^ *$/ ? " ." : " #{l}" }.join("\n") %>
 <% end -%>
 Changes:
- <%= name %> (<%= "#{epoch}:" if epoch %><%= version %><%= "-" + iteration.to_s if iteration %>) whatever; urgency=medium
+ <%= name %> (<%= "#{epoch}:" if epoch %><%= version %><%= "-" + iteration.to_s if iteration %>) <%= distribution %>; urgency=medium
   * Package created with FPM.
 Checksums-Sha1:
 <% changes_files.each do |file| -%>

metadata

@@ -1,35 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.15.0
 platform: ruby
 authors:
 - Jordan Sissel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-10 00:00:00.000000000 Z
+date: 2022-11-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.7
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.7
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: cabin
   requirement: !ruby/object:Gem::Requirement
@@ -100,26 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.29
-- !ruby/object:Gem::Dependency
-  name: git
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: stud
   requirement: !ruby/object:Gem::Requirement
@@ -190,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Convert directories, rpms, python eggs, rubygems, and more to rpms, debs,
   solaris packages and more. Win at package management without wasting pointless hours
   debugging bad rpm specs!
@@ -280,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.31
+rubygems_version: 3.3.20
 signing_key:
 specification_version: 4
 summary: fpm - package building and mangling