From a607b87154ff29f1ceb54499ce18d7a642ef8639 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Tue, 9 Jan 2024 15:01:10 +0100
Subject: [PATCH] puppetlabs/stdlib: Allow 9.x

---
 manifests/dependencies/centos.pp                | 2 +-
 manifests/dependencies/oraclelinux.pp           | 2 +-
 manifests/dependencies/ubuntu.pp                | 2 +-
 manifests/passenger/dependencies/centos.pp      | 2 +-
 manifests/passenger/dependencies/oraclelinux.pp | 2 +-
 manifests/passenger/dependencies/ubuntu.pp      | 2 +-
 manifests/system.pp                             | 4 ++--
 metadata.json                                   | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifests/dependencies/centos.pp b/manifests/dependencies/centos.pp
index 30212123..5b82ec59 100644
--- a/manifests/dependencies/centos.pp
+++ b/manifests/dependencies/centos.pp
@@ -1,6 +1,6 @@
 # Install packages needed by RVM on RedHat systems when not using autolibs
 class rvm::dependencies::centos {
-  ensure_packages(['which','gcc','gcc-c++','make','gettext-devel','expat-devel','zlib-devel','openssl-devel',
+  stdlib::ensure_packages(['which','gcc','gcc-c++','make','gettext-devel','expat-devel','zlib-devel','openssl-devel',
       'perl','cpio','gettext-devel','wget','bzip2','libxml2','libxml2-devel','libxslt','libxslt-devel',
   'readline-devel','patch','git','libyaml-devel','libffi-devel','libtool','bison', 'libcurl-devel'])
 }
diff --git a/manifests/dependencies/oraclelinux.pp b/manifests/dependencies/oraclelinux.pp
index 23ed8856..a1862ab6 100644
--- a/manifests/dependencies/oraclelinux.pp
+++ b/manifests/dependencies/oraclelinux.pp
@@ -1,6 +1,6 @@
 # Install packages needed by RVM on Oracle Linux when not using autolibs
 class rvm::dependencies::oraclelinux {
-  ensure_packages(['which','gcc','gcc-c++','make','gettext-devel','expat-devel','libcurl-devel',
+  stdlib::ensure_packages(['which','gcc','gcc-c++','make','gettext-devel','expat-devel','libcurl-devel',
       'zlib-devel','openssl-devel','perl','cpio','expat-devel','gettext-devel','wget','bzip2',
   'libxml2','libxml2-devel','libxslt','libxslt-devel','readline-devel','patch','git'])
 }
diff --git a/manifests/dependencies/ubuntu.pp b/manifests/dependencies/ubuntu.pp
index 25363f17..e36ecc4d 100644
--- a/manifests/dependencies/ubuntu.pp
+++ b/manifests/dependencies/ubuntu.pp
@@ -1,6 +1,6 @@
 # Install packages needed by RVM on Ubuntu when not using autolibs
 class rvm::dependencies::ubuntu {
-  ensure_packages(['build-essential','bison','openssl','libreadline6','libreadline6-dev','curl','git-core',
+  stdlib::ensure_packages(['build-essential','bison','openssl','libreadline6','libreadline6-dev','curl','git-core',
       'zlib1g','zlib1g-dev','libssl-dev','libyaml-dev','libsqlite3-0','libsqlite3-dev','sqlite3','libxml2-dev',
   'autoconf','libc6-dev'])
 
diff --git a/manifests/passenger/dependencies/centos.pp b/manifests/passenger/dependencies/centos.pp
index 9241dc07..13f32088 100644
--- a/manifests/passenger/dependencies/centos.pp
+++ b/manifests/passenger/dependencies/centos.pp
@@ -1,4 +1,4 @@
 # Package dependencies for Passenger on RedHat
 class rvm::passenger::dependencies::centos {
-  ensure_packages(['libcurl-devel'])
+  stdlib::ensure_packages(['libcurl-devel'])
 }
diff --git a/manifests/passenger/dependencies/oraclelinux.pp b/manifests/passenger/dependencies/oraclelinux.pp
index fa562f50..9fa6c6c1 100644
--- a/manifests/passenger/dependencies/oraclelinux.pp
+++ b/manifests/passenger/dependencies/oraclelinux.pp
@@ -1,4 +1,4 @@
 # Package dependencies for Passenger on Oracle Linux
 class rvm::passenger::dependencies::oraclelinux {
-  ensure_packages(['libcurl-devel'])
+  stdlib::ensure_packages(['libcurl-devel'])
 }
diff --git a/manifests/passenger/dependencies/ubuntu.pp b/manifests/passenger/dependencies/ubuntu.pp
index 01c86d55..255ca775 100644
--- a/manifests/passenger/dependencies/ubuntu.pp
+++ b/manifests/passenger/dependencies/ubuntu.pp
@@ -1,4 +1,4 @@
 # Package dependencies for Passenger on Ubuntu
 class rvm::passenger::dependencies::ubuntu {
-  ensure_packages(['curl','libcurl4-gnutls-dev'])
+  stdlib::ensure_packages(['curl','libcurl4-gnutls-dev'])
 }
diff --git a/manifests/system.pp b/manifests/system.pp
index 696c8aaf..fcc94816 100644
--- a/manifests/system.pp
+++ b/manifests/system.pp
@@ -27,7 +27,7 @@
   $environment = concat($proxy_environment, ["HOME=${home}"])
 
   if $manage_wget {
-    ensure_packages(['wget'])
+    stdlib::ensure_packages(['wget'])
   }
   if $include_gnupg {
     include gnupg
@@ -67,7 +67,7 @@
     }
   }
   else {
-    ensure_packages(['curl'])
+    stdlib::ensure_packages(['curl'])
 
     exec { 'system-rvm':
       path        => '/usr/bin:/usr/sbin:/bin:/usr/local/bin',
diff --git a/metadata.json b/metadata.json
index 50e1c3ad..26b735fb 100644
--- a/metadata.json
+++ b/metadata.json
@@ -11,7 +11,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.13.0 < 9.0.0"
+      "version_requirement": ">= 4.13.0 < 10.0.0"
     },
     {
       "name": "golja/gnupg",