fpm 1.10.2 → 1.15.0

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,42 +139,37 @@ 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
+      # 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)
     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 +304,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 +329,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
@@ -423,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.10.2"
+  VERSION = "1.15.0"
 end

data/lib/fpm.rb

@@ -18,3 +18,4 @@ require "fpm/package/p5p"
 require "fpm/package/pkgin"
 require "fpm/package/freebsd"
 require "fpm/package/apk"
+require "fpm/package/snap"

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

data/templates/deb/postinst_upgrade.sh.erb

@@ -1,4 +1,9 @@
 #!/bin/sh
+
+<% if attributes[:deb_maintainerscripts_force_errorchecks?] -%>
+set -e
+<% end -%>
+
 after_upgrade() {
 <%# Making sure that at least one command is in the function -%>
 <%# avoids a lot of potential errors, including the case that -%>
@@ -8,18 +13,27 @@ after_upgrade() {
 <%=  script(:after_upgrade) %>
 <% end -%>
 
-<% if attributes[:deb_systemd] -%>
+<%# if any systemd services specified, loop through and start them -%>
+<% if attributes[:deb_systemd].any? -%>
 systemctl --system daemon-reload >/dev/null || true
-if ! systemctl is-enabled <%= attributes[:deb_systemd] %> >/dev/null 
+debsystemctl=$(command -v deb-systemd-invoke || echo systemctl)
+<% attributes[:deb_systemd].each do |service| -%>
+if ! systemctl is-enabled <%= service %> >/dev/null 
 then
-    systemctl enable <%= attributes[:deb_systemd] %> >/dev/null || true
-    systemctl start <%= attributes[:deb_systemd] %> >/dev/null || true
+  : # 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 -%>
+<% if attributes[:deb_systemd_auto_start?]-%>
+    $debsystemctl start <%= service %> >/dev/null || true
+<% end -%>
 <% if attributes[:deb_systemd_restart_after_upgrade?] -%>
 else
-    systemctl restart <%= attributes[:deb_systemd] %> >/dev/null || true
+    $debsystemctl restart <%= service %> >/dev/null || true
 <% end -%>
 fi
 <% end -%>
+<% end -%>
 }
 
 after_install() {
@@ -31,10 +45,18 @@ after_install() {
 <%=  script(:after_install) %>
 <% end -%>
 
-<% if attributes[:deb_systemd] -%>
+<%# if any systemd services specified, loop through and start them -%>
+<% if attributes[:deb_systemd].any? -%>
 systemctl --system daemon-reload >/dev/null || true
-systemctl enable <%= attributes[:deb_systemd] %> >/dev/null || true
-systemctl start <%= attributes[:deb_systemd] %> >/dev/null || true
+debsystemctl=$(command -v deb-systemd-invoke || echo systemctl)
+<% attributes[:deb_systemd].each do |service| -%>
+<% if attributes[:deb_systemd_enable?]-%>
+systemctl enable <%= service %> >/dev/null || true
+<% end -%>
+<% if attributes[:deb_systemd_auto_start?]-%>
+$debsystemctl start <%= service %> >/dev/null || true
+<% end -%>
+<% end -%>
 <% end -%>
 }
 

data/templates/deb/postrm_upgrade.sh.erb

@@ -1,4 +1,9 @@
 #!/bin/sh
+
+<% if attributes[:deb_maintainerscripts_force_errorchecks?] -%>
+set -e
+<% end -%>
+
 after_remove() {
 <%# Making sure that at least one command is in the function -%>
 <%# avoids a lot of potential errors, including the case that -%>

data/templates/deb/preinst_upgrade.sh.erb

@@ -1,4 +1,9 @@
 #!/bin/sh
+
+<% if attributes[:deb_maintainerscripts_force_errorchecks?] -%>
+set -e
+<% end -%>
+
 before_upgrade() {
 <%# Making sure that at least one command is in the function -%>
 <%# avoids a lot of potential errors, including the case that -%>

data/templates/deb/prerm_upgrade.sh.erb

@@ -1,4 +1,9 @@
 #!/bin/sh
+
+<% if attributes[:deb_maintainerscripts_force_errorchecks?] -%>
+set -e
+<% end -%>
+
 before_remove() {
 <%# Making sure that at least one command is in the function -%>
 <%# avoids a lot of potential errors, including the case that -%>
@@ -8,10 +13,13 @@ before_remove() {
 <%=  script(:before_remove) %>
 <% end -%>
 
-<%# Removing the systemd service-%>
-<% if attributes[:deb_systemd] -%>
-systemctl stop <%= attributes[:deb_systemd] %> >/dev/null || true
-systemctl disable <%= attributes[:deb_systemd] %> >/dev/null || true
+<%# Stop and remove any systemd services that were installed-%>
+<% if attributes[:deb_systemd].any? -%>
+debsystemctl=$(command -v deb-systemd-invoke || echo systemctl)
+<% attributes[:deb_systemd].each do |service| -%>
+$debsystemctl stop <%= service %> >/dev/null || true
+systemctl disable <%= service %> >/dev/null || true
+<% end -%>
 systemctl --system daemon-reload >/dev/null || true
 <% end -%>
 }

data/templates/deb.erb

@@ -25,10 +25,10 @@ Build-Depends: <%= attributes[:deb_build_depends].collect { |d| fix_dependency(d
 <% if !provides.empty? -%>
 <%# Turn each provides from 'foo = 123' to simply 'foo' because Debian :\ -%>
 <%#  http://www.debian.org/doc/debian-policy/ch-relationships.html -%>
-Provides: <%= provides.map {|p| p.split(" ").first}.join ", " %>
+Provides: <%= provides.join ", " %>
 <% end -%>
 <% if !replaces.empty? -%>
-Replaces: <%= replaces.join(", ") %>
+Replaces: <%= replaces.collect { |d| fix_dependency(d) }.flatten.join(", ") %>
 <% end -%>
 <% if attributes[:deb_recommends] and !attributes[:deb_recommends].empty? -%>
 Recommends: <%= attributes[:deb_recommends].collect { |d| fix_dependency(d) }.flatten.join(", ") %>

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
+%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
+%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
+%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
+%postun <% if attributes[:rpm_macro_expansion?] -%><%= " -e " %>  <% end %>
 if [ "${1}" -eq 0 ]
 then
 <%# Making sure that at least one command is in the function -%>
@@ -219,7 +219,7 @@ fi
 -%>
 <% scriptmap.each do |name, rpmname| -%>
 <%   if script?(name) -%>
-%<%=   rpmname %>
+%<%=   rpmname -%> <%= ' -e' if attributes[:rpm_macro_expansion?] %>
 <%=    script(name) %>
 <%   end -%>
 <% end -%>

data/templates/sh.erb

@@ -268,7 +268,12 @@ function clean_out_old_releases(){
 function print_package_metadata(){
     local metadata_line=$(grep -a -n -m1 '__METADATA__$' $0 | sed 's/:.*//')
     local archive_line=$(grep -a -n -m1 '__ARCHIVE__$' $0 | sed 's/:.*//')
-    sed -n "$((metadata_line + 1)),$((archive_line - 1)) p" $0
+
+    # This used to be a sed call but it was taking _forever_ and this method is super fast
+    local start_at=$((metadata_line + 1))
+    local take_num=$((archive_line - start_at))
+
+    head -n${start_at} $0 | tail -n${take_num}
 }
 
 function print_usage(){

metadata

@@ -1,35 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.15.0
 platform: ruby
 authors:
 - Jordan Sissel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-07-04 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: '2.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: '2.0'
 - !ruby/object:Gem::Dependency
   name: cabin
   requirement: !ruby/object:Gem::Requirement
@@ -64,14 +44,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
@@ -87,21 +67,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: childprocess
+  name: pleaserun
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.29
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.29
 - !ruby/object:Gem::Dependency
-  name: ffi
+  name: stud
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,49 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !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
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.29
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.29
-- !ruby/object:Gem::Dependency
-  name: stud
+  name: rexml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -212,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!
@@ -250,6 +202,7 @@ files:
 - lib/fpm/package/python.rb
 - lib/fpm/package/rpm.rb
 - lib/fpm/package/sh.rb
+- lib/fpm/package/snap.rb
 - lib/fpm/package/solaris.rb
 - lib/fpm/package/tar.rb
 - lib/fpm/package/virtualenv.rb
@@ -285,7 +238,7 @@ homepage: https://github.com/jordansissel/fpm
 licenses:
 - MIT-like
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -301,9 +254,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.3.20
+signing_key:
 specification_version: 4
 summary: fpm - package building and mangling
 test_files: []