From 9dbe07969235d5c092e8dd55b269344ce123c766 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Thu, 20 Aug 2020 18:27:59 +0000 Subject: [PATCH] import libreport-2.9.5-15.el8 --- ...eferences-to-removed-command-line-op.patch | 44 +++++++++++++++++++ SPECS/libreport.spec | 7 ++- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 SOURCES/0032-Drop-remaining-references-to-removed-command-line-op.patch diff --git a/SOURCES/0032-Drop-remaining-references-to-removed-command-line-op.patch b/SOURCES/0032-Drop-remaining-references-to-removed-command-line-op.patch new file mode 100644 index 0000000..cf53807 --- /dev/null +++ b/SOURCES/0032-Drop-remaining-references-to-removed-command-line-op.patch @@ -0,0 +1,44 @@ +From 143c76e6db52881a8da188f54ec0ec1aacb209de Mon Sep 17 00:00:00 2001 +From: Ernestas Kulik +Date: Wed, 19 Aug 2020 09:30:28 +0300 +Subject: [PATCH] Drop remaining references to removed command-line options + +cb81dc0870949fbacaa6e2384e91fc4de4df43a5 drops -u and -C options, but +the report_RHTSupport event handler still passes one of them, resulting +in failures. + +https://bugzilla.redhat.com/show_bug.cgi?id=1867064 +--- + doc/reporter-rhtsupport.txt | 2 +- + src/plugins/rhtsupport_event.conf | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/doc/reporter-rhtsupport.txt b/doc/reporter-rhtsupport.txt +index 132c0eaa..7d79e33b 100644 +--- a/doc/reporter-rhtsupport.txt ++++ b/doc/reporter-rhtsupport.txt +@@ -7,7 +7,7 @@ reporter-rhtsupport - Reports problem to RHTSupport. + + SYNOPSIS + -------- +-'reporter-rhtsupport' [-v] [-c CONFFILE] [-F FMTFILE] [-u -C UR_CONFFILE] -d DIR ++'reporter-rhtsupport' [-v] [-c CONFFILE] [-F FMTFILE] -d DIR + + Or: + +diff --git a/src/plugins/rhtsupport_event.conf b/src/plugins/rhtsupport_event.conf +index cc2f05d1..6b0b3e67 100644 +--- a/src/plugins/rhtsupport_event.conf ++++ b/src/plugins/rhtsupport_event.conf +@@ -1,6 +1,6 @@ + EVENT=report_RHTSupport +- # Submit an uReport and create a case in Red Hat Customer Portal +- reporter-rhtsupport -u ++ # Create a case in Red Hat Customer Portal ++ reporter-rhtsupport + + EVENT=report_RHTSupport_AddData + # Attach data to a case in Red Hat Customer Portal +-- +2.28.0 + diff --git a/SPECS/libreport.spec b/SPECS/libreport.spec index 4a2c4d6..dcea294 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: 14%{?dist} +Release: 15%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -71,6 +71,8 @@ Patch0029: 0029-setgid-instead-of-setuid-the-abrt-action-install-deb.patch 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 +# git format-patch --no-numbered --start-number=32 --topo-order 2.9.5-14.el8 +Patch0032: 0032-Drop-remaining-references-to-removed-command-line-op.patch # autogen.sh is need to regenerate all the Makefile files Patch9000: 9000-Add-autogen.sh.patch @@ -851,6 +853,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Tue Aug 18 2020 - Ernestas Kulik - 2.9.5-15 +- Add patch for rhbz#1867064 + * Fri Jul 24 2020 - Ernestas Kulik - 2.9.5-14 - Add patch for #1860285