From 1a071781d2de6f9905a44af6b9f8b1d8b4989979 Mon Sep 17 00:00:00 2001 From: Matej Habrnal Date: Jun 10 2015 15:49:27 +0000 Subject: Add support for mantisbt reporter and turn sosreport off Signed-off-by: Matej Habrnal --- diff --git a/SOURCES/1000-turn-sosreport-off.patch b/SOURCES/1000-turn-sosreport-off.patch new file mode 100644 index 0000000..4b7166a --- /dev/null +++ b/SOURCES/1000-turn-sosreport-off.patch @@ -0,0 +1,24 @@ +From 2b02dc85753e4b11f10bfa2d660aa493ae80c52b Mon Sep 17 00:00:00 2001 +From: Jakub Filak +Date: Thu, 20 Nov 2014 11:24:39 +0100 +Subject: [PATCH] turn sosreport off + +--- + src/daemon/abrt_event.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/daemon/abrt_event.conf b/src/daemon/abrt_event.conf +index 380b312..eafee17 100644 +--- a/src/daemon/abrt_event.conf ++++ b/src/daemon/abrt_event.conf +@@ -67,7 +67,7 @@ EVENT=post-create runlevel= + # Example: if you want to save sosreport immediately at the moment of a crash: + # (alternatively, you can add similar command to EVENT=analyze_foo's, + # if you would rather perform this collection later): +-EVENT=post-create ++#EVENT=post-create + nice sosreport --tmp-dir "$DUMP_DIR" --batch \ + --only=anaconda --only=boot --only=devicemapper \ + --only=filesys --only=hardware --only=kernel --only=libraries \ +-- +1.8.3.1 diff --git a/SOURCES/1001-event-don-t-run-the-reporter-bugzilla-h-on-RHEL-and-.patch b/SOURCES/1001-event-don-t-run-the-reporter-bugzilla-h-on-RHEL-and-.patch new file mode 100644 index 0000000..9ffe642 --- /dev/null +++ b/SOURCES/1001-event-don-t-run-the-reporter-bugzilla-h-on-RHEL-and-.patch @@ -0,0 +1,29 @@ +From 6c95ae2bf1c80530442a516f23b7cd8e82dcae12 Mon Sep 17 00:00:00 2001 +From: Matej Habrnal +Date: Thu, 22 Jan 2015 02:23:21 +0100 +Subject: [PATCH] event: don't run the 'reporter-bugzilla -h' on RHEL and + CentOS + +Running the 'reporter-bugzilla -h' makes sense only on Fedora because of bodhi. + +Signed-off-by: Matej Habrnal +--- + src/plugins/ccpp_event.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/ccpp_event.conf b/src/plugins/ccpp_event.conf +index 62ff08a..cd75ee2 100644 +--- a/src/plugins/ccpp_event.conf ++++ b/src/plugins/ccpp_event.conf +@@ -71,7 +71,7 @@ EVENT=analyze_LocalGDB analyzer=CCpp + # Run GDB plugin to see if crash looks exploitable + abrt-action-analyze-vulnerability + # Run GDB to genereate backtrace +- abrt-action-analyze-ccpp-local --without-bodhi ++ abrt-action-analyze-ccpp-local --without-bz + + + # Bugzilla requires nonempty duphash +-- +1.8.3.1 + diff --git a/SOURCES/1003-plugin-set-URL-to-retrace-server.patch b/SOURCES/1003-plugin-set-URL-to-retrace-server.patch new file mode 100644 index 0000000..f87e200 --- /dev/null +++ b/SOURCES/1003-plugin-set-URL-to-retrace-server.patch @@ -0,0 +1,42 @@ +From 81181a893b91a229e05a5a915cc98347126e3834 Mon Sep 17 00:00:00 2001 +From: Matej Habrnal +Date: Fri, 30 Jan 2015 17:52:25 +0100 +Subject: [PATCH] plugin: set URL to retrace server + +Changed default retrace server URL from localhost to retrace.fedoraproject.org. + +Signed-off-by: Matej Habrnal +--- + src/plugins/analyze_CCpp.xml.in | 2 +- + src/plugins/analyze_RetraceServer.xml.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/plugins/analyze_CCpp.xml.in b/src/plugins/analyze_CCpp.xml.in +index 6f02692..a7ce4dd 100644 +--- a/src/plugins/analyze_CCpp.xml.in ++++ b/src/plugins/analyze_CCpp.xml.in +@@ -26,7 +26,7 @@ + + +diff --git a/src/plugins/analyze_RetraceServer.xml.in b/src/plugins/analyze_RetraceServer.xml.in +index cf1d25a..e437cac 100644 +--- a/src/plugins/analyze_RetraceServer.xml.in ++++ b/src/plugins/analyze_RetraceServer.xml.in +@@ -12,7 +12,7 @@ + + +-- +1.8.3.1 + diff --git a/SPECS/abrt.spec b/SPECS/abrt.spec index 4efc25d..1949b6f 100644 --- a/SPECS/abrt.spec +++ b/SPECS/abrt.spec @@ -27,13 +27,13 @@ %define desktopvendor fedora %endif -%define libreport_ver 2.1.11-22 +%define libreport_ver 2.1.11-22%{?dist}.0.1 %define satyr_ver 0.13-7 Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.1.11 -Release: 22%{?dist} +Release: 22%{?dist}.0.1 License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/abrt/ @@ -116,7 +116,7 @@ Patch75: 0075-Translation-updates.patch Patch76: 0076-Revert-gdb-disable-loading-of-auto-loaded-files.patch Patch77: 0077-gdb-make-gdb-aware-of-the-abrt-s-debuginfo-dir.patch #Patch78: 0078-spec-update-the-required-gdb-version.patch -Patch79: 0079-cli-mark-the-suggestion-text-for-translation.patch +#Patch79: 0079-cli-mark-the-suggestion-text-for-translation.patch Patch80: 0080-auto-reporting-add-options-to-specify-auth-type.patch #Patch81: 0081-testsuite-abrt-auto-reporting-uReport-authentication.patch Patch82: 0082-translations-pull-the-newest-PO-files.patch @@ -164,6 +164,12 @@ Patch119: 0119-ccpp-do-not-unlink-failed-and-big-user-cores.patch Patch120: 0120-a-a-i-d-t-a-cache-don-t-open-the-build_ids-file-as-a.patch Patch121: 0121-a-a-i-d-t-a-cache-fix-command-line-argument-generati.patch +Patch1000: 1000-turn-sosreport-off.patch +Patch1001: 1001-event-don-t-run-the-reporter-bugzilla-h-on-RHEL-and-.patch +#Patch1002: 1002-spec-added-dependency-to-libreport-centos.patch +Patch1003: 1003-plugin-set-URL-to-retrace-server.patch +#Patch1004: 1004-spec-add-dependenci-on-abrt-retrace-client.patch + # git is need for '%%autosetup -S git' which automatically applies all the # patches above. Please, be aware that the patches must be generated # by 'git format-patch' @@ -271,10 +277,8 @@ Group: System Environment/Libraries Requires: cpio Requires: gdb >= 7.6.1-63 Requires: elfutils -%if 0%{!?rhel:1} # abrt-action-perform-ccpp-analysis wants to run analyze_RetraceServer: Requires: %{name}-retrace-client -%endif Requires: %{name} = %{version}-%{release} Requires: abrt-libs = %{version}-%{release} Requires: libreport-python @@ -387,8 +391,13 @@ Requires: abrt-addon-ccpp Requires: abrt-addon-python Requires: abrt-addon-xorg %if 0%{?rhel} +%if 0%{?centos_ver} +Requires: libreport-centos >= %{libreport_ver} +Requires: libreport-plugin-mantisbt >= %{libreport_ver} +%else Requires: libreport-rhel >= %{libreport_ver} Requires: libreport-plugin-rhtsupport >= %{libreport_ver} +%endif %else Requires: abrt-retrace-client Requires: libreport-plugin-bugzilla >= %{libreport_ver} @@ -421,8 +430,13 @@ Requires: elfutils Requires: abrt-gui Requires: gnome-abrt %if 0%{?rhel} +%if 0%{?centos_ver} +Requires: libreport-centos >= %{libreport_ver} +Requires: libreport-plugin-mantisbt >= %{libreport_ver} +%else Requires: libreport-rhel >= %{libreport_ver} Requires: libreport-plugin-rhtsupport >= %{libreport_ver} +%endif %else Requires: abrt-retrace-client Requires: libreport-plugin-bugzilla >= %{libreport_ver} @@ -971,6 +985,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Wed Jun 10 2015 Matej Habrnal - 2.1.11-22.el7.centos.0.1 +- set URL to retrace server +- turn sosreport off + * Tue Jun 09 2015 CentOS Sources - 2.1.11-22.el7.centos - Drop RHTS hint - Change by David Mansfield