From 9f4adf5a903d93076162265335ee2cba300df028 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Thu, 9 Feb 2023 18:31:03 -0700
Subject: [PATCH] Fix selinux idempotency; fix nbde_server test problem

selinux - managing modules is not idempotent
Resolves:rhbz#2160152

fix nbde_server test problem
---
 .gitignore              |  2 ++
 CHANGELOG.md            |  7 +++++++
 linux-system-roles.spec | 10 +++++++---
 sources                 |  4 ++--
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4f43407..d430581 100644
--- a/.gitignore
+++ b/.gitignore
@@ -423,3 +423,5 @@
 /certificate-1.1.9.tar.gz
 /selinux-1.5.4.tar.gz
 /nbde_client-1.2.10.tar.gz
+/nbde_server-1.3.3.tar.gz
+/selinux-1.5.6.tar.gz
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8e2f78..a80422f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+[1.21.0-0.17] - 2023-02-09
+----------------------------
+
+### Bug Fixes
+
+- [selinux - managing modules is not idempotent](https://bugzilla.redhat.com/show_bug.cgi?id=2160152)
+
 [1.21.0-0.16] - 2023-02-03
 ----------------------------
 
diff --git a/linux-system-roles.spec b/linux-system-roles.spec
index 7be591e..17ee532 100644
--- a/linux-system-roles.spec
+++ b/linux-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.16%{?dist}
+Release: 0.17%{?dist}
 
 License: GPLv3+ and MIT and BSD and Python
 %global _pkglicensedir %{_licensedir}/%{name}
@@ -115,7 +115,7 @@ Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar
 %deftag 1 1.3.3
 
 %global rolename2 selinux
-%deftag 2 1.5.4
+%deftag 2 1.5.6
 
 %global rolename3 timesync
 %deftag 3 1.7.2
@@ -142,7 +142,7 @@ Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar
 %deftag 10 1.11.5
 
 %global rolename11 nbde_server
-%deftag 11 1.3.2
+%deftag 11 1.3.3
 
 %global rolename12 nbde_client
 %deftag 12 1.2.10
@@ -746,6 +746,10 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \
 %endif
 
 %changelog
+* Thu Feb 09 2023 Rich Megginson <rmeggins@redhat.com> - 1.21.0-0.17
+- Resolves:rhbz#2160152 : selinux - managing modules is not idempotent
+- Fix nbde_server test issue
+
 * Fri Feb 03 2023 Rich Megginson <rmeggins@redhat.com> - 1.21.0-0.16
 - Resolves:rhbz#2165175 : journald - New role - journald - manage systemd-journald
 - Resolves:rhbz#2162782 : nbde_client - nbde_client_clevis fails with a traceback and prints sensitive data
diff --git a/sources b/sources
index 9017b92..9b2e022 100644
--- a/sources
+++ b/sources
@@ -15,11 +15,11 @@ SHA512 (kernel_settings-1.1.11.tar.gz) = 70b6f851ab12af1bf6b7c95159a42c709c6d8a9
 SHA512 (logging-1.11.5.tar.gz) = 8594d4fec3cc6d1fec9feb5a6a2929992f1774dd0c586ab45bcac9f41dc8e9f3d969e417ed855892c281d7c7b5fe29f3da9f5316660c6d268298621fa4ec937f
 SHA512 (metrics-1.8.1.tar.gz) = c4373bc925b5b89f47d4abe23e576dba8c8043682e7cd0e564c87474c14e80e347f4fe3ce78ae15bd5eca525c1ab7b9079908651bcf52590fa789fe362453b28
 SHA512 (nbde_client-1.2.10.tar.gz) = 3f9458cbf572bbaeca58a99db2e7613106e265a44082d470e31944d508a142954a9fd96bbb4ab9ba483fd1b1e8973b9c60ed6d00838f46acd57e3d3e1e54b293
-SHA512 (nbde_server-1.3.2.tar.gz) = fbf2ca2e171b3774358fbb5427d3bf7c531c928afcc30d2146d5f2c442bc758dc6f2be12c0e2e7a942ce562a782e3a644e38e1090958f9ade012715f2396bbea
+SHA512 (nbde_server-1.3.3.tar.gz) = 41161f373dda9682796fa3d9940b9e0c39db030b6588c6313f1863c455f213335bb867ddea04bd4719c2d41aa54f0c79fa92e33403b35199f581cbccada4b59b
 SHA512 (network-1.11.1.tar.gz) = b7de11b69b33521dd9edbac718276c757c6bbbd6e83b1cdddf5b925d21f7d6c7bbfe2df4097c50d174d86adfb05f65831bfac7f7c2dcb158094361e3e7e6ad22
 SHA512 (podman-1.1.2.tar.gz) = 627bdca8053a2e7b817f2c039dea3ce4a2ec1bf116a455ce812bd1d6f6fc01214a02d582a8789ffd6f8657c959fad773423000ef773fa47e314059a12a70aa6a
 SHA512 (postfix-1.3.3.tar.gz) = 93cb2ec4764d5ea7922298194e5ed8613bac50a6646e4410bb608c8590e5f4a1b7aa3a6251bc9551ab3ba2033394a2700542f6377d9bf08676c8ee2b963710de
-SHA512 (selinux-1.5.4.tar.gz) = af87b71baa134d8b039a7762ce14db3f821564d04125c9b21ecbe1499843facbeed978fdf6d044c9f536229e08b0c1a2a550871d933d952c67ce9c2ccfc85ead
+SHA512 (selinux-1.5.6.tar.gz) = 7467d3f048735151ab2f54949b8ef4af0e5a0a4b808558e0a4bc7bc2f6adcf1e2e4003d5709e3d6b6c4f75ebf2a6ac678e98fe46764e04d373efbd69d4b84afa
 SHA512 (ssh-1.1.12.tar.gz) = b3041110726467bb9711babc2dd327622cacb31e3ba19f5f0036b538575ebe71b55521eb7f7e7cb6e5fc22ee230f2909c3eb2308ac163144c72422211f979d6d
 SHA512 (storage-1.9.6.tar.gz) = a8de206da08fdc2ad467e493e3a601b72d3aa31133b7d2878ef3b920ad767ea7090b51518eea40de5b7b652fa68d11d14324beb62354956cacd8f6e9c05cc850
 SHA512 (timesync-1.7.2.tar.gz) = 0410ef3934ca080f968253a6f5b655e5d7467808af0320f1eb3237eb758415010f8bfe74447ea949fe9d30af63f7b145c455c5485c12227768b8567bb89b024b