.gitignore

@@ -1,2 +1,16 @@
-SOURCES/sos-4.9.2.tar.gz
-SOURCES/sos-audit-0.3-1.tgz
+/sos-4.2.tar.gz
+/sos-audit-0.3.tgz
+/sos-4.3.tar.gz
+/sos-4.4.tar.gz
+/sos-4.5.0.tar.gz
+/sos-4.5.1.tar.gz
+/sos-4.5.3.tar.gz
+/sos-4.5.4.tar.gz
+/sos-4.5.6.tar.gz
+/sos-4.6.0.tar.gz
+/sos-4.6.1.tar.gz
+/sos-4.7.0.tar.gz
+/sos-4.7.1.tar.gz
+/sos-4.7.2.tar.gz
+/sos-4.8.0.tar.gz
+/sos-4.8.1.tar.gz

.sos.metadata

@@ -1,2 +0,0 @@
-928a58267511054d8173802fca3ee8ca087e1eac SOURCES/sos-4.9.2.tar.gz
-00752b68ec5e1141192a9dab7d44377b8d637bf7 SOURCES/sos-audit-0.3-1.tgz

SOURCES/sos-python36-walrus-operator.patch

@@ -1,41 +0,0 @@
---- 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}")
---- a/sos/report/plugins/mongodb.py
-+++ b/sos/report/plugins/mongodb.py
-@@ -87,9 +87,11 @@
-     )
- 
-     def setup(self):
--        if get_juju_info := self.path_exists('/var/lib/juju/db'):
-+        if self.path_exists('/var/lib/juju/db'):
-+            get_juju_info = self.path_exists('/var/lib/juju/db')
-             self.db_folder = "/var/lib/juju/db"
--        elif get_juju_info := self.path_exists('/var/snap/juju-db/curent/db'):
-+        elif self.path_exists('/var/snap/juju-db/curent/db'):
-+            get_juju_info = self.path_exists('/var/snap/juju-db/curent/db')
-             self.db_folder = "/var/snap/juju-db/current/db"
- 
-         super().setup()

SOURCES/sosreport-binary.patch

@@ -1,29 +0,0 @@
---- /dev/null			2025-04-03 01:35:45.132999852 +0200
-+++ sos-4.9.2/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.2/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.2/setup.py	2025-04-15 15:17:21.938635468 +0200
-+++ sos-4.9.2/setup.py	2025-04-15 15:17:41.328198501 +0200
-@@ -34,7 +34,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=data_files,
-     packages=find_packages(include=['sos', 'sos.*'])
- )

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-8
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}

sos.spec

@@ -1,10 +1,10 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%global auditversion 0.3-1
+%global auditversion 0.3
 
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
-Version: 4.9.2
+Version: 4.8.1
 Release: 1%{?dist}
 Group: Applications/System
 Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
@@ -22,8 +22,6 @@ Recommends: python3-pexpect
 Recommends: python3-pyyaml
 Conflicts: vdsm < 4.40
 Obsoletes: sos-collector
-Patch1: sos-python36-walrus-operator.patch
-Patch2: sosreport-binary.patch
 
 %description
 Sos is a set of tools that gathers information about system
@@ -34,8 +32,6 @@ support technicians and developers.
 %prep
 %setup -qn %{name}-%{version}
 %setup -T -D -a1 -q
-%patch -P 1 -p1 
-%patch -P 2 -p1
 
 %build
 %py3_build
@@ -59,17 +55,18 @@ mkdir -p %{buildroot}%{_sysconfdir}/sos/{cleaner,presets.d,extras.d,groups.d}
 # internationalization is currently broken. Uncomment this line once fixed.
 # %%files -f %%{name}.lang
 %files
-%{_sbindir}/sos
 %{_sbindir}/sosreport
+%{_sbindir}/sos
 %{_sbindir}/sos-collector
 %dir /etc/sos/presets.d
 %dir /etc/sos/extras.d
 %dir /etc/sos/groups.d
 /etc/tmpfiles.d/%{name}.conf
 %{python3_sitelib}/*
+%{_mandir}/man1/sosreport.1.gz
 %{_mandir}/man1/sos-clean.1.gz
-%{_mandir}/man1/sos-upload.1.gz
 %{_mandir}/man1/sos-collect.1.gz
+%{_mandir}/man1/sos-collector.1.gz
 %{_mandir}/man1/sos-help.1.gz
 %{_mandir}/man1/sos-mask.1.gz
 %{_mandir}/man1/sos-report.1.gz
@@ -82,7 +79,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/sos/{cleaner,presets.d,extras.d,groups.d}
 
 %package audit
 Summary: Audit use of some commands for support purposes
-License: GPL-2.0-or-later
+License: GPLv2+
 Group: Application/System
 
 %description audit
@@ -105,25 +102,8 @@ of the system. Currently storage and filesystem commands are audited.
 %{_mandir}/man8/sos-audit.sh.8.gz
 %ghost /etc/audit/rules.d/40-sos-filesystem.rules
 %ghost /etc/audit/rules.d/40-sos-storage.rules
-%license LICENSE
 
 %changelog
-* Fri Jul 04 2025 Jan Jansky <jjansky@redhat.com> = 4.9.2-1
-- Update to 4.9.2 in RHEL 8
-  Resolves: RHEL-101716
-
-* Fri May 30 2025 Jan Jansky <jjansky@redhat.com> = 4.9.1-2
-- Update to 4.9.1-2 in RHEL 8
-  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
 - Update to 4.8.1 in RHEL 8
   Resolves: RHEL-64160

sources

@@ -0,0 +1,2 @@
+SHA512 (sos-4.8.1.tar.gz) = c75d5a891c0dd48d2cf511f39dc25a71b65e9daf965d9c1be7ace94f957ec62543fa0c8d1cc700b557920ee581eacce9cf1d8520d5401396aba323dee131e633
+SHA512 (sos-audit-0.3.tgz) = 32597baf6350804d08179a0dbe48470a93df148e83d2e49bb3288f6bcc2d151bb1433761913bfbccd912c14de92435939fef5bcd7e091dfe33a345d61ea842ea