From a6a79a8bbc6325bf910336de70e2d836d98c20fa Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Wed, 21 Jun 2023 11:08:23 +0200
Subject: [PATCH 1/3] puppet/systemd: Allow 5.x

---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index e8ed15ea09..e8e94aeeea 100644
--- a/metadata.json
+++ b/metadata.json
@@ -18,7 +18,7 @@
     },
     {
       "name": "puppet/systemd",
-      "version_requirement": ">= 4.0.1 < 5.0.0"
+      "version_requirement": ">= 4.0.1 < 6.0.0"
     },
     {
       "name": "puppetlabs/concat",

From 8a64280d87794ea75960ee0d39ce1d5f67af4110 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Wed, 21 Jun 2023 11:08:42 +0200
Subject: [PATCH 2/3] puppetlabs/concat: Allow 9.x

---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index e8e94aeeea..aae032a220 100644
--- a/metadata.json
+++ b/metadata.json
@@ -22,7 +22,7 @@
     },
     {
       "name": "puppetlabs/concat",
-      "version_requirement": ">= 4.1.0 < 9.0.0"
+      "version_requirement": ">= 4.1.0 < 10.0.0"
     }
   ],
   "operatingsystem_support": [

From e142268e9aa9f802a861d42bed2f7039bb8d6295 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Wed, 21 Jun 2023 13:08:39 +0200
Subject: [PATCH 3/3] puppetlabs/stdlib: Require 9.x

---
 manifests/backup/pg_dump.pp         | 6 +++---
 manifests/server/extension.pp       | 2 +-
 manifests/server/instance/config.pp | 2 +-
 manifests/server/instance/passwd.pp | 4 ++--
 metadata.json                       | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifests/backup/pg_dump.pp b/manifests/backup/pg_dump.pp
index eb4e3b4975..ff99779fb5 100644
--- a/manifests/backup/pg_dump.pp
+++ b/manifests/backup/pg_dump.pp
@@ -68,13 +68,13 @@
 ) {
   # Install required packages
   if $package_name {
-    ensure_packages($package_name)
+    stdlib::ensure_packages($package_name)
   }
   if $install_cron {
     if $facts['os']['family'] == 'RedHat' {
-      ensure_packages('cronie')
+      stdlib::ensure_packages('cronie')
     } elsif $facts['os']['family'] != 'FreeBSD' {
-      ensure_packages('cron')
+      stdlib::ensure_packages('cron')
     }
   }
 
diff --git a/manifests/server/extension.pp b/manifests/server/extension.pp
index aa83f708f5..c8b62985f6 100644
--- a/manifests/server/extension.pp
+++ b/manifests/server/extension.pp
@@ -129,7 +129,7 @@
       default => $package_ensure,
     }
 
-    ensure_packages($package_name, {
+    stdlib::ensure_packages($package_name, {
         ensure  => $_package_ensure,
         tag     => 'puppetlabs-postgresql',
     })
diff --git a/manifests/server/instance/config.pp b/manifests/server/instance/config.pp
index d9e1cd94b5..f2f8639e54 100644
--- a/manifests/server/instance/config.pp
+++ b/manifests/server/instance/config.pp
@@ -175,7 +175,7 @@
       }
     }
 
-    ensure_packages([$package_name])
+    stdlib::ensure_packages([$package_name])
 
     $exec_command = ['/usr/sbin/semanage', 'port', '-a', '-t', 'postgresql_port_t', '-p', 'tcp', $port]
     $exec_unless = "/usr/sbin/semanage port -l | grep -qw ${port}"
diff --git a/manifests/server/instance/passwd.pp b/manifests/server/instance/passwd.pp
index 89c9a53250..a397beda54 100644
--- a/manifests/server/instance/passwd.pp
+++ b/manifests/server/instance/passwd.pp
@@ -27,7 +27,7 @@
   # psql will default to connecting as $user if you don't specify name
   $_datbase_user_same = $database == $user
   $_dboption = $_datbase_user_same ? {
-    false => " --dbname ${shell_escape($database)}",
+    false => " --dbname ${stdlib::shell_escape($database)}",
     default => ''
   }
 
@@ -37,7 +37,7 @@
     #  without specifying a password ('ident' or 'trust' security). This is
     #  the default for pg_hba.conf.
     $escaped = postgresql::postgresql_escape($real_postgres_password)
-    $exec_command = "${shell_escape($psql_path)}${_dboption} -c \"ALTER ROLE \\\"${shell_escape($user)}\\\" PASSWORD \${NEWPASSWD_ESCAPED}\"" # lint:ignore:140chars
+    $exec_command = "${stdlib::shell_escape($psql_path)}${_dboption} -c \"ALTER ROLE \\\"${stdlib::shell_escape($user)}\\\" PASSWORD \${NEWPASSWD_ESCAPED}\"" # lint:ignore:140chars
     exec { 'set_postgres_postgrespw':
       # This command works w/no password because we run it as postgres system
       # user
diff --git a/metadata.json b/metadata.json
index aae032a220..2443217f39 100644
--- a/metadata.json
+++ b/metadata.json
@@ -10,7 +10,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 5.2.0 < 10.0.0"
+      "version_requirement": ">= 9.0.0 < 10.0.0"
     },
     {
       "name": "puppetlabs/apt",