From 0f2117d223ba40280bf6d6e40ce0a2cede9e6f9c Mon Sep 17 00:00:00 2001
From: jcastillo <jcastill@redhat.com>
Date: Thu, 7 Aug 2025 09:29:59 +0000
Subject: [PATCH] Update the sosreport action to stop using obsolete
 'sosreport' command

---
 rig.spec                          | 13 ++++++----
 sos-modify-sosreport-binary.patch | 40 +++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 sos-modify-sosreport-binary.patch

diff --git a/rig.spec b/rig.spec
index 13a9ddc..139e903 100644
--- a/rig.spec
+++ b/rig.spec
@@ -1,7 +1,7 @@
 Name:       rig
 Summary:    Monitor a system for events and trigger specific actions
 Version:    1.1
-Release:    6%{?dist}
+Release:    7%{?dist}
 Url:        https://github.com/TurboTurtle/rig
 Source0:    %{url}/archive/%{name}-%{version}.tar.gz
 License:    GPLv2
@@ -14,6 +14,7 @@ BuildRequires: python3dist(psutil)
 
 Patch1: rig-fix-rig-list.patch
 Patch2: rig-full-random-temp.patch
+Patch3: sos-modify-sosreport-binary.patch
 
 %description
 Rig is a utility designed to watch or monitor specific system resources (e.g.
@@ -23,8 +24,9 @@ troubleshooting and data collection for randomly occurring events.
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
+%patch -p1 1
+%patch -p1 2
+%patch -p1 3
 
 %build
 %py3_build
@@ -45,6 +47,9 @@ install -p -m644 man/en/rig.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/
 %doc README.md
 
 %changelog
+* Wed Aug 06 2025 Jose Castillo <jcastill@redhat.com> - 1.1-7
+- Add fix to avoid using deprecated sosreport command.
+
 * Tue Jun 14 2022 Jake Hunsaker <jhunsake@redhat.com> - 1.1-6
 - Backport change to temp dir creation to ignore rig ID
 
@@ -66,4 +71,4 @@ install -p -m644 man/en/rig.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
 * Tue Jul 28 2020 Jake Hunsaker <jhunsake@redhat.com> - 1.0-1
-- Version 1.0 release
+- Version 1.0 release
\ No newline at end of file
diff --git a/sos-modify-sosreport-binary.patch b/sos-modify-sosreport-binary.patch
new file mode 100644
index 0000000..3be2204
--- /dev/null
+++ b/sos-modify-sosreport-binary.patch
@@ -0,0 +1,40 @@
+From 57c2d62fd86522714e3eacc3fcd76ff8ad780e0b Mon Sep 17 00:00:00 2001
+From: Jose Castillo <jcastillo@redhat.com>
+Date: Thu, 7 Aug 2025 09:04:25 +0100
+Subject: [PATCH] [sos] Modify sosreport binary
+
+The 'sosreport' command has been deprecated in
+sos upstream, and users should use now 'sos report' instead.
+This commit prevents an error that occurs
+when calling the old sos binary.
+
+Signed-off-by: Jose Castillo <jcastillo@redhat.com>
+---
+ rig-c9s/rig-rig-1.1/rigging/actions/sosreport.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/rigging/actions/sosreport.py b/rigging/actions/sosreport.py
+index 5f7435a..abf6471 100644
+--- a/rigging/actions/sosreport.py
++++ b/rigging/actions/sosreport.py
+@@ -14,7 +14,7 @@ from pipes import quote
+ from rigging.actions import BaseAction
+ from rigging.exceptions import CannotConfigureRigError
+
+-SOS_BIN = '/usr/sbin/sosreport --batch'
++SOS_BIN = '/usr/sbin/sos report --batch'
+
+
+ class SoSReport(BaseAction):
+@@ -23,7 +23,7 @@ class SoSReport(BaseAction):
+     enabling_opt = 'sosreport'
+     enabling_opt_desc = 'Generate an sos report when triggered'
+     priority = 100
+-    required_binaries = ('sosreport',)
++    required_binaries = ('sos',)
+     sos_opts = ('only_plugins', 'skip_plugins', 'enable_plugins',
+                 'plugin_option')
+
+-- 
+2.50.1
+