puppet 7.4.0-x64-mingw32 → 7.8.0-x64-mingw32

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
 
@@ -93,7 +93,7 @@ Puppet::Type.type(:package).provide :dnfmodule, :parent => :dnf do
         # module has no default profile and no profile was requested, so just enable the stream
         # DNF versions prior to 4.2.8 do not need this workaround
         # see https://bugzilla.redhat.com/show_bug.cgi?id=1669527
-        if @resource[:flavor] == nil && e.message =~ /^missing groups or modules: #{Regexp.quote(@resource[:name])}$/
+        if @resource[:flavor] == nil && e.message =~ /^(?:missing|broken) groups or modules: #{Regexp.quote(@resource[:name])}$/
           enable(args)
         else
           raise

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)

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

@@ -1,4 +1,4 @@
-require 'puppet/provider/package'
+require_relative '../../../puppet/provider/package'
 
 # Packaging on OpenBSD.  Doesn't work anywhere else that I know of.
 Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Package do

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

@@ -1,4 +1,4 @@
-require 'puppet/provider/package'
+require_relative '../../../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"

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

@@ -1,4 +1,4 @@
-require 'puppet/provider/package'
+require_relative '../../../puppet/provider/package'
 require 'set'
 require 'uri'
 

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

@@ -1,9 +1,9 @@
 # Puppet package provider for Python's `pip` package management frontend.
 # <http://pip.pypa.io/>
 
-require 'puppet/util/package/version/pip'
-require 'puppet/util/package/version/range'
-require 'puppet/provider/package_targetable'
+require_relative '../../../puppet/util/package/version/pip'
+require_relative '../../../puppet/util/package/version/range'
+require_relative '../../../puppet/provider/package_targetable'
 
 Puppet::Type.type(:package).provide :pip, :parent => ::Puppet::Provider::Package::Targetable do
 

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

@@ -1,4 +1,4 @@
-require 'puppet/provider/package'
+require_relative '../../../puppet/provider/package'
 
 Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package do
   desc "OpenSolaris image packaging system. See pkg(5) for more information.
@@ -273,6 +273,6 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
 
   def exec_cmd(*cmd)
     output = Puppet::Util::Execution.execute(cmd, :failonfail => false, :combine => true)
-    {:out => output, :exit => $CHILD_STATUS.exitstatus}
+    {:out => output, :exit => output.exitstatus}
   end
 end

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

@@ -8,9 +8,9 @@
 # As a result, we store installed .pkg.dmg file names
 # in /var/db/.puppet_pkgdmg_installed_<name>
 
-require 'puppet/provider/package'
-require 'puppet/util/plist'
-require 'puppet/util/http_proxy'
+require_relative '../../../puppet/provider/package'
+require_relative '../../../puppet/util/plist'
+require_relative '../../../puppet/util/http_proxy'
 
 Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Package do
   desc "Package management based on Apple's Installer.app and DiskUtility.app.

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

@@ -1,4 +1,4 @@
-require "puppet/provider/package"
+require_relative '../../../puppet/provider/package'
 
 Puppet::Type.type(:package).provide :pkgin, :parent => Puppet::Provider::Package do
   desc "Package management using pkgin, a binary package manager for pkgsrc."

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

@@ -1,4 +1,4 @@
-require 'puppet/provider/package'
+require_relative '../../../puppet/provider/package'
 
 Puppet::Type.type(:package).provide :pkgng, :parent => Puppet::Provider::Package do
   desc "A PkgNG provider for FreeBSD and DragonFly."

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

@@ -1,4 +1,4 @@
-require 'puppet/provider/package'
+require_relative '../../../puppet/provider/package'
 require 'fileutils'
 
 Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Package do

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

@@ -1,5 +1,5 @@
 # Whole new package, so include pack stuff
-require 'puppet/provider/package'
+require_relative '../../../puppet/provider/package'
 
 Puppet::Type.type(:package).provide :portupgrade, :parent => Puppet::Provider::Package do
   include Puppet::Util::Execution

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

@@ -4,8 +4,19 @@ Puppet::Type.type(:package).provide :puppet_gem, :parent => :gem do
 
   has_feature :versionable, :install_options, :uninstall_options
 
+  confine :true => Facter.value(:aio_agent_version)
+
+  def self.windows_gemcmd
+    puppet_dir = Puppet::Util.get_env('PUPPET_DIR')
+    if puppet_dir
+      File.join(Puppet::Util.get_env('PUPPET_DIR').to_s, 'bin', 'gem.bat')
+    else
+      File.join(Gem.default_bindir, 'gem.bat')
+    end
+  end
+
   if Puppet::Util::Platform.windows?
-    commands :gemcmd => File.join(Puppet::Util.get_env('PUPPET_DIR').to_s, 'bin', 'gem.bat')
+    commands :gemcmd => windows_gemcmd
   else
     commands :gemcmd => "/opt/puppetlabs/puppet/bin/gem"
   end

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

@@ -1,5 +1,5 @@
-require 'puppet/provider/package'
-require 'puppet/util/rpm_compare'
+require_relative '../../../puppet/provider/package'
+require_relative '../../../puppet/util/rpm_compare'
 
 # RPM packaging.  Should work anywhere that has rpm installed.
 Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Provider::Package do

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

@@ -1,6 +1,6 @@
 # Sun packaging.
 
-require 'puppet/provider/package'
+require_relative '../../../puppet/provider/package'
 
 Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package do
   desc "Sun's packaging system.  Requires that you specify the source for

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

@@ -1,6 +1,6 @@
-require 'puppet/provider/package'
-require 'puppet/util/windows'
-require 'puppet/provider/package/windows/package'
+require_relative '../../../puppet/provider/package'
+require_relative '../../../puppet/util/windows'
+require_relative 'windows/package'
 
 Puppet::Type.type(:package).provide(:windows, :parent => Puppet::Provider::Package) do
   desc "Windows package management.

data/lib/puppet/provider/package/windows/exe_package.rb

@@ -1,4 +1,4 @@
-require 'puppet/provider/package/windows/package'
+require_relative '../../../../puppet/provider/package/windows/package'
 
 class Puppet::Provider::Package::Windows
   class ExePackage < Puppet::Provider::Package::Windows::Package

data/lib/puppet/provider/package/windows/msi_package.rb

@@ -1,4 +1,4 @@
-require 'puppet/provider/package/windows/package'
+require_relative '../../../../puppet/provider/package/windows/package'
 
 class Puppet::Provider::Package::Windows
   class MsiPackage < Puppet::Provider::Package::Windows::Package

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

@@ -1,5 +1,5 @@
-require 'puppet/provider/package'
-require 'puppet/util/windows'
+require_relative '../../../../puppet/provider/package'
+require_relative '../../../../puppet/util/windows'
 
 class Puppet::Provider::Package::Windows
   class Package
@@ -105,5 +105,5 @@ class Puppet::Provider::Package::Windows
   end
 end
 
-require 'puppet/provider/package/windows/msi_package'
-require 'puppet/provider/package/windows/exe_package'
+require_relative '../../../../puppet/provider/package/windows/msi_package'
+require_relative '../../../../puppet/provider/package/windows/exe_package'

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

@@ -1,6 +1,6 @@
-require 'puppet/util/package/version/range'
-require 'puppet/util/package/version/rpm'
-require 'puppet/util/rpm_compare'
+require_relative '../../../puppet/util/package/version/range'
+require_relative '../../../puppet/util/package/version/rpm'
+require_relative '../../../puppet/util/rpm_compare'
 
 Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
   # provides Rpm parsing and comparison
@@ -203,17 +203,17 @@ defaultfor :osfamily => :redhat, :operatingsystemmajrelease => (4..7).to_a
         Puppet.debug("Cannot parse #{should} as a RPM version range")
         return should
       end
-      sorted_versions = SortedSet.new
+      versions = []
       available_versions(@resource[:name]).each do |version|
         begin
           rpm_version = RPM_VERSION.parse(version)
-          sorted_versions << rpm_version if should_range.include?(rpm_version)
+          versions << rpm_version if should_range.include?(rpm_version)
         rescue RPM_VERSION::ValidationFailure
           Puppet.debug("Cannot parse #{version} as a RPM version")
         end
       end
 
-      version = sorted_versions.entries.last
+      version = versions.sort.last if versions.any?
 
       if version
         version = version.to_s.sub(/^\d+:/, '')

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

@@ -63,7 +63,7 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
         return should
       end
 
-      sorted_versions = SortedSet.new
+      versions = []
 
       output = zypper('search', '--match-exact', '--type', 'package', '--uninstalled-only', '-s', @resource[:name])
       output.lines.each do |line|
@@ -72,13 +72,13 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
         begin
           rpm_version = Puppet::Util::Package::Version::Rpm.parse(pkg_ver[3])
 
-          sorted_versions << rpm_version if should_range.include?(rpm_version)
+          versions << rpm_version if should_range.include?(rpm_version)
         rescue Puppet::Util::Package::Version::Rpm::ValidationFailure
           Puppet.debug("Cannot parse #{pkg_ver[3]} as a RPM version")
         end
       end
 
-      return sorted_versions.entries.last if sorted_versions.any?
+      return versions.sort.last if versions.any?
 
       Puppet.debug("No available version for package #{@resource[:name]} is included in range #{should_range}")
       should