Compare commits
3 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1ff47fcd7a | ||
|
|
853f87d534 | ||
|
|
87234a1ae9 |
5 changed files with 103 additions and 3 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -18,3 +18,4 @@ setools-3.3.8-f1e5b20.tar.bz2
|
||||||
/4.4.4.tar.gz
|
/4.4.4.tar.gz
|
||||||
/4.5.0.tar.gz
|
/4.5.0.tar.gz
|
||||||
/4.5.1.tar.gz
|
/4.5.1.tar.gz
|
||||||
|
/4.6.0.tar.gz
|
||||||
|
|
|
||||||
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')
|
||||||
18
setools.spec
18
setools.spec
|
|
@ -2,8 +2,8 @@
|
||||||
%global selinux_ver 3.6
|
%global selinux_ver 3.6
|
||||||
|
|
||||||
Name: setools
|
Name: setools
|
||||||
Version: 4.5.1
|
Version: 4.6.0
|
||||||
Release: 6%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: Policy analysis tools for SELinux
|
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
|
||||||
|
|
@ -12,6 +12,11 @@ Source0: https://github.com/SELinuxProject/setools/archive/%{version}.tar
|
||||||
Source1: setools.pam
|
Source1: setools.pam
|
||||||
Source2: apol.desktop
|
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
|
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
|
||||||
|
|
@ -145,6 +150,15 @@ Python modules designed to facilitate SELinux policy analysis.
|
||||||
%{_mandir}/ru/man1/apol*
|
%{_mandir}/ru/man1/apol*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Dec 01 2025 Veronika Syncakova <vsyncako@redhat.com> - 4.6.0-3
|
||||||
|
- Fix seinfo argument parsing when policy path follows query options
|
||||||
|
|
||||||
|
* Thu Oct 02 2025 Miro Hrončok <mhroncok@redhat.com> - 4.6.0-2
|
||||||
|
- Drop redundant runtime requirement on python3-setuptools (redux)
|
||||||
|
|
||||||
|
* Tue Sep 09 2025 Petr Lautrbach <lautrbach@redhat.com> - 4.6.0-1
|
||||||
|
- SETools 4.6.0
|
||||||
|
|
||||||
* Tue Apr 01 2025 Miro Hrončok <mhroncok@redhat.com> - 4.5.1-6
|
* 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
|
- Drop redundant runtime requirement on python3-setuptools, dropped in setools 4.5.1
|
||||||
|
|
||||||
|
|
|
||||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
||||||
SHA512 (4.5.1.tar.gz) = 6aef2e12495f980a0b71cf888170ee2f1de94785404b578d416d9720f2441ff3ef14c7ac434310e421c7fa885b8c8ef99aff6438ecfb5e8687d0ff4875127824
|
SHA512 (4.6.0.tar.gz) = 5b654f480f285717d15fa55f754fbd00cb030a0d8af8342d901e0514c4fdbacb7873e19420dab98540eaa481c687ff1e03423df893c0d1744eb4c53eb81afbf5
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue