setools-4.2.2-2

- setools requires -console, -console-analyses and -gui packages (#1794314)
tests: Add local Sanity/sedta to the testsuite
2020-03-23 21:28:43 +01:00 · 2020-03-23 21:27:07 +01:00 · 2020-03-23 21:27:07 +01:00
22 changed files with 239 additions and 634 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -1 +0,0 @@
-1
--- a/.gitignore
+++ b/.gitignore
@ -8,14 +8,3 @@ setools-3.3.8-f1e5b20.tar.bz2
 /4.2.0.tar.gz
 /4.2.1.tar.gz
 /4.2.2.tar.gz
-/4.3.0.tar.gz
-/05e90ee.tar.gz
-/16c0696.tar.gz
-/4.4.0.tar.gz
-/4.4.1.tar.gz
-/4.4.2.tar.gz
-/4.4.3.tar.gz
-/4.4.4.tar.gz
-/4.5.0.tar.gz
-/4.5.1.tar.gz
-/4.6.0.tar.gz
--- a/1001-Do-not-use-Werror-during-build.patch
+++ b/1001-Do-not-use-Werror-during-build.patch
@ -0,0 +1,49 @@
+From 4b3dc6b38abbd32cda557d5ef9ea1383ac5fdcf2 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Thu, 23 Feb 2017 08:17:07 +0100
+Subject: [PATCH 2/3] Do not use -Werror during build
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+There are new warnings when setools are built with gcc 7 therefore we
+want to suppress -Werror for now
+
+Fixes:
+libqpol/policy_extend.c: In function ‘policy_extend’:
+libqpol/policy_extend.c:161:27: error: ‘%04zd’ directive output may be truncated writing between 4 and 10 bytes into a region of size 5 [-Werror=format-truncation=]
+    snprintf(buff, 9, "@ttr%04zd", i + 1);
+                           ^~~~~
+libqpol/policy_extend.c:161:22: note: directive argument in the range [1, 4294967295]
+    snprintf(buff, 9, "@ttr%04zd", i + 1);
+                      ^~~~~~~~~~~
+In file included from /usr/include/stdio.h:939:0,
+                 from /usr/include/sepol/policydb/policydb.h:53,
+                 from libqpol/policy_extend.c:29:
+/usr/include/bits/stdio2.h:64:10: note: ‘__builtin___snprintf_chk’ output between 9 and 15 bytes into a destination of size 9
+   return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1,
+          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        __bos (__s), __fmt, __va_arg_pack ());
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+cc1: all warnings being treated as errors
+error: command 'gcc' failed with exit status 1
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index c94daf1..a7442ac 100644
+--- a/setup.py
+++ b/setup.py
+@@ -105,7 +105,7 @@ ext_py_mods = [Extension('setools.policyrep', ['setools/policyrep.pyx'],
+                          libraries=['selinux', 'sepol'],
+                          library_dirs=lib_dirs,
+                          define_macros=macros,
+-                         extra_compile_args=['-Werror', '-Wextra',
+                         extra_compile_args=['-Wextra',
+                                              '-Waggregate-return',
+                                              '-Wfloat-equal',
+                                              '-Wformat', '-Wformat=2',
+-- 
+2.17.2
+
--- a/1002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch
+++ b/1002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch
@ -0,0 +1,139 @@
+From b960869bcbcb58f2ce9af598484f209935c096b0 Mon Sep 17 00:00:00 2001
+From: Vit Mojzis <vmojzis@redhat.com>
+Date: Fri, 26 Apr 2019 15:27:25 +0200
+Subject: [PATCH 3/3] Do not export/use setools.InfoFlowAnalysis and
+ setools.DomainTransitionAnalysis
+
+dta and infoflow modules require networkx which brings lot of dependencies.
+These dependencies are not necessary for setools module itself as it's
+used in policycoreutils.
+
+Therefore it's better to use setools.infoflow.InfoFlowAnalysis and
+setools.dta.DomainTransitionAnalysis and let the package containing
+sedta and seinfoflow to require python3-networkx
+---
+ sedta                       | 4 ++--
+ seinfoflow                  | 4 ++--
+ setools/__init__.py         | 4 ----
+ setoolsgui/apol/dta.py      | 2 +-
+ setoolsgui/apol/infoflow.py | 2 +-
+ tests/dta.py                | 2 +-
+ tests/infoflow.py           | 2 +-
+ 7 files changed, 8 insertions(+), 12 deletions(-)
+
+diff --git a/sedta b/sedta
+index 60861ca..41e38a2 100755
+--- a/sedta
+++ b/sedta
+@@ -22,7 +22,7 @@ import argparse
+ import logging
+ import signal
+ 
+-import setools
+import setools.dta
+ 
+ 
+ def print_transition(trans):
+@@ -114,7 +114,7 @@ else:
+ 
+ try:
+     p = setools.SELinuxPolicy(args.policy)
+-    g = setools.DomainTransitionAnalysis(p, reverse=args.reverse, exclude=args.exclude)
+    g = setools.dta.DomainTransitionAnalysis(p, reverse=args.reverse, exclude=args.exclude)
+ 
+     if args.shortest_path or args.all_paths:
+         if args.shortest_path:
+diff --git a/seinfoflow b/seinfoflow
+index 97b14ba..e7f965d 100755
+--- a/seinfoflow
+++ b/seinfoflow
+@@ -17,7 +17,7 @@
+ # along with SETools.  If not, see <http://www.gnu.org/licenses/>.
+ #
+ 
+-import setools
+import setools.infoflow
+ import argparse
+ import sys
+ import logging
+@@ -81,7 +81,7 @@ else:
+ try:
+     p = setools.SELinuxPolicy(args.policy)
+     m = setools.PermissionMap(args.map)
+-    g = setools.InfoFlowAnalysis(p, m, min_weight=args.min_weight, exclude=args.exclude)
+    g = setools.infoflow.InfoFlowAnalysis(p, m, min_weight=args.min_weight, exclude=args.exclude)
+ 
+     if args.shortest_path or args.all_paths:
+         if args.shortest_path:
+diff --git a/setools/__init__.py b/setools/__init__.py
+index 7b70f5e..5a5f7fe 100644
+--- a/setools/__init__.py
+++ b/setools/__init__.py
+@@ -73,12 +73,8 @@ from .pcideviceconquery import PcideviceconQuery
+ from .devicetreeconquery import DevicetreeconQuery
+ 
+ # Information Flow Analysis
+-from .infoflow import InfoFlowAnalysis
+ from .permmap import PermissionMap
+ 
+-# Domain Transition Analysis
+-from .dta import DomainTransitionAnalysis
+-
+ # Policy difference
+ from .diff import PolicyDifference
+ 
+diff --git a/setoolsgui/apol/dta.py b/setoolsgui/apol/dta.py
+index 4608b9d..2cde44c 100644
+--- a/setoolsgui/apol/dta.py
+++ b/setoolsgui/apol/dta.py
+@@ -23,7 +23,7 @@ from PyQt5.QtCore import pyqtSignal, Qt, QStringListModel, QThread
+ from PyQt5.QtGui import QPalette, QTextCursor
+ from PyQt5.QtWidgets import QCompleter, QHeaderView, QMessageBox, QProgressDialog, \
+     QTreeWidgetItem
+-from setools import DomainTransitionAnalysis
+from setools.dta import DomainTransitionAnalysis
+ 
+ from ..logtosignal import LogHandlerToSignal
+ from .analysistab import AnalysisTab
+diff --git a/setoolsgui/apol/infoflow.py b/setoolsgui/apol/infoflow.py
+index 7bca299..7fee277 100644
+--- a/setoolsgui/apol/infoflow.py
+++ b/setoolsgui/apol/infoflow.py
+@@ -26,7 +26,7 @@ from PyQt5.QtCore import pyqtSignal, Qt, QStringListModel, QThread
+ from PyQt5.QtGui import QPalette, QTextCursor
+ from PyQt5.QtWidgets import QCompleter, QHeaderView, QMessageBox, QProgressDialog, \
+     QTreeWidgetItem
+-from setools import InfoFlowAnalysis
+from setools.infoflow import InfoFlowAnalysis
+ from setools.exception import UnmappedClass, UnmappedPermission
+ 
+ from ..logtosignal import LogHandlerToSignal
+diff --git a/tests/dta.py b/tests/dta.py
+index a0cc938..177e6fb 100644
+--- a/tests/dta.py
+++ b/tests/dta.py
+@@ -18,7 +18,7 @@
+ import os
+ import unittest
+ 
+-from setools import DomainTransitionAnalysis
+from setools.dta import DomainTransitionAnalysis
+ from setools import TERuletype as TERT
+ from setools.exception import InvalidType
+ from setools.policyrep import Type
+diff --git a/tests/infoflow.py b/tests/infoflow.py
+index aa0e44a..fca2848 100644
+--- a/tests/infoflow.py
+++ b/tests/infoflow.py
+@@ -18,7 +18,7 @@
+ import os
+ import unittest
+ 
+-from setools import InfoFlowAnalysis
+from setools.infoflow import InfoFlowAnalysis
+ from setools import TERuletype as TERT
+ from setools.exception import InvalidType
+ from setools.permmap import PermissionMap
+-- 
+2.17.2
+
--- a/156.patch
+++ b/156.patch
@ -1,43 +0,0 @@
-From 39f7c88251925463c38f5000f6178fe70b484f44 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Tue, 8 Apr 2025 11:22:47 +0200
-Subject: [PATCH] Remove redundant runtime requirement on setuptools
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The dependency was dropped in 99a1cf3b50cd8bf502b5070293c4d1bf792d1566
-
-Add a build time dependency for setup.py build_ext on Python 3.12+
-which no longer contains distutils.
-
-Signed-off-by: Miro Hrončok <miro@hroncok.cz>
---
- pyproject.toml | 2 +-
- tox.ini        | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index f7815a15..28ae121a 100644
--- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -39,7 +39,7 @@ classifiers = ["Development Status :: 5 - Production/Stable",
- 
- requires-python=">=3.10"
- # also requires libsepol.so and libselinux.so.
-dependencies = ["setuptools"]
-+dependencies = []
- 
- optional-dependencies.analysis = ["networkx>=2.6",
-                                   "pygraphviz"]
-diff --git a/tox.ini b/tox.ini
-index 8fa6954f..b2a21d6b 100644
--- a/tox.ini
-+++ b/tox.ini
-@@ -56,5 +56,6 @@ deps            = networkx>=2.6
-                   pygraphviz
-                   pytest-qt
-                   pytest-xvfb
-+                  setuptools;python_version>="3.12"
- commands_pre    = {envpython} setup.py build_ext -i
- commands        = {envpython} -m pytest tests
--- a/157.patch
+++ b/157.patch
@ -1,42 +0,0 @@
-From a33a2e394435316f3822e89ac9c2a9aabab17252 Mon Sep 17 00:00:00 2001
-From: Pranav Lawate <pran.lawate@gmail.com>
-Date: Tue, 30 Sep 2025 22:29:10 +0530
-Subject: [PATCH] Fix seinfo argument parsing when policy path follows query
- options
-
-Signed-off-by: Pranav Lawate <pran.lawate@gmail.com>
---
- seinfo | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/seinfo b/seinfo
-index 99180c36..d04ec320 100755
--- a/seinfo
-+++ b/seinfo
-@@ -12,6 +12,7 @@ import logging
- import signal
- import ipaddress
- import warnings
-+from pathlib import Path
- from typing import Callable, List, Tuple
- 
- 
-@@ -102,6 +103,18 @@ xen.add_argument("--devicetreecon", help="Print all devicetreecon statements.",
- 
- args = parser.parse_args()
- 
-+# Fix argument misparsing: when policy is None and a query option is a string,
-+# check if the string is actually a policy file that is incorrectly consumed by the query option
-+if not args.policy:
-+    # Check all query options defined in the queries argument group
-+    for action in queries._group_actions:
-+        value = getattr(args, action.dest, None)
-+        if isinstance(value, str) and Path(value).exists():
-+            # This query argument consumed the policy path - fix it
-+            args.policy = value
-+            setattr(args, action.dest, True)
-+            break
-+
- if args.debug:
-     logging.basicConfig(level=logging.DEBUG,
-                         format='%(asctime)s|%(levelname)s|%(name)s|%(message)s')
--- a/gating.yaml
+++ b/gating.yaml
@ -1,16 +0,0 @@
--- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_testing
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
-
--- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
-
--- a/plans/selinux.fmf
+++ b/plans/selinux.fmf
@ -1,7 +0,0 @@
-summary: selinux tests - Tier 1 | policycoreutils | checkpolicy
-discover:
-    how: fmf
-    url: https://src.fedoraproject.org/tests/selinux
-    filter: "tier: 1 | component: policycoreutils | component: checkpolicy"
-execute:
-    how: tmt
--- a/plans/tests.fmf
+++ b/plans/tests.fmf
@ -1,5 +0,0 @@
-summary: setools test plan
-discover:
-    how: fmf
-execute:
-    how: tmt
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@ -1,3 +0,0 @@
-emptyrpm:
-    expected_empty:
-        - setools
--- a/setools.spec
+++ b/setools.spec
@ -1,29 +1,32 @@
-%global sepol_ver 3.9
-%global selinux_ver 3.9
+# % global setools_pre_ver rc
+# % global gitver f1e5b20
+
+%global sepol_ver 2.9-1
+%global selinux_ver 2.9-1
+

 Name:           setools
-Version:        4.6.0
-Release:        4%{?dist}
+Version:        4.2.2
+Release:        2%{?setools_pre_ver:.%{setools_pre_ver}}%{?dist}
 Summary:        Policy analysis tools for SELinux

-License:        GPL-2.0-only AND LGPL-2.1-only
+License:        GPLv2
 URL:            https://github.com/SELinuxProject/setools/wiki
-Source0:        https://github.com/SELinuxProject/setools/archive/%{version}.tar.gz
+Source0:        https://github.com/SELinuxProject/setools/archive/%{version}%{?setools_pre_ver:-%{setools_pre_ver}}.tar.gz
 Source1:        setools.pam
 Source2:        apol.desktop
-
-# Remove redundant runtime requirement on setuptools
-Patch:          https://github.com/SELinuxProject/setools/pull/156.patch
-# Fix seinfo argument parsing when policy path follows query
-Patch:          https://github.com/SELinuxProject/setools/pull/157.patch
+Patch1001:      1001-Do-not-use-Werror-during-build.patch
+Patch1002:      1002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch

 Obsoletes:      setools < 4.0.0, setools-devel < 4.0.0
 BuildRequires:  flex,  bison
-BuildRequires:  glibc-devel, gcc, git-core
+BuildRequires:  glibc-devel, gcc, git
 BuildRequires:  libsepol-devel >= %{sepol_ver}, libsepol-static >= %{sepol_ver}
+BuildRequires:  qt5-qtbase-devel
 BuildRequires:  swig
 BuildRequires:  python3-Cython
 BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
 BuildRequires:  libselinux-devel

 Requires:       %{name}-console = %{version}-%{release}
@ -36,7 +39,7 @@ Python modules designed to facilitate SELinux policy analysis.

 %package     console
 Summary:     Policy analysis command-line tools for SELinux
-License:     GPL-2.0-only
+License:     GPLv2
 Requires:    python3-setools = %{version}-%{release}
 Requires:    libselinux >= %{selinux_ver}

@ -53,7 +56,7 @@ This package includes the following console tools:

 %package     console-analyses
 Summary:     Policy analysis command-line tools for SELinux
-License:     GPL-2.0-only
+License:     GPLv2
 Requires:    python3-setools = %{version}-%{release}
 Requires:    libselinux >= %{selinux_ver}
 Requires:    python3-networkx
@ -69,9 +72,11 @@ This package includes the following console tools:


 %package     -n python3-setools
-Summary:     Policy analysis tools for SELinux
-License:     LGPL-2.1-only
+Summary:     Policy analysis tools for SELinux  
 Obsoletes:   setools-libs < 4.0.0
+Recommends:  libselinux-python3
+%{?python_provide:%python_provide python3-setools}
+Requires:    python3-setuptools

 %description -n python3-setools
 SETools is a collection of graphical tools, command-line tools, and
@ -80,9 +85,8 @@ Python 3 modules designed to facilitate SELinux policy analysis.

 %package     gui
 Summary:     Policy analysis graphical tools for SELinux
-License:     GPL-2.0-only
 Requires:    python3-setools = %{version}-%{release}
-Requires:    python3-pyqt6 python3-pyqt6-sip
+Requires:    python3-qt5
 Requires:    python3-networkx

 %description gui
@ -91,231 +95,53 @@ Python modules designed to facilitate SELinux policy analysis.


 %prep
-%autosetup -p 1 -S git -n setools-%{version}
-
-
-%generate_buildrequires
-%pyproject_buildrequires
+%autosetup -p 1 -S git -n setools-%{version}%{?setools_pre_ver:-%{setools_pre_ver}}


 %build
-%pyproject_wheel
+%py3_build


 %install
-%pyproject_install
+%py3_install

 %check
 %if %{?_with_check:1}%{!?_with_check:0}
-# dnf install python3-pytest python3-pytest-qt
-%pytest
+%{__python3} setup.py test
 %endif


 %files

 %files console
-%license COPYING.GPL
-%{_bindir}/sechecker
 %{_bindir}/sediff
 %{_bindir}/seinfo
 %{_bindir}/sesearch
-%{_mandir}/man1/sechecker*
 %{_mandir}/man1/sediff*
 %{_mandir}/man1/seinfo*
 %{_mandir}/man1/sesearch*
-%{_mandir}/ru/man1/sediff*
-%{_mandir}/ru/man1/seinfo*
-%{_mandir}/ru/man1/sesearch*

 %files console-analyses
-%license COPYING.GPL
 %{_bindir}/sedta
 %{_bindir}/seinfoflow
 %{_mandir}/man1/sedta*
 %{_mandir}/man1/seinfoflow*
-%{_mandir}/ru/man1/sedta*
-%{_mandir}/ru/man1/seinfoflow*

 %files -n python3-setools
-%license COPYING COPYING.LGPL
+%license COPYING COPYING.GPL COPYING.LGPL
 %{python3_sitearch}/setools
 %{python3_sitearch}/setools-*

 %files gui
-%license COPYING.GPL
 %{_bindir}/apol
 %{python3_sitearch}/setoolsgui
 %{_mandir}/man1/apol*
-%{_mandir}/ru/man1/apol*

 %changelog
-* Mon Dec 01 2025 Veronika Syncakova <vsyncako@redhat.com> - 4.6.0-4
- Fix seinfo argument parsing when policy path follows query options
-
-* Thu Oct 02 2025 Miro Hrončok <mhroncok@redhat.com> - 4.6.0-3
- Drop redundant runtime requirement on python3-setuptools (redux)
-
-* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 4.6.0-2
- Rebuilt for Python 3.14.0rc3 bytecode
-
-* Tue Sep 09 2025 Petr Lautrbach <lautrbach@redhat.com> - 4.6.0-1
- SETools 4.6.0
-
-* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 4.5.1-11
- Rebuilt for Python 3.14.0rc2 bytecode
-
-* Mon Aug 04 2025 Miro Hrončok <mhroncok@redhat.com> - 4.5.1-10
- Drop redundant runtime requirement on python3-setuptools (correction)
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sat Jul 05 2025 Petr Lautrbach <lautrbach@redhat.com> - 4.5.1-8
- Rebuilt with SELinux userspace 3.9-rc2 release
-
-* Mon Jun 02 2025 Python Maint <python-maint@redhat.com> - 4.5.1-7
- Rebuilt for Python 3.14
-
-* Tue Apr 01 2025 Miro Hrončok <mhroncok@redhat.com> - 4.5.1-6
- Drop redundant runtime requirement on python3-setuptools, dropped in setools 4.5.1
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 4.5.1-3
- Rebuilt for Python 3.13
-
-* Thu May 02 2024 Petr Lautrbach <lautrbach@redhat.com> - 4.5.1-2
- Fix License tag
-
-* Thu May 02 2024 Petr Lautrbach <lautrbach@redhat.com> - 4.5.1-1
- SETools 4.5.1
-
-* Thu Apr 18 2024 Petr Lautrbach <lautrbach@redhat.com> - 4.5.0-1
- SETools 4.5.0
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Dec 11 2023 Petr Lautrbach <lautrbach@redhat.com> - 4.4.4-1
- SETools 4.4.4 release
-
-* Mon Aug 28 2023 Petr Lautrbach <lautrbach@redhat.com> - 4.4.3-2
- Use Qt 6
-
-* Wed Aug  9 2023 Petr Lautrbach <lautrbach@redhat.com> - 4.4.3-1
- SETools 4.4.3 release
-
-* Wed Jul 26 2023 Petr Lautrbach <lautrbach@redhat.com> - 4.4.2-4
- Disable/remove neverallow options in sediff.
- Improve man pages
- seinfoflow: Add -r option to get flows into the source type.
- seinfoflow.1: Remove references to sepolgen permission map.
- AVRule/AVRuleXperm: Treat rules with no permissions as invalid policy.
- SELinuxPolicy: Add explicit cast for libspol message
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 4.4.2-2
- Rebuilt for Python 3.12
-
-* Thu Apr 20 2023 Petr Lautrbach <lautrbach@redhat.com> - 4.4.2-1
- SETools 4.4.2 release
-
-* Mon Feb  6 2023 Petr Lautrbach <lautrbach@redhat.com> - 4.4.1-1
- SETools 4.4.1 release
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jun 16 2022 Python Maint <python-maint@redhat.com> - 4.4.0-8
- Rebuilt for Python 3.11
-
-* Mon Jun 13 2022 Petr Lautrbach <plautrba@redhat.com> - 4.4.0-7
- Update required userspace versions to 3.4
- Drop unnecessary Recommends
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 4.4.0-6
- Rebuilt for Python 3.11
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Nov 19 2021 Petr Lautrbach <plautrba@redhat.com> - 4.4.0-4
- Make seinfo output predictable
-  https://github.com/SELinuxProject/setools/issues/65
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 4.4.0-2
- Rebuilt for Python 3.10
-
-* Mon Mar  8 2021 Petr Lautrbach <plautrba@redhat.com> - 4.4.0-1
- SETools 4.4.0 release
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0-0.3.20210121git16c0696
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Jan 21 2021 Petr Lautrbach <plautrba@redhat.com> - 4.4.0-0.2.20210121git16c0696
- Rebuild with SELinux userspace 3.2-rc1
- Update to 16c0696
-
-* Thu Dec 10 2020 Petr Lautrbach <plautrba@redhat.com> - 4.4.0-0.2.20201102git05e90ee
- Fix imports in /usr/bin/sedta
-
-* Tue Nov  3 2020 Petr Lautrbach <plautrba@redhat.com> - 4.4.0-0.1.20201102git05e90ee
- Update to 05e90ee
- Add /usr/bin/sechecker
- Adapt to new libsepol filename transition structures
- Rebuild with libsepol.so.2
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.0-5
- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jul 16 2020 Petr Lautrbach <plautrba@redhat.com> - 4.3.0-3
- rebuild with SELinux userspace 3.1 release
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 4.3.0-2
- Rebuilt for Python 3.9
-
-* Thu Apr  2 2020 Petr Lautrbach <plautrba@redhat.com> - 4.3.0-1
- SETools 4.3.0 release
- Revised sediff method for TE rules. This drastically reduced memory and run time.
- Added infiniband context support to seinfo, sediff, and apol.
- Added apol configuration for location of Qt assistant.
- Fixed sediff issue where properties header would display when not requested.
- Fixed sediff issue with type_transition file name comparison.
- Fixed permission map socket sendto information flow direction.
- Added methods to TypeAttribute class to make it a complete Python collection.
- Genfscon now will look up classes rather than using fixed values which
-    were dropped from libsepol.
-
-* Mon Mar 23 2020 Petr Lautrbach <plautrba@redhat.com> - 4.2.2-5
+* Mon Mar 23 2020 Petr Lautrbach <plautrba@redhat.com> - 4.2.2-2
 - setools requires -console, -console-analyses and -gui packages (#1794314)

-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 4.2.2-3
- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 4.2.2-2
- Rebuilt for Python 3.8
-
-* Mon Jul 08 2019 Vit Mojzis <vmojzis@redhat.com> - 4.2.2-1}
+* Mon Jul 08 2019 Vit Mojzis <vmojzis@redhat.com> - 4.2.2-1
 - SETools 4.2.2 release

 * Mon May 13 2019 Vit Mojzis <vmojzis@redhat.com> - 4.2.1-3
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (4.6.0.tar.gz) = 5b654f480f285717d15fa55f754fbd00cb030a0d8af8342d901e0514c4fdbacb7873e19420dab98540eaa481c687ff1e03423df893c0d1744eb4c53eb81afbf5
+SHA512 (4.2.2.tar.gz) = 5044b04d0895ffe31557b3b71bb277ab49710a6066485c8f204ce7858abab259f973000f1fcfde0149ed4e33a50103984939dcc68ce322d70e9e927e81d4f798
--- a/tests/Regression/The-setools-package-doesn-t-install-any-tools/Makefile
+++ b/tests/Regression/The-setools-package-doesn-t-install-any-tools/Makefile
@ -1,63 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /CoreOS/setools/Regression/The-setools-package-doesn-t-install-any-tools
-#   Description: Make sure setools requires setools-console and setools-gui
-#   Author: Vit Mojzis <vmojzis@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2020 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=/CoreOS/setools/Regression/The-setools-package-doesn-t-install-any-tools
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile
-
-.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:           Vit Mojzis <vmojzis@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Make sure setools requires setools-console and setools-gui" >> $(METADATA)
-	@echo "Type:            Regression" >> $(METADATA)
-	@echo "TestTime:        5m" >> $(METADATA)
-	@echo "RunFor:          setools" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2+" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Bug:             1820078" >> $(METADATA)
-	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5 -RHEL6 -RHEL7" >> $(METADATA)
-
-	rhts-lint $(METADATA)
--- a/tests/Regression/The-setools-package-doesn-t-install-any-tools/main.fmf
+++ b/tests/Regression/The-setools-package-doesn-t-install-any-tools/main.fmf
@ -1,11 +0,0 @@
-summary: Make sure setools requires setools-console and setools-gui
-contact: Vit Mojzis <vmojzis@redhat.com>
-component:
-  - setools
-test: ./runtest.sh
-framework: beakerlib
-duration: 5m
-link:
-  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1820078
-extra-summary: /CoreOS/setools/Regression/The-setools-package-doesn-t-install-any-tools
-extra-task: /CoreOS/setools/Regression/The-setools-package-doesn-t-install-any-tools
--- a/tests/Regression/The-setools-package-doesn-t-install-any-tools/runtest.sh
+++ b/tests/Regression/The-setools-package-doesn-t-install-any-tools/runtest.sh
@ -1,53 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /CoreOS/setools/Regression/bz1820078-The-setools-package-doesn-t-install-any-tools
-#   Description: Make sure setools requires setools-console and setools-gui
-#   Author: Vit Mojzis <vmojzis@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2020 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/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="setools"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlRun "dnf -y remove ${PACKAGE} ${PACKAGE}-gui ${PACKAGE}-console"
-        OUTPUT_FILE=`mktemp`
-    rlPhaseEnd
-
-    rlPhaseStartTest "bz#1820078"
-        rlRun "dnf -y install ${PACKAGE}" 0
-        rlAssertRpm "${PACKAGE}-gui"
-        rlAssertRpm "${PACKAGE}-console"
-        # make sure that setools-* packages do not require setools
-        rlRun "rpm -q --whatrequires ${PACKAGE} >& ${OUTPUT_FILE}" 0,1
-        rlRun "grep -i \"${PACKAGE}-\" ${OUTPUT_FILE}" 1
-        if [ $? -ne 1 ]; then rlRun "cat \"${OUTPUT_FILE}\""; fi
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rm -f ${OUTPUT_FILE}
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
--- a/tests/Sanity/sedta/main.fmf
+++ b/tests/Sanity/sedta/main.fmf
@ -1,30 +0,0 @@
-summary: Does sedta work as expected? Does it support all features?
-description: ''
-contact: Milos Malik <mmalik@redhat.com>
-component:
-  - setools
-test: ./runtest.sh
-framework: beakerlib
-recommend:
-  - git
-  - policycoreutils
-  - setools-console-analyses
-duration: 1h
-enabled: true
-tag:
-  - CI-Tier-1
-  - NoRHEL4
-  - NoRHEL5
-  - NoRHEL6
-  - NoRHEL7
-  - TIPfail_Security
-  - f32friendly
-  - f33friendly
-  - targeted
-adjust:
-  - enabled: false
-    when: distro == rhel-4, rhel-5, rhel-6, rhel-7
-    continue: false
-extra-nitrate: TC#0604139
-extra-summary: /CoreOS/setools/Sanity/sedta
-extra-task: /CoreOS/setools/Sanity/sedta
--- a/tests/Sanity/sedta/runtest.sh
+++ b/tests/Sanity/sedta/runtest.sh
@ -26,6 +26,7 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 # Include Beaker environment
+. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1

 PACKAGE="setools"
--- a/tests/Sanity/seinfo-consistent-output/Makefile
+++ b/tests/Sanity/seinfo-consistent-output/Makefile
@ -1,64 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of Sanity/seinfo-consistent-output
-#   Description: Check whether different 2 or more runs of same seinfo commands produce same output
-#   Author: Petr Lautrbach <plautrba@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2021 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=Sanity/seinfo-consistent-output
-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:     Check whether different 2 or more runs of same seinfo commands produce same output" >> $(METADATA)
-	@echo "Type:            Sanity" >> $(METADATA)
-	@echo "TestTime:        5m" >> $(METADATA)
-	@echo "RunFor:          setools" >> $(METADATA)
-	@echo "Requires:        setools-console" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2+" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Bug:             2019962" >> $(METADATA)
-	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
-
-	rhts-lint $(METADATA)
--- a/tests/Sanity/seinfo-consistent-output/PURPOSE
+++ b/tests/Sanity/seinfo-consistent-output/PURPOSE
@ -1,3 +0,0 @@
-PURPOSE of Sanity/seinfo-consistent-output
-Description: Check whether different 2 or more runs of same seinfo commands produce same output
-Author: Petr Lautrbach <plautrba@redhat.com>
--- a/tests/Sanity/seinfo-consistent-output/main.fmf
+++ b/tests/Sanity/seinfo-consistent-output/main.fmf
@ -1,15 +0,0 @@
-summary: Check whether different 2 or more runs of same seinfo commands produce same
-    output
-description: ''
-contact: Petr Lautrbach <plautrba@redhat.com>
-component:
-  - setools
-test: ./runtest.sh
-framework: beakerlib
-recommend:
-  - setools-console
-duration: 5m
-link:
-  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=2019962
-extra-summary: Sanity/seinfo-consistent-output
-extra-task: Sanity/seinfo-consistent-output
--- a/tests/Sanity/seinfo-consistent-output/runtest.sh
+++ b/tests/Sanity/seinfo-consistent-output/runtest.sh
@ -1,63 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of Sanity/seinfo-consistent-output
-#   Description: Check whether different 2 or more runs of same seinfo commands produce same output
-#   Author: Petr Lautrbach <plautrba@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2021 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/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="setools-console"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
-        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-    commands=(
-        "seinfo --all -x"
-        "seinfo --constrain"
-        "seinfo --common"
-        "seinfo -c -x"
-        "seinfo -r -x"
-        "seinfo -u -x"
-    )
-
-    for c in "${commands[@]}"; do
-
-        rlPhaseStartTest "$c"
-            rlRun "$c > 1.out"
-            rlRun "$c > 2.out"
-            rlRun "cmp 1.out 2.out" 0
-        rlPhaseEnd
-    done
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
--- a/tests/tests.yml
+++ b/tests/tests.yml
@ -0,0 +1,20 @@
+---
+# Test to run in classic context
+- 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 | component: checkpolicy"
+
+# Test to run in classic context
+- hosts: localhost
+  roles:
+  - role: standard-test-beakerlib
+    tags:
+    - classic
+    tests:
+      - Sanity/sedta
Author	SHA1	Message	Date
Petr Lautrbach	75342558ef	setools-4.2.2-2 - setools requires -console, -console-analyses and -gui packages (#1794314)	2020-03-23 21:28:43 +01:00
Petr Lautrbach	e6a90d4108	tests: Add local Sanity/sedta to the testsuite	2020-03-23 21:27:07 +01:00
Milos Malik	fce8dddc4a	Add new test for sedta utility Basic test which covers the sedta tool. - test invalid values - test transitivity, reflexivity, non-existent relation etc	2020-03-23 21:27:07 +01:00