diff --git a/.gitignore b/.gitignore index b838721..ee1b313 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,3 @@ setools-3.3.8-f1e5b20.tar.bz2 /4.4.4.tar.gz /4.5.0.tar.gz /4.5.1.tar.gz -/4.6.0.tar.gz diff --git a/156.patch b/156.patch deleted file mode 100644 index ea56fc1..0000000 --- a/156.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 39f7c88251925463c38f5000f6178fe70b484f44 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -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 ---- - 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 diff --git a/157.patch b/157.patch deleted file mode 100644 index 24b6820..0000000 --- a/157.patch +++ /dev/null @@ -1,42 +0,0 @@ -From a33a2e394435316f3822e89ac9c2a9aabab17252 Mon Sep 17 00:00:00 2001 -From: Pranav Lawate -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 ---- - 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') diff --git a/setools.spec b/setools.spec index e43d04a..f714ba9 100644 --- a/setools.spec +++ b/setools.spec @@ -1,9 +1,9 @@ -%global sepol_ver 3.9 -%global selinux_ver 3.9 +%global sepol_ver 3.6 +%global selinux_ver 3.6 Name: setools -Version: 4.6.0 -Release: 4%{?dist} +Version: 4.5.1 +Release: 6%{?dist} Summary: Policy analysis tools for SELinux License: GPL-2.0-only AND LGPL-2.1-only @@ -12,11 +12,6 @@ Source0: https://github.com/SELinuxProject/setools/archive/%{version}.tar 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 @@ -150,33 +145,6 @@ Python modules designed to facilitate SELinux policy analysis. %{_mandir}/ru/man1/apol* %changelog -* Mon Dec 01 2025 Veronika Syncakova - 4.6.0-4 -- Fix seinfo argument parsing when policy path follows query options - -* Thu Oct 02 2025 Miro Hrončok - 4.6.0-3 -- Drop redundant runtime requirement on python3-setuptools (redux) - -* Fri Sep 19 2025 Python Maint - 4.6.0-2 -- Rebuilt for Python 3.14.0rc3 bytecode - -* Tue Sep 09 2025 Petr Lautrbach - 4.6.0-1 -- SETools 4.6.0 - -* Fri Aug 15 2025 Python Maint - 4.5.1-11 -- Rebuilt for Python 3.14.0rc2 bytecode - -* Mon Aug 04 2025 Miro Hrončok - 4.5.1-10 -- Drop redundant runtime requirement on python3-setuptools (correction) - -* Fri Jul 25 2025 Fedora Release Engineering - 4.5.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jul 05 2025 Petr Lautrbach - 4.5.1-8 -- Rebuilt with SELinux userspace 3.9-rc2 release - -* Mon Jun 02 2025 Python Maint - 4.5.1-7 -- Rebuilt for Python 3.14 - * Tue Apr 01 2025 Miro Hrončok - 4.5.1-6 - Drop redundant runtime requirement on python3-setuptools, dropped in setools 4.5.1 diff --git a/sources b/sources index 386b801..fa454b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (4.6.0.tar.gz) = 5b654f480f285717d15fa55f754fbd00cb030a0d8af8342d901e0514c4fdbacb7873e19420dab98540eaa481c687ff1e03423df893c0d1744eb4c53eb81afbf5 +SHA512 (4.5.1.tar.gz) = 6aef2e12495f980a0b71cf888170ee2f1de94785404b578d416d9720f2441ff3ef14c7ac434310e421c7fa885b8c8ef99aff6438ecfb5e8687d0ff4875127824