From e9f831dfdb709a6165487ecc450e3b6cedb42bc1 Mon Sep 17 00:00:00 2001
From: Petr Lautrbach <lautrbach@redhat.com>
Date: Wed, 10 May 2023 17:42:17 +0200
Subject: [PATCH] setools-4.4.2-2.1

- Disable sediff --neverallow and --neverallowxperm options
Resolves: rhbz#2184140
---
 ...-remove-neverallow-options-in-sediff.patch | 52 +++++++++++++++++--
 setools.spec                                  |  4 +-
 2 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/0001-Disable-remove-neverallow-options-in-sediff.patch b/0001-Disable-remove-neverallow-options-in-sediff.patch
index 840f4f0..a6f6cc7 100644
--- a/0001-Disable-remove-neverallow-options-in-sediff.patch
+++ b/0001-Disable-remove-neverallow-options-in-sediff.patch
@@ -1,4 +1,4 @@
-From 1fd4270f23f1f0fcde4eb6d87b50a59ba4a0d1b4 Mon Sep 17 00:00:00 2001
+From b6b7a20618595ab88480f05348e91491345b70ef Mon Sep 17 00:00:00 2001
 From: Petr Lautrbach <lautrbach@redhat.com>
 Date: Tue, 9 May 2023 19:22:01 +0200
 Subject: [PATCH] Disable/remove neverallow options in sediff.
@@ -9,9 +9,53 @@ options in frontends.") to sediff
 
 Signed-off-by: Petr Lautrbach <lautrbach@redhat.com>
 ---
- sediff | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
+ man/ru/sediff.1 |  4 ----
+ man/sediff.1    |  4 ----
+ sediff          | 10 +++++++---
+ 3 files changed, 7 insertions(+), 11 deletions(-)
 
+diff --git a/man/ru/sediff.1 b/man/ru/sediff.1
+index c6bf2939443f..af5d8efcf82c 100644
+--- a/man/ru/sediff.1
++++ b/man/ru/sediff.1
+@@ -57,16 +57,12 @@ sediff \- утилита выявления различий политик SELi
+ Найти различия правил включения журналирования событий.
+ .IP "--dontaudit"
+ Найти различия правил запрета журналирования событий.
+-.IP "--neverallow"
+-Найти различия запрещающих правил.
+ .IP "--allowxperm"
+ Найти различия расширенных разрешительных правил.
+ .IP "--auditallowxperm"
+ Найти различия расширенных правил включения журналирования событий.
+ .IP "--dontauditxperm"
+ Найти различия расширенных правил запрета журналирования событий.
+-.IP "--neverallowxperm"
+-Найти различия расширенных запрещающих правил.
+ .IP "-T, --type_trans"
+ Найти различия правил перехода типов.
+ .IP "--type_member"
+diff --git a/man/sediff.1 b/man/sediff.1
+index ed3b497db2c4..18466d8aeb68 100644
+--- a/man/sediff.1
++++ b/man/sediff.1
+@@ -50,16 +50,12 @@ Find differences in allow rules.
+ Find differences in auditallow rules.
+ .IP "--dontaudit"
+ Find differences in dontaudit rules.
+-.IP "--neverallow"
+-Find differences in neverallow rules.
+ .IP "--allowxperm"
+ Find differences in allowxperm rules.
+ .IP "--auditallowxperm"
+ Find differences in auditallowxperm rules.
+ .IP "--dontauditxperm"
+ Find differences in dontauditxperm rules.
+-.IP "--neverallowxperm"
+-Find differences in neverallowxperm rules.
+ .IP "-T, --type_trans"
+ Find differences in type_transition rules.
+ .IP "--type_member"
 diff --git a/sediff b/sediff
 index dfaa319d1d59..97899c13caf4 100755
 --- a/sediff
@@ -44,5 +88,5 @@ index dfaa319d1d59..97899c13caf4 100755
      args.allow = True
      args.allowxperm = True
 -- 
-2.40.0
+2.40.1
 
diff --git a/setools.spec b/setools.spec
index 00d8861..17588f5 100644
--- a/setools.spec
+++ b/setools.spec
@@ -3,7 +3,7 @@
 
 Name:           setools
 Version:        4.4.2
-Release:        2%{?dist}
+Release:        2.1%{?dist}
 Summary:        Policy analysis tools for SELinux
 
 License:        GPL-2.0-only and LGPL-2.1-only
@@ -144,7 +144,7 @@ Python modules designed to facilitate SELinux policy analysis.
 %{_mandir}/ru/man1/apol*
 
 %changelog
-* Wed May 10 2023 Petr Lautrbach <lautrbach@redhat.com> - 4.4.2-2
+* Wed May 10 2023 Petr Lautrbach <lautrbach@redhat.com> - 4.4.2-2.1
 - Disable sediff --neverallow and --neverallowxperm options
 
 * Thu Apr 20 2023 Petr Lautrbach <lautrbach@redhat.com> - 4.4.2-1