import CS sos-4.7.1-2.el8

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/sos-4.5.6.tar.gz
+SOURCES/sos-4.7.1.tar.gz
 SOURCES/sos-audit-0.3.tgz

.sos.metadata

@@ -1,2 +1,2 @@
-8f38e24add48538585441452d85e2ea4faa04c34 SOURCES/sos-4.5.6.tar.gz
+9ced981872d308e13c5dc47fee21071592ceefc2 SOURCES/sos-4.7.1.tar.gz
 9d478b9f0085da9178af103078bbf2fd77b0175a SOURCES/sos-audit-0.3.tgz

SOURCES/sos-RHEL-35945-sos-clean-on-archive.patch

@@ -0,0 +1,30 @@
+From a0c2586e230c9600d3d3f70ab89c9f6eb52ed3ed Mon Sep 17 00:00:00 2001
+From: Pavel Moravec <pmoravec@redhat.com>
+Date: Tue, 23 Apr 2024 11:00:11 +0200
+Subject: [PATCH] [archive] Fix get_archive_root after files reordering
+
+Commit d5d8c21 reordered files in the archive, such that the first
+member is not the archive root directory further more. Let change the
+get_archive_root method accordingly to prevent self.archive_root being
+empty.
+
+Resolves: #3616
+
+Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
+---
+ sos/cleaner/archives/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sos/cleaner/archives/__init__.py b/sos/cleaner/archives/__init__.py
+index f7c5eb587..0fa1ef43f 100644
+--- a/sos/cleaner/archives/__init__.py
++++ b/sos/cleaner/archives/__init__.py
+@@ -104,7 +104,7 @@ def get_archive_root(self):
+             if toplevel.isdir():
+                 return toplevel.name
+             else:
+-                return os.sep
++                return os.path.dirname(toplevel.name) or os.sep
+         return os.path.abspath(self.archive_path)
+ 
+     def report_msg(self, msg):

SOURCES/sos-bz2226682-ovn-ic-db-files.patch

@@ -1,42 +0,0 @@
-From 0af74a8b24ec9dab0ca0089d5b834ab9908173ac Mon Sep 17 00:00:00 2001
-From: Periyasamy Palanisamy <pepalani@redhat.com>
-Date: Fri, 21 Jul 2023 15:03:01 +0530
-Subject: [PATCH] Collect db files for ovn interconnect environment
-
-This updates openshift_ovn plugin to collect ovn db files
-when it is running with interconnect configuration.
-
-Signed-off-by: Periyasamy Palanisamy <pepalani@redhat.com>
----
- sos/report/plugins/openshift_ovn.py | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/sos/report/plugins/openshift_ovn.py b/sos/report/plugins/openshift_ovn.py
-index 98522b1ed6..d81fc97aae 100644
---- a/sos/report/plugins/openshift_ovn.py
-+++ b/sos/report/plugins/openshift_ovn.py
-@@ -27,7 +27,13 @@ def setup(self):
-             "/var/log/openvswitch/libreswan.log",
-             "/var/log/openvswitch/ovs-monitor-ipsec.log"
-         ])
-+        # Collect ovn interconnect specific files if exists.
-+        self.add_copy_spec([
-+            "/var/lib/ovn-ic/etc/ovnnb_db.db",
-+            "/var/lib/ovn-ic/etc/ovnsb_db.db"
-+        ])
- 
-+        # The ovn cluster/status is not valid anymore for interconnect setup.
-         self.add_cmd_output([
-             'ovn-appctl -t /var/run/ovn/ovnnb_db.ctl ' +
-             'cluster/status OVN_Northbound',
-@@ -38,6 +44,10 @@ def setup(self):
-             'ovs-appctl -t /var/run/ovn/ovn-controller.*.ctl ' +
-             'ct-zone-list'],
-             container='ovnkube-node')
-+        # Collect ovs ct-zone-list directly on host for interconnect setup.
-+        self.add_cmd_output([
-+            'ovs-appctl -t /var/run/ovn-ic/ovn-controller.*.ctl ' +
-+            'ct-zone-list'])
-         self.add_cmd_output([
-             'ovs-appctl -t ovs-monitor-ipsec tunnels/show',
-             'ipsec status',

SPECS/sos.spec

@@ -4,8 +4,8 @@
 
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
-Version: 4.5.6
-Release: 1%{?dist}
+Version: 4.7.1
+Release: 2%{?dist}
 Group: Applications/System
 Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
 Source1: sos-audit-%{auditversion}.tgz
@@ -22,7 +22,7 @@ Recommends: python3-pexpect
 Recommends: python3-pyyaml
 Conflicts: vdsm < 4.40
 Obsoletes: sos-collector
-Patch1: sos-bz2226682-ovn-ic-db-files.patch
+Patch1: sos-RHEL-35945-sos-clean-on-archive.patch
 
 %description
 Sos is a set of tools that gathers information about system
@@ -35,8 +35,9 @@ support technicians and developers.
 %setup -T -D -a1 -q
 %patch1 -p1
 
+
 %build
-%py3_build
+%py3_build         
 
 %install
 %py3_install '--install-scripts=%{_sbindir}'
@@ -106,6 +107,40 @@ of the system. Currently storage and filesystem commands are audited.
 %ghost /etc/audit/rules.d/40-sos-storage.rules
 
 %changelog
+* Thu May 09 2024 Pavel Moravec <pmoravec@redhat.com> = 4.7.1-2
+- [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