From ddc4eeca296ef9fb99df73cc192b949efb4e275c Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 28 Jul 2020 19:17:40 +0000
Subject: [PATCH] import libreport-2.9.5-14.el8

---
 ...-rhtsupport-Fix-command-line-parsing.patch | 34 +++++++++++++++++++
 SPECS/libreport.spec                          |  7 +++-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/0031-plugins-reporter-rhtsupport-Fix-command-line-parsing.patch

diff --git a/SOURCES/0031-plugins-reporter-rhtsupport-Fix-command-line-parsing.patch b/SOURCES/0031-plugins-reporter-rhtsupport-Fix-command-line-parsing.patch
new file mode 100644
index 0000000..a69bd54
--- /dev/null
+++ b/SOURCES/0031-plugins-reporter-rhtsupport-Fix-command-line-parsing.patch
@@ -0,0 +1,34 @@
+From aea02b3719a161a05dac815955cfa1bb630e8da4 Mon Sep 17 00:00:00 2001
+From: Ernestas Kulik <ekulik@redhat.com>
+Date: Fri, 24 Jul 2020 10:45:37 +0200
+Subject: [PATCH] plugins: reporter-rhtsupport: Fix command-line parsing
+
+cb81dc0870949fbacaa6e2384e91fc4de4df43a5 drops -u and -C options, but
+does not remove them from the enumeration, which maps the options to the
+option struct, leading to -F and -D not being parsed.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1860285
+---
+ src/plugins/reporter-rhtsupport.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/plugins/reporter-rhtsupport.c b/src/plugins/reporter-rhtsupport.c
+index 411bffc..7f5aafa 100644
+--- a/src/plugins/reporter-rhtsupport.c
++++ b/src/plugins/reporter-rhtsupport.c
+@@ -404,10 +404,8 @@ int main(int argc, char **argv)
+         OPT_c = 1 << 2,
+         OPT_t = 1 << 3,
+         OPT_f = 1 << 4,
+-        OPT_u = 1 << 5,
+-        OPT_C = 1 << 6,
+-        OPT_F = 1 << 7,
+-        OPT_D = 1 << 8,
++        OPT_F = 1 << 5,
++        OPT_D = 1 << 6,
+     };
+     /* Keep enum above and order of options below in sync! */
+     struct options program_options[] = {
+-- 
+2.26.2
+
diff --git a/SPECS/libreport.spec b/SPECS/libreport.spec
index 21869a3..4a2c4d6 100644
--- a/SPECS/libreport.spec
+++ b/SPECS/libreport.spec
@@ -29,7 +29,7 @@
 Summary: Generic library for reporting various problems
 Name: libreport
 Version: 2.9.5
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2+
 URL: https://abrt.readthedocs.org/
 Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
@@ -69,6 +69,8 @@ Patch0028: 0028-dirsize-Skip-dirs-in-which-sosreport-is-being-genera.patch
 Patch0029: 0029-setgid-instead-of-setuid-the-abrt-action-install-deb.patch
 # git format-patch --no-numbered --start-number=30 --topo-order 2.9.5-12.el8
 Patch0030: 0030-ureport-Drop-Strata-integration.patch
+# git format-patch --no-numbered --start-number=31 --topo-order 2.9.5-13.el8
+Patch0031: 0031-plugins-reporter-rhtsupport-Fix-command-line-parsing.patch
 
 # autogen.sh is need to regenerate all the Makefile files
 Patch9000: 9000-Add-autogen.sh.patch
@@ -849,6 +851,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
 %changelog
+* Fri Jul 24 2020 - Ernestas Kulik <ekulik@redhat.com> - 2.9.5-14
+- Add patch for #1860285
+
 * Mon Jun 29 2020 - Ernestas Kulik <ekulik@redhat.com> - 2.9.5-13
 - Add patch for #1848903