rpms/setroubleshoot-plugins
7
0
Fork 0
Code Issues Pull Requests Releases Activity

setroubleshoot-plugins-3.3.15-2

Browse Source 
- Split multi-command fix_cmds into lists

Note: Swtiched from "Requires" to "Conflicts" with setroubleshoot-server
to remove the circular dependency.

Resolves: RHEL-155206
This commit is contained in:
Vit Mojzis 2026-05-07 13:01:17 +02:00
parent c7492c936d
commit 53499765c2
2 changed files with 82 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
0001-Split-multi-command-fix_cmds-into-lists.patch Normal file
View File

@ -0,0 +1,73 @@
From df90bf242b35a9e01f721dd7ad436f1bd5d21616 Mon Sep 17 00:00:00 2001
From: Vit Mojzis <vmojzis@redhat.com>
Date: Mon, 9 Mar 2026 22:03:31 +0100
Subject: [PATCH] Split multi-command fix_cmds into lists
This requires
https://gitlab.com/setroubleshoot/setroubleshoot/-/merge_requests/54/diffs?commit_id=d5d13afa86c2bd03952c04a187657ed981c9be7e
to work properly!
---
src/allow_execmod.py | 3 ++-
src/automount_exec_config.py | 3 ++-
src/cvs_data.py | 3 ++-
src/file.py | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/allow_execmod.py b/src/allow_execmod.py
index 6e1f6bf..0a3995f 100644
--- a/src/allow_execmod.py
+++ b/src/allow_execmod.py
@@ -81,7 +81,8 @@ If you want this to survive a relabel, execute
# semanage fcontext -a -t textrel_shlib_t '$FIX_TARGET_PATH';restorecon -v '$FIX_TARGET_PATH'
"""
- fix_cmd = """/usr/sbin/semanage fcontext -a -t textrel_shlib_t '$FIX_TARGET_PATH';/usr/sbin/restorecon -v '$FIX_TARGET_PATH'"""
+ fix_cmd = ["""/usr/sbin/semanage fcontext -a -t textrel_shlib_t '$FIX_TARGET_PATH'""",
+ """/usr/sbin/restorecon -v '$FIX_TARGET_PATH'"""]
def init_args(self, args):
if len(args) > 0:
diff --git a/src/automount_exec_config.py b/src/automount_exec_config.py
index a64eaf2..81ada8e 100644
--- a/src/automount_exec_config.py
+++ b/src/automount_exec_config.py
@@ -40,7 +40,8 @@ class plugin(Plugin):
If you want to change the file context of $TARGET_PATH so that the automounter can execute it you can execute "chcon -t bin_t $TARGET_PATH". If you want this to survive a relabel, you need to permanently change the file context: execute "semanage fcontext -a -t bin_t '$FIX_TARGET_PATH'".
''')
- fix_cmd = """/usr/sbin/semanage fcontext -a -t bin_t '$FIX_TARGET_PATH';/usr/sbin/restorecon -v '$FIX_TARGET_PATH'"""
+ fix_cmd = ["""/usr/sbin/semanage fcontext -a -t bin_t '$FIX_TARGET_PATH'""",
+ """/usr/sbin/restorecon -v '$FIX_TARGET_PATH'"""]
if_text = 'If you want to allow automounter to execute $TARGET_PATH'
diff --git a/src/cvs_data.py b/src/cvs_data.py
index 7451622..1e75ead 100644
--- a/src/cvs_data.py
+++ b/src/cvs_data.py
@@ -46,7 +46,8 @@ class plugin(Plugin):
do_text = """# semanage fcontext -a -t cvs_data_t '$FIX_TARGET_PATH'
# restorecon -v '$FIX_TARGET_PATH'"""
- fix_cmd = """/usr/sbin/semanage fcontext -a -t cvs_data_t '$FIX_TARGET_PATH';/usr/sbin/restorecon -v '$FIX_TARGET_PATH'"""
+ fix_cmd = ["""/usr/sbin/semanage fcontext -a -t cvs_data_t '$FIX_TARGET_PATH'""",
+ """/usr/sbin/restorecon -v '$FIX_TARGET_PATH'"""]
def __init__(self):
Plugin.__init__(self, __name__)
diff --git a/src/file.py b/src/file.py
index ac24bf9..25f3a43 100644
--- a/src/file.py
+++ b/src/file.py
@@ -66,7 +66,7 @@ home directory from a previous installation that did not use SELinux, 'restoreco
if args == (1,0):
return '/sbin/restorecon -R -v $TARGET_PATH'
else:
- return 'touch /.autorelabel; reboot'
+ return ['touch /.autorelabel', 'reboot']
def init_args(self, args):
if args == (1,0):
--
2.53.0

14
setroubleshoot-plugins.spec
View File

@ -6,12 +6,13 @@
Summary: Analysis plugins for use with setroubleshoot
Name: setroubleshoot-plugins
Version: 3.3.15
Release: 1%{?dist}
Release: 2%{?dist}
License: GPL-2.0-or-later
URL: https://gitlab.com/setroubleshoot/plugins
Source0: https://gitlab.com/-/project/24478430/uploads/1d856bff1c9fb16a8c6fc877d7fe91ca/setroubleshoot-plugins-3.3.15.tar.gz
# git format-patch -N setroubleshoot-plugins-<version> -- plugins
# i=1; for j in 00*patch; do printf "Patch%04d: %s\n" $i $j; i=$((i+1));done
# git format-patch -N setroubleshoot-plugins-<version>
# for j in 00*patch; do printf "Patch: %s\n" $j; done
Patch: 0001-Split-multi-command-fix_cmds-into-lists.patch
BuildArch: noarch
# gcc is needed only for ./configure
@ -20,8 +21,8 @@ BuildRequires: gcc
BuildRequires: make
BuildRequires: perl-XML-Parser
BuildRequires: intltool gettext python3-devel
# Introduction of get_package_nvr functions
Requires: setroubleshoot-server >= 3.3.23
# Support for multiple commands in fix_cmd
Conflicts: setroubleshoot-server < 3.3.37
%description
This package provides a set of analysis plugins for use with
@ -49,6 +50,9 @@ rm -rf %{buildroot}
%{_datadir}/setroubleshoot/plugins
%changelog
* Thu May 07 2026 Vit Mojzis <vmojzis@redhat.com> - 3.3.15-2
- Split multi-command fix_cmds into lists (RHEL-155206)
* Mon Jan 06 2025 Petr Lautrbach <lautrbach@redhat.com> - 3.3.15-1
- restorecon.py: exclude more paths
- Improve disable_ipv6 plugin then_text