remove ureport from the reporting workflow in RHEL

This commit is contained in:
Jakub Filak 2013-03-05 10:16:59 +01:00
parent 1ab7e7d2db
commit d39e70cd90
2 changed files with 103 additions and 1 deletions

View File

@ -0,0 +1,97 @@
diff -ur abrt-2.1.1/src/daemon/abrt.conf abrt-2.1.1.new/src/daemon/abrt.conf
--- abrt-2.1.1/src/daemon/abrt.conf 2013-02-01 12:59:58.000000000 +0100
+++ abrt-2.1.1.new/src/daemon/abrt.conf 2013-03-05 10:01:11.347789231 +0100
@@ -28,9 +28,7 @@
# In order to run this event automatically after detection, the
# AutoreportingEnabled option must be configured to 'yes'
#
-# Default value: report_uReport
-#
-AutoreportingEvent = report_uReport
+AutoreportingEvent = empty
# Enables automatic running of the event configured in AutoreportingEvent option.
#
diff -ur abrt-2.1.1/src/daemon/abrt_event.conf abrt-2.1.1.new/src/daemon/abrt_event.conf
--- abrt-2.1.1/src/daemon/abrt_event.conf 2013-02-01 17:05:40.000000000 +0100
+++ abrt-2.1.1.new/src/daemon/abrt_event.conf 2013-03-05 10:00:58.406693336 +0100
@@ -95,3 +95,7 @@
EVENT=open-gui
report-gtk -x -- "$DUMP_DIR"
+
+# no operation event, used for AutoreportingEvent to override the default value
+EVENT=empty
+ exit 0
diff -ur abrt-2.1.1/src/plugins/ccpp_event.conf abrt-2.1.1.new/src/plugins/ccpp_event.conf
--- abrt-2.1.1/src/plugins/ccpp_event.conf 2013-02-07 08:42:58.000000000 +0100
+++ abrt-2.1.1.new/src/plugins/ccpp_event.conf 2013-03-05 09:56:40.607779146 +0100
@@ -80,20 +80,12 @@
-F "/etc/libreport/plugins/$format" \
-A "/etc/libreport/plugins/$formatdup"
-# Send micro report
-EVENT=report_uReport analyzer=CCpp
- /usr/libexec/abrt-action-ureport
-
-# update ABRT database after successful report to bugzilla
-EVENT=post_report analyzer=CCpp
- reporter-ureport -r
-
EVENT=analyze_CCpp analyzer=CCpp
abrt-action-perform-ccpp-analysis
# Reporting of C/Cpp problems
EVENT=report-gui analyzer=CCpp
- report-gtk -e report_uReport -e analyze_CCpp -e "collect_*" -e report_Bugzilla -e post_report -- "$DUMP_DIR"
+ report-gtk -e analyze_CCpp -e "collect_*" -e report_Bugzilla -- "$DUMP_DIR"
EVENT=report-cli analyzer=CCpp
- report-cli -e report_uReport -e analyze_CCpp -e report_Bugzilla -e post_report -- "$DUMP_DIR"
+ report-cli -e analyze_CCpp -e report_Bugzilla -- "$DUMP_DIR"
diff -ur abrt-2.1.1/src/plugins/koops_event.conf abrt-2.1.1.new/src/plugins/koops_event.conf
--- abrt-2.1.1/src/plugins/koops_event.conf 2013-02-01 17:05:40.000000000 +0100
+++ abrt-2.1.1.new/src/plugins/koops_event.conf 2013-03-05 09:57:50.824301289 +0100
@@ -21,17 +21,9 @@
reporter-bugzilla -b \
-F /etc/libreport/plugins/bugzilla_format_kernel.conf
-# Send micro report
-EVENT=report_uReport analyzer=Kerneloops
- /usr/libexec/abrt-action-ureport
-
-# Update ABRT database after successful report to bugzilla
-EVENT=post_report analyzer=Kerneloops
- reporter-ureport -r
-
# Automatic/simple GUI-based kernel oopses reporting will do this:
EVENT=report-gui analyzer=Kerneloops
- report-gtk -e report_uReport -e "collect_*" -e report_Bugzilla -e post_report -- "$DUMP_DIR"
+ report-gtk -e "collect_*" -e report_Bugzilla -- "$DUMP_DIR"
EVENT=report-cli analyzer=Kerneloops
- report-cli -e report_uReport -e report_Bugzilla -e post_report -- "$DUMP_DIR"
+ report-cli -e report_Bugzilla -- "$DUMP_DIR"
diff -ur abrt-2.1.1/src/plugins/python_event.conf abrt-2.1.1.new/src/plugins/python_event.conf
--- abrt-2.1.1/src/plugins/python_event.conf 2013-02-01 17:05:40.000000000 +0100
+++ abrt-2.1.1.new/src/plugins/python_event.conf 2013-03-05 10:04:37.763247228 +0100
@@ -16,17 +16,9 @@
-c /etc/libreport/plugins/bugzilla.conf
# TODO? -F /etc/libreport/plugins/bugzilla_format_python.conf
-# Send micro report
-EVENT=report_uReport analyzer=Python
- /usr/libexec/abrt-action-ureport
-
-# update ABRT database after successful report to bugzilla
-EVENT=post_report analyzer=Python
- reporter-ureport -r
-
# Reporting of python exceptions
EVENT=report-gui analyzer=Python
- report-gtk -e report_uReport -e "collect_*" -e report_Bugzilla -e post_report -- "$DUMP_DIR"
+ report-gtk -e "collect_*" -e report_Bugzilla -- "$DUMP_DIR"
EVENT=report-cli analyzer=Python
- report-cli -e report_uReport -e report_Bugzilla -e post_report -- "$DUMP_DIR"
+ report-cli -e report_Bugzilla -- "$DUMP_DIR"

View File

@ -25,7 +25,7 @@
Summary: Automatic bug detection and reporting tool
Name: abrt
Version: 2.1.1
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2+
Group: Applications/System
URL: https://fedorahosted.org/abrt/
@ -33,6 +33,7 @@ Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz
# don't remove this patch, packages in rawhide are not signed!
Patch0: abrt-rhelkeys.patch
Patch1: disable_gpg_check.patch
Patch2: abrt-2.1.1-hide_all_ureport_stuff.patch
BuildRequires: dbus-devel
BuildRequires: gtk3-devel
BuildRequires: rpm-devel >= 4.6
@ -257,6 +258,7 @@ problems handled by ABRT in Python.
#RHEL
%if 0%{?rhel} >= 7
%patch0 -p1 -b .rhel_gpg
%patch2 -p1 -b .ureport
%endif
#Fedora
%patch1 -p1 -b .gpgcheck
@ -728,6 +730,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_defaultdocdir}/%{name}-python-%{version}/examples/
%changelog
* Fri Feb 04 2013 Jakub Filak <jfilak@redhat.com> 2.1.1-2
- remove ureport events from the reporting workflow in RHEL
* Fri Feb 04 2013 Jakub Filak <jfilak@redhat.com> 2.1.1-1
- add SETGID bit to abrt-action-install-debuginfo-to-abrt-cache
- add abrt-desktop depency on libreport-fedora