.gitignore

@@ -1,2 +1,31 @@
-SOURCES/sos-4.10.1.tar.gz
-SOURCES/sos-audit-0.3-1.tgz
+sos-2.2.tar.gz
+/sos-3.0.tar.gz
+/sos-3.1.tar.gz
+/sos-55c89eb6810e7060845082845653b059aab90e3d.tar.gz
+/sos-3.2.tar.gz
+/3.3.tar.gz
+/3.4.tar.gz
+/3.5.tar.gz
+/3.5.1.tar.gz
+/3.6.tar.gz
+/3.7.tar.gz
+/3.8.tar.gz
+/3.9.1.tar.gz
+/4.0.tar.gz
+/4.1.tar.gz
+/sos-4.1.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.5.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 @@
-9e592633b8ac40cfd84c08b33d3f213edaadfb08 SOURCES/sos-4.10.1.tar.gz
-00752b68ec5e1141192a9dab7d44377b8d637bf7 SOURCES/sos-audit-0.3-1.tgz

SOURCES/0001-python3-walrus-operator.patch

@@ -1,66 +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()
---- a/sos/report/plugins/__init__.py	2025-08-21 12:41:10.418390705 +0200
-+++ b/sos/report/plugins/__init__.py	2025-08-21 12:55:39.546634618 +0200
-@@ -2965,8 +2965,9 @@
-         :rtype: ``str``
-         """
-         if self.container_exists(container, runtime) or \
--           ((_runtime := self._get_container_runtime(runtime)) and
-+           ((self._get_container_runtime(runtime)) and
-            runas is not None):
-+            _runtime = self._get_container_runtime(runtime)
-             return _runtime.fmt_container_cmd(container, cmd, quotecmd)
-         return ''
-
---- a/sos/report/plugins/loki.py	2025-11-24 11:20:56.237814760 +0100
-+++ b/sos/report/plugins/loki.py	2025-11-24 11:28:37.466603011 +0100
-@@ -143,7 +143,8 @@
-         if self.get_option("collect-logs"):
-             endpoint = self.get_option("endpoint") or "http://localhost:3100"
-             self.labels = []
--            if labels_option := self.get_option("labels"):
-+            labels_option = self.get_option("labels")
-+            if labels_option:
-                 if isinstance(labels_option, str) and labels_option:
-                     self.labels.extend(labels_option.split(":"))
-

SOURCES/0002-sosreport-binary.patch

@@ -1,27 +0,0 @@
---- /dev/null	2025-10-28 14:11:21.494784405 +0100
-+++ sos-4.10.1/bin/sosreport	2025-12-04 08:46:53.277857061 +0100
-@@ -0,0 +1,5 @@
-+#!/bin/bash
-+echo "sosreport binary is deprecated, use 'sos report' instead"
-+exec sos report "$@"
-+
-+# vim:ts=4 et sw=4
---- /dev/null	2025-10-28 14:11:21.494784405 +0100
-+++ sos-4.10.1/bin/sos-collector	2025-12-04 08:48:04.661880220 +0100
-@@ -0,0 +1,5 @@
-+#!/bin/bash
-+echo "sos-collector binary is deprecated, use 'sos collector' instead"
-+exec sos collector "$@"
-+
-+# vim:ts=4 et sw=4
---- sos-4.10.1/setup.py	2025-04-15 15:17:21.938635468 +0200
-+++ sos-4.10.1/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.*'])
- )

SOURCES/0003-revert-PR4092.patch

@@ -1,49 +0,0 @@
---- a/sos/upload/targets/__init__.py	2025-09-16 19:57:27.294642506 +0200
-+++ b/sos/upload/targets/__init__.py	2025-09-16 19:59:44.498573843 +0200
-@@ -465,7 +465,7 @@
-                 self.upload_password or
-                 self._upload_password)
- 
--    def upload_sftp(self, user=None, password=None, user_dir=None):
-+    def upload_sftp(self, user=None, password=None):
-         """Attempts to upload the archive to an SFTP location.
- 
-         Due to the lack of well maintained, secure, and generally widespread
-@@ -540,13 +540,10 @@
-             raise Exception("Unable to connect via SFTP to "
-                             f"{self.get_upload_url_string()}")
- 
--        # certain implementations require file to be put in the user dir
--        put_cmd = (
--            f"put {self.upload_archive_name} "
--            f"{f'{user_dir}/' if user_dir else ''}"
--            f"{self._get_sftp_upload_name()}"
--        )
-+        put_cmd = (f'put {self.upload_archive_name} '
-+                   f'{self._get_sftp_upload_name()}')
-         ret.sendline(put_cmd)
-+
-         put_expects = [
-             '100%',
-             pexpect.TIMEOUT,
---- a/sos/upload/targets/redhat.py	2025-09-16 19:57:36.804628207 +0200
-+++ b/sos/upload/targets/redhat.py	2025-09-16 20:00:52.578728154 +0200
-@@ -145,7 +145,7 @@
-         return fname
- 
-     # pylint: disable=too-many-branches
--    def upload_sftp(self, user=None, password=None, user_dir=None):
-+    def upload_sftp(self, user=None, password=None):    
-         """Override the base upload_sftp to allow for setting an on-demand
-         generated anonymous login for the RH SFTP server if a username and
-         password are not given
-@@ -217,8 +217,7 @@
-                     f"{anon.status_code}): {anon.json()}"
-                 )
-         if _user and _token:
--            return super().upload_sftp(user=_user, password=_token,
--                                       user_dir=_user)
-+            return super().upload_sftp(user=_user, password=_token)
-         raise Exception("Could not retrieve valid or anonymous credentials")
- 
-     def check_file_too_big(self, archive):

SOURCES/0004-cleaner-rhel8.patch

@@ -1,36 +0,0 @@
---- a/sos/cleaner/archives/__init__.py	2025-09-22 19:44:51.272619200 +0200
-+++ b/sos/cleaner/archives/__init__.py	2025-09-22 23:28:15.116001268 +0200
-@@ -118,6 +118,8 @@ class SoSObfuscationArchive():
-         self.parsers = parsers  # TODO: include this in __init__?
- 
-     def load_parser_entries(self):
-+        self.soslog = logging.getLogger('sos')
-+        self.ui_log = logging.getLogger('sos_ui')
-         for parser in self.parsers:
-             parser.load_map_entries()
- 
-@@ -150,6 +152,7 @@ class SoSObfuscationArchive():
-         return line, count
- 
-     def obfuscate_arc_files(self, flist):
-+        self.load_parser_entries()
-         for filename in flist:
-             self.log_debug(f"    pid={os.getpid()}: obfuscating {filename}")
-             try:
---- a/sos/cleaner/__init__.py	2025-09-22 19:44:51.272619200 +0200
-+++ b/sos/cleaner/__init__.py	2025-09-22 23:32:17.606745778 +0200
-@@ -720,10 +720,11 @@ third party.
-             # based on files' sizes.
- 
-             files_obfuscated_count = total_sub_count = removed_file_count = 0
-+            # two nullification required before processes cloning
-+            archive.soslog = None
-+            archive.ui_log = None
-             archive_list = [archive for i in range(self.opts.jobs)]
--            with ProcessPoolExecutor(
--                    max_workers=self.opts.jobs,
--                    initializer=archive.load_parser_entries) as executor:
-+            with ProcessPoolExecutor(max_workers=self.opts.jobs) as executor:
-                 futures = executor.map(obfuscate_arc_files, archive_list,
-                                        [file_list[i::self.opts.jobs] for i in
-                                         range(self.opts.jobs)])

SOURCES/0005-pulpcore-RFE-export-table-contents-as-CSV.patch

@@ -1,60 +0,0 @@
-From 6402b4240929b334c31a38a9c86e16e0b6a9e4dd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Pablo=20Fern=C3=A1ndez=20Rodr=C3=ADguez?=
- <pafernan@redhat.com>
-Date: Fri, 21 Nov 2025 12:32:30 +0100
-Subject: [PATCH] [pulpcore] RFE export table contents as CSV
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Resolves: #4152
-
-Signed-off-by: Pablo Fernández Rodríguez <pafernan@redhat.com>
----
- sos/report/plugins/pulpcore.py | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/sos/report/plugins/pulpcore.py b/sos/report/plugins/pulpcore.py
-index ffd53e01..4b126e78 100644
---- a/sos/report/plugins/pulpcore.py
-+++ b/sos/report/plugins/pulpcore.py
-@@ -127,14 +127,15 @@ class PulpCore(Plugin, IndependentPlugin):
-                       "AND table_schema = 'public' AND column_name NOT IN"
-                       " ('args', 'kwargs', 'enc_args', 'enc_kwargs'))"
-                       " TO STDOUT;")
--            col_out = self.exec_cmd(self.build_query_cmd(_query), env=self.env,
-+            col_out = self.exec_cmd(self.build_query_cmd(_query, csv=False),
-+                                    env=self.env,
-                                     runas=self.runas,
-                                     container=self.in_container)
-             columns = col_out['output'] if col_out['status'] == 0 else '*'
-             _query = (f"select {columns} from {table} where pulp_last_updated"
-                       f"> NOW() - interval '{task_days} days' order by"
-                       " pulp_last_updated")
--            _cmd = self.build_query_cmd(_query)
-+            _cmd = self.build_query_cmd(_query, csv=True)
-             self.add_cmd_output(_cmd, env=self.env, suggest_filename=table,
-                                 runas=self.runas, container=self.in_container)
- 
-@@ -152,7 +153,8 @@ class PulpCore(Plugin, IndependentPlugin):
-             "pg_total_relation_size(reltoastrelid) AS toast_bytes "
-             "FROM pg_class c LEFT JOIN pg_namespace n ON "
-             "n.oid = c.relnamespace WHERE relkind = 'r') a) a order by "
--            "total_bytes DESC"
-+            "total_bytes DESC",
-+            csv=False
-         )
-         self.add_cmd_output(_cmd, suggest_filename='pulpcore_db_tables_sizes',
-                             env=self.env, runas=self.runas,
-@@ -168,7 +170,7 @@ class PulpCore(Plugin, IndependentPlugin):
-         """
-         if csv:
-             query = f"COPY ({query}) TO STDOUT " \
--                    "WITH (FORMAT 'csv', DELIMITER ',', HEADER)"
-+                    "WITH (FORMAT 'csv', DELIMITER ';', HEADER)"
-         _dbcmd = "psql --no-password -h %s -p %s -U %s -d %s -c %s"
-         return _dbcmd % (self.dbhost, self.dbport,
-                          self.dbuser, self.dbname, quote(query))
--- 
-2.51.1
-

SOURCES/0006-cleaner-Mask-IPv6-addresses-with-trailing-or.patch

@@ -1,31 +0,0 @@
-From 1c1ee1ac676961fecfc5513fa4f90656401b3aaa Mon Sep 17 00:00:00 2001
-From: Pavel Moravec <pmoravec@redhat.com>
-Date: Wed, 5 Nov 2025 11:53:57 +0100
-Subject: [PATCH] [cleaner] Mask IPv6 addresses with trailing ':' or '\'
-
-Additionally, fix missing backslash in subnet identification.
-
-Resolves: #4154
-Closes: #4155
-
-Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
----
- sos/cleaner/parsers/ipv6_parser.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sos/cleaner/parsers/ipv6_parser.py b/sos/cleaner/parsers/ipv6_parser.py
-index bfb860c7..315241f5 100644
---- a/sos/cleaner/parsers/ipv6_parser.py
-+++ b/sos/cleaner/parsers/ipv6_parser.py
-@@ -27,7 +27,7 @@ class SoSIPv6Parser(SoSCleanerParser):
-         # a trailing prefix for the network bits.
-         r"(?<![:\\.\\-a-z0-9])((([0-9a-f]{1,4})(:[0-9a-f]{1,4}){7})|"
-         r"(([0-9a-f]{1,4}(:[0-9a-f]{0,4}){0,5}))([^.])::(([0-9a-f]{1,4}"
--        r"(:[0-9a-f]{1,4}){0,5})?)(/\d{1,3})?)(?![:\\a-z0-9])"
-+        r"(:[0-9a-f]{1,4}){0,5})?)(\/\d{1,3})?)(?!([a-z0-9]|:[a-z0-9]))"
-     ]
-     parser_skip_files = [
-         'etc/dnsmasq.conf.*',
--- 
-2.51.1
-

SOURCES/0007-plugin_aws-fix-unable-to-get-metadata-in-aws.py.patch

@@ -1,58 +0,0 @@
-From d78e7000d0c91ba0b6b7a56fc931bce3094d0bc9 Mon Sep 17 00:00:00 2001
-From: Frank Liang <xiliang@redhat.com>
-Date: Wed, 3 Dec 2025 00:21:06 +0800
-Subject: [PATCH] [plugin_aws]fix unable to get metadata in aws.py
-
-- exec_cmd() cmd type is a str, cannot execute when
-it is a list
-- removed spaces after X-aws-ec2-metadata-token and
-X-aws-ec2-metadata-token-ttl-seconds
-
-Signed-off-by: Frank Liang <xiliang@redhat.com>
----
- sos/report/plugins/aws.py | 14 ++++++--------
- 1 file changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/sos/report/plugins/aws.py b/sos/report/plugins/aws.py
-index 602e88e4..ba819bed 100644
---- a/sos/report/plugins/aws.py
-+++ b/sos/report/plugins/aws.py
-@@ -41,21 +41,19 @@ class Aws(Plugin, IndependentPlugin):
- 
-         # Try to get an IMDSv2 token
-         token_url = 'http://169.254.169.254/latest/api/token'
--        token_cmd = [
--            'curl', '-sS', '-X', 'PUT', '-H',
--            'X-aws-ec2-metadata-token-ttl-seconds: 21600',
--            token_url]
-+        token_cmd = f'curl -sS -X PUT -H \
-+            X-aws-ec2-metadata-token-ttl-seconds:21600 {token_url}'
- 
-         try:
--            token = self.exec_cmd(token_cmd, timeout=1)
-+            token = self.exec_cmd(token_cmd, timeout=1)['output']
-         except Exception:
-             token = ''
- 
-         # Add header only if token retrieval succeeded
--        token_header = []
-+        token_header = ''
- 
-         if token:
--            token_header = ['-H', f'X-aws-ec2-metadata-token: {token}']
-+            token_header = f'-H X-aws-ec2-metadata-token:{token}'
- 
-         # List of metadata paths we want to get
-         metadata_paths = [
-@@ -73,7 +71,7 @@ class Aws(Plugin, IndependentPlugin):
-             meta_url = base_url + path
-             safe_name = path.replace('/', '_')
-             self.add_cmd_output(
--                    ['curl', '-sS'] + token_header + [meta_url],
-+                    f'curl -sS {token_header} {meta_url}',
-                     suggest_filename=f'aws_metadata_{safe_name}.txt'
-             )
- 
--- 
-2.51.1
-

SPECS/sos.spec

@@ -1,585 +0,0 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
-%global auditversion 0.3-1
-
-Summary: A set of tools to gather troubleshooting information from a system
-Name: sos
-Version: 4.10.1
-Release: 2%{?dist}
-Group: Applications/System
-Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
-Source1: sos-audit-%{auditversion}.tgz
-License: GPL-2.0-or-later
-BuildArch: noarch
-Url: https://github.com/sosreport/sos
-BuildRequires: python3-devel
-BuildRequires: gettext
-BuildRequires: python3-setuptools
-Requires: python3-requests
-Requires: python3-setuptools
-Recommends: python3-magic
-Recommends: python3-pexpect
-Recommends: python3-pyyaml
-Conflicts: vdsm < 4.40
-Obsoletes: sos-collector
-Patch1: 0001-python3-walrus-operator.patch
-Patch2: 0002-sosreport-binary.patch
-Patch3: 0003-revert-PR4092.patch
-Patch4: 0004-cleaner-rhel8.patch
-Patch5: 0005-pulpcore-RFE-export-table-contents-as-CSV.patch
-Patch6: 0006-cleaner-Mask-IPv6-addresses-with-trailing-or.patch
-Patch7: 0007-plugin_aws-fix-unable-to-get-metadata-in-aws.py.patch
-
-%description
-Sos is a set of tools that gathers information about system
-hardware and configuration. The information can then be used for
-diagnostic purposes and debugging. Sos is commonly used to help
-support technicians and developers.
-
-%prep
-%setup -qn %{name}-%{version}
-%setup -T -D -a1 -q
-%patch -P 1 -p1 
-%patch -P 2 -p1
-%patch -P 3 -p1
-%patch -P 4 -p1
-%patch -P 5 -p1
-%patch -P 6 -p1
-%patch -P 7 -p1
-
-%build
-%py3_build
-
-%install
-%py3_install '--install-scripts=%{_sbindir}'
-rm -f %{buildroot}/usr/config/sos.conf
-rm -f %{buildroot}/usr/config/tmpfilesd-sos-rh.conf
-install -Dm644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
-install -d -m 755 %{buildroot}%{_sysconfdir}/tmpfiles.d/
-install -m 644 tmpfiles/tmpfilesd-sos-rh.conf %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
-
-%find_lang %{name} || echo 0
-
-cd %{name}-audit-%{auditversion}
-DESTDIR=%{buildroot} ./install.sh
-cd ..
-
-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-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/sos-clean.1.gz
-%{_mandir}/man1/sos-upload.1.gz
-%{_mandir}/man1/sos-collect.1.gz
-%{_mandir}/man1/sos-help.1.gz
-%{_mandir}/man1/sos-mask.1.gz
-%{_mandir}/man1/sos-report.1.gz
-%{_mandir}/man1/sos.1.gz
-%{_mandir}/man5/sos.conf.5.gz
-%doc AUTHORS README.md
-%license LICENSE
-%config(noreplace) %{_sysconfdir}/sos/sos.conf
-%config(noreplace) %{_sysconfdir}/sos/cleaner
-
-%package audit
-Summary: Audit use of some commands for support purposes
-License: GPL-2.0-or-later
-Group: Application/System
-
-%description audit
-
-Sos-audit provides configuration files for the Linux Auditing System
-to track the use of some commands capable of changing the configuration
-of the system. Currently storage and filesystem commands are audited.
-
-%post audit
-%{_sbindir}/sos-audit.sh
-
-%files audit
-%defattr(755,root,root,-)
-%{_sbindir}/sos-audit.sh
-%defattr(644,root,root,-)
-%config(noreplace) %{_sysconfdir}/sos/sos-audit.conf
-%defattr(444,root,root,-)
-%{_prefix}/lib/sos/audit/*
-%{_mandir}/man5/sos-audit.conf.5.gz
-%{_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 Dec 05 2025 Jan Jansky <jjansky@redhat.com> = 4.10.1-2
-- Fixing sosreport and sos-collector binary
-  Resolves: RHEL-121468
-
-* Tue Nov 25 2025 Jan Jansky <jjansky@redhat.com> = 4.10.1-1
-- Update to 4.10.1-1
-  Resolves: RHEL-121468
-
-* Tue Sep 23 2025 Jan Jansky <jjansky@redhat.com> = 4.10.0-4
-- Update to 4.10.0-4
-  Resolves: RHEL-112413
-
-* Wed Sep 17 2025 Jan Jansky <jjansky@redhat.com> = 4.10.0-2
-- Update to 4.10.0-2
-  Resolves: RHEL-112413
-
-* Thu Aug 21 2025 Jan Jansky <jjansky@redhat.com> = 4.10.0-1
-- Update to 4.10.0
-  Resolves: RHEL-110499
-
-* 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
-
-* Fri Sep 27 2024 Jan Jansky <jjansky@redhat.com> = 4.8.0-3
-- Added credentials obfuscation from multiple files
-  Resolves: RHEL-58097
-
-* Sat Sep 14 2024 Pierguido Lambri <plambri@redhat.com> = 4.8.0-2
-- Resolves: RHEL-22732
-  Fix wrong formatting
-
-* Mon Sep 09 2024 Pierguido Lambri <plambri@redhat.com> = 4.8.0-1
-- New upstream release
-  Resolves: RHEL-58097
-
-* Wed Aug 21 2024 Pavel Moravec <pmoravec@redhat.com> = 4.7.2-2
-- reverting RHEL-22732 patch due to regressions
-  Resolves: RHEL-49779
-
-* Fri Jun 21 2024 Pierguido Lambri <plambri@redhat.com> = 4.7.2-1
-- New upstream release
-  Resolves: RHEL-40871
-  Resolves: RHEL-33703
-  Resolves: RHEL-22732
-
-* Thu May 09 2024 Pavel Moravec <pmoravec@redhat.com> = 4.7.1-3
-- [archive] Fix get_archive_root after files reordering
-  Resolves: RHEL-35945
-
-* Mon Apr 08 2024 Jan Jansky <jjansky@redhat.com> = 4.7.1-1
-- rebase to upstream 4.7.1
-  Resolves: RHEL-32104
-
-* Tue Feb 20 2024 Jan Jansky <jjansky@redhat.com> = 4.7.0-1
-- rebase to upstream 4.7.0
-  Resolves: RHEL-26111
-
-* Thu Jan 11 2024 Pavel Moravec <pmoravec@redhat.com> = 4.6.1-1
-- rebase to upstream 4.6.1
-  Resolves: RHEL-21173
-- [redhat] Change authentication method for RHEL
-  Resolves: RHEL-21177
-
-* Wed Oct 18 2023 Pavel Moravec <pmoravec@redhat.com> = 4.6.0-5
-  [pulpcore] Scrub AUTH_LDAP_BIND_PASSWORD value
-  Resolves: RHEL-13697
-
-* Tue Oct 17 2023 Pavel Moravec <pmoravec@redhat.com> = 4.6.0-4
-- [pulp] Fix dynaconf obfuscation and add AUTH_LDAP_BIND_PASSWORD
-  Resolves: RHEL-13697
-
-* Fri Sep 01 2023 Pavel Moravec <pmoravec@redhat.com> = 4.6.0-2
-- [openshift_ovn] Collect additional ovnkube node logs
-  Resolves: SUPDEV145
-
-* Wed Aug 23 2023 Jan Jansky <jjansky@redhat.com> = 4.6.0-1
-- [cleaner] Use data filter for extraction
-  Resolves: bz2218873
-
-* Thu Jul 27 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.6-1
-- Rebase sos to 4.5.6
-  Resolves: bz2226724
-
-* Fri Jul 14 2023 Jan Jansky <jjansky@redhat.com> = 4.5.5-2
-- Adding patch for mac obfuscation
-  Resolves: bz2218279
-  Resolves: bz2216608
-  Resolves: bz2207562
-
-* Mon Jul 03 2023 Jan Jansky <jjansky@redhat.com> = 4.5.5-1
-- [clean] Respect permissions of sanitised files
-  Resolves: bz2218279
-- [plugin] Fix exception when calling os.makedirs
-  Resolves: bz2216608
-- [cleaner] Enhance trailing characters list after AMC address
-  Resolves: bz2207562
-
-* Thu Jun 01 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.4-1
-- [plugins] collect strings before commands
-  Resolves: bz2203141
-- [collector] collect report from primary node if in node_list
-  Resolves: bz2186460
-- [powerpc] collect invscout logs
-  Resolves: bz2210543
-- [rhc] New plugin for RHC
-  Resolves: bz2196649
-
-* Fri May 05 2023 Jan Jansky <jjansky@redhat.com> = 4.5.3-1
-- [report] Ignore case when scrubbing via do_file_sub
-  Resolves: bz2143272
-- [subscription_manager] Scrub proxy passwords from repo_server_val
-  Resolves: bz2177282
-- [virsh] Scrub passwords in virt-manager logs
-  Resolves: bz2184062
-
-* Wed Mar 08 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.1-3
-- Rebase on upstream 4.5.1
-  Resolves: bz2175806
-- [composer] Capure /etc/osbuild-composer file
-  Resolves: bz2169776
-- [ostree] Collect "ostree fsck" under plugin specific opt
-  Resolves: bz2161533
-- [iprconfig] guard whole plugin by sg kmod predicate
-  Resolves: bz2176086
-- [cleaner] dont clean sys_tmp from final_path
-  Resolves: bz2176218
-
-* Tue Feb 07 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.0-1
-- Rebase on upstream 4.5.0
-  Resolves: bz2082614
-
-* Thu Nov 03 2022 Pavel Moravec <pmoravec@redhat.com> = 4.4-4
-- [ocp] Add newly required labels to temp OCP namespace
-  Resolves: bz2130922
-
-* Fri Oct 28 2022 Pavel Moravec <pmoravec@redhat.com> = 4.4-3
-- [cleaner] Apply compile_regexes after a regular parse line
-  Resolves: bz2138173
-
-* Thu Sep 22 2022 Pavel Moravec <pmoravec@redhat.com> = 4.4-2
-- [utilities] Relax from hard dependency of python3-magic
-  Resolves: bz2129038
-- [dnf] Collect legacy yum config symlinks, properly obfuscate pwds
-  Resolves: bz2100154
-
-* Fri Sep 09 2022 Pavel Moravec <pmoravec@redhat.com> = 4.4-1
-- Rebase on upstream 4.4
-  Resolves: bz2082614
-- [redhat] Honour credential-less --upload-url on RedHat distro properly
-  Resolves: bz2059572
-- [sos] Fix unhandled exception when concurrently removing temp dir
-  Resolves: bz2088439
-- [specfile] drop python3-libxml2 dependency
-  Resolves: bz2125486
-- [md] Restrict data capture to raid members
-  Resolves: bz2125485
-- [cleaner] Use compiled regex lists for parsers by default
-  Resolves: bz2043233
-- [cgroups] not collect memory.kmem.slabinfo
-  Resolves: bz1995120
-- [report] Fix loop devices data gathering
-  Resolves: bz2010735
-- [insights] Collect /var/lib/insights
-  Resolves: bz2103233
-- [candlepin] collect information about SCA
-  Resolves: bz2060925
-- [manpages] Clarify --upload-directory applicable to FTP protocol only
-  Resolves: bz2063259
-- [cleaner] Dont obfuscate tmpdir path of local private_map
-  Resolves: bz2064815
-- [fibrechannel] collect Cisco fnic statistics
-  Resolves: bz2074715
-- [pulpcore] Collect db_tables_sizes
-  Resolves: bz2081433
-- [fibrechannel]: Update fibrechannel plugin to collect HBA logs
-  Resolves: bz2089591
-- [arcconf]: Update arcconf plugin to collect UART logs
-  Resolves: bz2090283
-- [pulpcore] Stop collecting commands relevant to old taskig system
-  Resolves: bz2093191
-- [dnf,yum] Merge plugins into dnf, remove yum plugin
-  Resolves: bz2100154
-- [policies] Simplify flow in _container_init()
-  Resolves: bz2100480
-- [pacemaker] Update collect cluster profile for pacemaker
-  Resolves: bz2065821
-
-* Mon Aug 29 2022 Pavel Moravec <pmoravec@redhat.com> = 4.3-3
-- [vdsm] Set LVM option use_devicesfile=0
-  Resolves: bz2093993
-- [Plugin] Make forbidden path checks more efficient
-  Resolves: bz2099598
-
-* Thu Jun 16 2022 Pavel Moravec <pmoravec@redhat.com> = 4.3-2
-- [ovirt] answer files: Filter out all password keys
-  Resolves: bz2095263
-- [plugins] Allow 'str' PlugOpt type to accept any value
-  Resolves: bz2079485
-- [tigervnc] Update collections for newer versions of TigerVNC
-  Resolves: bz2062908
-- [pacemaker] Redesign node enumeration logic
-  Resolves: bz2065805
-- crio: switch from parsing output in table format to json
-  Resolves: bz2092969
-- [report] Honor plugins' hardcoded plugin_timeout
-  Resolves: bz2079187
-- [report] --list-plugins should report used, not default,
-  Resolves: bz2079484
-- [utilities] Close file only when storing to file
-  Resolves: bz2079486
-- [presets] Adjust OCP preset options, more OCP backports
-  Resolves: bz2058279
-
-* Mon Apr 04 2022 Pavel Moravec <pmoravec@redhat.com> = 4.3-1
-- Rebase on upstream 4.3
-  Resolves: bz2055002
-- [sapnw] Fix IndexError exception
-  Resolves: bz1992938
-- [Plugin, utilities] Allow writing command output directly to disk
-  Resolves: bz1726023
-- [Ceph] Add support for containerized Ceph setup
-  Resolves: bz1882544
-- [unbound] Add new plugin for Unbound DNS resolver
-  Resolves: bz2018228
-- [discovery] Add new discovery plugin
-  Resolves: bz2018549
-- [vdsm] Exclude /var/lib/vdsm/storage/transient_disks
-  Resolves: bz2029154
-
-* Wed Feb 23 2022 Pavel Moravec <pmoravec@redhat.com> = 4.2-15
-- [sosnode] Handle downstream versioning for runtime option
-  Resolves: bz2036697
-- [options] Fix logging on plugopts in effective sos command
-  Resolves: bz2054882
-- [report] Honor plugins' hardcoded plugin_timeout
-  Resolves: bz2055547
-- [policies] Set fallback to None sysroot, don't chroot to '/'
-  Resolves: bz1873185
-- [ovn_central] Rename container responsable of Red Hat
-  Resolves: bz2042966
-
-* Wed Jan 26 2022 Pavel Moravec <pmoravec@redhat.com> = 4.2-13
-- [virsh] Catch parsing exception
-  Resolves: bz2041488
-
-* Tue Jan 25 2022 Pavel Moravec <pmoravec@redhat.com> = 4.2-12
-- [foreman] Use psql-msgpack-decode wrapper for dynflow >= 1.6
-  Resolves: bz2043102
-- [virsh] Call virsh commands in the foreground / with a TTY
-  Resolves: bz2041488
-- [ovn_central] Account for Red Hat ovn package naming
-  Resolves: bz2042966
-- [clean,parsers] Build regex lists for static items only once
-  Resolves: bz2036697
-
-* Mon Jan 10 2022 Pavel Moravec <pmoravec@redhat.com> = 4.2-11
-- [report] Add journal logs for NetworkManager plugin
-  Resolves: bz2036697
-
-* Fri Jan 07 2022 Pavel Moravec <pmoravec@redhat.com> = 4.2-9
-- add oc transport, backport various PRs for OCP
-  Resolves: bz2036697
-- [report] Provide better warning about estimate-mode
-  Resolves: bz1873185
-- [hostname] Fix loading and detection of long base domains
-  Resolves: bz2023867
-
-* Sun Dec 19 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-8
-- [rhui] New log folder
-  Resolves: bz2030741
-- nvidia]:Patch to update nvidia plugin for GPU info
-  Resolves: bz2025403
-- [hostname] Fix edge case for new hosts in a known subdomain
-  Resolves: bz2023867
-
-* Wed Dec 08 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-7
-- [hostname] Simplify case matching for domains
-  Resolves: bz2023867
-
-* Tue Nov 30 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-6
-- [redhat] Fix broken URI to upload to customer portal
-  Resolves: bz2025610
-
-* Mon Nov 22 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-5
-- [clean,hostname_parser] Source /etc/hosts for obfuscation
-  Resolves: bz2023867
-- [clean, hostname] Fix unintentionally case sensitive
-  Resolves: bz2023863
-- [redhat] update SFTP API version to v2
-  Resolves: bz2025610
-
-* Tue Nov 16 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-4
-- [report] Calculate sizes of dirs, symlinks and manifest in
-  Resolves: bz1873185
-- [report] shutdown threads for timeouted plugins
-  Resolves: bz2012857
-- [report] fix filter_namespace per pattern
-  Resolves: bz2020777
-- Ensure specific plugin timeouts are only set
-  Resolves: bz2018033
-
-* Wed Nov 03 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-2
-- [firewall_tables] call iptables -t <table> based on nft
-  Resolves: bz2005195
-- [report] Count with sos_logs and sos_reports in
-  Resolves: bz1873185
-- [foreman] Collect puma status and stats
-  Resolves: bz2011506
-- [report] Overwrite pred=None before refering predicate
-  Resolves: bz2012856
-- [openvswitch] add commands for offline analysis
-  Resolves: bz2004929
-
-* Wed Oct 06 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-1
-- Rebase on upstream 4.2
-  Resolves: bz1998133
-- [report] Implement --estimate-only
-  Resolves: bz1873185
-- [omnipath_client] Opacapture to run only with allow changes
-  Resolves: bz1998433
-- [unpackaged] deal with recursive loop of symlinks properly
-  Resolves: bz1998521
-- [networking] prevent iptables-save commands to load nf_tables
-  Resolves: bz2001096
-- [kernel] Capture Pressure Stall Information
-  Resolves: bz2002145
-- [processor] Apply sizelimit to /sys/devices/system/cpu/cpuX
-  Resolves: bz2011413
-
-* Wed Aug 11 2021 Pavel Moravec <pmoravec@redhat.com> = 4.1-5
-- [report,collect] unify --map-file arguments
-  Resolves: bz1923938
-- [rhui] add new plugin for RHUI 4
-  Resolves: bz1665947
-- [username parser] Load usernames from `last` for LDAP users
-  Resolves: bz1985037
-
-* Mon Jul 26 2021 Pavel Moravec <pmoravec@redhat.com> = 4.1-4
-- [options] allow variant option names in config file
-  Resolves: bz1923938
-- [plugins] Set default predicate instead of None
-  Resolves: bz1985986
-- [MigrationResults] collect info about conversions
-  Resolves: bz1959598
-
-* Mon Jun 21 2021 Pavel Moravec <pmoravec@redhat.com> = 4.1-3
-- [gluster] collect public keys from the right dir
-  Resolves: bz1925419
-- [cleaner] Only skip packaging-based files for the IP parse
-  Resolves: bz1964499
-- [networking] collect also tc filter show ingress
-  Resolves: bz1886711
-- [archive] skip copying SELinux context for /proc and /sys
-  Resolves: bz1965001
-- [sssd] sssd plugin when sssd-common
-  Resolves: bz1967613
-- Various OCP/cluster/cleanup enhancements
-  Resolves: bz1973675
-
-* Tue May 18 2021 Pavel Moravec <pmoravec@redhat.com> = 4.1-2
-- Load maps from all archives before obfuscation
-  Resolves: bz1930181
-- Multiple fixes in man pages
-  Resolves: bz1935603
-- [ds] Mask password and encryption keys in ldif files
-  Resolves: bz1937298
-- [report] add --cmd-timeout option
-  Resolves: bz1937418
-- [cups] Add gathering cups-browsed logs
-  Resolves: bz1939963
-- [sssd] Collect memory cache / individual logfiles
-  Resolves: bz1940502
-- Collect ibmvNIC dynamic_debugs
-  Resolves: bz1942276
-- [pulpcore] add plugin for pulp-3
-  Resolves: bz1956673
-- [saphana] remove redundant unused argument of get_inst_info
-  Resolves: bz1959413
-- [networking] Add nstat command support
-  Resolves: bz1961458
-- [snapper] add a new plugin
-  Resolves: bz1961229
-
-* Mon Apr 26 2021 Pavel Moravec <pmoravec@redhat.com> = 4.1-1
-- Rebase on upstream 4.1
-  Resolves: bz1928679
-
-* Tue Feb 16 2021 Pavel Moravec <pmoravec@redhat.com> = 4.0-8
-- Automatically create directory for sos-cleaner default_mapping
-  Resolves: bz1923937
-
-* Fri Jan 29 2021 Pavel Moravec <pmoravec@redhat.com> = 4.0-7
-- [kdump] Gather the file kexec-dmesg.log
-  Resolves: bz1887402
-- [Policy] Handle additional FTP authentication issues
-  Resolves: bz1916729
-
-* Thu Jan 21 2021 Pavel Moravec <pmoravec@redhat.com> = 4.0-6
-- [networking] Collect 'ethtool -e <device>' conditionally only
-  Resolves: bz1917196
-
-* Wed Jan 06 2021 Pavel Moravec <pmoravec@redhat.com> = 4.0-5
-- [component] honour plugopts from config file
-  Resolves: bz1912889
-- [collector] declare sysroot for each component
-  Resolves: bz1912821
-- [plugins] Dont stop collecting by empty specfile when sizelimit=0
-  Resolves: bz1912910
-
-* Mon Jan 04 2021 Pavel Moravec <pmoravec@redhat.com> = 4.0-4
-- [component] Use sysroot from Policy when opts doesn't specify it
-  Resolves: bz1881118
-
-* Mon Dec 14 2020 Pavel Moravec <pmoravec@redhat.com> = 4.0-3
-- [ovirt] collect /etc/pki/ovirt-engine/.truststore
-  Resolves: bz1848095
-- [collector] allow overriding plain --cluster-type
-  Resolves: bz1895316
-- [component] Add log verbosity from presets
-  Resolves: bz1904045
-- [options] Fix --log-size=0 being ignored and unreported
-  Resolves: bz1905657
-- [report] collect broken symlinks
-  Resolves: bz1906598
-
-* Thu Oct 29 2020 Pavel Moravec <pmoravec@redhat.com> = 4.0-2
-- [cleaner] more streamlined sanitize_item method
-  Resolves: bz1827801
-- [openstack_ironic] Missing ironic-inspector configs
-  Resolves: bz1874295
-- Add support to collect hardware component logs
-  Resolves: bz1880372
-- [crio] collect /etc/crio/crio.conf.d/
-  Resolves: bz1881118
-- [policy] Handle additional failure conditions for FTP uploads
-  Resolves: bz1882368
-- [filesys] never collect content of /proc/fs/panfs
-  Resolves: bz1886782
-- [kdump] Collect new kdump logfiles
-  Resolves: bz1887390
-- [stratis] Collect key list and report engine
-  Resolves: bz1888012
-- return tmp-dir with absolute path
-  Resolves: bz1891562
-
-* Tue Oct 13 2020 Pavel Moravec <pmoravec@redhat.com> = 4.0-1
-- Rebase on upstream 4.0
-  Resolves: bz1827801

gating.yaml

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

sos.spec

@@ -0,0 +1,446 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+%global auditversion 0.3
+
+Summary: A set of tools to gather troubleshooting information from a system
+Name: sos
+Version: 4.8.1
+Release: 1%{?dist}
+Group: Applications/System
+Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
+Source1: sos-audit-%{auditversion}.tgz
+License: GPL-2.0-or-later
+BuildArch: noarch
+Url: https://github.com/sosreport/sos
+BuildRequires: python3-devel
+BuildRequires: gettext
+BuildRequires: python3-setuptools
+Requires: python3-requests
+Requires: python3-setuptools
+Recommends: python3-magic
+Recommends: python3-pexpect
+Recommends: python3-pyyaml
+Conflicts: vdsm < 4.40
+Obsoletes: sos-collector <= 1.9
+
+%description
+Sos is a set of tools that gathers information about system
+hardware and configuration. The information can then be used for
+diagnostic purposes and debugging. Sos is commonly used to help
+support technicians and developers.
+
+%prep
+%setup -qn %{name}-%{version}
+%setup -T -D -a1 -q
+
+%build
+%py3_build
+
+%install
+%py3_install '--install-scripts=%{_sbindir}'
+
+install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}
+install -d -m 700 %{buildroot}%{_sysconfdir}/%{name}/cleaner
+install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}/presets.d
+install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}/groups.d
+install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}/extras.d
+install -d -m 755 %{buildroot}%{_sysconfdir}/tmpfiles.d/
+install -m 644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
+install -m 644 tmpfiles/tmpfilesd-sos-rh.conf %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
+
+rm -rf %{buildroot}/usr/config/
+
+%find_lang %{name} || echo 0
+
+cd %{name}-audit-%{auditversion}
+DESTDIR=%{buildroot} ./install.sh
+cd ..
+
+# internationalization is currently broken. Uncomment this line once fixed.
+# %%files -f %%{name}.lang
+%files
+%{_sbindir}/sos
+%{_sbindir}/sosreport
+%{_sbindir}/sos-collector
+#%dir /etc/sos/cleaner
+%dir /etc/sos/presets.d
+%dir /etc/sos/extras.d
+%dir /etc/sos/groups.d
+%{_sysconfdir}/tmpfiles.d/%{name}.conf
+%{python3_sitelib}/*
+%{_mandir}/man1/*
+%{_mandir}/man5/sos.conf.5.gz
+%doc AUTHORS README.md
+%license LICENSE
+%config(noreplace) %{_sysconfdir}/sos/sos.conf
+%config(noreplace) %{_sysconfdir}/sos/cleaner
+
+
+%package audit
+Summary: Audit use of some commands for support purposes
+License: GPLv2+
+Group: Application/System
+
+%description audit
+
+Sos-audit provides configuration files for the Linux Auditing System
+to track the use of some commands capable of changing the configuration
+of the system.  Currently storage and filesystem commands are audited.
+
+%post audit
+%{_sbindir}/sos-audit.sh
+
+%files audit
+%defattr(755,root,root,-)
+%{_sbindir}/sos-audit.sh
+%defattr(644,root,root,-)
+%config(noreplace) %{_sysconfdir}/sos/sos-audit.conf
+%defattr(444,root,root,-)
+%{_prefix}/lib/sos/audit/*
+%{_mandir}/man5/sos-audit.conf.5.gz
+%{_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
+
+
+%changelog
+* Wed Oct 23 2024 Jan Jansky <jjansky@redhat.com> = 4.8.1-1
+- Update to 4.8.1 in RHEL 9
+  Resolves: RHEL-64159
+ 
+* Tue Oct 15 2024 Jan Jansky <jjansky@redhat.com> = 4.8.0-5
+- Rebase to 4.8.0 and adding credential obfuscation
+  Resolves: RHEL-58096
+
+* Fri Sep 27 2024 Jan Jansky <jjansky@redhat.com> = 4.8.0-4
+- Added credentials obfuscation from multiple files
+  Resolves: RHEL-58096
+
+* Wed Sep 25 2024 Jan Jansky <jjansky@redhat.com> = 4.8.0-3
+- Update 4.8.0
+  Resolves: RHEL-58096
+
+* Thu Sep 19 2024 Jan Jansky <jjansky@redhat.com> = 4.8.0-2
+- Update to 4.8.0
+  Resolves: RHEL-58096
+
+* Mon Sep 09 2024 Pierguido Lambri <plambri@redhat.com> = 4.8.0-1
+- New upstream release
+  Resolves: RHEL-58096
+
+* Wed Aug 21 2024 Pavel Moravec <pmoravec@redhat.com> = 4.7.2-3
+- reverting RHEL-22732 patch due to regressions
+  Resolves: RHEL-49781
+
+* Fri Jun 21 2024 Pierguido Lambri <plambri@redhat.com> = 4.7.2-1
+- New upstream release
+  Resolves: RHEL-49781
+
+* Thu May 09 2024 Pavel Moravec <pmoravec@redhat.com> = 4.7.1-3
+- [archive] Fix get_archive_root after files reordering
+  Resolves: RHEL-35945
+
+* Mon Apr 08 2024 Jan Jansky <jjansky@redhat.com> = 4.7.1-1
+- rebase to upstream 4.7.1
+  Resolves: RHEL-32106
+
+* Tue Feb 20 2024 Jan Jansky <jjansky@redhat.com> = 4.7.0-1
+- rebase to upstream 4.7.0
+  Resolves: RHEL-26115
+
+* Thu Jan 11 2024 Pavel Moravec <pmoravec@redhat.com> = 4.6.1-1
+- rebase to upstream 4.6.1
+  Resolves: RHEL-21174
+- [redhat] Change authentication method for RHEL
+  Resolves: RHEL-21178
+
+* Wed Oct 18 2023 Pavel Moravec <pmoravec@redhat.com> = 4.6.0-5
+  [pulpcore] Scrub AUTH_LDAP_BIND_PASSWORD value
+  Resolves: RHEL-13701
+
+* Tue Oct 17 2023 Pavel Moravec <pmoravec@redhat.com> = 4.6.0-4
+- [pulp] Fix dynaconf obfuscation and add AUTH_LDAP_BIND_PASSWORD
+  Resolves: RHEL-13701
+
+* Thu Oct 12 2023 Pavel Moravec <pmoravec@redhat.com> = 4.6.0-3
+- [greenboot] seperate logs to a standalone plugin; enhance [microshift]
+  Resolves: SUPDEV148
+
+* Fri Sep 01 2023 Pavel Moravec <pmoravec@redhat.com> = 4.6.0-2
+- [openshift_ovn] Collect additional ovnkube node logs
+  Resolves: SUPDEV145
+
+* Wed Aug 23 2023 Jan Jansky <jjansky@redhat.com> = 4.6.0-1
+- [ultrapath] Add new plugin for Huawei UltraPath
+  Resolves: bz2187407
+- [cleaner] Use data filter for extraction
+  Resolves: bz2217906
+- [discovery] Enable the plugin by containers
+  Resolves: bz2222134
+
+* Thu Jul 27 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.6-1
+- Collect db files for ovn interconnect environment
+  Resolves: bz2226682
+
+* Fri Jul 14 2023 Jan Jansky <jjansky@redhat.com> - 4.5.5-2
+- Adding patch for cleaning mac addresses
+  Resolves: bz2217943
+
+* Mon Jul 03 2023 Jan Jansky <jjansky@redhat.com> = 4.5.5-1
+- Rebase on upstream 4.5.5
+  Resolves: bz2217943
+
+* Tue May 31 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.4-1
+- [specfile] add runtime requirement to python3-setuptools
+  Resolves: bz2207776
+
+* Thu May 04 2023 Jan Jansky <jjansky@redhat.com> = 4.5.3-1
+- [unpackaged] Print unpackaged symlinks instead of targets
+  Resolves: bz2169684
+- [report] Ignore case when scrubbing via do_file_sub
+  Resolves: bz2174254
+- [powerpc]: To collect lparnumascore logs
+  Resolves: bz2177984
+
+* Wed Mar 08 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.1-3
+- Rebase on upstream 4.5.1
+  Resolves: bz2175808
+- [microshift] Fix microshift get and add commands
+  Resolves: bz2175650
+
+* Tue Feb 07 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.0-1
+- Rebase on upstream 4.5.0
+  Resolves: bz2082615
+
+* Thu Nov 03 2022 Pavel Moravec <pmoravec@redhat.com> = 4.4-4
+- [ocp] Add newly required labels to temp OCP namespace
+  Resolves: bz2130976
+
+* Fri Oct 28 2022 Pavel Moravec <pmoravec@redhat.com> = 4.4-3
+- [cleaner] Apply compile_regexes after a regular parse line
+  Resolves: bz2138174
+
+* Thu Sep 22 2022 Pavel Moravec <pmoravec@redhat.com> = 4.4-2
+- [utilities] Relax from hard dependency of python3-magic
+  Resolves: bz2126089
+- [dnf] Collect legacy yum config symlinks, properly obfuscate pwds
+  Resolves: bz2125499
+
+* Fri Sep 09 2022 Pavel Moravec <pmoravec@redhat.com> = 4.4-1
+- Rebase on upstream 4.4
+  Resolves: bz2082615
+- [redhat] Honour credential-less --upload-url on RedHat distro properly
+  Resolves: bz2059573
+- [md] Restrict data capture to raid members
+  Resolves: bz2062283
+- [sos] Fix unhandled exception when concurrently removing temp dir
+  Resolves: bz2088440
+
+* Mon Aug 29 2022 Pavel Moravec <pmoravec@redhat.com> = 4.3-3
+- [vdsm] Set LVM option use_devicesfile=0
+  Resolves: bz2122355
+- [Plugin] Make forbidden path checks more efficient
+  Resolves: bz2122354
+
+* Thu Jun 16 2022 Pavel Moravec <pmoravec@redhat.com> = 4.3-2
+- [ocp, openshift] Re-align API collection options and rename
+  Resolves: bz2065563
+- [utilities] Close file only when storing to file
+  Resolves: bz2079492
+- [report] --list-plugins should report used, not default,
+  Resolves: bz2079490
+- [report] Honor plugins' hardcoded plugin_timeout
+  Resolves: bz2079188
+- crio: switch from parsing output in table format to json
+  Resolves: bz2097674
+- [pacemaker] Redesign node enumeration logic
+  Resolves: bz2082914
+- [tigervnc] Update collections for newer versions of TigerVNC
+  Resolves: bz2066181
+- [plugins] Allow 'str' PlugOpt type to accept any value
+  Resolves: bz2079491
+- [ovirt] answer files: Filter out all password keys
+  Resolves: bz2095267
+
+* Thu Mar 24 2022 Pavel Moravec <pmoravec@redhat.com> = 4.3-1
+- Rebase on upstream 4.3
+  Resolves: 2055003
+- [sapnw] Fix IndexError exception
+  Resolves: 2065551
+- [subscription_manager] collect syspurpose data via sub-man
+  Resolves: 2002333
+- [Plugin, utilities] Allow writing command output directly to disk
+  Resolves: 2065564
+- [Ceph] Add support for containerized Ceph setup
+  Resolves: 2065562
+- [unbound] Add new plugin for Unbound DNS resolver
+  Resolves: 2065560
+- [discovery] Add new discovery plugin
+  Resolves: 2065558
+- [system] Collect glibc tuning decisions
+  Resolves: 2032913
+
+* Wed Feb 23 2022 Pavel Moravec <pmoravec@redhat.com> = 4.2-15
+- [sosnode] Handle downstream versioning for runtime option
+  Resolves: bz2037350
+- [options] Fix logging on plugopts in effective sos command
+  Resolves: bz2054883
+- [report] Honor plugins' hardcoded plugin_timeout
+  Resolves: bz2055548
+- [policies] Set fallback to None sysroot, don't chroot to '/'
+  Resolves: bz2011537
+- [ovn_central] Rename container responsable of Red Hat
+  Resolves: bz2043488
+
+* Wed Jan 26 2022 Pavel Moravec <pmoravec@redhat.com> = 4.2-13
+- [virsh] Catch parsing exception
+  Resolves: bz2041855
+
+* Tue Jan 25 2022 Pavel Moravec <pmoravec@redhat.com> = 4.2-12
+- [foreman] Use psql-msgpack-decode wrapper for dynflow >= 1.6
+  Resolves: bz2043104
+- [virsh] Call virsh commands in the foreground / with a TTY
+  Resolves: bz2041855
+- [ovn_central] Account for Red Hat ovn package naming
+  Resolves: bz2043488
+- [clean,parsers] Build regex lists for static items only once
+  Resolves: bz2037350
+
+* Mon Jan 10 2022 Pavel Moravec <pmoravec@redhat.com> = 4.2-11
+- [report] Add journal logs for NetworkManager plugin
+  Resolves: bz2037350
+
+* Fri Jan 07 2022 Pavel Moravec <pmoravec@redhat.com> = 4.2-9
+- add oc transport, backport various PRs for OCP
+  Resolves: bz2037350
+- [report] Provide better warning about estimate-mode
+  Resolves: bz2011537
+- [hostname] Fix loading and detection of long base domains
+  Resolves: bz2024893
+
+* Sun Dec 19 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-8
+- [rhui] New log folder
+  Resolves: bz2031777
+- nvidia]:Patch to update nvidia plugin for GPU info
+  Resolves: bz2034001
+- [hostname] Fix edge case for new hosts in a known subdomain
+  Resolves: bz2024893
+
+* Wed Dec 08 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-7
+- [hostname] Simplify case matching for domains
+  Resolves: bz2024893
+
+* Tue Nov 30 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-6
+- [redhat] Fix broken URI to upload to customer portal
+  Resolves: bz2025611
+
+* Mon Nov 22 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-5
+- [clean,hostname_parser] Source /etc/hosts for obfuscation
+  Resolves: bz2024893
+- [clean, hostname] Fix unintentionally case sensitive
+  Resolves: bz2024892
+- [redhat] update SFTP API version to v2
+  Resolves: bz2025611
+
+* Tue Nov 16 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-4
+- [report] Calculate sizes of dirs, symlinks and manifest in
+  Resolves: bz2011537
+- [report] shutdown threads for timeouted plugins
+  Resolves: bz2012859
+- [report] fix filter_namespace per pattern
+  Resolves: bz2020778
+- Ensure specific plugin timeouts are only set
+  Resolves: bz2023481
+
+* Wed Nov 03 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-2
+- [firewall_tables] call iptables -t <table> based on nft
+  Resolves: bz2011536
+- [report] Count with sos_logs and sos_reports in
+  Resolves: bz2011537
+- [foreman] Collect puma status and stats
+  Resolves: bz2011507
+- [report] Overwrite pred=None before refering predicate
+  Resolves: bz2012858
+- [openvswitch] add commands for offline analysis
+  Resolves: bz2019697
+
+* Wed Oct 06 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-1
+- Rebase on upstream 4.2
+  Resolves: bz1998134
+- [report] Implement --estimate-only
+  Resolves: bz2011537
+- [omnipath_client] Opacapture to run only with allow changes
+  Resolves: bz2011534
+- [unpackaged] deal with recursive loop of symlinks properly
+  Resolves: bz2011533
+- [networking] prevent iptables-save commands to load nf_tables
+  Resolves: bz2011538
+- [kernel] Capture Pressure Stall Information
+  Resolves: bz2011535
+- [processor] Apply sizelimit to /sys/devices/system/cpu/cpuX
+  Resolves: bz1869561
+
+* Wed Aug 11 2021 Pavel Moravec <pmoravec@redhat.com> = 4.1-8
+- [report,collect] unify --map-file arguments
+  Resolves: bz1985985
+- [rhui] add new plugin for RHUI 4
+  Resolves: bz1992859
+- [username parser] Load usernames from `last` for LDAP users
+  Resolves: bz1992861
+
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 4.1-7
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Tue Jul 27 2021 Pavel Moravec <pmoravec@redhat.com> - 4.1-6
+- [networking] collect also tc filter show ingress
+  Resolves: bz1985976
+- [cleaner] Only skip packaging-based files for the IP parser
+  Resolves: bz1985982
+- [sssd] sssd plugin when sssd-common
+  Resolves: bz1967718
+- Various OCP/cluster/cleanup enhancements
+  Resolves: bz1985983
+- [options] allow variant option names in config file
+  Resolves: bz1985985
+- [plugins] Set default predicate instead of None
+  Resolves: bz1938874
+- [MigrationResults] collect info about conversions and
+  Resolves: bz1959779
+
+* Wed Jun 02 2021 Pavel Moravec <pmoravec@redhat.com> - 4.1-4
+- [archive] skip copying SELinux context for /proc and /sys everytime
+  Resolves: bz1965002
+- Load maps from all archives before obfuscation
+  Resolves: bz1967110
+- Multiple fixes in man pages
+  Resolves: bz1967111
+- [ds] Mask password and encryption keys in ldif files
+  Resolves: bz1967112
+- [report] add --cmd-timeout option
+  Resolves: bz1967113
+- [cups] Add gathering cups-browsed logs
+  Resolves: bz1967114
+- [sssd] Collect memory cache / individual logfiles
+  Resolves: bz1967115
+- Collect ibmvNIC dynamic_debugs
+  Resolves: bz1967116
+- [pulpcore] add plugin for pulp-3
+  Resolves: bz1967117
+- [saphana] remove redundant unused argument of get_inst_info
+  Resolves: bz1967118
+- [networking] Add nstat command support
+  Resolves: bz1967119
+- [snapper] add a new plugin
+  Resolves: bz1967120
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 4.1-4
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Thu Apr 01 2021 Pavel Moravec <pmoravec@redhat.com> - 4.1-3
+- adding sos-audit
+- [gluster] Add glusterd public keys and status files
+  Resolves: bz1925419
+
+* Wed Mar 10 2021 Sandro Bonazzola <sbonazzo@redhat.com> - 4.1-1
+- Rebase to 4.1

sources

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