Do not use %autochangelog

It can't be used without %autorelease.
Use our own macro to add entries from SOURCE3: changelog to %changelog

    %add_changelog %SOURCE3

Also install changelog to /usr/share/doc/policycoreutils/changelog

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -340,3 +340,30 @@ policycoreutils-2.0.83.tgz
 /selinux-3.3-rc2.tar.gz
 /selinux-3.3-rc3.tar.gz
 /selinux-3.3.tar.gz
+/selinux-3.4-rc1.tar.gz
+/selinux-3.4-rc2.tar.gz
+/selinux-3.4-rc3.tar.gz
+/selinux-3.4.tar.gz
+/selinux-3.5-rc1.tar.gz
+/selinux-3.5-rc2.tar.gz
+/selinux-3.5-rc3.tar.gz
+/selinux-3.5.tar.gz
+/selinux-policycoreutils.zip
+/selinux-python.zip
+/selinux-sandbox.zip
+/selinux-gui.zip
+/selinux-3.6-rc1.tar.gz
+/selinux-3.6-rc2.tar.gz
+/selinux-3.6.tar.gz
+/selinux-3.7.tar.gz
+/selinux-3.7.tar.gz.asc
+/selinux-3.8-rc1.tar.gz
+/selinux-3.8-rc1.tar.gz.asc
+/selinux-3.8-rc3.tar.gz
+/selinux-3.8-rc3.tar.gz.asc
+/selinux-3.8.tar.gz
+/selinux-3.8.tar.gz.asc
+/selinux-3.9-rc2.tar.gz
+/selinux-3.9-rc2.tar.gz.asc
+/selinux-3.9.tar.gz
+/selinux-3.9.tar.gz.asc

0001-Don-t-be-verbose-if-you-are-not-on-a-tty.patch

@@ -1,14 +1,15 @@
-From f183dd36c66069c95726e1dab47639e76077d86a Mon Sep 17 00:00:00 2001
+From ce28d432bef8d1a346054b56a989e58533fecfa7 Mon Sep 17 00:00:00 2001
 From: Dan Walsh <dwalsh@redhat.com>
 Date: Fri, 14 Feb 2014 12:32:12 -0500
 Subject: [PATCH] Don't be verbose if you are not on a tty
+Content-type: text/plain
 
 ---
  policycoreutils/scripts/fixfiles | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/policycoreutils/scripts/fixfiles b/policycoreutils/scripts/fixfiles
-index 6fb12e0451a9..cb20002ab613 100755
+index b7cd765c15e4..f2518e96e34c 100755
 --- a/policycoreutils/scripts/fixfiles
 +++ b/policycoreutils/scripts/fixfiles
 @@ -108,6 +108,7 @@ exclude_dirs_from_relabelling() {
@@ -17,8 +18,8 @@ index 6fb12e0451a9..cb20002ab613 100755
  VERBOSE="-p"
 +[ -t 1 ] || VERBOSE=""
  FORCEFLAG=""
+ THREADS=""
  RPMFILES=""
- PREFC=""
 -- 
-2.32.0
+2.50.1
 

0001-sandbox-add-reset-to-Xephyr-as-it-works-better-with-.patch

@@ -1,26 +0,0 @@
-From ec3bf6f3e5468ba7b5164cc588ef5746454808a5 Mon Sep 17 00:00:00 2001
-From: Petr Lautrbach <plautrba@redhat.com>
-Date: Thu, 20 Aug 2015 12:58:41 +0200
-Subject: [PATCH] sandbox: add -reset to Xephyr as it works better with it in
- recent Fedoras
-
----
- sandbox/sandboxX.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sandbox/sandboxX.sh b/sandbox/sandboxX.sh
-index eaa500d08143..4774528027ef 100644
---- a/sandbox/sandboxX.sh
-+++ b/sandbox/sandboxX.sh
-@@ -20,7 +20,7 @@ cat > ~/.config/openbox/rc.xml << EOF
- </openbox_config>
- EOF
- 
--(/usr/bin/Xephyr -resizeable -title "$TITLE" -terminate -screen $SCREENSIZE -dpi $DPI -nolisten tcp -displayfd 5 5>&1 2>/dev/null) | while read D; do
-+(/usr/bin/Xephyr -resizeable -title "$TITLE" -terminate -reset -screen $SCREENSIZE -dpi $DPI -nolisten tcp -displayfd 5 5>&1 2>/dev/null) | while read D; do
-     export DISPLAY=:$D
-     cat > ~/seremote << __EOF
- #!/bin/sh
--- 
-2.32.0
-

0002-Fix-STANDARD_FILE_CONTEXT-section-in-man-pages.patch

@@ -1,46 +0,0 @@
-From 7a548cae4303f8429040ba6be67be182b7f9a943 Mon Sep 17 00:00:00 2001
-From: Dan Walsh <dwalsh@redhat.com>
-Date: Mon, 21 Apr 2014 13:54:40 -0400
-Subject: [PATCH] Fix STANDARD_FILE_CONTEXT section in man pages
-
-Signed-off-by: Miroslav Grepl <mgrepl@redhat.com>
----
- python/sepolicy/sepolicy/manpage.py | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/python/sepolicy/sepolicy/manpage.py b/python/sepolicy/sepolicy/manpage.py
-index 2f847abb87e2..dccd778ed4be 100755
---- a/python/sepolicy/sepolicy/manpage.py
-+++ b/python/sepolicy/sepolicy/manpage.py
-@@ -737,10 +737,13 @@ Default Defined Ports:""")
- 
-     def _file_context(self):
-         flist = []
-+        flist_non_exec = []
-         mpaths = []
-         for f in self.all_file_types:
-             if f.startswith(self.domainname):
-                 flist.append(f)
-+                if not file_type_is_executable(f) or not file_type_is_entrypoint(f):
-+                    flist_non_exec.append(f)
-                 if f in self.fcdict:
-                     mpaths = mpaths + self.fcdict[f]["regex"]
-         if len(mpaths) == 0:
-@@ -799,12 +802,12 @@ SELinux %(domainname)s policy is very flexible allowing users to setup their %(d
- SELinux defines the file context types for the %(domainname)s, if you wanted to
- store files with these types in a diffent paths, you need to execute the semanage command to specify alternate labeling and then use restorecon to put the labels on disk.
- 
--.B semanage fcontext -a -t %(type)s '/srv/%(domainname)s/content(/.*)?'
-+.B semanage fcontext -a -t %(type)s '/srv/my%(domainname)s_content(/.*)?'
- .br
- .B restorecon -R -v /srv/my%(domainname)s_content
- 
- Note: SELinux often uses regular expressions to specify labels that match multiple files.
--""" % {'domainname': self.domainname, "type": flist[0]})
-+""" % {'domainname': self.domainname, "type": flist_non_exec[-1]})
- 
-         self.fd.write(r"""
- .I The following file types are defined for %(domainname)s:
--- 
-2.32.0
-

0002-sepolicy-generate-Handle-more-reserved-port-types.patch

@@ -1,7 +1,8 @@
-From 53c27e891b9053a9bbbbca5a854deb4fc526a8a2 Mon Sep 17 00:00:00 2001
+From 618ae48ebf1334f9380a9ae7460c553515f9c4ca Mon Sep 17 00:00:00 2001
 From: Masatake YAMATO <yamato@redhat.com>
 Date: Thu, 14 Dec 2017 15:57:58 +0900
 Subject: [PATCH] sepolicy-generate: Handle more reserved port types
+Content-type: text/plain
 
 Currently only reserved_port_t, port_t and hi_reserved_port_t are
 handled as special when making a ports-dictionary.  However, as fas as
@@ -52,10 +53,10 @@ https://lore.kernel.org/selinux/20150610.190635.1866127952891120915.yamato@redha
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/python/sepolicy/sepolicy/generate.py b/python/sepolicy/sepolicy/generate.py
-index 43180ca6fda4..d60a08e1d72c 100644
+index adf65f27a822..f726ad51b775 100644
 --- a/python/sepolicy/sepolicy/generate.py
 +++ b/python/sepolicy/sepolicy/generate.py
-@@ -99,7 +99,9 @@ def get_all_ports():
+@@ -100,7 +100,9 @@ def get_all_ports():
      for p in sepolicy.info(sepolicy.PORT):
          if p['type'] == "reserved_port_t" or \
                  p['type'] == "port_t" or \
@@ -67,5 +68,5 @@ index 43180ca6fda4..d60a08e1d72c 100644
          dict[(p['low'], p['high'], p['protocol'])] = (p['type'], p.get('range'))
      return dict
 -- 
-2.32.0
+2.50.1
 

0003-If-there-is-no-executable-we-don-t-want-to-print-a-p.patch

@@ -1,27 +0,0 @@
-From b3cb362afe86278c600d6e97cc7abf9c0b102071 Mon Sep 17 00:00:00 2001
-From: Miroslav Grepl <mgrepl@redhat.com>
-Date: Mon, 12 May 2014 14:11:22 +0200
-Subject: [PATCH] If there is no executable we don't want to print a part of
- STANDARD FILE CONTEXT
-
----
- python/sepolicy/sepolicy/manpage.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/python/sepolicy/sepolicy/manpage.py b/python/sepolicy/sepolicy/manpage.py
-index dccd778ed4be..81333928d552 100755
---- a/python/sepolicy/sepolicy/manpage.py
-+++ b/python/sepolicy/sepolicy/manpage.py
-@@ -795,7 +795,8 @@ SELinux %(domainname)s policy is very flexible allowing users to setup their %(d
- .PP
- """ % {'domainname': self.domainname, 'equiv': e, 'alt': e.split('/')[-1]})
- 
--        self.fd.write(r"""
-+        if flist_non_exec:
-+                self.fd.write(r"""
- .PP
- .B STANDARD FILE CONTEXT
- 
--- 
-2.32.0
-

0003-sandbox-Use-matchbox-window-manager-instead-of-openb.patch

@@ -1,7 +1,8 @@
-From be804ecd456a52803067e1aa11e20ef69788221c Mon Sep 17 00:00:00 2001
+From 16fd581da479f80b8f8ff8ae8ff58a4f0a610d54 Mon Sep 17 00:00:00 2001
 From: Petr Lautrbach <plautrba@redhat.com>
 Date: Wed, 18 Jul 2018 09:09:35 +0200
 Subject: [PATCH] sandbox: Use matchbox-window-manager instead of openbox
+Content-type: text/plain
 
 ---
  sandbox/sandbox     |  4 ++--
@@ -10,10 +11,10 @@ Subject: [PATCH] sandbox: Use matchbox-window-manager instead of openbox
  3 files changed, 3 insertions(+), 17 deletions(-)
 
 diff --git a/sandbox/sandbox b/sandbox/sandbox
-index 16c43b51eaaa..7709a6585665 100644
+index e3fd6119ed4d..e01425f0c637 100644
 --- a/sandbox/sandbox
 +++ b/sandbox/sandbox
-@@ -268,7 +268,7 @@ class Sandbox:
+@@ -270,7 +270,7 @@ class Sandbox:
              copyfile(f, "/tmp", self.__tmpdir)
              copyfile(f, "/var/tmp", self.__tmpdir)
  
@@ -22,7 +23,7 @@ index 16c43b51eaaa..7709a6585665 100644
          execfile = self.__homedir + "/.sandboxrc"
          fd = open(execfile, "w+")
          if self.__options.session:
-@@ -362,7 +362,7 @@ sandbox [-h] [-l level ] [-[X|M] [-H homedir] [-T tempdir]] [-I includefile ] [-
+@@ -370,7 +370,7 @@ sandbox [-h] [-l level ] [-[X|M] [-H homedir] [-T tempdir]] [-I includefile ] [-
  
          parser.add_option("-W", "--windowmanager", dest="wm",
                            type="string",
@@ -32,24 +33,24 @@ index 16c43b51eaaa..7709a6585665 100644
  
          parser.add_option("-l", "--level", dest="level",
 diff --git a/sandbox/sandbox.8 b/sandbox/sandbox.8
-index d83fee76f335..90ef4951c8c2 100644
+index 095b9e27042d..1c1870190e51 100644
 --- a/sandbox/sandbox.8
 +++ b/sandbox/sandbox.8
-@@ -77,7 +77,7 @@ Specifies the windowsize when creating an X based Sandbox. The default windowsiz
+@@ -80,7 +80,7 @@ Specifies the windowsize when creating an X based Sandbox. The default windowsiz
  \fB\-W\fR \fB\-\-windowmanager\fR
- Select alternative window manager to run within 
+ Select alternative window manager to run within
  .B sandbox \-X.
 -Default to /usr/bin/openbox.
 +Default to /usr/bin/matchbox-window-manager.
  .TP
- \fB\-X\fR 
+ \fB\-X\fR
  Create an X based Sandbox for gui apps, temporary files for
 diff --git a/sandbox/sandboxX.sh b/sandbox/sandboxX.sh
-index 4774528027ef..c211ebc14549 100644
+index 28169182ce42..e2a7ad9b2ac7 100644
 --- a/sandbox/sandboxX.sh
 +++ b/sandbox/sandboxX.sh
-@@ -6,20 +6,6 @@ export TITLE="Sandbox $context -- `grep ^#TITLE: ~/.sandboxrc | /usr/bin/cut -b8
- [ -z $2 ] && export DPI="96" || export DPI="$2"
+@@ -7,20 +7,6 @@ export TITLE="Sandbox $context -- `grep ^#TITLE: ~/.sandboxrc | /usr/bin/cut -b8
+ [ -z $3 ] && export DPI="96" || export DPI="$3"
  trap "exit 0" HUP
  
 -mkdir -p ~/.config/openbox
@@ -66,9 +67,9 @@ index 4774528027ef..c211ebc14549 100644
 -</openbox_config>
 -EOF
 -
- (/usr/bin/Xephyr -resizeable -title "$TITLE" -terminate -reset -screen $SCREENSIZE -dpi $DPI -nolisten tcp -displayfd 5 5>&1 2>/dev/null) | while read D; do
-     export DISPLAY=:$D
-     cat > ~/seremote << __EOF
+ if [ "$WAYLAND_NATIVE" == "no" ]; then
+     if [ -z "$WAYLAND_DISPLAY" ]; then
+         DISPLAY_COMMAND='/usr/bin/Xephyr -resizeable -title "$TITLE" -terminate -screen $SCREENSIZE -dpi $DPI -nolisten tcp -displayfd 5 5>&1 2>/dev/null'
 -- 
-2.32.0
+2.50.1
 

0004-Simplication-of-sepolicy-manpage-web-functionality.-.patch

@@ -1,169 +0,0 @@
-From b954ff8379e03714f707daa85111f6bf2f265772 Mon Sep 17 00:00:00 2001
-From: Miroslav Grepl <mgrepl@redhat.com>
-Date: Thu, 19 Feb 2015 17:45:15 +0100
-Subject: [PATCH] Simplication of sepolicy-manpage web functionality.
- system_release is no longer hardcoded and it creates only index.html and html
- man pages in the directory for the system release.
-
----
- python/sepolicy/sepolicy/__init__.py | 25 +++--------
- python/sepolicy/sepolicy/manpage.py  | 65 +++-------------------------
- 2 files changed, 13 insertions(+), 77 deletions(-)
-
-diff --git a/python/sepolicy/sepolicy/__init__.py b/python/sepolicy/sepolicy/__init__.py
-index e8654abbceb3..a2475d22547a 100644
---- a/python/sepolicy/sepolicy/__init__.py
-+++ b/python/sepolicy/sepolicy/__init__.py
-@@ -1225,27 +1225,14 @@ def boolean_desc(boolean):
- 
- 
- def get_os_version():
--    os_version = ""
--    pkg_name = "selinux-policy"
-+    system_release = ""
-     try:
--        try:
--            from commands import getstatusoutput
--        except ImportError:
--            from subprocess import getstatusoutput
--        rc, output = getstatusoutput("rpm -q '%s'" % pkg_name)
--        if rc == 0:
--            os_version = output.split(".")[-2]
--    except:
--        os_version = ""
--
--    if os_version[0:2] == "fc":
--        os_version = "Fedora" + os_version[2:]
--    elif os_version[0:2] == "el":
--        os_version = "RHEL" + os_version[2:]
--    else:
--        os_version = ""
-+        with open('/etc/system-release') as f:
-+            system_release = f.readline()
-+    except IOError:
-+        system_release = "Misc"
- 
--    return os_version
-+    return system_release
- 
- 
- def reinit():
-diff --git a/python/sepolicy/sepolicy/manpage.py b/python/sepolicy/sepolicy/manpage.py
-index 81333928d552..dc3e5207c57c 100755
---- a/python/sepolicy/sepolicy/manpage.py
-+++ b/python/sepolicy/sepolicy/manpage.py
-@@ -151,10 +151,6 @@ def prettyprint(f, trim):
- manpage_domains = []
- manpage_roles = []
- 
--fedora_releases = ["Fedora17", "Fedora18"]
--rhel_releases = ["RHEL6", "RHEL7"]
--
--
- def get_alphabet_manpages(manpage_list):
-     alphabet_manpages = dict.fromkeys(string.ascii_letters, [])
-     for i in string.ascii_letters:
-@@ -184,7 +180,7 @@ def convert_manpage_to_html(html_manpage, manpage):
- class HTMLManPages:
- 
-     """
--            Generate a HHTML Manpages on an given SELinux domains
-+            Generate a HTML Manpages on an given SELinux domains
-     """
- 
-     def __init__(self, manpage_roles, manpage_domains, path, os_version):
-@@ -192,9 +188,9 @@ class HTMLManPages:
-         self.manpage_domains = get_alphabet_manpages(manpage_domains)
-         self.os_version = os_version
-         self.old_path = path + "/"
--        self.new_path = self.old_path + self.os_version + "/"
-+        self.new_path = self.old_path
- 
--        if self.os_version in fedora_releases or self.os_version in rhel_releases:
-+        if self.os_version:
-             self.__gen_html_manpages()
-         else:
-             print("SELinux HTML man pages can not be generated for this %s" % os_version)
-@@ -203,7 +199,6 @@ class HTMLManPages:
-     def __gen_html_manpages(self):
-         self._write_html_manpage()
-         self._gen_index()
--        self._gen_body()
-         self._gen_css()
- 
-     def _write_html_manpage(self):
-@@ -221,67 +216,21 @@ class HTMLManPages:
-                     convert_manpage_to_html((self.new_path + r.rsplit("_selinux", 1)[0] + ".html"), self.old_path + r)
- 
-     def _gen_index(self):
--        index = self.old_path + "index.html"
--        fd = open(index, 'w')
--        fd.write("""
--<html>
--<head>
--    <link rel=stylesheet type="text/css" href="style.css" title="style">
--    <title>SELinux man pages online</title>
--</head>
--<body>
--<h1>SELinux man pages</h1>
--<br></br>
--Fedora or Red Hat Enterprise Linux Man Pages.</h2>
--<br></br>
--<hr>
--<h3>Fedora</h3>
--<table><tr>
--<td valign="middle">
--</td>
--</tr></table>
--<pre>
--""")
--        for f in fedora_releases:
--            fd.write("""
--<a href=%s/%s.html>%s</a> - SELinux man pages for %s """ % (f, f, f, f))
--
--        fd.write("""
--</pre>
--<hr>
--<h3>RHEL</h3>
--<table><tr>
--<td valign="middle">
--</td>
--</tr></table>
--<pre>
--""")
--        for r in rhel_releases:
--            fd.write("""
--<a href=%s/%s.html>%s</a> - SELinux man pages for %s """ % (r, r, r, r))
--
--        fd.write("""
--</pre>
--	""")
--        fd.close()
--        print("%s has been created" % index)
--
--    def _gen_body(self):
-         html = self.new_path + self.os_version + ".html"
-         fd = open(html, 'w')
-         fd.write("""
- <html>
- <head>
--	<link rel=stylesheet type="text/css" href="../style.css" title="style">
--	<title>Linux man-pages online for Fedora18</title>
-+	<link rel=stylesheet type="text/css" href="style.css" title="style">
-+	<title>SELinux man pages online</title>
- </head>
- <body>
--<h1>SELinux man pages for Fedora18</h1>
-+<h1>SELinux man pages for %s</h1>
- <hr>
- <table><tr>
- <td valign="middle">
- <h3>SELinux roles</h3>
--""")
-+""" % self.os_version)
-         for letter in self.manpage_roles:
-             if len(self.manpage_roles[letter]):
-                 fd.write("""
--- 
-2.32.0
-

0004-Use-SHA-2-instead-of-SHA-1.patch

@@ -0,0 +1,178 @@
+From 1a3fc195c6dc7fe51ef76e4484910f7b41161ccc Mon Sep 17 00:00:00 2001
+From: Petr Lautrbach <plautrba@redhat.com>
+Date: Fri, 30 Jul 2021 14:14:37 +0200
+Subject: [PATCH] Use SHA-2 instead of SHA-1
+Content-type: text/plain
+
+The use of SHA-1 in RHEL9 is deprecated
+---
+ policycoreutils/setfiles/restorecon.8       | 10 +++++-----
+ policycoreutils/setfiles/restorecon_xattr.8 |  8 ++++----
+ policycoreutils/setfiles/restorecon_xattr.c | 12 ++++++------
+ policycoreutils/setfiles/setfiles.8         | 10 +++++-----
+ 4 files changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/policycoreutils/setfiles/restorecon.8 b/policycoreutils/setfiles/restorecon.8
+index 1134420e0e28..77dd05421d11 100644
+--- a/policycoreutils/setfiles/restorecon.8
++++ b/policycoreutils/setfiles/restorecon.8
+@@ -103,14 +103,14 @@ display usage information and exit.
+ ignore files that do not exist.
+ .TP
+ .B \-I
+-ignore digest to force checking of labels even if the stored SHA1 digest
+-matches the specfiles SHA1 digest. The digest will then be updated provided
++ignore digest to force checking of labels even if the stored SHA256 digest
++matches the specfiles SHA256 digest. The digest will then be updated provided
+ there are no errors. See the
+ .B NOTES
+ section for further details.
+ .TP
+ .B \-D
+-Set or update any directory SHA1 digests. Use this option to
++Set or update any directory SHA256 digests. Use this option to
+ enable usage of the
+ .IR security.sehash
+ extended attribute.
+@@ -208,7 +208,7 @@ the
+ .B \-D
+ option to
+ .B restorecon
+-will cause it to store a SHA1 digest of the default specfiles set in an extended
++will cause it to store a SHA256 digest of the default specfiles set in an extended
+ attribute named
+ .IR security.sehash
+ on each directory specified in
+@@ -225,7 +225,7 @@ for further details.
+ .sp
+ The
+ .B \-I
+-option will ignore the SHA1 digest from each directory specified in
++option will ignore the SHA256 digest from each directory specified in
+ .IR pathname \ ...
+ and provided the
+ .B \-n
+diff --git a/policycoreutils/setfiles/restorecon_xattr.8 b/policycoreutils/setfiles/restorecon_xattr.8
+index 51d12a4dbb80..09bfd8c40ab4 100644
+--- a/policycoreutils/setfiles/restorecon_xattr.8
++++ b/policycoreutils/setfiles/restorecon_xattr.8
+@@ -23,7 +23,7 @@ or
+ 
+ .SH "DESCRIPTION"
+ .B restorecon_xattr
+-will display the SHA1 digests added to extended attributes
++will display the SHA256 digests added to extended attributes
+ .I security.sehash
+ or delete the attribute completely. These attributes are set by
+ .BR restorecon (8)
+@@ -48,12 +48,12 @@ extended attribute and are automatically excluded from searches.
+ .sp
+ By default
+ .B restorecon_xattr
+-will display the SHA1 digests with "Match" appended if they match the default
++will display the SHA256 digests with "Match" appended if they match the default
+ specfile set or the
+ .I specfile
+ set used with the
+ .B \-f
+-option. Non-matching SHA1 digests will be displayed with "No Match" appended.
++option. Non-matching SHA256 digests will be displayed with "No Match" appended.
+ This feature can be disabled by the
+ .B \-n
+ option.
+@@ -87,7 +87,7 @@ Do not append "Match" or "No Match" to displayed digests.
+ recursively descend directories.
+ .TP
+ .B \-v
+-display SHA1 digest generated by specfile set (Note that this digest is not
++display SHA256 digest generated by specfile set (Note that this digest is not
+ used to match the
+ .I security.sehash
+ directory digest entries, and is shown for reference only).
+diff --git a/policycoreutils/setfiles/restorecon_xattr.c b/policycoreutils/setfiles/restorecon_xattr.c
+index 31fb82fd2099..bc22d3fd4560 100644
+--- a/policycoreutils/setfiles/restorecon_xattr.c
++++ b/policycoreutils/setfiles/restorecon_xattr.c
+@@ -38,7 +38,7 @@ int main(int argc, char **argv)
+ 	unsigned int xattr_flags = 0, delete_digest = 0, recurse = 0;
+ 	unsigned int delete_all_digests = 0, ignore_mounts = 0;
+ 	bool display_digest = false;
+-	char *sha1_buf, **specfiles, *fc_file = NULL, *pathname = NULL;
++	char *sha256_buf, **specfiles, *fc_file = NULL, *pathname = NULL;
+ 	unsigned char *fc_digest = NULL;
+ 	size_t i, fc_digest_len = 0, num_specfiles;
+ 
+@@ -133,8 +133,8 @@ int main(int argc, char **argv)
+ 			exit(-1);
+ 		}
+ 
+-		sha1_buf = malloc(fc_digest_len * 2 + 1);
+-		if (!sha1_buf) {
++		sha256_buf = malloc(fc_digest_len * 2 + 1);
++		if (!sha256_buf) {
+ 			fprintf(stderr,
+ 				"Error allocating digest buffer: %s\n",
+ 							    strerror(errno));
+@@ -143,16 +143,16 @@ int main(int argc, char **argv)
+ 		}
+ 
+ 		for (i = 0; i < fc_digest_len; i++)
+-			sprintf((&sha1_buf[i * 2]), "%02x", fc_digest[i]);
++			sprintf((&sha256_buf[i * 2]), "%02x", fc_digest[i]);
+ 
+-		printf("specfiles SHA1 digest: %s\n", sha1_buf);
++		printf("specfiles SHA256 digest: %s\n", sha256_buf);
+ 
+ 		printf("calculated using the following specfile(s):\n");
+ 		if (specfiles) {
+ 			for (i = 0; i < num_specfiles; i++)
+ 				printf("%s\n", specfiles[i]);
+ 		}
+-		free(sha1_buf);
++		free(sha256_buf);
+ 		printf("\n");
+ 	}
+ 
+diff --git a/policycoreutils/setfiles/setfiles.8 b/policycoreutils/setfiles/setfiles.8
+index eabf0a1cf755..187f45131a1f 100644
+--- a/policycoreutils/setfiles/setfiles.8
++++ b/policycoreutils/setfiles/setfiles.8
+@@ -104,14 +104,14 @@ display usage information and exit.
+ ignore files that do not exist.
+ .TP
+ .B \-I
+-ignore digest to force checking of labels even if the stored SHA1 digest
+-matches the specfiles SHA1 digest. The digest will then be updated provided
++ignore digest to force checking of labels even if the stored SHA256 digest
++matches the specfiles SHA256 digest. The digest will then be updated provided
+ there are no errors. See the
+ .B NOTES
+ section for further details.
+ .TP
+ .B \-D
+-Set or update any directory SHA1 digests. Use this option to
++Set or update any directory SHA256 digests. Use this option to
+ enable usage of the
+ .IR security.sehash
+ extended attribute.
+@@ -270,7 +270,7 @@ the
+ .B \-D
+ option to
+ .B setfiles
+-will cause it to store a SHA1 digest of the
++will cause it to store a SHA256 digest of the
+ .B spec_file
+ set in an extended attribute named
+ .IR security.sehash
+@@ -291,7 +291,7 @@ for further details.
+ .sp
+ The
+ .B \-I
+-option will ignore the SHA1 digest from each directory specified in
++option will ignore the SHA256 digest from each directory specified in
+ .IR pathname \ ...
+ and provided the
+ .B \-n
+-- 
+2.50.1
+

0005-We-want-to-remove-the-trailing-newline-for-etc-syste.patch

@@ -1,26 +0,0 @@
-From 7572bbec8b6a422e722864348a53d5e0f855e7f6 Mon Sep 17 00:00:00 2001
-From: Miroslav Grepl <mgrepl@redhat.com>
-Date: Fri, 20 Feb 2015 16:42:01 +0100
-Subject: [PATCH] We want to remove the trailing newline for
- /etc/system_release.
-
----
- python/sepolicy/sepolicy/__init__.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/python/sepolicy/sepolicy/__init__.py b/python/sepolicy/sepolicy/__init__.py
-index a2475d22547a..8055a12f6020 100644
---- a/python/sepolicy/sepolicy/__init__.py
-+++ b/python/sepolicy/sepolicy/__init__.py
-@@ -1228,7 +1228,7 @@ def get_os_version():
-     system_release = ""
-     try:
-         with open('/etc/system-release') as f:
--            system_release = f.readline()
-+            system_release = f.readline().rstrip()
-     except IOError:
-         system_release = "Misc"
- 
--- 
-2.32.0
-

0005-python-sepolicy-Fix-spec-file-dependencies.patch

@@ -0,0 +1,48 @@
+From 84b051139ab536519cc8e9c333483475d830d40b Mon Sep 17 00:00:00 2001
+From: Vit Mojzis <vmojzis@redhat.com>
+Date: Tue, 30 May 2023 09:07:28 +0200
+Subject: [PATCH] python/sepolicy: Fix spec file dependencies
+Content-type: text/plain
+
+semanage is part of policycoreutils-python-utils package, selinuxenabled
+is part of libselinux-utils (required by ^^^) and restorecon/load_policy
+are part of policycoreutils (also required by policycoreutils-python-utils).
+
+Signed-off-by: Vit Mojzis <vmojzis@redhat.com>
+---
+ python/sepolicy/sepolicy/templates/spec.py | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/python/sepolicy/sepolicy/templates/spec.py b/python/sepolicy/sepolicy/templates/spec.py
+index 433c298a17e0..a6d4508bb670 100644
+--- a/python/sepolicy/sepolicy/templates/spec.py
++++ b/python/sepolicy/sepolicy/templates/spec.py
+@@ -11,18 +11,20 @@ Version:	1.0
+ Release:	1%{?dist}
+ Summary:	SELinux policy module for MODULENAME
+ 
+-Group:	System Environment/Base		
+-License:	GPLv2+	
++Group:	System Environment/Base
++License:	GPLv2+
+ # This is an example. You will need to change it.
++# For a complete guide on packaging your policy
++# see https://fedoraproject.org/wiki/SELinux/IndependentPolicy
+ URL:		http://HOSTNAME
+ Source0:	MODULENAME.pp
+ Source1:	MODULENAME.if
+ Source2:	DOMAINNAME_selinux.8
+ Source3:	DOMAINNAME_u
+ 
+-Requires: policycoreutils, libselinux-utils
+-Requires(post): selinux-policy-base >= %{selinux_policyver}, policycoreutils
+-Requires(postun): policycoreutils
++Requires: policycoreutils-python-utils, libselinux-utils
++Requires(post): selinux-policy-base >= %{selinux_policyver}, policycoreutils-python-utils
++Requires(postun): policycoreutils-python-utils
+ """
+ 
+ mid_section="""\
+-- 
+2.50.1
+

0006-Fix-title-in-manpage.py-to-not-contain-online.patch

@@ -1,25 +0,0 @@
-From a4d59dcce863a02895fe40e487176149f3a4ad5b Mon Sep 17 00:00:00 2001
-From: Miroslav Grepl <mgrepl@redhat.com>
-Date: Fri, 20 Feb 2015 16:42:53 +0100
-Subject: [PATCH] Fix title in manpage.py to not contain 'online'.
-
----
- python/sepolicy/sepolicy/manpage.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/python/sepolicy/sepolicy/manpage.py b/python/sepolicy/sepolicy/manpage.py
-index dc3e5207c57c..6420ebe2e08e 100755
---- a/python/sepolicy/sepolicy/manpage.py
-+++ b/python/sepolicy/sepolicy/manpage.py
-@@ -222,7 +222,7 @@ class HTMLManPages:
- <html>
- <head>
- 	<link rel=stylesheet type="text/css" href="style.css" title="style">
--	<title>SELinux man pages online</title>
-+	<title>SELinux man pages</title>
- </head>
- <body>
- <h1>SELinux man pages for %s</h1>
--- 
-2.32.0
-

0006-sepolicy-Fix-detection-of-writeable-locations.patch

@@ -0,0 +1,65 @@
+From 98cd707e8106e9e77b179bccbeb4fd4004b4c601 Mon Sep 17 00:00:00 2001
+From: Petr Lautrbach <lautrbach@redhat.com>
+Date: Mon, 5 May 2025 18:28:40 +0200
+Subject: [PATCH] sepolicy: Fix detection of writeable locations
+
+- update substitutions from /etc/dnf/var
+
+It seems that by default dnf api does not read /etc/dnf/var/* files to
+update substitutions and so it can't resolve correct mirror list when a
+variable is part of the link.
+
+- alway run query.run()
+
+Fixes:
+    Traceback (most recent call last):
+      File "/usr/lib/python3.12/site-packages/dnf/repo.py", line 574, in load
+        ret = self._repo.load()
+              ^^^^^^^^^^^^^^^^^
+      File "/usr/lib64/python3.12/site-packages/libdnf/repo.py", line 467, in load
+        return _repo.Repo_load(self)
+               ^^^^^^^^^^^^^^^^^^^^^
+    libdnf._error.Error: Failed to download metadata for repo 'baseos':
+    Cannot prepare internal mirrorlist: Status code: 404 for
+    https://mirrors.centos.org/metalink?repo=centos-baseos-$stream&arch=x86_64&protocol=https,http (IP:152.19.134.198)
+
+Signed-off-by: Petr Lautrbach <lautrbach@redhat.com>
+---
+ python/sepolicy/sepolicy/generate.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/python/sepolicy/sepolicy/generate.py b/python/sepolicy/sepolicy/generate.py
+index f726ad51..a0314a70 100644
+--- a/python/sepolicy/sepolicy/generate.py
++++ b/python/sepolicy/sepolicy/generate.py
+@@ -1267,15 +1267,15 @@ allow %s_t %s_t:%s_socket name_%s;
+         import dnf
+ 
+         with dnf.Base() as base:
++            base.conf.substitutions.update_from_etc('/')
+             base.read_all_repos()
+             base.fill_sack(load_system_repo=True)
+ 
+             query = base.sack.query()
+ 
+-            pq = query.available()
+-            pq = pq.filter(file=self.program)
++            pq = query.filter(file=self.program)
+ 
+-            for pkg in pq:
++            for pkg in pq.run():
+                 self.rpms.append(pkg.name)
+                 for fname in pkg.files:
+                     for b in self.DEFAULT_DIRS:
+@@ -1288,7 +1288,7 @@ allow %s_t %s_t:%s_socket name_%s;
+                                 self.add_dir(fname)
+                 sq = query.available()
+                 sq = sq.filter(provides=pkg.source_name)
+-                for bpkg in sq:
++                for bpkg in sq.run():
+                     for fname in bpkg.files:
+                         for b in self.DEFAULT_DIRS:
+                             if b == "/etc":
+-- 
+2.49.0
+

0007-setfiles-Add-A-option-to-disable-SELINUX_RESTORECON_.patch

@@ -0,0 +1,91 @@
+From ae251cfb85090126d5c1de62b94775fae3b43527 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Wed, 10 Sep 2025 11:42:09 +0100
+Subject: [PATCH] setfiles: Add -A option to disable
+ SELINUX_RESTORECON_ADD_ASSOC
+
+SELINUX_RESTORECON_ADD_ASSOC tracks conflicts between inodes with
+multiple hard links or bind mounts that have differing contexts.
+However doing this involves building a large internal hashtable that
+stores the full path of every file examined by setfiles.  For
+filesystems that have very large numbers of files or long pathnames,
+this uses a lot of memory, which makes SELinux relabelling in
+constrained memory environments infeasible.
+
+This adds a new setfiles -A option that disables this tracking.
+
+For example, using setfiles to relabel a filesystem with 15 million
+files took 3.7GB of RAM.  Using this option, the same filesystem can
+be relabelled in 121MB (albeit with no warnings or errors possible for
+conflicting labels, but for our use case we don't care about that.)
+
+Fixes: https://issues.redhat.com/browse/RHEL-111505
+Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
+Acked-by: Stephen Smalley <stephen.smalley.work@gmail.com>
+---
+ policycoreutils/setfiles/setfiles.8 |  5 +++++
+ policycoreutils/setfiles/setfiles.c | 11 +++++++----
+ 2 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/policycoreutils/setfiles/setfiles.8 b/policycoreutils/setfiles/setfiles.8
+index 187f4513..458f3f9f 100644
+--- a/policycoreutils/setfiles/setfiles.8
++++ b/policycoreutils/setfiles/setfiles.8
+@@ -23,6 +23,7 @@ setfiles \- set SELinux file security contexts.
+ .RB [ \-I | \-D ]
+ .RB [ \-T
+ .IR nthreads ]
++.RB [ \-A ]
+ .I spec_file
+ .IR pathname \ ...
+ 
+@@ -187,6 +188,10 @@ use up to
+ threads.  Specify 0 to create as many threads as there are available
+ CPU cores; 1 to use only a single thread (default); or any positive
+ number to use the given number of threads (if possible).
++.TP
++.B \-A
++do not track inodes with multiple hard links or bind mounts that would
++match different contexts (saves memory)
+ 
+ .SH "ARGUMENTS"
+ .TP
+diff --git a/policycoreutils/setfiles/setfiles.c b/policycoreutils/setfiles/setfiles.c
+index ad09f840..31034316 100644
+--- a/policycoreutils/setfiles/setfiles.c
++++ b/policycoreutils/setfiles/setfiles.c
+@@ -40,9 +40,9 @@ static __attribute__((__noreturn__)) void usage(const char *const name)
+ 			name, name);
+ 	} else {
+ 		fprintf(stderr,
+-			"usage:  %s [-diIDlmnpqvCEFUWT] [-e excludedir] [-r alt_root_path] [-c policyfile] spec_file pathname...\n"
+-			"usage:  %s [-diIDlmnpqvCEFUWT] [-e excludedir] [-r alt_root_path] [-c policyfile] spec_file -f filename\n"
+-			"usage:  %s -s [-diIDlmnpqvFUWT] spec_file\n",
++			"usage:  %s [-diIDlmnpqvACEFUWT] [-e excludedir] [-r alt_root_path] [-c policyfile] spec_file pathname...\n"
++			"usage:  %s [-diIDlmnpqvACEFUWT] [-e excludedir] [-r alt_root_path] [-c policyfile] spec_file -f filename\n"
++			"usage:  %s -s [-diIDlmnpqvAFUWT] spec_file\n",
+ 			name, name, name);
+ 	}
+ 	exit(-1);
+@@ -147,7 +147,7 @@ int main(int argc, char **argv)
+ 	const char *base;
+ 	int errors = 0;
+ 	const char *ropts = "e:f:hiIDlmno:pqrsvFURW0xT:";
+-	const char *sopts = "c:de:f:hiIDlmno:pqr:svCEFUR:W0T:";
++	const char *sopts = "c:de:f:hiIDlmno:pqr:svACEFUR:W0T:";
+ 	const char *opts;
+ 	union selinux_callback cb;
+ 	long unsigned skipped_errors;
+@@ -375,6 +375,9 @@ int main(int argc, char **argv)
+ 			if (*optarg == '\0' || *endptr != '\0')
+ 				usage(argv[0]);
+ 			break;
++		case 'A':
++			r_opts.add_assoc = 0;
++			break;
+ 		case 'h':
+ 		case '?':
+ 			usage(argv[0]);
+-- 
+2.49.0
+

0008-semanage-Reset-active-value-when-deleting-boolean-cu.patch

@@ -0,0 +1,98 @@
+From c1bd6ee62f2cedfb3709710fc46f2899b301c139 Mon Sep 17 00:00:00 2001
+From: Vit Mojzis <vmojzis@redhat.com>
+Date: Mon, 1 Sep 2025 18:17:10 +0200
+Subject: [PATCH] semanage: Reset active value when deleting boolean
+ customizations
+
+Currently, removal of boolean local customizations leaves their current
+(active) value untouched.
+
+After the removal is complete, semanage_bool_query will return the
+default value. But it needs to be called in a separate transaction.
+This makes the fix a bit awkward, but I have not found a way to query
+the default value before the first transation is committed.
+
+Fixes:
+  # getsebool smbd_anon_write
+  smbd_anon_write --> off
+  # semanage boolean -m1 smbd_anon_write
+  # semanage boolean -D
+  # getsebool smbd_anon_write
+  smbd_anon_write --> on
+  # manage boolean -l isemanage boolean --list | grep smbd_anon_write
+  smbd_anon_write                (on   ,  off)  Allow smbd to anon write
+
+Signed-off-by: Vit Mojzis <vmojzis@redhat.com>
+---
+ python/semanage/seobject.py | 43 +++++++++++++++++++++++++++++++++++++
+ 1 file changed, 43 insertions(+)
+
+diff --git a/python/semanage/seobject.py b/python/semanage/seobject.py
+index 10963e81..6d6188fd 100644
+--- a/python/semanage/seobject.py
++++ b/python/semanage/seobject.py
+@@ -2886,7 +2886,15 @@ class booleanRecords(semanageRecords):
+         self.__delete(name)
+         self.commit()
+ 
++        # New transaction to reset the boolean to its default value.
++        # Calling __reset_value in the same transaction as the removal of
++        # local customizations does nothing
++        self.begin()
++        self.__reset_value(name)
++        self.commit()
++
+     def deleteall(self):
++        deleted = []
+         (rc, self.blist) = semanage_bool_list_local(self.sh)
+         if rc < 0:
+             raise ValueError(_("Could not list booleans"))
+@@ -2895,10 +2903,45 @@ class booleanRecords(semanageRecords):
+ 
+         for boolean in self.blist:
+             name = semanage_bool_get_name(boolean)
++            deleted.append(name)
+             self.__delete(name)
+ 
+         self.commit()
+ 
++        # New transaction to reset all affected booleans to their default values.
++        # Calling __reset_value in the same transaction as the removal of
++        # local customizations does nothing
++        self.begin()
++
++        for boolean in deleted:
++            self.__reset_value(boolean)
++
++        self.commit()
++
++    # Set active value to default
++    # Note: this needs to be called in a new transaction after removing local customizations
++    # in order for semanage_bool_query to fetch the default value
++    # (as opposed to the current one -- set by the local customizations)
++    def __reset_value(self, name):
++        name = selinux.selinux_boolean_sub(name)
++
++        (rc, k) = semanage_bool_key_create(self.sh, name)
++        if rc < 0:
++            raise ValueError(_("Could not create a key for %s") % name)
++
++        (rc, b) = semanage_bool_query(self.sh, k)
++        if rc < 0:
++            raise ValueError(_("Could not query boolean %s") % name)
++
++        semanage_bool_set_value(b, semanage_bool_get_value(b))
++
++        rc = semanage_bool_set_active(self.sh, k, b)
++        if rc < 0:
++            raise ValueError(_("Could not set active value of boolean %s") % name)
++
++        semanage_bool_key_free(k)
++        semanage_bool_free(b)
++
+     def get_all(self, locallist=0):
+         ddict = {}
+         if locallist:
+-- 
+2.49.0
+

0008-sepolicy-Drop-old-interface-file_type_is_executable-.patch

@@ -1,63 +0,0 @@
-From fae31a306e7b6084710c02b658ace668766fc004 Mon Sep 17 00:00:00 2001
-From: Petr Lautrbach <plautrba@redhat.com>
-Date: Mon, 27 Feb 2017 17:12:39 +0100
-Subject: [PATCH] sepolicy: Drop old interface file_type_is_executable(f) and
- file_type_is_entrypoint(f)
-
-- use direct queries
-- load exec_types and entry_types only once
----
- python/sepolicy/sepolicy/manpage.py | 22 ++++++++++++++++++++--
- 1 file changed, 20 insertions(+), 2 deletions(-)
-
-diff --git a/python/sepolicy/sepolicy/manpage.py b/python/sepolicy/sepolicy/manpage.py
-index 6420ebe2e08e..d15522135288 100755
---- a/python/sepolicy/sepolicy/manpage.py
-+++ b/python/sepolicy/sepolicy/manpage.py
-@@ -127,8 +127,24 @@ def gen_domains():
-     domains.sort()
-     return domains
- 
--types = None
- 
-+exec_types = None
-+
-+def _gen_exec_types():
-+    global exec_types
-+    if exec_types is None:
-+        exec_types = next(sepolicy.info(sepolicy.ATTRIBUTE, "exec_type"))["types"]
-+    return exec_types
-+
-+entry_types = None
-+
-+def _gen_entry_types():
-+    global entry_types
-+    if entry_types is None:
-+        entry_types = next(sepolicy.info(sepolicy.ATTRIBUTE, "entry_type"))["types"]
-+    return entry_types
-+
-+types = None
- 
- def _gen_types():
-     global types
-@@ -374,6 +390,8 @@ class ManPage:
-         self.all_file_types = sepolicy.get_all_file_types()
-         self.role_allows = sepolicy.get_all_role_allows()
-         self.types = _gen_types()
-+        self.exec_types = _gen_exec_types()
-+        self.entry_types = _gen_entry_types()
- 
-         if self.source_files:
-             self.fcpath = self.root + "file_contexts"
-@@ -691,7 +709,7 @@ Default Defined Ports:""")
-         for f in self.all_file_types:
-             if f.startswith(self.domainname):
-                 flist.append(f)
--                if not file_type_is_executable(f) or not file_type_is_entrypoint(f):
-+                if not f in self.exec_types or not f in self.entry_types:
-                     flist_non_exec.append(f)
-                 if f in self.fcdict:
-                     mpaths = mpaths + self.fcdict[f]["regex"]
--- 
-2.32.0
-

0009-sepolicy-Another-small-optimization-for-mcs-types.patch

@@ -1,53 +0,0 @@
-From afe686ec783ccf442c8e2bbcb9dbdb7650328253 Mon Sep 17 00:00:00 2001
-From: Petr Lautrbach <plautrba@redhat.com>
-Date: Tue, 28 Feb 2017 21:29:46 +0100
-Subject: [PATCH] sepolicy: Another small optimization for mcs types
-
----
- python/sepolicy/sepolicy/manpage.py | 16 +++++++++++-----
- 1 file changed, 11 insertions(+), 5 deletions(-)
-
-diff --git a/python/sepolicy/sepolicy/manpage.py b/python/sepolicy/sepolicy/manpage.py
-index d15522135288..ffcedb547993 100755
---- a/python/sepolicy/sepolicy/manpage.py
-+++ b/python/sepolicy/sepolicy/manpage.py
-@@ -144,6 +144,15 @@ def _gen_entry_types():
-         entry_types = next(sepolicy.info(sepolicy.ATTRIBUTE, "entry_type"))["types"]
-     return entry_types
- 
-+mcs_constrained_types = None
-+
-+def _gen_mcs_constrained_types():
-+    global mcs_constrained_types
-+    if mcs_constrained_types is None:
-+        mcs_constrained_types = next(sepolicy.info(sepolicy.ATTRIBUTE, "mcs_constrained_type"))
-+    return mcs_constrained_types
-+
-+
- types = None
- 
- def _gen_types():
-@@ -392,6 +401,7 @@ class ManPage:
-         self.types = _gen_types()
-         self.exec_types = _gen_exec_types()
-         self.entry_types = _gen_entry_types()
-+        self.mcs_constrained_types = _gen_mcs_constrained_types()
- 
-         if self.source_files:
-             self.fcpath = self.root + "file_contexts"
-@@ -946,11 +956,7 @@ All executables with the default executable label, usually stored in /usr/bin an
- %s""" % ", ".join(paths))
- 
-     def _mcs_types(self):
--        try:
--            mcs_constrained_type = next(sepolicy.info(sepolicy.ATTRIBUTE, "mcs_constrained_type"))
--        except StopIteration:
--            return
--        if self.type not in mcs_constrained_type['types']:
-+        if self.type not in self.mcs_constrained_types['types']:
-             return
-         self.fd.write ("""
- .SH "MCS Constrained"
--- 
-2.32.0
-

0010-Move-po-translation-files-into-the-right-sub-directo.patch

@@ -1,515 +0,0 @@
-From 28879b771a804242d00a8a978bdbc4b85210814d Mon Sep 17 00:00:00 2001
-From: Petr Lautrbach <plautrba@redhat.com>
-Date: Mon, 6 Aug 2018 13:23:00 +0200
-Subject: [PATCH] Move po/ translation files into the right sub-directories
-
-When policycoreutils was split into policycoreutils/ python/ gui/ and sandbox/
-sub-directories, po/ translation files stayed in policycoreutils/.
-
-This commit split original policycoreutils/po directory into
-policycoreutils/po
-python/po
-gui/po
-sandbox/po
-
-See https://github.com/fedora-selinux/selinux/issues/43
----
- gui/Makefile                |  3 ++
- gui/po/Makefile             | 82 ++++++++++++++++++++++++++++++++++++
- gui/po/POTFILES             | 17 ++++++++
- policycoreutils/po/Makefile | 70 ++-----------------------------
- policycoreutils/po/POTFILES |  9 ++++
- python/Makefile             |  2 +-
- python/po/Makefile          | 83 +++++++++++++++++++++++++++++++++++++
- python/po/POTFILES          | 10 +++++
- sandbox/Makefile            |  2 +
- sandbox/po/Makefile         | 82 ++++++++++++++++++++++++++++++++++++
- sandbox/po/POTFILES         |  1 +
- 11 files changed, 293 insertions(+), 68 deletions(-)
- create mode 100644 gui/po/Makefile
- create mode 100644 gui/po/POTFILES
- create mode 100644 policycoreutils/po/POTFILES
- create mode 100644 python/po/Makefile
- create mode 100644 python/po/POTFILES
- create mode 100644 sandbox/po/Makefile
- create mode 100644 sandbox/po/POTFILES
-
-diff --git a/gui/Makefile b/gui/Makefile
-index ca965c942912..5a5bf6dcae19 100644
---- a/gui/Makefile
-+++ b/gui/Makefile
-@@ -22,6 +22,7 @@ system-config-selinux.ui \
- usersPage.py
- 
- all: $(TARGETS) system-config-selinux.py polgengui.py
-+	(cd po && $(MAKE) $@)
- 
- install: all
- 	-mkdir -p $(DESTDIR)$(MANDIR)/man8
-@@ -54,6 +55,8 @@ install: all
- 		install -m 644 sepolicy_$${i}.png $(DESTDIR)$(DATADIR)/icons/hicolor/$${i}x$${i}/apps/sepolicy.png; \
- 	done
- 	install -m 644 org.selinux.config.policy $(DESTDIR)$(DATADIR)/polkit-1/actions/
-+	(cd po && $(MAKE) $@)
-+
- clean:
- 
- indent:
-diff --git a/gui/po/Makefile b/gui/po/Makefile
-new file mode 100644
-index 000000000000..a0f5439f2d1c
---- /dev/null
-+++ b/gui/po/Makefile
-@@ -0,0 +1,82 @@
-+#
-+# Makefile for the PO files (translation) catalog
-+#
-+
-+PREFIX ?= /usr
-+
-+# What is this package?
-+NLSPACKAGE	= gui
-+POTFILE		= $(NLSPACKAGE).pot
-+INSTALL		= /usr/bin/install -c -p
-+INSTALL_DATA	= $(INSTALL) -m 644
-+INSTALL_DIR	= /usr/bin/install -d
-+
-+# destination directory
-+INSTALL_NLS_DIR = $(PREFIX)/share/locale
-+
-+# PO catalog handling
-+MSGMERGE	= msgmerge
-+MSGMERGE_FLAGS	= -q
-+XGETTEXT	= xgettext --default-domain=$(NLSPACKAGE)
-+MSGFMT		= msgfmt
-+
-+# All possible linguas
-+PO_LINGUAS := $(sort $(patsubst %.po,%,$(wildcard *.po)))
-+
-+# Only the files matching what the user has set in LINGUAS
-+USER_LINGUAS := $(filter $(patsubst %,%%,$(LINGUAS)),$(PO_LINGUAS))
-+
-+# if no valid LINGUAS, build all languages
-+USE_LINGUAS := $(if $(USER_LINGUAS),$(USER_LINGUAS),$(PO_LINGUAS))
-+
-+POFILES		= $(patsubst %,%.po,$(USE_LINGUAS))
-+MOFILES		= $(patsubst %.po,%.mo,$(POFILES))
-+POTFILES  = $(shell cat POTFILES)
-+
-+#default:: clean
-+
-+all::  $(MOFILES)
-+
-+$(POTFILE): $(POTFILES)
-+	$(XGETTEXT) --keyword=_ --keyword=N_ $(POTFILES)
-+	@if cmp -s $(NLSPACKAGE).po $(POTFILE); then \
-+	    rm -f $(NLSPACKAGE).po; \
-+	else \
-+	    mv -f $(NLSPACKAGE).po $(POTFILE); \
-+	fi; \
-+
-+
-+refresh-po: Makefile
-+	for cat in $(POFILES); do \
-+		lang=`basename $$cat .po`; \
-+		if $(MSGMERGE) $(MSGMERGE_FLAGS) $$lang.po $(POTFILE) > $$lang.pot ; then \
-+			mv -f $$lang.pot $$lang.po ; \
-+			echo "$(MSGMERGE) of $$lang succeeded" ; \
-+		else \
-+			echo "$(MSGMERGE) of $$lang failed" ; \
-+			rm -f $$lang.pot ; \
-+		fi \
-+	done
-+
-+clean:
-+	@rm -fv *mo *~ .depend
-+	@rm -rf tmp
-+
-+install: $(MOFILES)
-+	@for n in $(MOFILES); do \
-+	    l=`basename $$n .mo`; \
-+	    $(INSTALL_DIR) $(DESTDIR)$(INSTALL_NLS_DIR)/$$l/LC_MESSAGES; \
-+	    $(INSTALL_DATA) --verbose $$n $(DESTDIR)$(INSTALL_NLS_DIR)/$$l/LC_MESSAGES/selinux-$(NLSPACKAGE).mo; \
-+	done
-+
-+%.mo: %.po
-+	$(MSGFMT) -o $@ $<
-+report:
-+	@for cat in $(wildcard *.po); do \
-+                echo -n "$$cat: "; \
-+                msgfmt -v --statistics -o /dev/null $$cat; \
-+        done
-+
-+.PHONY: missing depend
-+
-+relabel:
-diff --git a/gui/po/POTFILES b/gui/po/POTFILES
-new file mode 100644
-index 000000000000..1795c5c1951b
---- /dev/null
-+++ b/gui/po/POTFILES
-@@ -0,0 +1,17 @@
-+../booleansPage.py
-+../domainsPage.py
-+../fcontextPage.py
-+../loginsPage.py
-+../modulesPage.py
-+../org.selinux.config.policy
-+../polgengui.py
-+../polgen.ui
-+../portsPage.py
-+../selinux-polgengui.desktop
-+../semanagePage.py
-+../sepolicy.desktop
-+../statusPage.py
-+../system-config-selinux.desktop
-+../system-config-selinux.py
-+../system-config-selinux.ui
-+../usersPage.py
-diff --git a/policycoreutils/po/Makefile b/policycoreutils/po/Makefile
-index 575e143122e6..18bc1dff8d1f 100644
---- a/policycoreutils/po/Makefile
-+++ b/policycoreutils/po/Makefile
-@@ -3,7 +3,6 @@
- #
- 
- PREFIX ?= /usr
--TOP	 = ../..
- 
- # What is this package?
- NLSPACKAGE	= policycoreutils
-@@ -32,74 +31,13 @@ USE_LINGUAS := $(if $(USER_LINGUAS),$(USER_LINGUAS),$(PO_LINGUAS))
- 
- POFILES		= $(patsubst %,%.po,$(USE_LINGUAS))
- MOFILES		= $(patsubst %.po,%.mo,$(POFILES))
--POTFILES = \
--	../run_init/open_init_pty.c \
--	../run_init/run_init.c \
--	../semodule_link/semodule_link.c \
--	../audit2allow/audit2allow \
--	../semanage/seobject.py \
--	../setsebool/setsebool.c \
--	../newrole/newrole.c \
--	../load_policy/load_policy.c \
--	../sestatus/sestatus.c \
--	../semodule/semodule.c \
--	../setfiles/setfiles.c \
--	../semodule_package/semodule_package.c \
--	../semodule_deps/semodule_deps.c \
--	../semodule_expand/semodule_expand.c \
--	../scripts/chcat \
--	../scripts/fixfiles \
--	../restorecond/stringslist.c \
--	../restorecond/restorecond.h \
--	../restorecond/utmpwatcher.h \
--	../restorecond/stringslist.h \
--	../restorecond/restorecond.c \
--	../restorecond/utmpwatcher.c \
--	../gui/booleansPage.py \
--	../gui/fcontextPage.py \
--	../gui/loginsPage.py \
--	../gui/mappingsPage.py \
--	../gui/modulesPage.py \
--	../gui/polgen.glade \
--	../gui/polgengui.py \
--	../gui/portsPage.py \
--	../gui/semanagePage.py \
--	../gui/statusPage.py \
--	../gui/system-config-selinux.glade \
--	../gui/system-config-selinux.py \
--	../gui/usersPage.py \
--	../secon/secon.c \
--	booleans.py \
--	../sepolicy/sepolicy.py \
--	../sepolicy/sepolicy/communicate.py \
--	../sepolicy/sepolicy/__init__.py \
--	../sepolicy/sepolicy/network.py \
--	../sepolicy/sepolicy/generate.py \
--	../sepolicy/sepolicy/sepolicy.glade \
--	../sepolicy/sepolicy/gui.py \
--	../sepolicy/sepolicy/manpage.py \
--	../sepolicy/sepolicy/transition.py \
--	../sepolicy/sepolicy/templates/executable.py \
--	../sepolicy/sepolicy/templates/__init__.py \
--	../sepolicy/sepolicy/templates/network.py \
--	../sepolicy/sepolicy/templates/rw.py \
--	../sepolicy/sepolicy/templates/script.py \
--	../sepolicy/sepolicy/templates/semodule.py \
--	../sepolicy/sepolicy/templates/tmp.py \
--	../sepolicy/sepolicy/templates/user.py \
--	../sepolicy/sepolicy/templates/var_lib.py \
--	../sepolicy/sepolicy/templates/var_log.py \
--	../sepolicy/sepolicy/templates/var_run.py \
--	../sepolicy/sepolicy/templates/var_spool.py
-+POTFILES  = $(shell cat POTFILES)
- 
- #default:: clean
- 
--all::  $(MOFILES)
-+all:: $(POTFILE) $(MOFILES)
- 
--booleans.py:
--	sepolicy booleans -a > booleans.py
--
--$(POTFILE): $(POTFILES) booleans.py
-+$(POTFILE): $(POTFILES)
- 	$(XGETTEXT) --keyword=_ --keyword=N_ $(POTFILES)
- 	@if cmp -s $(NLSPACKAGE).po $(POTFILE); then \
- 	    rm -f $(NLSPACKAGE).po; \
-@@ -107,8 +45,6 @@ $(POTFILE): $(POTFILES) booleans.py
- 	    mv -f $(NLSPACKAGE).po $(POTFILE); \
- 	fi; \
- 
--update-po: Makefile $(POTFILE) refresh-po
--	@rm -f booleans.py
- 
- refresh-po: Makefile
- 	for cat in $(POFILES); do \
-diff --git a/policycoreutils/po/POTFILES b/policycoreutils/po/POTFILES
-new file mode 100644
-index 000000000000..12237dc61ee4
---- /dev/null
-+++ b/policycoreutils/po/POTFILES
-@@ -0,0 +1,9 @@
-+../run_init/open_init_pty.c
-+../run_init/run_init.c
-+../setsebool/setsebool.c
-+../newrole/newrole.c
-+../load_policy/load_policy.c
-+../sestatus/sestatus.c
-+../semodule/semodule.c
-+../setfiles/setfiles.c
-+../secon/secon.c
-diff --git a/python/Makefile b/python/Makefile
-index 9b66d52fbd4d..00312dbdb5c6 100644
---- a/python/Makefile
-+++ b/python/Makefile
-@@ -1,4 +1,4 @@
--SUBDIRS = sepolicy audit2allow semanage sepolgen chcat
-+SUBDIRS = sepolicy audit2allow semanage sepolgen chcat po
- 
- all install relabel clean indent test:
- 	@for subdir in $(SUBDIRS); do \
-diff --git a/python/po/Makefile b/python/po/Makefile
-new file mode 100644
-index 000000000000..4e052d5a2bd7
---- /dev/null
-+++ b/python/po/Makefile
-@@ -0,0 +1,83 @@
-+#
-+# Makefile for the PO files (translation) catalog
-+#
-+
-+PREFIX ?= /usr
-+
-+# What is this package?
-+NLSPACKAGE	= python
-+POTFILE		= $(NLSPACKAGE).pot
-+INSTALL		= /usr/bin/install -c -p
-+INSTALL_DATA	= $(INSTALL) -m 644
-+INSTALL_DIR	= /usr/bin/install -d
-+
-+# destination directory
-+INSTALL_NLS_DIR = $(PREFIX)/share/locale
-+
-+# PO catalog handling
-+MSGMERGE	= msgmerge
-+MSGMERGE_FLAGS	= -q
-+XGETTEXT	= xgettext --default-domain=$(NLSPACKAGE)
-+MSGFMT		= msgfmt
-+
-+# All possible linguas
-+PO_LINGUAS := $(sort $(patsubst %.po,%,$(wildcard *.po)))
-+
-+# Only the files matching what the user has set in LINGUAS
-+USER_LINGUAS := $(filter $(patsubst %,%%,$(LINGUAS)),$(PO_LINGUAS))
-+
-+# if no valid LINGUAS, build all languages
-+USE_LINGUAS := $(if $(USER_LINGUAS),$(USER_LINGUAS),$(PO_LINGUAS))
-+
-+POFILES		= $(patsubst %,%.po,$(USE_LINGUAS))
-+MOFILES		= $(patsubst %.po,%.mo,$(POFILES))
-+POTFILES  = $(shell cat POTFILES)
-+
-+#default:: clean
-+
-+all::  $(MOFILES)
-+
-+$(POTFILE): $(POTFILES) 
-+	$(XGETTEXT) -L Python --keyword=_ --keyword=N_ $(POTFILES)
-+	$(XGETTEXT) -j --keyword=_ --keyword=N_ ../sepolicy/sepolicy/sepolicy.glade
-+	@if cmp -s $(NLSPACKAGE).po $(POTFILE); then \
-+	    rm -f $(NLSPACKAGE).po; \
-+	else \
-+	    mv -f $(NLSPACKAGE).po $(POTFILE); \
-+	fi; \
-+
-+
-+refresh-po: Makefile
-+	for cat in $(POFILES); do \
-+		lang=`basename $$cat .po`; \
-+		if $(MSGMERGE) $(MSGMERGE_FLAGS) $$lang.po $(POTFILE) > $$lang.pot ; then \
-+			mv -f $$lang.pot $$lang.po ; \
-+			echo "$(MSGMERGE) of $$lang succeeded" ; \
-+		else \
-+			echo "$(MSGMERGE) of $$lang failed" ; \
-+			rm -f $$lang.pot ; \
-+		fi \
-+	done
-+
-+clean:
-+	@rm -fv *mo *~ .depend
-+	@rm -rf tmp
-+
-+install: $(MOFILES)
-+	@for n in $(MOFILES); do \
-+	    l=`basename $$n .mo`; \
-+	    $(INSTALL_DIR) $(DESTDIR)$(INSTALL_NLS_DIR)/$$l/LC_MESSAGES; \
-+	    $(INSTALL_DATA) --verbose $$n $(DESTDIR)$(INSTALL_NLS_DIR)/$$l/LC_MESSAGES/selinux-$(NLSPACKAGE).mo; \
-+	done
-+
-+%.mo: %.po
-+	$(MSGFMT) -o $@ $<
-+report:
-+	@for cat in $(wildcard *.po); do \
-+                echo -n "$$cat: "; \
-+                msgfmt -v --statistics -o /dev/null $$cat; \
-+        done
-+
-+.PHONY: missing depend
-+
-+relabel:
-diff --git a/python/po/POTFILES b/python/po/POTFILES
-new file mode 100644
-index 000000000000..128eb870a69e
---- /dev/null
-+++ b/python/po/POTFILES
-@@ -0,0 +1,10 @@
-+../audit2allow/audit2allow
-+../chcat/chcat
-+../semanage/semanage
-+../semanage/seobject.py
-+../sepolgen/src/sepolgen/interfaces.py
-+../sepolicy/sepolicy/generate.py
-+../sepolicy/sepolicy/gui.py
-+../sepolicy/sepolicy/__init__.py
-+../sepolicy/sepolicy/interface.py
-+../sepolicy/sepolicy.py
-diff --git a/sandbox/Makefile b/sandbox/Makefile
-index 9da5e58db9e6..b817824e2102 100644
---- a/sandbox/Makefile
-+++ b/sandbox/Makefile
-@@ -13,6 +13,7 @@ override LDLIBS += -lselinux -lcap-ng
- SEUNSHARE_OBJS = seunshare.o
- 
- all: sandbox seunshare sandboxX.sh start
-+	(cd po && $(MAKE) $@)
- 
- seunshare: $(SEUNSHARE_OBJS)
- 
-@@ -39,6 +40,7 @@ install: all
- 	install -m 755 start $(DESTDIR)$(SHAREDIR)
- 	-mkdir -p $(DESTDIR)$(SYSCONFDIR)
- 	install -m 644 sandbox.conf $(DESTDIR)$(SYSCONFDIR)/sandbox
-+	(cd po && $(MAKE) $@)
- 
- test:
- 	@$(PYTHON) test_sandbox.py -v
-diff --git a/sandbox/po/Makefile b/sandbox/po/Makefile
-new file mode 100644
-index 000000000000..0556bbe953f0
---- /dev/null
-+++ b/sandbox/po/Makefile
-@@ -0,0 +1,82 @@
-+#
-+# Makefile for the PO files (translation) catalog
-+#
-+
-+PREFIX ?= /usr
-+
-+# What is this package?
-+NLSPACKAGE	= sandbox
-+POTFILE		= $(NLSPACKAGE).pot
-+INSTALL		= /usr/bin/install -c -p
-+INSTALL_DATA	= $(INSTALL) -m 644
-+INSTALL_DIR	= /usr/bin/install -d
-+
-+# destination directory
-+INSTALL_NLS_DIR = $(PREFIX)/share/locale
-+
-+# PO catalog handling
-+MSGMERGE	= msgmerge
-+MSGMERGE_FLAGS	= -q
-+XGETTEXT	= xgettext -L Python --default-domain=$(NLSPACKAGE)
-+MSGFMT		= msgfmt
-+
-+# All possible linguas
-+PO_LINGUAS := $(sort $(patsubst %.po,%,$(wildcard *.po)))
-+
-+# Only the files matching what the user has set in LINGUAS
-+USER_LINGUAS := $(filter $(patsubst %,%%,$(LINGUAS)),$(PO_LINGUAS))
-+
-+# if no valid LINGUAS, build all languages
-+USE_LINGUAS := $(if $(USER_LINGUAS),$(USER_LINGUAS),$(PO_LINGUAS))
-+
-+POFILES		= $(patsubst %,%.po,$(USE_LINGUAS))
-+MOFILES		= $(patsubst %.po,%.mo,$(POFILES))
-+POTFILES  = $(shell cat POTFILES)
-+
-+#default:: clean
-+
-+all:: $(POTFILE) $(MOFILES)
-+
-+$(POTFILE): $(POTFILES)
-+	$(XGETTEXT) --keyword=_ --keyword=N_ $(POTFILES)
-+	@if cmp -s $(NLSPACKAGE).po $(POTFILE); then \
-+	    rm -f $(NLSPACKAGE).po; \
-+	else \
-+	    mv -f $(NLSPACKAGE).po $(POTFILE); \
-+	fi; \
-+
-+
-+refresh-po: Makefile
-+	for cat in $(POFILES); do \
-+		lang=`basename $$cat .po`; \
-+		if $(MSGMERGE) $(MSGMERGE_FLAGS) $$lang.po $(POTFILE) > $$lang.pot ; then \
-+			mv -f $$lang.pot $$lang.po ; \
-+			echo "$(MSGMERGE) of $$lang succeeded" ; \
-+		else \
-+			echo "$(MSGMERGE) of $$lang failed" ; \
-+			rm -f $$lang.pot ; \
-+		fi \
-+	done
-+
-+clean:
-+	@rm -fv *mo *~ .depend
-+	@rm -rf tmp
-+
-+install: $(MOFILES)
-+	@for n in $(MOFILES); do \
-+	    l=`basename $$n .mo`; \
-+	    $(INSTALL_DIR) $(DESTDIR)$(INSTALL_NLS_DIR)/$$l/LC_MESSAGES; \
-+	    $(INSTALL_DATA) --verbose $$n $(DESTDIR)$(INSTALL_NLS_DIR)/$$l/LC_MESSAGES/selinux-$(NLSPACKAGE).mo; \
-+	done
-+
-+%.mo: %.po
-+	$(MSGFMT) -o $@ $<
-+report:
-+	@for cat in $(wildcard *.po); do \
-+                echo -n "$$cat: "; \
-+                msgfmt -v --statistics -o /dev/null $$cat; \
-+        done
-+
-+.PHONY: missing depend
-+
-+relabel:
-diff --git a/sandbox/po/POTFILES b/sandbox/po/POTFILES
-new file mode 100644
-index 000000000000..deff3f2f4656
---- /dev/null
-+++ b/sandbox/po/POTFILES
-@@ -0,0 +1 @@
-+../sandbox
--- 
-2.32.0
-

0011-Use-correct-gettext-domains-in-python-gui-sandbox.patch

@@ -1,306 +0,0 @@
-From a8cacf2944ddd803909d2111bdf2d43ab90e1111 Mon Sep 17 00:00:00 2001
-From: Petr Lautrbach <plautrba@redhat.com>
-Date: Mon, 6 Aug 2018 13:37:07 +0200
-Subject: [PATCH] Use correct gettext domains in python/ gui/ sandbox/
-
-https://github.com/fedora-selinux/selinux/issues/43
----
- gui/booleansPage.py                          | 2 +-
- gui/domainsPage.py                           | 2 +-
- gui/fcontextPage.py                          | 2 +-
- gui/loginsPage.py                            | 2 +-
- gui/modulesPage.py                           | 2 +-
- gui/polgengui.py                             | 2 +-
- gui/portsPage.py                             | 2 +-
- gui/semanagePage.py                          | 2 +-
- gui/statusPage.py                            | 2 +-
- gui/system-config-selinux.py                 | 2 +-
- gui/usersPage.py                             | 2 +-
- python/chcat/chcat                           | 2 +-
- python/semanage/semanage                     | 2 +-
- python/semanage/seobject.py                  | 2 +-
- python/sepolgen/src/sepolgen/sepolgeni18n.py | 2 +-
- python/sepolicy/sepolicy.py                  | 2 +-
- python/sepolicy/sepolicy/__init__.py         | 2 +-
- python/sepolicy/sepolicy/generate.py         | 2 +-
- python/sepolicy/sepolicy/gui.py              | 2 +-
- python/sepolicy/sepolicy/interface.py        | 2 +-
- sandbox/sandbox                              | 2 +-
- 21 files changed, 21 insertions(+), 21 deletions(-)
-
-diff --git a/gui/booleansPage.py b/gui/booleansPage.py
-index 7849bea26a06..dd12b6d6ab86 100644
---- a/gui/booleansPage.py
-+++ b/gui/booleansPage.py
-@@ -38,7 +38,7 @@ DISABLED = 2
- ##
- ## I18N
- ##
--PROGNAME = "policycoreutils"
-+PROGNAME = "selinux-gui"
- try:
-     import gettext
-     kwargs = {}
-diff --git a/gui/domainsPage.py b/gui/domainsPage.py
-index bad5140d8c59..6bbe4de5884f 100644
---- a/gui/domainsPage.py
-+++ b/gui/domainsPage.py
-@@ -30,7 +30,7 @@ from semanagePage import *
- ##
- ## I18N
- ##
--PROGNAME = "policycoreutils"
-+PROGNAME = "selinux-gui"
- try:
-     import gettext
-     kwargs = {}
-diff --git a/gui/fcontextPage.py b/gui/fcontextPage.py
-index d26aa1b405a9..52292cae01d2 100644
---- a/gui/fcontextPage.py
-+++ b/gui/fcontextPage.py
-@@ -47,7 +47,7 @@ class context:
- ##
- ## I18N
- ##
--PROGNAME = "policycoreutils"
-+PROGNAME = "selinux-gui"
- try:
-     import gettext
-     kwargs = {}
-diff --git a/gui/loginsPage.py b/gui/loginsPage.py
-index b67eb8bc42af..cbfb0cc23f65 100644
---- a/gui/loginsPage.py
-+++ b/gui/loginsPage.py
-@@ -29,7 +29,7 @@ from semanagePage import *
- ##
- ## I18N
- ##
--PROGNAME = "policycoreutils"
-+PROGNAME = "selinux-gui"
- try:
-     import gettext
-     kwargs = {}
-diff --git a/gui/modulesPage.py b/gui/modulesPage.py
-index 0584acf9b3a4..35a0129bab9c 100644
---- a/gui/modulesPage.py
-+++ b/gui/modulesPage.py
-@@ -30,7 +30,7 @@ from semanagePage import *
- ##
- ## I18N
- ##
--PROGNAME = "policycoreutils"
-+PROGNAME = "selinux-gui"
- try:
-     import gettext
-     kwargs = {}
-diff --git a/gui/polgengui.py b/gui/polgengui.py
-index d284ded65279..01f541bafae8 100644
---- a/gui/polgengui.py
-+++ b/gui/polgengui.py
-@@ -63,7 +63,7 @@ def get_all_modules():
- ##
- ## I18N
- ##
--PROGNAME = "policycoreutils"
-+PROGNAME = "selinux-gui"
- try:
-     import gettext
-     kwargs = {}
-diff --git a/gui/portsPage.py b/gui/portsPage.py
-index 30f58383bc1d..a537ecc8c0a1 100644
---- a/gui/portsPage.py
-+++ b/gui/portsPage.py
-@@ -35,7 +35,7 @@ from semanagePage import *
- ##
- ## I18N
- ##
--PROGNAME = "policycoreutils"
-+PROGNAME = "selinux-gui"
- try:
-     import gettext
-     kwargs = {}
-diff --git a/gui/semanagePage.py b/gui/semanagePage.py
-index 4127804fbbee..5361d69c1313 100644
---- a/gui/semanagePage.py
-+++ b/gui/semanagePage.py
-@@ -22,7 +22,7 @@ from gi.repository import Gdk, Gtk
- ##
- ## I18N
- ##
--PROGNAME = "policycoreutils"
-+PROGNAME = "selinux-gui"
- try:
-     import gettext
-     kwargs = {}
-diff --git a/gui/statusPage.py b/gui/statusPage.py
-index 766854b19cba..a8f079b9b163 100644
---- a/gui/statusPage.py
-+++ b/gui/statusPage.py
-@@ -35,7 +35,7 @@ RELABELFILE = "/.autorelabel"
- ##
- ## I18N
- ##
--PROGNAME = "policycoreutils"
-+PROGNAME = "selinux-gui"
- try:
-     import gettext
-     kwargs = {}
-diff --git a/gui/system-config-selinux.py b/gui/system-config-selinux.py
-index 3f70122b87e8..8c46c987b974 100644
---- a/gui/system-config-selinux.py
-+++ b/gui/system-config-selinux.py
-@@ -45,7 +45,7 @@ import selinux
- ##
- ## I18N
- ##
--PROGNAME = "policycoreutils"
-+PROGNAME = "selinux-gui"
- try:
-     import gettext
-     kwargs = {}
-diff --git a/gui/usersPage.py b/gui/usersPage.py
-index 26794ed5c3f3..d15d4c5a71dd 100644
---- a/gui/usersPage.py
-+++ b/gui/usersPage.py
-@@ -29,7 +29,7 @@ from semanagePage import *
- ##
- ## I18N
- ##
--PROGNAME = "policycoreutils"
-+PROGNAME = "selinux-gui"
- try:
-     import gettext
-     kwargs = {}
-diff --git a/python/chcat/chcat b/python/chcat/chcat
-index fdd2e46ee3f9..839ddd3b54b6 100755
---- a/python/chcat/chcat
-+++ b/python/chcat/chcat
-@@ -30,7 +30,7 @@ import getopt
- import selinux
- import seobject
- 
--PROGNAME = "policycoreutils"
-+PROGNAME = "selinux-python"
- try:
-     import gettext
-     kwargs = {}
-diff --git a/python/semanage/semanage b/python/semanage/semanage
-index 18a2710531ca..0980aecb6311 100644
---- a/python/semanage/semanage
-+++ b/python/semanage/semanage
-@@ -30,7 +30,7 @@ import seobject
- import sys
- import traceback
- 
--PROGNAME = "policycoreutils"
-+PROGNAME = "selinux-python"
- try:
-     import gettext
-     kwargs = {}
-diff --git a/python/semanage/seobject.py b/python/semanage/seobject.py
-index 21adbf6eb74f..69e60db80060 100644
---- a/python/semanage/seobject.py
-+++ b/python/semanage/seobject.py
-@@ -29,7 +29,7 @@ import sys
- import stat
- import socket
- from semanage import *
--PROGNAME = "policycoreutils"
-+PROGNAME = "selinux-python"
- import sepolicy
- from setools.policyrep import SELinuxPolicy
- from setools.typequery import TypeQuery
-diff --git a/python/sepolgen/src/sepolgen/sepolgeni18n.py b/python/sepolgen/src/sepolgen/sepolgeni18n.py
-index 998c4356415c..56ebd807c69c 100644
---- a/python/sepolgen/src/sepolgen/sepolgeni18n.py
-+++ b/python/sepolgen/src/sepolgen/sepolgeni18n.py
-@@ -19,7 +19,7 @@
- 
- try: 
-     import gettext
--    t = gettext.translation( 'yumex' )
-+    t = gettext.translation( 'selinux-python' )
-     _ = t.gettext
- except:
-     def _(str):
-diff --git a/python/sepolicy/sepolicy.py b/python/sepolicy/sepolicy.py
-index 7b2230651099..32956e58f52e 100755
---- a/python/sepolicy/sepolicy.py
-+++ b/python/sepolicy/sepolicy.py
-@@ -28,7 +28,7 @@ import sepolicy
- from multiprocessing import Pool
- from sepolicy import get_os_version, get_conditionals, get_conditionals_format_text
- import argparse
--PROGNAME = "policycoreutils"
-+PROGNAME = "selinux-python"
- try:
-     import gettext
-     kwargs = {}
-diff --git a/python/sepolicy/sepolicy/__init__.py b/python/sepolicy/sepolicy/__init__.py
-index 8055a12f6020..aa8beda313c8 100644
---- a/python/sepolicy/sepolicy/__init__.py
-+++ b/python/sepolicy/sepolicy/__init__.py
-@@ -23,7 +23,7 @@ from setools.typeattrquery import TypeAttributeQuery
- from setools.typequery import TypeQuery
- from setools.userquery import UserQuery
- 
--PROGNAME = "policycoreutils"
-+PROGNAME = "selinux-python"
- try:
-     import gettext
-     kwargs = {}
-diff --git a/python/sepolicy/sepolicy/generate.py b/python/sepolicy/sepolicy/generate.py
-index 4e1ed4e9dc31..43180ca6fda4 100644
---- a/python/sepolicy/sepolicy/generate.py
-+++ b/python/sepolicy/sepolicy/generate.py
-@@ -48,7 +48,7 @@ import sepolgen.defaults as defaults
- ##
- ## I18N
- ##
--PROGNAME = "policycoreutils"
-+PROGNAME = "selinux-python"
- try:
-     import gettext
-     kwargs = {}
-diff --git a/python/sepolicy/sepolicy/gui.py b/python/sepolicy/sepolicy/gui.py
-index 1e86422b864a..c9ca158ddd09 100644
---- a/python/sepolicy/sepolicy/gui.py
-+++ b/python/sepolicy/sepolicy/gui.py
-@@ -41,7 +41,7 @@ import os
- import re
- import unicodedata
- 
--PROGNAME = "policycoreutils"
-+PROGNAME = "selinux-python"
- try:
-     import gettext
-     kwargs = {}
-diff --git a/python/sepolicy/sepolicy/interface.py b/python/sepolicy/sepolicy/interface.py
-index bdffb770f364..9d40aea1498d 100644
---- a/python/sepolicy/sepolicy/interface.py
-+++ b/python/sepolicy/sepolicy/interface.py
-@@ -30,7 +30,7 @@ __all__ = ['get_all_interfaces', 'get_interfaces_from_xml', 'get_admin', 'get_us
- ##
- ## I18N
- ##
--PROGNAME = "policycoreutils"
-+PROGNAME = "selinux-python"
- try:
-     import gettext
-     kwargs = {}
-diff --git a/sandbox/sandbox b/sandbox/sandbox
-index ca5f1e030a51..16c43b51eaaa 100644
---- a/sandbox/sandbox
-+++ b/sandbox/sandbox
-@@ -37,7 +37,7 @@ import sepolicy
- 
- SEUNSHARE = "/usr/sbin/seunshare"
- SANDBOXSH = "/usr/share/sandbox/sandboxX.sh"
--PROGNAME = "policycoreutils"
-+PROGNAME = "selinux-sandbox"
- try:
-     import gettext
-     kwargs = {}
--- 
-2.32.0
-

0013-policycoreutils-setfiles-Improve-description-of-d-sw.patch

@@ -1,30 +0,0 @@
-From f5045f645cfa10fed01b4225d26d98ea9f81f085 Mon Sep 17 00:00:00 2001
-From: Vit Mojzis <vmojzis@redhat.com>
-Date: Wed, 21 Mar 2018 08:51:31 +0100
-Subject: [PATCH] policycoreutils/setfiles: Improve description of -d switch
-
-The "-q" switch is becoming obsolete (completely unused in fedora) and
-debug output ("-d" switch) makes sense in any scenario. Therefore both
-options can be specified at once.
-
-Resolves: rhbz#1271327
----
- policycoreutils/setfiles/setfiles.8 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/policycoreutils/setfiles/setfiles.8 b/policycoreutils/setfiles/setfiles.8
-index 4d28bc9a95c1..8e6c4ab94841 100644
---- a/policycoreutils/setfiles/setfiles.8
-+++ b/policycoreutils/setfiles/setfiles.8
-@@ -57,7 +57,7 @@ option will force a replacement of the entire context.
- check the validity of the contexts against the specified binary policy.
- .TP
- .B \-d
--show what specification matched each file.
-+show what specification matched each file. Not affected by "\-q".
- .TP
- .BI \-e \ directory
- directory to exclude (repeat option for more than one directory).
--- 
-2.32.0
-

0015-semodule-utils-Fix-RESOURCE_LEAK-coverity-scan-defec.patch

@@ -1,24 +0,0 @@
-From f1acc9a3057e199d62c6b8ec6e77fc33ca3db1d1 Mon Sep 17 00:00:00 2001
-From: Petr Lautrbach <plautrba@redhat.com>
-Date: Thu, 8 Nov 2018 09:20:58 +0100
-Subject: [PATCH] semodule-utils: Fix RESOURCE_LEAK coverity scan defects
-
----
- semodule-utils/semodule_package/semodule_package.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/semodule-utils/semodule_package/semodule_package.c b/semodule-utils/semodule_package/semodule_package.c
-index 3515234e36de..7b75b3fd9bb4 100644
---- a/semodule-utils/semodule_package/semodule_package.c
-+++ b/semodule-utils/semodule_package/semodule_package.c
-@@ -74,6 +74,7 @@ static int file_to_data(const char *path, char **data, size_t * len)
- 	}
- 	if (!sb.st_size) {
- 		*len = 0;
-+		close(fd);
- 		return 0;
- 	}
- 
--- 
-2.32.0
-

0017-sepolicy-Fix-flake8-warnings-in-Fedora-only-code.patch

@@ -1,46 +0,0 @@
-From 0e40b5541773c6daf58bba7048fae6918d74de74 Mon Sep 17 00:00:00 2001
-From: Ondrej Mosnacek <omosnace@redhat.com>
-Date: Tue, 28 Jul 2020 14:37:13 +0200
-Subject: [PATCH] sepolicy: Fix flake8 warnings in Fedora-only code
-
-Fixes:
-$ PATH="$VIRTUAL_ENV/bin:$PATH" ./scripts/run-flake8
-Analyzing 187 Python scripts
-./installdir/usr/lib/python3.8/site-packages/sepolicy/manpage.py:720:20: E713 test for membership should be 'not in'
-./installdir/usr/lib/python3.8/site-packages/sepolicy/manpage.py:774:17: E117 over-indented
-./python/sepolicy/build/lib/sepolicy/manpage.py:720:20: E713 test for membership should be 'not in'
-./python/sepolicy/build/lib/sepolicy/manpage.py:774:17: E117 over-indented
-./python/sepolicy/sepolicy/manpage.py:720:20: E713 test for membership should be 'not in'
-./python/sepolicy/sepolicy/manpage.py:774:17: E117 over-indented
-The command "PATH="$VIRTUAL_ENV/bin:$PATH" ./scripts/run-flake8" exited with 1.
-
-Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
----
- python/sepolicy/sepolicy/manpage.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/python/sepolicy/sepolicy/manpage.py b/python/sepolicy/sepolicy/manpage.py
-index ffcedb547993..c013c0d48502 100755
---- a/python/sepolicy/sepolicy/manpage.py
-+++ b/python/sepolicy/sepolicy/manpage.py
-@@ -719,7 +719,7 @@ Default Defined Ports:""")
-         for f in self.all_file_types:
-             if f.startswith(self.domainname):
-                 flist.append(f)
--                if not f in self.exec_types or not f in self.entry_types:
-+                if f not in self.exec_types or f not in self.entry_types:
-                     flist_non_exec.append(f)
-                 if f in self.fcdict:
-                     mpaths = mpaths + self.fcdict[f]["regex"]
-@@ -773,7 +773,7 @@ SELinux %(domainname)s policy is very flexible allowing users to setup their %(d
- """ % {'domainname': self.domainname, 'equiv': e, 'alt': e.split('/')[-1]})
- 
-         if flist_non_exec:
--                self.fd.write(r"""
-+            self.fd.write(r"""
- .PP
- .B STANDARD FILE CONTEXT
- 
--- 
-2.32.0
-

0018-Use-SHA-2-instead-of-SHA-1.patch

@@ -1,297 +0,0 @@
-From ec1b147076345478636de763ce5d4e8daa69afd6 Mon Sep 17 00:00:00 2001
-From: Petr Lautrbach <plautrba@redhat.com>
-Date: Fri, 30 Jul 2021 14:14:37 +0200
-Subject: [PATCH] Use SHA-2 instead of SHA-1
-
-The use of SHA-1 in RHEL9 is deprecated
----
- policycoreutils/setfiles/restorecon.8          | 10 +++++-----
- policycoreutils/setfiles/restorecon_xattr.8    |  8 ++++----
- policycoreutils/setfiles/restorecon_xattr.c    | 12 ++++++------
- policycoreutils/setfiles/ru/restorecon.8       |  8 ++++----
- policycoreutils/setfiles/ru/restorecon_xattr.8 | 10 +++++-----
- policycoreutils/setfiles/ru/setfiles.8         |  8 ++++----
- policycoreutils/setfiles/setfiles.8            | 10 +++++-----
- 7 files changed, 33 insertions(+), 33 deletions(-)
-
-diff --git a/policycoreutils/setfiles/restorecon.8 b/policycoreutils/setfiles/restorecon.8
-index 668486f66113..a8900f02b3f3 100644
---- a/policycoreutils/setfiles/restorecon.8
-+++ b/policycoreutils/setfiles/restorecon.8
-@@ -93,14 +93,14 @@ display usage information and exit.
- ignore files that do not exist.
- .TP
- .B \-I
--ignore digest to force checking of labels even if the stored SHA1 digest
--matches the specfiles SHA1 digest. The digest will then be updated provided
-+ignore digest to force checking of labels even if the stored SHA256 digest
-+matches the specfiles SHA256 digest. The digest will then be updated provided
- there are no errors. See the
- .B NOTES
- section for further details.
- .TP
- .B \-D
--Set or update any directory SHA1 digests. Use this option to
-+Set or update any directory SHA256 digests. Use this option to
- enable usage of the
- .IR security.sehash
- extended attribute.
-@@ -191,7 +191,7 @@ the
- .B \-D
- option to
- .B restorecon
--will cause it to store a SHA1 digest of the default specfiles set in an extended
-+will cause it to store a SHA256 digest of the default specfiles set in an extended
- attribute named
- .IR security.sehash
- on each directory specified in
-@@ -208,7 +208,7 @@ for further details.
- .sp
- The
- .B \-I
--option will ignore the SHA1 digest from each directory specified in
-+option will ignore the SHA256 digest from each directory specified in
- .IR pathname \ ...
- and provided the
- .B \-n
-diff --git a/policycoreutils/setfiles/restorecon_xattr.8 b/policycoreutils/setfiles/restorecon_xattr.8
-index e04528e60824..4b1ce304d995 100644
---- a/policycoreutils/setfiles/restorecon_xattr.8
-+++ b/policycoreutils/setfiles/restorecon_xattr.8
-@@ -23,7 +23,7 @@ or
- 
- .SH "DESCRIPTION"
- .B restorecon_xattr
--will display the SHA1 digests added to extended attributes
-+will display the SHA256 digests added to extended attributes
- .I security.sehash
- or delete the attribute completely. These attributes are set by
- .BR restorecon (8)
-@@ -48,12 +48,12 @@ extended attribute and are automatically excluded from searches.
- .sp
- By default
- .B restorecon_xattr
--will display the SHA1 digests with "Match" appended if they match the default
-+will display the SHA256 digests with "Match" appended if they match the default
- specfile set or the
- .I specfile
- set used with the
- .B \-f
--option. Non-matching SHA1 digests will be displayed with "No Match" appended.
-+option. Non-matching SHA256 digests will be displayed with "No Match" appended.
- This feature can be disabled by the
- .B \-n
- option.
-@@ -87,7 +87,7 @@ Do not append "Match" or "No Match" to displayed digests.
- recursively descend directories.
- .TP
- .B \-v
--display SHA1 digest generated by specfile set (Note that this digest is not
-+display SHA256 digest generated by specfile set (Note that this digest is not
- used to match the
- .I security.sehash
- directory digest entries, and is shown for reference only).
-diff --git a/policycoreutils/setfiles/restorecon_xattr.c b/policycoreutils/setfiles/restorecon_xattr.c
-index 31fb82fd2099..bc22d3fd4560 100644
---- a/policycoreutils/setfiles/restorecon_xattr.c
-+++ b/policycoreutils/setfiles/restorecon_xattr.c
-@@ -38,7 +38,7 @@ int main(int argc, char **argv)
- 	unsigned int xattr_flags = 0, delete_digest = 0, recurse = 0;
- 	unsigned int delete_all_digests = 0, ignore_mounts = 0;
- 	bool display_digest = false;
--	char *sha1_buf, **specfiles, *fc_file = NULL, *pathname = NULL;
-+	char *sha256_buf, **specfiles, *fc_file = NULL, *pathname = NULL;
- 	unsigned char *fc_digest = NULL;
- 	size_t i, fc_digest_len = 0, num_specfiles;
- 
-@@ -133,8 +133,8 @@ int main(int argc, char **argv)
- 			exit(-1);
- 		}
- 
--		sha1_buf = malloc(fc_digest_len * 2 + 1);
--		if (!sha1_buf) {
-+		sha256_buf = malloc(fc_digest_len * 2 + 1);
-+		if (!sha256_buf) {
- 			fprintf(stderr,
- 				"Error allocating digest buffer: %s\n",
- 							    strerror(errno));
-@@ -143,16 +143,16 @@ int main(int argc, char **argv)
- 		}
- 
- 		for (i = 0; i < fc_digest_len; i++)
--			sprintf((&sha1_buf[i * 2]), "%02x", fc_digest[i]);
-+			sprintf((&sha256_buf[i * 2]), "%02x", fc_digest[i]);
- 
--		printf("specfiles SHA1 digest: %s\n", sha1_buf);
-+		printf("specfiles SHA256 digest: %s\n", sha256_buf);
- 
- 		printf("calculated using the following specfile(s):\n");
- 		if (specfiles) {
- 			for (i = 0; i < num_specfiles; i++)
- 				printf("%s\n", specfiles[i]);
- 		}
--		free(sha1_buf);
-+		free(sha256_buf);
- 		printf("\n");
- 	}
- 
-diff --git a/policycoreutils/setfiles/ru/restorecon.8 b/policycoreutils/setfiles/ru/restorecon.8
-index 9be3a63db356..745135020f4b 100644
---- a/policycoreutils/setfiles/ru/restorecon.8
-+++ b/policycoreutils/setfiles/ru/restorecon.8
-@@ -82,11 +82,11 @@ restorecon \- восстановить SELinux-контексты безопас
- игнорировать файлы, которые не существуют.
- .TP
- .B \-I
--игнорировать дайджест, чтобы принудительно проверить метки, даже если хранимый дайджест SHA1 соответствует дайджесту SHA1 файлов спецификации. Затем (при условии отсутствия ошибок) дайджест будет обновлён. Более подробные сведения доступны в разделе
-+игнорировать дайджест, чтобы принудительно проверить метки, даже если хранимый дайджест SHA256 соответствует дайджесту SHA256 файлов спецификации. Затем (при условии отсутствия ошибок) дайджест будет обновлён. Более подробные сведения доступны в разделе
- .B ПРИМЕЧАНИЯ.
- .TP
- .B \-D
--установить или обновить дайджесты SHA1 для любых каталогов. Используйте этот параметр, чтобы включить использование расширенного атрибута
-+установить или обновить дайджесты SHA256 для любых каталогов. Используйте этот параметр, чтобы включить использование расширенного атрибута
- .IR security.restorecon_last.
- .TP
- .B \-m
-@@ -159,7 +159,7 @@ GNU
- .B \-D
- команды
- .B restorecon
--обеспечит сохранение дайджеста SHA1 файлов спецификации по умолчанию в расширенном атрибуте с именем
-+обеспечит сохранение дайджеста SHA256 файлов спецификации по умолчанию в расширенном атрибуте с именем
- .IR security.restorecon_last
- для каталогов, указанных в соответствующих путях
- .IR pathname \ ...
-@@ -173,7 +173,7 @@ GNU
- .sp
- Параметр
- .B \-I
--позволяет игнорировать дайджест SHA1 из каждого каталога, указанного в 
-+позволяет игнорировать дайджест SHA256 из каждого каталога, указанного в
- .IR pathname \ ...
- , и, при условии, что НЕ установлен параметр
- .B \-n
-diff --git a/policycoreutils/setfiles/ru/restorecon_xattr.8 b/policycoreutils/setfiles/ru/restorecon_xattr.8
-index 41c441b8c5c2..25c4c3033334 100644
---- a/policycoreutils/setfiles/ru/restorecon_xattr.8
-+++ b/policycoreutils/setfiles/ru/restorecon_xattr.8
-@@ -23,7 +23,7 @@ restorecon_xattr \- управление записями расширенных
- 
- .SH "ОПИСАНИЕ"
- .B restorecon_xattr
--покажет дайджесты SHA1, добавленные в расширенные атрибуты
-+покажет дайджесты SHA256, добавленные в расширенные атрибуты
- .I security.restorecon_last,
- или полностью удалит эти атрибуты. Эти атрибуты устанавливаются командой
- .BR restorecon (8)
-@@ -47,11 +47,11 @@ restorecon_xattr \- управление записями расширенных
- .sp
- По умолчанию
- .B restorecon_xattr
--показывает дайджесты SHA1, добавляя в конце "Match", если они соответствуют установленному по умолчанию файлу спецификации или файлу спецификации
-+показывает дайджесты SHA256, добавляя в конце "Match", если они соответствуют установленному по умолчанию файлу спецификации или файлу спецификации
- .I specfile,
- который установлен с помощью параметра
- .B \-f.
--Несоответствующие дайджесты SHA1 будут показаны с добавлением "No Match" в конце.
-+Несоответствующие дайджесты SHA256 будут показаны с добавлением "No Match" в конце.
- Эту возможность можно отключить с помощью параметра
- .B \-n.
- 
-@@ -81,7 +81,7 @@ restorecon_xattr \- управление записями расширенных
- рекурсивно спускаться по каталогам.
- .TP
- .B \-v
--показать дайджест SHA1, созданный установленным файлом спецификации.
-+показать дайджест SHA256, созданный установленным файлом спецификации.
- .TP
- .B \-e
- .I directory
-@@ -97,7 +97,7 @@ restorecon_xattr \- управление записями расширенных
- .BR file_contexts (5).
- Он будет использоваться
- .BR selabel_open (3)
--для получения набора записей меток; получение дайджеста SHA1 выполняется с помощью
-+для получения набора записей меток; получение дайджеста SHA256 выполняется с помощью
- .BR selabel_digest (3).
- Если этот параметр не указан, будет использоваться файл file_contexts по умолчанию.
- 
-diff --git a/policycoreutils/setfiles/ru/setfiles.8 b/policycoreutils/setfiles/ru/setfiles.8
-index 910101452625..7f2daa09191b 100644
---- a/policycoreutils/setfiles/ru/setfiles.8
-+++ b/policycoreutils/setfiles/ru/setfiles.8
-@@ -69,11 +69,11 @@ setfiles \- установить SELinux-контексты безопаснос
- игнорировать файлы, которые не существуют.
- .TP
- .B \-I
--игнорировать дайджест, чтобы принудительно проверить метки, даже если хранимый дайджест SHA1 соответствует дайджесту SHA1 файлов спецификации. Затем (при условии отсутствия ошибок) дайджест будет обновлён. Более подробные сведения доступны в разделе
-+игнорировать дайджест, чтобы принудительно проверить метки, даже если хранимый дайджест SHA256 соответствует дайджесту SHA256 файлов спецификации. Затем (при условии отсутствия ошибок) дайджест будет обновлён. Более подробные сведения доступны в разделе
- .B ПРИМЕЧАНИЯ.
- .TP
- .B \-D
--установить или обновить дайджесты SHA1 для любых каталогов. Используйте этот параметр, чтобы включить использование расширенного атрибута
-+установить или обновить дайджесты SHA256 для любых каталогов. Используйте этот параметр, чтобы включить использование расширенного атрибута
- .IR security.restorecon_last.
- .TP
- .B \-l
-@@ -186,7 +186,7 @@ GNU
- .B \-D
- команды
- .B setfiles .
--Он обеспечивает сохранение дайджеста SHA1 файла спецификации
-+Он обеспечивает сохранение дайджеста SHA256 файла спецификации
- .B spec_file 
- в расширенном атрибуте с именем
- .IR security.restorecon_last
-@@ -204,7 +204,7 @@ GNU
- .sp
- Параметр
- .B \-I
--позволяет игнорировать дайджест SHA1 из каждого каталога, указанного в 
-+позволяет игнорировать дайджест SHA256 из каждого каталога, указанного в
- .IR pathname \ ...
- , и, при условии, что НЕ установлен параметр
- .B \-n
-diff --git a/policycoreutils/setfiles/setfiles.8 b/policycoreutils/setfiles/setfiles.8
-index 8e6c4ab94841..0692121f2f4d 100644
---- a/policycoreutils/setfiles/setfiles.8
-+++ b/policycoreutils/setfiles/setfiles.8
-@@ -85,14 +85,14 @@ display usage information and exit.
- ignore files that do not exist.
- .TP
- .B \-I
--ignore digest to force checking of labels even if the stored SHA1 digest
--matches the specfiles SHA1 digest. The digest will then be updated provided
-+ignore digest to force checking of labels even if the stored SHA256 digest
-+matches the specfiles SHA256 digest. The digest will then be updated provided
- there are no errors. See the
- .B NOTES
- section for further details.
- .TP
- .B \-D
--Set or update any directory SHA1 digests. Use this option to
-+Set or update any directory SHA256 digests. Use this option to
- enable usage of the
- .IR security.sehash
- extended attribute.
-@@ -230,7 +230,7 @@ the
- .B \-D
- option to
- .B setfiles
--will cause it to store a SHA1 digest of the
-+will cause it to store a SHA256 digest of the
- .B spec_file
- set in an extended attribute named
- .IR security.sehash
-@@ -251,7 +251,7 @@ for further details.
- .sp
- The
- .B \-I
--option will ignore the SHA1 digest from each directory specified in
-+option will ignore the SHA256 digest from each directory specified in
- .IR pathname \ ...
- and provided the
- .B \-n
--- 
-2.32.0
-

0019-setfiles-restorecon-support-parallel-relabeling.patch

@@ -1,253 +0,0 @@
-From fba88f42bf8490a23fa6dcd33de2ccd59170009b Mon Sep 17 00:00:00 2001
-From: Ondrej Mosnacek <omosnace@redhat.com>
-Date: Tue, 26 Oct 2021 13:52:39 +0200
-Subject: [PATCH] setfiles/restorecon: support parallel relabeling
-
-Use the newly introduced selinux_restorecon_parallel(3) in
-setfiles/restorecon and a -T option to both to allow enabling parallel
-relabeling. The default behavior without specifying the -T option is to
-use 1 thread; parallel relabeling must be requested explicitly by
-passing -T 0 (which will use as many threads as there are available CPU
-cores) or -T <N>, which will use <N> threads.
-
-=== Benchmarks ===
-As measured on a 32-core cloud VM with Fedora 34. Not a fully
-representative environment, but still the scaling is quite good.
-
-WITHOUT PATCHES:
-$ time restorecon -rn /usr
-
-real    0m21.689s
-user    0m21.070s
-sys     0m0.494s
-
-WITH PATCHES:
-$ time restorecon -rn /usr
-
-real    0m23.940s
-user    0m23.127s
-sys     0m0.653s
-$ time restorecon -rn -T 2 /usr
-
-real    0m13.145s
-user    0m25.306s
-sys     0m0.695s
-$ time restorecon -rn -T 4 /usr
-
-real    0m7.559s
-user    0m28.470s
-sys     0m1.099s
-$ time restorecon -rn -T 8 /usr
-
-real    0m5.186s
-user    0m37.450s
-sys     0m2.094s
-$ time restorecon -rn -T 16 /usr
-
-real    0m3.831s
-user    0m51.220s
-sys     0m4.895s
-$ time restorecon -rn -T 32 /usr
-
-real    0m2.650s
-user    1m5.136s
-sys     0m6.614s
-
-Note that the benchmarks were performed in read-only mode (-n), so the
-labels were only read and looked up in the database, not written. When
-fixing labels on a heavily mislabeled system, the scaling would likely
-be event better, since a larger % of work could be done in parallel.
-
-Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
----
- policycoreutils/setfiles/Makefile     |  2 +-
- policycoreutils/setfiles/restore.c    |  7 ++++---
- policycoreutils/setfiles/restore.h    |  2 +-
- policycoreutils/setfiles/restorecon.8 |  9 +++++++++
- policycoreutils/setfiles/setfiles.8   |  9 +++++++++
- policycoreutils/setfiles/setfiles.c   | 28 ++++++++++++++++-----------
- 6 files changed, 41 insertions(+), 16 deletions(-)
-
-diff --git a/policycoreutils/setfiles/Makefile b/policycoreutils/setfiles/Makefile
-index 63d818509791..d7670a8ff54b 100644
---- a/policycoreutils/setfiles/Makefile
-+++ b/policycoreutils/setfiles/Makefile
-@@ -6,7 +6,7 @@ MANDIR = $(PREFIX)/share/man
- AUDITH ?= $(shell test -f /usr/include/libaudit.h && echo y)
- 
- CFLAGS ?= -g -Werror -Wall -W
--override LDLIBS += -lselinux -lsepol
-+override LDLIBS += -lselinux -lsepol -lpthread
- 
- ifeq ($(AUDITH), y)
- 	override CFLAGS += -DUSE_AUDIT
-diff --git a/policycoreutils/setfiles/restore.c b/policycoreutils/setfiles/restore.c
-index 9d688c609f79..74d48bb3752d 100644
---- a/policycoreutils/setfiles/restore.c
-+++ b/policycoreutils/setfiles/restore.c
-@@ -72,7 +72,7 @@ void restore_finish(void)
- 	}
- }
- 
--int process_glob(char *name, struct restore_opts *opts)
-+int process_glob(char *name, struct restore_opts *opts, size_t nthreads)
- {
- 	glob_t globbuf;
- 	size_t i = 0;
-@@ -91,8 +91,9 @@ int process_glob(char *name, struct restore_opts *opts)
- 			continue;
- 		if (len > 0 && strcmp(&globbuf.gl_pathv[i][len], "/..") == 0)
- 			continue;
--		rc = selinux_restorecon(globbuf.gl_pathv[i],
--					opts->restorecon_flags);
-+		rc = selinux_restorecon_parallel(globbuf.gl_pathv[i],
-+						 opts->restorecon_flags,
-+						 nthreads);
- 		if (rc < 0)
- 			errors = rc;
- 	}
-diff --git a/policycoreutils/setfiles/restore.h b/policycoreutils/setfiles/restore.h
-index ac6ad6809f4f..bb35a1db9e34 100644
---- a/policycoreutils/setfiles/restore.h
-+++ b/policycoreutils/setfiles/restore.h
-@@ -49,7 +49,7 @@ struct restore_opts {
- void restore_init(struct restore_opts *opts);
- void restore_finish(void);
- void add_exclude(const char *directory);
--int process_glob(char *name, struct restore_opts *opts);
-+int process_glob(char *name, struct restore_opts *opts, size_t nthreads);
- extern char **exclude_list;
- 
- #endif
-diff --git a/policycoreutils/setfiles/restorecon.8 b/policycoreutils/setfiles/restorecon.8
-index a8900f02b3f3..dbd55ce7c512 100644
---- a/policycoreutils/setfiles/restorecon.8
-+++ b/policycoreutils/setfiles/restorecon.8
-@@ -33,6 +33,8 @@ restorecon \- restore file(s) default SELinux security contexts.
- .RB [ \-W ]
- .RB [ \-I | \-D ]
- .RB [ \-x ]
-+.RB [ \-T
-+.IR nthreads ]
- 
- .SH "DESCRIPTION"
- This manual page describes the
-@@ -160,6 +162,13 @@ prevent
- .B restorecon
- from crossing file system boundaries.
- .TP
-+.BI \-T \ nthreads
-+use up to
-+.I nthreads
-+threads.  Specify 0 to create as many threads as there are available
-+CPU cores; 1 to use only a single thread (default); or any positive
-+number to use the given number of threads (if possible).
-+.TP
- .SH "ARGUMENTS"
- .IR pathname \ ...
- The pathname for the file(s) to be relabeled.
-diff --git a/policycoreutils/setfiles/setfiles.8 b/policycoreutils/setfiles/setfiles.8
-index 0692121f2f4d..8ef9f602e843 100644
---- a/policycoreutils/setfiles/setfiles.8
-+++ b/policycoreutils/setfiles/setfiles.8
-@@ -19,6 +19,8 @@ setfiles \- set SELinux file security contexts.
- .RB [ \-W ]
- .RB [ \-F ]
- .RB [ \-I | \-D ]
-+.RB [ \-T
-+.IR nthreads ]
- .I spec_file
- .IR pathname \ ...
- 
-@@ -161,6 +163,13 @@ quote marks or backslashes.  The
- option of GNU
- .B find
- produces input suitable for this mode.
-+.TP
-+.BI \-T \ nthreads
-+use up to
-+.I nthreads
-+threads.  Specify 0 to create as many threads as there are available
-+CPU cores; 1 to use only a single thread (default); or any positive
-+number to use the given number of threads (if possible).
- 
- .SH "ARGUMENTS"
- .TP
-diff --git a/policycoreutils/setfiles/setfiles.c b/policycoreutils/setfiles/setfiles.c
-index f018d161aa9e..2313a21fa0f3 100644
---- a/policycoreutils/setfiles/setfiles.c
-+++ b/policycoreutils/setfiles/setfiles.c
-@@ -1,4 +1,5 @@
- #include "restore.h"
-+#include <stdlib.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <stdio_ext.h>
-@@ -34,14 +35,14 @@ static __attribute__((__noreturn__)) void usage(const char *const name)
- {
- 	if (iamrestorecon) {
- 		fprintf(stderr,
--			"usage:  %s [-iIDFmnprRv0x] [-e excludedir] pathname...\n"
--			"usage:  %s [-iIDFmnprRv0x] [-e excludedir] -f filename\n",
-+			"usage:  %s [-iIDFmnprRv0xT] [-e excludedir] pathname...\n"
-+			"usage:  %s [-iIDFmnprRv0xT] [-e excludedir] -f filename\n",
- 			name, name);
- 	} else {
- 		fprintf(stderr,
--			"usage:  %s [-diIDlmnpqvEFW] [-e excludedir] [-r alt_root_path] [-c policyfile] spec_file pathname...\n"
--			"usage:  %s [-diIDlmnpqvEFW] [-e excludedir] [-r alt_root_path] [-c policyfile] spec_file -f filename\n"
--			"usage:  %s -s [-diIDlmnpqvFW] spec_file\n",
-+			"usage:  %s [-diIDlmnpqvEFWT] [-e excludedir] [-r alt_root_path] [-c policyfile] spec_file pathname...\n"
-+			"usage:  %s [-diIDlmnpqvEFWT] [-e excludedir] [-r alt_root_path] [-c policyfile] spec_file -f filename\n"
-+			"usage:  %s -s [-diIDlmnpqvFWT] spec_file\n",
- 			name, name, name);
- 	}
- 	exit(-1);
-@@ -144,12 +145,12 @@ int main(int argc, char **argv)
- 	int opt, i = 0;
- 	const char *input_filename = NULL;
- 	int use_input_file = 0;
--	char *buf = NULL;
--	size_t buf_len;
-+	char *buf = NULL, *endptr;
-+	size_t buf_len, nthreads = 1;
- 	const char *base;
- 	int errors = 0;
--	const char *ropts = "e:f:hiIDlmno:pqrsvFRW0x";
--	const char *sopts = "c:de:f:hiIDlmno:pqr:svEFR:W0";
-+	const char *ropts = "e:f:hiIDlmno:pqrsvFRW0xT:";
-+	const char *sopts = "c:de:f:hiIDlmno:pqr:svEFR:W0T:";
- 	const char *opts;
- 	union selinux_callback cb;
- 
-@@ -370,6 +371,11 @@ int main(int argc, char **argv)
- 				usage(argv[0]);
-                         }
-                         break;
-+		case 'T':
-+			nthreads = strtoull(optarg, &endptr, 10);
-+			if (*optarg == '\0' || *endptr != '\0')
-+				usage(argv[0]);
-+			break;
- 		case 'h':
- 		case '?':
- 			usage(argv[0]);
-@@ -448,13 +454,13 @@ int main(int argc, char **argv)
- 			buf[len - 1] = 0;
- 			if (!strcmp(buf, "/"))
- 				r_opts.mass_relabel = SELINUX_RESTORECON_MASS_RELABEL;
--			errors |= process_glob(buf, &r_opts) < 0;
-+			errors |= process_glob(buf, &r_opts, nthreads) < 0;
- 		}
- 		if (strcmp(input_filename, "-") != 0)
- 			fclose(f);
- 	} else {
- 		for (i = optind; i < argc; i++)
--			errors |= process_glob(argv[i], &r_opts) < 0;
-+			errors |= process_glob(argv[i], &r_opts, nthreads) < 0;
- 	}
- 
- 	maybe_audit_mass_relabel(r_opts.mass_relabel, errors);
--- 
-2.33.1
-

0020-semodule-add-m-checksum-option.patch

@@ -1,674 +0,0 @@
-From 4e6165719d3315b6502f3d290a549f9fa14c3238 Mon Sep 17 00:00:00 2001
-From: Petr Lautrbach <plautrba@redhat.com>
-Date: Tue, 16 Nov 2021 14:27:11 +0100
-Subject: [PATCH] semodule: add -m | --checksum option
-
-Since cil doesn't store module name and module version in module itself,
-there's no simple way how to compare that installed module is the same
-version as the module which is supposed to be installed. Even though the
-version was not used by semodule itself, it was apparently used by some
-team.
-
-With `semodule -l --checksum` users get SHA256 hashes of modules and
-could compare them with their files which is faster than installing
-modules again and again.
-
-E.g.
-
-    # time (
-    semodule -l --checksum | grep localmodule
-    /usr/libexec/selinux/hll/pp localmodule.pp | sha256sum
-    )
-    localmodule db002f64ddfa3983257b42b54da7b182c9b2e476f47880ae3494f9099e1a42bd
-    db002f64ddfa3983257b42b54da7b182c9b2e476f47880ae3494f9099e1a42bd  -
-
-    real    0m0.876s
-    user    0m0.849s
-    sys     0m0.028s
-
-vs
-
-    # time semodule -i localmodule.pp
-
-    real    0m6.147s
-    user    0m5.800s
-    sys     0m0.231s
-
-Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
-Acked-by: James Carter <jwcart2@gmail.com>
----
- policycoreutils/semodule/Makefile   |   2 +-
- policycoreutils/semodule/semodule.8 |   6 +
- policycoreutils/semodule/semodule.c |  95 ++++++++-
- policycoreutils/semodule/sha256.c   | 294 ++++++++++++++++++++++++++++
- policycoreutils/semodule/sha256.h   |  89 +++++++++
- 5 files changed, 480 insertions(+), 6 deletions(-)
- create mode 100644 policycoreutils/semodule/sha256.c
- create mode 100644 policycoreutils/semodule/sha256.h
-
-diff --git a/policycoreutils/semodule/Makefile b/policycoreutils/semodule/Makefile
-index 73801e487a76..9875ac383280 100644
---- a/policycoreutils/semodule/Makefile
-+++ b/policycoreutils/semodule/Makefile
-@@ -6,7 +6,7 @@ MANDIR = $(PREFIX)/share/man
- 
- CFLAGS ?= -Werror -Wall -W
- override LDLIBS += -lsepol -lselinux -lsemanage
--SEMODULE_OBJS = semodule.o
-+SEMODULE_OBJS = semodule.o sha256.o
- 
- all: semodule genhomedircon
- 
-diff --git a/policycoreutils/semodule/semodule.8 b/policycoreutils/semodule/semodule.8
-index 18d4f708661c..3a2fb21c2481 100644
---- a/policycoreutils/semodule/semodule.8
-+++ b/policycoreutils/semodule/semodule.8
-@@ -95,6 +95,9 @@ only modules listed in \-\-extract after this option.
- .B  \-H,\-\-hll
- Extract module as an HLL file. This only affects the \-\-extract option and
- only modules listed in \-\-extract after this option.
-+.TP
-+.B  \-m,\-\-checksum
-+Add SHA256 checksum of modules to the list output.
- 
- .SH EXAMPLE
- .nf
-@@ -130,6 +133,9 @@ $ semodule \-B \-S "/tmp/var/lib/selinux"
- # Write the HLL version of puppet and the CIL version of wireshark
- # modules at priority 400 to the current working directory
- $ semodule \-X 400 \-\-hll \-E puppet \-\-cil \-E wireshark
-+# Check whether a module in "localmodule.pp" file is same as installed module "localmodule"
-+$ /usr/libexec/selinux/hll/pp localmodule.pp | sha256sum
-+$ semodule -l -m | grep localmodule
- .fi
- 
- .SH SEE ALSO
-diff --git a/policycoreutils/semodule/semodule.c b/policycoreutils/semodule/semodule.c
-index c815f01546b4..ddbf10455abf 100644
---- a/policycoreutils/semodule/semodule.c
-+++ b/policycoreutils/semodule/semodule.c
-@@ -25,6 +25,8 @@
- #include <sepol/cil/cil.h>
- #include <semanage/modules.h>
- 
-+#include "sha256.h"
-+
- enum client_modes {
- 	NO_MODE, INSTALL_M, REMOVE_M, EXTRACT_M, CIL_M, HLL_M,
- 	LIST_M, RELOAD, PRIORITY_M, ENABLE_M, DISABLE_M
-@@ -57,6 +59,7 @@ static semanage_handle_t *sh = NULL;
- static char *store;
- static char *store_root;
- int extract_cil = 0;
-+static int checksum = 0;
- 
- extern char *optarg;
- extern int optind;
-@@ -147,6 +150,7 @@ static void usage(char *progname)
- 	printf("  -S,--store-path  use an alternate path for the policy store root\n");
- 	printf("  -c, --cil extract module as cil. This only affects module extraction.\n");
- 	printf("  -H, --hll extract module as hll. This only affects module extraction.\n");
-+	printf("  -m, --checksum   print module checksum (SHA256).\n");
- }
- 
- /* Sets the global mode variable to new_mode, but only if no other
-@@ -200,6 +204,7 @@ static void parse_command_line(int argc, char **argv)
- 		{"disable", required_argument, NULL, 'd'},
- 		{"path", required_argument, NULL, 'p'},
- 		{"store-path", required_argument, NULL, 'S'},
-+		{"checksum", 0, NULL, 'm'},
- 		{NULL, 0, NULL, 0}
- 	};
- 	int extract_selected = 0;
-@@ -210,7 +215,7 @@ static void parse_command_line(int argc, char **argv)
- 	no_reload = 0;
- 	priority = 400;
- 	while ((i =
--		getopt_long(argc, argv, "s:b:hi:l::vr:u:RnNBDCPX:e:d:p:S:E:cH", opts,
-+		getopt_long(argc, argv, "s:b:hi:l::vr:u:RnNBDCPX:e:d:p:S:E:cHm", opts,
- 			    NULL)) != -1) {
- 		switch (i) {
- 		case 'b':
-@@ -287,6 +292,9 @@ static void parse_command_line(int argc, char **argv)
- 		case 'd':
- 			set_mode(DISABLE_M, optarg);
- 			break;
-+		case 'm':
-+			checksum = 1;
-+			break;
- 		case '?':
- 		default:{
- 				usage(argv[0]);
-@@ -338,6 +346,61 @@ static void parse_command_line(int argc, char **argv)
- 	}
- }
- 
-+/* Get module checksum */
-+static char *hash_module_data(const char *module_name, const int prio) {
-+	semanage_module_info_t *extract_info = NULL;
-+	semanage_module_key_t *modkey = NULL;
-+	Sha256Context context;
-+	uint8_t sha256_hash[SHA256_HASH_SIZE];
-+	char *sha256_buf = NULL;
-+	void *data;
-+	size_t data_len = 0, i;
-+	int result;
-+
-+	result = semanage_module_key_create(sh, &modkey);
-+	if (result != 0) {
-+		goto cleanup_extract;
-+	}
-+
-+	result = semanage_module_key_set_name(sh, modkey, module_name);
-+	if (result != 0) {
-+		goto cleanup_extract;
-+	}
-+
-+	result = semanage_module_key_set_priority(sh, modkey, prio);
-+	if (result != 0) {
-+		goto cleanup_extract;
-+	}
-+
-+	result = semanage_module_extract(sh, modkey, 1, &data, &data_len,
-+									 &extract_info);
-+	if (result != 0) {
-+		goto cleanup_extract;
-+	}
-+
-+	Sha256Initialise(&context);
-+	Sha256Update(&context, data, data_len);
-+
-+	Sha256Finalise(&context, (SHA256_HASH *)sha256_hash);
-+
-+	sha256_buf = calloc(1, SHA256_HASH_SIZE * 2 + 1);
-+
-+	if (sha256_buf == NULL)
-+		goto cleanup_extract;
-+
-+	for (i = 0; i < SHA256_HASH_SIZE; i++) {
-+		sprintf((&sha256_buf[i * 2]), "%02x", sha256_hash[i]);
-+	}
-+	sha256_buf[i * 2] = 0;
-+
-+cleanup_extract:
-+	semanage_module_info_destroy(sh, extract_info);
-+	free(extract_info);
-+	semanage_module_key_destroy(sh, modkey);
-+	free(modkey);
-+	return sha256_buf;
-+}
-+
- int main(int argc, char *argv[])
- {
- 	int i, commit = 0;
-@@ -546,6 +609,8 @@ cleanup_extract:
- 				int modinfos_len = 0;
- 				semanage_module_info_t *m = NULL;
- 				int j = 0;
-+				char *module_checksum = NULL;
-+				uint16_t pri = 0;
- 
- 				if (verbose) {
- 					printf
-@@ -570,7 +635,18 @@ cleanup_extract:
- 						result = semanage_module_info_get_name(sh, m, &name);
- 						if (result != 0) goto cleanup_list;
- 
--						printf("%s\n", name);
-+						result = semanage_module_info_get_priority(sh, m, &pri);
-+						if (result != 0) goto cleanup_list;
-+
-+						printf("%s", name);
-+						if (checksum) {
-+							module_checksum = hash_module_data(name, pri);
-+							if (module_checksum) {
-+								printf(" %s", module_checksum);
-+								free(module_checksum);
-+							}
-+						}
-+						printf("\n");
- 					}
- 				}
- 				else if (strcmp(mode_arg, "full") == 0) {
-@@ -585,11 +661,12 @@ cleanup_extract:
- 					}
- 
- 					/* calculate column widths */
--					size_t column[4] = { 0, 0, 0, 0 };
-+					size_t column[5] = { 0, 0, 0, 0, 0 };
- 
- 					/* fixed width columns */
- 					column[0] = sizeof("000") - 1;
- 					column[3] = sizeof("disabled") - 1;
-+					column[4] = 64; /* SHA256_HASH_SIZE * 2 */
- 
- 					/* variable width columns */
- 					const char *tmp = NULL;
-@@ -612,7 +689,6 @@ cleanup_extract:
- 
- 					/* print out each module */
- 					for (j = 0; j < modinfos_len; j++) {
--						uint16_t pri = 0;
- 						const char *name = NULL;
- 						int enabled = 0;
- 						const char *lang_ext = NULL;
-@@ -631,11 +707,20 @@ cleanup_extract:
- 						result = semanage_module_info_get_lang_ext(sh, m, &lang_ext);
- 						if (result != 0) goto cleanup_list;
- 
--						printf("%0*u %-*s %-*s %-*s\n",
-+						printf("%0*u %-*s %-*s %-*s",
- 							(int)column[0], pri,
- 							(int)column[1], name,
- 							(int)column[2], lang_ext,
- 							(int)column[3], enabled ? "" : "disabled");
-+						if (checksum) {
-+							module_checksum = hash_module_data(name, pri);
-+							if (module_checksum) {
-+								printf(" %-*s", (int)column[4], module_checksum);
-+								free(module_checksum);
-+							}
-+						}
-+						printf("\n");
-+
- 					}
- 				}
- 				else {
-diff --git a/policycoreutils/semodule/sha256.c b/policycoreutils/semodule/sha256.c
-new file mode 100644
-index 000000000000..fe2aeef07f53
---- /dev/null
-+++ b/policycoreutils/semodule/sha256.c
-@@ -0,0 +1,294 @@
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+//  WjCryptLib_Sha256
-+//
-+//  Implementation of SHA256 hash function.
-+//  Original author: Tom St Denis, tomstdenis@gmail.com, http://libtom.org
-+//  Modified by WaterJuice retaining Public Domain license.
-+//
-+//  This is free and unencumbered software released into the public domain - June 2013 waterjuice.org
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+//  IMPORTS
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+
-+#include "sha256.h"
-+#include <memory.h>
-+
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+//  MACROS
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+
-+#define ror(value, bits) (((value) >> (bits)) | ((value) << (32 - (bits))))
-+
-+#define MIN(x, y) ( ((x)<(y))?(x):(y) )
-+
-+#define STORE32H(x, y)                                                                     \
-+     { (y)[0] = (uint8_t)(((x)>>24)&255); (y)[1] = (uint8_t)(((x)>>16)&255);   \
-+       (y)[2] = (uint8_t)(((x)>>8)&255); (y)[3] = (uint8_t)((x)&255); }
-+
-+#define LOAD32H(x, y)                            \
-+     { x = ((uint32_t)((y)[0] & 255)<<24) | \
-+           ((uint32_t)((y)[1] & 255)<<16) | \
-+           ((uint32_t)((y)[2] & 255)<<8)  | \
-+           ((uint32_t)((y)[3] & 255)); }
-+
-+#define STORE64H(x, y)                                                                     \
-+   { (y)[0] = (uint8_t)(((x)>>56)&255); (y)[1] = (uint8_t)(((x)>>48)&255);     \
-+     (y)[2] = (uint8_t)(((x)>>40)&255); (y)[3] = (uint8_t)(((x)>>32)&255);     \
-+     (y)[4] = (uint8_t)(((x)>>24)&255); (y)[5] = (uint8_t)(((x)>>16)&255);     \
-+     (y)[6] = (uint8_t)(((x)>>8)&255); (y)[7] = (uint8_t)((x)&255); }
-+
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+//  CONSTANTS
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+
-+// The K array
-+static const uint32_t K[64] = {
-+    0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL, 0x3956c25bUL,
-+    0x59f111f1UL, 0x923f82a4UL, 0xab1c5ed5UL, 0xd807aa98UL, 0x12835b01UL,
-+    0x243185beUL, 0x550c7dc3UL, 0x72be5d74UL, 0x80deb1feUL, 0x9bdc06a7UL,
-+    0xc19bf174UL, 0xe49b69c1UL, 0xefbe4786UL, 0x0fc19dc6UL, 0x240ca1ccUL,
-+    0x2de92c6fUL, 0x4a7484aaUL, 0x5cb0a9dcUL, 0x76f988daUL, 0x983e5152UL,
-+    0xa831c66dUL, 0xb00327c8UL, 0xbf597fc7UL, 0xc6e00bf3UL, 0xd5a79147UL,
-+    0x06ca6351UL, 0x14292967UL, 0x27b70a85UL, 0x2e1b2138UL, 0x4d2c6dfcUL,
-+    0x53380d13UL, 0x650a7354UL, 0x766a0abbUL, 0x81c2c92eUL, 0x92722c85UL,
-+    0xa2bfe8a1UL, 0xa81a664bUL, 0xc24b8b70UL, 0xc76c51a3UL, 0xd192e819UL,
-+    0xd6990624UL, 0xf40e3585UL, 0x106aa070UL, 0x19a4c116UL, 0x1e376c08UL,
-+    0x2748774cUL, 0x34b0bcb5UL, 0x391c0cb3UL, 0x4ed8aa4aUL, 0x5b9cca4fUL,
-+    0x682e6ff3UL, 0x748f82eeUL, 0x78a5636fUL, 0x84c87814UL, 0x8cc70208UL,
-+    0x90befffaUL, 0xa4506cebUL, 0xbef9a3f7UL, 0xc67178f2UL
-+};
-+
-+#define BLOCK_SIZE          64
-+
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+//  INTERNAL FUNCTIONS
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+
-+// Various logical functions
-+#define Ch( x, y, z )     (z ^ (x & (y ^ z)))
-+#define Maj( x, y, z )    (((x | y) & z) | (x & y))
-+#define S( x, n )         ror((x),(n))
-+#define R( x, n )         (((x)&0xFFFFFFFFUL)>>(n))
-+#define Sigma0( x )       (S(x, 2) ^ S(x, 13) ^ S(x, 22))
-+#define Sigma1( x )       (S(x, 6) ^ S(x, 11) ^ S(x, 25))
-+#define Gamma0( x )       (S(x, 7) ^ S(x, 18) ^ R(x, 3))
-+#define Gamma1( x )       (S(x, 17) ^ S(x, 19) ^ R(x, 10))
-+
-+#define Sha256Round( a, b, c, d, e, f, g, h, i )       \
-+     t0 = h + Sigma1(e) + Ch(e, f, g) + K[i] + W[i];   \
-+     t1 = Sigma0(a) + Maj(a, b, c);                    \
-+     d += t0;                                          \
-+     h  = t0 + t1;
-+
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+//  TransformFunction
-+//
-+//  Compress 512-bits
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+static
-+void
-+    TransformFunction
-+    (
-+        Sha256Context*      Context,
-+        uint8_t const*      Buffer
-+    )
-+{
-+    uint32_t    S[8];
-+    uint32_t    W[64];
-+    uint32_t    t0;
-+    uint32_t    t1;
-+    uint32_t    t;
-+    int         i;
-+
-+    // Copy state into S
-+    for( i=0; i<8; i++ )
-+    {
-+        S[i] = Context->state[i];
-+    }
-+
-+    // Copy the state into 512-bits into W[0..15]
-+    for( i=0; i<16; i++ )
-+    {
-+        LOAD32H( W[i], Buffer + (4*i) );
-+    }
-+
-+    // Fill W[16..63]
-+    for( i=16; i<64; i++ )
-+    {
-+        W[i] = Gamma1( W[i-2]) + W[i-7] + Gamma0( W[i-15] ) + W[i-16];
-+    }
-+
-+    // Compress
-+    for( i=0; i<64; i++ )
-+    {
-+        Sha256Round( S[0], S[1], S[2], S[3], S[4], S[5], S[6], S[7], i );
-+        t = S[7];
-+        S[7] = S[6];
-+        S[6] = S[5];
-+        S[5] = S[4];
-+        S[4] = S[3];
-+        S[3] = S[2];
-+        S[2] = S[1];
-+        S[1] = S[0];
-+        S[0] = t;
-+    }
-+
-+    // Feedback
-+    for( i=0; i<8; i++ )
-+    {
-+        Context->state[i] = Context->state[i] + S[i];
-+    }
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+//  PUBLIC FUNCTIONS
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+//  Sha256Initialise
-+//
-+//  Initialises a SHA256 Context. Use this to initialise/reset a context.
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+void
-+    Sha256Initialise
-+    (
-+        Sha256Context*      Context         // [out]
-+    )
-+{
-+    Context->curlen = 0;
-+    Context->length = 0;
-+    Context->state[0] = 0x6A09E667UL;
-+    Context->state[1] = 0xBB67AE85UL;
-+    Context->state[2] = 0x3C6EF372UL;
-+    Context->state[3] = 0xA54FF53AUL;
-+    Context->state[4] = 0x510E527FUL;
-+    Context->state[5] = 0x9B05688CUL;
-+    Context->state[6] = 0x1F83D9ABUL;
-+    Context->state[7] = 0x5BE0CD19UL;
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+//  Sha256Update
-+//
-+//  Adds data to the SHA256 context. This will process the data and update the internal state of the context. Keep on
-+//  calling this function until all the data has been added. Then call Sha256Finalise to calculate the hash.
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+void
-+    Sha256Update
-+    (
-+        Sha256Context*      Context,        // [in out]
-+        void const*         Buffer,         // [in]
-+        uint32_t            BufferSize      // [in]
-+    )
-+{
-+    uint32_t n;
-+
-+    if( Context->curlen > sizeof(Context->buf) )
-+    {
-+       return;
-+    }
-+
-+    while( BufferSize > 0 )
-+    {
-+        if( Context->curlen == 0 && BufferSize >= BLOCK_SIZE )
-+        {
-+           TransformFunction( Context, (uint8_t*)Buffer );
-+           Context->length += BLOCK_SIZE * 8;
-+           Buffer = (uint8_t*)Buffer + BLOCK_SIZE;
-+           BufferSize -= BLOCK_SIZE;
-+        }
-+        else
-+        {
-+           n = MIN( BufferSize, (BLOCK_SIZE - Context->curlen) );
-+           memcpy( Context->buf + Context->curlen, Buffer, (size_t)n );
-+           Context->curlen += n;
-+           Buffer = (uint8_t*)Buffer + n;
-+           BufferSize -= n;
-+           if( Context->curlen == BLOCK_SIZE )
-+           {
-+              TransformFunction( Context, Context->buf );
-+              Context->length += 8*BLOCK_SIZE;
-+              Context->curlen = 0;
-+           }
-+       }
-+    }
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+//  Sha256Finalise
-+//
-+//  Performs the final calculation of the hash and returns the digest (32 byte buffer containing 256bit hash). After
-+//  calling this, Sha256Initialised must be used to reuse the context.
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+void
-+    Sha256Finalise
-+    (
-+        Sha256Context*      Context,        // [in out]
-+        SHA256_HASH*        Digest          // [out]
-+    )
-+{
-+    int i;
-+
-+    if( Context->curlen >= sizeof(Context->buf) )
-+    {
-+       return;
-+    }
-+
-+    // Increase the length of the message
-+    Context->length += Context->curlen * 8;
-+
-+    // Append the '1' bit
-+    Context->buf[Context->curlen++] = (uint8_t)0x80;
-+
-+    // if the length is currently above 56 bytes we append zeros
-+    // then compress.  Then we can fall back to padding zeros and length
-+    // encoding like normal.
-+    if( Context->curlen > 56 )
-+    {
-+        while( Context->curlen < 64 )
-+        {
-+            Context->buf[Context->curlen++] = (uint8_t)0;
-+        }
-+        TransformFunction(Context, Context->buf);
-+        Context->curlen = 0;
-+    }
-+
-+    // Pad up to 56 bytes of zeroes
-+    while( Context->curlen < 56 )
-+    {
-+        Context->buf[Context->curlen++] = (uint8_t)0;
-+    }
-+
-+    // Store length
-+    STORE64H( Context->length, Context->buf+56 );
-+    TransformFunction( Context, Context->buf );
-+
-+    // Copy output
-+    for( i=0; i<8; i++ )
-+    {
-+        STORE32H( Context->state[i], Digest->bytes+(4*i) );
-+    }
-+}
-+
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+//  Sha256Calculate
-+//
-+//  Combines Sha256Initialise, Sha256Update, and Sha256Finalise into one function. Calculates the SHA256 hash of the
-+//  buffer.
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+void
-+    Sha256Calculate
-+    (
-+        void  const*        Buffer,         // [in]
-+        uint32_t            BufferSize,     // [in]
-+        SHA256_HASH*        Digest          // [in]
-+    )
-+{
-+    Sha256Context context;
-+
-+    Sha256Initialise( &context );
-+    Sha256Update( &context, Buffer, BufferSize );
-+    Sha256Finalise( &context, Digest );
-+}
-diff --git a/policycoreutils/semodule/sha256.h b/policycoreutils/semodule/sha256.h
-new file mode 100644
-index 000000000000..406ed869cd82
---- /dev/null
-+++ b/policycoreutils/semodule/sha256.h
-@@ -0,0 +1,89 @@
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+//  WjCryptLib_Sha256
-+//
-+//  Implementation of SHA256 hash function.
-+//  Original author: Tom St Denis, tomstdenis@gmail.com, http://libtom.org
-+//  Modified by WaterJuice retaining Public Domain license.
-+//
-+//  This is free and unencumbered software released into the public domain - June 2013 waterjuice.org
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+
-+#pragma once
-+
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+//  IMPORTS
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+
-+#include <stdint.h>
-+#include <stdio.h>
-+
-+typedef struct
-+{
-+    uint64_t    length;
-+    uint32_t    state[8];
-+    uint32_t    curlen;
-+    uint8_t     buf[64];
-+} Sha256Context;
-+
-+#define SHA256_HASH_SIZE           ( 256 / 8 )
-+
-+typedef struct
-+{
-+    uint8_t      bytes [SHA256_HASH_SIZE];
-+} SHA256_HASH;
-+
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+//  PUBLIC FUNCTIONS
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+//  Sha256Initialise
-+//
-+//  Initialises a SHA256 Context. Use this to initialise/reset a context.
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+void
-+    Sha256Initialise
-+    (
-+        Sha256Context*      Context         // [out]
-+    );
-+
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+//  Sha256Update
-+//
-+//  Adds data to the SHA256 context. This will process the data and update the internal state of the context. Keep on
-+//  calling this function until all the data has been added. Then call Sha256Finalise to calculate the hash.
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+void
-+    Sha256Update
-+    (
-+        Sha256Context*      Context,        // [in out]
-+        void const*         Buffer,         // [in]
-+        uint32_t            BufferSize      // [in]
-+    );
-+
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+//  Sha256Finalise
-+//
-+//  Performs the final calculation of the hash and returns the digest (32 byte buffer containing 256bit hash). After
-+//  calling this, Sha256Initialised must be used to reuse the context.
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+void
-+    Sha256Finalise
-+    (
-+        Sha256Context*      Context,        // [in out]
-+        SHA256_HASH*        Digest          // [out]
-+    );
-+
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+//  Sha256Calculate
-+//
-+//  Combines Sha256Initialise, Sha256Update, and Sha256Finalise into one function. Calculates the SHA256 hash of the
-+//  buffer.
-+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+void
-+    Sha256Calculate
-+    (
-+        void  const*        Buffer,         // [in]
-+        uint32_t            BufferSize,     // [in]
-+        SHA256_HASH*        Digest          // [in]
-+    );
--- 
-2.33.1
-

0021-semodule-Fix-lang_ext-column-index.patch

@@ -1,29 +0,0 @@
-From 7537374e7f5802852c0c64b4cb2a9646402e3cba Mon Sep 17 00:00:00 2001
-From: Petr Lautrbach <plautrba@redhat.com>
-Date: Tue, 16 Nov 2021 16:11:22 +0100
-Subject: [PATCH] semodule: Fix lang_ext column index
-
-lang_ext is 3. column - index number 2.
-
-Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
-Acked-by: James Carter <jwcart2@gmail.com>
----
- policycoreutils/semodule/semodule.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/policycoreutils/semodule/semodule.c b/policycoreutils/semodule/semodule.c
-index ddbf10455abf..57f005ce2c62 100644
---- a/policycoreutils/semodule/semodule.c
-+++ b/policycoreutils/semodule/semodule.c
-@@ -684,7 +684,7 @@ cleanup_extract:
- 						if (result != 0) goto cleanup_list;
- 
- 						size = strlen(tmp);
--						if (size > column[3]) column[3] = size;
-+						if (size > column[2]) column[2] = size;
- 					}
- 
- 					/* print out each module */
--- 
-2.33.1
-

0022-semodule-Don-t-forget-to-munmap-data.patch

@@ -1,32 +0,0 @@
-From 0c4e5d70fde006977e798d6cc7d80db2e8af7bb9 Mon Sep 17 00:00:00 2001
-From: Petr Lautrbach <plautrba@redhat.com>
-Date: Tue, 23 Nov 2021 17:38:51 +0100
-Subject: [PATCH] semodule: Don't forget to munmap() data
-
-semanage_module_extract() mmap()'s the module raw data but it leaves on
-the caller to munmap() them.
-
-Reported-by: Ondrej Mosnacek <omosnace@redhat.com>
-Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
-Acked-by: James Carter <jwcart2@gmail.com>
----
- policycoreutils/semodule/semodule.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/policycoreutils/semodule/semodule.c b/policycoreutils/semodule/semodule.c
-index 57f005ce2c62..94a9d131bb79 100644
---- a/policycoreutils/semodule/semodule.c
-+++ b/policycoreutils/semodule/semodule.c
-@@ -394,6 +394,9 @@ static char *hash_module_data(const char *module_name, const int prio) {
- 	sha256_buf[i * 2] = 0;
- 
- cleanup_extract:
-+	if (data_len > 0) {
-+		munmap(data, data_len);
-+	}
- 	semanage_module_info_destroy(sh, extract_info);
- 	free(extract_info);
- 	semanage_module_key_destroy(sh, modkey);
--- 
-2.33.1
-

0023-semodule-libsemanage-move-module-hashing-into-libsem.patch

@@ -1,539 +0,0 @@
-From 7809f29b68e17a455478990ae9b22728381a126b Mon Sep 17 00:00:00 2001
-From: Ondrej Mosnacek <omosnace@redhat.com>
-Date: Thu, 3 Feb 2022 17:53:23 +0100
-Subject: [PATCH] semodule,libsemanage: move module hashing into libsemanage
-
-The main goal of this move is to have the SHA-256 implementation under
-libsemanage, since upcoming patches will make use of SHA-256 for a
-different (but similar) purpose in libsemanage. Having the hashing code
-in libsemanage will reduce code duplication and allow for easier hash
-algorithm upgrade in the future.
-
-Note that libselinux currently also contains a hash function
-implementation (for yet another different purpose). This patch doesn't
-make any effort to address that duplicity yet.
-
-This patch also changes the format of the hash string printed by
-semodule to include the name of the hash. The intent is to avoid
-ambiguity and potential collisions when the algorithm is potentially
-changed in the future.
-
-Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
----
- policycoreutils/semodule/Makefile   |   2 +-
- policycoreutils/semodule/semodule.c |  53 ++---
- policycoreutils/semodule/sha256.c   | 294 ----------------------------
- policycoreutils/semodule/sha256.h   |  89 ---------
- 4 files changed, 17 insertions(+), 421 deletions(-)
- delete mode 100644 policycoreutils/semodule/sha256.c
- delete mode 100644 policycoreutils/semodule/sha256.h
-
-diff --git a/policycoreutils/semodule/Makefile b/policycoreutils/semodule/Makefile
-index 9875ac383280..73801e487a76 100644
---- a/policycoreutils/semodule/Makefile
-+++ b/policycoreutils/semodule/Makefile
-@@ -6,7 +6,7 @@ MANDIR = $(PREFIX)/share/man
- 
- CFLAGS ?= -Werror -Wall -W
- override LDLIBS += -lsepol -lselinux -lsemanage
--SEMODULE_OBJS = semodule.o sha256.o
-+SEMODULE_OBJS = semodule.o
- 
- all: semodule genhomedircon
- 
-diff --git a/policycoreutils/semodule/semodule.c b/policycoreutils/semodule/semodule.c
-index 94a9d131bb79..f4a76289efa3 100644
---- a/policycoreutils/semodule/semodule.c
-+++ b/policycoreutils/semodule/semodule.c
-@@ -25,8 +25,6 @@
- #include <sepol/cil/cil.h>
- #include <semanage/modules.h>
- 
--#include "sha256.h"
--
- enum client_modes {
- 	NO_MODE, INSTALL_M, REMOVE_M, EXTRACT_M, CIL_M, HLL_M,
- 	LIST_M, RELOAD, PRIORITY_M, ENABLE_M, DISABLE_M
-@@ -348,60 +346,38 @@ static void parse_command_line(int argc, char **argv)
- 
- /* Get module checksum */
- static char *hash_module_data(const char *module_name, const int prio) {
--	semanage_module_info_t *extract_info = NULL;
- 	semanage_module_key_t *modkey = NULL;
--	Sha256Context context;
--	uint8_t sha256_hash[SHA256_HASH_SIZE];
--	char *sha256_buf = NULL;
--	void *data;
--	size_t data_len = 0, i;
-+	char *hash_str = NULL;
-+	void *hash = NULL;
-+	size_t hash_len = 0;
- 	int result;
- 
- 	result = semanage_module_key_create(sh, &modkey);
- 	if (result != 0) {
--		goto cleanup_extract;
-+		goto cleanup;
- 	}
- 
- 	result = semanage_module_key_set_name(sh, modkey, module_name);
- 	if (result != 0) {
--		goto cleanup_extract;
-+		goto cleanup;
- 	}
- 
- 	result = semanage_module_key_set_priority(sh, modkey, prio);
- 	if (result != 0) {
--		goto cleanup_extract;
-+		goto cleanup;
- 	}
- 
--	result = semanage_module_extract(sh, modkey, 1, &data, &data_len,
--									 &extract_info);
-+	result = semanage_module_compute_checksum(sh, modkey, 1, &hash_str,
-+						  &hash_len);
- 	if (result != 0) {
--		goto cleanup_extract;
--	}
--
--	Sha256Initialise(&context);
--	Sha256Update(&context, data, data_len);
--
--	Sha256Finalise(&context, (SHA256_HASH *)sha256_hash);
--
--	sha256_buf = calloc(1, SHA256_HASH_SIZE * 2 + 1);
--
--	if (sha256_buf == NULL)
--		goto cleanup_extract;
--
--	for (i = 0; i < SHA256_HASH_SIZE; i++) {
--		sprintf((&sha256_buf[i * 2]), "%02x", sha256_hash[i]);
-+		goto cleanup;
- 	}
--	sha256_buf[i * 2] = 0;
- 
--cleanup_extract:
--	if (data_len > 0) {
--		munmap(data, data_len);
--	}
--	semanage_module_info_destroy(sh, extract_info);
--	free(extract_info);
-+cleanup:
-+	free(hash);
- 	semanage_module_key_destroy(sh, modkey);
- 	free(modkey);
--	return sha256_buf;
-+	return hash_str;
- }
- 
- int main(int argc, char *argv[])
-@@ -669,7 +645,10 @@ cleanup_extract:
- 					/* fixed width columns */
- 					column[0] = sizeof("000") - 1;
- 					column[3] = sizeof("disabled") - 1;
--					column[4] = 64; /* SHA256_HASH_SIZE * 2 */
-+
-+					result = semanage_module_compute_checksum(sh, NULL, 0, NULL,
-+										  &column[4]);
-+					if (result != 0) goto cleanup_list;
- 
- 					/* variable width columns */
- 					const char *tmp = NULL;
-diff --git a/policycoreutils/semodule/sha256.c b/policycoreutils/semodule/sha256.c
-deleted file mode 100644
-index fe2aeef07f53..000000000000
---- a/policycoreutils/semodule/sha256.c
-+++ /dev/null
-@@ -1,294 +0,0 @@
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--//  WjCryptLib_Sha256
--//
--//  Implementation of SHA256 hash function.
--//  Original author: Tom St Denis, tomstdenis@gmail.com, http://libtom.org
--//  Modified by WaterJuice retaining Public Domain license.
--//
--//  This is free and unencumbered software released into the public domain - June 2013 waterjuice.org
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--//  IMPORTS
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--
--#include "sha256.h"
--#include <memory.h>
--
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--//  MACROS
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--
--#define ror(value, bits) (((value) >> (bits)) | ((value) << (32 - (bits))))
--
--#define MIN(x, y) ( ((x)<(y))?(x):(y) )
--
--#define STORE32H(x, y)                                                                     \
--     { (y)[0] = (uint8_t)(((x)>>24)&255); (y)[1] = (uint8_t)(((x)>>16)&255);   \
--       (y)[2] = (uint8_t)(((x)>>8)&255); (y)[3] = (uint8_t)((x)&255); }
--
--#define LOAD32H(x, y)                            \
--     { x = ((uint32_t)((y)[0] & 255)<<24) | \
--           ((uint32_t)((y)[1] & 255)<<16) | \
--           ((uint32_t)((y)[2] & 255)<<8)  | \
--           ((uint32_t)((y)[3] & 255)); }
--
--#define STORE64H(x, y)                                                                     \
--   { (y)[0] = (uint8_t)(((x)>>56)&255); (y)[1] = (uint8_t)(((x)>>48)&255);     \
--     (y)[2] = (uint8_t)(((x)>>40)&255); (y)[3] = (uint8_t)(((x)>>32)&255);     \
--     (y)[4] = (uint8_t)(((x)>>24)&255); (y)[5] = (uint8_t)(((x)>>16)&255);     \
--     (y)[6] = (uint8_t)(((x)>>8)&255); (y)[7] = (uint8_t)((x)&255); }
--
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--//  CONSTANTS
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--
--// The K array
--static const uint32_t K[64] = {
--    0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL, 0x3956c25bUL,
--    0x59f111f1UL, 0x923f82a4UL, 0xab1c5ed5UL, 0xd807aa98UL, 0x12835b01UL,
--    0x243185beUL, 0x550c7dc3UL, 0x72be5d74UL, 0x80deb1feUL, 0x9bdc06a7UL,
--    0xc19bf174UL, 0xe49b69c1UL, 0xefbe4786UL, 0x0fc19dc6UL, 0x240ca1ccUL,
--    0x2de92c6fUL, 0x4a7484aaUL, 0x5cb0a9dcUL, 0x76f988daUL, 0x983e5152UL,
--    0xa831c66dUL, 0xb00327c8UL, 0xbf597fc7UL, 0xc6e00bf3UL, 0xd5a79147UL,
--    0x06ca6351UL, 0x14292967UL, 0x27b70a85UL, 0x2e1b2138UL, 0x4d2c6dfcUL,
--    0x53380d13UL, 0x650a7354UL, 0x766a0abbUL, 0x81c2c92eUL, 0x92722c85UL,
--    0xa2bfe8a1UL, 0xa81a664bUL, 0xc24b8b70UL, 0xc76c51a3UL, 0xd192e819UL,
--    0xd6990624UL, 0xf40e3585UL, 0x106aa070UL, 0x19a4c116UL, 0x1e376c08UL,
--    0x2748774cUL, 0x34b0bcb5UL, 0x391c0cb3UL, 0x4ed8aa4aUL, 0x5b9cca4fUL,
--    0x682e6ff3UL, 0x748f82eeUL, 0x78a5636fUL, 0x84c87814UL, 0x8cc70208UL,
--    0x90befffaUL, 0xa4506cebUL, 0xbef9a3f7UL, 0xc67178f2UL
--};
--
--#define BLOCK_SIZE          64
--
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--//  INTERNAL FUNCTIONS
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--
--// Various logical functions
--#define Ch( x, y, z )     (z ^ (x & (y ^ z)))
--#define Maj( x, y, z )    (((x | y) & z) | (x & y))
--#define S( x, n )         ror((x),(n))
--#define R( x, n )         (((x)&0xFFFFFFFFUL)>>(n))
--#define Sigma0( x )       (S(x, 2) ^ S(x, 13) ^ S(x, 22))
--#define Sigma1( x )       (S(x, 6) ^ S(x, 11) ^ S(x, 25))
--#define Gamma0( x )       (S(x, 7) ^ S(x, 18) ^ R(x, 3))
--#define Gamma1( x )       (S(x, 17) ^ S(x, 19) ^ R(x, 10))
--
--#define Sha256Round( a, b, c, d, e, f, g, h, i )       \
--     t0 = h + Sigma1(e) + Ch(e, f, g) + K[i] + W[i];   \
--     t1 = Sigma0(a) + Maj(a, b, c);                    \
--     d += t0;                                          \
--     h  = t0 + t1;
--
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--//  TransformFunction
--//
--//  Compress 512-bits
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--static
--void
--    TransformFunction
--    (
--        Sha256Context*      Context,
--        uint8_t const*      Buffer
--    )
--{
--    uint32_t    S[8];
--    uint32_t    W[64];
--    uint32_t    t0;
--    uint32_t    t1;
--    uint32_t    t;
--    int         i;
--
--    // Copy state into S
--    for( i=0; i<8; i++ )
--    {
--        S[i] = Context->state[i];
--    }
--
--    // Copy the state into 512-bits into W[0..15]
--    for( i=0; i<16; i++ )
--    {
--        LOAD32H( W[i], Buffer + (4*i) );
--    }
--
--    // Fill W[16..63]
--    for( i=16; i<64; i++ )
--    {
--        W[i] = Gamma1( W[i-2]) + W[i-7] + Gamma0( W[i-15] ) + W[i-16];
--    }
--
--    // Compress
--    for( i=0; i<64; i++ )
--    {
--        Sha256Round( S[0], S[1], S[2], S[3], S[4], S[5], S[6], S[7], i );
--        t = S[7];
--        S[7] = S[6];
--        S[6] = S[5];
--        S[5] = S[4];
--        S[4] = S[3];
--        S[3] = S[2];
--        S[2] = S[1];
--        S[1] = S[0];
--        S[0] = t;
--    }
--
--    // Feedback
--    for( i=0; i<8; i++ )
--    {
--        Context->state[i] = Context->state[i] + S[i];
--    }
--}
--
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--//  PUBLIC FUNCTIONS
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--//  Sha256Initialise
--//
--//  Initialises a SHA256 Context. Use this to initialise/reset a context.
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--void
--    Sha256Initialise
--    (
--        Sha256Context*      Context         // [out]
--    )
--{
--    Context->curlen = 0;
--    Context->length = 0;
--    Context->state[0] = 0x6A09E667UL;
--    Context->state[1] = 0xBB67AE85UL;
--    Context->state[2] = 0x3C6EF372UL;
--    Context->state[3] = 0xA54FF53AUL;
--    Context->state[4] = 0x510E527FUL;
--    Context->state[5] = 0x9B05688CUL;
--    Context->state[6] = 0x1F83D9ABUL;
--    Context->state[7] = 0x5BE0CD19UL;
--}
--
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--//  Sha256Update
--//
--//  Adds data to the SHA256 context. This will process the data and update the internal state of the context. Keep on
--//  calling this function until all the data has been added. Then call Sha256Finalise to calculate the hash.
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--void
--    Sha256Update
--    (
--        Sha256Context*      Context,        // [in out]
--        void const*         Buffer,         // [in]
--        uint32_t            BufferSize      // [in]
--    )
--{
--    uint32_t n;
--
--    if( Context->curlen > sizeof(Context->buf) )
--    {
--       return;
--    }
--
--    while( BufferSize > 0 )
--    {
--        if( Context->curlen == 0 && BufferSize >= BLOCK_SIZE )
--        {
--           TransformFunction( Context, (uint8_t*)Buffer );
--           Context->length += BLOCK_SIZE * 8;
--           Buffer = (uint8_t*)Buffer + BLOCK_SIZE;
--           BufferSize -= BLOCK_SIZE;
--        }
--        else
--        {
--           n = MIN( BufferSize, (BLOCK_SIZE - Context->curlen) );
--           memcpy( Context->buf + Context->curlen, Buffer, (size_t)n );
--           Context->curlen += n;
--           Buffer = (uint8_t*)Buffer + n;
--           BufferSize -= n;
--           if( Context->curlen == BLOCK_SIZE )
--           {
--              TransformFunction( Context, Context->buf );
--              Context->length += 8*BLOCK_SIZE;
--              Context->curlen = 0;
--           }
--       }
--    }
--}
--
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--//  Sha256Finalise
--//
--//  Performs the final calculation of the hash and returns the digest (32 byte buffer containing 256bit hash). After
--//  calling this, Sha256Initialised must be used to reuse the context.
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--void
--    Sha256Finalise
--    (
--        Sha256Context*      Context,        // [in out]
--        SHA256_HASH*        Digest          // [out]
--    )
--{
--    int i;
--
--    if( Context->curlen >= sizeof(Context->buf) )
--    {
--       return;
--    }
--
--    // Increase the length of the message
--    Context->length += Context->curlen * 8;
--
--    // Append the '1' bit
--    Context->buf[Context->curlen++] = (uint8_t)0x80;
--
--    // if the length is currently above 56 bytes we append zeros
--    // then compress.  Then we can fall back to padding zeros and length
--    // encoding like normal.
--    if( Context->curlen > 56 )
--    {
--        while( Context->curlen < 64 )
--        {
--            Context->buf[Context->curlen++] = (uint8_t)0;
--        }
--        TransformFunction(Context, Context->buf);
--        Context->curlen = 0;
--    }
--
--    // Pad up to 56 bytes of zeroes
--    while( Context->curlen < 56 )
--    {
--        Context->buf[Context->curlen++] = (uint8_t)0;
--    }
--
--    // Store length
--    STORE64H( Context->length, Context->buf+56 );
--    TransformFunction( Context, Context->buf );
--
--    // Copy output
--    for( i=0; i<8; i++ )
--    {
--        STORE32H( Context->state[i], Digest->bytes+(4*i) );
--    }
--}
--
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--//  Sha256Calculate
--//
--//  Combines Sha256Initialise, Sha256Update, and Sha256Finalise into one function. Calculates the SHA256 hash of the
--//  buffer.
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--void
--    Sha256Calculate
--    (
--        void  const*        Buffer,         // [in]
--        uint32_t            BufferSize,     // [in]
--        SHA256_HASH*        Digest          // [in]
--    )
--{
--    Sha256Context context;
--
--    Sha256Initialise( &context );
--    Sha256Update( &context, Buffer, BufferSize );
--    Sha256Finalise( &context, Digest );
--}
-diff --git a/policycoreutils/semodule/sha256.h b/policycoreutils/semodule/sha256.h
-deleted file mode 100644
-index 406ed869cd82..000000000000
---- a/policycoreutils/semodule/sha256.h
-+++ /dev/null
-@@ -1,89 +0,0 @@
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--//  WjCryptLib_Sha256
--//
--//  Implementation of SHA256 hash function.
--//  Original author: Tom St Denis, tomstdenis@gmail.com, http://libtom.org
--//  Modified by WaterJuice retaining Public Domain license.
--//
--//  This is free and unencumbered software released into the public domain - June 2013 waterjuice.org
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--
--#pragma once
--
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--//  IMPORTS
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--
--#include <stdint.h>
--#include <stdio.h>
--
--typedef struct
--{
--    uint64_t    length;
--    uint32_t    state[8];
--    uint32_t    curlen;
--    uint8_t     buf[64];
--} Sha256Context;
--
--#define SHA256_HASH_SIZE           ( 256 / 8 )
--
--typedef struct
--{
--    uint8_t      bytes [SHA256_HASH_SIZE];
--} SHA256_HASH;
--
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--//  PUBLIC FUNCTIONS
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--//  Sha256Initialise
--//
--//  Initialises a SHA256 Context. Use this to initialise/reset a context.
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--void
--    Sha256Initialise
--    (
--        Sha256Context*      Context         // [out]
--    );
--
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--//  Sha256Update
--//
--//  Adds data to the SHA256 context. This will process the data and update the internal state of the context. Keep on
--//  calling this function until all the data has been added. Then call Sha256Finalise to calculate the hash.
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--void
--    Sha256Update
--    (
--        Sha256Context*      Context,        // [in out]
--        void const*         Buffer,         // [in]
--        uint32_t            BufferSize      // [in]
--    );
--
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--//  Sha256Finalise
--//
--//  Performs the final calculation of the hash and returns the digest (32 byte buffer containing 256bit hash). After
--//  calling this, Sha256Initialised must be used to reuse the context.
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--void
--    Sha256Finalise
--    (
--        Sha256Context*      Context,        // [in out]
--        SHA256_HASH*        Digest          // [out]
--    );
--
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--//  Sha256Calculate
--//
--//  Combines Sha256Initialise, Sha256Update, and Sha256Finalise into one function. Calculates the SHA256 hash of the
--//  buffer.
--////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--void
--    Sha256Calculate
--    (
--        void  const*        Buffer,         // [in]
--        uint32_t            BufferSize,     // [in]
--        SHA256_HASH*        Digest          // [in]
--    );
--- 
-2.34.1
-

0024-semodule-add-command-line-option-to-detect-module-ch.patch

@@ -1,144 +0,0 @@
-From 9341da3478625bb2ba2e7d4f3e227735cc9c8198 Mon Sep 17 00:00:00 2001
-From: Ondrej Mosnacek <omosnace@redhat.com>
-Date: Thu, 3 Feb 2022 17:53:27 +0100
-Subject: [PATCH] semodule: add command-line option to detect module changes
-
-Add a new command-line option "--rebuild-if-modules-changed" to control
-the newly introduced check_ext_changes libsemanage flag.
-
-For example, running `semodule --rebuild-if-modules-changed` will ensure
-that any externally added/removed modules (e.g. by an RPM transaction)
-are reflected in the compiled policy, while skipping the most expensive
-part of the rebuild if no module change was deteceted since the last
-libsemanage transaction.
-
-Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
----
- policycoreutils/semodule/semodule.8 |  7 +++++++
- policycoreutils/semodule/semodule.c | 32 ++++++++++++++++++++++-------
- 2 files changed, 32 insertions(+), 7 deletions(-)
-
-diff --git a/policycoreutils/semodule/semodule.8 b/policycoreutils/semodule/semodule.8
-index 3a2fb21c2481..d1735d216276 100644
---- a/policycoreutils/semodule/semodule.8
-+++ b/policycoreutils/semodule/semodule.8
-@@ -23,6 +23,13 @@ force a reload of policy
- .B \-B, \-\-build
- force a rebuild of policy (also reloads unless \-n is used)
- .TP
-+.B \-\-rebuild-if-modules-changed
-+Force a rebuild of the policy if any changes to module content are detected
-+(by comparing with checksum from the last transaction).  One can use this
-+instead of \-B to ensure that any changes to the module store done by an
-+external tool (e.g. a package manager) are applied, while automatically
-+skipping the rebuild if there are no new changes.
-+.TP
- .B \-D, \-\-disable_dontaudit
- Temporarily remove dontaudits from policy.  Reverts whenever policy is rebuilt
- .TP
-diff --git a/policycoreutils/semodule/semodule.c b/policycoreutils/semodule/semodule.c
-index f4a76289efa3..1ed8e69054e0 100644
---- a/policycoreutils/semodule/semodule.c
-+++ b/policycoreutils/semodule/semodule.c
-@@ -47,6 +47,7 @@ static int verbose;
- static int reload;
- static int no_reload;
- static int build;
-+static int check_ext_changes;
- static int disable_dontaudit;
- static int preserve_tunables;
- static int ignore_module_cache;
-@@ -149,6 +150,9 @@ static void usage(char *progname)
- 	printf("  -c, --cil extract module as cil. This only affects module extraction.\n");
- 	printf("  -H, --hll extract module as hll. This only affects module extraction.\n");
- 	printf("  -m, --checksum   print module checksum (SHA256).\n");
-+	printf("      --rebuild-if-modules-changed\n"
-+	       "                   force policy rebuild if module content changed since\n"
-+	       "                   last rebuild (based on checksum)\n");
- }
- 
- /* Sets the global mode variable to new_mode, but only if no other
-@@ -180,6 +184,7 @@ static void set_mode(enum client_modes new_mode, char *arg)
- static void parse_command_line(int argc, char **argv)
- {
- 	static struct option opts[] = {
-+		{"rebuild-if-modules-changed", 0, NULL, '\0'},
- 		{"store", required_argument, NULL, 's'},
- 		{"base", required_argument, NULL, 'b'},
- 		{"help", 0, NULL, 'h'},
-@@ -207,15 +212,26 @@ static void parse_command_line(int argc, char **argv)
- 	};
- 	int extract_selected = 0;
- 	int cil_hll_set = 0;
--	int i;
-+	int i, longind;
- 	verbose = 0;
- 	reload = 0;
- 	no_reload = 0;
-+	check_ext_changes = 0;
- 	priority = 400;
- 	while ((i =
--		getopt_long(argc, argv, "s:b:hi:l::vr:u:RnNBDCPX:e:d:p:S:E:cHm", opts,
--			    NULL)) != -1) {
-+		getopt_long(argc, argv, "s:b:hi:l::vr:u:RnNBDCPX:e:d:p:S:E:cHm",
-+			    opts, &longind)) != -1) {
- 		switch (i) {
-+		case '\0':
-+			switch(longind) {
-+			case 0: /* --rebuild-if-modules-changed */
-+				check_ext_changes = 1;
-+				break;
-+			default:
-+				usage(argv[0]);
-+				exit(1);
-+			}
-+			break;
- 		case 'b':
- 			fprintf(stderr, "The --base option is deprecated. Use --install instead.\n");
- 			set_mode(INSTALL_M, optarg);
-@@ -300,13 +316,13 @@ static void parse_command_line(int argc, char **argv)
- 			}
- 		}
- 	}
--	if ((build || reload) && num_commands) {
-+	if ((build || reload || check_ext_changes) && num_commands) {
- 		fprintf(stderr,
- 			"build or reload should not be used with other commands\n");
- 		usage(argv[0]);
- 		exit(1);
- 	}
--	if (num_commands == 0 && reload == 0 && build == 0) {
-+	if (num_commands == 0 && reload == 0 && build == 0 && check_ext_changes == 0) {
- 		fprintf(stderr, "At least one mode must be specified.\n");
- 		usage(argv[0]);
- 		exit(1);
-@@ -395,7 +411,7 @@ int main(int argc, char *argv[])
- 
- 	cil_set_log_level(CIL_ERR + verbose);
- 
--	if (build)
-+	if (build || check_ext_changes)
- 		commit = 1;
- 
- 	sh = semanage_handle_create();
-@@ -434,7 +450,7 @@ int main(int argc, char *argv[])
- 		}
- 	}
- 
--	if (build) {
-+	if (build || check_ext_changes) {
- 		if ((result = semanage_begin_transaction(sh)) < 0) {
- 			fprintf(stderr, "%s:  Could not begin transaction:  %s\n",
- 				argv[0], errno ? strerror(errno) : "");
-@@ -807,6 +823,8 @@ cleanup_disable:
- 			semanage_set_reload(sh, 0);
- 		if (build)
- 			semanage_set_rebuild(sh, 1);
-+		if (check_ext_changes)
-+			semanage_set_check_ext_changes(sh, 1);
- 		if (disable_dontaudit)
- 			semanage_set_disable_dontaudit(sh, 1);
- 		else if (build)
--- 
-2.34.1
-

0025-policycoreutils-fixfiles-Use-parallel-relabeling.patch

@@ -1,180 +0,0 @@
-From 09f700e9f953769d1697c46179faba32e4b80c0f Mon Sep 17 00:00:00 2001
-From: Petr Lautrbach <plautrba@redhat.com>
-Date: Fri, 4 Feb 2022 13:41:12 +0100
-Subject: [PATCH] policycoreutils/fixfiles: Use parallel relabeling
-
-Commit 93902fc8340f ("setfiles/restorecon: support parallel relabeling")
-implemented support for parallel relabeling in setfiles. This is
-available for fixfiles now.
-
-Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
----
- policycoreutils/scripts/fixfiles   | 35 +++++++++++++++++-------------
- policycoreutils/scripts/fixfiles.8 | 17 ++++++++++-----
- 2 files changed, 31 insertions(+), 21 deletions(-)
-
-diff --git a/policycoreutils/scripts/fixfiles b/policycoreutils/scripts/fixfiles
-index cb20002ab613..a4a419ab62de 100755
---- a/policycoreutils/scripts/fixfiles
-+++ b/policycoreutils/scripts/fixfiles
-@@ -110,6 +110,7 @@ BOOTTIME=""
- VERBOSE="-p"
- [ -t 1 ] || VERBOSE=""
- FORCEFLAG=""
-+THREADS=""
- RPMFILES=""
- PREFC=""
- RESTORE_MODE=""
-@@ -153,7 +154,7 @@ newer() {
-     shift
-     LogReadOnly
-     for m in `echo $FILESYSTEMSRW`; do
--	find $m -mount -newermt $DATE -print0 2>/dev/null | ${RESTORECON} ${FORCEFLAG} ${VERBOSE} $* -i -0 -f -
-+	find $m -mount -newermt $DATE -print0 2>/dev/null | ${RESTORECON} ${FORCEFLAG} ${VERBOSE} ${THREADS} $* -i -0 -f -
-     done;
- }
- 
-@@ -197,7 +198,7 @@ if [ -f ${PREFC} -a -x /usr/bin/diff ]; then
- 		  esac; \
- 	       fi; \
- 	    done | \
--	${RESTORECON} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} $* -i -R -f -; \
-+	${RESTORECON} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} ${THREADS} $* -i -R -f -; \
- 	rm -f ${TEMPFILE} ${PREFCTEMPFILE}
- fi
- }
-@@ -235,11 +236,11 @@ LogExcluded
- case "$RESTORE_MODE" in
-     RPMFILES)
- 	for i in `echo "$RPMFILES" | sed 's/,/ /g'`; do
--	    rpmlist $i | ${RESTORECON} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} $* -i -R -f -
-+	    rpmlist $i | ${RESTORECON} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} ${THREADS} $* -i -R -f -
- 	done
-     ;;
-     FILEPATH)
--	${RESTORECON} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} $* -R -- "$FILEPATH"
-+	${RESTORECON} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} ${THREADS} $* -R -- "$FILEPATH"
-     ;;
-     *)
- 	if [ -n "${FILESYSTEMSRW}" ]; then
-@@ -247,7 +248,7 @@ case "$RESTORE_MODE" in
- 	    echo "${OPTION}ing `echo ${FILESYSTEMSRW}`"
- 
- 	    if [ -z "$BIND_MOUNT_FILESYSTEMS" ]; then
--	        ${SETFILES} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} $* -q ${FC} ${FILESYSTEMSRW}
-+	        ${SETFILES} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} $* -q ${THREADS} ${FC} ${FILESYSTEMSRW}
- 	    else
- 	        # we bind mount so we can fix the labels of files that have already been
- 	        # mounted over
-@@ -257,7 +258,7 @@ case "$RESTORE_MODE" in
- 
- 	            mkdir -p "${TMP_MOUNT}${m}" || exit 1
- 	            mount --bind "${m}" "${TMP_MOUNT}${m}" || exit 1
--	            ${SETFILES} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} $* -q ${FC} -r "${TMP_MOUNT}" "${TMP_MOUNT}${m}"
-+	            ${SETFILES} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} ${THREADS} $* -q ${FC} -r "${TMP_MOUNT}" "${TMP_MOUNT}${m}"
- 	            umount "${TMP_MOUNT}${m}" || exit 1
- 	            rm -rf "${TMP_MOUNT}" || echo "Error cleaning up."
- 	        done;
-@@ -330,8 +331,9 @@ case "$1" in
- 	fi
- 	> /.autorelabel || exit $?
- 	[ -z "$FORCEFLAG" ] || echo -n "$FORCEFLAG " >> /.autorelabel
--	[ -z "$BOOTTIME" ] || echo -N $BOOTTIME >> /.autorelabel
--	[ -z "$BIND_MOUNT_FILESYSTEMS" ] || echo "-M" >> /.autorelabel
-+	[ -z "$BOOTTIME" ] || echo -n "-N $BOOTTIME " >> /.autorelabel
-+	[ -z "$BIND_MOUNT_FILESYSTEMS" ] || echo -n "-M " >> /.autorelabel
-+	[ -z "$THREADS" ] || echo -n "$THREADS " >> /.autorelabel
- 	# Force full relabel if SELinux is not enabled
- 	selinuxenabled || echo -F > /.autorelabel
- 	echo "System will relabel on next boot"
-@@ -343,17 +345,17 @@ esac
- }
- usage() {
- 	echo $"""
--Usage: $0 [-v] [-F] [-M] [-f] relabel
-+Usage: $0 [-v] [-F] [-M] [-f] [-T nthreads] relabel
- or
--Usage: $0 [-v] [-F] [-B | -N time ] { check | restore | verify }
-+Usage: $0 [-v] [-F] [-B | -N time ]  [-T nthreads] { check | restore | verify }
- or
--Usage: $0 [-v] [-F] { check | restore | verify } dir/file ...
-+Usage: $0 [-v] [-F] [-T nthreads] { check | restore | verify } dir/file ...
- or
--Usage: $0 [-v] [-F] -R rpmpackage[,rpmpackage...] { check | restore | verify }
-+Usage: $0 [-v] [-F] [-T nthreads] -R rpmpackage[,rpmpackage...] { check | restore | verify }
- or
--Usage: $0 [-v] [-F] -C PREVIOUS_FILECONTEXT { check | restore | verify }
-+Usage: $0 [-v] [-F] [-T nthreads] -C PREVIOUS_FILECONTEXT { check | restore | verify }
- or
--Usage: $0 [-F] [-M] [-B] onboot
-+Usage: $0 [-F] [-M] [-B] [-T nthreads] onboot
- """
- }
- 
-@@ -372,7 +374,7 @@ set_restore_mode() {
- }
- 
- # See how we were called.
--while getopts "N:BC:FfR:l:vM" i; do
-+while getopts "N:BC:FfR:l:vMT:" i; do
-     case "$i" in
- 	B)
- 		BOOTTIME=`/bin/who -b | awk '{print $3}'`
-@@ -407,6 +409,9 @@ while getopts "N:BC:FfR:l:vM" i; do
- 	f)
- 		fullFlag=1
- 		;;
-+	T)
-+		THREADS="-T $OPTARG"
-+		;;
- 	*)
- 	    usage
- 	    exit 1
-diff --git a/policycoreutils/scripts/fixfiles.8 b/policycoreutils/scripts/fixfiles.8
-index c4e894e56e8f..9a317d9181e2 100644
---- a/policycoreutils/scripts/fixfiles.8
-+++ b/policycoreutils/scripts/fixfiles.8
-@@ -6,22 +6,22 @@ fixfiles \- fix file SELinux security contexts.
- .na
- 
- .B fixfiles
--.I [\-v] [\-F] [-M] [\-f] relabel
-+.I [\-v] [\-F] [-M] [\-f] [\-T nthreads] relabel
- 
- .B fixfiles
--.I [\-v] [\-F] { check | restore | verify } dir/file ...
-+.I [\-v] [\-F] [\-T nthreads] { check | restore | verify } dir/file ...
- 
- .B fixfiles
--.I [\-v] [\-F] [\-B | \-N time ] { check | restore | verify }
-+.I [\-v] [\-F] [\-B | \-N time ] [\-T nthreads] { check | restore | verify }
- 
- .B fixfiles 
--.I [\-v] [\-F] \-R rpmpackagename[,rpmpackagename...] { check | restore | verify }
-+.I [\-v] [\-F] [\-T nthreads] \-R rpmpackagename[,rpmpackagename...] { check | restore | verify }
- 
- .B fixfiles
--.I [\-v] [\-F] \-C PREVIOUS_FILECONTEXT  { check | restore | verify }
-+.I [\-v] [\-F] [\-T nthreads] \-C PREVIOUS_FILECONTEXT  { check | restore | verify }
- 
- .B fixfiles
--.I [-F] [-M] [-B] onboot
-+.I [-F] [-M] [-B] [\-T nthreads] onboot
- 
- .ad
- 
-@@ -76,6 +76,11 @@ Bind mount filesystems before relabeling them, this allows fixing the context of
- .B -v
- Modify verbosity from progress to verbose. (Run restorecon with \-v instead of \-p)
- 
-+.TP
-+.B \-T nthreads
-+Use parallel relabeling, see
-+.B setfiles(8)
-+
- .SH "ARGUMENTS"
- One of:
- .TP 
--- 
-2.34.1
-

README.translations

@@ -1,41 +1,49 @@
-policycoreutils translations currently live in the following locations:
+SELinux translations currently live in the following locations:
 
-- https://fedora.zanata.org/project/view/selinux
-  - contains translations for both stable (Red Hat Enterprise Linux) and master (Fedora) branches
+- https://translate.fedoraproject.org/projects/selinux/
+  - contains 2 versions of translatable strings rhel8 (latest RHEL 8 release) and main (Fedora and RHEL 9)
   - maintains large number of languages (several of which do not actually contain any translated strings)
   - updated by community and partially by RH localization effort
 
-- selinux source repository (https://github.com/fedora-selinux/selinux)
-  - is kept up-to-date with fedora.zanata
+- SELinux source repositories (periodicaly updated from weblate)
+  - https://github.com/fedora-selinux/selinux
+    - used for Fedora, latest CentOS and RHEL 9
+  - https://github.com/SELinuxProject/selinux
+    - upstream repository
 
-How to update source files on fedora.zanata:
+How to update source files on weblate:
   $ git clone git@github.com:fedora-selinux/selinux.git
   $ cd selinux
-
-  # generate new potfile
+  # generate new potfiles
   $ for p in policycoreutils python gui sandbox; do
     cd $p/po
+    rm $p.pot
     make $p.pot
+    sed -i 's/charset=CHARSET/charset=UTF-8/g' $p.pot
     cd -
     done
-
-  # Push potfiles to zanata
-  $ zanata-cli push --push-type source
-
-How to pull new translations from zanata
-  $ git clone git@github.com:fedora-selinux/selinux.git
-  $ cd selinux
-  # Make sure "zanata.xml" file pointing to corresponding translations branch is present
-  # Optionally update source files on zanata
-  # Pull new translations from zanata
-  $ zanata-cli -e pull --pull-type trans
-
-How to update translations *-po.tgz files
-  $ mkdir zanata
-  $ cd zanata
-  $ zanata-cli -e pull --project-config ../zanata.xml  --pull-type both
+  # https://translate.fedoraproject.org/projects/selinux/policycoreutils/en/
+  # Files -> Upload translations
+  # Repeat the process for python, gui and sandbox
+  # or use weblate command line tool (get your API key at https://translate.fedoraproject.org/accounts/profile/#api):
   $ for p in policycoreutils python gui sandbox; do
-    cd $p
-    tar -c -f ../../$p-po.tgz -z .
-    cd -
+    wlc --key <API key> --url https://translate.fedoraproject.org/api/ upload --input $p/po/$p.pot selinux/$p/en --method=source
     done
+
+How to pull new translations from weblate
+  $ git clone git@github.com:fedora-selinux/selinux.git
+  # https://translate.fedoraproject.org/projects/selinux/policycoreutils
+  # Files -> Download translation files as ZIP file (save in selinux source directory)
+  # Repeat the process for python, gui and sandbox
+  # or use weblate command line tool
+  $ for p in policycoreutils python gui sandbox; do
+    wlc --key <API key> --url https://translate.fedoraproject.org/api/ download selinux/$p --output selinux
+    done
+  # unzip archives
+  $ cd selinux
+  $ for p in policycoreutils python gui sandbox; do
+    unzip -o selinux-$p.zip -d ..
+    rm selinux-$p.zip
+    done
+  $ git add .
+  $ git commit

bachradsusi.gpg

@@ -0,0 +1,438 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+dBW9kxiuWpZN3Q==
+=iuRK
+-----END PGP PUBLIC KEY BLOCK-----

macros

@@ -0,0 +1,8 @@
+%add_changelog(changelog:) %{lua:
+  local f = io.open(arg[1], 'r')
+  if f then
+    local content = f:read('*all')
+    f:close()
+    print(content)
+  end
+}

make-rhat-patches.sh

@@ -1,40 +0,0 @@
-#!/bin/bash
-
-POLICYCOREUTILS_VERSION=2.4
-SEPOLGEN_VERSION=1.2.2
-BRANCH=master
-
-REBASEDIR=`mktemp -d rebase.XXXXXX`
-pushd $REBASEDIR
-
-git clone git@github.com:fedora-selinux/selinux.git
-pushd selinux; git checkout $BRANCH; COMMIT=`git rev-parse --verify HEAD`; popd
-
-# prepare policycoreutils-rhat.patch
-tar xfz ../policycoreutils-$POLICYCOREUTILS_VERSION.tar.gz
-pushd policycoreutils-$POLICYCOREUTILS_VERSION
-
-git init; git add .; git commit -m "init"
-cp -r ../selinux/policycoreutils/* .
-git add -A .
-
-git diff --cached --src-prefix=a/policycoreutils-$POLICYCOREUTILS_VERSION/ --dst-prefix=b/policycoreutils-$POLICYCOREUTILS_VERSION/ > ../../policycoreutils-rhat.patch
-
-popd
-
-#prepare sepolgen-rhat.patch
-tar xfz ../sepolgen-$SEPOLGEN_VERSION.tar.gz
-pushd sepolgen-$SEPOLGEN_VERSION
-
-git init; git add .; git commit -m "init"
-cp -r ../selinux/sepolgen/* .
-git add -A .
-
-git diff --cached --src-prefix=a/sepolgen-$SEPOLGEN_VERSION/ --dst-prefix=b/sepolgen-$SEPOLGEN_VERSION/ > ../../sepolgen-rhat.patch
-
-popd
-
-popd
-# echo rm -rf $REBASEDIR
-
-echo policycoreutils-rhat.patch and sepolgen-rhat.patch created from https://github.com/fedora-selinux/selinux/commit/$COMMIT

plans/selinux.fmf

@@ -0,0 +1,7 @@
+summary: selinux tests - Tier 1 | policycoreutils
+discover:
+    how: fmf
+    url: https://src.fedoraproject.org/tests/selinux
+    filter: "tier: 1 | component: policycoreutils & tags: generic, fedora"
+execute:
+    how: tmt

selinux-autorelabel

@@ -30,8 +30,9 @@ efi_set_boot_next() {
 }
 
 relabel_selinux() {
-    # if /sbin/init is not labeled correctly this process is running in the
-    # wrong context, so a reboot will be required after relabel
+    # Switch SELinux to permissive mode, fix labeling issues (or execute shell
+    # and have the user fix them) and reboot the machine so that the correct
+    # labels are applied to all services.
     AUTORELABEL=
     . /etc/selinux/config
     echo "0" > /sys/fs/selinux/enforce
@@ -51,9 +52,15 @@ relabel_selinux() {
 	echo $"*** Relabeling could take a very long time, depending on file"
 	echo $"*** system size and speed of hard drives."
 
-	FORCE=`cat /.autorelabel`
-        [ -x "/usr/sbin/quotaoff" ] && /usr/sbin/quotaoff -aug
-	/sbin/fixfiles $FORCE restore
+	OPTS=`cat /.autorelabel`
+	# by default, use as many threads as there are available
+	# another -T X in $OPTS will override the default value
+	OPTS="-T 0 $OPTS"
+
+	[ -x "/usr/sbin/quotaoff" ] && /usr/sbin/quotaoff -aug
+	echo
+	echo $"Running: /sbin/fixfiles $OPTS restore"
+	/sbin/fixfiles $OPTS restore
     fi
 
     rm -f  /.autorelabel
@@ -63,7 +70,7 @@ relabel_selinux() {
         grub2-editenv - incr boot_indeterminate >/dev/null 2>&1
     fi
     sync
-    systemctl --force reboot
+    systemctl reboot
 }
 
 # Check to see if a full relabel is needed

selinux-autorelabel-generator.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # This systemd.generator(7) detects if SELinux is running and if the
 # user requested an autorelabel, and if so sets the default target to
@@ -18,6 +18,15 @@ fi
 set_target ()
 {
     ln -sf "$unitdir/selinux-autorelabel.target" "$earlydir/default.target"
+    AUTORELABEL="1"
+    source /etc/selinux/config
+    if [ "$AUTORELABEL" = "0" ]; then
+        mkdir -p "$earlydir/selinux-autorelabel.service.d"
+        cat > "$earlydir/selinux-autorelabel.service.d/tty.conf" <<EOF
+[Service]
+StandardInput=tty
+EOF
+    fi
 }
 
 if selinuxenabled; then

sources

@@ -1,6 +1,6 @@
-SHA512 (selinux-3.3-rc3.tar.gz) = 239a10ce5ab31233dbd4fccf3668c2643df66e6b19065a0e57396a2b277cf4769985292613df67011b82afa25ff8dbd02123bd09d59cd8984b8b5d4d572284bc
-SHA512 (gui-po.tgz) = 8e0855256b825eea422b8e2b82cc0decf66b902c9930840905c5ad5dda7bef3679943a22db62709907d48f8a331d67edc5efed3e2638b53e379959b14077b4ea
-SHA512 (policycoreutils-po.tgz) = 66b908f7a167225bebded46f9cf92f42eb194daa2a083d48de43c2a5d33fa42724c5add0a9d029ac9d62c500f6f1c8d3bc138dd598b1fd97e609d7cc7160be72
-SHA512 (python-po.tgz) = 7f2a082b77c7b4417d5d3dac35d86dd635635a9c05a80e5f9284d03604e2f2a06ec879fb29b056d1a46d3fc448cd76e6fd25196834c18a161fd6677f2e11b2be
-SHA512 (sandbox-po.tgz) = 3d4b389b56bab1a6dddce9884dcebdefbefd1017fec6d987ac22a0705f409ed56722387aaca8fe7d9c468862136387bc703062e2b6de8fd102e13fed04ce811b
-SHA512 (selinux-3.3.tar.gz) = 3d1ad92e63484a7533257ae65e4d35d7acb2c9f17b3900240dbfa61c7a7aa4cdf7d7c0c4077e66b30cada26026f9d2ca1ca7d194bfa990d04b0259aef53af100
+SHA512 (selinux-policycoreutils.zip) = 0df9dc274e0d1a2e4e2467f95a18a5bf7b6de2428ac90a0a73d7f3bd766a897062af142ba3cf39cdb79565ba78af960bcd2e35865cc26e14bf2305321780c918
+SHA512 (selinux-python.zip) = 35d209f8bcff498f66465499fcc4cef0780781276a4ba060b2d1d56eed1dd72d253f6b0eae5f679d46cf426b967a7aadac909363513be5d483c95a31249eacdd
+SHA512 (selinux-sandbox.zip) = ecbc0c8280eb6c013b039a2e63ee5a361cd84807613962a012ac0a98092357e9809bea23c3c71bd8ae4745b1dd12a4fce43db5e1cab31614f386a2a8db88b733
+SHA512 (selinux-gui.zip) = 3ae41eba5dd6d34e10dfdb97f4194d170ace2f3044e984077db7d26d05bdaad86625e48e5694e3e8680487ad99a50861d4bea30c4bf08e2820e3b7a8671270c7
+SHA512 (selinux-3.9.tar.gz) = ccfe9c8907ef50e35cda1e8282a4e02e8d2e1749dabde856343f236724214c89d0bcd4e799f383961b990c5fb9a6b0191880a478a8930af447951c8b36689720
+SHA512 (selinux-3.9.tar.gz.asc) = 598498e3919c72e1b7e6db85250ac7b1ff26e33598fb94c29ee74569dddee407fca73961d9fbb245ecf5ff5a7ee0eaa83031f79b7f0b2d89661119d45bbf5954

tests/CIL-modules-without-compilation/Makefile

@@ -1,64 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /CoreOS/policycoreutils/Sanity/CIL-modules-without-compilation
-#   Description: What the test does
-#   Author: Milos Malik <mmalik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2016 Red Hat, Inc.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/CoreOS/policycoreutils/Sanity/CIL-modules-without-compilation
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	test -x runtest.sh || chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Milos Malik <mmalik@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     What the test does" >> $(METADATA)
-	@echo "Type:            Sanity" >> $(METADATA)
-	@echo "TestTime:        5m" >> $(METADATA)
-	@echo "RunFor:          policycoreutils" >> $(METADATA)
-	@echo "Requires:        policycoreutils" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Releases:        -RHEL4 -RHEL6 -RHELClient5 -RHELServer5" >> $(METADATA)
-
-	rhts-lint $(METADATA)
-

tests/CIL-modules-without-compilation/PURPOSE

@@ -1,5 +0,0 @@
-PURPOSE of /CoreOS/policycoreutils/Sanity/CIL-modules-without-compilation
-Author: Milos Malik <mmalik@redhat.com>
-
-Is it possible to manage policy modules written in CIL without any compilation? Does semanage and semodule understand them?
-

tests/CIL-modules-without-compilation/runtest.sh

@@ -1,73 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /CoreOS/policycoreutils/Sanity/CIL-modules-without-compilation
-#   Description: What the test does
-#   Author: Milos Malik <mmalik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2016 Red Hat, Inc.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="policycoreutils"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
-        rlRun "echo '()' > empty.cil"
-        rlRun "echo '(())' > invalid.cil"
-    rlPhaseEnd
-
-    rlPhaseStartTest "empty CIL module"
-        rlRun "semodule -lfull | grep '400.*empty.*cil'" 1
-        rlRun "semodule -i empty.cil"
-        rlRun "semodule -lfull | grep '400.*empty.*cil'"
-        rlRun "semodule -r empty"
-        rlRun "semodule -lfull | grep '400.*empty.*cil'" 1
-        rlRun "semanage module -l | grep 'empty.*400.*cil'" 1
-        rlRun "semanage module -a empty.cil"
-        rlRun "semanage module -l | grep 'empty.*400.*cil'"
-        rlRun "semanage module -r empty"
-        rlRun "semanage module -l | grep 'empty.*400.*cil'" 1
-    rlPhaseEnd
-
-    rlPhaseStartTest "invalid CIL module"
-        rlRun "semodule -lfull | grep '400.*invalid.*cil'" 1
-        rlRun "semodule -i invalid.cil" 1
-        rlRun "semodule -lfull | grep '400.*invalid.*cil'" 1
-        rlRun "semodule -r invalid" 1
-        rlRun "semodule -lfull | grep '400.*invalid.*cil'" 1
-        rlRun "semanage module -l | grep 'invalid.*400.*cil'" 1
-        rlRun "semanage module -a invalid.cil" 1
-        rlRun "semanage module -l | grep 'invalid.*400.*cil'" 1
-        rlRun "semanage module -r invalid" 1
-        rlRun "semanage module -l | grep 'invalid.*400.*cil'" 1
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "rm -f empty.cil invalid.cil"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
-

tests/linux-system-roles.selinux-tests/Makefile

@@ -1,63 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of selinux-ansible-playbook
-#   Description: Run linux-system-roles.selinux (https://github.com/linux-system-roles/selinux.git) Ansible role tests
-#   Author: Petr Lautrbach <plautrba@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2018 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=linux-system-roles.selinux-tests
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	test -x runtest.sh || chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Petr Lautrbach <plautrba@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Run linux-system-roles.selinux (https://github.com/linux-system-roles/selinux.git) Ansible role tests" >> $(METADATA)
-	@echo "Type:            Sanity" >> $(METADATA)
-	@echo "TestTime:        10m" >> $(METADATA)
-	@echo "RunFor:          policycoreutils" >> $(METADATA)
-	@echo "Requires:        policycoreutils ansible git" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2+" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
-
-	rhts-lint $(METADATA)
-

tests/linux-system-roles.selinux-tests/PURPOSE

@@ -1,4 +0,0 @@
-PURPOSE of selinux-ansible-playbook
-Author: Petr Lautrbach <plautrba@redhat.com>
-
-Run linux-system-roles.selinux (https://github.com/linux-system-roles/selinux.git) Ansible role tests

tests/linux-system-roles.selinux-tests/runtest.sh

@@ -1,57 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Description: Run linux-system-roles.selinux (https://github.com/linux-system-roles/selinux.git) Ansible role tests
-#   Author: Petr Lautrbach <plautrba@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2018 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="policycoreutils"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
-        rlAssertRpm "git"
-        rlAssertRpm "ansible"
-
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "git clone https://github.com/linux-system-roles/selinux.git"
-	rlRun "cd selinux/test"
-
-	for ansible_test in test_*.yml; do
-            rlRun "ansible-playbook -i localhost, -c local -v $ansible_test"
-	done
-
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-	rlRun "cd ../../"
-        rlRun "rm -rf selinux"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
-

tests/load_policy/Makefile

@@ -1,64 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /CoreOS/policycoreutils/Sanity/load_policy
-#   Description: Does load_policy work as expected? Does it produce correct audit messages?
-#   Author: Milos Malik <mmalik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2016 Red Hat, Inc.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/CoreOS/policycoreutils/Sanity/load_policy
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	test -x runtest.sh || chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Milos Malik <mmalik@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Does load_policy work as expected? Does it produce correct audit messages?" >> $(METADATA)
-	@echo "Type:            Sanity" >> $(METADATA)
-	@echo "TestTime:        5m" >> $(METADATA)
-	@echo "RunFor:          policycoreutils" >> $(METADATA)
-	@echo "Requires:        audit policycoreutils selinux-policy-targeted" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
-
-	rhts-lint $(METADATA)
-

tests/load_policy/PURPOSE

@@ -1,5 +0,0 @@
-PURPOSE of /CoreOS/policycoreutils/Sanity/load_policy
-Author: Milos Malik <mmalik@redhat.com>
-
-Does load_policy work as expected? Does it produce correct audit messages?
-

tests/load_policy/runtest.sh

@@ -1,79 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /CoreOS/policycoreutils/Sanity/load_policy
-#   Description: Does load_policy work as expected? Does it produce correct audit messages?
-#   Author: Milos Malik <mmalik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2016 Red Hat, Inc.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="policycoreutils"
-if rlIsRHEL 6 ; then
-    SELINUX_FS_MOUNT="/selinux"
-else # RHEL-7 and above
-    SELINUX_FS_MOUNT="/sys/fs/selinux"
-fi
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm ${PACKAGE}
-        rlRun "ls -l `which load_policy`"
-        BINARY_POLICY=`find /etc/selinux/targeted -type f -name policy.?? | sort -n | tail -n 1`
-        rlRun "ls -l ${BINARY_POLICY}"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "load_policy --xyz 2>&1 | grep \"invalid option\""
-        rlRun "dmesg | grep -i selinux" 0,1
-        rlRun "grep -i selinux /proc/mounts"
-        START_DATE_TIME=`date "+%m/%d/%Y %T"`
-        sleep 1
-        rlRun "load_policy -q"
-        rlRun "grep -i selinux /proc/mounts"
-        sleep 1
-        if rlIsRHEL ; then
-            rlRun "ausearch -m MAC_POLICY_LOAD -i -ts ${START_DATE_TIME} | grep load_policy"
-        fi
-        rlRun "ausearch -m MAC_POLICY_LOAD -i -ts ${START_DATE_TIME} | grep 'policy loaded'"
-        rlRun "umount ${SELINUX_FS_MOUNT}"
-        rlRun "grep -i selinux /proc/mounts" 1
-        START_DATE_TIME=`date "+%m/%d/%Y %T"`
-        sleep 1
-        rlRun "load_policy -i ${BINARY_POLICY}"
-        rlRun "grep -i selinux /proc/mounts"
-        sleep 1
-        if rlIsRHEL ; then
-            rlRun "ausearch -m MAC_POLICY_LOAD -i -ts ${START_DATE_TIME} | grep load_policy"
-        fi
-        rlRun "ausearch -m MAC_POLICY_LOAD -i -ts ${START_DATE_TIME} | grep 'policy loaded'"
-        rlRun "dmesg | grep -i selinux"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
-

tests/restorecon/Makefile

@@ -1,70 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /CoreOS/policycoreutils/Sanity/restorecon
-#   Description: does restorecon work correctly ?
-#   Author: Milos Malik <mmalik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2011 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/CoreOS/policycoreutils/Sanity/restorecon
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE testpolicy.te testpolicy.fc
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	chmod a+x runtest.sh
-	chcon -t bin_t runtest.sh;:
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Milos Malik <mmalik@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     does restorecon work correctly ?" >> $(METADATA)
-	@echo "Type:            Sanity" >> $(METADATA)
-	@echo "TestTime:        15m" >> $(METADATA)
-	@echo "RunFor:          policycoreutils" >> $(METADATA)
-	@echo "Requires:        policycoreutils" >> $(METADATA)
-	@echo "Requires:        grep" >> $(METADATA)
-	@echo "Requires:        e2fsprogs" >> $(METADATA)
-	@echo "Requires:        libselinux" >> $(METADATA)
-	@echo "Requires:        selinux-policy-devel" >> $(METADATA)
-	@echo "Requires:        libselinux-utils" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Releases:        -RHEL4" >> $(METADATA)
-
-	rhts-lint $(METADATA)
-

tests/restorecon/PURPOSE

@@ -1,5 +0,0 @@
-PURPOSE of /CoreOS/policycoreutils/Sanity/restorecon
-Author: Milos Malik <mmalik@redhat.com>
-
-Does restorecon work correctly?
-

tests/restorecon/runtest.sh

@@ -1,367 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /CoreOS/policycoreutils/Sanity/restorecon
-#   Description: does restorecon work correctly ?
-#   Author: Milos Malik <mmalik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2011 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include rhts environment
-. /usr/bin/rhts-environment.sh
-. /usr/share/beakerlib/beakerlib.sh
-
-PACKAGE="policycoreutils"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm ${PACKAGE}
-        rlServiceStop mcstrans mcstransd
-        rlRun "rpm -qf `which restorecon` | grep ${PACKAGE}"
-        rlRun "setenforce 1"
-        rlRun "sestatus"
-        rlRun "setsebool allow_domain_fd_use on"
-    rlPhaseEnd
-
-    rlPhaseStartTest "Functional test"
-
-        TESTDIR="/opt/restorecon_testdir"
-        DIRS="correct.dir incorrect1.dir incorrect2.dir customizable.dir"
-        FILES="correct.file incorrect.file customizable.file"
-
-        rlRun "make -f /usr/share/selinux/devel/Makefile"
-        rlRun "semodule -i testpolicy.pp"
-
-        rlFileBackup /etc/selinux/targeted/contexts/customizable_types
-        rlRun "echo 'customizable_t' >> /etc/selinux/targeted/contexts/customizable_types"
-
-        # Here is the testing dirs and files structure
-        # all the files have initial context corresponding to their names
-
-        # ./
-        # correct.file
-        # incorrect.file
-        # customizable.file
-
-        # correct.dir/
-        #     correct.file
-        #     incorrect.file
-        #     customizable.file
-
-        # incorrect1.dir/
-        #     correct.file
-        #     incorrect.file
-        #     customizable.file
-
-        # incorrect2.dir/
-        #     correct.file
-        #     incorrect.file
-        #     customizable.file
-
-        # customizable.dir/
-        #     correct.file
-        #     incorrect.file
-        #     customizable.file
-
-        # Function to set initial contexts
-        function set_contexts {
-            # Set the intended contexts
-            rlLog "Setting initial contexts of testing dirs..."
-            restorecon -R $TESTDIR
-            for ITEM in `find . -name 'incorrect*'`; do
-                chcon -t incorrect_t $ITEM
-            done
-            for ITEM in `find . -name 'customizable*'`; do
-                chcon -t customizable_t $ITEM
-            done
-        }
-
-        # Check that files in dir $1 have the initial contexts
-        function check_initial_contexts {
-            if echo $1 | grep -q 'incorrect.dir'; then 
-                rlRun "ls -ladZ $1 | grep :incorrect_t"
-            elif echo $1 | grep -q 'correct.dir'; then
-                rlRun "ls -ladZ $1 | grep :correct_t"
-            elif echo $1 | grep -q 'customizable.dir'; then
-                rlRun "ls -ladZ $1 | grep :customizable_t"
-            fi
-            rlRun "ls -ladZ $1/* | grep '\<correct.file' | grep ':correct_t'"
-            rlRun "ls -ladZ $1/* | grep '\<incorrect.file' | grep ':incorrect_t'"
-            rlRun "ls -ladZ $1/* | grep '\<customizable.file' | grep ':customizable_t'"
-        }
-
-        # Check that files matching with $2 in dir $1 have context $3
-        function check_contexts {
-            COMMAND="find $1 -name '$2'"
-            for ITEM in `eval $COMMAND`; do
-                rlRun "ls -ladZ $ITEM | grep :$3";
-            done
-        }
-
-        # Create the testing dirs and files
-        rlRun "mkdir -p $TESTDIR"
-        rlRun "pushd $TESTDIR"
-        rlRun "mkdir $DIRS"
-        rlRun "touch $FILES"
-        for DIR in $DIRS; do
-            rlRun "pushd $DIR"
-            rlRun "touch $FILES"
-            rlRun "popd"
-        done
-
-        set_contexts
-
-        echo
-        rlLog "Checking initial contexts of testing dirs..."
-        # Check the contexts are set properly
-        check_initial_contexts '.'
-        check_initial_contexts 'incorrect1.dir'
-        check_initial_contexts 'incorrect2.dir'
-        check_initial_contexts 'correct.dir'
-        check_initial_contexts 'customizable.dir'
-        check_contexts '.' 'incorrect*' 'incorrect_t'
-        check_contexts '.' 'correct*' 'correct_t'
-        check_contexts '.' 'customizable*' 'customizable_t'
-
-        # -e directory
-        #     exclude a directory (repeat the option to exclude more than one directory).
-
-        echo
-        rlLog "-e directory"
-        set_contexts
-        rlRun "restorecon -RF -e $TESTDIR/incorrect2.dir $TESTDIR"
-        for ITEM in `ls *.file`; do rlRun "ls -ladZ $ITEM | grep correct_t"; done
-        check_contexts 'incorrect1.dir' '*' 'correct_t'
-        check_contexts 'customizable.dir' '*' 'correct_t'
-        check_initial_contexts 'incorrect2.dir'
-        rlRun "ls -ladZ incorrect2.dir | grep incorrect_t"
-
-        # -f infilename
-        #     infilename contains a list of files to be processed. Use - for stdin.
-
-        echo
-        rlLog "-f filename"
-        set_contexts
-        rlRun "cat > ../file_list <<EOF
-./customizable.file
-./customizable.dir
-./correct.dir/customizable.file
-./incorrect1.dir/customizable.file
-./incorrect2.dir/customizable.file
-./customizable.dir/customizable.file
-EOF"
-        if rlIsRHEL 5; then chcon -t file_t ../file_list ;fi
-        rlRun "restorecon -F -f ../file_list"
-        check_contexts '.' 'incorrect*' 'incorrect_t'
-        check_contexts '.' 'correct*' 'correct_t'
-        check_contexts '.' 'customizable*' 'correct_t'
-        rlRun "rm -f ../file_list"
-
-
-        echo
-        rlLog "-f -       Input from stdin"
-        set_contexts
-        rlRun "echo -e 'incorrect2.dir\ncustomizable.file\nincorrect.file' | restorecon -f -"
-        check_initial_contexts 'incorrect1.dir'
-        check_initial_contexts 'correct.dir'
-        check_initial_contexts 'customizable.dir'
-        check_contexts 'incorrect2' '*' 'correct_t'
-        rlRun "ls -ladZ customizable.file | grep customizable_t"
-        rlRun "ls -ladZ incorrect.file | grep :correct_t"
-
-        # -F  Force reset of context to match file_context for customizable files, and
-        #     the default file context, changing the user, role, range portion as well
-        #     as the type.
-
-        echo
-        rlLog "-F     Force reset of customizable types"
-        set_contexts
-        rlRun "restorecon -RF $TESTDIR"
-        check_contexts '.' '*' 'correct_t'
-
-    # This feature is from RHEL6 further
-    if ! rlIsRHEL; then
-        echo
-        rlLog "-F     Force reset of the whole context"
-        set_contexts
-        chcon -u staff_u *.file
-        rlRun "ls -laZ correct.file | grep staff_u"
-        rlRun "ls -laZ incorrect.file | grep staff_u"
-        rlRun "ls -laZ customizable.file | grep staff_u"
-        rlRun "restorecon -R $TESTDIR"
-        rlRun "ls -laZ correct.file | grep staff_u"
-        rlRun "ls -laZ incorrect.file | grep staff_u"
-        rlRun "ls -laZ customizable.file | grep staff_u"
-        rlRun "restorecon -RF $TESTDIR"
-        rlRun "ls -laZ correct.file | grep system_u"
-        rlRun "ls -laZ incorrect.file | grep system_u"
-        rlRun "ls -laZ customizable.file | grep system_u"
-    fi
- 
-        # -i  ignore files that do not exist.
-
-        rlRun "restorecon non-existent-file" 1-255
-        rlRun "restorecon -i non-existent-file"
-
-        # -n  don't change any file labels (passive check).
-
-        echo
-        rlLog "-n      dry-run"
-        set_contexts
-        rlRun "restorecon -RF -n $TESTDIR"
-        check_contexts '.' 'incorrect*' 'incorrect_t'
-        check_contexts '.' 'correct*' 'correct_t'
-        check_contexts '.' 'customizable*' 'customizable_t'
-
-        # -o outfilename
-        #     Deprecated,  SELinux  policy will probably block this access.  Use shell
-        #     redirection to save list of files with incorrect context in filename.
-
-        #  ----not tested yet 
-
-        # -R, -r change  files  and directories file labels recursively (descend directo‐
-        #     ries).
-        #     Note: restorecon reports warnings on paths without default  labels  only
-        #     if called non-recursively or in verbose mode.
-
-        set_contexts
-        rlRun "restorecon -R $TESTDIR"
-        check_contexts '.' '*corr*' 'correct_t'
-        check_contexts '.' 'customizable*' 'customizable_t'
-
-        #     ...by default it does not operate recursively on directories
-
-        set_contexts
-        rlRun "restorecon $TESTDIR"
-        check_initial_contexts 'incorrect1.dir'
-        check_initial_contexts 'incorrect2.dir'
-        check_initial_contexts 'correct.dir'
-        check_initial_contexts 'customizable.dir'
-        rlRun "ls -ladZ customizable.file | grep customizable_t"
-        rlRun "ls -ladZ incorrect.file | grep :incorrect_t"
-        rlRun "ls -ladZ correct.file | grep :correct_t"
-
-        # -v show changes in file labels, if type or role are going to be changed.
-
-        #  ----not tested yet 
-
-    # -0 option is not present in RHEL5
-    if ! rlIsRHEL 5; then
-        # -0 the  separator  for  the input items is assumed to be the null character
-        #     (instead of the white space).  The quotes and the  backslash  characters
-        #     are  also  treated as normal characters that can form valid input.  This
-        #     option finally also disables the end of file string,  which  is  treated
-        #     like  any  other  argument.  Useful when input items might contain white
-        #     space, quote marks or backslashes.  The -print0 option of GNU find  pro‐
-        #     duces input suitable for this mode.
-
-        echo
-        rlLog "-0"
-        set_contexts
-        rlRun "find . -print0 | restorecon -f - -0"
-        check_contexts '.' '*corr*' 'correct_t'
-        check_contexts '.' 'customizable*' 'customizable_t'
-
-        echo
-        rlLog "-0   with  -F"
-        set_contexts
-        rlRun "find . -print0 | restorecon -F -f - -0"
-        check_contexts '.' '*' 'correct_t'
-
-    fi
-
-        # If a file object does not have a context, restorecon will write the default
-        # context to the file object's extended attributes.
-
-        #  ----not tested yet 
-
-
-        # Cleanup
-
-        rlRun "popd"
-        rlRun "rm -rf /opt/restorecon_testdir"
-        rlFileRestore
-        rlRun "semodule -r testpolicy"
-    rlPhaseEnd
-
-    # This is RFE from RHEL6 and further versions
-    if ! rlIsRHEL 5;then
-    rlPhaseStartTest
-        # META-Fixed-In: policycoreutils-2.0.83-19.14.el6
-        rlRun "pushd /root"
-        rlRun "touch test-file"
-        rlRun "mkdir test-dir"
-        for ITEM in "test-file" "test-dir" ; do
-            rlRun "chcon -u staff_u -t shadow_t -l s0:c1 ${ITEM}"
-            rlRun "ls -dZ ${ITEM} | grep staff_u:object_r:shadow_t:s0:c1"
-            rlRun "restorecon -v ${ITEM}" 0,1
-            rlRun "ls -dZ ${ITEM} | grep staff_u:object_r:admin_home_t:s0:c1"
-            rlRun "restorecon -F -v ${ITEM}" 0,1
-            rlRun "ls -dZ ${ITEM} | grep system_u:object_r:admin_home_t:s0"
-        done
-        rlRun "rm -rf test-dir"
-        rlRun "rm -f test-file"
-        rlRun "popd"
-    rlPhaseEnd
-    fi
-
-    rlPhaseStartTest
-        # META-Fixed-In: policycoreutils-2.0.83-19.16.el6
-        rlRun "pushd /root"
-        rlRun "touch test-file"
-        rlRun "mkdir test-dir"
-        for ITEM in "test-file" "test-dir" ; do
-            rlRun "chcon -t tmp_t ${ITEM}"
-            rlRun "ls -dZ ${ITEM}"
-            rlRun "chattr +i ${ITEM}"
-            rlRun "restorecon -v ${ITEM}" 1-255
-            rlRun "chattr -i ${ITEM}"
-            rlRun "ls -dZ ${ITEM}"
-            rlRun "restorecon -v ${ITEM}"
-            rlRun "ls -dZ ${ITEM}"
-        done
-        rlRun "rm -rf test-dir"
-        rlRun "rm -f test-file"
-        rlRun "popd"
-    rlPhaseEnd
-
-    # The bug was closed as NEXTRELEASE for RHEL5
-    if ! rlIsRHEL 5; then
-    rlPhaseStartTest
-        rlRun "touch ~/test-file"
-        rlRun "restorecon -vF ~/test-file"
-        rlRun "restorecon -vF ~/test-file | grep \"reset.*context\"" 1
-        rlRun "rm -f ~/test-file"
-
-        rlRun "mkdir ~/test-dir"
-        rlRun "restorecon -vF ~/test-dir"
-        rlRun "restorecon -vF ~/test-dir | grep \"reset.*context\"" 1
-        rlRun "rm -rf ~/test-dir"
-    rlPhaseEnd
-    fi
-
-    rlPhaseStartCleanup
-        rlServiceRestore mcstrans mcstransd
-    rlPhaseEnd
-    rlJournalPrintText
-rlJournalEnd
-

tests/restorecon/testpolicy.fc

@@ -1,2 +0,0 @@
-/opt/restorecon_testdir(/.*)?	system_u:object_r:correct_t:s0
-

tests/restorecon/testpolicy.te

@@ -1,19 +0,0 @@
-policy_module(testpolicy, 1.0)
-
-require {
-    attribute domain;
-    type fs_t;
-}
-
-type correct_t;
-files_type(correct_t)
-type incorrect_t;
-files_type(incorrect_t)
-type customizable_t;
-files_type(customizable_t)
-
-
-#allow domain correct_t:dir relabelto;
-#allow correct_t fs_t:filesystem associate;
-
-

tests/semanage-interface/Makefile

@@ -1,65 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /CoreOS/policycoreutils/Regression/semanage-interface
-#   Description: Does semanage interface ... work correctly?
-#   Author: Milos Malik <mmalik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2013 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/CoreOS/policycoreutils/Regression/semanage-interface
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	test -x runtest.sh || chmod a+x runtest.sh
-	test -x runtest.sh || chcon -t bin_t runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Milos Malik <mmalik@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Does semanage interface ... work correctly?" >> $(METADATA)
-	@echo "Type:            Regression" >> $(METADATA)
-	@echo "TestTime:        20m" >> $(METADATA)
-	@echo "RunFor:          policycoreutils" >> $(METADATA)
-	@echo "Requires:        policycoreutils policycoreutils-python-utils grep selinux-policy-minimum selinux-policy-mls selinux-policy-targeted" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Releases:        -RHEL4" >> $(METADATA)
-
-	rhts-lint $(METADATA)
-

tests/semanage-interface/PURPOSE

@@ -1,4 +0,0 @@
-PURPOSE of /CoreOS/policycoreutils/Regression/semanage-interface
-Description: Does semanage interface ... work correctly?
-Author: Milos Malik <mmalik@redhat.com>
-

tests/semanage-interface/runtest.sh

@@ -1,69 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /CoreOS/policycoreutils/Regression/semanage-interface
-#   Description: Does semanage interface ... work correctly?
-#   Author: Milos Malik <mmalik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2013 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="policycoreutils"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm ${PACKAGE}
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "semanage interface --help" 0,1
-        for POLICY_TYPE in minimum mls targeted ; do
-            if [ ! -d /etc/selinux/${POLICY_TYPE} ] ; then
-                continue
-            fi
-            rlRun "semanage interface -l -S ${POLICY_TYPE}"
-        done
-        if ! rlIsRHEL 5; then
-          rlRun "semanage interface -l -S unknown 2>&1 | grep \"store cannot be accessed\""
-        fi
-        rlRun "semanage interface -a -t xyz_t xyz 2>&1 | grep -i -e 'not defined' -e 'error' -e 'could not'"
-        rlRun "semanage interface -m xyz" 1,2
-        rlRun "semanage interface -d xyz" 1
-        rlRun "semanage interface -a -t netif_t xyz"
-        if rlIsRHEL 5 6; then
-            rlRun "semanage interface -m -r s0 xyz"
-        else
-            rlRun "semanage interface -m -t netif_t -r s0 xyz"
-        fi
-        rlRun "semanage interface -l | grep \"xyz.*:netif_t:s0\""
-        rlRun "semanage interface -d xyz"
-        rlRun "semanage interface -l | grep xyz" 1
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
-

tests/semanage-login/Makefile

@@ -1,65 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /CoreOS/policycoreutils/Regression/semanage-login
-#   Description: Does semanage login ... work correctly?
-#   Author: Milos Malik <mmalik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2013 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/CoreOS/policycoreutils/Regression/semanage-login
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	test -x runtest.sh || chmod a+x runtest.sh
-	test -x runtest.sh || chcon -t bin_t runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Milos Malik <mmalik@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Does semanage login ... work correctly?" >> $(METADATA)
-	@echo "Type:            Regression" >> $(METADATA)
-	@echo "TestTime:        10m" >> $(METADATA)
-	@echo "RunFor:          policycoreutils" >> $(METADATA)
-	@echo "Requires:        policycoreutils policycoreutils-python-utils grep shadow-utils selinux-policy-minimum selinux-policy-mls selinux-policy-targeted" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Releases:        -RHEL4" >> $(METADATA)
-
-	rhts-lint $(METADATA)
-

tests/semanage-login/PURPOSE

@@ -1,4 +0,0 @@
-PURPOSE of /CoreOS/policycoreutils/Regression/semanage-login
-Description: Does semanage login ... work correctly?
-Author: Milos Malik <mmalik@redhat.com>
-

tests/semanage-login/runtest.sh

@@ -1,67 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /CoreOS/policycoreutils/Regression/semanage-login
-#   Description: Does semanage login ... work correctly?
-#   Author: Milos Malik <mmalik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2013 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="policycoreutils"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm ${PACKAGE}
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "semanage login --help" 0,1
-        for POLICY_TYPE in minimum mls targeted ; do
-            if [ ! -d /etc/selinux/${POLICY_TYPE} ] ; then
-                continue
-            fi
-            rlRun "semanage login -l -S ${POLICY_TYPE}"
-        done
-        if ! rlIsRHEL 5; then
-          rlRun "semanage login -l -S unknown 2>&1 | grep \"store cannot be accessed\""
-        fi
-        rlRun "semanage login -a -s xyz_u xyz 2>&1 | grep -i -e 'does not exist' -e 'mapping.*invalid' -e 'could not query'"
-        rlRun "semanage login -m xyz" 1
-        rlRun "semanage login -d xyz" 1
-        rlRun "useradd xyz"
-        rlRun "semanage login -a -s user_u xyz"
-        rlRun "semanage login -m -r s0 xyz"
-        rlRun "semanage login -l | grep \"xyz.*user_u.*s0\""
-        rlRun "semanage login -d xyz"
-        rlRun "semanage login -l | grep xyz" 1
-        rlRun "userdel -rf xyz"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
-

tests/semanage-permissive-d-problems/Makefile

@@ -1,70 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /CoreOS/policycoreutils/Regression/semanage-permissive-d-problems
-#   Description: semanage permissive -d accepts more than domain types, its behavior is not reliable
-#   Author: Milos Malik <mmalik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2011 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/CoreOS/policycoreutils/Regression/semanage-permissive-d-problems
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	chmod a+x runtest.sh
-	chcon -t bin_t runtest.sh; :
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Milos Malik <mmalik@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     semanage permissive -d accepts more than domain types, its behavior is not reliable" >> $(METADATA)
-	@echo "Type:            Regression" >> $(METADATA)
-	@echo "TestTime:        20m" >> $(METADATA)
-	@echo "RunFor:          policycoreutils" >> $(METADATA)
-	@echo "Requires:        policycoreutils" >> $(METADATA)
-	@echo "Requires:        policycoreutils-python-utils" >> $(METADATA)
-	@echo "Requires:        policycoreutils-devel" >> $(METADATA)
-	@echo "Requires:        selinux-policy-devel" >> $(METADATA)
-	@echo "Requires:        grep" >> $(METADATA)
-	@echo "Requires:        coreutils" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Releases:        -RHEL4 -RHELServer5 -RHELClient5" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-
-	rhts-lint $(METADATA)
-

tests/semanage-permissive-d-problems/PURPOSE

@@ -1,5 +0,0 @@
-PURPOSE of /CoreOS/policycoreutils/Regression/semanage-permissive-d-problems
-Author: Milos Malik <mmalik@redhat.com>
-
-Does semanage permissive work correctly?
-

tests/semanage-permissive-d-problems/runtest.sh

@@ -1,93 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /CoreOS/policycoreutils/Regression/semanage-permissive-d-problems
-#   Description: semanage permissive -d accepts more than domain types, its behavior is not reliable
-#   Author: Milos Malik <mmalik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2011 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include rhts environment
-. /usr/bin/rhts-environment.sh
-. /usr/share/beakerlib/beakerlib.sh
-
-PACKAGE="policycoreutils"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm ${PACKAGE}
-        rlRun "rpm -qf /usr/sbin/semanage"
-        OUTPUT_FILE=`mktemp`
-        rlRun "sestatus"
-    rlPhaseEnd
-
-    if selinuxenabled ; then
-        rlPhaseStartTest
-            if rlIsRHEL 7 ; then
-                rlFileBackup /usr/share/selinux/default/Makefile
-                rlRun "rm -rf /usr/share/selinux/default/Makefile"
-            fi
-            rlRun "semanage permissive -l | grep fenced" 1
-            rlRun "semanage permissive -a fenced_t"
-            rlRun "semanage permissive -l | grep fenced"
-            rlRun "semanage permissive -d fenced_t"
-            rlRun "semanage permissive -l | grep fenced" 1
-            if rlIsRHEL 7 ; then
-                rlFileRestore
-            fi
-        rlPhaseEnd
-
-        rlPhaseStartTest
-            rlRun "semanage permissive -l 2>&1 | grep -e ypserv_t -e ypbind_t | tee ${OUTPUT_FILE}"
-            rlRun "wc -l < ${OUTPUT_FILE} | grep ^0$"
-            rlRun "semanage permissive -a ypbind_t"
-            rlRun "semanage permissive -a ypserv_t"
-            rlRun "semanage permissive -l 2>&1 | grep -e ypserv_t -e ypbind_t | tee ${OUTPUT_FILE}"
-            rlRun "wc -l < ${OUTPUT_FILE} | grep ^2$"
-            rlRun "semanage permissive -d yp" 1-255
-            rlRun "semanage permissive -l 2>&1 | grep -e ypserv_t -e ypbind_t | tee ${OUTPUT_FILE}"
-            rlRun "wc -l < ${OUTPUT_FILE} | grep ^2$"
-            rlRun "semanage permissive -d ypbind_t"
-            rlRun "semanage permissive -d ypserv_t"
-            rlRun "semanage permissive -l 2>&1 | grep -e ypserv_t -e ypbind_t | tee ${OUTPUT_FILE}"
-            rlRun "wc -l < ${OUTPUT_FILE} | grep ^0$"
-        rlPhaseEnd
-
-        rlPhaseStartTest
-            rlRun -s "semanage permissive -d" 1
-            rlAssertNotGrep 'traceback' $rlRun_LOG -iEq
-            rlAssertGrep 'error: the following argument is required: type' $rlRun_LOG -iEq
-            rm -f $rlRun_LOG
-        rlPhaseEnd
-    else
-        rlPhaseStartTest
-            rlRun "semanage permissive -l >& ${OUTPUT_FILE}" 0,1
-            rlRun "grep -C 32 -i -e exception -e traceback -e error ${OUTPUT_FILE}" 1
-        rlPhaseEnd
-    fi
-
-    rlPhaseStartCleanup
-        rm -f ${OUTPUT_FILE}
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
-

tests/semanage-port-add-delete-problems/Makefile

@@ -1,71 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /CoreOS/policycoreutils/Regression/semanage-port-add-delete-problems
-#   Description: semanage accepts invalid port numbers and then cannot delete them
-#   Author: Milos Malik <mmalik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2009 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/CoreOS/policycoreutils/Regression/semanage-port-add-delete-problems
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	chmod a+x runtest.sh
-	chcon -t bin_t runtest.sh;:
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Milos Malik <mmalik@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     semanage accepts invalid port numbers and then cannot delete them" >> $(METADATA)
-	@echo "Type:            Regression" >> $(METADATA)
-	@echo "TestTime:        15m" >> $(METADATA)
-	@echo "RunFor:          policycoreutils" >> $(METADATA)
-	@echo "Requires:        policycoreutils" >> $(METADATA)
-	@echo "Requires:        policycoreutils-python-utils" >> $(METADATA)
-	@echo "Requires:        setools-console" >> $(METADATA)
-	@echo "Requires:        libselinux" >> $(METADATA)
-	@echo "Requires:        libselinux-utils" >> $(METADATA)
-	@echo "Requires:        coreutils" >> $(METADATA)
-	@echo "Requires:        grep" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Releases:        -RHEL4" >> $(METADATA)
-
-	rhts-lint $(METADATA)
-

tests/semanage-port-add-delete-problems/PURPOSE

@@ -1,5 +0,0 @@
-PURPOSE of /CoreOS/policycoreutils/Regression/semanage-port-add-delete-problems
-Author: Milos Malik <mmalik@redhat.com>
-
-semanage accepts invalid port numbers and then cannot delete them
-

tests/semanage-port-add-delete-problems/runtest.sh

@@ -1,137 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/rhts-library/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /CoreOS/policycoreutils/Regression/semanage-port-add-delete-problems
-#   Description: semanage accepts invalid port numbers and then cannot delete them
-#   Author: Milos Malik <mmalik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2009 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-. /usr/bin/rhts-environment.sh || exit 1
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="policycoreutils"
-PORT_NAME="ldap_port_t"
-BAD_PORT_NUMBER="123456"
-GOOD_PORT_NUMBER="1389"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm ${PACKAGE}
-        rlRun "rpm -qf /usr/sbin/semanage"
-        rlRun "rpm -qf /usr/bin/seinfo"
-        OUTPUT_FILE=`mktemp`
-        rlRun "setenforce 1"
-        rlRun "sestatus"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "semanage port -l | grep ${PORT_NAME}"
-
-        rlRun "semanage port -l | grep ${PORT_NAME} | tee -a ${OUTPUT_FILE}"
-        rlRun "semanage port -a -t ${PORT_NAME} -p tcp ${BAD_PORT_NUMBER}" 1
-        rlRun "semanage port -l | grep ${PORT_NAME} | tee -a ${OUTPUT_FILE}"
-        rlRun "semanage port -d -t ${PORT_NAME} -p tcp ${BAD_PORT_NUMBER}" 1
-        rlRun "semanage port -l | grep ${PORT_NAME} | tee -a ${OUTPUT_FILE}"
-        #rlRun "sort ${OUTPUT_FILE} | uniq | wc -l | grep '^2$'"
-
-        rlRun "semanage port -l | grep ${PORT_NAME} | grep ${GOOD_PORT_NUMBER}" 1
-        rlRun "semanage port -a -t ${PORT_NAME} -p tcp ${GOOD_PORT_NUMBER}"
-        rlRun "semanage port -l | grep ${PORT_NAME} | grep ${GOOD_PORT_NUMBER}"
-        rlRun "semanage port -d -t ${PORT_NAME} -p tcp ${GOOD_PORT_NUMBER}"
-        rlRun "semanage port -l | grep ${PORT_NAME} | grep ${GOOD_PORT_NUMBER}" 1
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "semanage port -a -t syslogd_port_t -p tcp 60514-60516 2>&1 | grep -i traceback" 1
-        rlRun "semanage port -l | grep syslogd_port_t"
-        rlRun "semanage port -d -t syslogd_port_t -p tcp 60514-60516 2>&1 | grep -i traceback" 1
-    rlPhaseEnd
-
-    if rlIsRHEL ; then
-    rlPhaseStartTest
-        rlRun "ps -efZ | grep -v grep | grep \"auditd_t.*auditd\""
-        if rlIsRHEL 5 6; then
-            PORT_TYPE="syslogd_port_t"
-        else
-            PORT_TYPE="commplex_link_port_t"
-        fi
-
-        # adding a port number to a type
-        START_DATE_TIME=`date "+%m/%d/%Y %T"`
-        sleep 1
-        rlRun "semanage port -a -p tcp -t $PORT_TYPE 5005"
-        sleep 2
-
-        # Check for user_avc
-        rlRun "ausearch -m user_avc -ts ${START_DATE_TIME} > ${OUTPUT_FILE}" 0,1
-        LINE_COUNT=`wc -l < ${OUTPUT_FILE}`
-        rlRun "cat ${OUTPUT_FILE}"
-        rlAssert0 "number of lines in ${OUTPUT_FILE} should be 0" ${LINE_COUNT}
-
-        # deleting a port number from a type
-        START_DATE_TIME=`date "+%m/%d/%Y %T"`
-        sleep 1
-        rlRun "semanage port -d -p tcp -t $PORT_TYPE 5005"
-        sleep 2
-
-        # Check for user_avc
-        rlRun "ausearch -m user_avc -ts ${START_DATE_TIME} > ${OUTPUT_FILE}" 0,1
-        LINE_COUNT=`wc -l < ${OUTPUT_FILE}`
-        rlRun "cat ${OUTPUT_FILE}"
-        rlAssert0 "number of lines in ${OUTPUT_FILE} should be 0" ${LINE_COUNT}
-    rlPhaseEnd
-    fi
-
-    if ! rlIsRHEL 5 ; then
-    rlPhaseStartTest
-        rlRun "seinfo --portcon | grep :hi_reserved_port_t:"
-        rlRun "seinfo --portcon | grep :reserved_port_t:"
-        rlRun "semanage port -l | grep ^hi_reserved_port_t"
-        rlRun "semanage port -l | grep ^reserved_port_t"
-        if ! rlIsRHEL 6 ; then
-            rlRun "seinfo --portcon | grep :unreserved_port_t:"
-            rlRun "semanage port -l | grep ^unreserved_port_t"
-        fi
-    rlPhaseEnd
-    fi
-
-    rlPhaseStartTest "manipulation with hard-wired ports"
-        rlRun "semanage port -l | grep 'smtp_port_t.*tcp.*25'"
-        rlRun "semanage port -a -t smtp_port_t -p tcp 25 2>&1 | tee ${OUTPUT_FILE}"
-        rlAssertGrep "port .* already defined" ${OUTPUT_FILE} -i
-        rlRun "semanage port -a -t smtp_port_t -p tcp 25 2>&1 | tee ${OUTPUT_FILE}"
-        rlAssertGrep "port .* already defined" ${OUTPUT_FILE} -i
-        rlRun "semanage port -l | grep 'smtp_port_t.*tcp.*25'"
-        rlRun "semanage port -d -t smtp_port_t -p tcp 25 2>&1 | tee ${OUTPUT_FILE}"
-        rlAssertGrep "port .* is defined in policy.*cannot be deleted" ${OUTPUT_FILE} -i
-        rlRun "semanage port -d -t smtp_port_t -p tcp 25 2>&1 | tee ${OUTPUT_FILE}"
-        rlAssertGrep "port .* is defined in policy.*cannot be deleted" ${OUTPUT_FILE} -i
-        rlRun "semanage port -l | grep 'smtp_port_t.*tcp.*25'"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rm -f ${OUTPUT_FILE}
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
-

tests/semanage-user/Makefile

@@ -1,65 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /CoreOS/policycoreutils/Regression/semanage-user
-#   Description: Does semanage user ... work correctly?
-#   Author: Milos Malik <mmalik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2013 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/CoreOS/policycoreutils/Regression/semanage-user
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE testpolicy.te
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	test -x runtest.sh || chmod a+x runtest.sh
-	test -x runtest.sh || chcon -t bin_t runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Milos Malik <mmalik@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Does semanage user ... work correctly?" >> $(METADATA)
-	@echo "Type:            Regression" >> $(METADATA)
-	@echo "TestTime:        20m" >> $(METADATA)
-	@echo "RunFor:          policycoreutils" >> $(METADATA)
-	@echo "Requires:        policycoreutils policycoreutils-python-utils grep selinux-policy-devel selinux-policy-minimum selinux-policy-mls selinux-policy-targeted selinux-policy-devel" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Releases:        -RHEL4" >> $(METADATA)
-
-	rhts-lint $(METADATA)
-

tests/semanage-user/PURPOSE

@@ -1,4 +0,0 @@
-PURPOSE of /CoreOS/policycoreutils/Regression/semanage-user
-Description: Does semanage user ... work correctly?
-Author: Milos Malik <mmalik@redhat.com>
-

tests/semanage-user/runtest.sh

@@ -1,76 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /CoreOS/policycoreutils/Regression/semanage-user
-#   Description: Does semanage user ... work correctly?
-#   Author: Milos Malik <mmalik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2013 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="policycoreutils"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm ${PACKAGE}
-        rlRun "make -f /usr/share/selinux/devel/Makefile"
-        rlRun "ls -l testpolicy.pp"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        if rlIsRHEL 5 6; then
-            rlRun "semanage user --help" 1
-        else
-            rlRun "semanage user --help" 0
-            # semanage: list option can not be used with --level ("semanage user -l")
-            rlRun "semanage user --help | grep fcontext" 1
-        fi
-        for POLICY_TYPE in minimum mls targeted ; do
-            if [ ! -d /etc/selinux/${POLICY_TYPE} ] ; then
-                continue
-            fi
-            rlRun "semanage user -l -S ${POLICY_TYPE}"
-        done
-        if ! rlIsRHEL 5; then
-          rlRun "semanage user -l -S unknown 2>&1 | grep \"store cannot be accessed\""
-        fi
-        rlRun "semanage user -a -P user -R xyz_r xyz_u 2>&1 | grep -i -e 'undefined' -e 'error' -e 'could not'"
-        rlRun "semanage user -m xyz_u" 1
-        rlRun "semanage user -d xyz_u" 1
-        rlRun "semodule -i testpolicy.pp"
-        rlRun "semanage user -a -P user -R xyz_r xyz_u"
-        rlRun "semanage user -m -r s0 xyz_u"
-        rlRun "semanage user -l | grep \"xyz_u.*s0.*s0.*xyz_r\""
-        rlRun "semanage user -d xyz_u"
-        rlRun "semanage user -l | grep xyz_u" 1
-        rlRun "semodule -r testpolicy"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "rm -rf tmp testpolicy.{fc,if,pp}"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
-

tests/semanage-user/testpolicy.te

@@ -1,11 +0,0 @@
-module testpolicy 1.0;
-
-type xyz_t;
-role xyz_r;
-
-require {
-  type xyz_t;
-}
-
-role xyz_r types xyz_t;
-

tests/sepolicy-generate/Makefile

@@ -1,64 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /CoreOS/policycoreutils/Sanity/sepolicy-generate
-#   Description: sepolicy generate sanity test
-#   Author: Michal Trunecka <mtruneck@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2013 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/CoreOS/policycoreutils/Sanity/sepolicy-generate
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	test -x runtest.sh || chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Michal Trunecka <mtruneck@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     sepolicy generate sanity test" >> $(METADATA)
-	@echo "Type:            Sanity" >> $(METADATA)
-	@echo "TestTime:        115m" >> $(METADATA)
-	@echo "RunFor:          policycoreutils" >> $(METADATA)
-	@echo "Requires:        policycoreutils policycoreutils-devel rpm-build" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Releases:        -RHEL4 -RHEL5 -RHEL6" >> $(METADATA)
-
-	rhts-lint $(METADATA)
-

tests/sepolicy-generate/PURPOSE

@@ -1,3 +0,0 @@
-PURPOSE of /CoreOS/policycoreutils/Sanity/sepolicy-generate
-Description: sepolicy generate sanity test
-Author: Michal Trunecka <mtruneck@redhat.com>

tests/sepolicy-generate/runtest.sh

@@ -1,115 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /CoreOS/policycoreutils/Sanity/sepolicy-generate
-#   Description: sepolicy generate sanity test
-#   Author: Michal Trunecka <mtruneck@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2013 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="policycoreutils"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlRun "rlCheckRequirements ${PACKAGES[*]}" || rlDie "cannot continue"
-        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "mkdir mypolicy"
-        rlRun "sepolicy generate --customize -p mypolicy -n testpolicy -d httpd_sys_script_t -w /home"
-        rlRun "grep 'manage_dirs_pattern(httpd_sys_script_t' mypolicy/testpolicy.te"
-        rlRun "rm -rf mypolicy"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "mkdir mypolicy"
-        rlRun "touch /usr/bin/testpolicy"
-      for VARIANT in " -n testpolicy --admin_user -r webadm_r" \
-                     " --application /usr/bin/testpolicy " \
-                     " -n testpolicy --confined_admin -a firewalld " \
-                     " -n testpolicy --confined_admin " \
-                     " -n testpolicy --customize -d httpd_t -a firewalld " \
-                     " -n testpolicy --customize -d httpd_t" \
-                     " --dbus /usr/bin/testpolicy " \
-                     " -n testpolicy --desktop_user " \
-                     " --inetd /usr/bin/testpolicy " \
-                     " --init /usr/bin/testpolicy " \
-                     " -n testpolicy --newtype -t newtype_var_log_t " \
-                     " -n testpolicy --newtype -t newtype_unit_file_t " \
-                     " -n testpolicy --newtype -t newtype_var_run_t " \
-                     " -n testpolicy --newtype -t newtype_var_cache_t " \
-                     " -n testpolicy --newtype -t newtype_tmp_t " \
-                     " -n testpolicy --newtype -t newtype_port_t " \
-                     " -n testpolicy --newtype -t newtype_var_spool_t " \
-                     " -n testpolicy --newtype -t newtype_var_lib_t " \
-                     " -n testpolicy --sandbox " \
-                     " -n testpolicy --term_user " \
-                     " -n testpolicy --x_user "
-#                     " --cgi /usr/bin/testpolicy "
-        do
-            rlRun "sepolicy generate -p mypolicy $VARIANT"
-            rlRun "cat mypolicy/testpolicy.te"
-            rlRun "cat mypolicy/testpolicy.if"
-            rlRun "cat mypolicy/testpolicy.fc"
-          if echo "$VARIANT" | grep -q newtype; then
-            rlAssertNotExists "mypolicy/testpolicy.sh"
-            rlAssertNotExists "mypolicy/testpolicy.spec"
-          else
-            rlRun "mypolicy/testpolicy.sh"
-            rlRun "semodule -l | grep  testpolicy"
-            rlRun "semanage user -d testpolicy_u" 0-255
-            rlRun "semodule -r testpolicy"
-          fi
-
-            rlRun "rm -rf mypolicy/*"
-            rlRun "sleep 1"
-
-          if ! echo "$VARIANT" | grep -q newtype; then
-            rlRun "sepolicy generate -p mypolicy -w /home  $VARIANT"
-            rlRun "cat mypolicy/testpolicy.te"
-            rlRun "cat mypolicy/testpolicy.if"
-            rlRun "cat mypolicy/testpolicy.fc"
-
-            rlRun "mypolicy/testpolicy.sh"
-            rlRun "semodule -l | grep  testpolicy"
-            rlRun "semanage user -d testpolicy_u" 0-255
-            rlRun "semodule -r testpolicy"
-
-            rlRun "rm -rf mypolicy/*"
-            rlRun "sleep 1"
-          fi
-        done
-        rlRun "rm -rf mypolicy"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd

tests/sestatus/Makefile

@@ -1,67 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /CoreOS/policycoreutils/Sanity/sestatus
-#   Description: tests everything about sestatus
-#   Author: Milos Malik <mmalik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2011 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/CoreOS/policycoreutils/Sanity/sestatus
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	chmod a+x runtest.sh
-	chcon -t bin_t runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Milos Malik <mmalik@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     tests everything about sestatus" >> $(METADATA)
-	@echo "Type:            Sanity" >> $(METADATA)
-	@echo "TestTime:        5m" >> $(METADATA)
-	@echo "RunFor:          policycoreutils" >> $(METADATA)
-	@echo "Requires:        policycoreutils" >> $(METADATA)
-	@echo "Requires:        grep" >> $(METADATA)
-	@echo "Requires:        man" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Releases:        -RHEL4" >> $(METADATA)
-
-	rhts-lint $(METADATA)
-

tests/sestatus/PURPOSE

@@ -1,4 +0,0 @@
-PURPOSE of /CoreOS/policycoreutils/Sanity/sestatus
-Description: tests everything about sestatus
-Author: Milos Malik <mmalik@redhat.com>
-

tests/sestatus/runtest.sh

@@ -1,114 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /CoreOS/policycoreutils/Sanity/sestatus
-#   Description: tests everything about sestatus
-#   Author: Milos Malik <mmalik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2011 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include rhts environment
-. /usr/bin/rhts-environment.sh
-. /usr/share/beakerlib/beakerlib.sh
-
-PACKAGE="policycoreutils"
-if rlIsRHEL 5 6 ; then
-    SELINUX_FS_MOUNT="/selinux"
-else # RHEL-7 and above
-    SELINUX_FS_MOUNT="/sys/fs/selinux"
-fi
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm ${PACKAGE}
-        rlFileBackup /etc/sestatus.conf
-        rlRun "mount | grep -i selinux" 0,1
-        OUTPUT_FILE=`mktemp`
-    rlPhaseEnd
-
-    rlPhaseStartTest "basic use"
-        rlRun "sestatus"
-        rlRun "sestatus -b 2>&1 | tee ${OUTPUT_FILE}"
-        rlAssertGrep "policy booleans" ${OUTPUT_FILE} -i
-        rlRun "sestatus -v 2>&1 | tee ${OUTPUT_FILE}"
-        rlAssertGrep "process contexts" ${OUTPUT_FILE} -i
-        rlAssertGrep "file contexts" ${OUTPUT_FILE} -i
-        rlAssertGrep "current context" ${OUTPUT_FILE} -i
-        rlAssertGrep "init context" ${OUTPUT_FILE} -i
-        rlAssertGrep "controlling term" ${OUTPUT_FILE} -i
-        rlRun "sestatus --xyz 2>&1 | tee ${OUTPUT_FILE}"
-        rlAssertGrep "invalid option" ${OUTPUT_FILE} -i
-    rlPhaseEnd
-
-    rlPhaseStartTest "extreme cases"
-        # pretend that the config file contains an invalid section
-        rlRun "sed -i 's/files/xyz/' /etc/sestatus.conf"
-        rlRun "sestatus -v 2>&1 | tee ${OUTPUT_FILE}"
-        rlAssertGrep "line not in a section" ${OUTPUT_FILE} -i
-        rlRun "rm -f /etc/sestatus.conf"
-        rlRun "mkdir /etc/sestatus.conf" # intentionally replaced a file with a directory
-        rlRun "sestatus -v"
-        # pretend that the config file is missing
-        rlRun "rm -rf /etc/sestatus.conf"
-        for OPTION in "-bv" "-v" ; do
-            rlRun "sestatus ${OPTION} 2>&1 | tee ${OUTPUT_FILE}"
-            rlAssertGrep "unable to open /etc/sestatus.conf" ${OUTPUT_FILE} -i
-        done
-        rlFileRestore
-        # pretend that SELinux is disabled
-        rlRun "umount ${SELINUX_FS_MOUNT}"
-        for OPTION in "" "-b" "-v" "-bv" ; do
-            rlRun "sestatus ${OPTION} 2>&1 | tee ${OUTPUT_FILE}"
-            rlAssertGrep "selinux status.*disabled" ${OUTPUT_FILE} -i
-        done
-        rlRun "mount -t selinuxfs none ${SELINUX_FS_MOUNT}"
-        # pretend that no booleans are defined
-        rlRun "mkdir ./booleans"
-        rlRun "mount --bind ./booleans ${SELINUX_FS_MOUNT}/booleans"
-        rlRun "sestatus -b 2>&1 | tee ${OUTPUT_FILE}"
-        rlRun "umount ${SELINUX_FS_MOUNT}/booleans"
-        rlAssertNotGrep "booleans" ${OUTPUT_FILE} -i
-        rlRun "rmdir ./booleans"
-    rlPhaseEnd
-
-    # This bug is not worth fixing in RHEL-5
-    if ! rlIsRHEL 5 ; then
-    rlPhaseStartTest
-        rlRun "rpm -ql ${PACKAGE} | grep /usr/sbin/sestatus"
-        rlRun "rpm -ql ${PACKAGE} | grep /usr/share/man/man8/sestatus.8"
-        for OPTION in b v ; do
-            rlRun "sestatus --help 2>&1 | grep -- -${OPTION}"
-            rlRun "man sestatus | col -b | grep -- -${OPTION}"
-        done
-        if ! rlIsRHEL 6 ; then
-            rlRun "man -w sestatus.conf"
-        fi
-    rlPhaseEnd
-    fi
-
-    rlPhaseStartCleanup
-        rlFileRestore
-        rm -f ${OUTPUT_FILE}
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
-

tests/setsebool/Makefile

@@ -1,65 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /CoreOS/policycoreutils/Sanity/setsebool
-#   Description: does setsebool work correctly ?
-#   Author: Milos Malik <mmalik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2011 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/CoreOS/policycoreutils/Sanity/setsebool
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	chmod a+x runtest.sh
-	chcon -t bin_t runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Milos Malik <mmalik@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     does setsebool work correctly ?" >> $(METADATA)
-	@echo "Type:            Sanity" >> $(METADATA)
-	@echo "TestTime:        45m" >> $(METADATA)
-	@echo "RunFor:          policycoreutils" >> $(METADATA)
-	@echo "Requires:        audit policycoreutils libselinux-utils shadow-utils grep" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Releases:        -RHEL4" >> $(METADATA)
-
-	rhts-lint $(METADATA)
-

tests/setsebool/PURPOSE

@@ -1,5 +0,0 @@
-PURPOSE of /CoreOS/policycoreutils/Sanity/setsebool
-Author: Milos Malik <mmalik@redhat.com>
-
-Does setsebool work as expected? Does it produce correct audit messages?
-

tests/setsebool/runtest.sh

@@ -1,151 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /CoreOS/policycoreutils/Sanity/setsebool
-#   Description: does setsebool work correctly ?
-#   Author: Milos Malik <mmalik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2011 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include rhts environment
-. /usr/bin/rhts-environment.sh
-. /usr/share/beakerlib/beakerlib.sh
-
-PACKAGE="policycoreutils"
-USER_NAME="user${RANDOM}"
-USER_SECRET="s3kr3t${RANDOM}"
-BOOLEAN="ftpd_connect_db"
-if rlIsRHEL 5 6 ; then
-    SELINUX_FS_MOUNT="/selinux"
-else # RHEL-7 and above
-    SELINUX_FS_MOUNT="/sys/fs/selinux"
-fi
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm ${PACKAGE}
-        OUTPUT_FILE=`mktemp`
-        chcon -t tmp_t ${OUTPUT_FILE}
-
-        rlRun "useradd ${USER_NAME}"
-        rlRun "echo ${USER_SECRET} | passwd --stdin ${USER_NAME}"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        for OPTION in "" "-P" ; do
-            for OPERATOR in " " "=" ; do
-                for VALUE in 0 1 false true off on ; do
-                    rlRun "setsebool ${OPTION} ${BOOLEAN}${OPERATOR}${VALUE} | grep -i -e illegal -e usage -e invalid" 1
-                    if [ ${VALUE} == "0" -o ${VALUE} == "false" ] ; then
-                        SHOWN_VALUE="off"
-                    elif [ ${VALUE} == "1" -o ${VALUE} == "true" ] ; then
-                        SHOWN_VALUE="on"
-                    else
-                        SHOWN_VALUE=${VALUE}
-                    fi
-                    rlRun "getsebool -a | grep \"^${BOOLEAN}.*${SHOWN_VALUE}\""
-                done
-            done
-        done
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "setsebool" 1
-        rlRun "setsebool xyz=1 2>&1 | tee /dev/stderr | grep -i -e \"invalid boolean\" -e \"not found\" -e \"not defined\""
-        rlRun "setsebool xyz=-1 2>&1 | tee /dev/stderr | grep -i \"illegal value\""
-        rlRun "setsebool xyz=2 2>&1 | tee /dev/stderr | grep -i \"illegal value\""
-        if ! rlIsRHEL 5 6 ; then
-            rlRun "setsebool -N 2>&1 | tee /dev/stderr | grep -i \"boolean.*required\""
-            rlRun "setsebool -P 2>&1 | tee /dev/stderr | grep -i \"boolean.*required\""
-        fi
-        rlRun "setsebool -P xyz=1 2>&1 | tee /dev/stderr | grep -i -e \"invalid boolean\" -e \"not found\" -e \"not defined\""
-        rlRun "setsebool -P xyz=-1 2>&1 | tee /dev/stderr | grep -i \"illegal value\""
-        rlRun "setsebool -P xyz=2 2>&1 | tee /dev/stderr | grep -i \"illegal value\""
-    rlPhaseEnd
-
-    if ! rlIsRHEL 5 6 ; then
-    rlPhaseStartTest
-        rlRun "su -l -c '/usr/sbin/setsebool allow_ypbind 0' ${USER_NAME} 2>&1 | tee ${OUTPUT_FILE}"
-        rlAssertGrep "try as root" ${OUTPUT_FILE} -i
-        rlRun "su -l -c '/usr/sbin/setsebool allow_ypbind 1' ${USER_NAME} 2>&1 | tee ${OUTPUT_FILE}"
-        rlAssertGrep "try as root" ${OUTPUT_FILE} -i
-        rlRun "su -l -c '/usr/sbin/setsebool -P allow_ypbind 0' ${USER_NAME} 2>&1 | tee ${OUTPUT_FILE}"
-        rlAssertGrep "try as root" ${OUTPUT_FILE} -i
-        rlRun "su -l -c '/usr/sbin/setsebool -P allow_ypbind 1' ${USER_NAME} 2>&1 | tee ${OUTPUT_FILE}"
-        rlAssertGrep "try as root" ${OUTPUT_FILE} -i
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        for OPTION in "" "-P" ; do
-            rlRun "getsebool allow_ypbind | grep nis_enabled"
-            rlRun "setsebool ${OPTION} allow_ypbind on"
-            rlRun "getsebool allow_ypbind | grep \"nis_enabled.*on\""
-            rlRun "setsebool ${OPTION} allow_ypbind off"
-            rlRun "getsebool allow_ypbind | grep \"nis_enabled.*off\""
-        done
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        # https://fedoraproject.org/wiki/Features/SELinuxBooleansRename
-        for LINE in `cat /etc/selinux/*/booleans.subs_dist | sort | uniq | tr -s ' ' | tr ' ' ':'` ; do
-            OLD_BOOLEAN_NAME=`echo ${LINE} | cut -d : -f 1`
-            NEW_BOOLEAN_NAME=`echo ${LINE} | cut -d : -f 2`
-            rlRun "getsebool ${OLD_BOOLEAN_NAME} 2>&1 | tee ${OUTPUT_FILE}"
-            rlRun "getsebool ${NEW_BOOLEAN_NAME} 2>&1 | tee -a ${OUTPUT_FILE}"
-            rlRun "uniq -c ${OUTPUT_FILE} | grep '2 '"
-        done
-    rlPhaseEnd
-    fi
-
-    rlPhaseStartTest "audit messages"
-        START_DATE_TIME=`date "+%m/%d/%Y %T"`
-        sleep 1
-        rlRun "setsebool ${BOOLEAN} on"
-        rlRun "setsebool ${BOOLEAN} off"
-        rlRun "setsebool ${BOOLEAN} on"
-        sleep 1
-        rlRun "ausearch -m MAC_CONFIG_CHANGE -i -ts ${START_DATE_TIME} | grep \"type=MAC_CONFIG_CHANGE.*bool=${BOOLEAN} val=1 old_val=0\""
-        rlRun "ausearch -m MAC_CONFIG_CHANGE -i -ts ${START_DATE_TIME} | grep \"type=MAC_CONFIG_CHANGE.*bool=${BOOLEAN} val=0 old_val=1\""
-        if rlIsRHEL ; then
-            rlRun "ausearch -m MAC_CONFIG_CHANGE -i -ts ${START_DATE_TIME} | grep \"type=SYSCALL.*comm=setsebool\""
-        fi
-    rlPhaseEnd
-
-    rlPhaseStartTest "extreme cases"
-        # pretend that no booleans are defined
-        rlRun "mkdir ./booleans"
-        rlRun "mount --bind ./booleans ${SELINUX_FS_MOUNT}/booleans"
-        rlRun "setsebool ${BOOLEAN} on 2>&1 | tee ${OUTPUT_FILE}"
-        rlAssertGrep "could not change active booleans" ${OUTPUT_FILE} -i
-        rlRun "setsebool ${BOOLEAN} off 2>&1 | tee ${OUTPUT_FILE}"
-        rlAssertGrep "could not change active booleans" ${OUTPUT_FILE} -i
-        rlRun "umount ${SELINUX_FS_MOUNT}/booleans"
-        rlRun "rmdir ./booleans"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "userdel -rf ${USER_NAME}"
-        rm -f ${OUTPUT_FILE}
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
-

tests/tests.yml

@@ -1,23 +0,0 @@
----
-# Tests to run in a classic environment
-- hosts: localhost
-  roles:
-  - role: standard-test-beakerlib
-    tags:
-    - classic
-    repositories:
-    - repo: "https://src.fedoraproject.org/tests/selinux.git"
-      dest: "selinux"
-      fmf_filter: "tier: 1 | component: policycoreutils & tags: generic, fedora"
-
-# Tests for atomic host
-- hosts: localhost
-  tags:
-  - atomic
-  # no compatible tests
-
-# Tests for docker container
-- hosts: localhost
-  tags:
-  - container
-  # no compatible tests

zanata.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<config xmlns="http://zanata.org/namespace/config/">
-  <url>https://fedora.zanata.org/</url>
-  <project>selinux</project>
-  <project-version>master</project-version>
-  <project-type>gettext</project-type>
-
-</config>