puppet 3.1.1 → 3.2.0.rc1

data/lib/puppet/provider/package/opkg.rb

@@ -0,0 +1,77 @@
+require 'puppet/provider/package'
+
+Puppet::Type.type(:package).provide :opkg, :source => :opkg, :parent => Puppet::Provider::Package do
+  desc "Opkg packaging support. Common on OpenWrt and OpenEmbedded platforms"
+
+  commands :opkg => "opkg"
+
+  confine     :operatingsystem => :openwrt
+  defaultfor  :operatingsystem => :openwrt
+
+  def self.instances
+    packages = []
+    execpipe("#{command(:opkg)} list-installed") do |process|
+      regex = %r{^(\S+) - (\S+)}
+      fields = [:name, :ensure]
+      hash = {}
+
+      process.each_line { |line|
+        if match = regex.match(line)
+          fields.zip(match.captures) { |field,value| hash[field] = value }
+          name = hash[:name]
+          hash[:provider] = self.name
+          packages << new(hash)
+          hash = {}
+        else
+          warning("Failed to match line %s" % line)
+        end
+      }
+    end
+    packages
+  rescue Puppet::ExecutionFailure
+    return nil
+  end
+
+  def latest
+    output = opkg( "list", @resource[:name])
+    matches = /^(\S+) - (\S+)/.match(output).captures
+    matches[1]
+  end
+
+  def install
+    # OpenWrt package lists are ephemeral, make sure we have at least
+    # some entries in the list directory for opkg to use
+    opkg('update') if Dir.entries('/var/opkg-lists/').size <= 2
+
+    if @resource[:source]
+      opkg( '--force-overwrite', 'install', @resource[:source] )
+    else
+      opkg( '--force-overwrite', 'install', @resource[:name] )
+    end
+  end
+
+  def uninstall
+    opkg( 'remove', @resource[:name] )
+  end
+
+  def update
+    self.install
+  end
+
+  def query
+    # list out our specific package
+    output = opkg( 'list-installed', @resource[:name] )
+    if output =~ /^(\S+) - (\S+)/
+      return { :ensure => $2 }
+    end
+    nil
+  rescue Puppet::ExecutionFailure
+    return {
+      :ensure => :purged,
+      :status => 'missing',
+      :name => @resource[:name],
+      :error => 'ok',
+    }
+  end
+
+end

data/lib/puppet/provider/package/pacman.rb

@@ -115,11 +115,11 @@ Puppet::Type.type(:package).provide :pacman, :parent => Puppet::Provider::Packag
       if pacman_check
         output = pacman "-Sp", "--print-format", "%v", @resource[:name]
         return output.chomp
-      else 
+      else
         output = yaourt "-Qma", @resource[:name]
         output.split("\n").each do |line|
           return line.split[1].chomp if line =~ /^aur/
-        end  
+        end
       end
     rescue Puppet::ExecutionFailure
       if pacman_check and self.yaourt?

data/lib/puppet/provider/package/rpm.rb

@@ -23,19 +23,28 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
       end
   end
 
+  def self.current_version
+    return @current_version unless @current_version.nil?
+    output = rpm "--version"
+    @current_version = output.gsub('RPM version ', '').strip
+  end
+
+  # rpm < 4.1 don't support --nosignature
+  def self.nosignature
+    '--nosignature' unless Puppet::Util::Package.versioncmp(current_version, '4.1') < 0
+  end
+
+  # rpm < 4.0.2 don't support --nodigest
+  def self.nodigest
+    '--nodigest' unless Puppet::Util::Package.versioncmp(current_version, '4.0.2') < 0
+  end
+
   def self.instances
     packages = []
 
-    # rpm < 4.1 don't support --nosignature
-    output = rpm "--version"
-    sig = "--nosignature"
-    if output =~ /RPM version (([123].*)|(4\.0.*))/
-      sig = ""
-    end
-
     # list out all of the packages
     begin
-      execpipe("#{command(:rpm)} -qa #{sig} --nodigest --qf '#{NEVRAFORMAT}\n'") { |process|
+      execpipe("#{command(:rpm)} -qa #{nosignature} #{nodigest} --qf '#{NEVRAFORMAT}\n'") { |process|
         # now turn each returned line into a package object
         process.each_line { |line|
           hash = nevra_to_hash(line)
@@ -56,7 +65,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
     #NOTE: Prior to a fix for issue 1243, this method potentially returned a cached value
     #IF YOU CALL THIS METHOD, IT WILL CALL RPM
     #Use get(:property) to check if cached values are available
-    cmd = ["-q", @resource[:name], "--nosignature", "--nodigest", "--qf", "#{NEVRAFORMAT}\n"]
+    cmd = ["-q", @resource[:name], "#{self.class.nosignature}", "#{self.class.nodigest}", "--qf", "#{NEVRAFORMAT}\n"]
 
     begin
       output = rpm(*cmd)
@@ -95,13 +104,13 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
     end
 
     flag = "-i"
-    flag = "-U" if @property_hash[:ensure] and @property_hash[:ensure] != :absent
+    flag = ["-U", "--oldpackage"] if @property_hash[:ensure] and @property_hash[:ensure] != :absent
 
-    rpm flag, "--oldpackage", source
+    rpm flag, source
   end
 
   def uninstall
-    query unless get(:arch)
+    query if get(:arch) == :absent
     nvr = "#{get(:name)}-#{get(:version)}-#{get(:release)}"
     arch = ".#{get(:arch)}"
     # If they specified an arch in the manifest, erase that Otherwise,
@@ -109,10 +118,15 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
     # installed and only the package name is specified (without the
     # arch), this will uninstall all of them on successive runs of the
     # client, one after the other
-    if @resource[:name][-arch.size, arch.size] == arch
-      nvr += arch
-    else
-      nvr += ".#{get(:arch)}"
+
+    # version of RPM prior to 4.2.1 can't accept the architecture as
+    # part of the package name.
+    unless Puppet::Util::Package.versioncmp(self.class.current_version, '4.2.1') < 0
+      if @resource[:name][-arch.size, arch.size] == arch
+        nvr += arch
+      else
+        nvr += ".#{get(:arch)}"
+      end
     end
     rpm "-e", nvr
   end

data/lib/puppet/provider/package/yum.rb

@@ -2,9 +2,9 @@ require 'puppet/util/package'
 
 Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
   desc "Support via `yum`.
-  
-  Using this provider's `uninstallable` feature will not remove dependent packages. To 
-  remove dependent packages with this provider use the `purgeable` feature, but note this 
+
+  Using this provider's `uninstallable` feature will not remove dependent packages. To
+  remove dependent packages with this provider use the `purgeable` feature, but note this
   feature is destructive and should be used with the utmost care."
 
   has_feature :versionable

data/lib/puppet/provider/parsedfile.rb

@@ -103,6 +103,37 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
 # HEADER: is definitely not recommended.\n}
   end
 
+  # An optional regular expression matched by third party headers.
+  #
+  # For example, this can be used to filter the vixie cron headers as
+  # erronously exported by older cron versions.
+  #
+  # @api private
+  # @abstract Providers based on ParsedFile may implement this to make it
+  #   possible to identify a header maintained by a third party tool.
+  #   The provider can then allow that header to remain near the top of the
+  #   written file, or remove it after composing the file content.
+  #   If implemented, the function must return a Regexp object.
+  #   The expression must be tailored to match exactly one third party header.
+  # @see drop_native_header
+  # @note When specifying regular expressions in multiline mode, avoid
+  #   greedy repititions such as '.*' (use .*? instead). Otherwise, the
+  #   provider may drop file content between sparse headers.
+  def self.native_header_regex
+    nil
+  end
+
+  # How to handle third party headers.
+  # @api private
+  # @abstract Providers based on ParsedFile that make use of the support for
+  #   third party headers may override this method to return +true+.
+  #   When this is done, headers that are matched by the native_header_regex
+  #   are not written back to disk.
+  # @see native_header_regex
+  def self.drop_native_header
+    false
+  end
+
   # Add another type var.
   def self.initvars
     @records = []
@@ -186,6 +217,11 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
     match_providers_with_resources(resources)
   end
 
+  # Match a list of catalog resources with provider instances
+  #
+  # @api private
+  #
+  # @param [Array<Puppet::Resource>] resources A list of resources using this class as a provider
   def self.match_providers_with_resources(resources)
     return unless resources
     matchers = resources.dup
@@ -193,11 +229,10 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
       # Skip things like comments and blank lines
       next if skip_record?(record)
 
-      if name = record[:name] and resource = resources[name]
+      if (resource = resource_for_record(record, resources))
         resource.provider = new(record)
       elsif respond_to?(:match)
         if resource = match(record, matchers)
-          # Remove this resource from circulation so we don't unnecessarily try to match
           matchers.delete(resource.title)
           record[:name] = resource[:name]
           resource.provider = new(record)
@@ -206,6 +241,21 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
     end
   end
 
+  # Look up a resource based on a parsed file record
+  #
+  # @api private
+  #
+  # @param [Hash<Symbol, Object>] record
+  # @param [Array<Puppet::Resource>] resources
+  #
+  # @return [Puppet::Resource, nil] The resource if found, else nil
+  def self.resource_for_record(record, resources)
+    name = record[:name]
+    if name
+      resources[name]
+    end
+  end
+
   def self.prefetch_all_targets(resources)
     records = []
     targets(resources).each do |target|
@@ -216,7 +266,16 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
 
   # Prefetch an individual target.
   def self.prefetch_target(target)
-    target_records = retrieve(target).each do |r|
+
+    begin
+      target_records = retrieve(target)
+    rescue Puppet::Util::FileType::FileReadError => detail
+      puts detail.backtrace if Puppet[:trace]
+      Puppet.err "Could not prefetch #{self.resource_type.name} provider '#{self.name}' target '#{target}': #{detail}. Treating as empty"
+      target_records = []
+    end
+
+    target_records.each do |r|
       r[:on_disk] = true
       r[:target] = target
       r[:ensure] = :present
@@ -299,8 +358,26 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
     targets.uniq.compact
   end
 
+  # Compose file contents from the set of records.
+  #
+  # If self.native_header_regex is not nil, possible vendor headers are
+  # identified by matching the return value against the expression.
+  # If one (or several consecutive) such headers, are found, they are
+  # either moved in front of the self.header if self.drop_native_header
+  # is false (this is the default), or removed from the return value otherwise.
+  #
+  # @api private
   def self.to_file(records)
     text = super
+    if native_header_regex and (match = text.match(native_header_regex))
+      if drop_native_header
+        # concatenate the text in front of and after the native header
+        text = match.pre_match + match.post_match
+      else
+        native_header = match[0]
+        return native_header + header + match.pre_match + match.post_match
+      end
+    end
     header + text
   end
 

data/lib/puppet/provider/selmodule/semodule.rb

@@ -73,7 +73,7 @@ Puppet::Type.type(:selmodule).provide(:semodule) do
   end
 
   def selmod_readnext (handle)
-    len = handle.read(4).unpack('L')[0]
+    len = handle.read(4).unpack('V')[0]
     handle.read(len)
   end
 
@@ -83,7 +83,7 @@ Puppet::Type.type(:selmodule).provide(:semodule) do
     filename = selmod_name_to_filename
     mod = File.new(filename, "r")
 
-    (hdr, ver, numsec) = mod.read(12).unpack('LLL')
+    (hdr, ver, numsec) = mod.read(12).unpack('VVV')
 
     raise Puppet::Error, "Found #{hdr} instead of magic #{magic} in #{filename}" if hdr != magic
 

data/lib/puppet/provider/service/debian.rb

@@ -18,10 +18,6 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
 
   defaultfor :operatingsystem => [:debian, :ubuntu]
 
-  def self.defpath
-    superclass.defpath
-  end
-
   # Remove the symlinks
   def disable
     if `dpkg --compare-versions $(dpkg-query -W --showformat '${Version}' sysv-rc) ge 2.88 ; echo $?`.to_i == 0

data/lib/puppet/provider/service/freebsd.rb

@@ -41,7 +41,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
   def rcvar_name
     name = self.rcvar[1]
     self.error("No rcvar name found in rcvar") if name.nil?
-    name = name.gsub!(/(.*)(_enable)?=(.*)/, '\1')
+    name = name.gsub!(/(.*?)(_enable)?=(.*)/, '\1')
     self.error("rcvar name is empty") if name.nil?
     self.debug("rcvar name is #{name}")
     name
@@ -73,7 +73,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
     [rcconf, rcconf_local, rcconf_dir + "/#{service}"].each do |filename|
       if File.exists?(filename)
         s = File.read(filename)
-        if s.gsub!(/(#{rcvar}(_enable)?)=\"?(YES|NO)\"?/, "\\1=\"#{yesno}\"")
+        if s.gsub!(/^(#{rcvar}(_enable)?)=\"?(YES|NO)\"?/, "\\1=\"#{yesno}\"")
           File.open(filename, File::WRONLY) { |f| f << s }
           self.debug("Replaced in #{filename}")
           success = true

data/lib/puppet/provider/service/gentoo.rb

@@ -12,15 +12,6 @@ Puppet::Type.type(:service).provide :gentoo, :parent => :init do
 
   confine :operatingsystem => :gentoo
 
-  def self.defpath
-    superclass.defpath
-  end
-
-  def self.instances
-    # this exclude list was found with grep -L '\/sbin\/runscript' /etc/init.d/*
-    self.get_services(self.defpath, ['functions.sh', 'reboot.sh', 'shutdown.sh'])
-  end
-
   def disable
       output = update :del, @resource[:name], :default
   rescue Puppet::ExecutionFailure

data/lib/puppet/provider/service/init.rb

@@ -19,12 +19,37 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
   # We can't confine this here, because the init path can be overridden.
   #confine :exists => defpath
 
+  # some init scripts are not safe to execute, e.g. we do not want
+  # to suddently run /etc/init.d/reboot.sh status and reboot our system. The
+  # exclude list could be platform agnostic but I assume an invalid init script
+  # on system A will never be a valid init script on system B
+  def self.excludes
+    excludes = []
+    # these exclude list was found with grep -L '\/sbin\/runscript' /etc/init.d/* on gentoo
+    excludes += %w{functions.sh reboot.sh shutdown.sh}
+    # this exclude list is all from /sbin/service (5.x), but I did not exclude kudzu
+    excludes += %w{functions halt killall single linuxconf reboot boot}
+    # 'wait-for-state' and 'portmap-wait' are excluded from instances here
+    # because they take parameters that have unclear meaning. It looks like
+    # 'wait-for-state' is a generic waiter mainly used internally for other
+    # upstart services as a 'sleep until something happens'
+    # (http://lists.debian.org/debian-devel/2012/02/msg01139.html), while
+    # 'portmap-wait' is a specific instance of a waiter. There is an open
+    # launchpad bug
+    # (https://bugs.launchpad.net/ubuntu/+source/upstart/+bug/962047) that may
+    # eventually explain how to use the wait-for-state service or perhaps why
+    # it should remain excluded. When that bug is adddressed this should be
+    # reexamined.
+    excludes += %w{wait-for-state portmap-wait}
+    excludes
+  end
+
   # List all services of this type.
   def self.instances
     get_services(self.defpath)
   end
 
-  def self.get_services(defpath, exclude=[])
+  def self.get_services(defpath, exclude = self.excludes)
     defpath = [defpath] unless defpath.is_a? Array
     instances = []
     defpath.each do |path|
@@ -69,7 +94,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
       if File.directory?(path)
         true
       else
-        if File.exist?(path) and ! File.directory?(path)
+        if File.exist?(path)
           self.debug "Search path #{path} is not a directory"
         else
           self.debug "Search path #{path} does not exist"

data/lib/puppet/provider/service/launchd.rb

@@ -166,7 +166,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
   end
 
   # Launchd implemented plist overrides in version 10.6.
-  # This method checks the major_version of OS X and returns true if 
+  # This method checks the major_version of OS X and returns true if
   # it is 10.6 or greater. This allows us to implement different plist
   # behavior for versions >= 10.6
   def has_macosx_plist_overrides?

data/lib/puppet/provider/service/openwrt.rb

@@ -0,0 +1,36 @@
+Puppet::Type.type(:service).provide :openwrt, :parent => :init, :source => :init do
+  desc <<-EOT
+    Support for OpenWrt flavored init scripts.
+
+    Uses /etc/init.d/service_name enable, disable, and enabled.
+
+  EOT
+
+  defaultfor :operatingsystem => :openwrt
+  confine :operatingsystem => :openwrt
+
+  has_feature :enableable
+
+  def self.defpath
+    ["/etc/init.d"]
+  end
+
+  def enable
+    system(self.initscript, 'enable')
+  end
+
+  def disable
+    system(self.initscript, 'disable')
+  end
+
+  def enabled?
+    # We can't define the "command" for the init script, so we call system?
+    if system(self.initscript, 'enabled') then return :true else return :false end
+  end
+
+  # Purposely leave blank so we fail back to ps based status detection
+  # As OpenWrt init script do not have status commands
+  def statuscmd
+  end
+
+end