fpm 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28f939bd20768768cb05026a39c8a270596368c654ec5606a43a0e75afa845ad
-  data.tar.gz: 0d7eea7108832e79994ba3ee9511c3715b384906f7ef3a2ab5e907cfc764609a
+  metadata.gz: f231a03d2baac73ae0f4f8f15094237ca94ec43de51ef0b86dde886a8647efa2
+  data.tar.gz: 91666a6a7b09b6f3ab3bb6dccf32e647d58a43754d2163a4748ae8a2e14515e8
 SHA512:
-  metadata.gz: 555edd6cd5d4b0098e075011e48db96e52c454b8557735a51202307dcaeb4920a5efe93bb6d99cedf9d3ff95ff445c37059e1fc308e0602482977587d532e4b1
-  data.tar.gz: 2803ea8cb3af495d5fd20e75bee0eba11dc262ac59b86e63b75ef3cef7417440e88e1fec9172f7a1ea5cf0705e2ce36bc65e7b9c1c5469eb0e78b292ac822716
+  metadata.gz: b21d482730c5e532f9bf6f9e7faf51bf712aa9f75ebab9b8453d1f1b9cd9f1e0ef5a32bb84f18808bc5bc8c15a8e1c47546ad1d474e9c3c581eaa7afe85e80b9
+  data.tar.gz: 72963da4b7601fa8d416ab20ce26e15838960b7dca9c364b38312266857e3beb9b11b32a9c708ff393a612f0e5ff350b6098fd794c4b5b05fe767c0a4323dfdd

data/CHANGELOG.rst

@@ -1,6 +1,21 @@
 Release Notes and Change Log
 ============================
 
+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)
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 

data/lib/fpm/package/deb.rb

@@ -178,7 +178,7 @@ 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
 
@@ -228,6 +228,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"
@@ -588,15 +591,19 @@ class FPM::Package::Deb < FPM::Package
     case self.attributes[:deb_compression]
       when "gz", nil
         datatar = build_path("data.tar.gz")
+        controltar = build_path("control.tar.gz")
         compression = "-z"
       when "bzip2"
         datatar = build_path("data.tar.bz2")
+        controltar = build_path("control.tar.bz2")
         compression = "-j"
       when "xz"
         datatar = build_path("data.tar.xz")
+        controltar = build_path("control.tar.xz")
         compression = "-J"
       when "none"
         datatar = build_path("data.tar")
+        controltar = build_path("control.tar")
         compression = ""
       else
         raise FPM::InvalidPackageConfiguration,
@@ -616,7 +623,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
 

data/lib/fpm/package/freebsd.rb

@@ -17,10 +17,6 @@ class FPM::Package::FreeBSD < FPM::Package
          :default => "fpm/<name>"
 
   def output(output_path)
-    # See https://github.com/jordansissel/fpm/issues/1090
-    # require xz later, because this triggers a load of liblzma.so.5 that is
-    # unavailable on older CentOS/RH distros.
-    require "xz"
     output_check(output_path)
 
     # Build the packaging metadata files.
@@ -80,22 +76,19 @@ class FPM::Package::FreeBSD < FPM::Package
       file.write(pkgdata.to_json + "\n")
     end
 
-    # Create the .txz package archive from the files in staging_path.
-    File.open(output_path, "wb") do |file|
-      XZ::StreamWriter.new(file) do |xz|
-        FPM::Util::TarWriter.new(xz) do |tar|
-          # The manifests must come first for pkg.
-          add_path(tar, "+COMPACT_MANIFEST",
-                   File.join(staging_path, "+COMPACT_MANIFEST"))
-          add_path(tar, "+MANIFEST",
-                   File.join(staging_path, "+MANIFEST"))
-
-          checksums.keys.each do |path|
-            add_path(tar, "/" + path, File.join(staging_path, path))
-          end
-        end
-      end
+    file_list = File.new(build_path("file_list"), "w")
+    files.each do |i|
+      file_list.puts(i)
     end
+    file_list.close
+
+    # Create the .txz package archive from the files in staging_path.
+    # We use --files-from here to keep the tar entries from having `./` as the prefix.
+    # This is done as a best effor to mimic what FreeBSD packages do, having everything at the top-level as
+    # file names, like "+MANIFEST" instead of "./+MANIFEST"
+    # Note: This will include top-level files like "/usr/bin/foo" listed in the tar as "usr/bin/fo" without
+    # a leading slash. I don't know if this has any negative impact on freebsd packages.
+    safesystem("tar", "-Jcf", output_path, "-C", staging_path, "--files-from", build_path("file_list"))
   end # def output
 
   # Handle architecture naming conversion:
@@ -110,6 +103,8 @@ class FPM::Package::FreeBSD < FPM::Package
     wordsize = case @architecture
     when nil, 'native'
       %x{getconf LONG_BIT}.chomp # 'native' is current arch
+    when 'arm64'
+      '64'
     when 'amd64'
       '64'
     when 'i386'

data/lib/fpm/package/gem.rb

@@ -4,7 +4,6 @@ require "rubygems"
 require "fileutils"
 require "fpm/util"
 require "yaml"
-require "git"
 
 # A rubygems package.
 #
@@ -105,6 +104,7 @@ 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)
       if attributes[:gem_git_branch]

data/lib/fpm/package/rpm.rb

@@ -190,14 +190,15 @@ class FPM::Package::RPM < FPM::Package
   # Replace ? with [?] to make rpm not use globs
   # Replace % with [%] to make rpm not expand macros
   def rpm_fix_name(name)
-    name = name.gsub(/(\ |\[|\]|\*|\?|\%|\$)/, {
+    name = name.gsub(/(\ |\[|\]|\*|\?|\%|\$|')/, {
       ' ' => '?',
       '%' => '[%]',
       '$' => '[$]',
       '?' => '[?]',
       '*' => '[*]',
       '[' => '[\[]',
-      ']' => '[\]]'
+      ']' => '[\]]',
+      "'" => "\\'",
     })
   end
 
@@ -239,6 +240,8 @@ class FPM::Package::RPM < FPM::Package
         return %x{uname -m}.chomp   # default to current arch
       when "amd64" # debian and redhat disagree on architecture names
         return "x86_64"
+      when "arm64" # debian and redhat disagree on architecture names
+        return "aarch64"
       when "native"
         return %x{uname -m}.chomp   # 'native' is current arch
       when "all"

data/lib/fpm/util.rb

@@ -1,21 +1,8 @@
 require "fpm/namespace"
-require "childprocess"
-require "ffi"
 require "fileutils"
 
 # Some utility functions
 module FPM::Util
-  extend FFI::Library
-  ffi_lib FFI::Library::LIBC
-
-  # mknod is __xmknod in glibc a wrapper around mknod to handle
-  # various stat struct formats. See bits/stat.h in glibc source
-  begin
-    attach_function :mknod, :mknod, [:string, :uint, :ulong], :int
-  rescue FFI::NotFoundError
-    # glibc/io/xmknod.c int __xmknod (int vers, const char *path, mode_t mode, dev_t *dev)
-    attach_function :xmknod, :__xmknod, [:int, :string, :uint, :pointer], :int
-  end
 
   # Raised if safesystem cannot find the program to run.
   class ExecutableNotFound < StandardError; end
@@ -23,6 +10,12 @@ module FPM::Util
   # Raised if a safesystem program exits nonzero
   class ProcessFailed < StandardError; end
 
+  # Raised when a named pipe cannot be copied due to missing functions in fpm and ruby.
+  class NamedPipeCannotBeCopied < StandardError; end
+
+  # Raised when an attempting to copy a special file such as a block device.
+  class UnsupportedSpecialFile < StandardError; end
+
   # Is the given program in the system's PATH?
   def program_in_path?(program)
     # return false if path is not set
@@ -146,31 +139,22 @@ module FPM::Util
 
     stdout_r, stdout_w = IO.pipe
     stderr_r, stderr_w = IO.pipe
+    stdin_r, stdin_w = IO.pipe
 
-    process = ChildProcess.build(*args2)
-    process.environment.merge!(env)
-
-    process.io.stdout = stdout_w
-    process.io.stderr = stderr_w
-
-    if block_given? and opts[:stdin]
-      process.duplex = true
-    end
-
-    process.start
+    pid = Process.spawn(env, *args2, :out => stdout_w, :err => stderr_w, :in => stdin_r)
 
     stdout_w.close; stderr_w.close
-    logger.debug("Process is running", :pid => process.pid)
+    logger.debug("Process is running", :pid => pid)
     if block_given?
       args3 = []
       args3.push(process)           if opts[:process]
-      args3.push(process.io.stdin)  if opts[:stdin]
+      args3.push(stdin_w)           if opts[:stdin]
       args3.push(stdout_r)          if opts[:stdout]
       args3.push(stderr_r)          if opts[:stderr]
 
       yield(*args3)
 
-      process.io.stdin.close        if opts[:stdin] and not process.io.stdin.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
@@ -179,9 +163,10 @@ module FPM::Util
       logger.pipe(stdout_r => :info, stderr_r => :info)
     end
 
-    process.wait if process.alive?
+    Process.waitpid(pid)
+    status = $?
 
-    return process.exit_code
+    return status.exitstatus
   end # def execmd
 
   # Run a command safely in a way that gets reports useful errors.
@@ -316,19 +301,6 @@ module FPM::Util
     return @@tar_cmd_deterministic
   end
 
-  # wrapper around mknod ffi calls
-  def mknod_w(path, mode, dev)
-    rc = -1
-    case %x{uname -s}.chomp
-    when 'Linux'
-      # bits/stat.h #define _MKNOD_VER_LINUX  0
-      rc = xmknod(0, path, mode, FFI::MemoryPointer.new(dev))
-    else
-      rc = mknod(path, mode, dev)
-    end
-    rc
-  end
-
   def copy_metadata(source, destination)
     source_stat = File::lstat(source)
     dest_stat = File::lstat(destination)
@@ -354,10 +326,21 @@ module FPM::Util
 
   def copy_entry(src, dst, preserve=false, remove_destination=false)
     case File.ftype(src)
-    when 'fifo', 'characterSpecial', 'blockSpecial', 'socket'
-      st = File.stat(src)
-      rc = mknod_w(dst, st.mode, st.dev)
-      raise SystemCallError.new("mknod error", FFI.errno) if rc == -1
+    when 'fifo'
+      if File.respond_to?(:mkfifo)
+        File.mkfifo(dst)
+      elsif program_exists?("mkfifo")
+        safesystem("mkfifo", dst)
+      else
+        raise NamedPipeCannotBeCopied("Unable to copy. Cannot find program 'mkfifo' and Ruby is missing the 'File.mkfifo' method: #{src}")
+      end
+    when 'socket'
+      require "socket"
+      # In 2019, Ruby's FileUtils added this as a way to "copy" a unix socket.
+      # Reference: https://github.com/ruby/fileutils/pull/36/files
+      UNIXServer.new(dst).close()
+    when 'characterSpecial', 'blockSpecial'
+      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.exists? dst
     else

data/lib/fpm/version.rb

@@ -1,3 +1,3 @@
 module FPM
-  VERSION = "1.12.0"
+  VERSION = "1.13.0"
 end

data/templates/deb/postinst_upgrade.sh.erb

@@ -20,6 +20,7 @@ debsystemctl=$(command -v deb-systemd-invoke || echo systemctl)
 <% attributes[:deb_systemd].each do |service| -%>
 if ! systemctl is-enabled <%= service %> >/dev/null 
 then
+  : # Ensure this if-clause is not empty. If it were empty, and we had an 'else', then it is an error in shell syntax
 <% if attributes[:deb_systemd_enable?]-%>
     systemctl enable <%= service %> >/dev/null || true
 <% end -%>

data/templates/rpm.erb

@@ -126,7 +126,7 @@ Obsoletes: <%= repl %>
 -%>
 <% if script?(:before_upgrade) or script?(:after_upgrade) -%>
 <%   if script?(:before_upgrade) or script?(:before_install) -%>
-%pre <% if attributes[:rpm_macro_expansion?] -%><%= " -e " %> <% end -%>
+%pre <% if attributes[:rpm_macro_expansion?] -%><%= " -e " %> <% end %>
 upgrade() {
 <%# Making sure that at least one command is in the function -%>
 <%# avoids a lot of potential errors, including the case that -%>
@@ -156,7 +156,7 @@ then
 fi
 <%   end -%>
 <%   if script?(:after_upgrade) or script?(:after_install) -%>
-%post <% if attributes[:rpm_macro_expansion?] -%><%= " -e " %>  <% end -%>
+%post <% if attributes[:rpm_macro_expansion?] -%><%= " -e " %>  <% end %>
 upgrade() {
 <%# Making sure that at least one command is in the function -%>
 <%# avoids a lot of potential errors, including the case that -%>
@@ -186,7 +186,7 @@ then
 fi
 <%   end -%>
 <%   if script?(:before_remove) -%>
-%preun <% if attributes[:rpm_macro_expansion?] -%><%= " -e " %>  <% end -%>
+%preun <% if attributes[:rpm_macro_expansion?] -%><%= " -e " %>  <% end %>
 if [ "${1}" -eq 0 ]
 then
 <%# Making sure that at least one command is in the function -%>
@@ -197,7 +197,7 @@ then
 fi
 <%   end -%>
 <%   if script?(:after_remove) -%>
-%postun <% if attributes[:rpm_macro_expansion?] -%><%= " -e " %>  <% end -%>
+%postun <% if attributes[:rpm_macro_expansion?] -%><%= " -e " %>  <% end %>
 if [ "${1}" -eq 0 ]
 then
 <%# Making sure that at least one command is in the function -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Jordan Sissel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2021-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.11
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
@@ -86,34 +86,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: childprocess
-  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
-  name: ffi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.12.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -128,20 +100,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
-- !ruby/object:Gem::Dependency
-  name: ruby-xz
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: pleaserun
   requirement: !ruby/object:Gem::Requirement
@@ -190,6 +148,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -306,7 +278,7 @@ homepage: https://github.com/jordansissel/fpm
 licenses:
 - MIT-like
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -322,9 +294,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: fpm - package building and mangling
 test_files: []