Related to abrt/abrt#668
Signed-off-by: Jakub Filak jfilak@redhat.com --- configure.ac | 12 +++++++----- libreport.spec.in | 38 +++++++++++++++++++++----------------- src/plugins/Makefile.am | 15 ++++++++++----- src/workflows/Makefile.am | 6 +++--- 4 files changed, 41 insertions(+), 30 deletions(-)
diff --git a/configure.ac b/configure.ac index 671d6a4..bad3aa6 100644 --- a/configure.ac +++ b/configure.ac @@ -216,10 +216,11 @@ CONF_DIR='${sysconfdir}/${PACKAGE_NAME}' VAR_RUN='${localstatedir}/run' PLUGINS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/plugins' REPORT_PLUGINS_CONF_DIR='${sysconfdir}/libreport/plugins' -EVENTS_DIR='${sysconfdir}/${PACKAGE_NAME}/events' -EVENTS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/events.d' -WORKFLOWS_DIR='${sysconfdir}/${PACKAGE_NAME}/workflows' -WORKFLOWS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/workflows.d' +EVENTS_DIR='${pkgdatadir}/events' +EVENTS_DEFINITION_DIR='${sysconfdir}/${PACKAGE_NAME}/events.d' +EVENTS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/events' +WORKFLOWS_DIR='${pkgdatadir}/workflows' +WORKFLOWS_DEFINITION_DIR='${sysconfdir}/${PACKAGE_NAME}/workflows.d' PLUGINS_LIB_DIR='${libdir}/${PACKAGE_NAME}' LIBEXEC_DIR='${libexecdir}'
@@ -276,13 +277,14 @@ AC_SUBST(CONF_DIR) AC_SUBST(VAR_RUN) AC_SUBST(PLUGINS_CONF_DIR) AC_SUBST(REPORT_PLUGINS_CONF_DIR) +AC_SUBST(EVENTS_DEFINITION_DIR) AC_SUBST(EVENTS_CONF_DIR) AC_SUBST(EVENTS_DIR) AC_SUBST(PLUGINS_LIB_DIR) AC_SUBST(DEBUG_DUMPS_DIR) AC_SUBST(LIBEXEC_DIR) AC_SUBST(WORKFLOWS_DIR) -AC_SUBST(WORKFLOWS_CONF_DIR) +AC_SUBST(WORKFLOWS_DEFINITION_DIR) AC_SUBST(DUMP_DIR_OWNED_BY_USER)
# Initialize the test suite. diff --git a/libreport.spec.in b/libreport.spec.in index 539e5f1..df37227 100644 --- a/libreport.spec.in +++ b/libreport.spec.in @@ -311,6 +311,8 @@ find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f mkdir -p $RPM_BUILD_ROOT/%{_initrddir} mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/events.d/ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/events/ +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/events/ +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/workflows/
# After everything is installed, remove info dir rm -f $RPM_BUILD_ROOT/%{_infodir}/dir @@ -354,6 +356,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %dir %{_sysconfdir}/%{name}/ %dir %{_sysconfdir}/%{name}/events.d/ %dir %{_sysconfdir}/%{name}/events/ +%dir %{_datadir}/%{name}/events/ +%dir %{_datadir}/%{name}/workflows/ %dir %{_sysconfdir}/%{name}/plugins/
%files devel @@ -408,7 +412,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_libexecdir}/abrt-screencast %{_libdir}/libreport-gtk.so.* %config(noreplace) %{_sysconfdir}/libreport/events.d/emergencyanalysis_event.conf -%config(noreplace) %{_sysconfdir}/libreport/events/report_EmergencyAnalysis.xml +%{_datadir}/%{name}/events/report_EmergencyAnalysis.xml
%files gtk-devel %defattr(-,root,root,-) @@ -418,14 +422,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files plugin-kerneloops %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/libreport/events/report_Kerneloops.xml +%{_datadir}/%{name}/events/report_Kerneloops.xml %{_mandir}/man*/reporter-kerneloops.* %{_bindir}/reporter-kerneloops
%files plugin-logger %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/libreport/events/report_Logger.conf -%config(noreplace) %{_sysconfdir}/libreport/events/report_Logger.xml +%{_datadir}/%{name}/events/report_Logger.xml %config(noreplace) %{_sysconfdir}/libreport/events.d/print_event.conf %{_bindir}/reporter-print %{_mandir}/man*/reporter-print.* @@ -433,7 +437,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files plugin-mailx %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/libreport/plugins/mailx.conf -%config(noreplace) %{_sysconfdir}/libreport/events/report_Mailx.xml +%{_datadir}/%{name}/events/report_Mailx.xml %config(noreplace) %{_sysconfdir}/libreport/events.d/mailx_event.conf %{_mandir}/man*/reporter-mailx.* %{_bindir}/reporter-mailx @@ -442,7 +446,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %defattr(-,root,root,-) %{_bindir}/reporter-ureport #%{_mandir}/man1/reporter-ureport.1.gz -%config(noreplace) %{_sysconfdir}/libreport/events/report_uReport.xml +%{_datadir}/%{name}/events/report_uReport.xml
%if %{with bugzilla} %files plugin-bugzilla @@ -452,7 +456,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_formatdup.conf %config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_format_libreport.conf %config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_format_kernel.conf -%config(noreplace) %{_sysconfdir}/libreport/events/report_Bugzilla.xml +%{_datadir}/%{name}/events/report_Bugzilla.xml %config(noreplace) %{_sysconfdir}/libreport/events/report_Bugzilla.conf %config(noreplace) %{_sysconfdir}/libreport/events.d/bugzilla_event.conf # FIXME: remove with the old gui @@ -463,7 +467,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files plugin-rhtsupport %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/libreport/plugins/rhtsupport.conf -%config(noreplace) %{_sysconfdir}/libreport/events/report_RHTSupport.xml +%{_datadir}/%{name}/events/report_RHTSupport.xml %config(noreplace) %{_sysconfdir}/libreport/events.d/rhtsupport_event.conf %{_mandir}/man1/reporter-rhtsupport.1.gz %{_bindir}/reporter-rhtsupport @@ -479,29 +483,29 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %defattr(-,root,root,-) %{_mandir}/man*/reporter-upload.* %{_bindir}/reporter-upload -%config(noreplace) %{_sysconfdir}/libreport/events/report_Uploader.xml +%{_datadir}/%{name}/events/report_Uploader.xml %config(noreplace) %{_sysconfdir}/libreport/events.d/uploader_event.conf -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_Upload.xml +%{_datadir}/%{name}/workflows/workflow_Upload.xml
%files fedora %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_Fedora.xml +%{_datadir}/%{name}/workflows/workflow_Fedora.xml %config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_fedora.conf
%files rhel %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELCCpp.xml -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELKerneloops.xml -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELPython.xml -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELvmcore.xml -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELxorg.xml +%{_datadir}/%{name}/workflows/workflow_RHELCCpp.xml +%{_datadir}/%{name}/workflows/workflow_RHELKerneloops.xml +%{_datadir}/%{name}/workflows/workflow_RHELPython.xml +%{_datadir}/%{name}/workflows/workflow_RHELvmcore.xml +%{_datadir}/%{name}/workflows/workflow_RHELxorg.xml %config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_rhel.conf
%if %{with bugzilla} %files anaconda %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_AnacondaFedora.xml -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_AnacondaUpload.xml +%{_datadir}/%{name}/workflows/workflow_AnacondaFedora.xml +%{_datadir}/%{name}/workflows/workflow_AnacondaUpload.xml %config(noreplace) %{_sysconfdir}/libreport/workflows.d/anaconda_event.conf %config(noreplace) %{_sysconfdir}/libreport/events.d/bugzilla_anaconda_event.conf %config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_format_anaconda.conf diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am index 4bca629..166604c 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am @@ -39,10 +39,13 @@ dist_reportpluginsconf_DATA = $(reporters_plugin_conf) \ mailx.conf
eventsdir = $(EVENTS_DIR) +eventsconfdir = $(EVENTS_CONF_DIR)
reporters_events = +reporters_events_conf = if BUILD_BUGZILLA -reporters_events += report_Bugzilla.xml report_Bugzilla.conf +reporters_events += report_Bugzilla.xml +reporters_events_conf += report_Bugzilla.conf endif
if BUILD_UREPORT @@ -50,7 +53,6 @@ reporters_events += report_uReport.xml endif
dist_events_DATA = $(reporters_events) \ - report_Logger.conf \ report_Logger.xml \ report_Mailx.xml \ report_RHTSupport.xml \ @@ -58,11 +60,14 @@ dist_events_DATA = $(reporters_events) \ report_Uploader.xml \ report_EmergencyAnalysis.xml
+dist_eventsconf_DATA = $(reporters_events_conf) \ + report_Logger.conf + @INTLTOOL_XML_RULE@
-eventsconfdir = $(EVENTS_CONF_DIR) +eventsdefdir = $(EVENTS_DEFINITION_DIR)
-dist_eventsconf_DATA = \ +dist_eventsdef_DATA = \ mailx_event.conf \ print_event.conf \ rhtsupport_event.conf \ @@ -71,7 +76,7 @@ dist_eventsconf_DATA = \
reporters_extra_dist = if BUILD_BUGZILLA -dist_eventsconf_DATA += bugzilla_event.conf bugzilla_anaconda_event.conf +dist_eventsdef_DATA += bugzilla_event.conf bugzilla_anaconda_event.conf reporters_extra_dist += report_Bugzilla.xml.in report_Bugzilla.conf endif
diff --git a/src/workflows/Makefile.am b/src/workflows/Makefile.am index 45ba7e0..9e53c8c 100644 --- a/src/workflows/Makefile.am +++ b/src/workflows/Makefile.am @@ -15,14 +15,14 @@ dist_workflows_DATA += \ workflow_AnacondaUpload.xml endif
-workflowsconfdir = $(WORKFLOWS_CONF_DIR) +workflowsdefdir = $(WORKFLOWS_DEFINITION_DIR)
-dist_workflowsconf_DATA =\ +dist_workflowsdef_DATA =\ report_fedora.conf \ report_rhel.conf
if BUILD_BUGZILLA -dist_workflowsconf_DATA += \ +dist_workflowsdef_DATA += \ anaconda_event.conf endif
Closes #668
Signed-off-by: Jakub Filak jfilak@redhat.com --- abrt.spec.in | 18 +++++++++--------- configure.ac | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/abrt.spec.in b/abrt.spec.in index 75d3670..190a470 100644 --- a/abrt.spec.in +++ b/abrt.spec.in @@ -701,13 +701,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %config(noreplace) %{_sysconfdir}/libreport/events.d/ccpp_event.conf %config(noreplace) %{_sysconfdir}/libreport/events.d/gconf_event.conf %config(noreplace) %{_sysconfdir}/libreport/events.d/vimrc_event.conf -%config(noreplace) %{_sysconfdir}/libreport/events/analyze_CCpp.xml -%config(noreplace) %{_sysconfdir}/libreport/events/analyze_LocalGDB.xml -%config(noreplace) %{_sysconfdir}/libreport/events/collect_xsession_errors.xml -%config(noreplace) %{_sysconfdir}/libreport/events/collect_GConf.xml -%config(noreplace) %{_sysconfdir}/libreport/events/collect_vimrc_user.xml -%config(noreplace) %{_sysconfdir}/libreport/events/collect_vimrc_system.xml -%config(noreplace) %{_sysconfdir}/libreport/events/post_report.xml +%{_datadir}/libreport/events/analyze_CCpp.xml +%{_datadir}/libreport/events/analyze_LocalGDB.xml +%{_datadir}/libreport/events/collect_xsession_errors.xml +%{_datadir}/libreport/events/collect_GConf.xml +%{_datadir}/libreport/events/collect_vimrc_user.xml +%{_datadir}/libreport/events/collect_vimrc_system.xml +%{_datadir}/libreport/events/post_report.xml %{_mandir}/man*/abrt-action-analyze-c.* %{_mandir}/man*/abrt-action-trim-files.* %{_mandir}/man*/abrt-action-generate-backtrace.* @@ -720,7 +720,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_bindir}/abrt-retrace-client %{_mandir}/man1/abrt-retrace-client.1.gz %config(noreplace) %{_sysconfdir}/libreport/events.d/ccpp_retrace_event.conf -%config(noreplace) %{_sysconfdir}/libreport/events/analyze_RetraceServer.xml +%{_datadir}/libreport/events/analyze_RetraceServer.xml
%files addon-kerneloops %defattr(-,root,root,-) @@ -749,7 +749,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/libreport/events.d/vmcore_event.conf %config(noreplace) %{_sysconfdir}/%{name}/abrt-harvest-vmcore.conf -%config(noreplace) %{_sysconfdir}/libreport/events/analyze_VMcore.xml +%{_datadir}/libreport/events/analyze_VMcore.xml %if %{with systemd} %{_unitdir}/abrt-vmcore.service %else diff --git a/configure.ac b/configure.ac index ccd3901..7a8449a 100644 --- a/configure.ac +++ b/configure.ac @@ -139,7 +139,7 @@ AC_CHECK_HEADERS([locale.h]) CONF_DIR='${sysconfdir}/${PACKAGE_NAME}' VAR_RUN='${localstatedir}/run' PLUGINS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/plugins' -EVENTS_DIR='${sysconfdir}/libreport/events' +EVENTS_DIR='${datadir}/libreport/events' EVENTS_CONF_DIR='${sysconfdir}/libreport/events.d' ENABLE_SOCKET_OR_DBUS='-DENABLE_DBUS=1' DEFAULT_DUMP_DIR_MODE=$($PKG_CONFIG --variable=dd_mode libreport)
Related to abrt/abrt#669
Signed-off-by: Jakub Filak jfilak@redhat.com --- libreport.spec.in | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/libreport.spec.in b/libreport.spec.in index df37227..fb36c59 100644 --- a/libreport.spec.in +++ b/libreport.spec.in @@ -77,7 +77,7 @@ Development libraries and headers for libreport
%package web Summary: Library providing network API for libreport -Group: Libraries +Group: System Environment/Libraries Requires: libreport = %{version}-%{release}
%description web @@ -254,6 +254,7 @@ Plugin to report bugs into anonymous FTP site associated with ticketing system. %package fedora Summary: Default configuration for reporting bugs via Fedora infrastructure Group: Applications/File +Requires: %{name} = %{version}-%{release}
%description fedora Default configuration for reporting bugs via Fedora infrastructure @@ -263,6 +264,7 @@ install this package and you're done. %package rhel Summary: Default configuration for reporting bugs via Red Hat infrastructure Group: Applications/File +Requires: %{name} = %{version}-%{release}
%description rhel Default configuration for reporting bugs via Red Hat infrastructure @@ -273,8 +275,9 @@ install this package and you're done. %package anaconda Summary: Default configuration for reporting anaconda bugs Group: Applications/File -Requires: libreport-plugin-reportuploader -Requires: libreport-plugin-bugzilla +Requires: %{name} = %{version}-%{release} +Requires: libreport-plugin-reportuploader = %{version}-%{release} +Requires: libreport-plugin-bugzilla = %{version}-%{release}
%description anaconda Default configuration for reporting Anaconda problems using Fedora @@ -342,6 +345,13 @@ fi %posttrans gtk gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+ +%post web -p /sbin/ldconfig + + +%postun web -p /sbin/ldconfig + + %files -f %{name}.lang %defattr(-,root,root,-) %doc README COPYING @@ -385,10 +395,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files web %defattr(-,root,root,-) -%{_libdir}/libreport-web.so* +%{_libdir}/libreport-web.so.*
%files web-devel %defattr(-,root,root,-) +%{_libdir}/libreport-web.so %{_includedir}/libreport/libreport_curl.h %{_libdir}/pkgconfig/libreport-web.pc
Related to abrt/abrt#672
Signed-off-by: Jakub Filak jfilak@redhat.com --- doc/Makefile.am | 3 +++ doc/report-gtk.txt | 44 ++++++++++++++++++++++++++++++++++++++++++++ doc/report-newt.txt | 27 +++++++++++++++++++++++++++ doc/reporter-ureport.txt | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 121 insertions(+) create mode 100644 doc/report-gtk.txt create mode 100644 doc/report-newt.txt create mode 100644 doc/reporter-ureport.txt
diff --git a/doc/Makefile.am b/doc/Makefile.am index b52a043..11e2c4d 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -9,6 +9,8 @@ XMLTO_SILENT_0 = @echo " XMLTO " $@;
MAN1_TXT = MAN1_TXT += report-cli.txt +MAN1_TXT += report-newt.txt +MAN1_TXT += report-gtk.txt
if BUILD_BUGZILLA MAN1_TXT += reporter-bugzilla.txt @@ -20,6 +22,7 @@ MAN1_TXT += reporter-mailx.txt MAN1_TXT += reporter-print.txt MAN1_TXT += reporter-rhtsupport.txt MAN1_TXT += reporter-upload.txt +MAN1_TXT += reporter-ureport.txt
MAN5_TXT = MAN5_TXT += report_event.conf.txt diff --git a/doc/report-gtk.txt b/doc/report-gtk.txt new file mode 100644 index 0000000..20e3685 --- /dev/null +++ b/doc/report-gtk.txt @@ -0,0 +1,44 @@ +report-gtk(1) +=========== + +NAME +---- +report-gtk - GUI tool to analyze and report ABRT problems + +SYNOPSIS +-------- +'report-gtk' [-vpdx] [-e EVENT] [-g GUI_FILE] PROBLEM_DIR + +DESCRIPTION +----------- +'report-gtk' is a graphical tool that reports application crashes and other +problems caught by abrtd daemon, or created by other programs using libreport. +report-gtk works with a single problem saved in specified PROBLEM_DIR. +In the expert mode it enables access to and manipulation of problem data. + +OPTIONS +------- +-d, --delete:: + Remove PROBLEM_DIR after reporting + +-e EVENT:: + Run only theset EVENTs on PROBLEM_DIR + +-g FILE:: + Alternate GUI file + +-p:: + Add program names to log + +-v, --verbose:: + Be verbose + +-V, --version:: + Display version and exit + +-x, --expert:: + Enabled advanced features + +AUTHORS +------- +* ABRT team diff --git a/doc/report-newt.txt b/doc/report-newt.txt new file mode 100644 index 0000000..63e8ed0 --- /dev/null +++ b/doc/report-newt.txt @@ -0,0 +1,27 @@ +report-newt(1) +============ + +NAME +---- +report-newt - Reports ABRT problem to various bug tracking tools. + +SYNOPSIS +-------- +'report-newt' [-d] PROBLEM_DIR + +DESCRIPTION +----------- +'report-newt' is a command line tool that reports application crashes and other +problems caught by abrtd daemon, or created by other programs using libreport. + +OPTIONS +------- +-d, --delete:: + Remove PROBLEM_DIR after reporting + +-V, --version:: + Display version and exit + +AUTHORS +------- +* ABRT team diff --git a/doc/reporter-ureport.txt b/doc/reporter-ureport.txt new file mode 100644 index 0000000..1da336d --- /dev/null +++ b/doc/reporter-ureport.txt @@ -0,0 +1,47 @@ +reporter-ureport(1) +================= + +NAME +---- +reporter-ureport - Reports ABRT problems in format of micro report + +SYNOPSIS +-------- +'reporter-ureport' [-v] [-u URL] [-k] [-a bthash -b bug-id] [-r] [-d DIR] + +DESCRIPTION +----------- +The tool reads problem directory DIR, assembles an micro report from the loaded +problem data and sends the micro report to uReport server for updating +statistics and fast analysis. The results of the analysis are stored in problem +data in form of problems elements. 'reporter-ureport' updates 'reported_to' +element with links to duplicates and saves solutions in 'not-reportable' element. + + +OPTIONS +------- +-a, --attach BTHASH:: + bthash of uReport to attach + +-b, --bug-id NUM:: + Attach RHBZ bug (requires -a) + +-d DIR:: + Path to problem directory. + +-k,--insecure:: + Allow insecure connection to ureport server + +-r, --attach-reported-to:: + Attach contents of reported_to + +-v:: + Be more verbose. Can be given multiple times. + +-u, --url URL:: + Specify server URL + + +AUTHORS +------- +* ABRT team
Related to abrt/abrt#672
Signed-off-by: Jakub Filak jfilak@redhat.com --- libreport.spec.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libreport.spec.in b/libreport.spec.in index fb36c59..51dc747 100644 --- a/libreport.spec.in +++ b/libreport.spec.in @@ -416,6 +416,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files newt %defattr(-,root,root,-) %{_bindir}/report-newt +%{_mandir}/man1/report-newt.1.gz
%files gtk %defattr(-,root,root,-) @@ -424,6 +425,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_libdir}/libreport-gtk.so.* %config(noreplace) %{_sysconfdir}/libreport/events.d/emergencyanalysis_event.conf %{_datadir}/%{name}/events/report_EmergencyAnalysis.xml +%{_mandir}/man1/report-gtk.1.gz
%files gtk-devel %defattr(-,root,root,-) @@ -456,7 +458,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files plugin-ureport %defattr(-,root,root,-) %{_bindir}/reporter-ureport -#%{_mandir}/man1/reporter-ureport.1.gz +%{_mandir}/man1/reporter-ureport.1.gz %{_datadir}/%{name}/events/report_uReport.xml
%if %{with bugzilla}
Related to abrt/abrt#669
Signed-off-by: Jakub Filak jfilak@redhat.com --- libreport.spec.in | 21 --------------------- 1 file changed, 21 deletions(-)
diff --git a/libreport.spec.in b/libreport.spec.in index 51dc747..23089f3 100644 --- a/libreport.spec.in +++ b/libreport.spec.in @@ -165,11 +165,6 @@ server, usually to kerneloops.org. Summary: %{name}'s logger reporter plugin Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} -Obsoletes: abrt-plugin-logger < 2.0.4 -Provides: report-plugin-localsave = 0:0.23-1 -Obsoletes: report-plugin-localsave < 0:0.23-1 -Provides: report-config-localsave = 0:0.23-1 -Obsoletes: report-config-localsave < 0:0.23-1
%description plugin-logger The simple reporter plugin which writes a report to a specified file. @@ -179,7 +174,6 @@ Summary: %{name}'s mailx reporter plugin Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Requires: mailx -Obsoletes: abrt-plugin-mailx < 2.0.4
%description plugin-mailx The simple reporter plugin which sends a report via mailx to a specified @@ -191,11 +185,6 @@ Summary: %{name}'s bugzilla plugin Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Requires: libreport-web = %{version}-%{release} -Obsoletes: abrt-plugin-bugzilla < 2.0.4 -Provides: report-plugin-bugzilla = 0:0.23-1 -Obsoletes: report-plugin-bugzilla < 0:0.23-1 -Provides: report-config-bugzilla-redhat-com = 0:0.23-1 -Obsoletes: report-config-bugzilla-redhat-com < 0:0.23-1
%description plugin-bugzilla Plugin to report bugs into the bugzilla. @@ -216,7 +205,6 @@ Summary: %{name}'s RHTSupport plugin Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Requires: libreport-web = %{version}-%{release} -Obsoletes: abrt-plugin-rhtsupport < 2.0.4
%description plugin-rhtsupport Plugin to report bugs into RH support system. @@ -238,15 +226,6 @@ Summary: %{name}'s reportuploader plugin Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Requires: libreport-web = %{version}-%{release} -Obsoletes: abrt-plugin-reportuploader < 2.0.4 -Provides: report-plugin-ftp = 0:0.23-1 -Obsoletes: report-plugin-ftp < 0:0.23-1 -Provides: report-config-ftp = 0:0.23-1 -Obsoletes: report-config-ftp < 0:0.23-1 -Provides: report-plugin-scp = 0:0.23-1 -Obsoletes: report-plugin-scp < 0:0.23-1 -Provides: report-config-scp = 0:0.23-1 -Obsoletes: report-config-scp < 0:0.23-1
%description plugin-reportuploader Plugin to report bugs into anonymous FTP site associated with ticketing system.
Related to #669
Signed-off-by: Jakub Filak jfilak@redhat.com --- abrt.spec.in | 57 ++++++++++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 25 deletions(-)
diff --git a/abrt.spec.in b/abrt.spec.in index 190a470..fd23b12 100644 --- a/abrt.spec.in +++ b/abrt.spec.in @@ -38,6 +38,8 @@ %define shadow_utils shadow-utils %endif
+%define libreport_ver 2.1.5 + Summary: Automatic bug detection and reporting tool Name: abrt Version: @@ABRT_VERSION@@ @@ -61,11 +63,11 @@ BuildRequires: %{nss_devel} BuildRequires: asciidoc BuildRequires: doxygen BuildRequires: xmlto -BuildRequires: libreport-devel >= 2.1.3 +BuildRequires: libreport-devel >= %{libreport_ver} BuildRequires: btparser-devel ##satyr migration: #BuildRequires: satyr-devel -Requires: libreport >= 2.1.3 +Requires: libreport >= %{libreport_ver} # these only exist on suse %if 0%{?suse_version} BuildRequires: dbus-1-glib-devel @@ -110,7 +112,7 @@ Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} Requires: %{name}-dbus = %{version}-%{release} Requires: gnome-abrt -BuildRequires: libreport-gtk-devel +BuildRequires: libreport-gtk-devel >= %{libreport_ver} # we used to have abrt-applet, now abrt-gui includes it: Provides: abrt-applet = %{version}-%{release} Obsoletes: abrt-applet < 0.0.5 @@ -153,14 +155,16 @@ Summary: %{name}'s kerneloops addon Group: System Environment/Libraries Requires: curl Requires: %{name} = %{version}-%{release} -Requires: libreport-plugin-kerneloops +Requires: libreport-plugin-kerneloops >= %{libreport_ver} + Requires: abrt-libs = %{version}-%{release} Obsoletes: kerneloops > 0.0.1 Obsoletes: abrt-plugin-kerneloops > 0.0.1 Obsoletes: abrt-plugin-kerneloopsreporter > 0.0.1
%description addon-kerneloops -This package contains plugin for collecting kernel crash information from system log. +This package contains plugin for collecting kernel crash information from +system log.
%package addon-xorg Summary: %{name}'s Xorg addon @@ -170,7 +174,8 @@ Requires: %{name} = %{version}-%{release} Requires: abrt-libs = %{version}-%{release}
%description addon-xorg -This package contains plugin for collecting Xorg crash information from Xorg log. +This package contains plugin for collecting Xorg crash information from Xorg +log.
%package addon-vmcore Summary: %{name}'s vmcore addon @@ -180,7 +185,8 @@ Requires: abrt-addon-kerneloops Requires: crash
%description addon-vmcore -This package contains plugin for collecting kernel crash information from vmcore files. +This package contains plugin for collecting kernel crash information from +vmcore files.
%package addon-uefioops Summary: %{name}'s UEFI oops addon @@ -197,7 +203,7 @@ Summary: %{name}'s bodhi plugin BuildRequires: %{libjson_devel} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} -BuildRequires: libreport-web-devel >= 2.0.10 +BuildRequires: libreport-web-devel >= %{libreport_ver} Obsoletes: libreport-plugin-bodhi > 0.0.1 Provides: libreport-plugin-bodhi
@@ -221,15 +227,15 @@ uncaught exception in python programs. Summary: %{name}'s command line interface Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} -Requires: libreport-cli +Requires: libreport-cli >= %{libreport_ver} Requires: abrt-libs = %{version}-%{release}
%description tui -This package contains a simple command line client for processing abrt reports in -command line environment. +This package contains a simple command line client for processing abrt reports +in command line environment.
%package cli -Summary: Virtual package to install all necessary packages for usage from command line environment +Summary: Virtual package to make easy default installation on non-graphical environments Group: Applications/System Requires: %{name} = %{version}-%{release} Requires: abrt-tui @@ -244,16 +250,17 @@ Requires: abrt-retrace-client Requires: abrt-plugin-bodhi %endif %if 0%{!?suse_version:1} -Requires: libreport-plugin-bugzilla +Requires: libreport-plugin-bugzilla >= %{libreport_ver} %endif -Requires: libreport-plugin-logger -Requires: libreport-plugin-ureport +Requires: libreport-plugin-logger >= %{libreport_ver} +Requires: libreport-plugin-ureport >= %{libreport_ver}
%description cli -Virtual package to make easy default installation on non-graphical environments. +Virtual package to install all necessary packages for usage from command line +environment.
%package desktop -Summary: Virtual package to install all necessary packages for usage from desktop environment +Summary: Virtual package to make easy default installation on desktop environments Group: User Interface/Desktops # This package gets installed when anything requests bug-buddy - # happens when users upgrade Fn to Fn+1; @@ -276,28 +283,28 @@ Requires: gnome-abrt Requires: abrt-plugin-bodhi %endif %if 0%{!?suse_version:1} -Requires: libreport-plugin-bugzilla +Requires: libreport-plugin-bugzilla >= %{libreport_ver} %endif -Requires: libreport-plugin-logger -Requires: libreport-plugin-ureport +Requires: libreport-plugin-logger >= %{libreport_ver} +Requires: libreport-plugin-ureport >= %{libreport_ver} %if 0%{?fedora} -Requires: libreport-fedora +Requires: libreport-fedora >= %{libreport_ver} %endif %if 0%{?rhel} -Requires: libreport-rhel +Requires: libreport-rhel >= %{libreport_ver} %endif #Requires: abrt-plugin-firefox Obsoletes: bug-buddy > 0.0.1 Provides: bug-buddy
%description desktop -Virtual package to make easy default installation on desktop environments. +Virtual package to install all necessary packages for usage from desktop +environment.
%package dbus Summary: ABRT DBus service -Group: Application/System +Group: Applications/System Requires: %{name} = %{version}-%{release} -Requires: libreport BuildRequires: polkit-devel Requires: abrt-libs = %{version}-%{release}
Related to #672
Signed-off-by: Jakub Filak jfilak@redhat.com --- doc/Makefile.am | 15 +++++++++ doc/abrt-action-analyze-core.txt | 33 ++++++++++++++++++++ doc/abrt-action-analyze-vulnerability.txt | 24 ++++++++++++++ doc/abrt-action-analyze-xorg.txt | 47 ++++++++++++++++++++++++++++ doc/abrt-action-install-debuginfo.txt | 44 ++++++++++++++++++++++++++ doc/abrt-action-perform-ccpp-analysis.txt | 40 ++++++++++++++++++++++++ doc/abrt-action-save-kernel-data.txt | 33 ++++++++++++++++++++ doc/abrt-applet.txt | 33 ++++++++++++++++++++ doc/abrt-dedup-client.txt | 52 +++++++++++++++++++++++++++++++ doc/abrt-dump-oops.txt | 49 +++++++++++++++++++++++++++++ doc/abrt-dump-xorg.txt | 46 +++++++++++++++++++++++++++ doc/abrt-harvest-uefioops.txt | 25 +++++++++++++++ doc/abrt-harvest-vmcore.txt | 32 +++++++++++++++++++ doc/abrt-merge-uefioops.txt | 30 ++++++++++++++++++ doc/abrt-watch-log.txt | 34 ++++++++++++++++++++ doc/system-config-abrt.txt | 19 +++++++++++ 16 files changed, 556 insertions(+) create mode 100644 doc/abrt-action-analyze-core.txt create mode 100644 doc/abrt-action-analyze-vulnerability.txt create mode 100644 doc/abrt-action-analyze-xorg.txt create mode 100644 doc/abrt-action-install-debuginfo.txt create mode 100644 doc/abrt-action-perform-ccpp-analysis.txt create mode 100644 doc/abrt-action-save-kernel-data.txt create mode 100644 doc/abrt-applet.txt create mode 100644 doc/abrt-dedup-client.txt create mode 100644 doc/abrt-dump-oops.txt create mode 100644 doc/abrt-dump-xorg.txt create mode 100644 doc/abrt-harvest-uefioops.txt create mode 100644 doc/abrt-harvest-vmcore.txt create mode 100644 doc/abrt-merge-uefioops.txt create mode 100644 doc/abrt-watch-log.txt create mode 100644 doc/system-config-abrt.txt
diff --git a/doc/Makefile.am b/doc/Makefile.am index 94d8f8f..872d210 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -8,17 +8,32 @@ MAN1_TXT += abrt-action-trim-files.txt MAN1_TXT += abrt-action-generate-backtrace.txt MAN1_TXT += abrt-action-generate-core-backtrace.txt MAN1_TXT += abrt-action-analyze-backtrace.txt +MAN1_TXT += abrt-action-analyze-core.txt MAN1_TXT += abrt-action-analyze-oops.txt MAN1_TXT += abrt-action-analyze-python.txt +MAN1_TXT += abrt-action-analyze-xorg.txt +MAN1_TXT += abrt-action-analyze-vulnerability.txt +MAN1_TXT += abrt-action-install-debuginfo.txt MAN1_TXT += abrt-action-list-dsos.txt +MAN1_TXT += abrt-action-perform-ccpp-analysis.txt +MAN1_TXT += abrt-applet.txt +MAN1_TXT += abrt-dump-oops.txt +MAN1_TXT += abrt-dump-xorg.txt MAN1_TXT += abrt-retrace-client.txt MAN1_TXT += abrt-handle-upload.txt +MAN1_TXT += abrt-harvest-uefioops.txt +MAN1_TXT += abrt-harvest-vmcore.txt +MAN1_TXT += abrt-merge-uefioops.txt MAN1_TXT += abrt-server.txt +MAN1_TXT += abrt-dedup-client.txt MAN1_TXT += abrt-cli.txt MAN1_TXT += abrt-action-save-package-data.txt +MAN1_TXT += abrt-action-save-kernel-data.txt MAN1_TXT += abrt-install-ccpp-hook.txt MAN1_TXT += abrt-action-analyze-vmcore.txt MAN1_TXT += abrt-action-analyze-ccpp-local.txt +MAN1_TXT += abrt-watch-log.txt +MAN1_TXT += system-config-abrt.txt if BUILD_BODHI MAN1_TXT += abrt-bodhi.txt endif diff --git a/doc/abrt-action-analyze-core.txt b/doc/abrt-action-analyze-core.txt new file mode 100644 index 0000000..750be2d --- /dev/null +++ b/doc/abrt-action-analyze-core.txt @@ -0,0 +1,33 @@ +abrt-action-analyze-core(1) +============================= + +NAME +---- +abrt-action-analyze-core - Extracts builds from a core dump + +SYNOPSIS +-------- +'abrt-action-analyze-core' [-v] [-o OUTFILE] -c COREFILE + +DESCRIPTION +----------- +The tool reads a core dump and extracts build ids of loaded modules and prints +the list to the standard output if the OUTFILE file is not configured. + +OPTIONS +------- +-c COREFILE:: + Path to a core dump. + +-v:: + Be more verbose. Can be given multiple times. + +-o OUTFILE:: + Output file + +-h, --help:: + Prints help text + +AUTHORS +------- +* ABRT team diff --git a/doc/abrt-action-analyze-vulnerability.txt b/doc/abrt-action-analyze-vulnerability.txt new file mode 100644 index 0000000..8dc118f --- /dev/null +++ b/doc/abrt-action-analyze-vulnerability.txt @@ -0,0 +1,24 @@ +abrt-action-analyze-vulnerability(1) +================================== + +NAME +---- +abrt-action-analyze-vulnerability - Provides assessment of potential exploitability of crash + +SYNOPSIS +-------- +abrt-action-analyze-vulnerability + +DESCRIPTION +----------- +This tool expects that file named 'coredump' is placed in the current directory +and runs abrt-gdb-exploitable gdb plugin on that file. The result of +vulnerability analysis is saved in 'exploitable' file in the current directory. + +This tool requires both 'gdb' and 'eu-readelf' executables placed in PATH. If +any of the required programs is missing the tool silently exits with 0 exit +code. + +AUTHORS +------- +* ABRT team diff --git a/doc/abrt-action-analyze-xorg.txt b/doc/abrt-action-analyze-xorg.txt new file mode 100644 index 0000000..880c6fb --- /dev/null +++ b/doc/abrt-action-analyze-xorg.txt @@ -0,0 +1,47 @@ +abrt-action-analyze-xorg(1) +=========================== + +NAME +---- +abrt-action-analyze-xorg - Calculate and save UUID and duplicate hash +for a problem data directory DIR with Xorg backtrace. + +SYNOPSIS +-------- +'abrt-action-analyze-xorg' [-v] [-d DIR] + +DESCRIPTION +----------- +The tool reads the file named 'Xorg.0.log' and checks if any black listed +module was loaded. If so, 'not-reportable' file is created with an appropriate +explanation text. If no black listed module was loaded, the tool reads the +file named 'backtrace' from a problem data directory record and generates a +duplication hash and a universally unique identifier (UUID). Then it saves +this data as new elements 'duphash' and 'uuid'. + +Integration with ABRT events +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +'abrt-action-analyze-xorg' can be used to generate the duplication +hash of a newly discovered Xorg backtraces. + +------------ +EVENT=post-create analyzer=Xorg abrt-action-analyze-xorg +------------ + +OPTIONS +------- +-d DIR:: + Path to a problem directory. Current working directory is used when + this option is not provided. + +-v:: + Be more verbose. Can be given multiple times. + +FILES +----- +/etc/abrt/xorg.conf + List of modules which, when loaded, should make Xorg crashes non-reportable. + +AUTHORS +------- +* ABRT team diff --git a/doc/abrt-action-install-debuginfo.txt b/doc/abrt-action-install-debuginfo.txt new file mode 100644 index 0000000..49a0ebd --- /dev/null +++ b/doc/abrt-action-install-debuginfo.txt @@ -0,0 +1,44 @@ +abrt-action-install-debuginfo(1) +============================== + +NAME +---- +abrt-action-install-debuginfo - Install debuginfos for build-ids + +SYNOPSIS +-------- +'abrt-action-install-debuginfo' [-vy] [--ids=BUILD_IDS_FILE] [--tmpdir=TMPDIR] [--cache=CACHEDIR[:DEBUGINFODIR1:DEBUGINFODIR2...]] [--size_mb=SIZE] [-e PATH] + +DESCRIPTION +----------- +Installs debuginfos for all build-ids listed in BUILD_IDS_FILE +to CACHEDIR, using TMPDIR as temporary staging area. +Old files in CACHEDIR are deleted until it is smaller than SIZE. + +OPTIONS +------- +-v:: + Be more verbose. Can be given multiple times. + +-y:: + Noninteractive, assume 'Yes' to all questions + +--ids:: + Path to file with list of build ids. Default: build_ids + +--tmpdir:: + Path to tmp directory. Default: /tmp/abrt-tmp-debuginfo-RANDOM_SUFFIX + +--cache:: + Path to cache directory. Default: /var/cache/abrt-di + +--size_mb:: + Default: 4096 + +-e,--exact:: + Download only specified files + +AUTHORS +------- +* ABRT team + diff --git a/doc/abrt-action-perform-ccpp-analysis.txt b/doc/abrt-action-perform-ccpp-analysis.txt new file mode 100644 index 0000000..3fac30f --- /dev/null +++ b/doc/abrt-action-perform-ccpp-analysis.txt @@ -0,0 +1,40 @@ +abrt-action-perform-ccpp-analysis(1) +================================== + +NAME +---- +abrt-action-perform-ccpp-analysis - Allows users to select acceptable way of core dump analysis + +SYNOPSIS +-------- +'abrt-action-perform-ccpp-analysis' [-h] [-d PROBLEM_DIR] + +DESCRIPTION +----------- +This tool allows user to select between local and remote core dump analysis. +The local analysis may require to download huge amount of data but is +completely safe. On the contrary the remote analysis only needs to upload the +core dump to retrace server but the core dump may contain security sensitive +data. + +Integration with ABRT events +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +'abrt-action-perform-ccpp-analysis' is used in the analyze step when processing +C/C++ crashes + +------------ +EVENT=analyze_CCpp analyzer=CCpp + abrt-action-perform-ccpp-analysis +------------ + +OPTIONS +------- +-d, --problem-dir PROBLEM_DIR:: + Problem directory [Default: current directory] + +-h, --help:: + Show help message + +AUTHORS +------- +* ABRT team diff --git a/doc/abrt-action-save-kernel-data.txt b/doc/abrt-action-save-kernel-data.txt new file mode 100644 index 0000000..f82fa35 --- /dev/null +++ b/doc/abrt-action-save-kernel-data.txt @@ -0,0 +1,33 @@ +abrt-action-save-kernel-data(1) +================================ + +NAME +---- +abrt-action-save-kernel-data - Creates uReport mandatory files for kernel oopses. + +SYNOPSIS +-------- +'abrt-action-save-kernel-data' + +DESCRIPTION +----------- +The tool reads problem directory DIR. It analyzes contents of 'kernel' element, +checks database of installed packages, and creates new elements +'pkg_name', 'pkg_arch', 'pkg_version', 'pkg_release'. + +These files are required by reporter-ureporter (mandatory in uReport). + +Integration with ABRT events +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +This tool can be used as an ABRT reporter. Example +fragment for /etc/libreport/report_event.conf: + +------------ +# Determine in which package/component the crash happened (if not yet done): +EVENT=post-create analyzer=Kerneloops + abrt-action-save-kernel-data +------------ + +AUTHORS +------- +* ABRT team diff --git a/doc/abrt-applet.txt b/doc/abrt-applet.txt new file mode 100644 index 0000000..3dfc00b --- /dev/null +++ b/doc/abrt-applet.txt @@ -0,0 +1,33 @@ +abrt-applet(1) +============ + +NAME +---- +abrt-applet - Applet which notifies user when new problems are detected by ABRT + +SYNOPSIS +-------- +'abrt-applet' [-v] + +DESCRIPTION +----------- +This tool listens on 'org.freedesktop.problems' D-Bus bus and waits for 'Crash' +signal. When the tool detects the signal, it notifies user about new problem +over a desktop specific notification pop-up. + +At start-up this tool checks for new problems which occurred while the tool was +not running and if it finds any of such problem it notifies user over a desktop +specific notification pop-up. + +OPTIONS +------- +-v, --verbose:: + Be more verbose. Can be given multiple times. + +SEE ALSO +-------- +abrt-dbus(8) + +AUTHORS +------- +* ABRT team diff --git a/doc/abrt-dedup-client.txt b/doc/abrt-dedup-client.txt new file mode 100644 index 0000000..b837fcd --- /dev/null +++ b/doc/abrt-dedup-client.txt @@ -0,0 +1,52 @@ +abrt-dedup-client(1) +================== + +NAME +---- +abrt-dedup-client - The ABRT dedup server client. + +SYNOPSIS +-------- +'abrt-dedup-client' [-vsk] [--url URL] [--port PORT] [-d DIR] [--headers] + +DESCRIPTION +----------- +'abrt-dedup-client' is the command-line tool for searching for duplicates. + +OPTIONS +------- +-v, --verbose:: + be verbose + +-s, --syslog:: + log to syslog + +-k, --insecure:: + allow insecure connection to dedup server + +--url URL:: + dedup server URL [Default: retrace.fedoraproject.org] + +--port NUM:: + dedup server port [Default: 443] + +-d, --dump-dir DIR:: + problem directory [Default: current directory] + +--headers:: + (debug) show received HTTP headers + +ENVIRONMENT +----------- +DEDUP_SERVER_URL:: + dedup server URL + +DEDUP_SERVER_PORT:: + dedup server PORT + +DEDUP_SERVER_INSECURE:: + Allow insecure connection to dedup server (use 'insecure') + +AUTHORS +------- +* ABRT team diff --git a/doc/abrt-dump-oops.txt b/doc/abrt-dump-oops.txt new file mode 100644 index 0000000..f63e53a --- /dev/null +++ b/doc/abrt-dump-oops.txt @@ -0,0 +1,49 @@ +abrt-dump-oops(1) +=============== + +NAME +---- +abrt-dump-oops - Extract oops from FILE (or standard input) + +SYNOPSIS +-------- +'abrt-dump-oops' [-vusoxm] [-d DIR]/[-D] [FILE] + +DESCRIPTION +----------- +This tool creates problem directory from, updates problem directory with or +prints oops extracted from FILE or standard input. + +OPTIONS +------- +-v, --verbose:: + Be more verbose. Can be given multiple times. + +-s:: + Log to syslog + +-o:: + Print found oopses on standard output + +-d DIR:: + Create new problem directory in DIR for every oops found + +-D:: + Same as -d DumpLocation, DumpLocation is specified in abrt.conf + +-u PROBLEM:: + Save the extracted information in PROBLEM directory + +-x:: + Make the problem directory world readable. Usable only with -d/-D + +-m:: + Print search string(s) for 'abrt-watch-log' to stdout and exit + +SEE ALSO +-------- +abrt-watch-log(1), abrt.conf(5) + +AUTHORS +------- +* ABRT team diff --git a/doc/abrt-dump-xorg.txt b/doc/abrt-dump-xorg.txt new file mode 100644 index 0000000..7fe7a79 --- /dev/null +++ b/doc/abrt-dump-xorg.txt @@ -0,0 +1,46 @@ +abrt-dump-xorg(1) +=============== + +NAME +---- +abrt-dump-xorg - Extract Xorg crash from FILE (or standard input) + +SYNOPSIS +-------- +'abrt-dump-xorg' [-vsoxm] [-d DIR]/[-D] [FILE] + +DESCRIPTION +----------- +This tool creates problem directory from or prints Xorg crash extracted from FILE +or standard input. + +OPTIONS +------- +-v, --verbose:: + Be more verbose. Can be given multiple times. + +-s:: + Log to syslog + +-o:: + Print found crash data on standard output + +-d DIR:: + Create new problem directory in DIR for every crash found + +-D:: + Same as -d DumpLocation, DumpLocation is specified in abrt.conf + +-x:: + Make the problem directory world readable. Usable only with -d/-D + +-m:: + Print search string(s) for 'abrt-watch-log' to stdout and exit + +SEE ALSO +-------- +abrt-watch-log(1), abrt.conf(5) + +AUTHORS +------- +* ABRT team diff --git a/doc/abrt-harvest-uefioops.txt b/doc/abrt-harvest-uefioops.txt new file mode 100644 index 0000000..efd6f3f --- /dev/null +++ b/doc/abrt-harvest-uefioops.txt @@ -0,0 +1,25 @@ +abrt-harvest-uefioops(1) +====================== + +NAME +---- +abrt-harvest-uefioops - Reconstruct oops from /sys/fs/pstore/* files, create ABRT problems and remove the files + +SYNOPSIS +-------- +'abrt-harvest-uefioops' + +DESCRIPTION +----------- +This script is meant to be run once at system startup after abrtd is up and +running. It scans /sys/fs/pstore/*, reconstructs oops text(s) from these files, +creates ABRT problem directories from them, then removes the files (UEFI +storage is a limited resource). + +SEE ALSO +-------- +abrt-merge-uefioops(1) + +AUTHORS +------- +* ABRT team diff --git a/doc/abrt-harvest-vmcore.txt b/doc/abrt-harvest-vmcore.txt new file mode 100644 index 0000000..0902afd --- /dev/null +++ b/doc/abrt-harvest-vmcore.txt @@ -0,0 +1,32 @@ +abrt-harvest-vmcore(1) +==================== + +NAME +---- +abrt-harvest-vmcore - Converts VMCores to ABRT problems + +SYNOPSIS +-------- +'abrt-harvest-vmcore' + +DESCRIPTION +----------- +This script is meant to be run once at system startup after abrtd is up and +running. It moves all vmcore directories in /var/crash (which are presumably +created by kdump) to abrtd spool directory. + +The goal is to let abrtd notice and process them as new problem data dirs. + +FILES +----- +/etc/abrt/abrt-harvest-vmcore.conf + Configuration file where user can enable copying or moving VMcore to ABRT + problem directory + +SEE ALSO +-------- +abrt.conf(5) + +AUTHORS +------- +* ABRT team diff --git a/doc/abrt-merge-uefioops.txt b/doc/abrt-merge-uefioops.txt new file mode 100644 index 0000000..8f7de86 --- /dev/null +++ b/doc/abrt-merge-uefioops.txt @@ -0,0 +1,30 @@ +abrt-merge-uefioops(1) +==================== + +NAME +---- +abrt-merge-uefioops - Scans files for split oops message. Can print and/or delete them. + +SYNOPSIS +-------- +'abrt-merge-uefioops' [-v] [-od] FILE... + +DESCRIPTION +----------- +This tool takes list of files, reads all of the files, scans them for split +oops messages and join oops parts to original oops message. + +OPTIONS +------- +-o:: + Print found oopses + +-d:: + Delete files with found oopses + +-v, --verbose:: + Be more verbose. Can be given multiple times. + +AUTHORS +------- +* ABRT team diff --git a/doc/abrt-watch-log.txt b/doc/abrt-watch-log.txt new file mode 100644 index 0000000..c393410 --- /dev/null +++ b/doc/abrt-watch-log.txt @@ -0,0 +1,34 @@ +abrt-watch-log(1) +=============== + +NAME +---- +abrt-watch-log - Watch log file and run command when it grows or is replaced + +SYNOPSIS +-------- +'abrt-watch-log' [-vs] [-F STR] ... FILE PROG [ARGS] + +OPTIONS +------- +-F STR:: + Don't run PROG if STRs aren't found + +-v, --verbose:: + Be more verbose. Can be given multiple times. + +-s:: + Log to syslog + +FILE:: + Watched file + +PROG:: + Path to an executable + +ARGS:: + Arguments for PROG + +AUTHORS +------- +* ABRT team diff --git a/doc/system-config-abrt.txt b/doc/system-config-abrt.txt new file mode 100644 index 0000000..cf431a7 --- /dev/null +++ b/doc/system-config-abrt.txt @@ -0,0 +1,19 @@ +system-config-abrt(1) +=================== + +NAME +---- +system-config-abrt - GUI tool to configure ABRT + +SYNOPSIS +-------- +'system-config-abrt' + +DESCRIPTION +----------- +'system-config-abrt' is a graphical tool that provides to users comfortable way +for changing ABRT's configuration files from one place. + +AUTHORS +------- +* ABRT team
Closes #672
Signed-off-by: Jakub Filak jfilak@redhat.com --- abrt.spec.in | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/abrt.spec.in b/abrt.spec.in index fd23b12..20fb9c1 100644 --- a/abrt.spec.in +++ b/abrt.spec.in @@ -644,12 +644,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_mandir}/man1/abrt-handle-upload.1.gz %{_mandir}/man1/abrt-server.1.gz %{_mandir}/man1/abrt-action-save-package-data.1.gz +%{_mandir}/man1/abrt-watch-log.1.gz +%{_mandir}/man1/abrt-action-analyze-xorg.1.gz %{_mandir}/man8/abrtd.8.gz -%{_mandir}/man8/abrt-dbus.8.gz %{_mandir}/man5/abrt.conf.5.gz %{_mandir}/man5/abrt-action-save-package-data.conf.5.gz # {_mandir}/man5/pyhook.conf.5.gz -%{_mandir}/man1/abrt-action-analyze-ccpp-local.*
%files libs %defattr(-,root,root,-) @@ -676,6 +676,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #%%{_bindir}/test-report %config(noreplace) %{_sysconfdir}/xdg/autostart/abrt-applet.desktop /usr/share/applications/system-config-abrt.desktop +%{_mandir}/man1/abrt-applet.1* +%{_mandir}/man1/system-config-abrt.1*
%files addon-ccpp %defattr(-,root,root,-) @@ -721,7 +723,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_mandir}/man*/abrt-action-generate-core-backtrace.* %{_mandir}/man*/abrt-action-analyze-backtrace.* %{_mandir}/man*/abrt-action-list-dsos.* -%{_mandir}/man1/abrt-install-ccpp-hook.1.gz +%{_mandir}/man*/abrt-install-ccpp-hook.* +%{_mandir}/man*/abrt-action-install-debuginfo.* +%{_mandir}/man*/abrt-action-analyze-ccpp-local.* +%{_mandir}/man*/abrt-action-analyze-core.* +%{_mandir}/man*/abrt-action-analyze-vulnerability.* +%{_mandir}/man*/abrt-action-perform-ccpp-analysis.* +%{_mandir}/man*/abrt-dedup-client.*
%files retrace-client %{_bindir}/abrt-retrace-client @@ -740,7 +748,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_bindir}/abrt-dump-oops %{_bindir}/abrt-action-analyze-oops %{_bindir}/abrt-action-save-kernel-data +%{_mandir}/man1/abrt-dump-oops.1* %{_mandir}/man1/abrt-action-analyze-oops.1* +%{_mandir}/man1/abrt-action-save-kernel-data.1*
%files addon-xorg %defattr(-,root,root,-) @@ -751,6 +761,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_initrddir}/abrt-xorg %endif %{_bindir}/abrt-dump-xorg +%{_mandir}/man1/abrt-dump-xorg.1*
%files addon-vmcore %defattr(-,root,root,-) @@ -764,6 +775,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %{_sbindir}/abrt-harvest-vmcore %{_bindir}/abrt-action-analyze-vmcore +%{_mandir}/man1/abrt-harvest-vmcore.1* %{_mandir}/man1/abrt-action-analyze-vmcore.1*
%files addon-uefioops @@ -775,6 +787,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %{_sbindir}/abrt-harvest-uefioops %{_bindir}/abrt-merge-uefioops +%{_mandir}/man1/abrt-harvest-uefioops.1* +%{_mandir}/man1/abrt-merge-uefioops.1*
%files addon-python %defattr(-,root,root,-) @@ -807,6 +821,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files dbus %defattr(-,root,root,-) %{_sbindir}/abrt-dbus +%{_mandir}/man8/abrt-dbus.8.gz %config(noreplace) %{_sysconfdir}/dbus-1/system.d/dbus-abrt.conf %{_datadir}/dbus-1/interfaces/org.freedesktop.Problems.xml %{_datadir}/dbus-1/system-services/org.freedesktop.problems.service
Related to #669
Signed-off-by: Jakub Filak jfilak@redhat.com --- src/hooks/abrt_exception_handler.py.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/hooks/abrt_exception_handler.py.in b/src/hooks/abrt_exception_handler.py.in index 774a586..4ed34fd 100644 --- a/src/hooks/abrt_exception_handler.py.in +++ b/src/hooks/abrt_exception_handler.py.in @@ -16,7 +16,7 @@
## You should have received a copy of the GNU General Public License ## along with this program; if not, write to the Free Software -## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +## Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
""" Module for the ABRT exception handling hook
Related to #669
Signed-off-by: Jakub Filak jfilak@redhat.com --- abrt.spec.in | 12 ------------ 1 file changed, 12 deletions(-)
diff --git a/abrt.spec.in b/abrt.spec.in index 20fb9c1..bb099a9 100644 --- a/abrt.spec.in +++ b/abrt.spec.in @@ -80,11 +80,6 @@ Requires: %{systemd_units} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-libs = %{version}-%{release} Requires(pre): %{shadow_utils} -Obsoletes: abrt-plugin-sqlite3 > 0.0.1 -# required for transition from 1.1.13, can be removed after some time -Obsoletes: abrt-plugin-runapp > 0.0.1 -Obsoletes: abrt-plugin-filetransfer > 0.0.1 -Obsoletes: abrt-plugin-sosreport > 0.0.1
%description %{name} is a tool to help users to detect defects in applications and @@ -156,11 +151,7 @@ Group: System Environment/Libraries Requires: curl Requires: %{name} = %{version}-%{release} Requires: libreport-plugin-kerneloops >= %{libreport_ver} - Requires: abrt-libs = %{version}-%{release} -Obsoletes: kerneloops > 0.0.1 -Obsoletes: abrt-plugin-kerneloops > 0.0.1 -Obsoletes: abrt-plugin-kerneloopsreporter > 0.0.1
%description addon-kerneloops This package contains plugin for collecting kernel crash information from @@ -216,8 +207,6 @@ Summary: %{name}'s addon for catching and analyzing Python exceptions Group: System Environment/Libraries Requires: python Requires: %{name} = %{version}-%{release} -Obsoletes: gnome-python2-bugbuddy > 0.0.1 -Provides: gnome-python2-bugbuddy
%description addon-python This package contains python hook and python analyzer plugin for handling @@ -294,7 +283,6 @@ Requires: libreport-fedora >= %{libreport_ver} Requires: libreport-rhel >= %{libreport_ver} %endif #Requires: abrt-plugin-firefox -Obsoletes: bug-buddy > 0.0.1 Provides: bug-buddy
%description desktop
I about to send the rebased versions of these patches ...
On Wed, 2013-07-10 at 15:58 +0200, Jakub Filak wrote:
Related to abrt/abrt#668
Signed-off-by: Jakub Filak jfilak@redhat.com
configure.ac | 12 +++++++----- libreport.spec.in | 38 +++++++++++++++++++++----------------- src/plugins/Makefile.am | 15 ++++++++++----- src/workflows/Makefile.am | 6 +++--- 4 files changed, 41 insertions(+), 30 deletions(-)
diff --git a/configure.ac b/configure.ac index 671d6a4..bad3aa6 100644 --- a/configure.ac +++ b/configure.ac @@ -216,10 +216,11 @@ CONF_DIR='${sysconfdir}/${PACKAGE_NAME}' VAR_RUN='${localstatedir}/run' PLUGINS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/plugins' REPORT_PLUGINS_CONF_DIR='${sysconfdir}/libreport/plugins' -EVENTS_DIR='${sysconfdir}/${PACKAGE_NAME}/events' -EVENTS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/events.d' -WORKFLOWS_DIR='${sysconfdir}/${PACKAGE_NAME}/workflows' -WORKFLOWS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/workflows.d' +EVENTS_DIR='${pkgdatadir}/events' +EVENTS_DEFINITION_DIR='${sysconfdir}/${PACKAGE_NAME}/events.d' +EVENTS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/events' +WORKFLOWS_DIR='${pkgdatadir}/workflows' +WORKFLOWS_DEFINITION_DIR='${sysconfdir}/${PACKAGE_NAME}/workflows.d' PLUGINS_LIB_DIR='${libdir}/${PACKAGE_NAME}' LIBEXEC_DIR='${libexecdir}'
@@ -276,13 +277,14 @@ AC_SUBST(CONF_DIR) AC_SUBST(VAR_RUN) AC_SUBST(PLUGINS_CONF_DIR) AC_SUBST(REPORT_PLUGINS_CONF_DIR) +AC_SUBST(EVENTS_DEFINITION_DIR) AC_SUBST(EVENTS_CONF_DIR) AC_SUBST(EVENTS_DIR) AC_SUBST(PLUGINS_LIB_DIR) AC_SUBST(DEBUG_DUMPS_DIR) AC_SUBST(LIBEXEC_DIR) AC_SUBST(WORKFLOWS_DIR) -AC_SUBST(WORKFLOWS_CONF_DIR) +AC_SUBST(WORKFLOWS_DEFINITION_DIR) AC_SUBST(DUMP_DIR_OWNED_BY_USER)
# Initialize the test suite. diff --git a/libreport.spec.in b/libreport.spec.in index 539e5f1..df37227 100644 --- a/libreport.spec.in +++ b/libreport.spec.in @@ -311,6 +311,8 @@ find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f mkdir -p $RPM_BUILD_ROOT/%{_initrddir} mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/events.d/ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/events/ +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/events/ +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/workflows/
# After everything is installed, remove info dir rm -f $RPM_BUILD_ROOT/%{_infodir}/dir @@ -354,6 +356,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %dir %{_sysconfdir}/%{name}/ %dir %{_sysconfdir}/%{name}/events.d/ %dir %{_sysconfdir}/%{name}/events/ +%dir %{_datadir}/%{name}/events/ +%dir %{_datadir}/%{name}/workflows/ %dir %{_sysconfdir}/%{name}/plugins/
%files devel @@ -408,7 +412,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_libexecdir}/abrt-screencast %{_libdir}/libreport-gtk.so.* %config(noreplace) %{_sysconfdir}/libreport/events.d/emergencyanalysis_event.conf -%config(noreplace) %{_sysconfdir}/libreport/events/report_EmergencyAnalysis.xml +%{_datadir}/%{name}/events/report_EmergencyAnalysis.xml
%files gtk-devel %defattr(-,root,root,-) @@ -418,14 +422,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files plugin-kerneloops %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/libreport/events/report_Kerneloops.xml +%{_datadir}/%{name}/events/report_Kerneloops.xml %{_mandir}/man*/reporter-kerneloops.* %{_bindir}/reporter-kerneloops
%files plugin-logger %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/libreport/events/report_Logger.conf -%config(noreplace) %{_sysconfdir}/libreport/events/report_Logger.xml +%{_datadir}/%{name}/events/report_Logger.xml %config(noreplace) %{_sysconfdir}/libreport/events.d/print_event.conf %{_bindir}/reporter-print %{_mandir}/man*/reporter-print.* @@ -433,7 +437,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files plugin-mailx %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/libreport/plugins/mailx.conf -%config(noreplace) %{_sysconfdir}/libreport/events/report_Mailx.xml +%{_datadir}/%{name}/events/report_Mailx.xml %config(noreplace) %{_sysconfdir}/libreport/events.d/mailx_event.conf %{_mandir}/man*/reporter-mailx.* %{_bindir}/reporter-mailx @@ -442,7 +446,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %defattr(-,root,root,-) %{_bindir}/reporter-ureport #%{_mandir}/man1/reporter-ureport.1.gz -%config(noreplace) %{_sysconfdir}/libreport/events/report_uReport.xml +%{_datadir}/%{name}/events/report_uReport.xml
%if %{with bugzilla} %files plugin-bugzilla @@ -452,7 +456,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_formatdup.conf %config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_format_libreport.conf %config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_format_kernel.conf -%config(noreplace) %{_sysconfdir}/libreport/events/report_Bugzilla.xml +%{_datadir}/%{name}/events/report_Bugzilla.xml %config(noreplace) %{_sysconfdir}/libreport/events/report_Bugzilla.conf %config(noreplace) %{_sysconfdir}/libreport/events.d/bugzilla_event.conf # FIXME: remove with the old gui @@ -463,7 +467,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files plugin-rhtsupport %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/libreport/plugins/rhtsupport.conf -%config(noreplace) %{_sysconfdir}/libreport/events/report_RHTSupport.xml +%{_datadir}/%{name}/events/report_RHTSupport.xml %config(noreplace) %{_sysconfdir}/libreport/events.d/rhtsupport_event.conf %{_mandir}/man1/reporter-rhtsupport.1.gz %{_bindir}/reporter-rhtsupport @@ -479,29 +483,29 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %defattr(-,root,root,-) %{_mandir}/man*/reporter-upload.* %{_bindir}/reporter-upload -%config(noreplace) %{_sysconfdir}/libreport/events/report_Uploader.xml +%{_datadir}/%{name}/events/report_Uploader.xml %config(noreplace) %{_sysconfdir}/libreport/events.d/uploader_event.conf -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_Upload.xml +%{_datadir}/%{name}/workflows/workflow_Upload.xml
%files fedora %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_Fedora.xml +%{_datadir}/%{name}/workflows/workflow_Fedora.xml %config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_fedora.conf
%files rhel %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELCCpp.xml -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELKerneloops.xml -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELPython.xml -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELvmcore.xml -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELxorg.xml +%{_datadir}/%{name}/workflows/workflow_RHELCCpp.xml +%{_datadir}/%{name}/workflows/workflow_RHELKerneloops.xml +%{_datadir}/%{name}/workflows/workflow_RHELPython.xml +%{_datadir}/%{name}/workflows/workflow_RHELvmcore.xml +%{_datadir}/%{name}/workflows/workflow_RHELxorg.xml %config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_rhel.conf
%if %{with bugzilla} %files anaconda %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_AnacondaFedora.xml -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_AnacondaUpload.xml +%{_datadir}/%{name}/workflows/workflow_AnacondaFedora.xml +%{_datadir}/%{name}/workflows/workflow_AnacondaUpload.xml %config(noreplace) %{_sysconfdir}/libreport/workflows.d/anaconda_event.conf %config(noreplace) %{_sysconfdir}/libreport/events.d/bugzilla_anaconda_event.conf %config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_format_anaconda.conf diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am index 4bca629..166604c 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am @@ -39,10 +39,13 @@ dist_reportpluginsconf_DATA = $(reporters_plugin_conf) \ mailx.conf
eventsdir = $(EVENTS_DIR) +eventsconfdir = $(EVENTS_CONF_DIR)
reporters_events = +reporters_events_conf = if BUILD_BUGZILLA -reporters_events += report_Bugzilla.xml report_Bugzilla.conf +reporters_events += report_Bugzilla.xml +reporters_events_conf += report_Bugzilla.conf endif
if BUILD_UREPORT @@ -50,7 +53,6 @@ reporters_events += report_uReport.xml endif
dist_events_DATA = $(reporters_events) \
- report_Logger.conf \ report_Logger.xml \ report_Mailx.xml \ report_RHTSupport.xml \
@@ -58,11 +60,14 @@ dist_events_DATA = $(reporters_events) \ report_Uploader.xml \ report_EmergencyAnalysis.xml
+dist_eventsconf_DATA = $(reporters_events_conf) \
- report_Logger.conf
@INTLTOOL_XML_RULE@
-eventsconfdir = $(EVENTS_CONF_DIR) +eventsdefdir = $(EVENTS_DEFINITION_DIR)
-dist_eventsconf_DATA = \ +dist_eventsdef_DATA = \ mailx_event.conf \ print_event.conf \ rhtsupport_event.conf \ @@ -71,7 +76,7 @@ dist_eventsconf_DATA = \
reporters_extra_dist = if BUILD_BUGZILLA -dist_eventsconf_DATA += bugzilla_event.conf bugzilla_anaconda_event.conf +dist_eventsdef_DATA += bugzilla_event.conf bugzilla_anaconda_event.conf reporters_extra_dist += report_Bugzilla.xml.in report_Bugzilla.conf endif
diff --git a/src/workflows/Makefile.am b/src/workflows/Makefile.am index 45ba7e0..9e53c8c 100644 --- a/src/workflows/Makefile.am +++ b/src/workflows/Makefile.am @@ -15,14 +15,14 @@ dist_workflows_DATA += \ workflow_AnacondaUpload.xml endif
-workflowsconfdir = $(WORKFLOWS_CONF_DIR) +workflowsdefdir = $(WORKFLOWS_DEFINITION_DIR)
-dist_workflowsconf_DATA =\ +dist_workflowsdef_DATA =\ report_fedora.conf \ report_rhel.conf
if BUILD_BUGZILLA -dist_workflowsconf_DATA += \ +dist_workflowsdef_DATA += \ anaconda_event.conf endif
Related to abrt/abrt#668
Signed-off-by: Jakub Filak jfilak@redhat.com --- configure.ac | 12 +++++++----- libreport.spec.in | 38 +++++++++++++++++++++----------------- src/plugins/Makefile.am | 15 ++++++++++----- src/workflows/Makefile.am | 6 +++--- 4 files changed, 41 insertions(+), 30 deletions(-)
diff --git a/configure.ac b/configure.ac index da7f480..5365c2a 100644 --- a/configure.ac +++ b/configure.ac @@ -200,10 +200,11 @@ CONF_DIR='${sysconfdir}/${PACKAGE_NAME}' VAR_RUN='${localstatedir}/run' PLUGINS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/plugins' REPORT_PLUGINS_CONF_DIR='${sysconfdir}/libreport/plugins' -EVENTS_DIR='${sysconfdir}/${PACKAGE_NAME}/events' -EVENTS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/events.d' -WORKFLOWS_DIR='${sysconfdir}/${PACKAGE_NAME}/workflows' -WORKFLOWS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/workflows.d' +EVENTS_DIR='${pkgdatadir}/events' +EVENTS_DEFINITION_DIR='${sysconfdir}/${PACKAGE_NAME}/events.d' +EVENTS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/events' +WORKFLOWS_DIR='${pkgdatadir}/workflows' +WORKFLOWS_DEFINITION_DIR='${sysconfdir}/${PACKAGE_NAME}/workflows.d' PLUGINS_LIB_DIR='${libdir}/${PACKAGE_NAME}' LIBEXEC_DIR='${libexecdir}'
@@ -260,13 +261,14 @@ AC_SUBST(CONF_DIR) AC_SUBST(VAR_RUN) AC_SUBST(PLUGINS_CONF_DIR) AC_SUBST(REPORT_PLUGINS_CONF_DIR) +AC_SUBST(EVENTS_DEFINITION_DIR) AC_SUBST(EVENTS_CONF_DIR) AC_SUBST(EVENTS_DIR) AC_SUBST(PLUGINS_LIB_DIR) AC_SUBST(DEBUG_DUMPS_DIR) AC_SUBST(LIBEXEC_DIR) AC_SUBST(WORKFLOWS_DIR) -AC_SUBST(WORKFLOWS_CONF_DIR) +AC_SUBST(WORKFLOWS_DEFINITION_DIR) AC_SUBST(DUMP_DIR_OWNED_BY_USER)
# Initialize the test suite. diff --git a/libreport.spec.in b/libreport.spec.in index 972b3be..2a91739 100644 --- a/libreport.spec.in +++ b/libreport.spec.in @@ -310,6 +310,8 @@ find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f mkdir -p $RPM_BUILD_ROOT/%{_initrddir} mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/events.d/ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/events/ +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/events/ +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/workflows/
# After everything is installed, remove info dir rm -f $RPM_BUILD_ROOT/%{_infodir}/dir @@ -353,6 +355,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %dir %{_sysconfdir}/%{name}/ %dir %{_sysconfdir}/%{name}/events.d/ %dir %{_sysconfdir}/%{name}/events/ +%dir %{_datadir}/%{name}/events/ +%dir %{_datadir}/%{name}/workflows/ %dir %{_sysconfdir}/%{name}/plugins/
%files devel @@ -407,7 +411,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_libexecdir}/abrt-screencast %{_libdir}/libreport-gtk.so.* %config(noreplace) %{_sysconfdir}/libreport/events.d/emergencyanalysis_event.conf -%config(noreplace) %{_sysconfdir}/libreport/events/report_EmergencyAnalysis.xml +%{_datadir}/%{name}/events/report_EmergencyAnalysis.xml
%files gtk-devel %defattr(-,root,root,-) @@ -417,14 +421,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files plugin-kerneloops %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/libreport/events/report_Kerneloops.xml +%{_datadir}/%{name}/events/report_Kerneloops.xml %{_mandir}/man*/reporter-kerneloops.* %{_bindir}/reporter-kerneloops
%files plugin-logger %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/libreport/events/report_Logger.conf -%config(noreplace) %{_sysconfdir}/libreport/events/report_Logger.xml +%{_datadir}/%{name}/events/report_Logger.xml %config(noreplace) %{_sysconfdir}/libreport/events.d/print_event.conf %{_bindir}/reporter-print %{_mandir}/man*/reporter-print.* @@ -432,7 +436,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files plugin-mailx %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/libreport/plugins/mailx.conf -%config(noreplace) %{_sysconfdir}/libreport/events/report_Mailx.xml +%{_datadir}/%{name}/events/report_Mailx.xml %config(noreplace) %{_sysconfdir}/libreport/events.d/mailx_event.conf %{_mandir}/man*/reporter-mailx.* %{_bindir}/reporter-mailx @@ -441,7 +445,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %defattr(-,root,root,-) %{_bindir}/reporter-ureport #%{_mandir}/man1/reporter-ureport.1.gz -%config(noreplace) %{_sysconfdir}/libreport/events/report_uReport.xml +%{_datadir}/%{name}/events/report_uReport.xml
%if %{with bugzilla} %files plugin-bugzilla @@ -451,7 +455,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_formatdup.conf %config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_format_libreport.conf %config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_format_kernel.conf -%config(noreplace) %{_sysconfdir}/libreport/events/report_Bugzilla.xml +%{_datadir}/%{name}/events/report_Bugzilla.xml %config(noreplace) %{_sysconfdir}/libreport/events/report_Bugzilla.conf %config(noreplace) %{_sysconfdir}/libreport/events.d/bugzilla_event.conf # FIXME: remove with the old gui @@ -462,7 +466,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files plugin-rhtsupport %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/libreport/plugins/rhtsupport.conf -%config(noreplace) %{_sysconfdir}/libreport/events/report_RHTSupport.xml +%{_datadir}/%{name}/events/report_RHTSupport.xml %config(noreplace) %{_sysconfdir}/libreport/events.d/rhtsupport_event.conf %{_mandir}/man1/reporter-rhtsupport.1.gz %{_bindir}/reporter-rhtsupport @@ -478,29 +482,29 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %defattr(-,root,root,-) %{_mandir}/man*/reporter-upload.* %{_bindir}/reporter-upload -%config(noreplace) %{_sysconfdir}/libreport/events/report_Uploader.xml +%{_datadir}/%{name}/events/report_Uploader.xml %config(noreplace) %{_sysconfdir}/libreport/events.d/uploader_event.conf -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_Upload.xml +%{_datadir}/%{name}/workflows/workflow_Upload.xml
%files fedora %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_Fedora.xml +%{_datadir}/%{name}/workflows/workflow_Fedora.xml %config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_fedora.conf
%files rhel %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELCCpp.xml -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELKerneloops.xml -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELPython.xml -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELvmcore.xml -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELxorg.xml +%{_datadir}/%{name}/workflows/workflow_RHELCCpp.xml +%{_datadir}/%{name}/workflows/workflow_RHELKerneloops.xml +%{_datadir}/%{name}/workflows/workflow_RHELPython.xml +%{_datadir}/%{name}/workflows/workflow_RHELvmcore.xml +%{_datadir}/%{name}/workflows/workflow_RHELxorg.xml %config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_rhel.conf
%if %{with bugzilla} %files anaconda %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_AnacondaFedora.xml -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_AnacondaUpload.xml +%{_datadir}/%{name}/workflows/workflow_AnacondaFedora.xml +%{_datadir}/%{name}/workflows/workflow_AnacondaUpload.xml %config(noreplace) %{_sysconfdir}/libreport/workflows.d/anaconda_event.conf %config(noreplace) %{_sysconfdir}/libreport/events.d/bugzilla_anaconda_event.conf %config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_format_anaconda.conf diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am index 4bca629..166604c 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am @@ -39,10 +39,13 @@ dist_reportpluginsconf_DATA = $(reporters_plugin_conf) \ mailx.conf
eventsdir = $(EVENTS_DIR) +eventsconfdir = $(EVENTS_CONF_DIR)
reporters_events = +reporters_events_conf = if BUILD_BUGZILLA -reporters_events += report_Bugzilla.xml report_Bugzilla.conf +reporters_events += report_Bugzilla.xml +reporters_events_conf += report_Bugzilla.conf endif
if BUILD_UREPORT @@ -50,7 +53,6 @@ reporters_events += report_uReport.xml endif
dist_events_DATA = $(reporters_events) \ - report_Logger.conf \ report_Logger.xml \ report_Mailx.xml \ report_RHTSupport.xml \ @@ -58,11 +60,14 @@ dist_events_DATA = $(reporters_events) \ report_Uploader.xml \ report_EmergencyAnalysis.xml
+dist_eventsconf_DATA = $(reporters_events_conf) \ + report_Logger.conf + @INTLTOOL_XML_RULE@
-eventsconfdir = $(EVENTS_CONF_DIR) +eventsdefdir = $(EVENTS_DEFINITION_DIR)
-dist_eventsconf_DATA = \ +dist_eventsdef_DATA = \ mailx_event.conf \ print_event.conf \ rhtsupport_event.conf \ @@ -71,7 +76,7 @@ dist_eventsconf_DATA = \
reporters_extra_dist = if BUILD_BUGZILLA -dist_eventsconf_DATA += bugzilla_event.conf bugzilla_anaconda_event.conf +dist_eventsdef_DATA += bugzilla_event.conf bugzilla_anaconda_event.conf reporters_extra_dist += report_Bugzilla.xml.in report_Bugzilla.conf endif
diff --git a/src/workflows/Makefile.am b/src/workflows/Makefile.am index 45ba7e0..9e53c8c 100644 --- a/src/workflows/Makefile.am +++ b/src/workflows/Makefile.am @@ -15,14 +15,14 @@ dist_workflows_DATA += \ workflow_AnacondaUpload.xml endif
-workflowsconfdir = $(WORKFLOWS_CONF_DIR) +workflowsdefdir = $(WORKFLOWS_DEFINITION_DIR)
-dist_workflowsconf_DATA =\ +dist_workflowsdef_DATA =\ report_fedora.conf \ report_rhel.conf
if BUILD_BUGZILLA -dist_workflowsconf_DATA += \ +dist_workflowsdef_DATA += \ anaconda_event.conf endif
Related to abrt/abrt#669
Signed-off-by: Jakub Filak jfilak@redhat.com --- libreport.spec.in | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/libreport.spec.in b/libreport.spec.in index 2a91739..4ae926d 100644 --- a/libreport.spec.in +++ b/libreport.spec.in @@ -76,7 +76,7 @@ Development libraries and headers for libreport
%package web Summary: Library providing network API for libreport -Group: Libraries +Group: System Environment/Libraries Requires: libreport = %{version}-%{release}
%description web @@ -253,6 +253,7 @@ Plugin to report bugs into anonymous FTP site associated with ticketing system. %package fedora Summary: Default configuration for reporting bugs via Fedora infrastructure Group: Applications/File +Requires: %{name} = %{version}-%{release}
%description fedora Default configuration for reporting bugs via Fedora infrastructure @@ -262,6 +263,7 @@ install this package and you're done. %package rhel Summary: Default configuration for reporting bugs via Red Hat infrastructure Group: Applications/File +Requires: %{name} = %{version}-%{release}
%description rhel Default configuration for reporting bugs via Red Hat infrastructure @@ -272,8 +274,9 @@ install this package and you're done. %package anaconda Summary: Default configuration for reporting anaconda bugs Group: Applications/File -Requires: libreport-plugin-reportuploader -Requires: libreport-plugin-bugzilla +Requires: %{name} = %{version}-%{release} +Requires: libreport-plugin-reportuploader = %{version}-%{release} +Requires: libreport-plugin-bugzilla = %{version}-%{release}
%description anaconda Default configuration for reporting Anaconda problems using Fedora @@ -341,6 +344,13 @@ fi %posttrans gtk gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+ +%post web -p /sbin/ldconfig + + +%postun web -p /sbin/ldconfig + + %files -f %{name}.lang %defattr(-,root,root,-) %doc README COPYING @@ -384,10 +394,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files web %defattr(-,root,root,-) -%{_libdir}/libreport-web.so* +%{_libdir}/libreport-web.so.*
%files web-devel %defattr(-,root,root,-) +%{_libdir}/libreport-web.so %{_includedir}/libreport/libreport_curl.h %{_libdir}/pkgconfig/libreport-web.pc
Related to abrt/abrt#672
Signed-off-by: Jakub Filak jfilak@redhat.com --- doc/Makefile.am | 3 +++ doc/report-gtk.txt | 44 ++++++++++++++++++++++++++++++++++++++++++++ doc/report-newt.txt | 27 +++++++++++++++++++++++++++ doc/reporter-ureport.txt | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 121 insertions(+) create mode 100644 doc/report-gtk.txt create mode 100644 doc/report-newt.txt create mode 100644 doc/reporter-ureport.txt
diff --git a/doc/Makefile.am b/doc/Makefile.am index b52a043..11e2c4d 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -9,6 +9,8 @@ XMLTO_SILENT_0 = @echo " XMLTO " $@;
MAN1_TXT = MAN1_TXT += report-cli.txt +MAN1_TXT += report-newt.txt +MAN1_TXT += report-gtk.txt
if BUILD_BUGZILLA MAN1_TXT += reporter-bugzilla.txt @@ -20,6 +22,7 @@ MAN1_TXT += reporter-mailx.txt MAN1_TXT += reporter-print.txt MAN1_TXT += reporter-rhtsupport.txt MAN1_TXT += reporter-upload.txt +MAN1_TXT += reporter-ureport.txt
MAN5_TXT = MAN5_TXT += report_event.conf.txt diff --git a/doc/report-gtk.txt b/doc/report-gtk.txt new file mode 100644 index 0000000..20e3685 --- /dev/null +++ b/doc/report-gtk.txt @@ -0,0 +1,44 @@ +report-gtk(1) +=========== + +NAME +---- +report-gtk - GUI tool to analyze and report ABRT problems + +SYNOPSIS +-------- +'report-gtk' [-vpdx] [-e EVENT] [-g GUI_FILE] PROBLEM_DIR + +DESCRIPTION +----------- +'report-gtk' is a graphical tool that reports application crashes and other +problems caught by abrtd daemon, or created by other programs using libreport. +report-gtk works with a single problem saved in specified PROBLEM_DIR. +In the expert mode it enables access to and manipulation of problem data. + +OPTIONS +------- +-d, --delete:: + Remove PROBLEM_DIR after reporting + +-e EVENT:: + Run only theset EVENTs on PROBLEM_DIR + +-g FILE:: + Alternate GUI file + +-p:: + Add program names to log + +-v, --verbose:: + Be verbose + +-V, --version:: + Display version and exit + +-x, --expert:: + Enabled advanced features + +AUTHORS +------- +* ABRT team diff --git a/doc/report-newt.txt b/doc/report-newt.txt new file mode 100644 index 0000000..63e8ed0 --- /dev/null +++ b/doc/report-newt.txt @@ -0,0 +1,27 @@ +report-newt(1) +============ + +NAME +---- +report-newt - Reports ABRT problem to various bug tracking tools. + +SYNOPSIS +-------- +'report-newt' [-d] PROBLEM_DIR + +DESCRIPTION +----------- +'report-newt' is a command line tool that reports application crashes and other +problems caught by abrtd daemon, or created by other programs using libreport. + +OPTIONS +------- +-d, --delete:: + Remove PROBLEM_DIR after reporting + +-V, --version:: + Display version and exit + +AUTHORS +------- +* ABRT team diff --git a/doc/reporter-ureport.txt b/doc/reporter-ureport.txt new file mode 100644 index 0000000..1da336d --- /dev/null +++ b/doc/reporter-ureport.txt @@ -0,0 +1,47 @@ +reporter-ureport(1) +================= + +NAME +---- +reporter-ureport - Reports ABRT problems in format of micro report + +SYNOPSIS +-------- +'reporter-ureport' [-v] [-u URL] [-k] [-a bthash -b bug-id] [-r] [-d DIR] + +DESCRIPTION +----------- +The tool reads problem directory DIR, assembles an micro report from the loaded +problem data and sends the micro report to uReport server for updating +statistics and fast analysis. The results of the analysis are stored in problem +data in form of problems elements. 'reporter-ureport' updates 'reported_to' +element with links to duplicates and saves solutions in 'not-reportable' element. + + +OPTIONS +------- +-a, --attach BTHASH:: + bthash of uReport to attach + +-b, --bug-id NUM:: + Attach RHBZ bug (requires -a) + +-d DIR:: + Path to problem directory. + +-k,--insecure:: + Allow insecure connection to ureport server + +-r, --attach-reported-to:: + Attach contents of reported_to + +-v:: + Be more verbose. Can be given multiple times. + +-u, --url URL:: + Specify server URL + + +AUTHORS +------- +* ABRT team
Related to abrt/abrt#672
Signed-off-by: Jakub Filak jfilak@redhat.com --- libreport.spec.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libreport.spec.in b/libreport.spec.in index 4ae926d..a9b134d 100644 --- a/libreport.spec.in +++ b/libreport.spec.in @@ -415,6 +415,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files newt %defattr(-,root,root,-) %{_bindir}/report-newt +%{_mandir}/man1/report-newt.1.gz
%files gtk %defattr(-,root,root,-) @@ -423,6 +424,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_libdir}/libreport-gtk.so.* %config(noreplace) %{_sysconfdir}/libreport/events.d/emergencyanalysis_event.conf %{_datadir}/%{name}/events/report_EmergencyAnalysis.xml +%{_mandir}/man1/report-gtk.1.gz
%files gtk-devel %defattr(-,root,root,-) @@ -455,7 +457,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files plugin-ureport %defattr(-,root,root,-) %{_bindir}/reporter-ureport -#%{_mandir}/man1/reporter-ureport.1.gz +%{_mandir}/man1/reporter-ureport.1.gz %{_datadir}/%{name}/events/report_uReport.xml
%if %{with bugzilla}
Related to abrt/abrt#669
Signed-off-by: Jakub Filak jfilak@redhat.com --- libreport.spec.in | 21 --------------------- 1 file changed, 21 deletions(-)
diff --git a/libreport.spec.in b/libreport.spec.in index a9b134d..0d30cc5 100644 --- a/libreport.spec.in +++ b/libreport.spec.in @@ -164,11 +164,6 @@ server, usually to kerneloops.org. Summary: %{name}'s logger reporter plugin Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} -Obsoletes: abrt-plugin-logger < 2.0.4 -Provides: report-plugin-localsave = 0:0.23-1 -Obsoletes: report-plugin-localsave < 0:0.23-1 -Provides: report-config-localsave = 0:0.23-1 -Obsoletes: report-config-localsave < 0:0.23-1
%description plugin-logger The simple reporter plugin which writes a report to a specified file. @@ -178,7 +173,6 @@ Summary: %{name}'s mailx reporter plugin Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Requires: mailx -Obsoletes: abrt-plugin-mailx < 2.0.4
%description plugin-mailx The simple reporter plugin which sends a report via mailx to a specified @@ -190,11 +184,6 @@ Summary: %{name}'s bugzilla plugin Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Requires: libreport-web = %{version}-%{release} -Obsoletes: abrt-plugin-bugzilla < 2.0.4 -Provides: report-plugin-bugzilla = 0:0.23-1 -Obsoletes: report-plugin-bugzilla < 0:0.23-1 -Provides: report-config-bugzilla-redhat-com = 0:0.23-1 -Obsoletes: report-config-bugzilla-redhat-com < 0:0.23-1
%description plugin-bugzilla Plugin to report bugs into the bugzilla. @@ -215,7 +204,6 @@ Summary: %{name}'s RHTSupport plugin Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Requires: libreport-web = %{version}-%{release} -Obsoletes: abrt-plugin-rhtsupport < 2.0.4
%description plugin-rhtsupport Plugin to report bugs into RH support system. @@ -237,15 +225,6 @@ Summary: %{name}'s reportuploader plugin Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Requires: libreport-web = %{version}-%{release} -Obsoletes: abrt-plugin-reportuploader < 2.0.4 -Provides: report-plugin-ftp = 0:0.23-1 -Obsoletes: report-plugin-ftp < 0:0.23-1 -Provides: report-config-ftp = 0:0.23-1 -Obsoletes: report-config-ftp < 0:0.23-1 -Provides: report-plugin-scp = 0:0.23-1 -Obsoletes: report-plugin-scp < 0:0.23-1 -Provides: report-config-scp = 0:0.23-1 -Obsoletes: report-config-scp < 0:0.23-1
%description plugin-reportuploader Plugin to report bugs into anonymous FTP site associated with ticketing system.
Closes #668
Signed-off-by: Jakub Filak jfilak@redhat.com --- abrt.spec.in | 18 +++++++++--------- configure.ac | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/abrt.spec.in b/abrt.spec.in index 7bf9349..033622c 100644 --- a/abrt.spec.in +++ b/abrt.spec.in @@ -698,13 +698,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %config(noreplace) %{_sysconfdir}/libreport/events.d/ccpp_event.conf %config(noreplace) %{_sysconfdir}/libreport/events.d/gconf_event.conf %config(noreplace) %{_sysconfdir}/libreport/events.d/vimrc_event.conf -%config(noreplace) %{_sysconfdir}/libreport/events/analyze_CCpp.xml -%config(noreplace) %{_sysconfdir}/libreport/events/analyze_LocalGDB.xml -%config(noreplace) %{_sysconfdir}/libreport/events/collect_xsession_errors.xml -%config(noreplace) %{_sysconfdir}/libreport/events/collect_GConf.xml -%config(noreplace) %{_sysconfdir}/libreport/events/collect_vimrc_user.xml -%config(noreplace) %{_sysconfdir}/libreport/events/collect_vimrc_system.xml -%config(noreplace) %{_sysconfdir}/libreport/events/post_report.xml +%{_datadir}/libreport/events/analyze_CCpp.xml +%{_datadir}/libreport/events/analyze_LocalGDB.xml +%{_datadir}/libreport/events/collect_xsession_errors.xml +%{_datadir}/libreport/events/collect_GConf.xml +%{_datadir}/libreport/events/collect_vimrc_user.xml +%{_datadir}/libreport/events/collect_vimrc_system.xml +%{_datadir}/libreport/events/post_report.xml %{_mandir}/man*/abrt-action-analyze-c.* %{_mandir}/man*/abrt-action-trim-files.* %{_mandir}/man*/abrt-action-generate-backtrace.* @@ -717,7 +717,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_bindir}/abrt-retrace-client %{_mandir}/man1/abrt-retrace-client.1.gz %config(noreplace) %{_sysconfdir}/libreport/events.d/ccpp_retrace_event.conf -%config(noreplace) %{_sysconfdir}/libreport/events/analyze_RetraceServer.xml +%{_datadir}/libreport/events/analyze_RetraceServer.xml
%files addon-kerneloops %defattr(-,root,root,-) @@ -746,7 +746,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/libreport/events.d/vmcore_event.conf %config(noreplace) %{_sysconfdir}/%{name}/abrt-harvest-vmcore.conf -%config(noreplace) %{_sysconfdir}/libreport/events/analyze_VMcore.xml +%{_datadir}/libreport/events/analyze_VMcore.xml %if %{with systemd} %{_unitdir}/abrt-vmcore.service %else diff --git a/configure.ac b/configure.ac index 7b32618..4e69519 100644 --- a/configure.ac +++ b/configure.ac @@ -127,7 +127,7 @@ AC_CHECK_HEADERS([locale.h]) CONF_DIR='${sysconfdir}/${PACKAGE_NAME}' VAR_RUN='${localstatedir}/run' PLUGINS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/plugins' -EVENTS_DIR='${sysconfdir}/libreport/events' +EVENTS_DIR='${datadir}/libreport/events' EVENTS_CONF_DIR='${sysconfdir}/libreport/events.d' ENABLE_SOCKET_OR_DBUS='-DENABLE_DBUS=1' DEFAULT_DUMP_DIR_MODE=$($PKG_CONFIG --variable=dd_mode libreport)
Related to #669
Signed-off-by: Jakub Filak jfilak@redhat.com --- abrt.spec.in | 57 ++++++++++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 25 deletions(-)
diff --git a/abrt.spec.in b/abrt.spec.in index 033622c..cd8462a 100644 --- a/abrt.spec.in +++ b/abrt.spec.in @@ -38,6 +38,8 @@ %define shadow_utils shadow-utils %endif
+%define libreport_ver 2.1.5 + Summary: Automatic bug detection and reporting tool Name: abrt Version: @@ABRT_VERSION@@ @@ -61,9 +63,9 @@ BuildRequires: %{nss_devel} BuildRequires: asciidoc BuildRequires: doxygen BuildRequires: xmlto -BuildRequires: libreport-devel >= 2.1.3 +BuildRequires: libreport-devel >= %{libreport_ver} BuildRequires: satyr-devel >= 0.4 -Requires: libreport >= 2.1.3 +Requires: libreport >= %{libreport_ver} Requires: satyr >= 0.4 # these only exist on suse %if 0%{?suse_version} @@ -109,7 +111,7 @@ Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} Requires: %{name}-dbus = %{version}-%{release} Requires: gnome-abrt -BuildRequires: libreport-gtk-devel +BuildRequires: libreport-gtk-devel >= %{libreport_ver} # we used to have abrt-applet, now abrt-gui includes it: Provides: abrt-applet = %{version}-%{release} Obsoletes: abrt-applet < 0.0.5 @@ -150,14 +152,16 @@ Summary: %{name}'s kerneloops addon Group: System Environment/Libraries Requires: curl Requires: %{name} = %{version}-%{release} -Requires: libreport-plugin-kerneloops +Requires: libreport-plugin-kerneloops >= %{libreport_ver} + Requires: abrt-libs = %{version}-%{release} Obsoletes: kerneloops > 0.0.1 Obsoletes: abrt-plugin-kerneloops > 0.0.1 Obsoletes: abrt-plugin-kerneloopsreporter > 0.0.1
%description addon-kerneloops -This package contains plugin for collecting kernel crash information from system log. +This package contains plugin for collecting kernel crash information from +system log.
%package addon-xorg Summary: %{name}'s Xorg addon @@ -167,7 +171,8 @@ Requires: %{name} = %{version}-%{release} Requires: abrt-libs = %{version}-%{release}
%description addon-xorg -This package contains plugin for collecting Xorg crash information from Xorg log. +This package contains plugin for collecting Xorg crash information from Xorg +log.
%package addon-vmcore Summary: %{name}'s vmcore addon @@ -177,7 +182,8 @@ Requires: abrt-addon-kerneloops Requires: crash
%description addon-vmcore -This package contains plugin for collecting kernel crash information from vmcore files. +This package contains plugin for collecting kernel crash information from +vmcore files.
%package addon-uefioops Summary: %{name}'s UEFI oops addon @@ -194,7 +200,7 @@ Summary: %{name}'s bodhi plugin BuildRequires: %{libjson_devel} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} -BuildRequires: libreport-web-devel >= 2.0.10 +BuildRequires: libreport-web-devel >= %{libreport_ver} Obsoletes: libreport-plugin-bodhi > 0.0.1 Provides: libreport-plugin-bodhi
@@ -218,15 +224,15 @@ uncaught exception in python programs. Summary: %{name}'s command line interface Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} -Requires: libreport-cli +Requires: libreport-cli >= %{libreport_ver} Requires: abrt-libs = %{version}-%{release}
%description tui -This package contains a simple command line client for processing abrt reports in -command line environment. +This package contains a simple command line client for processing abrt reports +in command line environment.
%package cli -Summary: Virtual package to install all necessary packages for usage from command line environment +Summary: Virtual package to make easy default installation on non-graphical environments Group: Applications/System Requires: %{name} = %{version}-%{release} Requires: abrt-tui @@ -241,16 +247,17 @@ Requires: abrt-retrace-client Requires: abrt-plugin-bodhi %endif %if 0%{!?suse_version:1} -Requires: libreport-plugin-bugzilla +Requires: libreport-plugin-bugzilla >= %{libreport_ver} %endif -Requires: libreport-plugin-logger -Requires: libreport-plugin-ureport +Requires: libreport-plugin-logger >= %{libreport_ver} +Requires: libreport-plugin-ureport >= %{libreport_ver}
%description cli -Virtual package to make easy default installation on non-graphical environments. +Virtual package to install all necessary packages for usage from command line +environment.
%package desktop -Summary: Virtual package to install all necessary packages for usage from desktop environment +Summary: Virtual package to make easy default installation on desktop environments Group: User Interface/Desktops # This package gets installed when anything requests bug-buddy - # happens when users upgrade Fn to Fn+1; @@ -273,28 +280,28 @@ Requires: gnome-abrt Requires: abrt-plugin-bodhi %endif %if 0%{!?suse_version:1} -Requires: libreport-plugin-bugzilla +Requires: libreport-plugin-bugzilla >= %{libreport_ver} %endif -Requires: libreport-plugin-logger -Requires: libreport-plugin-ureport +Requires: libreport-plugin-logger >= %{libreport_ver} +Requires: libreport-plugin-ureport >= %{libreport_ver} %if 0%{?fedora} -Requires: libreport-fedora +Requires: libreport-fedora >= %{libreport_ver} %endif %if 0%{?rhel} -Requires: libreport-rhel +Requires: libreport-rhel >= %{libreport_ver} %endif #Requires: abrt-plugin-firefox Obsoletes: bug-buddy > 0.0.1 Provides: bug-buddy
%description desktop -Virtual package to make easy default installation on desktop environments. +Virtual package to install all necessary packages for usage from desktop +environment.
%package dbus Summary: ABRT DBus service -Group: Application/System +Group: Applications/System Requires: %{name} = %{version}-%{release} -Requires: libreport BuildRequires: polkit-devel Requires: abrt-libs = %{version}-%{release}
Related to #672
Signed-off-by: Jakub Filak jfilak@redhat.com --- doc/Makefile.am | 15 +++++++++ doc/abrt-action-analyze-core.txt | 33 ++++++++++++++++++++ doc/abrt-action-analyze-vulnerability.txt | 24 ++++++++++++++ doc/abrt-action-analyze-xorg.txt | 47 ++++++++++++++++++++++++++++ doc/abrt-action-install-debuginfo.txt | 44 ++++++++++++++++++++++++++ doc/abrt-action-perform-ccpp-analysis.txt | 40 ++++++++++++++++++++++++ doc/abrt-action-save-kernel-data.txt | 33 ++++++++++++++++++++ doc/abrt-applet.txt | 33 ++++++++++++++++++++ doc/abrt-dedup-client.txt | 52 +++++++++++++++++++++++++++++++ doc/abrt-dump-oops.txt | 49 +++++++++++++++++++++++++++++ doc/abrt-dump-xorg.txt | 46 +++++++++++++++++++++++++++ doc/abrt-harvest-uefioops.txt | 25 +++++++++++++++ doc/abrt-harvest-vmcore.txt | 32 +++++++++++++++++++ doc/abrt-merge-uefioops.txt | 30 ++++++++++++++++++ doc/abrt-watch-log.txt | 34 ++++++++++++++++++++ doc/system-config-abrt.txt | 19 +++++++++++ 16 files changed, 556 insertions(+) create mode 100644 doc/abrt-action-analyze-core.txt create mode 100644 doc/abrt-action-analyze-vulnerability.txt create mode 100644 doc/abrt-action-analyze-xorg.txt create mode 100644 doc/abrt-action-install-debuginfo.txt create mode 100644 doc/abrt-action-perform-ccpp-analysis.txt create mode 100644 doc/abrt-action-save-kernel-data.txt create mode 100644 doc/abrt-applet.txt create mode 100644 doc/abrt-dedup-client.txt create mode 100644 doc/abrt-dump-oops.txt create mode 100644 doc/abrt-dump-xorg.txt create mode 100644 doc/abrt-harvest-uefioops.txt create mode 100644 doc/abrt-harvest-vmcore.txt create mode 100644 doc/abrt-merge-uefioops.txt create mode 100644 doc/abrt-watch-log.txt create mode 100644 doc/system-config-abrt.txt
diff --git a/doc/Makefile.am b/doc/Makefile.am index 94d8f8f..872d210 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -8,17 +8,32 @@ MAN1_TXT += abrt-action-trim-files.txt MAN1_TXT += abrt-action-generate-backtrace.txt MAN1_TXT += abrt-action-generate-core-backtrace.txt MAN1_TXT += abrt-action-analyze-backtrace.txt +MAN1_TXT += abrt-action-analyze-core.txt MAN1_TXT += abrt-action-analyze-oops.txt MAN1_TXT += abrt-action-analyze-python.txt +MAN1_TXT += abrt-action-analyze-xorg.txt +MAN1_TXT += abrt-action-analyze-vulnerability.txt +MAN1_TXT += abrt-action-install-debuginfo.txt MAN1_TXT += abrt-action-list-dsos.txt +MAN1_TXT += abrt-action-perform-ccpp-analysis.txt +MAN1_TXT += abrt-applet.txt +MAN1_TXT += abrt-dump-oops.txt +MAN1_TXT += abrt-dump-xorg.txt MAN1_TXT += abrt-retrace-client.txt MAN1_TXT += abrt-handle-upload.txt +MAN1_TXT += abrt-harvest-uefioops.txt +MAN1_TXT += abrt-harvest-vmcore.txt +MAN1_TXT += abrt-merge-uefioops.txt MAN1_TXT += abrt-server.txt +MAN1_TXT += abrt-dedup-client.txt MAN1_TXT += abrt-cli.txt MAN1_TXT += abrt-action-save-package-data.txt +MAN1_TXT += abrt-action-save-kernel-data.txt MAN1_TXT += abrt-install-ccpp-hook.txt MAN1_TXT += abrt-action-analyze-vmcore.txt MAN1_TXT += abrt-action-analyze-ccpp-local.txt +MAN1_TXT += abrt-watch-log.txt +MAN1_TXT += system-config-abrt.txt if BUILD_BODHI MAN1_TXT += abrt-bodhi.txt endif diff --git a/doc/abrt-action-analyze-core.txt b/doc/abrt-action-analyze-core.txt new file mode 100644 index 0000000..750be2d --- /dev/null +++ b/doc/abrt-action-analyze-core.txt @@ -0,0 +1,33 @@ +abrt-action-analyze-core(1) +============================= + +NAME +---- +abrt-action-analyze-core - Extracts builds from a core dump + +SYNOPSIS +-------- +'abrt-action-analyze-core' [-v] [-o OUTFILE] -c COREFILE + +DESCRIPTION +----------- +The tool reads a core dump and extracts build ids of loaded modules and prints +the list to the standard output if the OUTFILE file is not configured. + +OPTIONS +------- +-c COREFILE:: + Path to a core dump. + +-v:: + Be more verbose. Can be given multiple times. + +-o OUTFILE:: + Output file + +-h, --help:: + Prints help text + +AUTHORS +------- +* ABRT team diff --git a/doc/abrt-action-analyze-vulnerability.txt b/doc/abrt-action-analyze-vulnerability.txt new file mode 100644 index 0000000..8dc118f --- /dev/null +++ b/doc/abrt-action-analyze-vulnerability.txt @@ -0,0 +1,24 @@ +abrt-action-analyze-vulnerability(1) +================================== + +NAME +---- +abrt-action-analyze-vulnerability - Provides assessment of potential exploitability of crash + +SYNOPSIS +-------- +abrt-action-analyze-vulnerability + +DESCRIPTION +----------- +This tool expects that file named 'coredump' is placed in the current directory +and runs abrt-gdb-exploitable gdb plugin on that file. The result of +vulnerability analysis is saved in 'exploitable' file in the current directory. + +This tool requires both 'gdb' and 'eu-readelf' executables placed in PATH. If +any of the required programs is missing the tool silently exits with 0 exit +code. + +AUTHORS +------- +* ABRT team diff --git a/doc/abrt-action-analyze-xorg.txt b/doc/abrt-action-analyze-xorg.txt new file mode 100644 index 0000000..880c6fb --- /dev/null +++ b/doc/abrt-action-analyze-xorg.txt @@ -0,0 +1,47 @@ +abrt-action-analyze-xorg(1) +=========================== + +NAME +---- +abrt-action-analyze-xorg - Calculate and save UUID and duplicate hash +for a problem data directory DIR with Xorg backtrace. + +SYNOPSIS +-------- +'abrt-action-analyze-xorg' [-v] [-d DIR] + +DESCRIPTION +----------- +The tool reads the file named 'Xorg.0.log' and checks if any black listed +module was loaded. If so, 'not-reportable' file is created with an appropriate +explanation text. If no black listed module was loaded, the tool reads the +file named 'backtrace' from a problem data directory record and generates a +duplication hash and a universally unique identifier (UUID). Then it saves +this data as new elements 'duphash' and 'uuid'. + +Integration with ABRT events +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +'abrt-action-analyze-xorg' can be used to generate the duplication +hash of a newly discovered Xorg backtraces. + +------------ +EVENT=post-create analyzer=Xorg abrt-action-analyze-xorg +------------ + +OPTIONS +------- +-d DIR:: + Path to a problem directory. Current working directory is used when + this option is not provided. + +-v:: + Be more verbose. Can be given multiple times. + +FILES +----- +/etc/abrt/xorg.conf + List of modules which, when loaded, should make Xorg crashes non-reportable. + +AUTHORS +------- +* ABRT team diff --git a/doc/abrt-action-install-debuginfo.txt b/doc/abrt-action-install-debuginfo.txt new file mode 100644 index 0000000..49a0ebd --- /dev/null +++ b/doc/abrt-action-install-debuginfo.txt @@ -0,0 +1,44 @@ +abrt-action-install-debuginfo(1) +============================== + +NAME +---- +abrt-action-install-debuginfo - Install debuginfos for build-ids + +SYNOPSIS +-------- +'abrt-action-install-debuginfo' [-vy] [--ids=BUILD_IDS_FILE] [--tmpdir=TMPDIR] [--cache=CACHEDIR[:DEBUGINFODIR1:DEBUGINFODIR2...]] [--size_mb=SIZE] [-e PATH] + +DESCRIPTION +----------- +Installs debuginfos for all build-ids listed in BUILD_IDS_FILE +to CACHEDIR, using TMPDIR as temporary staging area. +Old files in CACHEDIR are deleted until it is smaller than SIZE. + +OPTIONS +------- +-v:: + Be more verbose. Can be given multiple times. + +-y:: + Noninteractive, assume 'Yes' to all questions + +--ids:: + Path to file with list of build ids. Default: build_ids + +--tmpdir:: + Path to tmp directory. Default: /tmp/abrt-tmp-debuginfo-RANDOM_SUFFIX + +--cache:: + Path to cache directory. Default: /var/cache/abrt-di + +--size_mb:: + Default: 4096 + +-e,--exact:: + Download only specified files + +AUTHORS +------- +* ABRT team + diff --git a/doc/abrt-action-perform-ccpp-analysis.txt b/doc/abrt-action-perform-ccpp-analysis.txt new file mode 100644 index 0000000..3fac30f --- /dev/null +++ b/doc/abrt-action-perform-ccpp-analysis.txt @@ -0,0 +1,40 @@ +abrt-action-perform-ccpp-analysis(1) +================================== + +NAME +---- +abrt-action-perform-ccpp-analysis - Allows users to select acceptable way of core dump analysis + +SYNOPSIS +-------- +'abrt-action-perform-ccpp-analysis' [-h] [-d PROBLEM_DIR] + +DESCRIPTION +----------- +This tool allows user to select between local and remote core dump analysis. +The local analysis may require to download huge amount of data but is +completely safe. On the contrary the remote analysis only needs to upload the +core dump to retrace server but the core dump may contain security sensitive +data. + +Integration with ABRT events +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +'abrt-action-perform-ccpp-analysis' is used in the analyze step when processing +C/C++ crashes + +------------ +EVENT=analyze_CCpp analyzer=CCpp + abrt-action-perform-ccpp-analysis +------------ + +OPTIONS +------- +-d, --problem-dir PROBLEM_DIR:: + Problem directory [Default: current directory] + +-h, --help:: + Show help message + +AUTHORS +------- +* ABRT team diff --git a/doc/abrt-action-save-kernel-data.txt b/doc/abrt-action-save-kernel-data.txt new file mode 100644 index 0000000..f82fa35 --- /dev/null +++ b/doc/abrt-action-save-kernel-data.txt @@ -0,0 +1,33 @@ +abrt-action-save-kernel-data(1) +================================ + +NAME +---- +abrt-action-save-kernel-data - Creates uReport mandatory files for kernel oopses. + +SYNOPSIS +-------- +'abrt-action-save-kernel-data' + +DESCRIPTION +----------- +The tool reads problem directory DIR. It analyzes contents of 'kernel' element, +checks database of installed packages, and creates new elements +'pkg_name', 'pkg_arch', 'pkg_version', 'pkg_release'. + +These files are required by reporter-ureporter (mandatory in uReport). + +Integration with ABRT events +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +This tool can be used as an ABRT reporter. Example +fragment for /etc/libreport/report_event.conf: + +------------ +# Determine in which package/component the crash happened (if not yet done): +EVENT=post-create analyzer=Kerneloops + abrt-action-save-kernel-data +------------ + +AUTHORS +------- +* ABRT team diff --git a/doc/abrt-applet.txt b/doc/abrt-applet.txt new file mode 100644 index 0000000..3dfc00b --- /dev/null +++ b/doc/abrt-applet.txt @@ -0,0 +1,33 @@ +abrt-applet(1) +============ + +NAME +---- +abrt-applet - Applet which notifies user when new problems are detected by ABRT + +SYNOPSIS +-------- +'abrt-applet' [-v] + +DESCRIPTION +----------- +This tool listens on 'org.freedesktop.problems' D-Bus bus and waits for 'Crash' +signal. When the tool detects the signal, it notifies user about new problem +over a desktop specific notification pop-up. + +At start-up this tool checks for new problems which occurred while the tool was +not running and if it finds any of such problem it notifies user over a desktop +specific notification pop-up. + +OPTIONS +------- +-v, --verbose:: + Be more verbose. Can be given multiple times. + +SEE ALSO +-------- +abrt-dbus(8) + +AUTHORS +------- +* ABRT team diff --git a/doc/abrt-dedup-client.txt b/doc/abrt-dedup-client.txt new file mode 100644 index 0000000..b837fcd --- /dev/null +++ b/doc/abrt-dedup-client.txt @@ -0,0 +1,52 @@ +abrt-dedup-client(1) +================== + +NAME +---- +abrt-dedup-client - The ABRT dedup server client. + +SYNOPSIS +-------- +'abrt-dedup-client' [-vsk] [--url URL] [--port PORT] [-d DIR] [--headers] + +DESCRIPTION +----------- +'abrt-dedup-client' is the command-line tool for searching for duplicates. + +OPTIONS +------- +-v, --verbose:: + be verbose + +-s, --syslog:: + log to syslog + +-k, --insecure:: + allow insecure connection to dedup server + +--url URL:: + dedup server URL [Default: retrace.fedoraproject.org] + +--port NUM:: + dedup server port [Default: 443] + +-d, --dump-dir DIR:: + problem directory [Default: current directory] + +--headers:: + (debug) show received HTTP headers + +ENVIRONMENT +----------- +DEDUP_SERVER_URL:: + dedup server URL + +DEDUP_SERVER_PORT:: + dedup server PORT + +DEDUP_SERVER_INSECURE:: + Allow insecure connection to dedup server (use 'insecure') + +AUTHORS +------- +* ABRT team diff --git a/doc/abrt-dump-oops.txt b/doc/abrt-dump-oops.txt new file mode 100644 index 0000000..f63e53a --- /dev/null +++ b/doc/abrt-dump-oops.txt @@ -0,0 +1,49 @@ +abrt-dump-oops(1) +=============== + +NAME +---- +abrt-dump-oops - Extract oops from FILE (or standard input) + +SYNOPSIS +-------- +'abrt-dump-oops' [-vusoxm] [-d DIR]/[-D] [FILE] + +DESCRIPTION +----------- +This tool creates problem directory from, updates problem directory with or +prints oops extracted from FILE or standard input. + +OPTIONS +------- +-v, --verbose:: + Be more verbose. Can be given multiple times. + +-s:: + Log to syslog + +-o:: + Print found oopses on standard output + +-d DIR:: + Create new problem directory in DIR for every oops found + +-D:: + Same as -d DumpLocation, DumpLocation is specified in abrt.conf + +-u PROBLEM:: + Save the extracted information in PROBLEM directory + +-x:: + Make the problem directory world readable. Usable only with -d/-D + +-m:: + Print search string(s) for 'abrt-watch-log' to stdout and exit + +SEE ALSO +-------- +abrt-watch-log(1), abrt.conf(5) + +AUTHORS +------- +* ABRT team diff --git a/doc/abrt-dump-xorg.txt b/doc/abrt-dump-xorg.txt new file mode 100644 index 0000000..7fe7a79 --- /dev/null +++ b/doc/abrt-dump-xorg.txt @@ -0,0 +1,46 @@ +abrt-dump-xorg(1) +=============== + +NAME +---- +abrt-dump-xorg - Extract Xorg crash from FILE (or standard input) + +SYNOPSIS +-------- +'abrt-dump-xorg' [-vsoxm] [-d DIR]/[-D] [FILE] + +DESCRIPTION +----------- +This tool creates problem directory from or prints Xorg crash extracted from FILE +or standard input. + +OPTIONS +------- +-v, --verbose:: + Be more verbose. Can be given multiple times. + +-s:: + Log to syslog + +-o:: + Print found crash data on standard output + +-d DIR:: + Create new problem directory in DIR for every crash found + +-D:: + Same as -d DumpLocation, DumpLocation is specified in abrt.conf + +-x:: + Make the problem directory world readable. Usable only with -d/-D + +-m:: + Print search string(s) for 'abrt-watch-log' to stdout and exit + +SEE ALSO +-------- +abrt-watch-log(1), abrt.conf(5) + +AUTHORS +------- +* ABRT team diff --git a/doc/abrt-harvest-uefioops.txt b/doc/abrt-harvest-uefioops.txt new file mode 100644 index 0000000..efd6f3f --- /dev/null +++ b/doc/abrt-harvest-uefioops.txt @@ -0,0 +1,25 @@ +abrt-harvest-uefioops(1) +====================== + +NAME +---- +abrt-harvest-uefioops - Reconstruct oops from /sys/fs/pstore/* files, create ABRT problems and remove the files + +SYNOPSIS +-------- +'abrt-harvest-uefioops' + +DESCRIPTION +----------- +This script is meant to be run once at system startup after abrtd is up and +running. It scans /sys/fs/pstore/*, reconstructs oops text(s) from these files, +creates ABRT problem directories from them, then removes the files (UEFI +storage is a limited resource). + +SEE ALSO +-------- +abrt-merge-uefioops(1) + +AUTHORS +------- +* ABRT team diff --git a/doc/abrt-harvest-vmcore.txt b/doc/abrt-harvest-vmcore.txt new file mode 100644 index 0000000..0902afd --- /dev/null +++ b/doc/abrt-harvest-vmcore.txt @@ -0,0 +1,32 @@ +abrt-harvest-vmcore(1) +==================== + +NAME +---- +abrt-harvest-vmcore - Converts VMCores to ABRT problems + +SYNOPSIS +-------- +'abrt-harvest-vmcore' + +DESCRIPTION +----------- +This script is meant to be run once at system startup after abrtd is up and +running. It moves all vmcore directories in /var/crash (which are presumably +created by kdump) to abrtd spool directory. + +The goal is to let abrtd notice and process them as new problem data dirs. + +FILES +----- +/etc/abrt/abrt-harvest-vmcore.conf + Configuration file where user can enable copying or moving VMcore to ABRT + problem directory + +SEE ALSO +-------- +abrt.conf(5) + +AUTHORS +------- +* ABRT team diff --git a/doc/abrt-merge-uefioops.txt b/doc/abrt-merge-uefioops.txt new file mode 100644 index 0000000..8f7de86 --- /dev/null +++ b/doc/abrt-merge-uefioops.txt @@ -0,0 +1,30 @@ +abrt-merge-uefioops(1) +==================== + +NAME +---- +abrt-merge-uefioops - Scans files for split oops message. Can print and/or delete them. + +SYNOPSIS +-------- +'abrt-merge-uefioops' [-v] [-od] FILE... + +DESCRIPTION +----------- +This tool takes list of files, reads all of the files, scans them for split +oops messages and join oops parts to original oops message. + +OPTIONS +------- +-o:: + Print found oopses + +-d:: + Delete files with found oopses + +-v, --verbose:: + Be more verbose. Can be given multiple times. + +AUTHORS +------- +* ABRT team diff --git a/doc/abrt-watch-log.txt b/doc/abrt-watch-log.txt new file mode 100644 index 0000000..c393410 --- /dev/null +++ b/doc/abrt-watch-log.txt @@ -0,0 +1,34 @@ +abrt-watch-log(1) +=============== + +NAME +---- +abrt-watch-log - Watch log file and run command when it grows or is replaced + +SYNOPSIS +-------- +'abrt-watch-log' [-vs] [-F STR] ... FILE PROG [ARGS] + +OPTIONS +------- +-F STR:: + Don't run PROG if STRs aren't found + +-v, --verbose:: + Be more verbose. Can be given multiple times. + +-s:: + Log to syslog + +FILE:: + Watched file + +PROG:: + Path to an executable + +ARGS:: + Arguments for PROG + +AUTHORS +------- +* ABRT team diff --git a/doc/system-config-abrt.txt b/doc/system-config-abrt.txt new file mode 100644 index 0000000..cf431a7 --- /dev/null +++ b/doc/system-config-abrt.txt @@ -0,0 +1,19 @@ +system-config-abrt(1) +=================== + +NAME +---- +system-config-abrt - GUI tool to configure ABRT + +SYNOPSIS +-------- +'system-config-abrt' + +DESCRIPTION +----------- +'system-config-abrt' is a graphical tool that provides to users comfortable way +for changing ABRT's configuration files from one place. + +AUTHORS +------- +* ABRT team
Closes #672
Signed-off-by: Jakub Filak jfilak@redhat.com --- abrt.spec.in | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/abrt.spec.in b/abrt.spec.in index cd8462a..93059e4 100644 --- a/abrt.spec.in +++ b/abrt.spec.in @@ -641,12 +641,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_mandir}/man1/abrt-handle-upload.1.gz %{_mandir}/man1/abrt-server.1.gz %{_mandir}/man1/abrt-action-save-package-data.1.gz +%{_mandir}/man1/abrt-watch-log.1.gz +%{_mandir}/man1/abrt-action-analyze-xorg.1.gz %{_mandir}/man8/abrtd.8.gz -%{_mandir}/man8/abrt-dbus.8.gz %{_mandir}/man5/abrt.conf.5.gz %{_mandir}/man5/abrt-action-save-package-data.conf.5.gz # {_mandir}/man5/pyhook.conf.5.gz -%{_mandir}/man1/abrt-action-analyze-ccpp-local.*
%files libs %defattr(-,root,root,-) @@ -673,6 +673,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #%%{_bindir}/test-report %config(noreplace) %{_sysconfdir}/xdg/autostart/abrt-applet.desktop /usr/share/applications/system-config-abrt.desktop +%{_mandir}/man1/abrt-applet.1* +%{_mandir}/man1/system-config-abrt.1*
%files addon-ccpp %defattr(-,root,root,-) @@ -718,7 +720,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_mandir}/man*/abrt-action-generate-core-backtrace.* %{_mandir}/man*/abrt-action-analyze-backtrace.* %{_mandir}/man*/abrt-action-list-dsos.* -%{_mandir}/man1/abrt-install-ccpp-hook.1.gz +%{_mandir}/man*/abrt-install-ccpp-hook.* +%{_mandir}/man*/abrt-action-install-debuginfo.* +%{_mandir}/man*/abrt-action-analyze-ccpp-local.* +%{_mandir}/man*/abrt-action-analyze-core.* +%{_mandir}/man*/abrt-action-analyze-vulnerability.* +%{_mandir}/man*/abrt-action-perform-ccpp-analysis.* +%{_mandir}/man*/abrt-dedup-client.*
%files retrace-client %{_bindir}/abrt-retrace-client @@ -737,7 +745,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_bindir}/abrt-dump-oops %{_bindir}/abrt-action-analyze-oops %{_bindir}/abrt-action-save-kernel-data +%{_mandir}/man1/abrt-dump-oops.1* %{_mandir}/man1/abrt-action-analyze-oops.1* +%{_mandir}/man1/abrt-action-save-kernel-data.1*
%files addon-xorg %defattr(-,root,root,-) @@ -748,6 +758,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_initrddir}/abrt-xorg %endif %{_bindir}/abrt-dump-xorg +%{_mandir}/man1/abrt-dump-xorg.1*
%files addon-vmcore %defattr(-,root,root,-) @@ -761,6 +772,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %{_sbindir}/abrt-harvest-vmcore %{_bindir}/abrt-action-analyze-vmcore +%{_mandir}/man1/abrt-harvest-vmcore.1* %{_mandir}/man1/abrt-action-analyze-vmcore.1*
%files addon-uefioops @@ -772,6 +784,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %{_sbindir}/abrt-harvest-uefioops %{_bindir}/abrt-merge-uefioops +%{_mandir}/man1/abrt-harvest-uefioops.1* +%{_mandir}/man1/abrt-merge-uefioops.1*
%files addon-python %defattr(-,root,root,-) @@ -804,6 +818,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files dbus %defattr(-,root,root,-) %{_sbindir}/abrt-dbus +%{_mandir}/man8/abrt-dbus.8.gz %config(noreplace) %{_sysconfdir}/dbus-1/system.d/dbus-abrt.conf %{_datadir}/dbus-1/interfaces/org.freedesktop.Problems.xml %{_datadir}/dbus-1/system-services/org.freedesktop.problems.service
Related to #669
Signed-off-by: Jakub Filak jfilak@redhat.com --- src/hooks/abrt_exception_handler.py.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/hooks/abrt_exception_handler.py.in b/src/hooks/abrt_exception_handler.py.in index 774a586..4ed34fd 100644 --- a/src/hooks/abrt_exception_handler.py.in +++ b/src/hooks/abrt_exception_handler.py.in @@ -16,7 +16,7 @@
## You should have received a copy of the GNU General Public License ## along with this program; if not, write to the Free Software -## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +## Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
""" Module for the ABRT exception handling hook
Related to #669
Signed-off-by: Jakub Filak jfilak@redhat.com --- abrt.spec.in | 12 ------------ 1 file changed, 12 deletions(-)
diff --git a/abrt.spec.in b/abrt.spec.in index 93059e4..9533a08 100644 --- a/abrt.spec.in +++ b/abrt.spec.in @@ -79,11 +79,6 @@ Requires: %{systemd_units} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-libs = %{version}-%{release} Requires(pre): %{shadow_utils} -Obsoletes: abrt-plugin-sqlite3 > 0.0.1 -# required for transition from 1.1.13, can be removed after some time -Obsoletes: abrt-plugin-runapp > 0.0.1 -Obsoletes: abrt-plugin-filetransfer > 0.0.1 -Obsoletes: abrt-plugin-sosreport > 0.0.1
%description %{name} is a tool to help users to detect defects in applications and @@ -153,11 +148,7 @@ Group: System Environment/Libraries Requires: curl Requires: %{name} = %{version}-%{release} Requires: libreport-plugin-kerneloops >= %{libreport_ver} - Requires: abrt-libs = %{version}-%{release} -Obsoletes: kerneloops > 0.0.1 -Obsoletes: abrt-plugin-kerneloops > 0.0.1 -Obsoletes: abrt-plugin-kerneloopsreporter > 0.0.1
%description addon-kerneloops This package contains plugin for collecting kernel crash information from @@ -213,8 +204,6 @@ Summary: %{name}'s addon for catching and analyzing Python exceptions Group: System Environment/Libraries Requires: python Requires: %{name} = %{version}-%{release} -Obsoletes: gnome-python2-bugbuddy > 0.0.1 -Provides: gnome-python2-bugbuddy
%description addon-python This package contains python hook and python analyzer plugin for handling @@ -291,7 +280,6 @@ Requires: libreport-fedora >= %{libreport_ver} Requires: libreport-rhel >= %{libreport_ver} %endif #Requires: abrt-plugin-firefox -Obsoletes: bug-buddy > 0.0.1 Provides: bug-buddy
%description desktop
- pushed all, thx (you can remove the rpmlint branches)
--J
On 07/10/2013 03:58 PM, Jakub Filak wrote:
Related to abrt/abrt#668
Signed-off-by: Jakub Filak jfilak@redhat.com
configure.ac | 12 +++++++----- libreport.spec.in | 38 +++++++++++++++++++++----------------- src/plugins/Makefile.am | 15 ++++++++++----- src/workflows/Makefile.am | 6 +++--- 4 files changed, 41 insertions(+), 30 deletions(-)
diff --git a/configure.ac b/configure.ac index 671d6a4..bad3aa6 100644 --- a/configure.ac +++ b/configure.ac @@ -216,10 +216,11 @@ CONF_DIR='${sysconfdir}/${PACKAGE_NAME}' VAR_RUN='${localstatedir}/run' PLUGINS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/plugins' REPORT_PLUGINS_CONF_DIR='${sysconfdir}/libreport/plugins' -EVENTS_DIR='${sysconfdir}/${PACKAGE_NAME}/events' -EVENTS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/events.d' -WORKFLOWS_DIR='${sysconfdir}/${PACKAGE_NAME}/workflows' -WORKFLOWS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/workflows.d' +EVENTS_DIR='${pkgdatadir}/events' +EVENTS_DEFINITION_DIR='${sysconfdir}/${PACKAGE_NAME}/events.d' +EVENTS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/events' +WORKFLOWS_DIR='${pkgdatadir}/workflows' +WORKFLOWS_DEFINITION_DIR='${sysconfdir}/${PACKAGE_NAME}/workflows.d' PLUGINS_LIB_DIR='${libdir}/${PACKAGE_NAME}' LIBEXEC_DIR='${libexecdir}'
@@ -276,13 +277,14 @@ AC_SUBST(CONF_DIR) AC_SUBST(VAR_RUN) AC_SUBST(PLUGINS_CONF_DIR) AC_SUBST(REPORT_PLUGINS_CONF_DIR) +AC_SUBST(EVENTS_DEFINITION_DIR) AC_SUBST(EVENTS_CONF_DIR) AC_SUBST(EVENTS_DIR) AC_SUBST(PLUGINS_LIB_DIR) AC_SUBST(DEBUG_DUMPS_DIR) AC_SUBST(LIBEXEC_DIR) AC_SUBST(WORKFLOWS_DIR) -AC_SUBST(WORKFLOWS_CONF_DIR) +AC_SUBST(WORKFLOWS_DEFINITION_DIR) AC_SUBST(DUMP_DIR_OWNED_BY_USER)
# Initialize the test suite. diff --git a/libreport.spec.in b/libreport.spec.in index 539e5f1..df37227 100644 --- a/libreport.spec.in +++ b/libreport.spec.in @@ -311,6 +311,8 @@ find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f mkdir -p $RPM_BUILD_ROOT/%{_initrddir} mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/events.d/ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/events/ +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/events/ +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/workflows/
# After everything is installed, remove info dir rm -f $RPM_BUILD_ROOT/%{_infodir}/dir @@ -354,6 +356,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %dir %{_sysconfdir}/%{name}/ %dir %{_sysconfdir}/%{name}/events.d/ %dir %{_sysconfdir}/%{name}/events/ +%dir %{_datadir}/%{name}/events/ +%dir %{_datadir}/%{name}/workflows/ %dir %{_sysconfdir}/%{name}/plugins/
%files devel @@ -408,7 +412,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_libexecdir}/abrt-screencast %{_libdir}/libreport-gtk.so.* %config(noreplace) %{_sysconfdir}/libreport/events.d/emergencyanalysis_event.conf -%config(noreplace) %{_sysconfdir}/libreport/events/report_EmergencyAnalysis.xml +%{_datadir}/%{name}/events/report_EmergencyAnalysis.xml
%files gtk-devel %defattr(-,root,root,-) @@ -418,14 +422,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files plugin-kerneloops %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/libreport/events/report_Kerneloops.xml +%{_datadir}/%{name}/events/report_Kerneloops.xml %{_mandir}/man*/reporter-kerneloops.* %{_bindir}/reporter-kerneloops
%files plugin-logger %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/libreport/events/report_Logger.conf -%config(noreplace) %{_sysconfdir}/libreport/events/report_Logger.xml +%{_datadir}/%{name}/events/report_Logger.xml %config(noreplace) %{_sysconfdir}/libreport/events.d/print_event.conf %{_bindir}/reporter-print %{_mandir}/man*/reporter-print.* @@ -433,7 +437,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files plugin-mailx %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/libreport/plugins/mailx.conf -%config(noreplace) %{_sysconfdir}/libreport/events/report_Mailx.xml +%{_datadir}/%{name}/events/report_Mailx.xml %config(noreplace) %{_sysconfdir}/libreport/events.d/mailx_event.conf %{_mandir}/man*/reporter-mailx.* %{_bindir}/reporter-mailx @@ -442,7 +446,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %defattr(-,root,root,-) %{_bindir}/reporter-ureport #%{_mandir}/man1/reporter-ureport.1.gz -%config(noreplace) %{_sysconfdir}/libreport/events/report_uReport.xml +%{_datadir}/%{name}/events/report_uReport.xml
%if %{with bugzilla} %files plugin-bugzilla @@ -452,7 +456,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_formatdup.conf %config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_format_libreport.conf %config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_format_kernel.conf -%config(noreplace) %{_sysconfdir}/libreport/events/report_Bugzilla.xml +%{_datadir}/%{name}/events/report_Bugzilla.xml %config(noreplace) %{_sysconfdir}/libreport/events/report_Bugzilla.conf %config(noreplace) %{_sysconfdir}/libreport/events.d/bugzilla_event.conf # FIXME: remove with the old gui @@ -463,7 +467,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files plugin-rhtsupport %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/libreport/plugins/rhtsupport.conf -%config(noreplace) %{_sysconfdir}/libreport/events/report_RHTSupport.xml +%{_datadir}/%{name}/events/report_RHTSupport.xml %config(noreplace) %{_sysconfdir}/libreport/events.d/rhtsupport_event.conf %{_mandir}/man1/reporter-rhtsupport.1.gz %{_bindir}/reporter-rhtsupport @@ -479,29 +483,29 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %defattr(-,root,root,-) %{_mandir}/man*/reporter-upload.* %{_bindir}/reporter-upload -%config(noreplace) %{_sysconfdir}/libreport/events/report_Uploader.xml +%{_datadir}/%{name}/events/report_Uploader.xml %config(noreplace) %{_sysconfdir}/libreport/events.d/uploader_event.conf -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_Upload.xml +%{_datadir}/%{name}/workflows/workflow_Upload.xml
%files fedora %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_Fedora.xml +%{_datadir}/%{name}/workflows/workflow_Fedora.xml %config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_fedora.conf
%files rhel %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELCCpp.xml -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELKerneloops.xml -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELPython.xml -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELvmcore.xml -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELxorg.xml +%{_datadir}/%{name}/workflows/workflow_RHELCCpp.xml +%{_datadir}/%{name}/workflows/workflow_RHELKerneloops.xml +%{_datadir}/%{name}/workflows/workflow_RHELPython.xml +%{_datadir}/%{name}/workflows/workflow_RHELvmcore.xml +%{_datadir}/%{name}/workflows/workflow_RHELxorg.xml %config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_rhel.conf
%if %{with bugzilla} %files anaconda %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_AnacondaFedora.xml -%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_AnacondaUpload.xml +%{_datadir}/%{name}/workflows/workflow_AnacondaFedora.xml +%{_datadir}/%{name}/workflows/workflow_AnacondaUpload.xml %config(noreplace) %{_sysconfdir}/libreport/workflows.d/anaconda_event.conf %config(noreplace) %{_sysconfdir}/libreport/events.d/bugzilla_anaconda_event.conf %config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_format_anaconda.conf diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am index 4bca629..166604c 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am @@ -39,10 +39,13 @@ dist_reportpluginsconf_DATA = $(reporters_plugin_conf) \ mailx.conf
eventsdir = $(EVENTS_DIR) +eventsconfdir = $(EVENTS_CONF_DIR)
reporters_events = +reporters_events_conf = if BUILD_BUGZILLA -reporters_events += report_Bugzilla.xml report_Bugzilla.conf +reporters_events += report_Bugzilla.xml +reporters_events_conf += report_Bugzilla.conf endif
if BUILD_UREPORT @@ -50,7 +53,6 @@ reporters_events += report_uReport.xml endif
dist_events_DATA = $(reporters_events) \
- report_Logger.conf \ report_Logger.xml \ report_Mailx.xml \ report_RHTSupport.xml \
@@ -58,11 +60,14 @@ dist_events_DATA = $(reporters_events) \ report_Uploader.xml \ report_EmergencyAnalysis.xml
+dist_eventsconf_DATA = $(reporters_events_conf) \
- report_Logger.conf
- @INTLTOOL_XML_RULE@
-eventsconfdir = $(EVENTS_CONF_DIR) +eventsdefdir = $(EVENTS_DEFINITION_DIR)
-dist_eventsconf_DATA = \ +dist_eventsdef_DATA = \ mailx_event.conf \ print_event.conf \ rhtsupport_event.conf \ @@ -71,7 +76,7 @@ dist_eventsconf_DATA = \
reporters_extra_dist = if BUILD_BUGZILLA -dist_eventsconf_DATA += bugzilla_event.conf bugzilla_anaconda_event.conf +dist_eventsdef_DATA += bugzilla_event.conf bugzilla_anaconda_event.conf reporters_extra_dist += report_Bugzilla.xml.in report_Bugzilla.conf endif
diff --git a/src/workflows/Makefile.am b/src/workflows/Makefile.am index 45ba7e0..9e53c8c 100644 --- a/src/workflows/Makefile.am +++ b/src/workflows/Makefile.am @@ -15,14 +15,14 @@ dist_workflows_DATA += \ workflow_AnacondaUpload.xml endif
-workflowsconfdir = $(WORKFLOWS_CONF_DIR) +workflowsdefdir = $(WORKFLOWS_DEFINITION_DIR)
-dist_workflowsconf_DATA =\ +dist_workflowsdef_DATA =\ report_fedora.conf \ report_rhel.conf
if BUILD_BUGZILLA -dist_workflowsconf_DATA += \ +dist_workflowsdef_DATA += \ anaconda_event.conf endif
crash-catcher@lists.fedorahosted.org