5 changed files with 50 additions and 149 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
-SOURCES/sos-4.8.2.tar.gz
+SOURCES/sos-4.5.0.tar.gz
 SOURCES/sos-audit-0.3.tgz
--- a/.sos.metadata
+++ b/.sos.metadata
@ -1,2 +1,2 @@
-ac691982f309879317709ce8c9cfa2c07631b89f SOURCES/sos-4.8.2.tar.gz
+d5e166c75250aef01c86a3a9d8c9fcc8db335f4e SOURCES/sos-4.5.0.tar.gz
 9d478b9f0085da9178af103078bbf2fd77b0175a SOURCES/sos-audit-0.3.tgz
--- a/SOURCES/sos-almalinux-branding.patch
+++ b/SOURCES/sos-almalinux-branding.patch
@ -0,0 +1,33 @@
+diff -aruN sos-4.3/sos/policies/distros/redhat.py sos-4.3.alma/sos/policies/distros/redhat.py
+--- sos-4.3/sos/policies/distros/redhat.py	2022-02-15 07:20:20.000000000 +0300
+++ sos-4.3.alma/sos/policies/distros/redhat.py	2022-10-10 11:40:12.000000000 +0300
+@@ -434,6 +434,14 @@
+     vendor = "CentOS"
+     vendor_urls = [('Community Website', 'https://www.centos.org/')]
+ 
+class AlmaLinuxPolicy(RHELPolicy):
+    distro = "AlmaLinux"
+    vendor = "AlmaLinux OS Foundation"
+    vendor_urls = [
+        ('Distribution Website', 'https://www.almalinux.org/'),
+        ('Commercial Support', 'https://tuxcare.com/linux-support-services/')
+    ]
+
+ 
+ class RedHatAtomicPolicy(RHELPolicy):
+     distro = "Red Hat Atomic Host"
+@@ -591,6 +599,14 @@
+     vendor = "CentOS"
+     vendor_urls = [('Community Website', 'https://www.centos.org/')]
+ 
+class AlmaLinuxAtomicPolicy(RedHatAtomicPolicy):
+    distro = "AlmaLinux Atomic Host"
+    vendor = "AlmaLinux OS Foundation"
+    vendor_urls = [
+        ('Distribution Website', 'https://www.almalinux.org/'),
+        ('Commercial Support', 'https://tuxcare.com/linux-support-services/')
+    ]
+
+ 
+ class FedoraPolicy(RedHatPolicy):
+     """
--- a/SOURCES/sos-python36-walrus-operator.patch
+++ b/SOURCES/sos-python36-walrus-operator.patch
@ -1,25 +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/SPECS/sos.spec
+++ b/SPECS/sos.spec
@ -4,25 +4,28 @@

 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
-Version: 4.8.2
-Release: 1%{?dist}
+Version: 4.5.0
+Release: 1%{?dist}.alma
 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
+License: GPLv2+
 BuildArch: noarch
 Url: https://github.com/sosreport/sos
 BuildRequires: python3-devel
 BuildRequires: gettext
 BuildRequires: python3-setuptools
+Requires: bzip2
+Requires: xz
 Requires: python3-requests
-Requires: python3-setuptools
 Recommends: python3-magic
 Recommends: python3-pexpect
 Recommends: python3-pyyaml
 Conflicts: vdsm < 4.40
 Obsoletes: sos-collector
-Patch1: sos-python36-walrus-operator.patch
+
+# AlmaLinux patches
+Patch1000: sos-almalinux-branding.patch

 %description
 Sos is a set of tools that gathers information about system
@ -33,18 +36,17 @@ support technicians and developers.
 %prep
 %setup -qn %{name}-%{version}
 %setup -T -D -a1 -q
-%patch -P 1 -p1 
+
+# 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}/tmpfiles.d/
-install -m 644 tmpfiles/tmpfilesd-sos-rh.conf %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf

 %find_lang %{name} || echo 0

@ -63,7 +65,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/sos/{cleaner,presets.d,extras.d,groups.d}
 %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
@ -78,6 +79,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/sos/{cleaner,presets.d,extras.d,groups.d}
 %license LICENSE
 %config(noreplace) %{_sysconfdir}/sos/sos.conf
 %config(noreplace) %{_sysconfdir}/sos/cleaner
+%config /usr/config/sos.conf

 %package audit
 Summary: Audit use of some commands for support purposes
@ -106,117 +108,8 @@ of the system. Currently storage and filesystem commands are audited.
 %ghost /etc/audit/rules.d/40-sos-storage.rules

 %changelog
-* 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
+* Wed Mar 29 2023 Eduard Abdullin <eabdullin@almalinux.org> - 4.5.0-1.alma
+- AlmaLinux changes

 * Tue Feb 07 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.0-1
 - Rebase on upstream 4.5.0