From 4d31cfe5079bf6de85437ecfd01b557184b9b03b Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Feb 13 2022 04:26:56 +0000
Subject: import rhel-system-roles-1.13.1-1.el8


---

diff --git a/.gitignore b/.gitignore
index 29f7b3a..cbfbd0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,13 @@
 SOURCES/ansible-posix-1.3.0.tar.gz
 SOURCES/ansible-sshd-214df35c0bee77b5d69f49c2da269251d451b28f.tar.gz
-SOURCES/auto-maintenance-792c7c0a5633b0a41edf7b1cb4d97963a585e508.tar.gz
+SOURCES/auto-maintenance-32ab2252be64d5e71454b83dc2c701d22168bef4.tar.gz
 SOURCES/certificate-1.1.2.tar.gz
 SOURCES/cockpit-1.2.1.tar.gz
 SOURCES/community-general-4.3.0.tar.gz
 SOURCES/crypto_policies-1.2.3.tar.gz
 SOURCES/firewall-1.0.3.tar.gz
 SOURCES/ha_cluster-1.4.0.tar.gz
-SOURCES/kdump-1.2.1.tar.gz
+SOURCES/kdump-1.2.2.tar.gz
 SOURCES/kernel_settings-1.1.4.tar.gz
 SOURCES/logging-1.8.1.tar.gz
 SOURCES/metrics-1.4.1.tar.gz
@@ -20,4 +20,4 @@ SOURCES/ssh-1.1.4.tar.gz
 SOURCES/storage-1.7.0.tar.gz
 SOURCES/timesync-1.6.5.tar.gz
 SOURCES/tlog-1.2.3.tar.gz
-SOURCES/vpn-1.3.0.tar.gz
+SOURCES/vpn-1.3.1.tar.gz
diff --git a/.rhel-system-roles.metadata b/.rhel-system-roles.metadata
index acf906e..4ebeabe 100644
--- a/.rhel-system-roles.metadata
+++ b/.rhel-system-roles.metadata
@@ -1,13 +1,13 @@
 d2d2382c38eaf34d2295aba2aa4652d75ebbaeef SOURCES/ansible-posix-1.3.0.tar.gz
 a4d4556cf6628e87fa62dec6c46099338b499930 SOURCES/ansible-sshd-214df35c0bee77b5d69f49c2da269251d451b28f.tar.gz
-e1983f416ae7a092dd9bbb35c3a113ffb6048f94 SOURCES/auto-maintenance-792c7c0a5633b0a41edf7b1cb4d97963a585e508.tar.gz
+749f960ce46712b9571339ecbc43b532c5eb662f SOURCES/auto-maintenance-32ab2252be64d5e71454b83dc2c701d22168bef4.tar.gz
 b9cb802ff62e34fe6297ecee79485f7ff1466a69 SOURCES/certificate-1.1.2.tar.gz
 004064268df0e7dd154331b7799272d3277388d4 SOURCES/cockpit-1.2.1.tar.gz
 52f68703d358cb96e112786c65fc8d48edd84624 SOURCES/community-general-4.3.0.tar.gz
 0684c1335923ba8ebbb05afbd507e5ff31f874d6 SOURCES/crypto_policies-1.2.3.tar.gz
 07ec8941f8ee167256276e3a02cb1834449bb0e1 SOURCES/firewall-1.0.3.tar.gz
 5b3a6aa19d02fdee694f6410f62beb769f2006b5 SOURCES/ha_cluster-1.4.0.tar.gz
-9d5e77db1f7055f464c56861188dfc12a1778045 SOURCES/kdump-1.2.1.tar.gz
+a1c9c89dea1dbe2410465c29ad0e1d3637ac5f52 SOURCES/kdump-1.2.2.tar.gz
 72bd06d25e4c841e53be7fa1330c859ac8f76a6d SOURCES/kernel_settings-1.1.4.tar.gz
 e530528ba5f9478cc8604aa6612388ea8e5078af SOURCES/logging-1.8.1.tar.gz
 c0dbbea68bba05ee98c3e1a686c328e741abe763 SOURCES/metrics-1.4.1.tar.gz
@@ -20,4 +20,4 @@ f38972c4b22a9f226b58725c7e9ba8fac692bba2 SOURCES/ssh-1.1.4.tar.gz
 0728b4e01261f84ce470431a4ea21907db75f26a SOURCES/storage-1.7.0.tar.gz
 b9f1b88b8eda052161bc86473b383ad88692249c SOURCES/timesync-1.6.5.tar.gz
 48a233ef19b6014f36c9a20eb1017817c4281bcd SOURCES/tlog-1.2.3.tar.gz
-fd6d2822dbc1b3bbd8c89a63a7932c950d40f2a2 SOURCES/vpn-1.3.0.tar.gz
+1b45d6e47bb4aa9e7840c416cb142981666c29a7 SOURCES/vpn-1.3.1.tar.gz
diff --git a/SPECS/rhel-system-roles.spec b/SPECS/rhel-system-roles.spec
index 3f02556..5a4c52c 100644
--- a/SPECS/rhel-system-roles.spec
+++ b/SPECS/rhel-system-roles.spec
@@ -30,7 +30,7 @@ Name: linux-system-roles
 %endif
 Url: https://github.com/linux-system-roles
 Summary: Set of interfaces for unified system management
-Version: 1.13.0
+Version: 1.13.1
 Release: 1%{?dist}
 
 #Group: Development/Libraries
@@ -139,7 +139,7 @@ BuildRequires: %{ansible_build_dep}
 
 #%%defcommit 4 02fc72b482e165472624b2f68eecd2ddce1d93b1
 %global rolename4 kdump
-%deftag 4 1.2.1
+%deftag 4 1.2.2
 
 %defcommit 5 2b881a6c3fac68457711be598523f625ded16565
 %global rolename5 network
@@ -197,7 +197,7 @@ BuildRequires: %{ansible_build_dep}
 
 #%%defcommit 18 5f6cb73e6753fbdbb219b7d3079f0378b2d3bdb3
 %global rolename18 vpn
-%deftag 18 1.3.0
+%deftag 18 1.3.1
 
 %global rolename19 firewall
 %deftag 19 1.0.3
@@ -205,7 +205,7 @@ BuildRequires: %{ansible_build_dep}
 %global rolename20 cockpit
 %deftag 20 1.2.1
 
-%global mainid 792c7c0a5633b0a41edf7b1cb4d97963a585e508
+%global mainid 32ab2252be64d5e71454b83dc2c701d22168bef4
 Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz
 Source1: %{archiveurl1}
 Source2: %{archiveurl2}
@@ -448,6 +448,9 @@ mkdir .collections
                       "https://access.redhat.com/articles/3050101" \
                       "https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20Linux%208&component=rhel-system-roles" \
                       > galaxy.yml.tmp
+# we vendor-in all of the dependencies on rhel, so remove them
+rm lsr_role2collection/collection_requirements.txt
+# but leave bindep.txt for now
 %else
 ./galaxy_transform.py "%{collection_namespace}" "%{collection_name}" "%{collection_version}" \
                       "Linux System Roles Ansible Collection" \
@@ -458,6 +461,10 @@ mv galaxy.yml.tmp galaxy.yml
 includes=""
 for role in %{rolenames}; do
     includes="$includes --include $role"
+%if 0%{?rhel}
+    # we vendor-in all of the dependencies on rhel, so remove them
+    rm -f "$role/meta/requirements.yml"
+%endif
 done
 
 LANG=en_US.utf-8 LC_ALL=en_US.utf-8 python3 release_collection.py --galaxy-yml galaxy.yml \
@@ -712,6 +719,15 @@ fi
 %endif
 
 %changelog
+* Tue Feb 8 2022 Rich Megginson <rmeggins@redhat.com> - 1.13.1-1
+- vpn - template error while templating string: no filter named 'vpn_ipaddr'
+  Resolves rhbz#2052103 (EL8)
+  Resolves rhbz#2050341 (EL9)
+- kdump - Unable to start service kdump: Job for kdump.service failed because the control process exited with error code.
+  Resolves rhbz#2052105 (EL8)
+  Resolves rhbz#2050419 (EL9)
+- remove collection dependencies on rhel because we vendor them in
+
 * Tue Feb 1 2022 Rich Megginson <rmeggins@redhat.com> - 1.13.0-1
 - storage - RFE: Add support for RAID volumes (lvm-only)
   Resolves rhbz#2016514 (EL8)