puppet 0.24.5 → 0.24.6

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

@@ -70,7 +70,7 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag
             self.fail "Mac OS X PKG DMG's must specificy a source string ending in .dmg"
         end
         require 'open-uri'
-        require 'puppet/util/plist'
+        require 'facter/util/plist'
         cached_source = source
         if %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://} =~ cached_source
             cached_source = "/tmp/#{name}"

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

@@ -7,6 +7,8 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
 
     commands :emerge => "/usr/bin/emerge", :eix => "/usr/bin/eix", :update_eix => "/usr/bin/update-eix"
 
+    confine :operatingsystem => :gentoo
+
     defaultfor :operatingsystem => :gentoo
 
     def self.instances
@@ -70,7 +72,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
         result_format = /(\S+) (\S+) \[(?:([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\([^\)]+\))?(?:\[([^\]]+)\])?[ ]*)*\] \[(?:(?:\{M\})?(?:\([~*]+\))?([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\(([^\)]+)\))?(?:![mf])*(?:\[([^\]]+)\])?)?\] ([\S]*) (.*)/
         result_fields = [:category, :name, :ensure, :ensure_overlay, :version_available, :slot, :overlay, :vendor, :description]
 
-        search_field = @resource[:category] ? "--category-name" : "--name"
+        search_field = package_name.count('/') > 0 ? "--category-name" : "--name"
         search_value = package_name
         search_format = "<category> <name> [<installedversionsshort>] [<best>] <homepage> <description>"
 

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

@@ -33,7 +33,7 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre
         begin
             output = portversion(*cmd)
         rescue Puppet::ExecutionFailure
-            raise Puppet::PackageError.new(output)
+            raise Puppet::Error.new(output)
         end
         line = output.split("\n").pop
 
@@ -47,7 +47,7 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre
         info = $3
 
         unless pkgstuff =~ /^(\S+)-([^-\s]+)$/
-            raise Puppet::PackageError,
+            raise Puppet::Error,
                 "Could not match package info '%s'" % pkgstuff
         end
 
@@ -61,7 +61,7 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre
         # Else, we need to be updated; we need to pull out the new version
 
         unless info =~ /\((\w+) has (.+)\)/
-            raise Puppet::PackageError,
+            raise Puppet::Error,
                 "Could not match version info '%s'" % info
         end
 

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

@@ -23,9 +23,16 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
     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 --nosignature --nodigest --qf '#{NEVRAFORMAT}\n'") { |process|
+            execpipe("#{command(:rpm)} -qa #{sig} --nodigest --qf '#{NEVRAFORMAT}\n'") { |process|
                 # now turn each returned line into a package object
                 process.each { |line|
                     hash = nevra_to_hash(line)

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

@@ -5,8 +5,8 @@ Puppet.type(:package).provide :rug, :parent => :rpm do
 
     commands :rug => "/usr/bin/rug"
     commands :rpm => "rpm"
-    defaultfor :operatingsystem => :suse 
-    confine    :operatingsystem => :suse
+    defaultfor :operatingsystem => [:suse, :sles]
+    confine    :operatingsystem => [:suse, :sles]
 
     # Install a package using 'rug'.
     def install

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

@@ -9,6 +9,8 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d
              :pkgadd => "/usr/sbin/pkgadd",
              :pkgrm => "/usr/sbin/pkgrm"
 
+    confine :operatingsystem => :solaris
+
     defaultfor :operatingsystem => :solaris
 
     def self.instances

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

@@ -4,5 +4,8 @@ Puppet::Type.type(:package).provide :sunfreeware, :parent => :blastwave, :source
         At this point, support is exactly the same as ``blastwave`` support and
         has not actually been tested."
     commands :pkgget => "pkg-get"
+
+    confine :operatingsystem => :solaris
+
 end
 

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

@@ -7,9 +7,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
     
     YUMHELPER = File::join(File::dirname(__FILE__), "yumhelper.py")
 
-    class << self
-        attr_reader :updates
-    end
+    attr_accessor :latest_info
 
     if command('rpm')
         confine :true => begin
@@ -24,22 +22,32 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
     defaultfor :operatingsystem => [:fedora, :centos, :redhat]
 
     def self.prefetch(packages)
-        @updates = {}
         if Process.euid != 0
             raise Puppet::Error, "The yum provider can only be used as root"
         end
         super
-        python(YUMHELPER).each_line do |l|
-            l.chomp!
-            next if l.empty?
-            if l[0,4] == "_pkg"
-                hash = nevra_to_hash(l[5..-1])
-                [hash[:name], "#{hash[:name]}.#{hash[:arch]}"].each do |n|
-                    @updates[n] ||= []
-                    @updates[n] << hash
-                end
-            end
-        end
+        return unless packages.detect { |name, package| package.should(:ensure) == :latest }
+
+         # collect our 'latest' info
+         updates = {}
+         python(YUMHELPER).each_line do |l|
+             l.chomp!
+             next if l.empty?
+             if l[0,4] == "_pkg"
+                 hash = nevra_to_hash(l[5..-1])
+                 [hash[:name], "#{hash[:name]}.#{hash[:arch]}"].each  do |n|
+                     updates[n] ||= []
+                     updates[n] << hash
+                 end
+             end
+         end
+
+         # Add our 'latest' info to the providers.
+         packages.each do |name, package|
+             if info = updates[package[:name]]
+                 package.provider.latest_info = info[0]
+             end
+         end
     end
 
     def install
@@ -73,11 +81,10 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
 
     # What's the latest package version available?
     def latest
-        upd = self.class.updates[@resource[:name]]
+        upd = latest_info
         unless upd.nil?
             # FIXME: there could be more than one update for a package
             # because of multiarch
-            upd = upd[0]
             return "#{upd[:version]}-#{upd[:release]}"
         else
             # Yum didn't find updates, pretend the current

data/lib/puppet/provider/package/yumhelper.py

@@ -4,8 +4,23 @@
 # (C) 2007 Red Hat Inc.
 # David Lutterkort <dlutter @redhat.com>
 
-import yum
 import sys
+import string
+import re
+
+# this maintains compatibility with really old platforms with python 1.x
+from os import popen, WEXITSTATUS
+
+# Try to use the yum libraries by default, but shell out to the yum executable
+# if they are not present (i.e. yum <= 2.0). This is only required for RHEL3
+# and earlier that do not support later versions of Yum. Once RHEL3 is EOL,
+# shell_out() and related code can be removed.
+try:
+    import yum
+except ImportError:
+    useyumlib = 0
+else:
+    useyumlib = 1
 
 OVERRIDE_OPTS = {
     'debuglevel': 0,
@@ -26,14 +41,80 @@ def pkg_lists(my):
     my.doRpmDBSetup()
     return my.doPackageLists('updates')
 
-try:
+def shell_out():
+    try:
+        p = popen("/usr/bin/env yum check-update 2>&1")
+        output = p.readlines()
+        rc = p.close()
+
+        if rc is not None:
+            # None represents exit code of 0, otherwise the exit code is in the
+            # format returned by wait(). Exit code of 100 from yum represents
+            # updates available.
+            if WEXITSTATUS(rc) != 100:
+                return WEXITSTATUS(rc)
+        else:
+            # Exit code is None (0), no updates waiting so don't both parsing output
+            return 0 
+
+        # Yum prints a line of hyphens (old versions) or a blank line between
+        # headers and package data, so skip everything before them
+        skipheaders = 0
+        for line in output:
+            if not skipheaders:
+                if re.compile("^((-){80}|)$").search(line):
+                    skipheaders = 1
+                continue
+
+            # Skip any blank lines
+            if re.compile("^[ \t]*$").search(line):
+                continue
+
+            # Format is:
+            # Yum 1.x: name arch (epoch:)?version
+            # Yum 2.0: name arch (epoch:)?version repo
+            # epoch is optional if 0
+
+            p = string.split(line)
+            pname = p[0]
+            parch = p[1]
+            pevr = p[2]
+
+            # Separate out epoch:version-release
+            evr_re = re.compile("^(\d:)?(\S+)-(\S+)$")
+            evr = evr_re.match(pevr)
+
+            pepoch = ""
+            if evr.group(1) is None:
+                pepoch = "0"
+            else:
+                pepoch = evr.group(1).replace(":", "")
+            pversion = evr.group(2)
+            prelease = evr.group(3)
+
+            print "_pkg", pname, pepoch, pversion, prelease, parch
+
+        return 0
+    except:
+        print sys.exc_info()[0]
+        return 1
+
+if useyumlib:
     try:
-        my = yum.YumBase()
-        ypl = pkg_lists(my)
-        for pkg in ypl.updates:
-            print "_pkg %s %s %s %s %s" % (pkg.name, pkg.epoch, pkg.version, pkg.release, pkg.arch)
-    finally:
-        my.closeRpmDB()
-except IOError, e:
-    print "_err IOError %d %s" % (e.errno, e)
-    sys.exit(1)
+        try:
+            my = yum.YumBase()
+            ypl = pkg_lists(my)
+            for pkg in ypl.updates:
+                print "_pkg %s %s %s %s %s" % (pkg.name, pkg.epoch, pkg.version, pkg.release, pkg.arch)
+        finally:
+            my.closeRpmDB()
+    except IOError, e:
+        print "_err IOError %d %s" % (e.errno, e)
+        sys.exit(1)
+    except AttributeError, e:
+        # catch yumlib errors in buggy 2.x versions of yum
+        print "_err AttributeError %s" % e
+        sys.exit(1)
+else:
+    rc = shell_out()
+    sys.exit(rc)

data/lib/puppet/provider/selboolean/getsetsebool.rb

@@ -0,0 +1,47 @@
+Puppet::Type.type(:selboolean).provide(:getsetsebool) do
+    desc "Manage SELinux booleans using the getsebool and setsebool binaries."
+
+    commands :getsebool => "/usr/sbin/getsebool"
+    commands :setsebool => "/usr/sbin/setsebool"
+
+    def value
+        self.debug "Retrieving value of selboolean #{@resource[:name]}"
+
+        status = getsebool(@resource[:name])
+
+        if status =~ / off$/ then
+            return :off
+        elsif status =~ / on$/ then
+            return :on
+        else
+            status.chomp!
+            raise Puppet::Error, "Invalid response '%s' returned from getsebool" % [status]
+        end
+    end
+
+    def value=(new)
+        persist = ""
+        if @resource[:persistent] == :true
+            self.debug "Enabling persistence"
+            persist = "-P"
+        end
+        execoutput("#{command(:setsebool)} #{persist} #{@resource[:name]} #{new}")
+        return :file_changed
+    end
+
+    # Required workaround, since SELinux policy prevents setsebool
+    # from writing to any files, even tmp, preventing the standard
+    # 'setsebool("...")' construct from working.
+
+    def execoutput (cmd)
+      output = ''
+      begin
+        execpipe(cmd) do |out|
+          output = out.readlines.join('').chomp!
+        end
+      rescue Puppet::ExecutionFailure
+        raise Puppet::ExecutionFailure, output.split("\n")[0]
+      end
+      return output
+    end
+end

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

@@ -0,0 +1,143 @@
+Puppet::Type.type(:selmodule).provide(:semodule) do
+    desc "Manage SELinux policy modules using the semodule binary."
+
+    commands :semodule => "/usr/sbin/semodule"
+
+    def create
+        begin
+            execoutput("#{command(:semodule)} --install #{selmod_name_to_filename}")
+        rescue Puppet::ExecutionFailure => detail
+            raise Puppet::Error, "Could not load policy module: %s" % [detail];
+        end
+        return :true
+    end
+
+    def destroy
+        begin
+            execoutput("#{command(:semodule)} --remove #{@resource[:name]}")
+        rescue Puppet::ExecutionFailure => detail
+            raise Puppet::Error, "Could not remove policy module: %s" % [detail];
+        end
+    end
+
+    def exists?
+        self.debug "Checking for module #{@resource[:name]}"
+        execpipe("#{command(:semodule)} --list") do |out|
+            out.each do |line|
+                if line =~ /#{@resource[:name]}\b/
+                        return :true
+                end
+            end
+        end
+        return nil
+    end
+
+    def syncversion
+        self.debug "Checking syncversion on #{@resource[:name]}"
+
+        loadver = selmodversion_loaded
+
+        if(loadver) then
+            filever = selmodversion_file
+            if (filever == loadver) then
+                return :true
+            end
+        end
+        return :false
+    end
+    
+    def syncversion= (dosync)
+        begin
+            execoutput("#{command(:semodule)} --upgrade #{selmod_name_to_filename}")
+        rescue Puppet::ExecutionFailure => detail
+            raise Puppet::Error, "Could not upgrade policy module: %s" % [detail];
+        end
+    end
+
+    # Helper functions
+
+    def execoutput (cmd)
+      output = ''
+      begin
+        execpipe(cmd) do |out|
+          output = out.readlines.join('').chomp!
+        end
+      rescue Puppet::ExecutionFailure
+        raise Puppet::ExecutionFailure, output.split("\n")[0]
+      end
+      return output
+    end
+
+    def selmod_name_to_filename
+        if @resource[:selmodulepath]
+            return @resource[:selmodulepath]
+        else
+            return "#{@resource[:selmoduledir]}/#{@resource[:name]}.pp"
+        end
+    end
+
+    def selmod_readnext (handle)
+        len = handle.read(4).unpack('L')[0]
+        return handle.read(len)
+    end
+
+    def selmodversion_file
+        magic = 0xF97CFF8F
+
+        filename = selmod_name_to_filename
+        mod = File.new(filename, "r")
+
+        (hdr, ver, numsec) = mod.read(12).unpack('LLL')
+
+        if hdr != magic
+            raise Puppet::Error, "Found #{hdr} instead of magic #{magic} in #{filename}"
+        end
+
+        if ver != 1
+            raise Puppet::Error, "Unknown policy file version #{ver} in #{filename}"
+        end
+
+        # Read through (and throw away) the file section offsets, and also
+        # the magic header for the first section.
+
+        mod.read((numsec + 1) * 4)
+
+        ## Section 1 should be "SE Linux Module"
+
+        selmod_readnext(mod)
+        selmod_readnext(mod)
+
+        # Skip past the section headers
+        mod.read(14)
+
+        # Module name
+        selmod_readnext(mod)
+
+        # At last!  the version
+
+        v = selmod_readnext(mod) 
+
+        self.debug "file version #{v}"
+        return v
+    end
+
+    def selmodversion_loaded 
+        lines = ()
+        begin
+            execpipe("#{command(:semodule)} --list") do |output|
+                lines = output.readlines
+                lines.each do |line|
+                    line.chomp!
+                    bits = line.split
+                    if bits[0] == @resource[:name] then
+                        self.debug "load version #{bits[1]}"
+                        return bits[1]
+                    end
+                end
+            end
+        rescue Puppet::ExecutionFailure
+            raise Puppet::ExecutionFailure, "Could not list policy modules: %s" % [lines.join(' ').chomp!]
+        end
+        return nil
+    end
+end