fpm 1.11.0 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24a4dd08de1d4ad02888c110b88ab0d6fd590d4d913aba61ec459d126fb84d40
-  data.tar.gz: d8c7e7867cff9198ee1d170a17534946a8cb82c1217ddb09d316f061e3be86d2
+  metadata.gz: ea647fcf022326ec4218db722e99c134664446ef0f5ce1885a7440acb1bc6a85
+  data.tar.gz: 8fa7b284c275629fac6d598211c2c54628c527435afbc835582279c760162786
 SHA512:
-  metadata.gz: df2cbe11e18c252ef87d75f724abb3de218be2b9050e8d1918c6d323ab49e02b84793a4de327f522f04eca2fa56d90d5ba50a56f49fb36f6d5e976f10a6b4e56
-  data.tar.gz: 3b93a0208cb451ee13c4cdc65adec6e68c46e2619f2d54114cfa6e4745be52d28ba12223701fc496866c4878b914f896232a389b0f37f07667c80224f6724933
+  metadata.gz: a8f4c7e20bc10732d29febc59824562d2da5d1273d6ca96788d0e033b08b9b4dad1fac8281f8030f70a65dd465fbffc194448f13291cc51105172e35370c1800
+  data.tar.gz: 4fcd3503b21ec04b1edb28ffca688898799d35f437cf097f4a3938adab78644bd0294bf9a4af327827bea63df04028150ada442727a0a41c005b59911c2d7a42

data/CHANGELOG.rst

@@ -1,6 +1,95 @@
 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)
+
+1.14.0 (November 9, 2021)
+^^^^^^^^^^^^^^^^^^^^^^^^^
+* python: Use pip by default for fetching Python packages. This matches the Python 3 "installation" docs which recommend calling pip as ``python -m pip`` where ``python`` depends on ``--python-bin`` (default "python"). Previous default was to use `easy_install` which is no longer available on many newer systems. To use easy_install, you can set ``--no-python-internal-pip`` to revert this pip default. Further, you can specify your own pip path instead of using ``python -m pip`` with the ``--python-pip /path/to/pip`` flag. (`#1820`_, `#1821`_; Jordan Sissel)
+* python: Support extras_require build markers in python packages (`#1307`_, `#1816`_; Joris Vandermeersch)
+* freebsd: Fix bug which caused fpm to generate incorrect FreeBSD packages "missing leading `/`" (`#1811`_, `#1812`_, `#1844`_, `#1832`_, `#1845`_; Vlastimil Holer, Clayton Wong, Markus Ueberall, Jordan Sissel)
+* deb: In order to only allow fpm to create valid packages, fpm now rejects packages with invalid "provides" (``--provides``) values. (`#1829`_, `#1825`_; Jordan Sissel, Peter Teichman)
+* deb: Only show a warning about /etc and config files if there are files in /etc (`#1852`_, `#1851`_; Jordan Sissel)
+
+* rpm: replace dash with underscore in rpm's "Release" field aka what fpm calls ``--iteration``. (`#1834`_, `#1833`_; Jordan Sissel)
+* empty: `fpm -s empty ...` now defaults to "all" architecture instead of "native". (`#1850`_, `#1846`_; Jordan Sissel)
+* Significant documentation improvements rewriting most of the documentation. New overview pages, full CLI flag listing, and new sections dedicated package types (rpm, cpan, deb, etc). (`#1815`_, `#1817`_, `#1838`_; Vedant K, Jordan Sissel)
+* Typo fixes in documentation are always appreciated! (`#1842`_; Clayton Wong)
+* fpm can now (we hope!) now be tested more easily from docker (`#1818`_, `#1682`_, `#1453`_; @directionless, Jordan Sissel, Douglas Muth)
+
+1.13.1 (July 6, 2021)
+^^^^^^^^^^^^^^^^^^^^^
+* deb: The `--provides` flag now allows for versions. Previously, fpm would
+  remove the version part of a provides field when generating deb packages.
+  (`#1788`_, `#1803`_; Jordan Sissel, Phil Schwartz, tympanix)
+* osxpkg: Update documentation to include installing `rpm` tools on OSX
+  (`#1797`_; allen joslin)
+
+1.13.0 (June 19, 2021)
+^^^^^^^^^^^^^^^^^^^^^^
+* Apple M1 users should now work (`#1772`_, `#1785`_, `#1786`_; Jordan Sissel)
+* Removed `ffi` ruby library as a dependency. This should make it easier to support a wider range of Ruby versions (Ruby 2.2, 3.0, etc) and platforms (like arm64, Apple M1, etc) in the future. (`#1785`_, `#1786`_; Jordan Sissel)
+* Now uses the correct architecture synonym for ARM 64 systems. Debian uses `arm64` as a synonym for what other systems call `aarch64` (linux kernel, RPM, Arch Linux). (`#1775`_; Steve Kamerman)
+* Docs: Fix a typo in an example (`#1785`_; Zoe O'Connell)
+* rpm: File paths can now contain single-quote characters (`#1774`_; Jordan Sissel)
+* rpm: Use correct SPEC syntax when using --after-upgrade or similar features (`#1761`_; Jo Vandeginste. Robert Fielding)
+* Ruby 3.0 support: Added `rexml` as a runtime dependency. In Ruby 2.0, `rexml` came by default, but in Ruby 3.0, `rexml` is now a bundled gem and some distributiosn do not include it by default. (`#1794`_; Jordan Sissel)
+* Fix error "git: not found (Git::GitExecuteError)". Now loads `git` library only when using git features. (`#1753`_, `#1748`_, `#1751`_, `#1766`_; Jordan Sissel, Cameron Nemo, Jason Rogers, Luke Short)
+* deb: Fix syntax error in `postinst` (`--after-install`) script. (`#1752`_, `#1749`_, `#1764`_; rmanus, Adam Mohammed, Elliot Murphy, kimw, Jordan Sissel)
+* deb: --deb-compression now uses the same compression and file suffix on the control.tar file (`#1760`_; Philippe Poilbarbe)
+
+
+1.12.0 (January 19, 2021)
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+* Pin ffi dependency to ruby ffi 1.12.x to try keeping fpm compatible with older/abandoned rubies like 2.0 and 2.1. (`#1709`_; Matt Patterson)
+* deb: New flag to add 'set -e' to all scripts. `--deb-maintainerscripts-force-errorchecks` which defaults to off. (`#1697`_; Andreas Ulm)
+* deb: Fix bug when converting rubygems to debs where certain constraints like `~>1` would generate a deb dependency that couldn't be satisfied. (`#1699`_; Vlastimil Holer)
+* deb: Fix error 'uninitialized constant FPM::Package::Deb::Zlib' (`#1739`_, `#1740`_; Federico Lancerin)
+* python: Prepend to PYTHONPATH instead of replacing it. This should help on platforms that rely heavily on PYTHONPATH, such as NixOSX (`#1711`_, `#1710`_; anarg)
+* python: Add `--python-trusted-host` flag which passes `--trusted-host` flag to `pip` (`#1737`_; Vladimir Ponarevsky)
+* Documentation improvements (`#1724`_, `#1738`_, `#1667`_, `#1636`_)
+* Dockerfile updated to Alpine 3.12 (`#1745`_; Cameron Nemo)
+* Remove the 'backports' deprecation warning (`#1727`_; Jose Galvez)
+* sh: Performance improvement when printing package metadata (`#1729`_; James Logsdon, Ed Healy)
+* rpm: Add support for `xzmt` compression (multithreaded xz compressor) to help when creating very large packages (several gigabytes). (`#1447`_, `#1419`_; amnobc)
+* rpm: Add `--rpm-macro-expansion` flag to enable macro expansion in scripts during rpmbuild. See https://rpm.org/user_doc/scriptlet_expansion.html for more details. (`#1642`_; juliantrzeciak)
+* deb: use correct control.tar filename (`#1668`_; Mike Perham)
+
 1.11.0 (January 30, 2019)
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -19,7 +108,7 @@ Release Notes and Change Log
 * cpan: Adds `--[no-]cpan-verbose` flag which, when set, runs `cpanm` with the `--verbose` flag (`#1511`_; William N. Braswell, Jr)
 
 1.10.0 (May 21, 2018)
-^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^
 
 * Pin `ruby-xz` dependency to one which allows Ruby versions older than 2.3.0 (`#1494`_; Marat Sharafutdinov)
 * Documentation improvements: `#1488`_; Arthur Burkart. `#1384`_; Justin Kolberg. `#1452`_; Anatoli Babenia.
@@ -47,7 +136,7 @@ Release Notes and Change Log
 * rpm: Fix `--config-files` handling (`#1390`_, `#1391`_; Jordan Sissel)
 
 1.9.1 (July 28, 2017) happy sysadmin day!
-^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 * Documentation improvements: `#1291`_; Pablo Castellano. `#1321`_; ge-fa. `#1309`_; jesusbagpuss. `#1349`_; Perry Stole. `#1352`_, Jordan Sissel. `#1384`_; Justin Kolberg.
 * Testing improvements: `#1320`_; Rob Young. `#1266`_; Ryan Parman. `#1374`_; Thiago Figueiró.
@@ -76,9 +165,9 @@ Release Notes and Change Log
 * Other: Remove unused archive-tar-minitar as a dependency of fpm (`#1355`_; Diego Martins)
 * Other: Add stud as a runtime dependency (`#1354`_; Elan Ruusamäe)
 
-.. _reproducible_builds:: https://reproducible-builds.org/
-.. _path mapping:: http://fpm.readthedocs.io/en/latest/source/dir.html#path-mapping
-.. _Deterministic output:: http://fpm.readthedocs.io/en/latest/source/gem.html
+.. _reproducible_builds: https://reproducible-builds.org/
+.. _path mapping: source/dir.html#path-mapping
+.. _Deterministic output: source/gem.html
 
 1.9.0 (July 28, 2017)
 ^^^^^^^^^^^^^^^^^^^^^

data/CONTRIBUTORS

@@ -21,6 +21,7 @@ sbuss
 Brett Gailey (github: dnbert)
 Daniel Haskin (github: djhaskin987)
 Richard Grainger (github: liger1978)
+seph (github: directionless)
 
 If you have contributed (bug reports, feature requests, help in IRC, blog
 posts, code, etc) and aren't listed here, please let me know if you wish to be

data/LICENSE

@@ -1,6 +1,6 @@
 (This is an MIT-style license)
 
-Copyright (c) 2011-2017 Jordan Sissel and contributors.
+Copyright (c) 2011-2021 Jordan Sissel and contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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/apk.rb

@@ -3,7 +3,7 @@ require "fpm/namespace"
 require "fpm/package"
 require "fpm/errors"
 require "fpm/util"
-require "backports"
+require "backports/latest"
 require "fileutils"
 require "digest"
 require 'digest/sha1'

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

@@ -3,9 +3,14 @@ require "fpm/namespace"
 require "fpm/package"
 require "fpm/errors"
 require "fpm/util"
-require "backports"
+require "backports/latest"
 require "fileutils"
 require "digest"
+require "zlib"
+
+# For handling conversion
+require "fpm/package/cpan"
+require "fpm/package/gem"
 
 # Support for debian packages (.deb files)
 #
@@ -24,6 +29,22 @@ class FPM::Package::Deb < FPM::Package
   # The list of supported compression types. Default is gz (gzip)
   COMPRESSION_TYPES = [ "gz", "bzip2", "xz", "none" ]
 
+  # https://www.debian.org/doc/debian-policy/ch-relationships.html#syntax-of-relationship-fields
+  # 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][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 " \
             "version. Default is to be specific. This option allows the same " \
@@ -77,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"
@@ -177,10 +198,14 @@ class FPM::Package::Deb < FPM::Package
   end
 
   option "--systemd", "FILEPATH", "Add FILEPATH as a systemd script",
-	:multivalued => true do |file|
+    :multivalued => true do |file|
     next File.expand_path(file)
   end
 
+  option "--systemd-enable", :flag , "Enable service on install or upgrade", :default => false
+
+  option "--systemd-auto-start", :flag , "Start service after install or upgrade", :default => false
+
   option "--systemd-restart-after-upgrade", :flag , "Restart service after upgrade", :default => true
 
   option "--after-purge", "FILE",
@@ -189,9 +214,14 @@ class FPM::Package::Deb < FPM::Package
     File.expand_path(val) # Get the full path to the script
   end # --after-purge
 
+  option "--maintainerscripts-force-errorchecks", :flag ,
+    "Activate errexit shell option according to lintian. " \
+    "https://lintian.debian.org/tags/maintainer-script-ignores-errors.html",
+    :default => false
+
   def initialize(*args)
     super(*args)
-    attributes[:deb_priority] = "extra"
+    attributes[:deb_priority] = "optional"
   end # def initialize
 
   private
@@ -218,6 +248,9 @@ class FPM::Package::Deb < FPM::Package
     when "x86_64"
       # Debian calls x86_64 "amd64"
       @architecture = "amd64"
+    when "aarch64"
+      # Debian calls aarch64 "arm64"
+      @architecture = "arm64"
     when "noarch"
       # Debian calls noarch "all"
       @architecture = "all"
@@ -414,6 +447,12 @@ class FPM::Package::Deb < FPM::Package
 
   def output(output_path)
     self.provides = self.provides.collect { |p| fix_provides(p) }
+
+    self.provides.each do |provide|
+      if !valid_provides_field?(provide)
+        raise FPM::InvalidPackageConfiguration, "Found invalid Provides field values (#{provide.inspect}). This is not valid in a Debian package."
+      end
+    end
     output_check(output_path)
     # Abort if the target path already exists.
 
@@ -453,6 +492,7 @@ class FPM::Package::Deb < FPM::Package
       raise "#{name}: tar is insufficient to support source_date_epoch."
     end
 
+    attributes[:deb_systemd] = []
     attributes.fetch(:deb_systemd_list, []).each do |systemd|
       name = File.basename(systemd, ".service")
       dest_systemd = staging_path("lib/systemd/system/#{name}.service")
@@ -460,19 +500,19 @@ class FPM::Package::Deb < FPM::Package
       FileUtils.cp(systemd, dest_systemd)
       File.chmod(0644, dest_systemd)
 
-      # set the attribute with the systemd service name
-      attributes[:deb_systemd] = name
+      # add systemd service name to attribute
+      attributes[:deb_systemd] << name
     end
 
-    if script?(:before_upgrade) or script?(:after_upgrade) or attributes[:deb_systemd]
+    if script?(:before_upgrade) or script?(:after_upgrade) or attributes[:deb_systemd].any?
       puts "Adding action files"
       if script?(:before_install) or script?(:before_upgrade)
         scripts[:before_install] = template("deb/preinst_upgrade.sh.erb").result(binding)
       end
-      if script?(:before_remove) or attributes[:deb_systemd]
+      if script?(:before_remove) or not attributes[:deb_systemd].empty?
         scripts[:before_remove] = template("deb/prerm_upgrade.sh.erb").result(binding)
       end
-      if script?(:after_install) or script?(:after_upgrade) or attributes[:deb_systemd]
+      if script?(:after_install) or script?(:after_upgrade) or attributes[:deb_systemd].any?
         scripts[:after_install] = template("deb/postinst_upgrade.sh.erb").result(binding)
       end
       if script?(:after_remove)
@@ -577,22 +617,25 @@ class FPM::Package::Deb < FPM::Package
     case self.attributes[:deb_compression]
       when "gz", nil
         datatar = build_path("data.tar.gz")
-        compression = "-z"
+        controltar = build_path("control.tar.gz")
+        compression_flags = ["-z"]
       when "bzip2"
         datatar = build_path("data.tar.bz2")
-        compression = "-j"
+        controltar = build_path("control.tar.gz")
+        compression_flags = ["-j"]
       when "xz"
         datatar = build_path("data.tar.xz")
-        compression = "-J"
+        controltar = build_path("control.tar.xz")
+        compression_flags = ["-J"]
       when "none"
         datatar = build_path("data.tar")
-        compression = ""
+        controltar = build_path("control.tar")
+        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])]
@@ -605,7 +648,7 @@ class FPM::Package::Deb < FPM::Package
     # the 'debian-binary' file has to be first
     File.expand_path(output_path).tap do |output_path|
       ::Dir.chdir(build_path) do
-        safesystem(*ar_cmd, output_path, "debian-binary", "control.tar.gz", datatar)
+        safesystem(*ar_cmd, output_path, "debian-binary", controltar, datatar)
       end
     end
 
@@ -642,6 +685,43 @@ class FPM::Package::Deb < FPM::Package
       fix_provides(provides)
     end.flatten
 
+    if origin == FPM::Package::CPAN
+      # The fpm cpan code presents dependencies and provides fields as perl(ModuleName)
+      # so we'll need to convert them to something debian supports.
+
+      # Replace perl(ModuleName) > 1.0 with Debian-style perl-ModuleName (> 1.0)
+      perldepfix = lambda do |dep|
+        m = dep.match(/perl\((?<name>[A-Za-z0-9_:]+)\)\s*(?<op>.*$)/)
+        if m.nil?
+          # 'dep' syntax didn't look like 'perl(Name) > 1.0'
+          dep
+        else
+          # Also replace '::' in the perl module name with '-'
+          modulename = m["name"].gsub("::", "-")
+         
+          # Fix any upper-casing or other naming concerns Debian has about packages
+          name = "#{attributes[:cpan_package_name_prefix]}-#{modulename}"
+
+          if m["op"].empty?
+            name
+          else
+            # 'dep' syntax was like this (version constraint): perl(Module) > 1.0
+            "#{name} (#{m["op"]})"
+          end
+        end
+      end
+
+      rejects = [ "perl(vars)", "perl(warnings)", "perl(strict)", "perl(Config)" ]
+      self.dependencies = self.dependencies.reject do |dep|
+        # Reject non-module Perl dependencies like 'vars' and 'warnings'
+        rejects.include?(dep)
+      end.collect(&perldepfix).collect(&method(:fix_dependency))
+
+      # Also fix the Provides field 'perl(ModuleName) = version' to be 'perl-modulename (= version)'
+      self.provides = self.provides.collect(&perldepfix).collect(&method(:fix_provides))
+
+    end # if origin == FPM::Packagin::CPAN
+
     if origin == FPM::Package::Deb
       changelog_path = staging_path("usr/share/doc/#{name}/changelog.Debian.gz")
       if File.exists?(changelog_path)
@@ -669,6 +749,19 @@ class FPM::Package::Deb < FPM::Package
         File.unlink(changelog_path)
       end
     end
+
+    if origin == FPM::Package::Gem
+      # fpm's gem input will have provides as "rubygem-name = version"
+      # and we need to convert this to Debian-style "rubygem-name (= version)"
+      self.provides = self.provides.collect do |provides|
+        m = /^(#{attributes[:gem_package_name_prefix]})-([^\s]+)\s*=\s*(.*)$/.match(provides)
+        if m
+          "#{m[1]}-#{m[2]} (= #{m[3]})"
+        else
+          provides
+        end
+      end
+    end
   end # def converted_from
 
   def debianize_op(op)
@@ -710,8 +803,13 @@ class FPM::Package::Deb < FPM::Package
       name, version = dep.gsub(/[()~>]/, "").split(/ +/)[0..1]
       nextversion = version.split(".").collect { |v| v.to_i }
       l = nextversion.length
-      nextversion[l-2] += 1
-      nextversion[l-1] = 0
+      if l > 1
+        nextversion[l-2] += 1
+        nextversion[l-1] = 0
+      else
+        # Single component versions ~> 1
+        nextversion[l-1] += 1
+      end
       nextversion = nextversion.join(".")
       return ["#{name} (>= #{version})", "#{name} (<< #{nextversion})"]
     elsif (m = dep.match(/(\S+)\s+\(!= (.+)\)/))
@@ -738,6 +836,32 @@ class FPM::Package::Deb < FPM::Package
     end
   end # def fix_dependency
 
+  def valid_provides_field?(text)
+    m = RELATIONSHIP_FIELD_PATTERN.match(text)
+    if m.nil?
+      logger.error("Invalid relationship field for debian package: #{text}")
+      return false
+    end
+
+    # Per Debian Policy manual, https://www.debian.org/doc/debian-policy/ch-relationships.html#syntax-of-relationship-fields
+    # >> The relations allowed are <<, <=, =, >= and >> for strictly earlier, earlier or equal,
+    # >> exactly equal, later or equal and strictly later, respectively. The exception is the
+    # >> Provides field, for which only = is allowed
+    if m["relation"] == "=" || m["relation"] == nil
+      return true
+    end
+    return false
+  end
+
+  def valid_relationship_field?(text)
+    m = RELATIONSHIP_FIELD_PATTERN.match(text)
+    if m.nil?
+      logger.error("Invalid relationship field for debian package: #{text}")
+      return false
+    end
+    return true
+  end
+
   def fix_provides(provides)
     name_re = /^[^ \(]+/
     name = provides[name_re]
@@ -752,6 +876,11 @@ class FPM::Package::Deb < FPM::Package
                    "debs don't like underscores")
       provides = provides.gsub("_", "-")
     end
+
+    if m = provides.match(/^([A-Za-z0-9_-]+)\s*=\s*(\d+.*$)/)
+      logger.warn("Replacing 'provides' entry #{provides} with syntax 'name (= version)'")
+      provides = "#{m[1]} (= #{m[2]})"
+    end
     return provides.rstrip
   end
 
@@ -779,28 +908,25 @@ class FPM::Package::Deb < FPM::Package
 
     # Tar up the staging_path into control.tar.{compression type}
     case self.attributes[:deb_compression]
-      when "gz", nil
-        controltar = build_path("control.tar.gz")
-        compression = "-z"
-      when "bzip2"
-        controltar = build_path("control.tar.bz2")
-        compression = "-j"
+      when "gz", "bzip2", nil
+        controltar = "control.tar.gz"
+        compression_flags = ["-z"]
       when "xz"
-        controltar = build_path("control.tar.xz")
-        compression = "-J"
+        controltar = "control.tar.xz"
+        compression_flags = ["-J"]
       when "none"
-        controltar = build_path("control.tar")
-        compression = ""
+        controltar = "control.tar"
+        compression_flags = []
       else
         raise FPM::InvalidPackageConfiguration,
           "Unknown compression type '#{self.attributes[:deb_compression]}'"
     end
 
     # Make the control.tar.gz
-    build_path("control.tar.gz").tap do |controltar|
+    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
@@ -889,7 +1015,7 @@ class FPM::Package::Deb < FPM::Package
     etcfiles = []
     # Add everything in /etc
     begin
-      if !attributes[:deb_no_default_config_files?]
+      if !attributes[:deb_no_default_config_files?] && File.exists?(staging_path("/etc"))
         logger.warn("Debian packaging tools generally labels all files in /etc as config files, " \
                     "as mandated by policy, so fpm defaults to this behavior for deb packages. " \
                     "You can disable this default behavior with --deb-no-default-config-files flag")