1
0
forked from rpms/sos

Compare commits

..

2 Commits
a8 ... c8

Author SHA1 Message Date
bec308ba16 import UBI sos-4.9.1-2.el8_10 2025-06-24 19:27:21 +00:00
ee271c3b5d import UBI sos-4.8.2-1.el8_10 2025-02-10 19:15:04 +00:00
9 changed files with 264 additions and 63 deletions

4
.gitignore vendored
View File

@ -1,2 +1,2 @@
SOURCES/sos-4.8.1.tar.gz SOURCES/sos-4.9.1.tar.gz
SOURCES/sos-audit-0.3.tgz SOURCES/sos-audit-0.3-1.tgz

View File

@ -1,2 +1,2 @@
26aee6ec0ad73c12a4ad0cf50c02082777d654cc SOURCES/sos-4.8.1.tar.gz 9c7e8309a950a99ccd4f02268b7b842374f7da16 SOURCES/sos-4.9.1.tar.gz
9d478b9f0085da9178af103078bbf2fd77b0175a SOURCES/sos-audit-0.3.tgz 00752b68ec5e1141192a9dab7d44377b8d637bf7 SOURCES/sos-audit-0.3-1.tgz

View File

@ -0,0 +1,37 @@
From 1d449044caf2224da5e55d0de51459137feb0807 Mon Sep 17 00:00:00 2001
From: Pavel Moravec <pmoravec@redhat.com>
Date: Sun, 25 May 2025 11:46:34 +0200
Subject: [PATCH] [cleaner] Use "hostname -f" in HostnamePrepper
HostnamePrepper should always be fed by FQDN to ensure domain names are
recognized properly.
This is important esp. when:
- /etc/hosts is empty
- "hostname" contains shortname only
- "hostname -f" contains FQDN
Resolves: #4022
Closes: #4026
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
---
sos/cleaner/preppers/hostname.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sos/cleaner/preppers/hostname.py b/sos/cleaner/preppers/hostname.py
index 0812597e..b20f5679 100644
--- a/sos/cleaner/preppers/hostname.py
+++ b/sos/cleaner/preppers/hostname.py
@@ -29,7 +29,7 @@ class HostnamePrepper(SoSPrepper):
items = []
_file = 'hostname'
if archive.is_sos:
- _file = 'sos_commands/host/hostname'
+ _file = 'sos_commands/host/hostname_-f'
elif archive.is_insights:
_file = 'data/insights_commands/hostname_-f'
--
2.49.0

View File

@ -0,0 +1,30 @@
From c41fca3daed8b515c4022ab02232acab8b1ec4c4 Mon Sep 17 00:00:00 2001
From: Pavel Moravec <pmoravec@redhat.com>
Date: Tue, 20 May 2025 13:18:26 +0200
Subject: [PATCH] [dnf] Scrub passwords in repository URIs
Closes: #4018
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
---
sos/report/plugins/dnf.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/sos/report/plugins/dnf.py b/sos/report/plugins/dnf.py
index 4a1e52b9..69224955 100644
--- a/sos/report/plugins/dnf.py
+++ b/sos/report/plugins/dnf.py
@@ -150,4 +150,10 @@ class DNFPlugin(Plugin, RedHatPlugin):
#
self.do_file_sub("/etc/dnf/dnf.conf", regexp, repl)
+ # Scrub credentials in http URIs
+ self.do_paths_http_sub([
+ '/etc/yum.repos.d/*',
+ '/var/log/dnf.*',
+ ])
+
# vim: set et ts=4 sw=4 :
--
2.49.0

View File

@ -1,43 +0,0 @@
From e2bd0d93a73c3613dd6eb758437fd54f72e83433 Mon Sep 17 00:00:00 2001
From: Koichiro Iwao <meta@almalinux.org>
Date: Wed, 11 Dec 2024 14:59:00 +0900
Subject: [PATCH] [policies] Fix bug in distro identification
Fixes a bug in #3764.
A bug in the distro-identifying logic caused incorrect identification
of the distro as CentOS, Fedora, or RHEL under the following conditions:
1. Distro inherits RedHatPolicy
2. Distro has either of /etc/{centos,fedora,redhat}-release
3. Policy file appears earlier than redhat.py in dictionary order
The issue occurs because the distro-identifying logic relies on the
existence of the above os_release_file without examining its contents,
more than checking NAME or ID in the /etc/os-release file. As a result,
once /etc/{centos,fedora,redhat}-release is found, the contents of
/etc/os-release are never checked, leading to distro misidentification.
At least AlmaLinux is affected by this bug.
Signed-off-by: Koichiro Iwao <meta@almalinux.org>
---
sos/policies/distros/__init__.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sos/policies/distros/__init__.py b/sos/policies/distros/__init__.py
index 66970c72d..a2a07a91f 100644
--- a/sos/policies/distros/__init__.py
+++ b/sos/policies/distros/__init__.py
@@ -164,7 +164,10 @@ def _check_release(content):
if remote:
return _check_release(remote)
# use the os-specific file primarily
- if os.path.isfile(cls.os_release_file):
+ # also check the symlink destination
+ if (os.path.isfile(cls.os_release_file) and
+ os.path.basename(cls.os_release_file)
+ == os.path.basename(os.path.realpath(cls.os_release_file))):
return True
# next check os-release for a NAME or ID value we expect
with open(OS_RELEASE, "r", encoding='utf-8') as f:

View File

@ -0,0 +1,111 @@
From 369e65acafa70a6d7a9751802395bddaaeafd141 Mon Sep 17 00:00:00 2001
From: Jose Castillo <jcastillo@redhat.com>
Date: Wed, 21 May 2025 10:10:41 +0100
Subject: [PATCH] [policy] Re-add logic to request case-id if not present
This commit re-adds the logic to ask for case-id if
the user hasn't specified it in the command line
explicitly.
Related: RHEL-92071
Signed-off-by: Jose Castillo <jcastillo@redhat.com>
---
sos/policies/distros/__init__.py | 18 ++++++++++++++++--
sos/upload/__init__.py | 3 +++
sos/upload/targets/redhat.py | 22 ++--------------------
3 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/sos/policies/distros/__init__.py b/sos/policies/distros/__init__.py
index 06327a6b..7004fdbd 100644
--- a/sos/policies/distros/__init__.py
+++ b/sos/policies/distros/__init__.py
@@ -13,6 +13,7 @@
import os
import re
+from sos import _sos as _
from sos.policies import Policy
from sos.policies.init_systems import InitSystem
from sos.policies.init_systems.systemd import SystemdInit
@@ -300,8 +301,21 @@ class LinuxPolicy(Policy):
if cmdline_opts.low_priority:
self._configure_low_priority()
- if cmdline_opts.case_id:
- self.case_id = cmdline_opts.case_id
+ # set or query for case id
+ self.case_id = self.prompt_for_case_id(cmdline_opts)
+
+ def prompt_for_case_id(self, cmdline_opts):
+ if not cmdline_opts.batch and not \
+ cmdline_opts.quiet:
+ if not cmdline_opts.case_id:
+ cmdline_opts.case_id = input(
+ _("Optionally, please enter the case id that you are "
+ "generating this report for: ")
+ )
+ self.case_id = cmdline_opts.case_id if \
+ cmdline_opts.case_id else ""
+
+ return self.case_id
def _configure_low_priority(self):
"""Used to constrain sos to a 'low priority' execution, potentially
diff --git a/sos/upload/__init__.py b/sos/upload/__init__.py
index 97872f69..7be33f65 100644
--- a/sos/upload/__init__.py
+++ b/sos/upload/__init__.py
@@ -282,6 +282,9 @@ this utility.
if self.from_cmdline:
self.intro()
self.archive = self.opts.upload_file
+ self.caseid = self.policy.prompt_for_case_id(
+ cmdline_opts=self.opts
+ )
cmdline_target = self.opts.upload_target
if cmdline_target and cmdline_target != 'local':
self.upload_target = self.upload_targets[cmdline_target]
diff --git a/sos/upload/targets/redhat.py b/sos/upload/targets/redhat.py
index b3e8e3c5..d5262af0 100644
--- a/sos/upload/targets/redhat.py
+++ b/sos/upload/targets/redhat.py
@@ -52,25 +52,6 @@ class RHELUploadTarget(UploadTarget):
self.upload_directory = self.commons['cmdlineopts'].upload_directory
- def prompt_for_case_id(self):
- caseid = self.commons['cmdlineopts'].case_id if \
- self.commons['cmdlineopts'].case_id else ""
-
- # set or query for case id
- if not self.commons['cmdlineopts'].batch and not \
- self.commons['cmdlineopts'].quiet:
- if caseid:
- self.commons['cmdlineopts'].case_id = caseid
- else:
- self.commons['cmdlineopts'].case_id = input(
- _("Optionally, please enter the case id that you are "
- "generating this report for: ")
- )
- if self.commons['cmdlineopts'].case_id:
- self.case_id = self.commons['cmdlineopts'].case_id
-
- return self.case_id
-
def prompt_for_upload_user(self):
if self.commons['cmdlineopts'].upload_user:
self.ui_log.info(
@@ -101,7 +82,8 @@ class RHELUploadTarget(UploadTarget):
if self.commons['cmdlineopts'].upload_protocol == 'sftp':
return self.RH_SFTP_HOST
if not self.commons['cmdlineopts'].case_id and not\
- self.prompt_for_case_id():
+ self.commons['policy'].prompt_for_case_id(
+ self.commons['cmdlineopts']):
return self.RH_SFTP_HOST
except Exception as e:
--
2.49.0

View File

@ -0,0 +1,25 @@
--- a/sos/report/plugins/coredump.py
+++ b/sos/report/plugins/coredump.py
@@ -72,8 +72,8 @@
cdump = line.split()
pid = cdump[4]
exe = cdump[-2]
- if regex := self.get_option("executable"):
- if not re.search(regex, exe, re.I):
+ if self.get_option("executable"):
+ if not re.search(self.get_option("executable"), exe, re.I):
continue
cinfo = self.collect_cmd_output(f"coredumpctl info {pid}")
if cinfo['status'] != 0:
--- a/sos/collector/sosnode.py
+++ b/sos/collector/sosnode.py
@@ -372,7 +372,8 @@
for line in result.splitlines():
if not is_list:
try:
- if ls := line.split():
+ ls = line.split()
+ if ls:
res.append(ls[0])
except Exception as err:
self.log_debug(f"Error parsing sos help: {err}")

View File

@ -0,0 +1,29 @@
--- /dev/null 2025-04-03 01:35:45.132999852 +0200
+++ sos-4.9.1/bin/sosreport 2025-04-15 13:54:04.924751581 +0200
@@ -0,0 +1,5 @@
+#!/usr/bin/python3
+msg = ("sosreport binary is deprecated, use 'sos report' instead")
+print(msg)
+
+# vim:ts=4 et sw=4
--- /dev/null 2025-04-03 01:35:45.132999852 +0200
+++ sos-4.9.1/bin/sos-collector 2025-04-15 15:10:17.780281627 +0200
@@ -0,0 +1,5 @@
+#!/usr/bin/python3
+msg = ("sos-collector binary is deprecated, use 'sos collector' instead")
+print(msg)
+
+# vim:ts=4 et sw=4
--- sos-4.9.1/setup.py 2025-04-15 15:17:21.938635468 +0200
+++ sos-4.9.1/setup.py 2025-04-15 15:17:41.328198501 +0200
@@ -19,7 +19,7 @@
maintainer_email='jacob.r.hunsaker@gmail.com',
url='https://github.com/sosreport/sos',
license="GPLv2+",
- scripts=['bin/sos'],
+ scripts=['bin/sos', 'bin/sosreport', 'bin/sos-collector'],
data_files=[
('share/man/man1', ['man/en/sos-report.1', 'man/en/sos.1',
'man/en/sos-collect.1', 'man/en/sos-clean.1',

View File

@ -1,11 +1,11 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%global auditversion 0.3 %global auditversion 0.3-1
Summary: A set of tools to gather troubleshooting information from a system Summary: A set of tools to gather troubleshooting information from a system
Name: sos Name: sos
Version: 4.8.1 Version: 4.9.1
Release: 1%{?dist}.alma.1 Release: 2%{?dist}
Group: Applications/System Group: Applications/System
Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
Source1: sos-audit-%{auditversion}.tgz Source1: sos-audit-%{auditversion}.tgz
@ -22,9 +22,11 @@ Recommends: python3-pexpect
Recommends: python3-pyyaml Recommends: python3-pyyaml
Conflicts: vdsm < 4.40 Conflicts: vdsm < 4.40
Obsoletes: sos-collector Obsoletes: sos-collector
Patch1: sos-python36-walrus-operator.patch
# AlmaLinux patches Patch2: sosreport-binary.patch
Patch1000: sos-patch-upstream-3870.patch Patch3: sos-cleaner-Use-hostname-f-in-HostnamePrepper.patch
Patch4: sos-dnf-Scrub-passwords-in-repository-URIs.patch
Patch5: sos-policy-Re-add-logic-to-request-case-id-if-not-presen.patch
%description %description
Sos is a set of tools that gathers information about system Sos is a set of tools that gathers information about system
@ -35,9 +37,11 @@ support technicians and developers.
%prep %prep
%setup -qn %{name}-%{version} %setup -qn %{name}-%{version}
%setup -T -D -a1 -q %setup -T -D -a1 -q
%patch -P 1 -p1
# AlmaLinux patches %patch -P 2 -p1
%patch1000 -p1 %patch -P 3 -p1
%patch -P 4 -p1
%patch -P 5 -p1
%build %build
%py3_build %py3_build
@ -61,18 +65,17 @@ mkdir -p %{buildroot}%{_sysconfdir}/sos/{cleaner,presets.d,extras.d,groups.d}
# internationalization is currently broken. Uncomment this line once fixed. # internationalization is currently broken. Uncomment this line once fixed.
# %%files -f %%{name}.lang # %%files -f %%{name}.lang
%files %files
%{_sbindir}/sosreport
%{_sbindir}/sos %{_sbindir}/sos
%{_sbindir}/sosreport
%{_sbindir}/sos-collector %{_sbindir}/sos-collector
%dir /etc/sos/presets.d %dir /etc/sos/presets.d
%dir /etc/sos/extras.d %dir /etc/sos/extras.d
%dir /etc/sos/groups.d %dir /etc/sos/groups.d
/etc/tmpfiles.d/%{name}.conf /etc/tmpfiles.d/%{name}.conf
%{python3_sitelib}/* %{python3_sitelib}/*
%{_mandir}/man1/sosreport.1.gz
%{_mandir}/man1/sos-clean.1.gz %{_mandir}/man1/sos-clean.1.gz
%{_mandir}/man1/sos-upload.1.gz
%{_mandir}/man1/sos-collect.1.gz %{_mandir}/man1/sos-collect.1.gz
%{_mandir}/man1/sos-collector.1.gz
%{_mandir}/man1/sos-help.1.gz %{_mandir}/man1/sos-help.1.gz
%{_mandir}/man1/sos-mask.1.gz %{_mandir}/man1/sos-mask.1.gz
%{_mandir}/man1/sos-report.1.gz %{_mandir}/man1/sos-report.1.gz
@ -85,7 +88,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/sos/{cleaner,presets.d,extras.d,groups.d}
%package audit %package audit
Summary: Audit use of some commands for support purposes Summary: Audit use of some commands for support purposes
License: GPLv2+ License: GPL-2.0-or-later
Group: Application/System Group: Application/System
%description audit %description audit
@ -108,11 +111,20 @@ of the system. Currently storage and filesystem commands are audited.
%{_mandir}/man8/sos-audit.sh.8.gz %{_mandir}/man8/sos-audit.sh.8.gz
%ghost /etc/audit/rules.d/40-sos-filesystem.rules %ghost /etc/audit/rules.d/40-sos-filesystem.rules
%ghost /etc/audit/rules.d/40-sos-storage.rules %ghost /etc/audit/rules.d/40-sos-storage.rules
%license LICENSE
%changelog %changelog
* Fri Dec 13 2024 Koichiro Iwao <meta@almalinux.org> - 4.8.1-1.alma.1 * Fri May 30 2025 Jan Jansky <jjansky@redhat.com> = 4.9.1-2
- Backport upstream patch to fix distro detection - Update to 4.9.1-2 in RHEL 8
Obtained from: https://github.com/sosreport/sos/pull/3870 Resolves: RHEL-86645
* Tue Apr 15 2025 Jan Jansky <jjansky@redhat.com> = 4.9.1-1
- Update to 4.9.1 in RHEL 8
Resolves: RHEL-86645
* Tue Jan 07 2025 Jan Jansky <jjansky@redhat.com> = 4.8.2-1
- Update to 4.8.2 in RHEL 8
Resolves: RHEL-72941
* Wed Oct 23 2024 Jan Jansky <jjansky@redhat.com> = 4.8.1-1 * Wed Oct 23 2024 Jan Jansky <jjansky@redhat.com> = 4.8.1-1
- Update to 4.8.1 in RHEL 8 - Update to 4.8.1 in RHEL 8