fpm-aeppert 1.6.2 → 1.11.0

data/CONTRIBUTORS

@@ -20,6 +20,7 @@ llasram
 sbuss
 Brett Gailey (github: dnbert)
 Daniel Haskin (github: djhaskin987)
+Richard Grainger (github: liger1978)
 
 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-2016 Jordan Sissel and contributors.
+Copyright (c) 2011-2017 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/bin/fpm

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require "rubygems"
 $: << File.join(File.dirname(__FILE__), "..", "lib")
 require "fpm"
 require "fpm/command"

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/lib/fpm/command.rb

@@ -45,13 +45,13 @@ class FPM::Command < Clamp::Command
     return lines.join("\n")
   end # def help
 
-  option "-t", "OUTPUT_TYPE",
+  option ["-t", "--output-type"], "OUTPUT_TYPE",
     "the type of package you want to create (deb, rpm, solaris, etc)",
     :attribute_name => :output_type
-  option "-s", "INPUT_TYPE",
+  option ["-s", "--input-type"], "INPUT_TYPE",
     "the package type to use as input (gem, rpm, python, etc)",
     :attribute_name => :input_type
-  option "-C", "CHDIR",
+  option ["-C", "--chdir"], "CHDIR",
     "Change directory to here before searching for files",
     :attribute_name => :chdir
   option "--prefix", "PREFIX",
@@ -233,6 +233,20 @@ class FPM::Command < Clamp::Command
     "copying, downloading, etc. Roughly any scratch space fpm needs to build " \
     "your package.", :default => Dir.tmpdir
 
+  option "--source-date-epoch-from-changelog", :flag,
+    "Use release date from changelog as timestamp on generated files to reduce nondeterminism. " \
+    "Experimental; only implemented for gem so far. ",
+    :default => false
+
+  option "--source-date-epoch-default", "SOURCE_DATE_EPOCH_DEFAULT",
+    "If no release date otherwise specified, use this value as timestamp on generated files to reduce nondeterminism. " \
+    "Reproducible build environments such as dpkg-dev and rpmbuild set this via envionment variable SOURCE_DATE_EPOCH " \
+    "variable to the integer unix timestamp to use in generated archives, " \
+    "and expect tools like fpm to use it as a hint to avoid nondeterministic output. " \
+    "This is a Unix timestamp, i.e. number of seconds since 1 Jan 1970 UTC. " \
+    "See https://reproducible-builds.org/specs/source-date-epoch ",
+    :environment_variable => "SOURCE_DATE_EPOCH"
+
   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 " \
@@ -256,12 +270,6 @@ class FPM::Command < Clamp::Command
 
   # Execute this command. See Clamp::Command#execute and Clamp's documentation
   def execute
-    # Short-circuit if someone simply runs `fpm --version`
-    if ARGV == [ "--version" ]
-      puts FPM::VERSION
-      return 0
-    end
-
     logger.level = :warn
     logger.level = :info if verbose? # --verbose
     logger.level = :debug if debug? # --debug
@@ -269,7 +277,6 @@ class FPM::Command < Clamp::Command
       logger.level = log_level.to_sym
     end
 
-
     if (stray_flags = args.grep(/^-/); stray_flags.any?)
       logger.warn("All flags should be before the first argument " \
                    "(stray flags found: #{stray_flags}")
@@ -514,9 +521,16 @@ class FPM::Command < Clamp::Command
     end
   end # def execute
 
-  def run(*run_args)
+  def run(run_args)
     logger.subscribe(STDOUT)
 
+    # Short circuit for a `fpm --version` or `fpm -v` short invocation that 
+    # is the user asking us for the version of fpm.
+    if run_args == [ "-v" ] || run_args == [ "--version" ]
+      puts FPM::VERSION
+      return 0
+    end
+
     # fpm initialization files, note the order of the following array is
     # important, try .fpm in users home directory first and then the current
     # directory
@@ -557,7 +571,7 @@ class FPM::Command < Clamp::Command
 
     ARGV.unshift(*flags)
     ARGV.push(*args)
-    super(*run_args)
+    super(run_args)
   rescue FPM::Package::InvalidArgument => e
     logger.error("Invalid package argument: #{e}")
     return 1

data/lib/fpm/package.rb

@@ -3,7 +3,8 @@ require "fpm/util" # local
 require "pathname" # stdlib
 require "find"
 require "tmpdir" # stdlib
-require "backports" # gem 'backports'
+require "ostruct"
+require "backports/latest"
 require "socket" # stdlib, for Socket.gethostname
 require "shellwords" # stdlib, for Shellwords.escape
 require "erb" # stdlib, for template processing
@@ -118,7 +119,10 @@ class FPM::Package
 
   def initialize
     # Attributes for this specific package
-    @attributes = {}
+    @attributes = {
+      # Default work location
+      :workdir => ::Dir.tmpdir
+    }
 
     # Reference
     # http://www.debian.org/doc/manuals/maint-guide/first.en.html
@@ -175,8 +179,8 @@ class FPM::Package
     @directories = []
     @attrs = {}
 
-    staging_path
     build_path
+    # Dont' initialize staging_path just yet, do it lazily so subclass can get a word in.
   end # def initialize
 
   # Get the 'type' for this instance.
@@ -386,7 +390,7 @@ class FPM::Package
       installdir = staging_path
     end
 
-    Find.find(staging_path) do |path|
+    Find.find(installdir) do |path|
       match_path = path.sub("#{installdir.chomp('/')}/", '')
 
       attributes[:excludes].each do |wildcard|
@@ -492,6 +496,22 @@ class FPM::Package
     return scripts.include?(name)
   end # def script?
 
+  # write all scripts to .scripts (tar and dir)
+  def write_scripts
+    scripts_path = File.join(staging_path, ".scripts")
+    target_scripts = [:before_install, :after_install, :before_remove, :after_remove]
+    if target_scripts.any? {|name| script?(name)}
+      ::Dir.mkdir(scripts_path)
+      target_scripts.each do |name|
+        next unless script?(name)
+        out = File.join(scripts_path, name.to_s)
+        logger.debug('Writing script', :source => name, :target => out)
+        File.write(out, script(name))
+        File.chmod(0755, out)
+      end
+    end
+  end
+
   # Get the contents of the script by a given name.
   #
   # If template_scripts? is set in attributes (often by the --template-scripts

data/lib/fpm/package/apk.rb

@@ -3,12 +3,12 @@ require "fpm/namespace"
 require "fpm/package"
 require "fpm/errors"
 require "fpm/util"
-require "backports"
+require "backports/latest"
 require "fileutils"
 require "digest"
 require 'digest/sha1'
 
-# Support for debian packages (.deb files)
+# Support for Alpine packages (.apk files)
 #
 # This class supports both input and output of packages.
 class FPM::Package::APK< FPM::Package
@@ -144,9 +144,9 @@ class FPM::Package::APK< FPM::Package
     scripts = {}
 
     scripts = register_script('post-install',   :after_install,   scripts)
-    scripts = register_script('post-install',   :before_install,  scripts)
-    scripts = register_script('post-install',   :before_upgrade,  scripts)
-    scripts = register_script('post-install',   :after_upgrade,  scripts)
+    scripts = register_script('pre-install',   :before_install,  scripts)
+    scripts = register_script('pre-upgrade',   :before_upgrade,  scripts)
+    scripts = register_script('post-upgrade',   :after_upgrade,  scripts)
     scripts = register_script('pre-deinstall',  :before_remove,   scripts)
     scripts = register_script('post-deinstall', :after_remove,    scripts)
 
@@ -238,7 +238,7 @@ class FPM::Package::APK< FPM::Package
         record_length = determine_record_length(record_length)
 
         until(data.length == record_length)
-          data += file.read(TAR_CHUNK_SIZE)
+          data << file.read(TAR_CHUNK_SIZE)
         end
 
         # Clear ownership fields

data/lib/fpm/package/cpan.rb

@@ -25,6 +25,9 @@ class FPM::Package::CPAN < FPM::Package
   option "--test", :flag,
     "Run the tests before packaging?", :default => true
 
+  option "--verbose", :flag,
+    "Produce verbose output from cpanm?", :default => false
+
   option "--perl-lib-path", "PERL_LIB_PATH",
     "Path of target Perl Libraries"
 
@@ -49,6 +52,7 @@ class FPM::Package::CPAN < FPM::Package
 
     if File.exist?(package)
       moduledir = package
+      result = {}
     else
       result = search(package)
       tarball = download(result, version)
@@ -98,6 +102,12 @@ class FPM::Package::CPAN < FPM::Package
       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
+    end
+
     # author is not always set or it may be a string instead of an array
     self.vendor = case metadata["author"]
       when String; metadata["author"]
@@ -130,6 +140,7 @@ class FPM::Package::CPAN < FPM::Package
     cpanm_flags += ["--mirror", "#{attributes[:cpan_mirror]}"] if !attributes[:cpan_mirror].nil?
     cpanm_flags += ["--mirror-only"] if attributes[:cpan_mirror_only?] && !attributes[:cpan_mirror].nil?
     cpanm_flags += ["--force"] if attributes[:cpan_cpanm_force?]
+    cpanm_flags += ["--verbose"] if attributes[:cpan_verbose?]
 
     safesystem(attributes[:cpan_cpanm_bin], *cpanm_flags)
 
@@ -149,16 +160,16 @@ class FPM::Package::CPAN < FPM::Package
        found_dependencies.each do |dep_name, version|
           # Special case for representing perl core as a version.
           if dep_name == "perl"
+            m = version.to_s.match(/^(\d)\.(\d{3})(\d{3})$/)
+            if m
+               version = m[1] + '.' + m[2].sub(/^0*/, '') + '.' + m[3].sub(/^0*/, '')
+            end
             self.dependencies << "#{dep_name} >= #{version}"
             next
           end
           dep = search(dep_name)
 
-          if dep.include?("distribution")
-            name = fix_name(dep["distribution"])
-          else
-            name = fix_name(dep_name)
-          end
+          name = cap_name(dep_name)
 
           if version.to_s == "0"
             # Assume 'Foo = 0' means any version?
@@ -166,12 +177,14 @@ class FPM::Package::CPAN < FPM::Package
           else
             # The 'version' string can be something complex like:
             #   ">= 0, != 1.0, != 1.2"
+            # If it is not specified explicitly, require the given
+            # version or newer, as that is all CPAN itself enforces
             if version.is_a?(String)
               version.split(/\s*,\s*/).each do |v|
                 if v =~ /\s*[><=]/
                   self.dependencies << "#{name} #{v}"
                 else
-                  self.dependencies << "#{name} = #{v}"
+                  self.dependencies << "#{name} >= #{v}"
                 end
               end
             else
@@ -232,11 +245,7 @@ class FPM::Package::CPAN < FPM::Package
                      # Empty install_base to avoid local::lib being used.
                      "INSTALL_BASE=")
         end
-        if attributes[:cpan_test?]
-          make = [ "env", "PERL5LIB=#{build_path("cpan/lib/perl5")}", "make" ]
-        else
-          make = [ "make" ]
-        end
+        make = [ "env", "PERL5LIB=#{build_path("cpan/lib/perl5")}", "make" ]
         safesystem(*make)
         safesystem(*(make + ["test"])) if attributes[:cpan_test?]
         safesystem(*(make + ["DESTDIR=#{staging_path}", "install"]))
@@ -258,7 +267,7 @@ class FPM::Package::CPAN < FPM::Package
                       :path => path.gsub(staging_path, ""))
         File.unlink(path)
       end
-      
+
       # Remove useless .packlist files and their empty parent folders
       # https://github.com/jordansissel/fpm/issues/1179
       ::Dir.glob(File.join(staging_path, glob_prefix, "**/.packlist")).each do |path|
@@ -308,38 +317,35 @@ class FPM::Package::CPAN < FPM::Package
                  :distribution => distribution,
                  :version => cpan_version)
 
-    # default to latest versionunless we specify one
+    # default to latest version unless we specify one
     if cpan_version.nil?
-      self.version = metadata["version"]
+      self.version = "#{metadata["version"]}"
     else
-      if metadata["version"] =~ /^v\d/
-        self.version = "v#{cpan_version}"
-      else
-        self.version = cpan_version
-      end
+      self.version = "#{cpan_version}"
     end
 
-    metacpan_release_url = "http://api.metacpan.org/v0/release/#{author}/#{distribution}-#{self.version}"
+    # 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}" + '"}}}'
     begin
-      release_response = httpfetch(metacpan_release_url)
+      search_response = httppost(metacpan_search_url,metacpan_search_query)
     rescue Net::HTTPServerException => e
       logger.error("metacpan release query failed.", :error => e.message,
-                    :url => metacpan_release_url)
+                    :url => metacpan_search_url)
       raise FPM::InvalidPackageConfiguration, "metacpan release query failed"
     end
 
-    data = release_response.body
+    data = search_response.body
     release_metadata = JSON.parse(data)
-    archive = release_metadata["archive"]
 
-    # should probably be basepathed from the url
-    tarball = File.basename(archive)
+    download_url = release_metadata['hits']['hits'][0]['fields']['download_url']
+    download_path = URI.parse(download_url).path
+    tarball = File.basename(download_path)
 
     url_base = "http://www.cpan.org/"
     url_base = "#{attributes[:cpan_mirror]}" if !attributes[:cpan_mirror].nil?
 
-    #url = "http://www.cpan.org/CPAN/authors/id/#{author[0,1]}/#{author[0,2]}/#{author}/#{tarball}"
-    url = "#{url_base}/authors/id/#{author[0,1]}/#{author[0,2]}/#{author}/#{archive}"
+    url = "#{url_base}#{download_path}"
     logger.debug("Fetching perl module", :url => url)
 
     begin
@@ -360,7 +366,7 @@ class FPM::Package::CPAN < FPM::Package
 
   def search(package)
     logger.info("Asking metacpan about a module", :module => package)
-    metacpan_url = "http://api.metacpan.org/v0/module/" + package
+    metacpan_url = "https://fastapi.metacpan.org/v1/module/" + package
     begin
       response = httpfetch(metacpan_url)
     rescue Net::HTTPServerException => e
@@ -378,6 +384,10 @@ class FPM::Package::CPAN < FPM::Package
     return metadata
   end # def metadata
 
+  def cap_name(name)
+    return "perl(" + name.gsub("-", "::") + ")"
+  end # def cap_name
+
   def fix_name(name)
     case name
       when "perl"; return "perl"
@@ -393,6 +403,7 @@ class FPM::Package::CPAN < FPM::Package
     else
       http = Net::HTTP.new(uri.host, uri.port)
     end
+    http.use_ssl = uri.scheme == 'https'
     response = http.request(Net::HTTP::Get.new(uri.request_uri))
     case response
       when Net::HTTPSuccess; return response
@@ -401,5 +412,22 @@ class FPM::Package::CPAN < FPM::Package
     end
   end
 
+  def httppost(url, body)
+    uri = URI.parse(url)
+    if ENV['http_proxy']
+      proxy = URI.parse(ENV['http_proxy'])
+      http = Net::HTTP.Proxy(proxy.host,proxy.port,proxy.user,proxy.password).new(uri.host, uri.port)
+    else
+      http = Net::HTTP.new(uri.host, uri.port)
+    end
+    http.use_ssl = uri.scheme == 'https'
+    response = http.post(uri.request_uri, body)
+    case response
+      when Net::HTTPSuccess; return response
+      when Net::HTTPRedirection; return httppost(response["location"])
+      else; response.error!
+    end
+  end
+
   public(:input)
 end # class FPM::Package::NPM

data/lib/fpm/package/deb.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"
 
@@ -18,10 +18,11 @@ class FPM::Package::Deb < FPM::Package
     :after_install      => "postinst",
     :before_remove      => "prerm",
     :after_remove       => "postrm",
+    :after_purge        => "postrm",
   } unless defined?(SCRIPT_MAP)
 
   # The list of supported compression types. Default is gz (gzip)
-  COMPRESSION_TYPES = [ "gz", "bzip2", "xz" ]
+  COMPRESSION_TYPES = [ "gz", "bzip2", "xz", "none" ]
 
   option "--ignore-iteration-in-dependencies", :flag,
             "For '=' (equal) dependencies, allow iterations on the specified " \
@@ -49,6 +50,8 @@ class FPM::Package::Deb < FPM::Package
     value
   end
 
+  option "--dist", "DIST-TAG", "Set the deb distribution.", :default => "unstable"
+
   # Take care about the case when we want custom control file but still use fpm ...
   option "--custom-control", "FILEPATH",
     "Custom version of the Debian control file." do |control|
@@ -87,6 +90,10 @@ class FPM::Package::Deb < FPM::Package
     File.expand_path(file)
   end
 
+  option "--generate-changes", :flag,
+    "Generate PACKAGENAME.changes file.",
+    :default => false
+
   option "--upstream-changelog", "FILEPATH", "Add FILEPATH as upstream changelog" do |file|
     File.expand_path(file)
   end
@@ -121,6 +128,18 @@ class FPM::Package::Deb < FPM::Package
     next @activated_triggers
   end
 
+  option "--interest-noawait", "EVENT", "Package is interested in EVENT trigger without awaiting" do |event|
+    @interested_noawait_triggers ||= []
+    @interested_noawait_triggers << event
+    next @interested_noawait_triggers
+  end
+
+  option "--activate-noawait", "EVENT", "Package activates EVENT trigger" do |event|
+    @activated_noawait_triggers ||= []
+    @activated_noawait_triggers << event
+    next @activated_noawait_triggers
+  end
+
   option "--field", "'FIELD: VALUE'", "Add custom field to the control file" do |fv|
     @custom_fields ||= {}
     field, value = fv.split(/: */, 2)
@@ -162,8 +181,18 @@ class FPM::Package::Deb < FPM::Package
     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",
+    "A script to be run after package removal to purge remaining (config) files " \
+    "(a.k.a. postrm purge within apt-get purge)" do |val|
+    File.expand_path(val) # Get the full path to the script
+  end # --after-purge
+
   def initialize(*args)
     super(*args)
     attributes[:deb_priority] = "extra"
@@ -240,10 +269,32 @@ class FPM::Package::Deb < FPM::Package
   end # def input
 
   def extract_info(package)
+    compression = `#{ar_cmd[0]} t #{package}`.split("\n").grep(/control.tar/).first.split(".").last
+    case compression
+      when "gz"
+        controltar = "control.tar.gz"
+        compression = "-z"
+      when "bzip2","bz2"
+        controltar = "control.tar.bz2"
+        compression = "-j"
+      when "xz"
+        controltar = "control.tar.xz"
+        compression = "-J"
+      when 'tar'
+        controltar = "control.tar"
+        compression = ""
+      when nil
+        raise FPM::InvalidPackageConfiguration, "Missing control.tar in deb source package #{package}"
+      else
+        raise FPM::InvalidPackageConfiguration,
+          "Unknown compression type '#{compression}' for control.tar in deb source package #{package}"
+    end
+
     build_path("control").tap do |path|
       FileUtils.mkdir(path) if !File.directory?(path)
+      # unpack the control.tar.{,gz,bz2,xz} from the deb package into staging_path
       # Unpack the control tarball
-      safesystem("ar p #{package} control.tar.gz | tar -zxf - -C #{path}")
+      safesystem(ar_cmd[0] + " p #{package} #{controltar} | tar #{compression} -xf - -C #{path}")
 
       control = File.read(File.join(path, "control"))
 
@@ -340,26 +391,29 @@ class FPM::Package::Deb < FPM::Package
 
   def extract_files(package)
     # Find out the compression type
-    compression = `ar t #{package}`.split("\n").grep(/data.tar/).first.split(".").last
+    compression = `#{ar_cmd[0]} t #{package}`.split("\n").grep(/data.tar/).first.split(".").last
     case compression
       when "gz"
         datatar = "data.tar.gz"
         compression = "-z"
-      when "bzip2"
+      when "bzip2","bz2"
         datatar = "data.tar.bz2"
         compression = "-j"
       when "xz"
         datatar = "data.tar.xz"
         compression = "-J"
+      when 'tar'
+        datatar = "data.tar"
+        compression = ""
+      when nil
+        raise FPM::InvalidPackageConfiguration, "Missing data.tar in deb source package #{package}"
       else
         raise FPM::InvalidPackageConfiguration,
-          "Unknown compression type '#{self.attributes[:deb_compression]}' "
-          "in deb source package #{package}"
+          "Unknown compression type '#{compression}' for data.tar in deb source package #{package}"
     end
 
     # unpack the data.tar.{gz,bz2,xz} from the deb package into staging_path
-    safesystem("ar p #{package} #{datatar} " \
-               "| tar #{compression} -xf - -C #{staging_path}")
+    safesystem(ar_cmd[0] + " p #{package} #{datatar} | tar #{compression} -xf - -C #{staging_path}")
   end # def extract_files
 
   def output(output_path)
@@ -387,6 +441,23 @@ class FPM::Package::Deb < FPM::Package
       end
     end
 
+    if attributes[:source_date_epoch].nil? and not attributes[:source_date_epoch_default].nil?
+      attributes[:source_date_epoch] = attributes[:source_date_epoch_default]
+    end
+    if attributes[:source_date_epoch] == "0"
+      logger.error("Alas, ruby's Zlib::GzipWriter does not support setting an mtime of zero.  Aborting.")
+      raise "#{name}: source_date_epoch of 0 not supported."
+    end
+    if not attributes[:source_date_epoch].nil? and not ar_cmd_deterministic?
+      logger.error("Alas, could not find an ar that can handle -D option. Try installing recent gnu binutils. Aborting.")
+      raise "#{name}: ar is insufficient to support source_date_epoch."
+    end
+    if not attributes[:source_date_epoch].nil? and not tar_cmd_supports_sort_names_and_set_mtime?
+      logger.error("Alas, could not find a tar that can set mtime and sort.  Try installing recent gnu tar. Aborting.")
+      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")
@@ -394,42 +465,27 @@ 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)
         scripts[:after_remove] = template("deb/postrm_upgrade.sh.erb").result(binding)
       end
-    end
-
-    write_control_tarball
-
-    # Tar up the staging_path into data.tar.{compression type}
-    case self.attributes[:deb_compression]
-      when "gz", nil
-        datatar = build_path("data.tar.gz")
-        compression = "-z"
-      when "bzip2"
-        datatar = build_path("data.tar.bz2")
-        compression = "-j"
-      when "xz"
-        datatar = build_path("data.tar.xz")
-        compression = "-J"
-      else
-        raise FPM::InvalidPackageConfiguration,
-          "Unknown compression type '#{self.attributes[:deb_compression]}'"
+      if script?(:after_purge)
+        scripts[:after_purge] = template("deb/postrm_upgrade.sh.erb").result(binding)
+      end
     end
 
     # There are two changelogs that may appear:
@@ -442,6 +498,9 @@ class FPM::Package::Deb < FPM::Package
     mkdir_p(File.dirname(dest_changelog))
     File.new(dest_changelog, "wb", 0644).tap do |changelog|
       Zlib::GzipWriter.new(changelog, Zlib::BEST_COMPRESSION).tap do |changelog_gz|
+        if not attributes[:source_date_epoch].nil?
+          changelog_gz.mtime = attributes[:source_date_epoch].to_i
+        end
         if attributes[:deb_changelog]
           logger.info("Writing user-specified changelog", :source => attributes[:deb_changelog])
           File.new(attributes[:deb_changelog]).tap do |fd|
@@ -461,6 +520,9 @@ class FPM::Package::Deb < FPM::Package
     if attributes[:deb_upstream_changelog]
       File.new(dest_upstream_changelog, "wb", 0644).tap do |changelog|
         Zlib::GzipWriter.new(changelog, Zlib::BEST_COMPRESSION).tap do |changelog_gz|
+            if not attributes[:source_date_epoch].nil?
+              changelog_gz.mtime = attributes[:source_date_epoch].to_i
+            end
             logger.info("Writing user-specified upstream changelog", :source => attributes[:deb_upstream_changelog])
             File.new(attributes[:deb_upstream_changelog]).tap do |fd|
               chunk = nil
@@ -494,6 +556,7 @@ class FPM::Package::Deb < FPM::Package
 
     attributes.fetch(:deb_upstart_list, []).each do |upstart|
       name = File.basename(upstart, ".upstart")
+      dest_init = staging_path("etc/init.d/#{name}")
       name = "#{name}.conf" if !(name =~ /\.conf$/)
       dest_upstart = staging_path("etc/init/#{name}")
       mkdir_p(File.dirname(dest_upstart))
@@ -501,7 +564,6 @@ class FPM::Package::Deb < FPM::Package
       File.chmod(0644, dest_upstart)
 
       # Install an init.d shim that calls upstart
-      dest_init = staging_path("etc/init.d/#{name}")
       mkdir_p(File.dirname(dest_init))
       FileUtils.ln_s("/lib/init/upstart-job", dest_init)
     end
@@ -527,21 +589,54 @@ class FPM::Package::Deb < FPM::Package
       when "xz"
         datatar = build_path("data.tar.xz")
         compression = "-J"
+      when "none"
+        datatar = build_path("data.tar")
+        compression = ""
       else
         raise FPM::InvalidPackageConfiguration,
           "Unknown compression type '#{self.attributes[:deb_compression]}'"
     end
 
     args = [ tar_cmd, "-C", staging_path, compression ] + 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])]
+      # gnu tar obeys GZIP environment variable with options for gzip; -n = forget original filename and date
+      args.unshift({"GZIP" => "-9n"})
+    end
     safesystem(*args)
 
     # pack up the .deb, which is just an 'ar' archive with 3 files
     # the 'debian-binary' file has to be first
     File.expand_path(output_path).tap do |output_path|
       ::Dir.chdir(build_path) do
-        safesystem("ar", "-qc", output_path, "debian-binary", "control.tar.gz", datatar)
+        safesystem(*ar_cmd, output_path, "debian-binary", "control.tar.gz", datatar)
       end
     end
+
+    # if a PACKAGENAME.changes file is to be created
+    if self.attributes[:deb_generate_changes?]
+      distribution = self.attributes[:deb_dist]
+
+      # gather information about the files to distribute
+      files = [ output_path ]
+      changes_files = []
+      files.each do |path|
+        changes_files.push({
+          :name => path,
+          :size => File.size?(path),
+          :md5sum => Digest::MD5.file(path).hexdigest,
+          :sha1sum => Digest::SHA1.file(path).hexdigest,
+          :sha256sum => Digest::SHA2.file(path).hexdigest,
+        })
+      end
+
+      # write change infos to .changes file
+      changes_path = File.basename(output_path, '.deb') + '.changes'
+      changes_data = template("deb/deb.changes.erb").result(binding)
+      File.write(changes_path, changes_data)
+      logger.log("Created changes", :path => changes_path)
+    end # if deb_generate_changes
   end # def output
 
   def converted_from(origin)
@@ -687,12 +782,37 @@ class FPM::Package::Deb < FPM::Package
     write_triggers # write trigger config to 'triggers' file
     write_md5sums # write the md5sums file
 
+    # Tar up the staging_path into control.tar.{compression type}
+    case self.attributes[:deb_compression]
+      when "gz", nil
+        controltar = "control.tar.gz"
+        compression = "-z"
+      when "bzip2"
+        controltar = "control.tar.bz2"
+        compression = "-j"
+      when "xz"
+        controltar = "control.tar.xz"
+        compression = "-J"
+      when "none"
+        controltar = "control.tar"
+        compression = ""
+      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, "-zcf", controltar,
+      args = [ tar_cmd, "-C", control_path, compression, "-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
+        args += ["--sort=name", ("--mtime=@%s" % attributes[:source_date_epoch])]
+        # gnu tar obeys GZIP environment variable with options for gzip; -n = forget original filename and date
+        args.unshift({"GZIP" => "-9n"})
+      end
       safesystem(*args)
     end
 
@@ -789,11 +909,25 @@ class FPM::Package::Deb < FPM::Package
 
     # scan all conf file paths for files and add them
     config_files.each do |path|
+      logger.debug("Checking if #{path} exists")
+      cfe = File.exist?("#{path}")
+      logger.debug("Check result #{cfe}")
       begin
         add_path(path, allconfigs)
       rescue Errno::ENOENT
-        raise FPM::InvalidPackageConfiguration,
-          "Error trying to use '#{path}' as a config file in the package. Does it exist?"
+        if !cfe
+          raise FPM::InvalidPackageConfiguration,
+            "Error trying to use '#{path}' as a config file in the package. Does it exist?"
+        else
+          dcl = File.join(staging_path, path)
+          if !File.exist?("#{dcl}")
+            logger.debug("Adding config file #{path} to Staging area #{staging_path}")
+            FileUtils.mkdir_p(File.dirname(dcl))
+            FileUtils.cp_r path, dcl
+          else
+            logger.debug("Config file aready exists in staging area.")
+          end
+        end
       end
     end
 
@@ -849,7 +983,7 @@ class FPM::Package::Deb < FPM::Package
 
     if attributes[:deb_templates]
       FileUtils.cp(attributes[:deb_templates], control_path("templates"))
-      File.chmod(0755, control_path("templates"))
+      File.chmod(0644, control_path("templates"))
     end
   end # def write_debconf
 
@@ -865,7 +999,10 @@ class FPM::Package::Deb < FPM::Package
 
   def write_triggers
     lines = [['interest', :deb_interest],
-             ['activate', :deb_activate]].map { |label, attr|
+             ['activate', :deb_activate],
+             ['interest-noawait', :deb_interest_noawait],
+             ['activate-noawait', :deb_activate_noawait],
+             ].map { |label, attr|
       (attributes[attr] || []).map { |e| "#{label} #{e}\n" }
     }.flatten.join('')