From 541ec9de73f4d44485f600ced0189c593529983e Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 24 2022 06:15:09 +0000
Subject: import rhel-system-roles-1.21.0-0.5.el8


---

diff --git a/.gitignore b/.gitignore
index a2365e4..25b0794 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,25 @@
 SOURCES/ansible-posix-1.4.0.tar.gz
-SOURCES/ansible-sshd-9766d9097a87a130d4c8abde2247aaad5c925ecf.tar.gz
+SOURCES/ansible-sshd-v0.18.0.tar.gz
 SOURCES/auto-maintenance-e3ac549bee05349d7ae033971448f861415ad608.tar.gz
 SOURCES/certificate-1.1.6.tar.gz
-SOURCES/cockpit-1.3.0.tar.gz
+SOURCES/cockpit-1.4.2.tar.gz
 SOURCES/community-general-6.0.1.tar.gz
+SOURCES/containers-podman-1.9.4.tar.gz
 SOURCES/crypto_policies-1.2.6.tar.gz
 SOURCES/firewall-1.4.0.tar.gz
 SOURCES/ha_cluster-1.8.1.tar.gz
 SOURCES/kdump-1.2.5.tar.gz
 SOURCES/kernel_settings-1.1.10.tar.gz
-SOURCES/logging-1.10.0.tar.gz
-SOURCES/metrics-1.7.3.tar.gz
+SOURCES/logging-1.11.2.tar.gz
+SOURCES/metrics-1.8.0.tar.gz
 SOURCES/nbde_client-1.2.6.tar.gz
-SOURCES/nbde_server-1.1.5.tar.gz
+SOURCES/nbde_server-1.2.0.tar.gz
 SOURCES/network-1.10.1.tar.gz
-SOURCES/postfix-1.2.4.tar.gz
-SOURCES/selinux-1.4.0.tar.gz
-SOURCES/ssh-1.1.9.tar.gz
+SOURCES/podman-1.0.1.tar.gz
+SOURCES/postfix-1.3.1.tar.gz
+SOURCES/selinux-1.5.0.tar.gz
+SOURCES/ssh-1.1.11.tar.gz
 SOURCES/storage-1.9.1.tar.gz
-SOURCES/timesync-1.6.9.tar.gz
+SOURCES/timesync-1.7.1.tar.gz
 SOURCES/tlog-1.2.9.tar.gz
-SOURCES/vpn-1.5.1.tar.gz
+SOURCES/vpn-1.5.2.tar.gz
diff --git a/.rhel-system-roles.metadata b/.rhel-system-roles.metadata
index 4d95614..020cb98 100644
--- a/.rhel-system-roles.metadata
+++ b/.rhel-system-roles.metadata
@@ -1,23 +1,25 @@
 e699d31bfa020050818f133b7c65a49d2e459178 SOURCES/ansible-posix-1.4.0.tar.gz
-c47e62ecf6502d952378206626ba66e456a73513 SOURCES/ansible-sshd-9766d9097a87a130d4c8abde2247aaad5c925ecf.tar.gz
+845ae09c2643c59aafff61a1ded9ccca114f5255 SOURCES/ansible-sshd-v0.18.0.tar.gz
 d7aa4c69b339bf109227ea9c289b242a808ca0f5 SOURCES/auto-maintenance-e3ac549bee05349d7ae033971448f861415ad608.tar.gz
 25e2045c8fc9d6455d7c5b0c7d32d4976ebc5178 SOURCES/certificate-1.1.6.tar.gz
-77b34cce8b416fec3a50900b47cbe6b8216e3036 SOURCES/cockpit-1.3.0.tar.gz
+3a9049ce1802f288df9e3550e2413faa509583ae SOURCES/cockpit-1.4.2.tar.gz
 ae6b2ada54e20e0400ed9e5e2d5fae8227303184 SOURCES/community-general-6.0.1.tar.gz
+0dd94e6f9f16a765d04263a4bd5b7812a6948804 SOURCES/containers-podman-1.9.4.tar.gz
 56bc0763e0b549c3499a80e95d0953ee6769136a SOURCES/crypto_policies-1.2.6.tar.gz
 4ee58deb2a514edd81dbcc56508be4ca9fd49089 SOURCES/firewall-1.4.0.tar.gz
 65eb89785d3c02e93c860f3e73a5dd5835ac9840 SOURCES/ha_cluster-1.8.1.tar.gz
 6ae0614d51db00957943fad6967674c0de88862c SOURCES/kdump-1.2.5.tar.gz
 17f28f701d7842499b232a7b28daae5f51ea631b SOURCES/kernel_settings-1.1.10.tar.gz
-042ba1183db4d36742a21c92111d68415c7c951a SOURCES/logging-1.10.0.tar.gz
-4ebbf457b9f0d767d19b7ef322b848e5e4da50ef SOURCES/metrics-1.7.3.tar.gz
+84ea8f305b331b79034cbccd5d6a1161da28086c SOURCES/logging-1.11.2.tar.gz
+2304e3ecdb5abf31264766bdfd65f93b9a127843 SOURCES/metrics-1.8.0.tar.gz
 80baf489aea9052ad11c84df7a6adfca75ce7a7b SOURCES/nbde_client-1.2.6.tar.gz
-2e2ad1b455da8c0a198524a08ffe16f2c954f131 SOURCES/nbde_server-1.1.5.tar.gz
+8c2869f1984c27be45e6559cf6e58affd12a86d4 SOURCES/nbde_server-1.2.0.tar.gz
 c3f012d86202d0f59d766d04c92ed4f82807ea1c SOURCES/network-1.10.1.tar.gz
-4a31ac4e7d4de65c2a74cfc6f3c4ff852d5a578c SOURCES/postfix-1.2.4.tar.gz
-a54aee1fa1b0ee023e4168d0abe880ad6ea64dcb SOURCES/selinux-1.4.0.tar.gz
-fcdbd369bcc41df028f842e49ebff28370d3adb4 SOURCES/ssh-1.1.9.tar.gz
+804fe67870d153f0b68b618faf63bd732b67288d SOURCES/podman-1.0.1.tar.gz
+345ad289065728cb1322bdbd9dca7cb4d393d384 SOURCES/postfix-1.3.1.tar.gz
+cca65506d7e747cd111fdd4397b60536a5d98dbd SOURCES/selinux-1.5.0.tar.gz
+8337034363ca9fc684cfeb7fc9f3028a5f72f45f SOURCES/ssh-1.1.11.tar.gz
 10b9bf8f3b16fc99d6070af6dbf82f9f889a8ff6 SOURCES/storage-1.9.1.tar.gz
-c0af2701a0f8db1d721bf6df4ba257888be0fe87 SOURCES/timesync-1.6.9.tar.gz
+6e452d26346f53bf715b57f530995fc078cd8cf8 SOURCES/timesync-1.7.1.tar.gz
 53fd0059c1da4c42228a9c0df592a96cd5a5060f SOURCES/tlog-1.2.9.tar.gz
-ad0fdbb87a8ef445aaf9d749d0df20f788775c7c SOURCES/vpn-1.5.1.tar.gz
+884ee8d0ae926a91e4a39e1eac2eaab55324df87 SOURCES/vpn-1.5.2.tar.gz
diff --git a/SOURCES/CHANGELOG.md b/SOURCES/CHANGELOG.md
index 8d0cd2c..a9b81ac 100644
--- a/SOURCES/CHANGELOG.md
+++ b/SOURCES/CHANGELOG.md
@@ -1,6 +1,37 @@
 Changelog
 =========
 
+[1.21.0-0.5] - 2022-11-22
+----------------------------
+
+### New Features
+
+- [cockpit - [RFE] convert cockpit role to use firewall, selinux role, and certificate role](https://bugzilla.redhat.com/show_bug.cgi?id=2137667)
+- [logging - [RFE] convert logging role to use firewall, selinux role, and certificate role](https://bugzilla.redhat.com/show_bug.cgi?id=2130362)
+- [metrics - [RFE] convert metrics role to use firewall and selinux role](https://bugzilla.redhat.com/show_bug.cgi?id=2133532)
+- [nbde_server - [RFE] convert nbde_server role to use firewall and selinux role](https://bugzilla.redhat.com/show_bug.cgi?id=2133931)
+- [postfix - [RFE] convert postfix role to use firewall and selinux role](https://bugzilla.redhat.com/show_bug.cgi?id=2130332)
+- [vpn - Add parameters shared_key_content, ike, esp, type, leftid, rightid](https://bugzilla.redhat.com/show_bug.cgi?id=2119600)
+- [vpn - [RFE] convert vpn role to use firewall and selinux role](https://bugzilla.redhat.com/show_bug.cgi?id=2130345)
+
+[1.21.0-0.4.podman] - 2022-11-22
+----------------------------
+
+### New Features
+
+- [podman - [RFE] role for managing podman containers and systemd](https://bugzilla.redhat.com/show_bug.cgi?id=2066864)
+
+[1.21.0-0.3.ssh_sshd_selinux_timesync] - 2022-11-22
+----------------------------
+
+### New Features
+
+- [selinux - add support for the 'local' parameter](https://bugzilla.redhat.com/show_bug.cgi?id=2143385)
+
+### Bug Fixes
+
+- [sshd,ssh,timesync - Unexpected templating type error - expected str instance, int found](https://bugzilla.redhat.com/show_bug.cgi?id=2143401)
+
 [1.21.0-0.2.network] - 2022-11-15
 ----------------------------
 
diff --git a/SPECS/rhel-system-roles.spec b/SPECS/rhel-system-roles.spec
index 4ebb721..f15a5c2 100644
--- a/SPECS/rhel-system-roles.spec
+++ b/SPECS/rhel-system-roles.spec
@@ -30,7 +30,7 @@ Name: linux-system-roles
 Url: https://github.com/linux-system-roles
 Summary: Set of interfaces for unified system management
 Version: 1.21.0
-Release: 0.2.network%{?dist}
+Release: 0.5%{?dist}
 
 License: GPLv3+ and MIT and BSD and Python
 %global _pkglicensedir %{_licensedir}/%{name}
@@ -109,15 +109,15 @@ Requires: (ansible-core >= 2.11.0 or ansible >= 2.9.0)
 
 #%%defcommit 1 14314822b529520ac12964e0d2938c4bb18ab895
 %global rolename1 postfix
-%deftag 1 1.2.4
+%deftag 1 1.3.1
 
 #%%defcommit 2 9fe6eb36772e83b53dcfb8ceb73608fd4f72eeda
 %global rolename2 selinux
-%deftag 2 1.4.0
+%deftag 2 1.5.0
 
 #%%defcommit 3 cbe4bf262bffae3bf53e531662237741954c4182
 %global rolename3 timesync
-%deftag 3 1.6.9
+%deftag 3 1.7.1
 
 #%%defcommit 4 02fc72b482e165472624b2f68eecd2ddce1d93b1
 %global rolename4 kdump
@@ -133,7 +133,7 @@ Requires: (ansible-core >= 2.11.0 or ansible >= 2.9.0)
 
 #%%defcommit 7 d57caa8ca506d8cbc7ca0f96f7cb62b7e965f163
 %global rolename7 metrics
-%deftag 7 1.7.3
+%deftag 7 1.8.0
 
 #%%defcommit 8 2b9e53233ee3a68bdb532e62f289733e436a6106
 %global rolename8 tlog
@@ -145,11 +145,11 @@ Requires: (ansible-core >= 2.11.0 or ansible >= 2.9.0)
 
 #%%defcommit 10 20dd3e5520ca06dcccaa9b3f1fb428d055e0c23f
 %global rolename10 logging
-%deftag 10 1.10.0
+%deftag 10 1.11.2
 
 #%%defcommit 11 c57d0b1f3384c525738fa26ba4bdca485e162567
 %global rolename11 nbde_server
-%deftag 11 1.1.5
+%deftag 11 1.2.0
 
 #%%defcommit 12 bef2fad5e365712d1f40e53662490ba2550a253f
 %global rolename12 nbde_client
@@ -166,26 +166,30 @@ Requires: (ansible-core >= 2.11.0 or ansible >= 2.9.0)
 %global forgeorg15 https://github.com/willshersystems
 %global repo15 ansible-sshd
 %global rolename15 sshd
-%defcommit 15 9766d9097a87a130d4c8abde2247aaad5c925ecf
-#%%deftag 15 v0.15.1
+#%%defcommit 15 9766d9097a87a130d4c8abde2247aaad5c925ecf
+%deftag 15 v0.18.0
 
 #%%defcommit 16 59b9fd7b25607d8bd33bdb082748955f2652846a
 %global rolename16 ssh
-%deftag 16 1.1.9
+%deftag 16 1.1.11
 
 #%%defcommit 17 f901239cb91878719c9e7461760ef8d4789d626d
 %global rolename17 ha_cluster
 %deftag 17 1.8.1
 
-#%%defcommit 18 5f6cb73e6753fbdbb219b7d3079f0378b2d3bdb3
+#%%defcommit 18 d21c896c0d5de83ec3a92d6adf8d14f0324803ca
 %global rolename18 vpn
-%deftag 18 1.5.1
+%deftag 18 1.5.2
 
 %global rolename19 firewall
 %deftag 19 1.4.0
 
+#%%defcommit 20 7e30ef9672ffd1d1daa9c8a6939ca63b3b503b5a
 %global rolename20 cockpit
-%deftag 20 1.3.0
+%deftag 20 1.4.2
+
+%global rolename21 podman
+%deftag 21 1.0.1
 
 %global mainid e3ac549bee05349d7ae033971448f861415ad608
 Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz
@@ -209,17 +213,18 @@ Source17: %{archiveurl17}
 Source18: %{archiveurl18}
 Source19: %{archiveurl19}
 Source20: %{archiveurl20}
+Source21: %{archiveurl21}
 
 # Not conditionalizing sources per FPC:
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/SourceURL/#_do_not_conditionalize_sources
 # Collections to vendor on RHEL only, Fedora has these available from RPMs
 Source801: https://galaxy.ansible.com/download/ansible-posix-1.4.0.tar.gz
 Source901: https://galaxy.ansible.com/download/community-general-6.0.1.tar.gz
-#Source902: https://galaxy.ansible.com/download/containers-podman-1.9.4.tar.gz
+Source902: https://galaxy.ansible.com/download/containers-podman-1.9.4.tar.gz
 %if 0%{?rhel}
 Provides: bundled(ansible-collection(ansible.posix)) = 1.4.0
 Provides: bundled(ansible-collection(community.general)) = 6.0.1
-#Provides: bundled(ansible-collection(containers.podman)) = 1.9.4
+Provides: bundled(ansible-collection(containers.podman)) = 1.9.4
 %endif
 
 # RHEL only, changelog is auto generated on Fedora
@@ -290,11 +295,11 @@ for i,v in ipairs(roles) do
 end
 
 %prep
-%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -n %{getarchivedir 0}
+%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -n %{getarchivedir 0}
 
 %if 0%{?rhel}
 # Untar vendored collection tarballs to corresponding directories
-for file in %{SOURCE801} %{SOURCE901}; do
+for file in %{SOURCE801} %{SOURCE901} %{SOURCE902}; do
     if [[ "$(basename $file)" =~ ([^-]+)-([^-]+)-(.+).tar.gz ]]; then
         ns=${BASH_REMATCH[1]}
         name=${BASH_REMATCH[2]}
@@ -406,6 +411,35 @@ for module in "${!module_map[@]}"; do
   sed -i -e ':a;N;$!ba;s/description:\n\( *\)/description:\n\1- WARNING: Do not use this module directly! It is only for role internal use.\n\1/' $role/library/$module
 done
 
+# containers.podman:
+#   - library:
+#     - Module podman_container_info, podman_image and podman_play for the podman role
+module_map=( ["podman_container_info.py"]="podman" ["podman_image.py"]="podman" ["podman_play.py"]="podman" )
+for module in "${!module_map[@]}"; do
+  role="${module_map[${module}]}"
+  if [ ! -d $role/library ]; then
+    mkdir $role/library
+  fi
+  moduledir=.external/containers/podman/plugins/modules
+  cp -pL $moduledir/$module $role/library/$module
+  ls -alrtF $role/library/$module
+  sed -i -e ':a;N;$!ba;s/description:\n\( *\)/description:\n\1- WARNING: Do not use this module directly! It is only for role internal use.\n\1/' \
+    -e "s/ansible_collections.containers.podman.plugins.module_utils.podman/ansible.module_utils.${role}_lsr/" \
+    $role/library/$module
+done
+
+# containers.podman:
+#   - module_utils:
+#     - Module_util common for the podman role
+module_map=( ["common.py"]="podman" )
+for module in "${!module_map[@]}"; do
+  role="${module_map[${module}]}"
+  if [ ! -d $role/module_utils/${role}_lsr ]; then
+    mkdir -p $role/module_utils/${role}_lsr
+  fi
+  cp -pL .external/containers/podman/plugins/module_utils/podman/$module $role/module_utils/${role}_lsr/$module
+done
+
 # remove the temporary .external directory after vendoring
 rm -rf .external
 
@@ -729,6 +763,23 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \
 %endif
 
 %changelog
+* Tue Nov 22 2022 Rich Megginson <rmeggins@redhat.com> - 1.21.0-0.5
+- Resolves:rhbz#2137667 : cockpit - [RFE] convert cockpit role to use firewall, selinux role, and certificate role
+- Resolves:rhbz#2130362 : logging - [RFE] convert logging role to use firewall, selinux role, and certificate role
+- Resolves:rhbz#2133532 : metrics - [RFE] convert metrics role to use firewall and selinux role
+- Resolves:rhbz#2133931 : nbde_server - [RFE] convert nbde_server role to use firewall and selinux role
+- Resolves:rhbz#2130332 : postfix - [RFE] convert postfix role to use firewall and selinux role
+- Resolves:rhbz#2119600 : vpn - Add parameters shared_key_content, ike, esp, type, leftid, rightid
+- Resolves:rhbz#2130345 : vpn - [RFE] convert vpn role to use firewall and selinux role
+
+* Tue Nov 22 2022 Rich Megginson <rmeggins@redhat.com> - 1.21.0-0.4.podman
+- Resolves:rhbz#2066864 : podman - [RFE] role for managing podman containers and systemd
+
+* Tue Nov 22 2022 Rich Megginson <rmeggins@redhat.com> - 1.21.0-0.3.ssh_sshd_selinux_timesync
+- Resolves:rhbz#2143385 : selinux - add support for the 'local' parameter
+- Resolves:rhbz#2143401 : sshd,ssh,timesync - Unexpected templating type error - expected str instance, int found
+- Resolves:rhbz#2130921 : ssh,sshd - Sync on final OpenSSH option name RequiredRSASize in ssh and sshd roles [rhel-8.7] [rhel-8.8.0]
+
 * Tue Nov 15 2022 Rich Megginson <rmeggins@redhat.com> - 1.21.0-0.2.network
 - Resolves:rhbz#2134201 : network - [RFE] Support setting the metric of the default route for initscripts provider
 - Resolves:rhbz#2133856 : network - [RFE] Support the DNS priority