setools-4.6.0-4

- Fix seinfo argument parsing when policy path follows query options

.gitignore

@@ -15,3 +15,7 @@ setools-3.3.8-f1e5b20.tar.bz2
 /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

156.patch

@@ -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

157.patch

@@ -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')

setools.spec

@@ -1,26 +1,29 @@
-%global sepol_ver 3.5-1
-%global selinux_ver 3.5-1
+%global sepol_ver 3.9
+%global selinux_ver 3.9
 
 Name:           setools
-Version:        4.4.3
-Release:        1%{?dist}
+Version:        4.6.0
+Release:        4%{?dist}
 Summary:        Policy analysis tools for SELinux
 
-License:        GPL-2.0-only and LGPL-2.1-only
+License:        GPL-2.0-only AND LGPL-2.1-only
 URL:            https://github.com/SELinuxProject/setools/wiki
 Source0:        https://github.com/SELinuxProject/setools/archive/%{version}.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
+
 Obsoletes:      setools < 4.0.0, setools-devel < 4.0.0
 BuildRequires:  flex,  bison
 BuildRequires:  glibc-devel, gcc, git-core
 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}
@@ -69,8 +72,6 @@ This package includes the following console tools:
 Summary:     Policy analysis tools for SELinux
 License:     LGPL-2.1-only
 Obsoletes:   setools-libs < 4.0.0
-%{?python_provide:%python_provide python3-setools}
-Requires:    python3-setuptools
 
 %description -n python3-setools
 SETools is a collection of graphical tools, command-line tools, and
@@ -81,7 +82,7 @@ Python 3 modules designed to facilitate SELinux policy analysis.
 Summary:     Policy analysis graphical tools for SELinux
 License:     GPL-2.0-only
 Requires:    python3-setools = %{version}-%{release}
-Requires:    python3-qt5
+Requires:    python3-pyqt6 python3-pyqt6-sip
 Requires:    python3-networkx
 
 %description gui
@@ -93,16 +94,21 @@ Python modules designed to facilitate SELinux policy analysis.
 %autosetup -p 1 -S git -n setools-%{version}
 
 
+%generate_buildrequires
+%pyproject_buildrequires
+
+
 %build
-%py3_build
+%pyproject_wheel
 
 
 %install
-%py3_install
+%pyproject_install
 
 %check
 %if %{?_with_check:1}%{!?_with_check:0}
-%{__python3} setup.py test
+# dnf install python3-pytest python3-pytest-qt
+%pytest
 %endif
 
 
@@ -144,6 +150,63 @@ Python modules designed to facilitate SELinux policy analysis.
 %{_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
 

sources

@@ -1 +1 @@
-SHA512 (4.4.3.tar.gz) = dcea6f10af0f46cb7f06aa1b29a757de7dbc30b52fe705c51a4f395d6cc25bfc7b78c15b6fc5c09ec05a2bbe8316bc79b87156304de5fe098040007d33a70143
+SHA512 (4.6.0.tar.gz) = 5b654f480f285717d15fa55f754fbd00cb030a0d8af8342d901e0514c4fdbacb7873e19420dab98540eaa481c687ff1e03423df893c0d1744eb4c53eb81afbf5