sos updates to RHEL9.1

Resolves: bz2055003 bz2065551 bz2002333 bz2065564
Resolves: bz2065562 bz2065560 bz2065558 bz2032913

Signed-off-by: Pavel Moravec <pmoravec@redhat.com>

.gitignore

@@ -15,3 +15,4 @@ sos-2.2.tar.gz
 /4.1.tar.gz
 /sos-4.1.tar.gz
 /sos-audit-0.3.tgz
+/sos-4.3.tar.gz

sos-bz2055003-rebase-sos-add-sos-help.patch

@@ -0,0 +1,67 @@
+From b5389aa195675f473acdd22f20017a8854ff82d0 Mon Sep 17 00:00:00 2001
+From: Pavel Moravec <pmoravec@redhat.com>
+Date: Wed, 16 Feb 2022 08:43:32 +0100
+Subject: [PATCH] [man] Mention sos-help in main sos manpage
+
+Related to #2860
+
+Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
+---
+ man/en/sos.1 | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/man/en/sos.1 b/man/en/sos.1
+index ce4918f99..c335b7e10 100644
+--- a/man/en/sos.1
++++ b/man/en/sos.1
+@@ -67,6 +67,14 @@ May be invoked via either \fBsos clean\fR, \fBsos cleaner\fR, \fBsos mask\fR,
+ or via the \fB--clean\fR, \fB--cleaner\fR or \fB --mask\fR options
+ for \fBreport\fR and \fBcollect\fR.
+ 
++.TP
++.B help
++This subcommand is used to retrieve more detailed information on the various SoS
++commands and components than is directly available in either other manpages or
++--help output.
++
++See \fB sos help --help\fR and \fB man sos-help\fR for more information.
++
+ .SH GLOBAL OPTIONS
+ sos components provide their own set of options, however the following are available
+ to be set across all components.
+From ac4eb48fa35c13b99ada41540831412480babf8d Mon Sep 17 00:00:00 2001
+From: Pavel Moravec <pmoravec@redhat.com>
+Date: Wed, 16 Feb 2022 08:44:16 +0100
+Subject: [PATCH] [setup] Add sos-help to build process
+
+Resolves: #2860
+Closes: #2861
+
+Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
+---
+ setup.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 25e87a71b..8db8641f0 100644
+--- a/setup.py
++++ b/setup.py
+@@ -90,7 +90,7 @@ def copy_file (self, filename, dirname):
+         ('share/man/man1', ['man/en/sosreport.1', 'man/en/sos-report.1',
+                             'man/en/sos.1', 'man/en/sos-collect.1',
+                             'man/en/sos-collector.1', 'man/en/sos-clean.1',
+-                            'man/en/sos-mask.1']),
++                            'man/en/sos-mask.1', 'man/en/sos-help.1']),
+         ('share/man/man5', ['man/en/sos.conf.5']),
+         ('share/licenses/sos', ['LICENSE']),
+         ('share/doc/sos', ['AUTHORS', 'README.md']),
+@@ -102,7 +102,8 @@ def copy_file (self, filename, dirname):
+         'sos.policies.package_managers', 'sos.policies.init_systems',
+         'sos.report', 'sos.report.plugins', 'sos.collector',
+         'sos.collector.clusters', 'sos.collector.transports', 'sos.cleaner',
+-        'sos.cleaner.mappings', 'sos.cleaner.parsers', 'sos.cleaner.archives'
++        'sos.cleaner.mappings', 'sos.cleaner.parsers', 'sos.cleaner.archives',
++        'sos.help'
+     ],
+     cmdclass=cmdclass,
+     command_options=command_options,

sos.spec

@@ -4,8 +4,8 @@
 
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
-Version: 4.2
+Version: 4.3
-Release: 15%{?dist}
+Release: 1%{?dist}
 Group: Applications/System
 Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
 Source1: sos-audit-%{auditversion}.tgz
@@ -24,29 +24,7 @@ Conflicts: vdsm < 4.40
 Obsoletes: sos-collector <= 1.9
 Recommends: python3-pexpect
 Recommends: python3-requests
-Patch1: sos-bz1869561-cpuX-individual-sizelimits.patch
+Patch1: sos-bz2055003-rebase-sos-add-sos-help.patch
-Patch2: sos-bz2011533-unpackaged-recursive-symlink.patch
-Patch3: sos-bz2011534-opacapture-under-allow-system-changes.patch
-Patch4: sos-bz2011535-kernel-psi.patch
-Patch5: sos-bz2011538-iptables-save-under-nf_tables-kmod.patch
-Patch6: sos-bz2011537-estimate-only-option.patch
-Patch7: sos-bz2011536-iptables-based-on-ntf.patch
-Patch8: sos-bz2011507-foreman-puma-status.patch
-Patch9: sos-bz2012858-dryrun-uncaught-exception.patch
-Patch10: sos-bz2019697-openvswitch-offline-analysis.patch
-Patch11: sos-bz2012859-plugin-timeout-unhandled-exception.patch
-Patch12: sos-bz2023481-plugin-timeouts-proper-handling.patch
-Patch13: sos-bz2020778-filter-namespace-per-pattern.patch
-Patch14: sos-bz2024893-cleaner-hostnames-improvements.patch
-Patch15: sos-bz2025611-RHTS-api-change.patch
-Patch16: sos-bz2034001-nvidia-GPU-info.patch
-Patch17: sos-bz2031777-rhui-logs.patch
-Patch18: sos-bz2037350-ocp-backports.patch
-Patch19: sos-bz2043104-foreman-tasks-msgpack.patch
-Patch20: sos-bz2041855-virsh-in-foreground.patch
-Patch21: sos-bz2043488-ovn-proper-package-enablement.patch
-Patch22: sos-bz2054883-plugopt-logging-effective-opts.patch
-Patch23: sos-bz2055548-honour-plugins-timeout-hardcoded.patch
 
 %description
 Sos is a set of tools that gathers information about system
@@ -58,28 +36,6 @@ support technicians and developers.
 %setup -qn %{name}-%{version}
 %setup -T -D -a1 -q
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
 
 %build
 %py3_build
@@ -147,6 +103,24 @@ of the system.  Currently storage and filesystem commands are audited.
 
 
 %changelog
+* 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

sources

@@ -1,2 +1,2 @@
-SHA512 (sos-4.2.tar.gz) = 549a5a0c916ea342680df48ad88b620238dc7e9e32531992020a684046774b54c40b8201733537f0fc0b7245f6b67608ff39db83fc0eaf4c3bc48928100081d9
+SHA512 (sos-4.3.tar.gz) = 6119abb52e2be650099c9a660a179856f1a2f64cc098a3318b685a407fdb2b8e1ad296bc124c1a6acd1142f75e106db353ce9d2b065d8cf4c077b98c40221d9c
 SHA512 (sos-audit-0.3.tgz) = 32597baf6350804d08179a0dbe48470a93df148e83d2e49bb3288f6bcc2d151bb1433761913bfbccd912c14de92435939fef5bcd7e091dfe33a345d61ea842ea