From baf1e89675d0b3812c303065879fb8486d63dba8 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Wed, 9 Aug 2023 17:15:48 -0600
Subject: [PATCH] firewall ipset and tests

firewall - missing module in linux-system-roles.firewall to create an ipset
Resolves:rhbz#2140880

(cherry picked from commit 83fcfac8747395ee47db840b35538f6e80f43953)
---
 .gitignore             |  1 +
 CHANGELOG.md           | 11 +++++++++++
 rhel-system-roles.spec |  7 +++++--
 sources                |  2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index a06724d..a9dc680 100644
--- a/.gitignore
+++ b/.gitignore
@@ -200,3 +200,4 @@ SOURCES/vpn-1.5.3.tar.gz
 /podman-1.3.1.tar.gz
 /rhc-1.2.4.tar.gz
 /kdump-1.3.4.tar.gz
+/firewall-1.6.1.tar.gz
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 167a544..cd9812e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,17 @@
 Changelog
 =========
 
+[1.22.0-0.20] - 2023-08-09
+----------------------------
+
+### New Features
+
+- [firewall - missing module in linux-system-roles.firewall to create an ipset](https://bugzilla.redhat.com/show_bug.cgi?id=2140880)
+
+### Bug Fixes
+
+- none
+
 [1.22.0-0.19] - 2023-08-01
 ----------------------------
 
diff --git a/rhel-system-roles.spec b/rhel-system-roles.spec
index e5b7749..cff065d 100644
--- a/rhel-system-roles.spec
+++ b/rhel-system-roles.spec
@@ -27,7 +27,7 @@ Name: linux-system-roles
 Url: https://github.com/linux-system-roles
 Summary: Set of interfaces for unified system management
 Version: 1.22.0
-Release: 0.19%{?dist}
+Release: 0.20%{?dist}
 
 License: GPLv3+ and MIT and BSD and Python
 %global _pkglicensedir %{_licensedir}/%{name}
@@ -147,7 +147,7 @@ Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar
 %deftag 18 1.5.8
 
 %global rolename19 firewall
-%deftag 19 1.5.0
+%deftag 19 1.6.1
 
 %global rolename20 cockpit
 %deftag 20 1.4.7
@@ -662,6 +662,9 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \
 %endif
 
 %changelog
+* Wed Aug 09 2023 Rich Megginson <rmeggins@redhat.com> - 1.22.0-0.20
+- Resolves:rhbz#2140880 : firewall - missing module in linux-system-roles.firewall to create an ipset
+
 * Tue Aug 01 2023 Rich Megginson <rmeggins@redhat.com> - 1.22.0-0.19
 - Resolves RHEL-866 : podman - use getsubids to look for subuid, subgid for IdM support
 - Resolves RHEL-858 : podman - allow to not pull images, continue if image pull fails
diff --git a/sources b/sources
index d274e27..b3e9d8b 100644
--- a/sources
+++ b/sources
@@ -7,7 +7,7 @@ SHA512 (cockpit-1.4.7.tar.gz) = 4241a400e26abfdc188d016dc367a62cb51979bcaa41f579
 SHA512 (community-general-7.2.1.tar.gz) = f9d35dd9979ac3b0b22f852703100228be1faf3073199122b870bba687b6db3b45f6713eb132186a5445b1c9d77abb0ed2d14f2e66fc44b64e91f166f025ace5
 SHA512 (containers-podman-1.10.2.tar.gz) = b18122f4d5b2e68b6b6edfbb264a7ff98ce898db2bbf1f87e0d449f3dd7035d55d4bfcaed831159c2a0e7dcc61856ef38e22a553bb65ede4aced1830709b783e
 SHA512 (crypto_policies-1.2.11.tar.gz) = b3bac1bf3b960b44f437ed2a42d2208406956166c18a1d0e711c44b75997ec26dd6628e0257b72ba1e540e62ac88d968287a47b0750b42961a90fa508febf1e3
-SHA512 (firewall-1.5.0.tar.gz) = b084b2733521d33818e81c10889344418bad95dc1628f4dee278cf3163a1cdb45754ccd73c04d0b0d05377172f278e23ef31f880f75baf5f311a25d78d349252
+SHA512 (firewall-1.6.1.tar.gz) = 84aaf0c9edd5a0b197fe2b5fcb39a3b4dce78ed2aceefa214f376dd0f45b92d19af148758be60e5c30376dc1d144421c7e1a0d6da64c0069687d3299686335e9
 SHA512 (ha_cluster-1.10.0.tar.gz) = 961145301b607def32352bd79f46f31d33866d3c3f588649135cab061966f65157a9fe3923881a294e80b87d6671697446a6074da4cf1b8645af11affc89500d
 SHA512 (journald-1.0.5.tar.gz) = 905d7b354f411f6b053e3ee6ada6771da8f5d310df5ef9c8eff5e88e6c31d968275cec1155bf8bbeeafa5c6436eb859f4d1dfdaefe097aa4feaea015559213cf
 SHA512 (kdump-1.3.4.tar.gz) = f9bedee4fc501f10c4a216f186d4ca85bef4d8a38c58ffe3e135d2bd25e013902a6f727e9b63d4c4668070b7c28107bfbd158727381ebc4cd469104c7a5de723