Compare commits
31 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
630d9a6666 | ||
|
|
c0cc824e8f | ||
|
|
ace7694196 | ||
|
|
e6c218363b | ||
|
|
1bd344a3ee | ||
|
|
17706eb780 | ||
|
|
e93cfa7b72 | ||
|
|
11ee438aa0 | ||
|
|
93d27ba219 | ||
|
|
f5e19e21ec | ||
|
|
658794f3e3 | ||
|
|
cb92b5067a | ||
|
|
183b6ffe53 | ||
|
|
94756e17ba | ||
|
|
d301e66a01 | ||
|
|
5f7bd5af0a | ||
|
|
5bd6294fca | ||
|
|
3a271f5265 | ||
|
|
cc080e498e | ||
|
|
65fa161f6f | ||
|
|
3eb6ca82a8 | ||
|
|
dd68fa8535 | ||
|
|
46e11071de | ||
|
|
6ae3e7d3fc | ||
|
|
ce72675700 | ||
|
|
d757b877a0 | ||
|
|
c8f176620d | ||
|
|
fa44d11ed8 | ||
|
|
67bdb1e7a5 | ||
|
|
e19a208cf3 | ||
|
|
3c2ac38daf |
18 changed files with 274 additions and 302 deletions
1
.fmf/version
Normal file
1
.fmf/version
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
1
|
||||||
7
.gitignore
vendored
7
.gitignore
vendored
|
|
@ -12,3 +12,10 @@ setools-3.3.8-f1e5b20.tar.bz2
|
||||||
/05e90ee.tar.gz
|
/05e90ee.tar.gz
|
||||||
/16c0696.tar.gz
|
/16c0696.tar.gz
|
||||||
/4.4.0.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
|
||||||
|
|
|
||||||
|
|
@ -1,90 +0,0 @@
|
||||||
From 8ed316d6bfb65e5e9b57f3761ea8490022ab3a05 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Petr Lautrbach <plautrba@redhat.com>
|
|
||||||
Date: Thu, 18 Nov 2021 13:59:08 +0100
|
|
||||||
Subject: [PATCH] Make seinfo output predictable
|
|
||||||
|
|
||||||
There are few places where frozenset is used. Given that frozenset is an unordered
|
|
||||||
collection the output generated from this is unpredictable.
|
|
||||||
|
|
||||||
The following command outputs are fixed using sorted() on frozensets:
|
|
||||||
|
|
||||||
seinfo --constrain
|
|
||||||
seinfo --common
|
|
||||||
seinfo -c -x
|
|
||||||
seinfo -r -x
|
|
||||||
seinfo -u -x
|
|
||||||
|
|
||||||
Fixes: https://github.com/SELinuxProject/setools/issues/65
|
|
||||||
|
|
||||||
Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
|
|
||||||
---
|
|
||||||
setools/policyrep/constraint.pxi | 2 +-
|
|
||||||
setools/policyrep/objclass.pxi | 4 ++--
|
|
||||||
setools/policyrep/role.pxi | 2 +-
|
|
||||||
setools/policyrep/user.pxi | 2 +-
|
|
||||||
4 files changed, 5 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/setools/policyrep/constraint.pxi b/setools/policyrep/constraint.pxi
|
|
||||||
index 01c63d87425b..0b4c5b9bcf6a 100644
|
|
||||||
--- a/setools/policyrep/constraint.pxi
|
|
||||||
+++ b/setools/policyrep/constraint.pxi
|
|
||||||
@@ -72,7 +72,7 @@ cdef class Constraint(BaseConstraint):
|
|
||||||
|
|
||||||
def statement(self):
|
|
||||||
if len(self.perms) > 1:
|
|
||||||
- perms = "{{ {0} }}".format(' '.join(self.perms))
|
|
||||||
+ perms = "{{ {0} }}".format(' '.join(sorted(self.perms)))
|
|
||||||
else:
|
|
||||||
# convert to list since sets cannot be indexed
|
|
||||||
perms = list(self.perms)[0]
|
|
||||||
diff --git a/setools/policyrep/objclass.pxi b/setools/policyrep/objclass.pxi
|
|
||||||
index b7ec7b7de5c3..8ed2be5a9bed 100644
|
|
||||||
--- a/setools/policyrep/objclass.pxi
|
|
||||||
+++ b/setools/policyrep/objclass.pxi
|
|
||||||
@@ -75,7 +75,7 @@ cdef class Common(PolicySymbol):
|
|
||||||
return other in self.perms
|
|
||||||
|
|
||||||
def statement(self):
|
|
||||||
- return "common {0}\n{{\n\t{1}\n}}".format(self, '\n\t'.join(self.perms))
|
|
||||||
+ return "common {0}\n{{\n\t{1}\n}}".format(self, '\n\t'.join(sorted(self.perms)))
|
|
||||||
|
|
||||||
|
|
||||||
cdef class ObjClass(PolicySymbol):
|
|
||||||
@@ -204,7 +204,7 @@ cdef class ObjClass(PolicySymbol):
|
|
||||||
|
|
||||||
# a class that inherits may not have additional permissions
|
|
||||||
if len(self.perms) > 0:
|
|
||||||
- stmt += "{{\n\t{0}\n}}".format('\n\t'.join(self.perms))
|
|
||||||
+ stmt += "{{\n\t{0}\n}}".format('\n\t'.join(sorted(self.perms)))
|
|
||||||
|
|
||||||
return stmt
|
|
||||||
|
|
||||||
diff --git a/setools/policyrep/role.pxi b/setools/policyrep/role.pxi
|
|
||||||
index 9a0dd39f27d9..3af8a3f72a1f 100644
|
|
||||||
--- a/setools/policyrep/role.pxi
|
|
||||||
+++ b/setools/policyrep/role.pxi
|
|
||||||
@@ -58,7 +58,7 @@ cdef class Role(PolicySymbol):
|
|
||||||
if count == 1:
|
|
||||||
stmt += " types {0}".format(types[0])
|
|
||||||
else:
|
|
||||||
- stmt += " types {{ {0} }}".format(' '.join(types))
|
|
||||||
+ stmt += " types {{ {0} }}".format(' '.join(sorted(types)))
|
|
||||||
|
|
||||||
stmt += ";"
|
|
||||||
return stmt
|
|
||||||
diff --git a/setools/policyrep/user.pxi b/setools/policyrep/user.pxi
|
|
||||||
index 9c82aa92eb72..e37af2939820 100644
|
|
||||||
--- a/setools/policyrep/user.pxi
|
|
||||||
+++ b/setools/policyrep/user.pxi
|
|
||||||
@@ -81,7 +81,7 @@ cdef class User(PolicySymbol):
|
|
||||||
if count == 1:
|
|
||||||
stmt += roles[0]
|
|
||||||
else:
|
|
||||||
- stmt += "{{ {0} }}".format(' '.join(roles))
|
|
||||||
+ stmt += "{{ {0} }}".format(' '.join(sorted(roles)))
|
|
||||||
|
|
||||||
if self._level:
|
|
||||||
stmt += " level {0.mls_level} range {0.mls_range};".format(self)
|
|
||||||
--
|
|
||||||
2.33.1
|
|
||||||
|
|
||||||
|
|
@ -1,142 +0,0 @@
|
||||||
From e47d19f4985098ca316eea4a383510d419ec6055 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Vit Mojzis <vmojzis@redhat.com>
|
|
||||||
Date: Fri, 26 Apr 2019 15:27:25 +0200
|
|
||||||
Subject: [PATCH 1/2] 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 | 5 +++--
|
|
||||||
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, 9 insertions(+), 12 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/sedta b/sedta
|
|
||||||
index 57070098fe10..51890ea8ea73 100755
|
|
||||||
--- a/sedta
|
|
||||||
+++ b/sedta
|
|
||||||
@@ -23,9 +23,10 @@ import logging
|
|
||||||
import signal
|
|
||||||
|
|
||||||
import setools
|
|
||||||
+import setools.dta
|
|
||||||
|
|
||||||
|
|
||||||
-def print_transition(trans: setools.DomainTransition) -> None:
|
|
||||||
+def print_transition(trans: setools.dta.DomainTransition) -> None:
|
|
||||||
if trans.transition:
|
|
||||||
print("Domain transition rule(s):")
|
|
||||||
for t in trans.transition:
|
|
||||||
@@ -114,7 +115,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 0ddcfdc7c1fb..8321718b2640 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
|
|
||||||
@@ -102,7 +102,7 @@ elif args.booleans is not None:
|
|
||||||
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,
|
|
||||||
booleans=booleans)
|
|
||||||
|
|
||||||
if args.shortest_path or args.all_paths:
|
|
||||||
diff --git a/setools/__init__.py b/setools/__init__.py
|
|
||||||
index d72d343e7e79..642485b9018d 100644
|
|
||||||
--- a/setools/__init__.py
|
|
||||||
+++ b/setools/__init__.py
|
|
||||||
@@ -91,12 +91,8 @@ from .pcideviceconquery import PcideviceconQuery
|
|
||||||
from .devicetreeconquery import DevicetreeconQuery
|
|
||||||
|
|
||||||
# Information Flow Analysis
|
|
||||||
-from .infoflow import InfoFlowAnalysis
|
|
||||||
from .permmap import PermissionMap, RuleWeight, Mapping
|
|
||||||
|
|
||||||
-# Domain Transition Analysis
|
|
||||||
-from .dta import DomainTransitionAnalysis, DomainEntrypoint, DomainTransition
|
|
||||||
-
|
|
||||||
# Policy difference
|
|
||||||
from .diff import PolicyDifference
|
|
||||||
|
|
||||||
diff --git a/setoolsgui/apol/dta.py b/setoolsgui/apol/dta.py
|
|
||||||
index 62dbf04d9a5e..0ea000e790f0 100644
|
|
||||||
--- a/setoolsgui/apol/dta.py
|
|
||||||
+++ b/setoolsgui/apol/dta.py
|
|
||||||
@@ -24,7 +24,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 AnalysisSection, AnalysisTab
|
|
||||||
diff --git a/setoolsgui/apol/infoflow.py b/setoolsgui/apol/infoflow.py
|
|
||||||
index 28009aa2329c..92d350bf727c 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 a0cc9381469c..177e6fb0b961 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 aa0e44a7e4f8..fca2848aeca5 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.30.0
|
|
||||||
|
|
||||||
|
|
@ -1,24 +0,0 @@
|
||||||
From 7b73bdeda54b9c944774452bfa3b3c1f2733b3f0 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Petr Lautrbach <plautrba@redhat.com>
|
|
||||||
Date: Thu, 2 Apr 2020 16:06:14 +0200
|
|
||||||
Subject: [PATCH 2/2] Require networkx on package level
|
|
||||||
|
|
||||||
It allows us to ship python3-setools without dependency on python3-networkx
|
|
||||||
---
|
|
||||||
setup.py | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/setup.py b/setup.py
|
|
||||||
index c593b786cc61..0551811e3fd1 100644
|
|
||||||
--- a/setup.py
|
|
||||||
+++ b/setup.py
|
|
||||||
@@ -163,5 +163,5 @@ setup(name='setools',
|
|
||||||
# setup also requires libsepol and libselinux
|
|
||||||
# C libraries and headers to compile.
|
|
||||||
setup_requires=['setuptools', 'Cython>=0.27'],
|
|
||||||
- install_requires=['setuptools', 'networkx>=2.0']
|
|
||||||
+ install_requires=['setuptools']
|
|
||||||
)
|
|
||||||
--
|
|
||||||
2.30.0
|
|
||||||
|
|
||||||
43
156.patch
Normal file
43
156.patch
Normal file
|
|
@ -0,0 +1,43 @@
|
||||||
|
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
|
||||||
42
157.patch
Normal file
42
157.patch
Normal file
|
|
@ -0,0 +1,42 @@
|
||||||
|
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')
|
||||||
7
plans/selinux.fmf
Normal file
7
plans/selinux.fmf
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
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
|
||||||
5
plans/tests.fmf
Normal file
5
plans/tests.fmf
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
summary: setools test plan
|
||||||
|
discover:
|
||||||
|
how: fmf
|
||||||
|
execute:
|
||||||
|
how: tmt
|
||||||
132
setools.spec
132
setools.spec
|
|
@ -1,28 +1,29 @@
|
||||||
%global sepol_ver 3.4-1
|
%global sepol_ver 3.9
|
||||||
%global selinux_ver 3.4-1
|
%global selinux_ver 3.9
|
||||||
|
|
||||||
Name: setools
|
Name: setools
|
||||||
Version: 4.4.0
|
Version: 4.6.0
|
||||||
Release: 9%{?dist}
|
Release: 4%{?dist}
|
||||||
Summary: Policy analysis tools for SELinux
|
Summary: Policy analysis tools for SELinux
|
||||||
|
|
||||||
License: GPLv2
|
License: GPL-2.0-only AND LGPL-2.1-only
|
||||||
URL: https://github.com/SELinuxProject/setools/wiki
|
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}.tar.gz
|
||||||
Source1: setools.pam
|
Source1: setools.pam
|
||||||
Source2: apol.desktop
|
Source2: apol.desktop
|
||||||
Patch0001: 0001-Make-seinfo-output-predictable.patch
|
|
||||||
Patch1002: 1002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch
|
# Remove redundant runtime requirement on setuptools
|
||||||
Patch1003: 1003-Require-networkx-on-package-level.patch
|
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
|
||||||
|
|
||||||
Obsoletes: setools < 4.0.0, setools-devel < 4.0.0
|
Obsoletes: setools < 4.0.0, setools-devel < 4.0.0
|
||||||
BuildRequires: flex, bison
|
BuildRequires: flex, bison
|
||||||
BuildRequires: glibc-devel, gcc, git-core
|
BuildRequires: glibc-devel, gcc, git-core
|
||||||
BuildRequires: libsepol-devel >= %{sepol_ver}, libsepol-static >= %{sepol_ver}
|
BuildRequires: libsepol-devel >= %{sepol_ver}, libsepol-static >= %{sepol_ver}
|
||||||
BuildRequires: qt5-qtbase-devel
|
|
||||||
BuildRequires: swig
|
BuildRequires: swig
|
||||||
BuildRequires: python3-Cython
|
BuildRequires: python3-Cython
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
BuildRequires: python3-setuptools
|
|
||||||
BuildRequires: libselinux-devel
|
BuildRequires: libselinux-devel
|
||||||
|
|
||||||
Requires: %{name}-console = %{version}-%{release}
|
Requires: %{name}-console = %{version}-%{release}
|
||||||
|
|
@ -35,7 +36,7 @@ Python modules designed to facilitate SELinux policy analysis.
|
||||||
|
|
||||||
%package console
|
%package console
|
||||||
Summary: Policy analysis command-line tools for SELinux
|
Summary: Policy analysis command-line tools for SELinux
|
||||||
License: GPLv2
|
License: GPL-2.0-only
|
||||||
Requires: python3-setools = %{version}-%{release}
|
Requires: python3-setools = %{version}-%{release}
|
||||||
Requires: libselinux >= %{selinux_ver}
|
Requires: libselinux >= %{selinux_ver}
|
||||||
|
|
||||||
|
|
@ -52,7 +53,7 @@ This package includes the following console tools:
|
||||||
|
|
||||||
%package console-analyses
|
%package console-analyses
|
||||||
Summary: Policy analysis command-line tools for SELinux
|
Summary: Policy analysis command-line tools for SELinux
|
||||||
License: GPLv2
|
License: GPL-2.0-only
|
||||||
Requires: python3-setools = %{version}-%{release}
|
Requires: python3-setools = %{version}-%{release}
|
||||||
Requires: libselinux >= %{selinux_ver}
|
Requires: libselinux >= %{selinux_ver}
|
||||||
Requires: python3-networkx
|
Requires: python3-networkx
|
||||||
|
|
@ -68,10 +69,9 @@ This package includes the following console tools:
|
||||||
|
|
||||||
|
|
||||||
%package -n python3-setools
|
%package -n python3-setools
|
||||||
Summary: Policy analysis tools for SELinux
|
Summary: Policy analysis tools for SELinux
|
||||||
|
License: LGPL-2.1-only
|
||||||
Obsoletes: setools-libs < 4.0.0
|
Obsoletes: setools-libs < 4.0.0
|
||||||
%{?python_provide:%python_provide python3-setools}
|
|
||||||
Requires: python3-setuptools
|
|
||||||
|
|
||||||
%description -n python3-setools
|
%description -n python3-setools
|
||||||
SETools is a collection of graphical tools, command-line tools, and
|
SETools is a collection of graphical tools, command-line tools, and
|
||||||
|
|
@ -80,8 +80,9 @@ Python 3 modules designed to facilitate SELinux policy analysis.
|
||||||
|
|
||||||
%package gui
|
%package gui
|
||||||
Summary: Policy analysis graphical tools for SELinux
|
Summary: Policy analysis graphical tools for SELinux
|
||||||
|
License: GPL-2.0-only
|
||||||
Requires: python3-setools = %{version}-%{release}
|
Requires: python3-setools = %{version}-%{release}
|
||||||
Requires: python3-qt5
|
Requires: python3-pyqt6 python3-pyqt6-sip
|
||||||
Requires: python3-networkx
|
Requires: python3-networkx
|
||||||
|
|
||||||
%description gui
|
%description gui
|
||||||
|
|
@ -93,22 +94,28 @@ Python modules designed to facilitate SELinux policy analysis.
|
||||||
%autosetup -p 1 -S git -n setools-%{version}
|
%autosetup -p 1 -S git -n setools-%{version}
|
||||||
|
|
||||||
|
|
||||||
|
%generate_buildrequires
|
||||||
|
%pyproject_buildrequires
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%py3_build
|
%pyproject_wheel
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%py3_install
|
%pyproject_install
|
||||||
|
|
||||||
%check
|
%check
|
||||||
%if %{?_with_check:1}%{!?_with_check:0}
|
%if %{?_with_check:1}%{!?_with_check:0}
|
||||||
%{__python3} setup.py test
|
# dnf install python3-pytest python3-pytest-qt
|
||||||
|
%pytest
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
|
|
||||||
%files console
|
%files console
|
||||||
|
%license COPYING.GPL
|
||||||
%{_bindir}/sechecker
|
%{_bindir}/sechecker
|
||||||
%{_bindir}/sediff
|
%{_bindir}/sediff
|
||||||
%{_bindir}/seinfo
|
%{_bindir}/seinfo
|
||||||
|
|
@ -122,6 +129,7 @@ Python modules designed to facilitate SELinux policy analysis.
|
||||||
%{_mandir}/ru/man1/sesearch*
|
%{_mandir}/ru/man1/sesearch*
|
||||||
|
|
||||||
%files console-analyses
|
%files console-analyses
|
||||||
|
%license COPYING.GPL
|
||||||
%{_bindir}/sedta
|
%{_bindir}/sedta
|
||||||
%{_bindir}/seinfoflow
|
%{_bindir}/seinfoflow
|
||||||
%{_mandir}/man1/sedta*
|
%{_mandir}/man1/sedta*
|
||||||
|
|
@ -130,17 +138,101 @@ Python modules designed to facilitate SELinux policy analysis.
|
||||||
%{_mandir}/ru/man1/seinfoflow*
|
%{_mandir}/ru/man1/seinfoflow*
|
||||||
|
|
||||||
%files -n python3-setools
|
%files -n python3-setools
|
||||||
%license COPYING COPYING.GPL COPYING.LGPL
|
%license COPYING COPYING.LGPL
|
||||||
%{python3_sitearch}/setools
|
%{python3_sitearch}/setools
|
||||||
%{python3_sitearch}/setools-*
|
%{python3_sitearch}/setools-*
|
||||||
|
|
||||||
%files gui
|
%files gui
|
||||||
|
%license COPYING.GPL
|
||||||
%{_bindir}/apol
|
%{_bindir}/apol
|
||||||
%{python3_sitearch}/setoolsgui
|
%{python3_sitearch}/setoolsgui
|
||||||
%{_mandir}/man1/apol*
|
%{_mandir}/man1/apol*
|
||||||
%{_mandir}/ru/man1/apol*
|
%{_mandir}/ru/man1/apol*
|
||||||
|
|
||||||
%changelog
|
%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
|
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0-9
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
|
|
||||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
||||||
SHA512 (4.4.0.tar.gz) = 4033ce54213e47e3afd1bdb03b99b0ee3d977f085310d746b34dcfcfe48ac3a562ae0aa2f730d629a298b56dbf295ad219669d13f82578521866b465f8c976e8
|
SHA512 (4.6.0.tar.gz) = 5b654f480f285717d15fa55f754fbd00cb030a0d8af8342d901e0514c4fdbacb7873e19420dab98540eaa481c687ff1e03423df893c0d1744eb4c53eb81afbf5
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
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
|
||||||
|
|
@ -26,7 +26,6 @@
|
||||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
# Include Beaker environment
|
# Include Beaker environment
|
||||||
. /usr/bin/rhts-environment.sh || exit 1
|
|
||||||
. /usr/share/beakerlib/beakerlib.sh || exit 1
|
. /usr/share/beakerlib/beakerlib.sh || exit 1
|
||||||
|
|
||||||
PACKAGE="setools"
|
PACKAGE="setools"
|
||||||
|
|
|
||||||
30
tests/Sanity/sedta/main.fmf
Normal file
30
tests/Sanity/sedta/main.fmf
Normal file
|
|
@ -0,0 +1,30 @@
|
||||||
|
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
|
||||||
|
|
@ -26,7 +26,6 @@
|
||||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
# Include Beaker environment
|
# Include Beaker environment
|
||||||
. /usr/bin/rhts-environment.sh || exit 1
|
|
||||||
. /usr/share/beakerlib/beakerlib.sh || exit 1
|
. /usr/share/beakerlib/beakerlib.sh || exit 1
|
||||||
|
|
||||||
PACKAGE="setools"
|
PACKAGE="setools"
|
||||||
|
|
|
||||||
15
tests/Sanity/seinfo-consistent-output/main.fmf
Normal file
15
tests/Sanity/seinfo-consistent-output/main.fmf
Normal file
|
|
@ -0,0 +1,15 @@
|
||||||
|
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
|
||||||
|
|
@ -26,7 +26,6 @@
|
||||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
# Include Beaker environment
|
# Include Beaker environment
|
||||||
. /usr/bin/rhts-environment.sh || exit 1
|
|
||||||
. /usr/share/beakerlib/beakerlib.sh || exit 1
|
. /usr/share/beakerlib/beakerlib.sh || exit 1
|
||||||
|
|
||||||
PACKAGE="setools-console"
|
PACKAGE="setools-console"
|
||||||
|
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
---
|
|
||||||
# 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
|
|
||||||
- Regression/The-setools-package-doesn-t-install-any-tools
|
|
||||||
- Sanity/seinfo-consistent-output
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue