puppet 3.8.7 → 4.0.0

data/lib/puppet/provider/mount/parsed.rb

@@ -4,7 +4,6 @@ require 'puppet/provider/mount'
 fstab = nil
 case Facter.value(:osfamily)
 when "Solaris"; fstab = "/etc/vfstab"
-when "AIX"; fstab = "/etc/filesystems"
 else
   fstab = "/etc/fstab"
 end
@@ -26,12 +25,7 @@ Puppet::Type.type(:mount).provide(
     @fields = [:device, :name, :fstype, :options, :dump, :pass]
   end
 
-  if Facter.value(:osfamily) == "AIX"
-    # * is the comment character on AIX /etc/filesystems
-    text_line :comment, :match => /^\s*\*/
-  else
-    text_line :comment, :match => /^\s*#/
-  end
+  text_line :comment, :match => /^\s*#/
   text_line :blank, :match => /^\s*$/
 
   optional_fields  = @fields - [:device, :name, :blockdevice]
@@ -42,144 +36,7 @@ Puppet::Type.type(:mount).provide(
   field_pattern = '(\s*(?>\S+))'
   text_line :incomplete, :match => /^(?!#{field_pattern}{#{mandatory_fields.length}})/
 
-  case Facter.value(:osfamily)
-  when "AIX"
-    # The only field that is actually ordered is :name. See `man filesystems` on AIX
-    @fields = [:name, :account, :boot, :check, :dev, :free, :mount, :nodename,
-               :options, :quota, :size, :type, :vfs, :vol, :log]
-    self.line_separator = "\n"
-    # Override lines and use scan instead of split, because we DON'T want to
-    # remove the separators
-    def self.lines(text)
-      lines = text.split("\n")
-      filesystem_stanza = false
-      filesystem_index = 0
-      ret = Array.new
-      lines.each_with_index do |line,i|
-        if line.match(%r{^\S+:})
-          # Begin new filesystem stanza and save the index
-          ret[filesystem_index] = filesystem_stanza.join("\n") if filesystem_stanza
-          filesystem_stanza = Array(line)
-          filesystem_index = i
-          # Eat the preceeding blank line
-          ret[i-1] = nil if i > 0 and ret[i-1] and ret[i-1].match(%r{^\s*$})
-          nil
-        elsif line.match(%r{^(\s*\*.*|\s*)$})
-          # Just a comment or blank line; add in place
-          ret[i] = line
-        else
-          # Non-comments or blank lines must be part of a stanza
-          filesystem_stanza << line
-        end
-      end
-      # Add the final stanza to the return
-      ret[filesystem_index] = filesystem_stanza.join("\n") if filesystem_stanza
-      ret = ret.compact.flatten
-      ret.reject { |line| line.match(/^\* HEADER/) }
-    end
-    def self.header
-      super.gsub(/^#/,'*')
-    end
-
-    record_line self.name,
-      :fields    => @fields,
-      :separator => /\n/,
-      :block_eval => :instance do
-
-      def post_parse(result)
-        property_map = {
-          :dev      => :device,
-          :nodename => :nodename,
-          :options  => :options,
-          :vfs      => :fstype,
-        }
-        # Result is modified in-place instead of being returned; icky!
-        memo = result.dup
-        result.clear
-        # Save the line for later, just in case it is unparsable
-        result[:line] = @fields.collect do |field|
-          memo[field] if memo[field] != :absent
-        end.compact.join("\n")
-        result[:record_type] = memo[:record_type]
-        special_options = Array.new
-        result[:name] = memo[:name].sub(%r{:\s*$},'').strip
-        memo.each do |_,k_v|
-          if k_v and k_v.is_a?(String) and k_v.match("=")
-            attr_name, attr_value = k_v.split("=",2).map(&:strip)
-            if attr_map_name = property_map[attr_name.to_sym]
-              # These are normal "options" options (see `man filesystems`)
-              result[attr_map_name] = attr_value
-            else
-              # These /etc/filesystem attributes have no mount resource simile,
-              # so are added to the "options" property for puppet's sake
-              special_options << "#{attr_name}=#{attr_value}"
-            end
-            if result[:nodename]
-              result[:device] = "#{result[:nodename]}:#{result[:device]}"
-              result.delete(:nodename)
-            end
-          end
-        end
-        result[:options] = [result[:options],special_options.sort].flatten.compact.join(',')
-        if ! result[:device]
-          result[:device] = :absent
-          Puppet.err "Prefetch: Mount[#{result[:name]}]: Field 'device' is missing"
-        end
-        if ! result[:fstype]
-          result[:fstype] = :absent
-          Puppet.err "Prefetch: Mount[#{result[:name]}]: Field 'fstype' is missing"
-        end
-      end
-      def to_line(result)
-        output = Array.new
-        output << "#{result[:name]}:"
-        if result[:device] and result[:device].match(%r{^/})
-          output << "\tdev\t\t= #{result[:device]}"
-        elsif result[:device] and result[:device] != :absent
-          if ! result[:device].match(%{^.+:/})
-            # Just skip this entry; it was malformed to begin with
-            Puppet.err "Mount[#{result[:name]}]: Field 'device' must be in the format of <absolute path> or <host>:<absolute path>"
-            return result[:line]
-          end
-          nodename, path = result[:device].split(":")
-          output << "\tdev\t\t= #{path}"
-          output << "\tnodename\t= #{nodename}"
-        else
-          # Just skip this entry; it was malformed to begin with
-          Puppet.err "Mount[#{result[:name]}]: Field 'device' is required"
-          return result[:line]
-        end
-        if result[:fstype] and result[:fstype] != :absent
-          output << "\tvfs\t\t= #{result[:fstype]}"
-        else
-          # Just skip this entry; it was malformed to begin with
-          Puppet.err "Mount[#{result[:name]}]: Field 'device' is required"
-          return result[:line]
-        end
-        if result[:options]
-          options = result[:options].split(',')
-          special_options = options.select do |x|
-            x.match('=') and
-              ["account", "boot", "check", "free", "mount", "size", "type",
-               "vol", "log", "quota"].include? x.split('=').first
-          end
-          options = options - special_options
-          special_options.sort.each do |x|
-            k, v = x.split("=")
-            output << "\t#{k}\t\t= #{v}"
-          end
-          output << "\toptions\t\t= #{options.join(",")}" unless options.empty?
-        end
-        if result[:line] and result[:line].split("\n").sort == output.sort
-          return "\n#{result[:line]}"
-        else
-          return "\n#{output.join("\n")}"
-        end
-      end
-    end
-  else
-    record_line self.name, :fields => @fields, :separator => /\s+/, :joiner => "\t", :optional => optional_fields
-  end
+  record_line self.name, :fields => @fields, :separator => /\s+/, :joiner => "\t", :optional => optional_fields
 
   # Every entry in fstab is :unmounted until we can prove different
   def self.prefetch_hook(target_records)

data/lib/puppet/provider/nameservice/directoryservice.rb

@@ -1,6 +1,6 @@
 require 'puppet'
 require 'puppet/provider/nameservice'
-require 'facter/util/plist'
+require 'plist'
 require 'fileutils'
 
 class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameService
@@ -11,7 +11,6 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     #  e.g. Puppet::Type.type(:user).provide :directoryservice, :ds_path => "Users"
     #  This is referenced in the get_ds_path class method
     attr_writer :ds_path
-    attr_writer :macosx_version_major
   end
 
   initvars
@@ -87,20 +86,6 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     @resource_type.name.to_s.capitalize + "s"
   end
 
-  def self.get_macosx_version_major
-    return @macosx_version_major if defined?(@macosx_version_major)
-    begin
-      product_version_major = Facter.value(:macosx_productversion_major)
-
-      fail("#{product_version_major} is not supported by the directoryservice provider") if %w{10.0 10.1 10.2 10.3 10.4}.include?(product_version_major)
-      @macosx_version_major = product_version_major
-      return @macosx_version_major
-    rescue Puppet::ExecutionFailure => detail
-      fail("Could not determine OS X version: #{detail}")
-    end
-  end
-
-
   def self.list_all_present
     # JJM: List all objects of this Puppet::Type already present on the system.
     begin
@@ -167,19 +152,11 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
       fail("Could not get report.  command execution failed.")
     end
 
-    # (#11593) Remove support for OS X 10.4 and earlier
-    fail_if_wrong_version
     dscl_plist = self.parse_dscl_plist_data(dscl_output)
 
     self.generate_attribute_hash(dscl_plist, *type_properties)
   end
 
-  def self.fail_if_wrong_version
-    if (Puppet::Util::Package.versioncmp(self.get_macosx_version_major, '10.5') == -1)
-      fail("Puppet does not support OS X versions < 10.5")
-    end
-  end
-
   def self.get_exec_preamble(ds_action, resource_name = nil)
     # JJM 2007-07-24
     #     DSCL commands are often repetitive and contain the same positional
@@ -188,8 +165,6 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     #     This method spits out proper DSCL commands for us.
     #     We EXPECT name to be @resource[:name] when called from an instance object.
 
-    # (#11593) Remove support for OS X 10.4 and earlier
-    fail_if_wrong_version
     command_vector = [ command(:dscl), "-plist", "." ]
 
     # JJM: The actual action to perform.  See "man dscl"
@@ -208,120 +183,71 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
   end
 
   def self.set_password(resource_name, guid, password_hash)
-    # Use Puppet::Util::Package.versioncmp() to catch the scenario where a
-    # version '10.10' would be < '10.7' with simple string comparison. This
-    # if-statement only executes if the current version is less-than 10.7
-    if (Puppet::Util::Package.versioncmp(get_macosx_version_major, '10.7') == -1)
-      password_hash_file = "#{password_hash_dir}/#{guid}"
-      begin
-        File.open(password_hash_file, 'w') { |f| f.write(password_hash)}
-      rescue Errno::EACCES => detail
-        fail("Could not write to password hash file: #{detail}")
-      end
+    # 10.7 uses salted SHA512 password hashes which are 128 characters plus
+    # an 8 character salt. Previous versions used a SHA1 hash padded with
+    # zeroes. If someone attempts to use a password hash that worked with
+    # a previous version of OX X, we will fail early and warn them.
+    if password_hash.length != 136
+      fail("OS X 10.7 requires a Salted SHA512 hash password of 136 characters. \
+           Please check your password and try again.")
+    end
 
-      # NBK: For shadow hashes, the user AuthenticationAuthority must contain a value of
-      # ";ShadowHash;". The LKDC in 10.5 makes this more interesting though as it
-      # will dynamically generate ;Kerberosv5;;username@LKDC:SHA1 attributes if
-      # missing. Thus we make sure we only set ;ShadowHash; if it is missing, and
-      # we can do this with the merge command. This allows people to continue to
-      # use other custom AuthenticationAuthority attributes without stomping on them.
-      #
-      # There is a potential problem here in that we're only doing this when setting
-      # the password, and the attribute could get modified at other times while the
-      # hash doesn't change and so this doesn't get called at all... but
-      # without switching all the other attributes to merge instead of create I can't
-      # see a simple enough solution for this that doesn't modify the user record
-      # every single time. This should be a rather rare edge case. (famous last words)
-
-      dscl_vector = self.get_exec_preamble("-merge", resource_name)
-      dscl_vector << "AuthenticationAuthority" << ";ShadowHash;"
-      begin
-        execute(dscl_vector)
-      rescue Puppet::ExecutionFailure => detail
-        fail("Could not set AuthenticationAuthority.")
-      end
-    else
-      # 10.7 uses salted SHA512 password hashes which are 128 characters plus
-      # an 8 character salt. Previous versions used a SHA1 hash padded with
-      # zeroes. If someone attempts to use a password hash that worked with
-      # a previous version of OX X, we will fail early and warn them.
-      if password_hash.length != 136
-        fail("OS X 10.7 requires a Salted SHA512 hash password of 136 characters. \
-             Please check your password and try again.")
+    if Puppet::FileSystem.exist?("#{users_plist_dir}/#{resource_name}.plist")
+      # If a plist already exists in /var/db/dslocal/nodes/Default/users, then
+      # we will need to extract the binary plist from the 'ShadowHashData'
+      # key, log the new password into the resultant plist's 'SALTED-SHA512'
+      # key, and then save the entire structure back.
+      users_plist = Plist::parse_xml(plutil( '-convert', 'xml1', '-o', '/dev/stdout', \
+                                     "#{users_plist_dir}/#{resource_name}.plist"))
+
+      # users_plist['ShadowHashData'][0].string is actually a binary plist
+      # that's nested INSIDE the user's plist (which itself is a binary
+      # plist). If we encounter a user plist that DOESN'T have a
+      # ShadowHashData field, create one.
+      if users_plist['ShadowHashData']
+        password_hash_plist = users_plist['ShadowHashData'][0].string
+        converted_hash_plist = convert_binary_to_xml(password_hash_plist)
+      else
+        users_plist['ShadowHashData'] = [StringIO.new]
+        converted_hash_plist = {'SALTED-SHA512' => StringIO.new}
       end
 
-      if Puppet::FileSystem.exist?("#{users_plist_dir}/#{resource_name}.plist")
-        # If a plist already exists in /var/db/dslocal/nodes/Default/users, then
-        # we will need to extract the binary plist from the 'ShadowHashData'
-        # key, log the new password into the resultant plist's 'SALTED-SHA512'
-        # key, and then save the entire structure back.
-        users_plist = Plist::parse_xml(plutil( '-convert', 'xml1', '-o', '/dev/stdout', \
-                                       "#{users_plist_dir}/#{resource_name}.plist"))
+      # converted_hash_plist['SALTED-SHA512'].string expects a Base64 encoded
+      # string. The password_hash provided as a resource attribute is a
+      # hex value. We need to convert the provided hex value to a Base64
+      # encoded string to nest it in the converted hash plist.
+      converted_hash_plist['SALTED-SHA512'].string = \
+        password_hash.unpack('a2'*(password_hash.size/2)).collect { |i| i.hex.chr }.join
+
+      # Finally, we can convert the nested plist back to binary, embed it
+      # into the user's plist, and convert the resultant plist back to
+      # a binary plist.
+      changed_plist = convert_xml_to_binary(converted_hash_plist)
+      users_plist['ShadowHashData'][0].string = changed_plist
+      Plist::Emit.save_plist(users_plist, "#{users_plist_dir}/#{resource_name}.plist")
+      plutil('-convert', 'binary1', "#{users_plist_dir}/#{resource_name}.plist")
+    end
+  end
 
+  def self.get_password(guid, username)
+    if Puppet::FileSystem.exist?("#{users_plist_dir}/#{username}.plist")
+      # If a plist exists in /var/db/dslocal/nodes/Default/users, we will
+      # extract the binary plist from the 'ShadowHashData' key, decode the
+      # salted-SHA512 password hash, and then return it.
+      users_plist = Plist::parse_xml(plutil('-convert', 'xml1', '-o', '/dev/stdout', "#{users_plist_dir}/#{username}.plist"))
+      if users_plist['ShadowHashData']
         # users_plist['ShadowHashData'][0].string is actually a binary plist
         # that's nested INSIDE the user's plist (which itself is a binary
-        # plist). If we encounter a user plist that DOESN'T have a
-        # ShadowHashData field, create one.
-        if users_plist['ShadowHashData']
-          password_hash_plist = users_plist['ShadowHashData'][0].string
-          converted_hash_plist = convert_binary_to_xml(password_hash_plist)
-        else
-          users_plist['ShadowHashData'] = [StringIO.new]
-          converted_hash_plist = {'SALTED-SHA512' => StringIO.new}
-        end
+        # plist).
+        password_hash_plist = users_plist['ShadowHashData'][0].string
+        converted_hash_plist = convert_binary_to_xml(password_hash_plist)
 
-        # converted_hash_plist['SALTED-SHA512'].string expects a Base64 encoded
+        # converted_hash_plist['SALTED-SHA512'].string is a Base64 encoded
         # string. The password_hash provided as a resource attribute is a
-        # hex value. We need to convert the provided hex value to a Base64
-        # encoded string to nest it in the converted hash plist.
-        converted_hash_plist['SALTED-SHA512'].string = \
-          password_hash.unpack('a2'*(password_hash.size/2)).collect { |i| i.hex.chr }.join
-
-        # Finally, we can convert the nested plist back to binary, embed it
-        # into the user's plist, and convert the resultant plist back to
-        # a binary plist.
-        changed_plist = convert_xml_to_binary(converted_hash_plist)
-        users_plist['ShadowHashData'][0].string = changed_plist
-        Plist::Emit.save_plist(users_plist, "#{users_plist_dir}/#{resource_name}.plist")
-        plutil('-convert', 'binary1', "#{users_plist_dir}/#{resource_name}.plist")
-      end
-    end
-  end
-
-  def self.get_password(guid, username)
-    # Use Puppet::Util::Package.versioncmp() to catch the scenario where a
-    # version '10.10' would be < '10.7' with simple string comparison. This
-    # if-statement only executes if the current version is less-than 10.7
-    if (Puppet::Util::Package.versioncmp(get_macosx_version_major, '10.7') == -1)
-      password_hash = nil
-      password_hash_file = "#{password_hash_dir}/#{guid}"
-      if Puppet::FileSystem.exist?(password_hash_file) and File.file?(password_hash_file)
-        fail("Could not read password hash file at #{password_hash_file}") if not File.readable?(password_hash_file)
-        f = File.new(password_hash_file)
-        password_hash = f.read
-        f.close
-      end
-      password_hash
-    else
-      if Puppet::FileSystem.exist?("#{users_plist_dir}/#{username}.plist")
-        # If a plist exists in /var/db/dslocal/nodes/Default/users, we will
-        # extract the binary plist from the 'ShadowHashData' key, decode the
-        # salted-SHA512 password hash, and then return it.
-        users_plist = Plist::parse_xml(plutil('-convert', 'xml1', '-o', '/dev/stdout', "#{users_plist_dir}/#{username}.plist"))
-        if users_plist['ShadowHashData']
-          # users_plist['ShadowHashData'][0].string is actually a binary plist
-          # that's nested INSIDE the user's plist (which itself is a binary
-          # plist).
-          password_hash_plist = users_plist['ShadowHashData'][0].string
-          converted_hash_plist = convert_binary_to_xml(password_hash_plist)
-
-          # converted_hash_plist['SALTED-SHA512'].string is a Base64 encoded
-          # string. The password_hash provided as a resource attribute is a
-          # hex value. We need to convert the Base64 encoded string to a
-          # hex value and provide it back to Puppet.
-          password_hash = converted_hash_plist['SALTED-SHA512'].string.unpack("H*")[0]
-          password_hash
-        end
+        # hex value. We need to convert the Base64 encoded string to a
+        # hex value and provide it back to Puppet.
+        password_hash = converted_hash_plist['SALTED-SHA512'].string.unpack("H*")[0]
+        password_hash
       end
     end
   end

data/lib/puppet/provider/network_device.rb

@@ -20,6 +20,9 @@ class Puppet::Provider::NetworkDevice < Puppet::Provider
         resource.provider = new(device, :ensure => :absent)
       end
     end
+  rescue => detail
+    # Preserving behavior introduced in #6907
+    Puppet.log_exception(detail, "Could not perform network device prefetch: #{detail}")
   end
 
   def exists?

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

@@ -50,15 +50,15 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
 
   def self.installpkgdmg(source, name)
     require 'open-uri'
-    require 'facter/util/plist'
+    require 'plist'
     cached_source = source
     tmpdir = Dir.mktmpdir
     begin
       if %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://} =~ cached_source
         cached_source = File.join(tmpdir, name)
         begin
-          curl "-o", cached_source, "-C", "-", "-k", "-L", "-s", "--url", source
-          Puppet.debug "Success: curl transfered [#{name}]"
+          curl "-o", cached_source, "-C", "-", "-L", "-s", "--url", source
+          Puppet.debug "Success: curl transferred [#{name}]"
         rescue Puppet::ExecutionFailure
           Puppet.debug "curl did not transfer [#{name}].  Falling back to slower open-uri transfer methods."
           cached_source = source
@@ -73,13 +73,16 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
             entity['mount-point']
           }.select { |mountloc|; mountloc }
           begin
+            found_app = false
             mounts.each do |fspath|
               Dir.entries(fspath).select { |f|
                 f =~ /\.app$/i
               }.each do |pkg|
+                found_app = true
                 installapp("#{fspath}/#{pkg}", name, source)
               end
             end
+            Puppet.debug "Unable to find .app in .appdmg. #{name} will not be installed." if !found_app
           ensure
             hdiutil "eject", mounts[0]
           end

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

@@ -94,7 +94,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
 
       preseed response
     else
-      self.info "No responsefile specified or non existant, not preseeding anything"
+      self.info "No responsefile specified or non existent, not preseeding anything"
     end
   end
 

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

@@ -61,7 +61,7 @@ Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do
 
       preseed response
     else
-      self.info "No responsefile specified or non existant, not preseeding anything"
+      self.info "No responsefile specified or non existent, not preseeding anything"
     end
   end
 

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

@@ -8,11 +8,12 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
     interpreted as the path to a local gem file.  If source is not present at all,
     the gem will be installed from the default gem repositories.
 
-    This provider supports the `install_options` attribute, which allows command-line flags to be passed to the gem command.
+    This provider supports the `install_options` and `uninstall_options` attributes,
+    which allow command-line flags to be passed to the gem command.
     These options should be specified as a string (e.g. '--flag'), a hash (e.g. {'--flag' => 'value'}),
     or an array where each element is either a string or a hash."
 
-  has_feature :versionable, :install_options
+  has_feature :versionable, :install_options, :uninstall_options
 
   commands :gemcmd => "gem"
 
@@ -54,12 +55,12 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
     # so we don't need to check for them
 
     if desc =~ /^(\S+)\s+\((.+)\)/
-      name = $1
+      gem_name = $1
       versions = $2.split(/,\s*/)
       {
-        :name     => name,
+        :name     => gem_name,
         :ensure   => versions.map{|v| v.split[0]},
-        :provider => :gem
+        :provider => name
       }
     else
       Puppet.warning "Could not match #{desc}" unless desc.chomp.empty?
@@ -122,7 +123,15 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
   end
 
   def uninstall
-    gemcmd "uninstall", "-x", "-a", resource[:name]
+    command = [command(:gemcmd), "uninstall"]
+    command << "--executables" << "--all" << resource[:name]
+
+    command += uninstall_options if resource[:uninstall_options]
+
+    output = execute(command)
+
+    # Apparently some stupid gem versions don't exit non-0 on failure
+    self.fail "Could not uninstall: #{output.chomp}" if output.include?("ERROR")
   end
 
   def update
@@ -132,4 +141,8 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
   def install_options
     join_options(resource[:install_options])
   end
+
+  def uninstall_options
+    join_options(resource[:uninstall_options])
+  end
 end

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

@@ -149,18 +149,7 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
 
     if @resource[:source][-1,1] == ::File::SEPARATOR
       e_vars = { 'PKG_PATH' => @resource[:source] }
-      # In case of a real update (i.e., the package already exists) then
-      # pkg_add(8) can handle the flavors. However, if we're actually
-      # installing with 'latest', we do need to handle the flavors.
-      # So we always need to handle flavors ourselves as to not break installs.
-      if latest and resource[:flavor]
-        full_name = "#{resource[:name]}--#{resource[:flavor]}"
-      elsif latest
-        # Don't depend on get_version for updates.
-        full_name = @resource[:name]
-      else
-        full_name = [ @resource[:name], get_version || @resource[:ensure], @resource[:flavor] ].join('-').chomp('-').chomp('-')
-      end
+      full_name = get_full_name(latest)
     else
       e_vars = {}
       full_name = @resource[:source]
@@ -176,6 +165,31 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
     Puppet::Util.withenv(e_vars) { pkgadd cmd.flatten.compact }
   end
 
+  def get_full_name(latest = false)
+    # In case of a real update (i.e., the package already exists) then
+    # pkg_add(8) can handle the flavors. However, if we're actually
+    # installing with 'latest', we do need to handle the flavors. This is
+    # done so we can feed pkg_add(8) the full package name to install to
+    # prevent ambiguity.
+    if latest && resource[:flavor]
+      "#{resource[:name]}--#{resource[:flavor]}"
+    elsif latest
+      # Don't depend on get_version for updates.
+      @resource[:name]
+    else
+      # If :ensure contains a version, use that instead of looking it up.
+      # This allows for installing packages with the same stem, but multiple
+      # version such as openldap-server.
+      if /(\d[^-]*)$/.match(@resource[:ensure].to_s)
+        use_version = @resource[:ensure]
+      else
+        use_version = get_version
+      end
+
+      [ @resource[:name], use_version, @resource[:flavor]].join('-').gsub(/-+$/, '')
+    end
+  end
+
   def get_version
     execpipe([command(:pkginfo), "-I", @resource[:name]]) do |process|
       # our regex for matching pkg_info output

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

@@ -40,7 +40,7 @@ Puppet::Type.type(:package).provide :opkg, :source => :opkg, :parent => Puppet::
   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
+    opkg('update') if package_lists.size <= 2
 
     if @resource[:source]
       opkg( '--force-overwrite', 'install', @resource[:source] )
@@ -73,4 +73,9 @@ Puppet::Type.type(:package).provide :opkg, :source => :opkg, :parent => Puppet::
     }
   end
 
+  private
+
+  def package_lists
+    Dir.entries('/var/opkg-lists/')
+  end
 end