From 243615fe448c196ebb217a4b8019a238c27d6242 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Fri, 3 Feb 2023 08:09:09 +0000
Subject: [PATCH] import abrt-2.10.9-22.el8

---
 .../0091-plugins-Update-sosreport-event.patch | 35 +++++++++++++++++++
 SPECS/abrt.spec                               |  7 +++-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/0091-plugins-Update-sosreport-event.patch

diff --git a/SOURCES/0091-plugins-Update-sosreport-event.patch b/SOURCES/0091-plugins-Update-sosreport-event.patch
new file mode 100644
index 0000000..bf34ac1
--- /dev/null
+++ b/SOURCES/0091-plugins-Update-sosreport-event.patch
@@ -0,0 +1,35 @@
+From 4cdb0a7de54b5aa2646169c33563a2e6545b580d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= <mgrabovs@redhat.com>
+Date: Tue, 31 Jan 2023 10:41:46 +0100
+Subject: [PATCH] plugins: Update sosreport event
+
+- Run `sos report` in place of the obsolete `sosreport` command.
+- Switch to `dnf` plugin instead of `yum`.
+
+Resolves rhbz#2137499
+---
+ src/plugins/sosreport_event.conf | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/plugins/sosreport_event.conf b/src/plugins/sosreport_event.conf
+index 88ca26fe..4799ff0a 100644
+--- a/src/plugins/sosreport_event.conf
++++ b/src/plugins/sosreport_event.conf
+@@ -2,12 +2,12 @@
+ # (alternatively, you can add similar command to EVENT=analyze_foo's,
+ # if you would rather perform this collection later):
+ EVENT=post-create remote!=1
+-        nice sosreport --tmp-dir "$DUMP_DIR" --batch \
++        nice sos report --tmp-dir "$DUMP_DIR" --batch \
+                 --only=anaconda --only=boot --only=devicemapper \
+                 --only=filesys --only=hardware --only=kernel --only=libraries \
+                 --only=memory --only=networking --only=nfs --only=pam \
+                 --only=process --only=rpm -k rpm.rpmva=off --only=ssh \
+-                --only=services --only=yum --only=date --only=host --only=x11 \
++                --only=services --only=dnf --only=date --only=host --only=x11 \
+                 --only=cups --only=logs --only=grub2 --only=cron --only=pci \
+                 --only=auditd --only=selinux --only=lvm2 --only=sar \
+                 --only=processor \
+-- 
+2.39.1
+
diff --git a/SPECS/abrt.spec b/SPECS/abrt.spec
index a6abbd7..8fe0c57 100644
--- a/SPECS/abrt.spec
+++ b/SPECS/abrt.spec
@@ -55,7 +55,7 @@
 Summary: Automatic bug detection and reporting tool
 Name: abrt
 Version: 2.10.9
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: GPLv2+
 URL: https://abrt.readthedocs.org/
 Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
@@ -158,6 +158,7 @@ Patch0086: 0086-plugins-sosreport_event-Rename-nfsserver-plugin.patch
 # git format-patch 2.10.9-19.el8 --no-numbered --start-number=87 --topo-order
 Patch0087: 0087-plugins-abrt-action-install-debuginfo-Fix-reference.patch
 Patch0090: 0090-skip-journal-reporting.patch
+Patch0091: 0091-plugins-Update-sosreport-event.patch
 
 # autogen.sh is need to regenerate all the Makefile files
 Patch1000: 1000-Add-autogen.sh.patch
@@ -1376,6 +1377,10 @@ killall abrt-dbus >/dev/null 2>&1 || :
 %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh
 
 %changelog
+* Tue Jan 31 2023 Matěj Grabovský <mgrabovs@redhat.com> - 2.10.9-22
+- Update sos report command line
+- Resolves: rhbz#2137499
+
 * Wed Mar 31 2021 Michal Srb <michal@redhat.com> - 2.10.9-21
 - Do not report problems to journal as we don't ship the journal reporter
 - Resolves: rhbz#1844739