SOURCES/sos-patch-upstream-3870.patch

@@ -0,0 +1,43 @@
+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:

SPECS/sos.spec

@@ -5,7 +5,7 @@
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
 Version: 4.8.1
-Release: 1%{?dist}
+Release: 1%{?dist}.alma.1
 Group: Applications/System
 Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
 Source1: sos-audit-%{auditversion}.tgz
@@ -21,7 +21,10 @@ Recommends: python3-magic
 Recommends: python3-pexpect
 Recommends: python3-pyyaml
 Conflicts: vdsm < 4.40
-Obsoletes: sos-collector
+Obsoletes: sos-collector <= 1.9
+
+# AlmaLinux patches
+Patch1000: sos-patch-upstream-3870.patch
 
 %description
 Sos is a set of tools that gathers information about system
@@ -33,50 +36,52 @@ support technicians and developers.
 %setup -qn %{name}-%{version}
 %setup -T -D -a1 -q
 
+# AlmaLinux patches
+%patch1000 -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}/%{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 ..
 
-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}/sosreport
 %{_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
-/etc/tmpfiles.d/%{name}.conf
+%{_sysconfdir}/tmpfiles.d/%{name}.conf
 %{python3_sitelib}/*
-%{_mandir}/man1/sosreport.1.gz
-%{_mandir}/man1/sos-clean.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
-%{_mandir}/man1/sos.1.gz
+%{_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+
@@ -86,7 +91,7 @@ Group: Application/System
 
 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.
+of the system.  Currently storage and filesystem commands are audited.
 
 %post audit
 %{_sbindir}/sos-audit.sh
@@ -103,32 +108,43 @@ of the system. Currently storage and filesystem commands are audited.
 %ghost /etc/audit/rules.d/40-sos-filesystem.rules
 %ghost /etc/audit/rules.d/40-sos-storage.rules
 
+
 %changelog
+* Fri Dec 13 2024 Koichiro Iwao <meta@almalinux.org> - 4.8.1-1.alma.1
+- Backport upstream patch to fix distro detection
+  Obtained from: https://github.com/sosreport/sos/pull/3870
+
 * Wed Oct 23 2024 Jan Jansky <jjansky@redhat.com> = 4.8.1-1
-- Update to 4.8.1 in RHEL 8
-  Resolves: RHEL-64160
+- 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-3
+* Fri Sep 27 2024 Jan Jansky <jjansky@redhat.com> = 4.8.0-4
 - Added credentials obfuscation from multiple files
-  Resolves: RHEL-58097
+  Resolves: RHEL-58096
 
-* Sat Sep 14 2024 Pierguido Lambri <plambri@redhat.com> = 4.8.0-2
-- Resolves: RHEL-22732
-  Fix wrong formatting
+* 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-58097
+  Resolves: RHEL-58096
 
-* Wed Aug 21 2024 Pavel Moravec <pmoravec@redhat.com> = 4.7.2-2
+* Wed Aug 21 2024 Pavel Moravec <pmoravec@redhat.com> = 4.7.2-3
 - reverting RHEL-22732 patch due to regressions
-  Resolves: RHEL-49779
+  Resolves: RHEL-49781
 
 * 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
+  Resolves: RHEL-49781
 
 * Thu May 09 2024 Pavel Moravec <pmoravec@redhat.com> = 4.7.1-3
 - [archive] Fix get_archive_root after files reordering
@@ -136,400 +152,305 @@ of the system. Currently storage and filesystem commands are audited.
 
 * Mon Apr 08 2024 Jan Jansky <jjansky@redhat.com> = 4.7.1-1
 - rebase to upstream 4.7.1
-  Resolves: RHEL-32104
+  Resolves: RHEL-32106
 
 * Tue Feb 20 2024 Jan Jansky <jjansky@redhat.com> = 4.7.0-1
 - rebase to upstream 4.7.0
-  Resolves: RHEL-26111
+  Resolves: RHEL-26115
 
 * Thu Jan 11 2024 Pavel Moravec <pmoravec@redhat.com> = 4.6.1-1
 - rebase to upstream 4.6.1
-  Resolves: RHEL-21173
+  Resolves: RHEL-21174
 - [redhat] Change authentication method for RHEL
-  Resolves: RHEL-21177
+  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-13697
+  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-13697
+  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: bz2218873
+  Resolves: bz2217906
+- [discovery] Enable the plugin by containers
+  Resolves: bz2222134
 
 * Thu Jul 27 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.6-1
-- Rebase sos to 4.5.6
-  Resolves: bz2226724
+- 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 mac obfuscation
-  Resolves: bz2218279
-  Resolves: bz2216608
-  Resolves: bz2207562
+* 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
-- [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
+- Rebase on upstream 4.5.5
+  Resolves: bz2217943
 
-* 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
+* Tue May 31 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.4-1
+- [specfile] add runtime requirement to python3-setuptools
+  Resolves: bz2207776
 
-* Fri May 05 2023 Jan Jansky <jjansky@redhat.com> = 4.5.3-1
+* 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: bz2143272
-- [subscription_manager] Scrub proxy passwords from repo_server_val
-  Resolves: bz2177282
-- [virsh] Scrub passwords in virt-manager logs
-  Resolves: bz2184062
+  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: 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
+  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: bz2082614
+  Resolves: bz2082615
 
 * Thu Nov 03 2022 Pavel Moravec <pmoravec@redhat.com> = 4.4-4
 - [ocp] Add newly required labels to temp OCP namespace
-  Resolves: bz2130922
+  Resolves: bz2130976
 
 * Fri Oct 28 2022 Pavel Moravec <pmoravec@redhat.com> = 4.4-3
 - [cleaner] Apply compile_regexes after a regular parse line
-  Resolves: bz2138173
+  Resolves: bz2138174
 
 * Thu Sep 22 2022 Pavel Moravec <pmoravec@redhat.com> = 4.4-2
 - [utilities] Relax from hard dependency of python3-magic
-  Resolves: bz2129038
+  Resolves: bz2126089
 - [dnf] Collect legacy yum config symlinks, properly obfuscate pwds
-  Resolves: bz2100154
+  Resolves: bz2125499
 
 * Fri Sep 09 2022 Pavel Moravec <pmoravec@redhat.com> = 4.4-1
 - Rebase on upstream 4.4
-  Resolves: bz2082614
+  Resolves: bz2082615
 - [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
+  Resolves: bz2059573
 - [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
+  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: bz2093993
+  Resolves: bz2122355
 - [Plugin] Make forbidden path checks more efficient
-  Resolves: bz2099598
+  Resolves: bz2122354
 
 * 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
+- [ocp, openshift] Re-align API collection options and rename
+  Resolves: bz2065563
 - [utilities] Close file only when storing to file
-  Resolves: bz2079486
-- [presets] Adjust OCP preset options, more OCP backports
-  Resolves: bz2058279
+  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
 
-* Mon Apr 04 2022 Pavel Moravec <pmoravec@redhat.com> = 4.3-1
+* Thu Mar 24 2022 Pavel Moravec <pmoravec@redhat.com> = 4.3-1
 - Rebase on upstream 4.3
-  Resolves: bz2055002
+  Resolves: 2055003
 - [sapnw] Fix IndexError exception
-  Resolves: bz1992938
+  Resolves: 2065551
+- [subscription_manager] collect syspurpose data via sub-man
+  Resolves: 2002333
 - [Plugin, utilities] Allow writing command output directly to disk
-  Resolves: bz1726023
+  Resolves: 2065564
 - [Ceph] Add support for containerized Ceph setup
-  Resolves: bz1882544
+  Resolves: 2065562
 - [unbound] Add new plugin for Unbound DNS resolver
-  Resolves: bz2018228
+  Resolves: 2065560
 - [discovery] Add new discovery plugin
-  Resolves: bz2018549
-- [vdsm] Exclude /var/lib/vdsm/storage/transient_disks
-  Resolves: bz2029154
+  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: bz2036697
+  Resolves: bz2037350
 - [options] Fix logging on plugopts in effective sos command
-  Resolves: bz2054882
+  Resolves: bz2054883
 - [report] Honor plugins' hardcoded plugin_timeout
-  Resolves: bz2055547
+  Resolves: bz2055548
 - [policies] Set fallback to None sysroot, don't chroot to '/'
-  Resolves: bz1873185
+  Resolves: bz2011537
 - [ovn_central] Rename container responsable of Red Hat
-  Resolves: bz2042966
+  Resolves: bz2043488
 
 * Wed Jan 26 2022 Pavel Moravec <pmoravec@redhat.com> = 4.2-13
 - [virsh] Catch parsing exception
-  Resolves: bz2041488
+  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: bz2043102
+  Resolves: bz2043104
 - [virsh] Call virsh commands in the foreground / with a TTY
-  Resolves: bz2041488
+  Resolves: bz2041855
 - [ovn_central] Account for Red Hat ovn package naming
-  Resolves: bz2042966
+  Resolves: bz2043488
 - [clean,parsers] Build regex lists for static items only once
-  Resolves: bz2036697
+  Resolves: bz2037350
 
 * Mon Jan 10 2022 Pavel Moravec <pmoravec@redhat.com> = 4.2-11
 - [report] Add journal logs for NetworkManager plugin
-  Resolves: bz2036697
+  Resolves: bz2037350
 
 * Fri Jan 07 2022 Pavel Moravec <pmoravec@redhat.com> = 4.2-9
 - add oc transport, backport various PRs for OCP
-  Resolves: bz2036697
+  Resolves: bz2037350
 - [report] Provide better warning about estimate-mode
-  Resolves: bz1873185
+  Resolves: bz2011537
 - [hostname] Fix loading and detection of long base domains
-  Resolves: bz2023867
+  Resolves: bz2024893
 
 * Sun Dec 19 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-8
 - [rhui] New log folder
-  Resolves: bz2030741
+  Resolves: bz2031777
 - nvidia]:Patch to update nvidia plugin for GPU info
-  Resolves: bz2025403
+  Resolves: bz2034001
 - [hostname] Fix edge case for new hosts in a known subdomain
-  Resolves: bz2023867
+  Resolves: bz2024893
 
 * Wed Dec 08 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-7
 - [hostname] Simplify case matching for domains
-  Resolves: bz2023867
+  Resolves: bz2024893
 
 * Tue Nov 30 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-6
 - [redhat] Fix broken URI to upload to customer portal
-  Resolves: bz2025610
+  Resolves: bz2025611
 
 * Mon Nov 22 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-5
 - [clean,hostname_parser] Source /etc/hosts for obfuscation
-  Resolves: bz2023867
+  Resolves: bz2024893
 - [clean, hostname] Fix unintentionally case sensitive
-  Resolves: bz2023863
+  Resolves: bz2024892
 - [redhat] update SFTP API version to v2
-  Resolves: bz2025610
+  Resolves: bz2025611
 
 * Tue Nov 16 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-4
 - [report] Calculate sizes of dirs, symlinks and manifest in
-  Resolves: bz1873185
+  Resolves: bz2011537
 - [report] shutdown threads for timeouted plugins
-  Resolves: bz2012857
+  Resolves: bz2012859
 - [report] fix filter_namespace per pattern
-  Resolves: bz2020777
+  Resolves: bz2020778
 - Ensure specific plugin timeouts are only set
-  Resolves: bz2018033
+  Resolves: bz2023481
 
 * Wed Nov 03 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-2
 - [firewall_tables] call iptables -t <table> based on nft
-  Resolves: bz2005195
+  Resolves: bz2011536
 - [report] Count with sos_logs and sos_reports in
-  Resolves: bz1873185
+  Resolves: bz2011537
 - [foreman] Collect puma status and stats
-  Resolves: bz2011506
+  Resolves: bz2011507
 - [report] Overwrite pred=None before refering predicate
-  Resolves: bz2012856
+  Resolves: bz2012858
 - [openvswitch] add commands for offline analysis
-  Resolves: bz2004929
+  Resolves: bz2019697
 
 * Wed Oct 06 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-1
 - Rebase on upstream 4.2
-  Resolves: bz1998133
+  Resolves: bz1998134
 - [report] Implement --estimate-only
-  Resolves: bz1873185
+  Resolves: bz2011537
 - [omnipath_client] Opacapture to run only with allow changes
-  Resolves: bz1998433
+  Resolves: bz2011534
 - [unpackaged] deal with recursive loop of symlinks properly
-  Resolves: bz1998521
+  Resolves: bz2011533
 - [networking] prevent iptables-save commands to load nf_tables
-  Resolves: bz2001096
+  Resolves: bz2011538
 - [kernel] Capture Pressure Stall Information
-  Resolves: bz2002145
+  Resolves: bz2011535
 - [processor] Apply sizelimit to /sys/devices/system/cpu/cpuX
-  Resolves: bz2011413
+  Resolves: bz1869561
 
-* Wed Aug 11 2021 Pavel Moravec <pmoravec@redhat.com> = 4.1-5
+* Wed Aug 11 2021 Pavel Moravec <pmoravec@redhat.com> = 4.1-8
 - [report,collect] unify --map-file arguments
-  Resolves: bz1923938
+  Resolves: bz1985985
 - [rhui] add new plugin for RHUI 4
-  Resolves: bz1665947
+  Resolves: bz1992859
 - [username parser] Load usernames from `last` for LDAP users
-  Resolves: bz1985037
+  Resolves: bz1992861
 
-* 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
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 4.1-7
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* 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
+* Tue Jul 27 2021 Pavel Moravec <pmoravec@redhat.com> - 4.1-6
 - [networking] collect also tc filter show ingress
-  Resolves: bz1886711
-- [archive] skip copying SELinux context for /proc and /sys
-  Resolves: bz1965001
+  Resolves: bz1985976
+- [cleaner] Only skip packaging-based files for the IP parser
+  Resolves: bz1985982
 - [sssd] sssd plugin when sssd-common
-  Resolves: bz1967613
+  Resolves: bz1967718
 - Various OCP/cluster/cleanup enhancements
-  Resolves: bz1973675
+  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
 
-* Tue May 18 2021 Pavel Moravec <pmoravec@redhat.com> = 4.1-2
+* 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: bz1930181
+  Resolves: bz1967110
 - Multiple fixes in man pages
-  Resolves: bz1935603
+  Resolves: bz1967111
 - [ds] Mask password and encryption keys in ldif files
-  Resolves: bz1937298
+  Resolves: bz1967112
 - [report] add --cmd-timeout option
-  Resolves: bz1937418
+  Resolves: bz1967113
 - [cups] Add gathering cups-browsed logs
-  Resolves: bz1939963
+  Resolves: bz1967114
 - [sssd] Collect memory cache / individual logfiles
-  Resolves: bz1940502
+  Resolves: bz1967115
 - Collect ibmvNIC dynamic_debugs
-  Resolves: bz1942276
+  Resolves: bz1967116
 - [pulpcore] add plugin for pulp-3
-  Resolves: bz1956673
+  Resolves: bz1967117
 - [saphana] remove redundant unused argument of get_inst_info
-  Resolves: bz1959413
+  Resolves: bz1967118
 - [networking] Add nstat command support
-  Resolves: bz1961458
+  Resolves: bz1967119
 - [snapper] add a new plugin
-  Resolves: bz1961229
+  Resolves: bz1967120
 
-* Mon Apr 26 2021 Pavel Moravec <pmoravec@redhat.com> = 4.1-1
-- Rebase on upstream 4.1
-  Resolves: bz1928679
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 4.1-4
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
-* Tue Feb 16 2021 Pavel Moravec <pmoravec@redhat.com> = 4.0-8
-- Automatically create directory for sos-cleaner default_mapping
-  Resolves: bz1923937
+* 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
 
-* 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
+* Wed Mar 10 2021 Sandro Bonazzola <sbonazzo@redhat.com> - 4.1-1
+- Rebase to 4.1