puppet 7.6.1-x64-mingw32 → 7.10.0-x64-mingw32

data/lib/puppet/pops/types/p_sensitive_type.rb

@@ -24,6 +24,16 @@ class PSensitiveType < PTypeWithContainedType
     def inspect
       "#<#{self}>"
     end
+
+    def hash
+      @value.hash
+    end
+
+    def ==(other)
+      other.is_a?(Sensitive) &&
+        other.hash == hash
+    end
+    alias eql? ==
   end
 
   def self.register_ptype(loader, ir)

data/lib/puppet/pops/types/string_converter.rb

@@ -1,4 +1,4 @@
-require 'puppet/concurrent/thread_local_singleton'
+require_relative '../../../puppet/concurrent/thread_local_singleton'
 
 module Puppet::Pops
 module Types

data/lib/puppet/pops/types/type_calculator.rb

@@ -1,4 +1,4 @@
-require 'puppet/concurrent/thread_local_singleton'
+require_relative '../../../puppet/concurrent/thread_local_singleton'
 
 module Puppet::Pops
 module Types

data/lib/puppet/pops/types/type_formatter.rb

@@ -1,4 +1,4 @@
-require 'puppet/concurrent/thread_local_singleton'
+require_relative '../../../puppet/concurrent/thread_local_singleton'
 
 module Puppet::Pops
 module Types

data/lib/puppet/pops/types/type_mismatch_describer.rb

@@ -640,7 +640,7 @@ module Types
           result = ["#{label} expects (#{signature_string(sig)})"]
           result.concat(error_arrays[0].map { |e| "  rejected:#{e.chop_path(0).format}" })
         else
-          result = ["#{label} expects one of:"]
+          result = ["The function #{label} was called with arguments it does not accept. It expects one of:"]
           signatures.each_with_index do |sg, index|
             result << "  (#{signature_string(sg)})"
             result.concat(error_arrays[index].map { |e| "    rejected:#{e.chop_path(0).format}" })

data/lib/puppet/pops/types/type_parser.rb

@@ -1,4 +1,4 @@
-require 'puppet/concurrent/thread_local_singleton'
+require_relative '../../../puppet/concurrent/thread_local_singleton'
 
 # This class provides parsing of Type Specification from a string into the Type
 # Model that is produced by the TypeFactory.

data/lib/puppet/pops/types/types.rb

@@ -3610,7 +3610,7 @@ end
 end
 end
 
-require 'puppet/pops/pcore'
+require_relative '../../../puppet/pops/pcore'
 
 require_relative 'annotatable'
 require_relative 'p_meta_type'

data/lib/puppet/pops/validation/checker4_0.rb

@@ -1,4 +1,4 @@
-require 'puppet/pops/evaluator/external_syntax_support'
+require_relative '../../../puppet/pops/evaluator/external_syntax_support'
 
 module Puppet::Pops
 module Validation

data/lib/puppet/property.rb

@@ -1,8 +1,8 @@
 # The virtual base class for properties, which are the self-contained building
 # blocks for actually doing work on the system.
 
-require 'puppet'
-require 'puppet/parameter'
+require_relative '../puppet'
+require_relative '../puppet/parameter'
 
 # The Property class is the implementation of a resource's attributes of _property_ kind.
 # A Property is a specialized Resource Type Parameter that has both an 'is' (current) state, and
@@ -39,7 +39,7 @@ require 'puppet/parameter'
 # @api public
 #
 class Puppet::Property < Puppet::Parameter
-  require 'puppet/property/ensure'
+  require_relative 'property/ensure'
 
   # Returns the original wanted value(s) _(should)_ unprocessed by munging/unmunging.
   # The original values are set by {#value=} or {#should=}.

data/lib/puppet/property/boolean.rb

@@ -1,4 +1,4 @@
-require 'puppet/coercion'
+require_relative '../../puppet/coercion'
 
 class Puppet::Property::Boolean < Puppet::Property
   def unsafe_munge(value)

data/lib/puppet/property/ensure.rb

@@ -1,4 +1,4 @@
-require 'puppet/property'
+require_relative '../../puppet/property'
 
 # This property is automatically added to any {Puppet::Type} that responds
 # to the methods 'exists?', 'create', and 'destroy'.

data/lib/puppet/property/keyvalue.rb

@@ -1,4 +1,4 @@
-require 'puppet/property'
+require_relative '../../puppet/property'
 
 module Puppet
   class Property

data/lib/puppet/property/list.rb

@@ -1,4 +1,4 @@
-require 'puppet/property'
+require_relative '../../puppet/property'
 
 module Puppet
   class Property

data/lib/puppet/property/ordered_list.rb

@@ -1,4 +1,4 @@
-require 'puppet/property/list'
+require_relative '../../puppet/property/list'
 
 module Puppet
   class Property

data/lib/puppet/provider.rb

@@ -40,8 +40,8 @@ class Puppet::Provider
   include Puppet::Util::Warnings
   extend Puppet::Util::Warnings
 
-  require 'puppet/confiner'
-  require 'puppet/provider/command'
+  require_relative '../puppet/confiner'
+  require_relative 'provider/command'
 
   extend Puppet::Confiner
 

data/lib/puppet/provider/confine.rb

@@ -1,6 +1,6 @@
 # Confines have been moved out of the provider as they are also used for other things.
 # This provides backwards compatibility for people still including this old location.
-require 'puppet/provider'
-require 'puppet/confine'
+require_relative '../../puppet/provider'
+require_relative '../../puppet/confine'
 
 Puppet::Provider::Confine = Puppet::Confine

data/lib/puppet/provider/exec.rb

@@ -1,5 +1,5 @@
-require 'puppet/provider'
-require 'puppet/util/execution'
+require_relative '../../puppet/provider'
+require_relative '../../puppet/util/execution'
 
 class Puppet::Provider::Exec < Puppet::Provider
   include Puppet::Util::Execution

data/lib/puppet/provider/exec/posix.rb

@@ -1,4 +1,4 @@
-require 'puppet/provider/exec'
+require_relative '../../../puppet/provider/exec'
 
 Puppet::Type.type(:exec).provide :posix, :parent => Puppet::Provider::Exec do
   has_feature :umask
@@ -6,10 +6,22 @@ Puppet::Type.type(:exec).provide :posix, :parent => Puppet::Provider::Exec do
   defaultfor :feature => :posix
 
   desc <<-EOT
-    Executes external binaries directly, without passing through a shell or
-    performing any interpolation. This is a safer and more predictable way
-    to execute most commands, but prevents the use of globbing and shell
-    built-ins (including control logic like "for" and "if" statements).
+    Executes external binaries by invoking Ruby's `Kernel.exec`.
+    When the command is a string, it will be executed directly,
+    without a shell, if it follows these rules:
+     - no meta characters
+     - no shell reserved word and no special built-in
+
+    When the command is an Array of Strings, passed as `[cmdname, arg1, ...]`
+    it will be executed directly(the first element is taken as a command name
+    and the rest are passed as parameters to command with no shell expansion)
+    This is a safer and more predictable way to execute most commands,
+    but prevents the use of globbing and shell built-ins (including control
+    logic like "for" and "if" statements).
+
+    If the use of globbing and shell built-ins is desired, please check
+    the `shell` provider
+
   EOT
 
   # Verify that we have the executable

data/lib/puppet/provider/exec/windows.rb

@@ -1,4 +1,4 @@
-require 'puppet/provider/exec'
+require_relative '../../../puppet/provider/exec'
 
 Puppet::Type.type(:exec).provide :windows, :parent => Puppet::Provider::Exec do
 

data/lib/puppet/provider/file/posix.rb

@@ -8,7 +8,7 @@ Puppet::Type.type(:file).provide :posix do
   include Puppet::Util::Warnings
 
   require 'etc'
-  require 'puppet/util/selinux'
+  require_relative '../../../puppet/util/selinux'
 
   def self.post_resource_eval
     Selinux.matchpathcon_fini if Puppet::Util::SELinux.selinux_support?

data/lib/puppet/provider/file/windows.rb

@@ -7,7 +7,7 @@ Puppet::Type.type(:file).provide :windows do
   include Puppet::Util::Warnings
 
   if Puppet::Util::Platform.windows?
-    require 'puppet/util/windows'
+    require_relative '../../../puppet/util/windows'
     include Puppet::Util::Windows::Security
   end
 

data/lib/puppet/provider/group/aix.rb

@@ -1,6 +1,6 @@
 # Group Puppet provider for AIX. It uses standard commands to manage groups:
 #  mkgroup, rmgroup, lsgroup, chgroup
-require 'puppet/provider/aix_object'
+require_relative '../../../puppet/provider/aix_object'
 
 Puppet::Type.type(:group).provide :aix, :parent => Puppet::Provider::AixObject do
   desc "Group management for AIX."

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

@@ -1,4 +1,4 @@
-require 'puppet/provider/nameservice/directoryservice'
+require_relative '../../../puppet/provider/nameservice/directoryservice'
 
 Puppet::Type.type(:group).provide :directoryservice, :parent => Puppet::Provider::NameService::DirectoryService do
   desc "Group management using DirectoryService on OS X.

data/lib/puppet/provider/group/groupadd.rb

@@ -1,5 +1,5 @@
-require 'puppet/provider/nameservice/objectadd'
-require 'puppet/util/libuser'
+require_relative '../../../puppet/provider/nameservice/objectadd'
+require_relative '../../../puppet/util/libuser'
 
 Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameService::ObjectAdd do
   desc "Group management via `groupadd` and its ilk. The default for most platforms."

data/lib/puppet/provider/group/ldap.rb

@@ -1,4 +1,4 @@
-require 'puppet/provider/ldap'
+require_relative '../../../puppet/provider/ldap'
 
 Puppet::Type.type(:group).provide :ldap, :parent => Puppet::Provider::Ldap do
   desc "Group management via LDAP.

data/lib/puppet/provider/group/pw.rb

@@ -1,4 +1,4 @@
-require 'puppet/provider/nameservice/pw'
+require_relative '../../../puppet/provider/nameservice/pw'
 
 Puppet::Type.type(:group).provide :pw, :parent => Puppet::Provider::NameService::PW do
   desc "Group management via `pw` on FreeBSD and DragonFly BSD."

data/lib/puppet/provider/group/windows_adsi.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/windows'
+require_relative '../../../puppet/util/windows'
 
 Puppet::Type.type(:group).provide :windows_adsi do
   desc "Local group management for Windows. Group members can be both users and groups.

data/lib/puppet/provider/ldap.rb

@@ -1,8 +1,8 @@
-require 'puppet/provider'
+require_relative '../../puppet/provider'
 
 # The base class for LDAP providers.
 class Puppet::Provider::Ldap < Puppet::Provider
-  require 'puppet/util/ldap/manager'
+  require_relative '../../puppet/util/ldap/manager'
 
   class << self
     attr_reader :manager

data/lib/puppet/provider/nameservice.rb

@@ -1,4 +1,4 @@
-require 'puppet'
+require_relative '../../puppet'
 
 # This is the parent class of all NSS classes.  They're very different in
 # their backend, but they're pretty similar on the front-end.  This class

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

@@ -1,6 +1,6 @@
-require 'puppet'
-require 'puppet/provider/nameservice'
-require 'puppet/util/plist' if Puppet.features.cfpropertylist?
+require_relative '../../../puppet'
+require_relative '../../../puppet/provider/nameservice'
+require_relative '../../../puppet/util/plist' if Puppet.features.cfpropertylist?
 require 'fileutils'
 
 class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameService

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

@@ -1,4 +1,4 @@
-require 'puppet/provider/nameservice'
+require_relative '../../../puppet/provider/nameservice'
 
 class Puppet::Provider::NameService
   class ObjectAdd < Puppet::Provider::NameService

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

@@ -1,4 +1,4 @@
-require 'puppet/provider/nameservice/objectadd'
+require_relative '../../../puppet/provider/nameservice/objectadd'
 
 class Puppet::Provider::NameService
   class PW < ObjectAdd

data/lib/puppet/provider/package.rb

@@ -1,4 +1,4 @@
-require 'puppet/provider'
+require_relative '../../puppet/provider'
 
 class Puppet::Provider::Package < Puppet::Provider
   # Prefetch our package list, yo.

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

@@ -1,5 +1,5 @@
-require 'puppet/provider/package'
-require 'puppet/util/package'
+require_relative '../../../puppet/provider/package'
+require_relative '../../../puppet/util/package'
 
 Puppet::Type.type(:package).provide :aix, :parent => Puppet::Provider::Package do
   desc "Installation from an AIX software directory, using the AIX `installp`

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

@@ -12,8 +12,8 @@
 # As a result, we store installed .app.dmg file names
 # in /var/db/.puppet_appdmg_installed_<name>
 
-require 'puppet/provider/package'
-require 'puppet/util/plist' if Puppet.features.cfpropertylist?
+require_relative '../../../puppet/provider/package'
+require_relative '../../../puppet/util/plist' if Puppet.features.cfpropertylist?
 Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Package) do
   desc "Package management which copies application bundles to a target."
 

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

@@ -1,4 +1,4 @@
-require 'puppet/provider/package'
+require_relative '../../../puppet/provider/package'
 
 # OS X Packaging sucks.  We can install packages, but that's about it.
 Puppet::Type.type(:package).provide :apple, :parent => Puppet::Provider::Package do

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

@@ -1,5 +1,5 @@
-require 'puppet/util/package/version/range'
-require 'puppet/util/package/version/debian'
+require_relative '../../../puppet/util/package/version/range'
+require_relative '../../../puppet/util/package/version/debian'
 
 Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
   # Provide sorting functionality
@@ -91,20 +91,20 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
   end
 
   def best_version(should_range)
-    available_versions = SortedSet.new
+    versions = []
 
     output = aptcache :madison, @resource[:name]
     output.each_line do |line|
       is = line.split('|')[1].strip
       begin
         is_version = DebianVersion.parse(is)
-        available_versions << is_version if should_range.include?(is_version)
+        versions << is_version if should_range.include?(is_version)
       rescue DebianVersion::ValidationFailure
         Puppet.debug("Cannot parse #{is} as a debian version")
       end
     end
 
-    return available_versions.to_a.last unless available_versions.empty?
+    return versions.sort.last if versions.any?
 
     Puppet.debug("No available version for package #{@resource[:name]} is included in range #{should_range}")
     should_range

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

@@ -8,7 +8,7 @@
 # }
 
 
-require 'puppet/provider/package'
+require_relative '../../../puppet/provider/package'
 
 Puppet::Type.type(:package).provide :dnfmodule, :parent => :dnf do
 

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

@@ -1,4 +1,4 @@
-require 'puppet/provider/package'
+require_relative '../../../puppet/provider/package'
 
 Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package do
   desc "Package management via `dpkg`.  Because this only uses `dpkg`

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

@@ -1,6 +1,6 @@
-require 'puppet/util/package/version/gem'
-require 'puppet/util/package/version/range'
-require 'puppet/provider/package_targetable'
+require_relative '../../../puppet/util/package/version/gem'
+require_relative '../../../puppet/util/package/version/range'
+require_relative '../../../puppet/provider/package_targetable'
 require 'uri'
 
 # Ruby gems support.

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

@@ -1,6 +1,6 @@
 # HP-UX packaging.
 
-require 'puppet/provider/package'
+require_relative '../../../puppet/provider/package'
 
 Puppet::Type.type(:package).provide :hpux, :parent => Puppet::Provider::Package do
 

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

@@ -1,5 +1,5 @@
-require 'puppet/provider/package'
-require 'puppet/provider/command'
+require_relative '../../../puppet/provider/package'
+require_relative '../../../puppet/provider/command'
 
 Puppet::Type.type(:package).provide :macports, :parent => Puppet::Provider::Package do
   desc "Package management using MacPorts on OS X.

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

@@ -1,5 +1,5 @@
-require 'puppet/provider/package'
-require 'puppet/util/package'
+require_relative '../../../puppet/provider/package'
+require_relative '../../../puppet/util/package'
 
 Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
   desc "Installation from an AIX NIM LPP source.  The `source` parameter is required
@@ -154,20 +154,25 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
   # I spent a lot of time trying to figure out a solution that didn't
   # require parsing the `nimclient -o showres` output and was unable to
   # do so.
-  self::HEADER_LINE_REGEX      = /^([^\s]+)\s+[^@]+@@(I|R):(\1)\s+[^\s]+$/
-  self::PACKAGE_LINE_REGEX     = /^.*@@(I|R):(.*)$/
-  self::RPM_PACKAGE_REGEX      = /^(.*)-(.*-\d+) \2$/
+  self::HEADER_LINE_REGEX      = /^([^\s]+)\s+[^@]+@@(I|R|S):(\1)\s+[^\s]+$/
+  self::PACKAGE_LINE_REGEX     = /^.*@@(I|R|S):(.*)$/
+  self::RPM_PACKAGE_REGEX      = /^(.*)-(.*-\d+\w*) \2$/
   self::INSTALLP_PACKAGE_REGEX = /^(.*) (.*)$/
 
   # Here is some sample output that shows what the above regexes will be up
   # against:
-  # FOR AN INSTALLP PACKAGE:
+  # FOR AN INSTALLP(bff) PACKAGE:
   #
   #    mypackage.foo                                                           ALL  @@I:mypackage.foo _all_filesets
-  #    @ 1.2.3.1  MyPackage Runtime Environment                       @@I:mypackage.foo 1.2.3.1
   #    + 1.2.3.4  MyPackage Runtime Environment                       @@I:mypackage.foo 1.2.3.4
   #    + 1.2.3.8  MyPackage Runtime Environment                       @@I:mypackage.foo 1.2.3.8
   #
+  # FOR AN INSTALLP(bff) PACKAGE with security update:
+  #
+  #    bos.net                                                                 ALL  @@S:bos.net _all_filesets
+  #    + 7.2.0.1  TCP/IP ntp Applications                             @@S:bos.net.tcp.ntp 7.2.0.1
+  #    + 7.2.0.2  TCP/IP ntp Applications                             @@S:bos.net.tcp.ntp 7.2.0.2
+  #
   # FOR AN RPM PACKAGE:
   #
   # mypackage.foo                                                                ALL  @@R:mypackage.foo _all_filesets
@@ -243,7 +248,7 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
     package_string = match.captures[1]
 
     case package_type_flag
-      when "I"
+      when "I","S"
         parse_installp_package_string(package_string)
       when "R"
         parse_rpm_package_string(package_string)