Update sos to be in line with what we ship in RHEL 9

Resolves: RHEL-50589

Signed-off-by: Brian Stinson <bstinson@redhat.com>

.gitignore

@@ -13,15 +13,17 @@ sos-2.2.tar.gz
 /3.9.1.tar.gz
 /4.0.tar.gz
 /4.1.tar.gz
-/4.2.tar.gz
+/sos-4.1.tar.gz
-/4.3.tar.gz
+/sos-audit-0.3.tgz
-/4.4.tar.gz
+/sos-4.3.tar.gz
-/4.5.0.tar.gz
+/sos-4.4.tar.gz
-/4.5.1.tar.gz
+/sos-4.5.0.tar.gz
-/4.5.2.tar.gz
+/sos-4.5.1.tar.gz
-/4.5.3.tar.gz
+/sos-4.5.3.tar.gz
-/4.5.4.tar.gz
+/sos-4.5.5.tar.gz
-/4.5.5.tar.gz
+/sos-4.5.6.tar.gz
-/4.5.6.tar.gz
+/sos-4.6.0.tar.gz
-/4.6.0.tar.gz
+/sos-4.6.1.tar.gz
-/4.6.1.tar.gz
+/sos-4.7.0.tar.gz
+/sos-4.7.1.tar.gz
+/sos-4.7.2.tar.gz

sos.spec

@@ -1,27 +1,27 @@
+%{!?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.6.1
+Version: 4.7.2
-Release: 3%{?dist}
+Release: 1%{?dist}
-Source0: https://github.com/sosreport/sos/archive/%{version}.tar.gz
+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-rpm
+Requires: python3-requests
-Requires: python3-pexpect
-%if 0%{?rhel} && 0%{?rhel} < 10
 Requires: python3-setuptools
-%else
-Requires: python3-packaging
-%endif
 Recommends: python3-magic
-# Mandatory just for uploading to a SFTP server:
+Recommends: python3-pexpect
-Recommends: python3-requests
 Recommends: python3-pyyaml
+Conflicts: vdsm < 4.40
 Obsoletes: sos-collector <= 1.9
-# For the _tmpfilesdir macro.
-BuildRequires: systemd
 
 %description
 Sos is a set of tools that gathers information about system
@@ -31,65 +31,82 @@ support technicians and developers.
 
 %prep
 %setup -qn %{name}-%{version}
-
+%setup -T -D -a1 -q
-%if 0%{?fedora} >= 39
-%generate_buildrequires
-%pyproject_buildrequires
-%endif
 
 %build
-%if 0%{?fedora} >= 39
-%pyproject_wheel
-%else
 %py3_build
-%endif
 
 %install
-%if 0%{?fedora} >= 39
-%pyproject_install
-%pyproject_save_files sos
-%else
 %py3_install '--install-scripts=%{_sbindir}'
-%endif
 
 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}%{_tmpfilesdir}
+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}%{_tmpfilesdir}/%{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
-%if 0%{?fedora} >= 39
-%{_bindir}/sos
-%{_bindir}/sosreport
-%{_bindir}/sos-collector
-%else
 %{_sbindir}/sos
 %{_sbindir}/sosreport
 %{_sbindir}/sos-collector
-%endif
+#%dir /etc/sos/cleaner
-%dir /etc/sos/cleaner
 %dir /etc/sos/presets.d
 %dir /etc/sos/extras.d
 %dir /etc/sos/groups.d
-%{_tmpfilesdir}/%{name}.conf
+%{_sysconfdir}/tmpfiles.d/%{name}.conf
 %{python3_sitelib}/*
 %{_mandir}/man1/*
-%{_mandir}/man5/*
+%{_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
+* Mon Jul 29 2024 Brian Stinson <bstinson@redhat.com> - 4.7.2-1
+- Update to 4.7.2 in RHEL 10
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 4.6.1-3
 - Bump release for June 2024 mass rebuild
 

sources

@@ -1 +1,2 @@
-SHA512 (4.6.1.tar.gz) = 8c5b99f94771a7938e7a5fca76f144c7629eb573c843fef0377cbb2b1f0f1be9602c88286e7c17f5cc03243ef915d63f3c3ffafc6987035576018223769c88ec
+SHA512 (sos-4.7.2.tar.gz) = 00124fcd1b14a16213ddd53da9686c4efcb773321e5e6e4a2c883bbe71e8ea200055134404942140a55bd94a3aeec272c5bc296f73b5bf16c7194955442e40e6
+SHA512 (sos-audit-0.3.tgz) = 32597baf6350804d08179a0dbe48470a93df148e83d2e49bb3288f6bcc2d151bb1433761913bfbccd912c14de92435939fef5bcd7e091dfe33a345d61ea842ea