cure-fpm 1.3.3b → 1.6.0b

data/lib/fpm/package/cpan.rb

@@ -27,6 +27,12 @@ class FPM::Package::CPAN < FPM::Package
   option "--perl-lib-path", "PERL_LIB_PATH",
     "Path of target Perl Libraries"
 
+  option "--sandbox-non-core", :flag,
+    "Sandbox all non-core modules, even if they're already installed", :default => true
+
+  option "--cpanm-force", :flag,
+    "Pass the --force parameter to cpanm", :default => false
+
   private
   def input(package)
     #if RUBY_VERSION =~ /^1\.8/
@@ -40,7 +46,7 @@ class FPM::Package::CPAN < FPM::Package
     require "net/http"
     require "json"
 
-    if (attributes[:cpan_local_module?])
+    if File.exist?(package)
       moduledir = package
     else
       result = search(package)
@@ -49,20 +55,29 @@ class FPM::Package::CPAN < FPM::Package
     end
 
     # Read package metadata (name, version, etc)
-    if File.exists?(File.join(moduledir, "META.json"))
-      metadata = JSON.parse(File.read(File.join(moduledir, ("META.json"))))
-    elsif File.exists?(File.join(moduledir, ("META.yml")))
+    if File.exist?(File.join(moduledir, "META.json"))
+      local_metadata = JSON.parse(File.read(File.join(moduledir, ("META.json"))))
+    elsif File.exist?(File.join(moduledir, ("META.yml")))
       require "yaml"
-      metadata = YAML.load_file(File.join(moduledir, ("META.yml")))
-    elsif File.exists?(File.join(moduledir, "MYMETA.json"))
-      metadata = JSON.parse(File.read(File.join(moduledir, ("MYMETA.json"))))
-    elsif File.exists?(File.join(moduledir, ("MYMETA.yml")))
+      local_metadata = YAML.load_file(File.join(moduledir, ("META.yml")))
+    elsif File.exist?(File.join(moduledir, "MYMETA.json"))
+      local_metadata = JSON.parse(File.read(File.join(moduledir, ("MYMETA.json"))))
+    elsif File.exist?(File.join(moduledir, ("MYMETA.yml")))
       require "yaml"
-      metadata = YAML.load_file(File.join(moduledir, ("MYMETA.yml")))
-    else
-      raise FPM::InvalidPackageConfiguration, 
-        "Could not find package metadata. Checked for META.json and META.yml"
+      local_metadata = YAML.load_file(File.join(moduledir, ("MYMETA.yml")))
+    end
+
+    # Merge the MetaCPAN query result and the metadata pulled from the local
+    # META file(s).  The local data overwrites the query data for all keys the
+    # two hashes have in common.  Merge with an empty hash if there was no
+    # local META file.
+    metadata = result.merge(local_metadata || {})
+
+    if metadata.empty?
+      raise FPM::InvalidPackageConfiguration,
+        "Could not find package metadata. Checked for META.json, META.yml, and MetaCPAN API data"
     end
+
     self.version = metadata["version"]
     self.description = metadata["abstract"]
 
@@ -100,14 +115,24 @@ class FPM::Package::CPAN < FPM::Package
     # We'll install to a temporary directory.
     logger.info("Installing any build or configure dependencies")
 
-    cpanm_flags = ["-L", build_path("cpan"), moduledir]
-    cpanm_flags += ["-n"] if attributes[:cpan_test?]
+    if attributes[:cpan_sandbox_non_core?]
+      cpanm_flags = ["-L", build_path("cpan"), moduledir]
+    else
+      cpanm_flags = ["-l", build_path("cpan"), moduledir]
+    end
+
+    # This flag causes cpanm to ONLY download dependencies, skipping the target
+    # module itself.  This is fine, because the target module has already been
+    # downloaded, and there's no need to download twice, test twice, etc.
+    cpanm_flags += ["--installdeps"]
+    cpanm_flags += ["-n"] if !attributes[:cpan_test?]
     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?]
 
     safesystem(attributes[:cpan_cpanm_bin], *cpanm_flags)
 
-    if !attributes[:no_auto_depends?] 
+    if !attributes[:no_auto_depends?]
       unless metadata["requires"].nil?
         metadata["requires"].each do |dep_name, version|
           # Special case for representing perl core as a version.
@@ -116,7 +141,7 @@ class FPM::Package::CPAN < FPM::Package
             next
           end
           dep = search(dep_name)
-          
+
           if dep.include?("distribution")
             name = fix_name(dep["distribution"])
           else
@@ -156,7 +181,7 @@ class FPM::Package::CPAN < FPM::Package
 
       # Try Makefile.PL, Build.PL
       #
-      if File.exists?("Build.PL")
+      if File.exist?("Build.PL")
         # Module::Build is in use here; different actions required.
         safesystem(attributes[:cpan_perl_bin],
                    "-Mlocal::lib=#{build_path("cpan")}",
@@ -180,7 +205,7 @@ class FPM::Package::CPAN < FPM::Package
                      # Empty install_base to avoid local::lib being used.
                      "--install_base", "")
         end
-      elsif File.exists?("Makefile.PL")
+      elsif File.exist?("Makefile.PL")
         if attributes[:cpan_perl_lib_path]
           perl_lib_path = attributes[:cpan_perl_lib_path]
           safesystem(attributes[:cpan_perl_bin],
@@ -206,7 +231,7 @@ class FPM::Package::CPAN < FPM::Package
 
 
       else
-        raise FPM::InvalidPackageConfiguration, 
+        raise FPM::InvalidPackageConfiguration,
           "I don't know how to build #{name}. No Makefile.PL nor " \
           "Build.PL found"
       end
@@ -231,10 +256,10 @@ class FPM::Package::CPAN < FPM::Package
     # Find any shared objects in the staging directory to set architecture as
     # native if found; otherwise keep the 'all' default.
     Find.find(staging_path) do |path|
-      if path =~ /\.so$/  
+      if path =~ /\.so$/
         logger.info("Found shared library, setting architecture=native",
                      :path => path)
-        self.architecture = "native" 
+        self.architecture = "native"
       end
     end
   end
@@ -272,7 +297,7 @@ class FPM::Package::CPAN < FPM::Package
       release_response = httpfetch(metacpan_release_url)
     rescue Net::HTTPServerException => e
       logger.error("metacpan release query failed.", :error => e.message,
-                    :module => package, :url => metacpan_release_url)
+                    :url => metacpan_release_url)
       raise FPM::InvalidPackageConfiguration, "metacpan release query failed"
     end
 
@@ -280,7 +305,7 @@ class FPM::Package::CPAN < FPM::Package
     release_metadata = JSON.parse(data)
     archive = release_metadata["archive"]
 
-    # should probably be basepathed from the url 
+    # should probably be basepathed from the url
     tarball = File.basename(archive)
 
     url_base = "http://www.cpan.org/"
@@ -289,7 +314,7 @@ class FPM::Package::CPAN < FPM::Package
     #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}"
     logger.debug("Fetching perl module", :url => url)
-    
+
     begin
       response = httpfetch(url)
     rescue Net::HTTPServerException => e
@@ -336,7 +361,7 @@ class FPM::Package::CPAN < FPM::Package
   def httpfetch(url)
     uri = URI.parse(url)
     if ENV['http_proxy']
-      proxy = URI.parse(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)

data/lib/fpm/package/deb.rb

@@ -23,7 +23,7 @@ class FPM::Package::Deb < FPM::Package
   # The list of supported compression types. Default is gz (gzip)
   COMPRESSION_TYPES = [ "gz", "bzip2", "xz" ]
 
-  option "--ignore-iteration-in-dependencies", :flag, 
+  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 " \
             "version of a package but any iteration is permitted"
@@ -73,10 +73,10 @@ class FPM::Package::Deb < FPM::Package
     value.to_i
   end
 
-  option "--priority", "PRIORITY", 
+  option "--priority", "PRIORITY",
     "The debian package 'priority' value.", :default => "extra"
 
-  option "--use-file-permissions", :flag, 
+  option "--use-file-permissions", :flag,
     "Use existing file permissions when defining ownership and modes"
 
   option "--user", "USER", "The owner of files in this package", :default => 'root'
@@ -87,6 +87,10 @@ class FPM::Package::Deb < FPM::Package
     File.expand_path(file)
   end
 
+  option "--upstream-changelog", "FILEPATH", "Add FILEPATH as upstream changelog" do |file|
+    File.expand_path(file)
+  end
+
   option "--recommends", "PACKAGE", "Add PACKAGE to Recommends" do |pkg|
     @recommends ||= []
     @recommends << pkg
@@ -124,26 +128,42 @@ class FPM::Package::Deb < FPM::Package
     next @custom_fields
   end
 
+  option "--no-default-config-files", :flag,
+    "Do not add all files in /etc as configuration files by default for Debian packages.",
+    :default => false
+
+  option "--auto-config-files", :flag,
+    "Init script and default configuration files will be labeled as " \
+    "configuration files for Debian packages.",
+    :default => true
+
   option "--shlibs", "SHLIBS", "Include control/shlibs content. This flag " \
     "expects a string that is used as the contents of the shlibs file. " \
     "See the following url for a description of this file and its format: " \
     "http://www.debian.org/doc/debian-policy/ch-sharedlibs.html#s-shlibs"
 
   option "--init", "FILEPATH", "Add FILEPATH as an init script",
-	:multivalued => true do |file|
+    :multivalued => true do |file|
     next File.expand_path(file)
   end
 
   option "--default", "FILEPATH", "Add FILEPATH as /etc/default configuration",
-	:multivalued => true do |file|
+    :multivalued => true do |file|
     next File.expand_path(file)
   end
 
   option "--upstart", "FILEPATH", "Add FILEPATH as an upstart script",
+    :multivalued => true do |file|
+    next File.expand_path(file)
+  end
+
+  option "--systemd", "FILEPATH", "Add FILEPATH as a systemd script",
 	:multivalued => true do |file|
     next File.expand_path(file)
   end
 
+  option "--systemd-restart-after-upgrade", :flag , "Restart service after upgrade", :default => true
+
   def initialize(*args)
     super(*args)
     attributes[:deb_priority] = "extra"
@@ -162,7 +182,7 @@ class FPM::Package::Deb < FPM::Package
         @architecture = %x{dpkg --print-architecture 2> /dev/null}.chomp
         if $?.exitstatus != 0 or @architecture.empty?
           # if dpkg fails or emits nothing, revert back to uname -m
-          @architecture = %x{uname -m}.chomp 
+          @architecture = %x{uname -m}.chomp
         end
       else
         @architecture = %x{uname -m}.chomp
@@ -209,7 +229,7 @@ class FPM::Package::Deb < FPM::Package
 
     return @name
   end # def name
-  
+
   def prefix
     return (attributes[:prefix] or "/")
   end # def prefix
@@ -220,14 +240,14 @@ class FPM::Package::Deb < FPM::Package
   end # def input
 
   def extract_info(package)
-    with(build_path("control")) do |path|
+    build_path("control").tap do |path|
       FileUtils.mkdir(path) if !File.directory?(path)
       # Unpack the control tarball
       safesystem("ar p #{package} control.tar.gz | tar -zxf - -C #{path}")
 
       control = File.read(File.join(path, "control"))
 
-      parse = lambda do |field| 
+      parse = lambda do |field|
         value = control[/^#{field.capitalize}: .*/]
         if value.nil?
           return nil
@@ -252,7 +272,7 @@ class FPM::Package::Deb < FPM::Package
       self.name = parse.call("Package")
       self.url = parse.call("Homepage")
       self.vendor = parse.call("Vendor") || self.vendor
-      with(parse.call("Provides")) do |provides_str|
+      parse.call("Provides").tap do |provides_str|
         next if provides_str.nil?
         self.provides = provides_str.split(/\s*,\s*/)
       end
@@ -267,6 +287,22 @@ class FPM::Package::Deb < FPM::Package
       #self.config_files = config_files
 
       self.dependencies += parse_depends(parse.call("Depends")) if !attributes[:no_auto_depends?]
+
+      if File.file?(File.join(path, "preinst"))
+        self.scripts[:before_install] = File.read(File.join(path, "preinst"))
+      end
+      if File.file?(File.join(path, "postinst"))
+        self.scripts[:after_install] = File.read(File.join(path, "postinst"))
+      end
+      if File.file?(File.join(path, "prerm"))
+        self.scripts[:before_remove] = File.read(File.join(path, "prerm"))
+      end
+      if File.file?(File.join(path, "postrm"))
+        self.scripts[:after_remove] = File.read(File.join(path, "postrm"))
+      end
+      if File.file?(File.join(path, "conffiles"))
+        self.config_files = File.read(File.join(path, "conffiles")).split("\n")
+      end
     end
   end # def extract_info
 
@@ -289,7 +325,7 @@ class FPM::Package::Deb < FPM::Package
       m = dep_re.match(dep)
       if m
         name, op, version = m.captures
-        # deb uses ">>" and "<<" for greater and less than respectively. 
+        # deb uses ">>" and "<<" for greater and less than respectively.
         # fpm wants just ">" and "<"
         op = "<" if op == "<<"
         op = ">" if op == ">>"
@@ -309,10 +345,10 @@ class FPM::Package::Deb < FPM::Package
       when "gz"
         datatar = "data.tar.gz"
         compression = "-z"
-      when "bzip2" 
+      when "bzip2"
         datatar = "data.tar.bz2"
         compression = "-j"
-      when "xz" 
+      when "xz"
         datatar = "data.tar.xz"
         compression = "-J"
       else
@@ -351,14 +387,26 @@ class FPM::Package::Deb < FPM::Package
       end
     end
 
-    if script?(:before_upgrade) or script?(:after_upgrade)
+    attributes.fetch(:deb_systemd_list, []).each do |systemd|
+      name = File.basename(systemd, ".service")
+      dest_systemd = staging_path("lib/systemd/system/#{name}.service")
+      mkdir_p(File.dirname(dest_systemd))
+      FileUtils.cp(systemd, dest_systemd)
+      File.chmod(0644, dest_systemd)
+
+      # set the attribute with the systemd service name
+      attributes[:deb_systemd] = name
+    end
+
+    if script?(:before_upgrade) or script?(:after_upgrade) or attributes[:deb_systemd]
+      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)
+      if script?(:before_remove) or attributes[:deb_systemd]
         scripts[:before_remove] = template("deb/prerm_upgrade.sh.erb").result(binding)
       end
-      if script?(:after_install) or script?(:after_upgrade)
+      if script?(:after_install) or script?(:after_upgrade) or attributes[:deb_systemd]
         scripts[:after_install] = template("deb/postinst_upgrade.sh.erb").result(binding)
       end
       if script?(:after_remove)
@@ -373,7 +421,7 @@ class FPM::Package::Deb < FPM::Package
       when "gz", nil
         datatar = build_path("data.tar.gz")
         compression = "-z"
-      when "bzip2" 
+      when "bzip2"
         datatar = build_path("data.tar.bz2")
         compression = "-j"
       when "xz"
@@ -384,9 +432,14 @@ class FPM::Package::Deb < FPM::Package
           "Unknown compression type '#{self.attributes[:deb_compression]}'"
     end
 
-    # Write the changelog file
+    # There are two changelogs that may appear:
+    #   - debian-specific changelog, which should be archived as changelog.Debian.gz
+    #   - upstream changelog, which should be archived as changelog.gz
+    # see https://www.debian.org/doc/debian-policy/ch-docs.html#s-changelogs
+
+    # Write the changelog.Debian.gz file
     dest_changelog = File.join(staging_path, "usr/share/doc/#{name}/changelog.Debian.gz")
-    FileUtils.mkdir_p(File.dirname(dest_changelog))
+    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 attributes[:deb_changelog]
@@ -403,10 +456,30 @@ class FPM::Package::Deb < FPM::Package
       end.close
     end # No need to close, GzipWriter#close will close it.
 
+    # Write the changelog.gz file (upstream changelog)
+    dest_upstream_changelog = File.join(staging_path, "usr/share/doc/#{name}/changelog.gz")
+    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|
+            logger.info("Writing user-specified upstream changelog", :source => attributes[:deb_upstream_changelog])
+            File.new(attributes[:deb_upstream_changelog]).tap do |fd|
+              chunk = nil
+              # Ruby 1.8.7 doesn't have IO#copy_stream
+              changelog_gz.write(chunk) while chunk = fd.read(16384)
+            end.close
+        end.close
+      end # No need to close, GzipWriter#close will close it.
+    end
+
+    if File.exists?(dest_changelog) and not File.exists?(dest_upstream_changelog)
+      # see https://www.debian.org/doc/debian-policy/ch-docs.html#s-changelogs
+      File.rename(dest_changelog, dest_upstream_changelog)
+    end
+
     attributes.fetch(:deb_init_list, []).each do |init|
       name = File.basename(init, ".init")
       dest_init = File.join(staging_path, "etc/init.d/#{name}")
-      FileUtils.mkdir_p(File.dirname(dest_init))
+      mkdir_p(File.dirname(dest_init))
       FileUtils.cp init, dest_init
       File.chmod(0755, dest_init)
     end
@@ -414,30 +487,57 @@ class FPM::Package::Deb < FPM::Package
     attributes.fetch(:deb_default_list, []).each do |default|
       name = File.basename(default, ".default")
       dest_default = File.join(staging_path, "etc/default/#{name}")
-      FileUtils.mkdir_p(File.dirname(dest_default))
+      mkdir_p(File.dirname(dest_default))
       FileUtils.cp default, dest_default
       File.chmod(0644, dest_default)
     end
 
     attributes.fetch(:deb_upstart_list, []).each do |upstart|
       name = File.basename(upstart, ".upstart")
-      dest_upstart = staging_path("etc/init/#{name}.conf")
-      FileUtils.mkdir_p(File.dirname(dest_upstart))
+      name = "#{name}.conf" if !(name =~ /\.conf$/)
+      dest_upstart = staging_path("etc/init/#{name}")
+      mkdir_p(File.dirname(dest_upstart))
       FileUtils.cp(upstart, dest_upstart)
       File.chmod(0644, dest_upstart)
 
       # Install an init.d shim that calls upstart
-      dest_init = staging_path("/etc/init.d/#{name}")
-      FileUtils.mkdir_p(File.dirname(dest_init))
+      dest_init = staging_path("etc/init.d/#{name}")
+      mkdir_p(File.dirname(dest_init))
       FileUtils.ln_s("/lib/init/upstart-job", dest_init)
     end
 
+    attributes.fetch(:deb_systemd_list, []).each do |systemd|
+      name = File.basename(systemd, ".service")
+      dest_systemd = staging_path("lib/systemd/system/#{name}.service")
+      mkdir_p(File.dirname(dest_systemd))
+      FileUtils.cp(systemd, dest_systemd)
+      File.chmod(0644, dest_systemd)
+    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]}'"
+    end
+
     args = [ tar_cmd, "-C", staging_path, compression ] + data_tar_flags + [ "-cf", datatar, "." ]
     safesystem(*args)
 
     # pack up the .deb, which is just an 'ar' archive with 3 files
     # the 'debian-binary' file has to be first
-    with(File.expand_path(output_path)) do |output_path|
+    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)
       end
@@ -465,6 +565,20 @@ class FPM::Package::Deb < FPM::Package
         File.unlink(changelog_path)
       end
     end
+
+    if origin == FPM::Package::Deb
+      changelog_path = staging_path("usr/share/doc/#{name}/changelog.gz")
+      if File.exists?(changelog_path)
+        logger.debug("Found an upstream changelog file, using it.", :path => changelog_path)
+        attributes[:deb_upstream_changelog] = build_path("deb_upstream_changelog")
+        File.open(attributes[:deb_upstream_changelog], "w") do |deb_upstream_changelog|
+          Zlib::GzipReader.open(changelog_path) do |gz|
+            IO::copy_stream(gz, deb_upstream_changelog)
+          end
+        end
+        File.unlink(changelog_path)
+      end
+    end
   end # def converted_from
 
   def debianize_op(op)
@@ -574,10 +688,10 @@ class FPM::Package::Deb < FPM::Package
     write_md5sums # write the md5sums file
 
     # Make the control.tar.gz
-    with(build_path("control.tar.gz")) do |controltar|
+    build_path("control.tar.gz").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, "-zcf", controltar,
         "--owner=0", "--group=0", "--numeric-owner", "." ]
       safesystem(*args)
     end
@@ -607,7 +721,7 @@ class FPM::Package::Deb < FPM::Package
     end
 
     # Write the control file
-    with(control_path("control")) do |control|
+    control_path("control").tap do |control|
       if attributes[:deb_custom_control]
         logger.debug("Using '#{attributes[:deb_custom_control]}' template for the control file")
         control_data = File.read(attributes[:deb_custom_control])
@@ -631,39 +745,84 @@ class FPM::Package::Deb < FPM::Package
     SCRIPT_MAP.each do |scriptname, filename|
       next unless script?(scriptname)
 
-      with(control_path(filename)) do |controlscript|
+      control_path(filename).tap do |controlscript|
         logger.debug("Writing control script", :source => filename, :target => controlscript)
         File.write(controlscript, script(scriptname))
         # deb maintainer scripts are required to be executable
         File.chmod(0755, controlscript)
       end
-    end 
+    end
   end # def write_scripts
 
   def write_conffiles
-    return unless config_files.any?
-
-    # scan all conf file paths for files and add them
-    allconfigs = []
-    config_files.each do |path|
+    # expand recursively a given path to be put in allconfigs
+    def add_path(path, allconfigs)
       # Strip leading /
       path = path[1..-1] if path[0,1] == "/"
       cfg_path = File.expand_path(path, staging_path)
-      begin
-        Find.find(cfg_path) do |p|
-          allconfigs << p.gsub("#{staging_path}/", '') if File.file? p
+      Find.find(cfg_path) do |p|
+        if File.file?(p)
+          allconfigs << p.gsub("#{staging_path}/", '')
         end
-      rescue Errno::ENOENT => e
+      end
+    end
+
+    # check for any init scripts or default files
+    inits    = attributes.fetch(:deb_init_list, [])
+    defaults = attributes.fetch(:deb_default_list, [])
+    upstarts = attributes.fetch(:deb_upstart_list, [])
+    etcfiles = []
+    # Add everything in /etc
+    begin
+      if !attributes[:deb_no_default_config_files?]
+        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")
+        add_path("/etc", etcfiles)
+      end
+    rescue Errno::ENOENT
+    end
+
+    return unless (config_files.any? or inits.any? or defaults.any? or upstarts.any? or etcfiles.any?)
+
+    allconfigs = etcfiles
+
+    # scan all conf file paths for files and add them
+    config_files.each do |path|
+      begin
+        add_path(path, allconfigs)
+      rescue Errno::ENOENT
         raise FPM::InvalidPackageConfiguration,
-          "Error trying to use '#{cfg_path}' as a config file in the package. Does it exist?"
+          "Error trying to use '#{path}' as a config file in the package. Does it exist?"
       end
     end
+
+    if attributes[:deb_auto_config_files?]
+      inits.each do |init|
+        name = File.basename(init, ".init")
+        initscript = "/etc/init.d/#{name}"
+        logger.debug("Add conf file declaration for init script", :script => initscript)
+        allconfigs << initscript[1..-1]
+      end
+      defaults.each do |default|
+        name = File.basename(default, ".default")
+        confdefaults = "/etc/default/#{name}"
+        logger.debug("Add conf file declaration for defaults", :default => confdefaults)
+        allconfigs << confdefaults[1..-1]
+      end
+      upstarts.each do |upstart|
+        name = File.basename(upstart, ".upstart")
+        upstartscript = "etc/init/#{name}.conf"
+        logger.debug("Add conf file declaration for upstart script", :script => upstartscript)
+        allconfigs << upstartscript[1..-1]
+      end
+    end
+
     allconfigs.sort!.uniq!
+    return unless allconfigs.any?
 
-    with(control_path("conffiles")) do |conffiles|
+    control_path("conffiles").tap do |conffiles|
       File.open(conffiles, "w") do |out|
-        # 'config_files' comes from FPM::Package and is usually set with
-        # FPM::Command's --config-files flag
         allconfigs.each do |cf|
           # We need to put the leading / back. Stops lintian relative-conffile error.
           out.puts("/" + cf)
@@ -679,6 +838,7 @@ class FPM::Package::Deb < FPM::Package
     File.open(control_path("shlibs"), "w") do |out|
       out.write(attributes[:deb_shlibs])
     end
+    File.chmod(0644, control_path("shlibs"))
   end # def write_shlibs
 
   def write_debconf
@@ -694,7 +854,7 @@ class FPM::Package::Deb < FPM::Package
   end # def write_debconf
 
   def write_meta_files
-    files = attributes[:deb_meta_files]
+    files = attributes[:deb_meta_file]
     return unless files
     files.each do |fn|
       dest = control_path(File.basename(fn))
@@ -711,6 +871,7 @@ class FPM::Package::Deb < FPM::Package
 
     if lines.size > 0
       File.open(control_path("triggers"), 'a') do |f|
+        f.chmod 0644
         f.write "\n" if f.size > 0
         f.write lines
       end
@@ -738,11 +899,14 @@ class FPM::Package::Deb < FPM::Package
     end
   end # def write_md5sums
 
+  def mkdir_p(dir)
+    FileUtils.mkdir_p(dir, :mode => 0755)
+  end
+
   def to_s(format=nil)
     # Default format if nil
     # git_1.7.9.3-1_amd64.deb
-    return super("NAME_FULLVERSION_ARCH.TYPE") if format.nil?
-    return super(format)
+    return super(format.nil? ? "NAME_FULLVERSION_ARCH.EXTENSION" : format)
   end # def to_s
 
   def data_tar_flags