fpm 1.16.0 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6f1fc4a26f95d77ce3626231e5b7674b8908fe7afc7e2c524f573852291ed2b
-  data.tar.gz: e31fa7d3a39de85c3a75b847fc9c336e5096ca32ecd08720554f3057e73e28ef
+  metadata.gz: 0a0ebf62e58835b9331f5f56ec9689e95e725666d7fc2563afd617f2fc882bb4
+  data.tar.gz: 7d0043765bdef7b5db3f493978cc94951fbb6cb5ad15bc823a9875e67ad2afd5
 SHA512:
-  metadata.gz: f6988868dc8fae9930af5163495bb76d4afa631b58d8608f903349aefd253321ab35d88ad7b5445793b6d6d378ca941bb65d3b3353244511d32d5c13bd22c8fa
-  data.tar.gz: fd0660808bb60d2796bc80fe25c5fd3e63f942ce24f79c4591e2d7c1917ef42af6529db07d116677ba439283843a99a80d8d5615c787815cd3a44a3540a5e474
+  metadata.gz: e887592f69377440a23e193c3a2ce049c0fdc286b6699931bed7c4589785da9532998ef3ccd09946e61974a3f441719d28d9b19332d4a5aa3ccf3c63bfb5c210
+  data.tar.gz: 1d21ed70407432b95a8c7095e226073e357bbf7754579df271e216ffc28f4121df949ecb01b4a8718d47033ebd6687175fb133edcca4793269f8bc3f9ffb31db

data/CHANGELOG.rst

@@ -1,6 +1,29 @@
 Release Notes and Change Log
 ============================
 
+1.18.0 (August 26, 2026)
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+* deb/macOS: Fix a bug on macOS caused by a behavior change to the ``ar`` utility provided by Xcode (`#2149`_, `#2148`_; Dan Pashin)
+* Ruby 2.x support: Restored compatibility with older versions of Ruby such as Ruby 2.5.0. (`#2123`_; Jordan Sissel)
+* cpan: Add flag --cpan-metacpan-api-url for custom MetaCPAN urls (`#2146`_; Nicholas B. Hubbard)
+* cpan: Add flag ``--cpan-disable-dependency <name>`` to remove a dependency from the package (`#2128`_, `#2125`_; Nicholas B. Hubbard)
+* cpan: MetaCPAN upgraded their Elasticsearch version which means fpm also needs to use the newer query syntax. (`#2144`_, `#2143`_; Jordan Sissel)
+* cpan: Improvements to cpan search to better support cpan distributions (`#2125`_; Nicholas B. Hubbard)
+* tests: Fixed a bunch of tests that were failing under Github Actions (`#2122`_; Nicholas B. Hubbard)
+
+1.17.0 (October 2, 2025)
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+* python: Support modern Python project features: pyproject.toml, wheels, etc. Now, any project that can be built or installed with ``pip`` can be packaged by fpm. Previously, fpm relied on a long-deprecated features in setup.py to see a python project's metadata such as name, version, and dependencies. Fpm now uses python's package tools to identify the project's name, version, dependencies, and other information. (`#2104`_, `#2105`_, `#2040`_, `#1982`_, `#2029`_; Jordan Sissel, cwegener, amdei, gmabey)
+* dir: When copying files, only use hardlinks if the original files were also hardlinks. (`#2103`_, `#2102`_; Michael Telatynski, Matthew Rathbone, Jordan Sissel). :w
+  Related: https://github.com/electron-userland/electron-builder/issues/5721
+* deb: bug fix: when a file given with ``--config-files <path>`` copied into the package, fpm was forgetting to mark the file as being a config file in the package, aka Debian "conffiles" (`#2027`_, `#1823`_; Alexandr Zarubkin, Kientz Arnaud)
+* pacman: Now can build packages with aarch64 and arm7hf architecture (`#2017`_; Markson Hon)
+* rpm: Paths with '{' and '}' characters can now be included in rpms (`#2088`_ `#2087`_; Jordan Sissel, Manish2481983)
+* docs: Updated urls which pointed at rpm documentation (`#2092`_, `#2011`_, `#2054`_; André Kelpe, Natanael Arndt)
+* Ruby 3.4.0 no longer gives warnings related to `ostruct` (`#2106`_, also `#2104`_ and `#2103`_; Jordan Sissel)
+
 1.16.0 (December 8, 2024)
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 

data/lib/fpm/command.rb

@@ -3,7 +3,6 @@ require "fpm/namespace"
 require "fpm/version"
 require "fpm/util"
 require "clamp"
-require "ostruct"
 require "fpm"
 require "tmpdir" # for Dir.tmpdir
 
@@ -260,7 +259,11 @@ class FPM::Command < Clamp::Command
     "'gem', it specifies the packages to download and use as the gem input",
     :attribute_name => :args
 
+  # Keep a copy of the original flags (ones declared above, not by package types)
+  # This helps when generating the documentation
+  GENERAL_OPTIONS = @declared_options.clone
   FPM::Package.types.each do |name, klass|
+    # This adds each package's flags to the main command
     klass.apply_options(self)
   end
 
@@ -670,7 +673,7 @@ class FPM::Command < Clamp::Command
         option.of(self).take(value)
       end
     end
-  end
+  end # def load_options
 
   # A simple flag validator
   #
@@ -754,4 +757,4 @@ class FPM::Command < Clamp::Command
 
     public(:initialize, :ok?, :messages)
   end # class Validator
-end # class FPM::Program
+end # class FPM::Command

data/lib/fpm/package/cpan.rb

@@ -22,6 +22,13 @@ class FPM::Package::CPAN < FPM::Package
   option "--package-name-prefix", "NAME_PREFIX",
     "Name to prefix the package name with.", :default => "perl"
 
+  option "--disable-dependency", "MODULE",
+    "Filter modules matching MODULE from those generated by " \
+    "the auto-depends for CPAN modules. This flag can be specified " \
+    "multiple times. Use the perl module name, IE: URI::Escape.",
+    :multivalued => true, :attribute_name => :rejects,
+    :default => ['vars','warnings','strict','Config']
+
   option "--test", :flag,
     "Run the tests before packaging?", :default => true
 
@@ -37,6 +44,10 @@ class FPM::Package::CPAN < FPM::Package
   option "--cpanm-force", :flag,
     "Pass the --force parameter to cpanm", :default => false
 
+  option "--metacpan-api-url", "URL",
+    "URL for the MetaCPAN api",
+    :default => "https://fastapi.metacpan.org"
+
   private
   def input(package)
     #if RUBY_VERSION =~ /^1\.8/
@@ -46,7 +57,6 @@ class FPM::Package::CPAN < FPM::Package
         #"me know by filing an issue: " \
         #"https://github.com/jordansissel/fpm/issues"
     #end
-    #require "ftw" # for http access
     require "net/http"
     require "json"
 
@@ -54,7 +64,7 @@ class FPM::Package::CPAN < FPM::Package
       moduledir = package
       result = {}
     else
-      result = search(package)
+      result = search_module(package, version)
       tarball = download(result, version)
       moduledir = unpack(tarball)
     end
@@ -92,20 +102,17 @@ class FPM::Package::CPAN < FPM::Package
       else; metadata["license"]
     end
 
-    unless metadata["distribution"].nil?
+    unless metadata["release"].nil?
+      dist_name, _, dist_version = metadata["release"].rpartition('-')
       logger.info("Setting package name from 'distribution'",
-                   :distribution => metadata["distribution"])
-      self.name = fix_name(metadata["distribution"])
+                  :distribution => dist_name)
+      self.name = fix_name(dist_name)
+      self.provides = search_provided_modules(dist_name, dist_version)
     else
       logger.info("Setting package name from 'name'",
                    :name => metadata["name"])
       self.name = fix_name(metadata["name"])
-    end
-
-    unless metadata["module"].nil?
-      metadata["module"].each do |m|
-        self.provides << cap_name(m["name"]) + " = #{self.version}"
-      end
+      self.provides << cap_name(metadata["name"]) + " = #{self.version}"
     end
 
     # author is not always set or it may be a string instead of an array
@@ -168,7 +175,6 @@ class FPM::Package::CPAN < FPM::Package
             self.dependencies << "#{dep_name} >= #{version}"
             next
           end
-          dep = search(dep_name)
 
           name = cap_name(dep_name)
 
@@ -299,7 +305,7 @@ class FPM::Package::CPAN < FPM::Package
         self.architecture = "native"
       end
     end
-  end
+  end # def input
 
   def unpack(tarball)
     directory = build_path("module")
@@ -308,7 +314,7 @@ class FPM::Package::CPAN < FPM::Package
              %q{--transform=s,[./]*[^/]*/,,} ]
     safesystem("tar", *args)
     return directory
-  end
+  end # def unpack
 
   def download(metadata, cpan_version=nil)
     distribution = metadata["distribution"]
@@ -326,8 +332,8 @@ class FPM::Package::CPAN < FPM::Package
     end
 
     # Search metacpan to get download URL for this version of the module
-    metacpan_search_url = "https://fastapi.metacpan.org/v1/release/_search"
-    metacpan_search_query = '{"fields":["download_url"],"filter":{"term":{"name":"' + "#{distribution}-#{self.version}" + '"}}}'
+    metacpan_search_url = "#{attributes[:cpan_metacpan_api_url]}/v1/release/_search?_source=download_url"
+    metacpan_search_query = {"query":{"term":{"name": "#{distribution}-#{self.version}" } } }.to_json
     begin
       search_response = httppost(metacpan_search_url,metacpan_search_query)
     rescue Net::HTTPServerException => e
@@ -339,7 +345,7 @@ class FPM::Package::CPAN < FPM::Package
     data = search_response.body
     release_metadata = JSON.parse(data)
 
-    download_url = release_metadata['hits']['hits'][0]['fields']['download_url']
+    download_url = release_metadata['hits']['hits'][0]['_source']['download_url']
     download_path = URI.parse(download_url).path
     tarball = File.basename(download_path)
 
@@ -365,25 +371,81 @@ class FPM::Package::CPAN < FPM::Package
     return build_path(tarball)
   end # def download
 
-  def search(package)
-    logger.info("Asking metacpan about a module", :module => package)
-    metacpan_url = "https://fastapi.metacpan.org/v1/module/" + package
+  def search_module(module_name, version=nil)
+    logger.info("Asking metacpan about a module", :module => module_name, :version => version)
+    metacpan_api_url = "#{attributes[:cpan_metacpan_api_url]}/v1/module/_search"
+    metacpan_api_query = <<-EOS
+{
+  "query": {
+    "bool": {
+      "must": [
+        { "term": { "module.name": "#{module_name}" } },
+        { "term": { "maturity": "released" } },
+        { "term": { #{version.nil? ? '"status": "latest"' : '"module.version": "' + version + '"'} } }
+      ]
+    }
+  },
+  "size": 1
+}
+EOS
     begin
-      response = httpfetch(metacpan_url)
+      response = httppost(metacpan_api_url, metacpan_api_query)
     rescue Net::HTTPServerException => e
       #logger.error("metacpan query failed.", :error => response.status_line,
                     #:module => package, :url => metacpan_url)
       logger.error("metacpan query failed.", :error => e.message,
-                    :module => package, :url => metacpan_url)
+                    :module => module_name, :version => version, :url => metacpan_api_url)
       raise FPM::InvalidPackageConfiguration, "metacpan query failed"
     end
 
     #data = ""
     #response.read_body { |c| p c; data << c }
     data = response.body
-    metadata = JSON.parse(data)
+    metadata = JSON.parse(data)['hits']['hits'][0]['_source']
     return metadata
-  end # def metadata
+  end # def search
+
+  def search_provided_modules(distribution, version)
+    logger.info("Asking metacpan about a releases provided modules",
+                :distribution => distribution,
+                :version => version)
+    metacpan_api_url = "#{attributes[:cpan_metacpan_api_url]}/v1/module/_search?_source=module.name,module.version"
+    metacpan_api_query = <<-EOS
+{
+  "query": {
+    "bool": {
+      "filter": [
+        { "exists": { "field": "module" } },
+        { "term": { "release": "#{distribution}-#{version}" } }
+      ]
+    }
+  },
+  "sort": [ { "module.name": { "order": "asc" } } ],
+  "size": 5000
+}
+EOS
+
+    begin
+      response = httppost(metacpan_api_url, metacpan_api_query)
+    rescue Net::HTTPServerException => e
+      logger.error("metacpan release query failed.", :error => e.message,
+                   :url => metacpan_api_url)
+      raise FPM::InvalidPackageConfiguration, "metacpan release query failed"
+    end
+    query_hits = JSON.parse(response.body)['hits']['hits']
+
+    provided_modules = []
+    query_hits.each do |h|
+      h["_source"]["module"].each do |m|
+        module_name = m["name"]
+        module_version = m["version"]
+        Array(module_name).zip(Array(module_version)).each do |name, version|
+          provided_modules << cap_name(name) + (version ? " = #{version}" : "")
+        end
+      end
+    end
+    return provided_modules
+  end # def search_provided_modules
 
   def cap_name(name)
     return "perl(" + name.gsub("-", "::") + ")"
@@ -411,7 +473,7 @@ class FPM::Package::CPAN < FPM::Package
       when Net::HTTPRedirection; return httpfetch(response["location"])
       else; response.error!
     end
-  end
+  end # def httpfetch
 
   def httppost(url, body)
     uri = URI.parse(url)
@@ -428,7 +490,7 @@ class FPM::Package::CPAN < FPM::Package
       when Net::HTTPRedirection; return httppost(response["location"])
       else; response.error!
     end
-  end
+  end # def httppost
 
   public(:input)
-end # class FPM::Package::NPM
+end # class FPM::Package::CPAN

data/lib/fpm/package/deb.rb

@@ -542,6 +542,20 @@ class FPM::Package::Deb < FPM::Package
       raise FPM::InvalidPackageConfiguration, "#{name}: tar is insufficient to support source_date_epoch."
     end
 
+    systemd_file_extensions = [
+        ".service",
+        ".socket",
+        ".device",
+        ".mount",
+        ".automount",
+        ".swap",
+        ".target",
+        ".path",
+        ".timer",
+        ".slice",
+        ".scope",
+    ]
+
     attributes[:deb_systemd] = []
     attributes.fetch(:deb_systemd_list, []).each do |systemd|
       name = File.basename(systemd)
@@ -549,10 +563,16 @@ class FPM::Package::Deb < FPM::Package
 
       name_with_extension = if extname.empty?
                               "#{name}.service"
-                            elsif [".service", ".timer"].include?(extname)
+                            elsif systemd_file_extensions.include?(extname)
                               name
                             else
-                              raise FPM::InvalidPackageConfiguration, "Invalid systemd unit file extension: #{extname}. Expected .service or .timer, or no extension."
+                              # Mutating the array is fine as we raise directly after, and the array will be re-initialised next time
+                              # this method is called. If this branch is changed in the future so as not to diverge, care should be
+                              # taken to ensure that this mutated version of the array is only used for generating the error message.
+                              systemd_file_extensions[-1] = systemd_file_extensions[-1].prepend("or ")
+                              possible_extensions_str = systemd_file_extensions.join(", ")
+                              raise FPM::InvalidPackageConfiguration,
+                                "Invalid systemd unit file extension: #{extname}. Expected one of: #{possible_extensions_str}"
                             end
 
       dest_systemd = staging_path(File.join(attributes[:deb_systemd_path], "#{name_with_extension}"))
@@ -767,10 +787,19 @@ class FPM::Package::Deb < FPM::Package
     self.provides = self.provides.reject { |p| p.empty? }
 
     if origin == FPM::Package::CPAN
+
+      # By default, we'd prefer to name Debian-targeted Perl packages using the
+      # same naming scheme that Debian itself uses, which is usually something
+      # like "lib<module-name-hyphenated>-perl", such as libregexp-common-perl
+      #
+      logger.info("Changing package name to match Debian's typical libmodule-name-perl style")
+      self.name = "lib#{self.name.sub(/^perl-/, "")}-perl"
+
       # 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)
+      # Replace perl(Module::Name) > 1.0 with Debian-style libmodule-name-perl (> 1.0)
+      # per: https://www.debian.org/doc/packaging-manuals/perl-policy/ch-module_packages.html
       perldepfix = lambda do |dep|
         m = dep.match(/perl\((?<name>[A-Za-z0-9_:]+)\)\s*(?<op>.*$)/)
         if m.nil?
@@ -781,7 +810,7 @@ class FPM::Package::Deb < FPM::Package
           modulename = m["name"].gsub("::", "-")
 
           # Fix any upper-casing or other naming concerns Debian has about packages
-          name = "#{attributes[:cpan_package_name_prefix]}-#{modulename}"
+          name = "lib#{modulename}-perl"
 
           if m["op"].empty?
             name
@@ -792,9 +821,12 @@ class FPM::Package::Deb < FPM::Package
         end
       end
 
-      rejects = [ "perl(vars)", "perl(warnings)", "perl(strict)", "perl(Config)" ]
+      rejects = attributes[:rejects].map do |skip|
+        "perl(#{skip})"
+      end
       self.dependencies = self.dependencies.reject do |dep|
         # Reject non-module Perl dependencies like 'vars' and 'warnings'
+        dep, _ = dep.split(' ') # strip potential version component
         rejects.include?(dep)
       end.collect(&perldepfix).collect(&method(:fix_dependency))
 
@@ -1151,6 +1183,7 @@ class FPM::Package::Deb < FPM::Package
             logger.debug("Adding config file #{path} to Staging area #{staging_path}")
             FileUtils.mkdir_p(File.dirname(dcl))
             FileUtils.cp_r path, dcl
+            add_path(path, allconfigs)
           else
             logger.debug("Config file aready exists in staging area.")
           end
@@ -1173,7 +1206,7 @@ class FPM::Package::Deb < FPM::Package
       end
       upstarts.each do |upstart|
         name = File.basename(upstart, ".upstart")
-        upstartscript = "etc/init/#{name}.conf"
+        upstartscript = "/etc/init/#{name}.conf"
         logger.debug("Add conf file declaration for upstart script", :script => upstartscript)
         allconfigs << upstartscript[1..-1]
       end

data/lib/fpm/package/dir.rb

@@ -197,10 +197,6 @@ class FPM::Package::Dir < FPM::Package
     else
       # Otherwise try copying the file.
       begin
-        logger.debug("Linking", :source => source, :destination => destination)
-        File.link(source, destination)
-      rescue Errno::ENOENT, Errno::EXDEV, Errno::EPERM
-        # Hardlink attempt failed, copy it instead
         logger.debug("Copying", :source => source, :destination => destination)
         copy_entry(source, destination)
       rescue Errno::EEXIST

data/lib/fpm/package/gem.rb

@@ -381,7 +381,7 @@ class FPM::Package::Gem < FPM::Package
       logger.debug("Gem %s did not have changelog with recognized name" % [name])
       # FIXME: check rubygems.org?
     end
-  end # detect_source_date_from_changelog
+  end # def detect_source_date_from_changelog
 
   public(:input, :output)
 end # class FPM::Package::Gem

data/lib/fpm/package/pacman.rb

@@ -37,11 +37,15 @@ class FPM::Package::Pacman < FPM::Package
   def architecture
     case @architecture
       when nil
-        return %x{uname -m}.chomp   # default to current arch
-      when "amd64" # debian and pacman disagree on architecture names
-        return "x86_64"
+        return %x{uname -m}.chomp     # default to current arch
+      when "amd64"                    # Debian uses amd64
+        return "x86_64"               # Arch Linux uses x86_64
+      when "arm64"                    # Debian uses arm64
+        return "aarch64"              # Arch Linux ARM uses aarch64
+      when "armhf"                    # Debian uses armhf
+        return "arm7hf"               # Arch Linux ARM uses arm7hf
       when "native"
-        return %x{uname -m}.chomp   # 'native' is current arch
+        return %x{uname -m}.chomp     # 'native' is the current arch
       when "all", "any", "noarch"
         return "any"
       else

data/lib/fpm/package/pyfpm/parse_requires.py

@@ -0,0 +1,24 @@
+#!/usr/bin/env python3
+
+#import pkg_resources
+import packaging.requirements
+import packaging.markers
+import json
+import sys
+
+# Expect requirements lines via stdin.
+#requirements = pkg_resources.parse_requirements(sys.stdin)
+
+# Process environment markers, if any, and produce a list of requirements for the current environment.
+def evaluate_requirements(fd):
+    all_requirements = [packaging.requirements.Requirement(line) for line in sys.stdin]
+    default_env = packaging.markers.default_environment()
+    for req in all_requirements:
+        if req.marker is None or req.marker.evaluate(environment=default_env):
+            if len(req.specifier) > 0:
+                for spec in req.specifier:
+                    yield "%s%s" % (req.name, spec)
+            else:
+                yield str(req.name)
+
+print(json.dumps(list(evaluate_requirements(sys.stdin))))