rpms/abrt
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

New upstream release 2.1.5

Browse source 
Resolves: #958961, #974670
This commit is contained in:
Jakub Filak 2013-06-14 13:29:42 +02:00
commit 26deb427d6
9 changed files with 51 additions and 45061 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -26,3 +26,4 @@ abrt-1.1.13.tar.gz
/abrt-2.1.2.tar.gz
/abrt-2.1.3.tar.gz
/abrt-2.1.4.tar.gz
/abrt-2.1.5.tar.gz

44207
0001-updated-translation.patch
View file

File diff suppressed because it is too large Load diff

419
0002-abrt-uefioops-new-service.patch
View file

@ -1,419 +0,0 @@
From 865f7b88b391f2fbd71baa1aa3d6320455d4f519 Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <dvlasenk@redhat.com>
Date: Fri, 26 Apr 2013 17:33:17 +0200
Subject: [ABRT PATCH 2/5] abrt-uefioops: new service
This service, once per boot, scans /sys/fs/pstore/* and crates
oops problem dirs from this data.
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Signed-off-by: Martin Milata <mmilata@redhat.com>
---
Makefile.am | 6 +-
init-scripts/abrt-uefioops | 79 ++++++++++++++++++++
init-scripts/abrt-uefioops.service | 12 +++
po/POTFILES.in | 4 +-
src/hooks/Makefile.am | 37 +++++++++-
src/hooks/abrt-harvest-uefioops.in | 24 ++++++
src/hooks/abrt-merge-uefioops.c | 148 +++++++++++++++++++++++++++++++++++++
7 files changed, 304 insertions(+), 6 deletions(-)
create mode 100644 init-scripts/abrt-uefioops
create mode 100644 init-scripts/abrt-uefioops.service
create mode 100644 src/hooks/abrt-harvest-uefioops.in
create mode 100644 src/hooks/abrt-merge-uefioops.c
diff --git a/Makefile.am b/Makefile.am
index cc820ee..0eecc60 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,14 +34,16 @@ if HAVE_SYSTEMD
init-scripts/abrt-ccpp.service \
init-scripts/abrt-oops.service \
init-scripts/abrt-xorg.service \
- init-scripts/abrt-vmcore.service
+ init-scripts/abrt-vmcore.service \
+ init-scripts/abrt-uefioops.service
else
sysv_initdir = $(sysconfdir)/rc.d/init.d/
sysv_init_SCRIPTS = init-scripts/abrtd \
init-scripts/abrt-ccpp \
init-scripts/abrt-oops \
init-scripts/abrt-xorg \
- init-scripts/abrt-vmcore
+ init-scripts/abrt-vmcore \
+ init-scripts/abrt-uefioops
endif
RPM_DIRS = --define "_sourcedir `pwd`" \
diff --git a/init-scripts/abrt-uefioops b/init-scripts/abrt-uefioops
new file mode 100644
index 0000000..663e24a
--- /dev/null
+++ b/init-scripts/abrt-uefioops
@@ -0,0 +1,79 @@
+#!/bin/bash
+# Harvest UEFI-saved oopses for ABRT
+#
+# chkconfig: 35 82 16
+# description: Collects UEFI-saved oopses for ABRT
+### BEGIN INIT INFO
+# Provides: abrt-uefioops
+# Required-Start: $abrtd
+# Default-Stop: 0 1 2 6
+# Default-Start: 3 5
+# Short-Description: Collects UEFI-saved oopses for ABRT
+# Description: Collects UEFI-saved oopses for ABRT
+### END INIT INFO
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+LOCK="/var/lock/subsys/abrt-uefioops"
+HARVEST_CMD="/usr/sbin/abrt-harvest-uefioops"
+
+RETVAL=0
+
+check() {
+ # Check that we're a privileged user
+ [ "`id -u`" = 0 ] || exit 4
+}
+
+start() {
+ check
+ "$HARVEST_CMD"
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] && touch -- "$LOCK"
+ return $RETVAL
+}
+
+stop() {
+ check
+ rm -f -- "$LOCK"
+ return 0
+}
+
+restart() {
+ stop
+ start
+}
+
+reload() {
+ restart
+}
+
+case "$1" in
+start)
+ start
+ ;;
+stop)
+ stop
+ ;;
+reload)
+ reload
+ ;;
+force-reload)
+ echo "$0: Unimplemented feature."
+ RETVAL=3
+ ;;
+restart)
+ restart
+ ;;
+condrestart)
+ test -f "$LOCK" && restart
+ ;;
+status)
+ test -f "$LOCK" && RETVAL=0 || RETVAL=3
+ ;;
+*)
+ echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}"
+ RETVAL=2
+esac
+
+exit $RETVAL
diff --git a/init-scripts/abrt-uefioops.service b/init-scripts/abrt-uefioops.service
new file mode 100644
index 0000000..cee4296
--- /dev/null
+++ b/init-scripts/abrt-uefioops.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Collect UEFI-saved oopses for ABRT
+After=abrtd.service
+Requisite=abrtd.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/sbin/abrt-harvest-uefioops
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b057a3d..26b595e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -35,13 +35,15 @@ src/plugins/collect_xsession_errors.xml.in
src/plugins/https-utils.c
src/plugins/bodhi.c
+src/hooks/abrt-merge-uefioops.c
+
src/cli/abrt-cli.c
src/cli/list.c
src/cli/status.c
+
src/plugins/analyze_CCpp.xml.in
src/plugins/analyze_VMcore.xml.in
src/plugins/collect_GConf.xml.in
src/plugins/collect_vimrc_system.xml.in
src/plugins/collect_vimrc_user.xml.in
src/plugins/post_report.xml.in
-
diff --git a/src/hooks/Makefile.am b/src/hooks/Makefile.am
index 9f65d62..de97a88 100644
--- a/src/hooks/Makefile.am
+++ b/src/hooks/Makefile.am
@@ -12,7 +12,11 @@ dist_pluginsconf_DATA = \
sbin_SCRIPTS = \
abrt-install-ccpp-hook \
- abrt-harvest-vmcore
+ abrt-harvest-vmcore \
+ abrt-harvest-uefioops
+
+bin_PROGRAMS = \
+ abrt-merge-uefioops
libexec_PROGRAMS = abrt-hook-ccpp
@@ -32,10 +36,32 @@ abrt_hook_ccpp_LDADD = \
../lib/libabrt.la \
$(LIBREPORT_LIBS)
-pyhook_PYTHON = abrt_exception_handler.py abrt.pth
+# abrt-merge-uefioops
+abrt_merge_uefioops_SOURCES = \
+ abrt-merge-uefioops.c
+abrt_merge_uefioops_CPPFLAGS = \
+ -I$(srcdir)/../include \
+ -I$(srcdir)/../lib \
+ -DVAR_RUN=\"$(VAR_RUN)\" \
+ -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
+ -DDEFAULT_DUMP_DIR_MODE=$(DEFAULT_DUMP_DIR_MODE) \
+ $(GLIB_CFLAGS) \
+ $(LIBREPORT_CFLAGS) \
+ -D_GNU_SOURCE
+abrt_merge_uefioops_LDADD = \
+ ../lib/libabrt.la \
+ $(LIBREPORT_LIBS)
+
+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+
+pyhook_PYTHON = \
+ abrt_exception_handler.py \
+ abrt.pth
+
EXTRA_DIST = abrt_exception_handler.py.in \
abrt-install-ccpp-hook.in \
- abrt-harvest-vmcore.in
+ abrt-harvest-vmcore.in \
+ abrt-harvest-uefioops.in
CLEANFILES := $(notdir $(wildcard *~)) $(notdir $(wildcard *\#)) $(notdir $(wildcard \.\#*)) $(notdir $(wildcard *.pyc)) $(man1_MANS)
@@ -63,3 +89,8 @@ abrt-harvest-vmcore: abrt-harvest-vmcore.in
sed -e s,\@CONF_DIR\@,\$(CONF_DIR)\,g \
-e s,\@DEFAULT_DUMP_LOCATION\@,$(DEFAULT_DUMP_LOCATION),g \
$< >$@
+
+abrt-harvest-uefioops: abrt-harvest-uefioops.in
+ sed -e s,\@CONF_DIR\@,\$(CONF_DIR)\,g \
+ -e s,\@DEFAULT_DUMP_LOCATION\@,$(DEFAULT_DUMP_LOCATION),g \
+ $< >$@
diff --git a/src/hooks/abrt-harvest-uefioops.in b/src/hooks/abrt-harvest-uefioops.in
new file mode 100644
index 0000000..9f63256
--- /dev/null
+++ b/src/hooks/abrt-harvest-uefioops.in
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# 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).
+#
+
+# Wait for abrtd to start. Give it at least 1 second to initialize.
+i=10
+while ! pidof abrtd >/dev/null; do
+ if test $((i--)) = 0; then
+ exit 1
+ fi
+ sleep 1
+done
+sleep 1
+
+cd /sys/fs/pstore 2>/dev/null || exit 0
+
+abrt-merge-uefioops -o * | abrt-dump-oops -D
+if test $? = 0; then
+ abrt-merge-uefioops -d *
+fi
diff --git a/src/hooks/abrt-merge-uefioops.c b/src/hooks/abrt-merge-uefioops.c
new file mode 100644
index 0000000..6fc3109
--- /dev/null
+++ b/src/hooks/abrt-merge-uefioops.c
@@ -0,0 +1,148 @@
+/*
+ Copyright (C) 2013 Red Hat, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ 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.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+#include "libabrt.h"
+
+struct oops_text {
+ unsigned panic_no;
+ unsigned part_no;
+ const char *filename;
+ char *text;
+};
+
+static
+struct oops_text *parse_file(const char *filename)
+{
+ FILE *fp = fopen(filename, "r");
+ if (!fp)
+ return NULL;
+
+ char buffer[16 * 1024];
+
+ struct oops_text *ot = NULL;
+
+ if (!fgets(buffer, sizeof(buffer), fp))
+ goto ret;
+ unsigned n1, n2;
+ int n = sscanf(buffer, "Panic#%u Part%u\n", &n1, &n2);
+ if (n != 2)
+ goto ret;
+
+ ot = xzalloc(sizeof(*ot));
+ ot->filename = filename;
+ ot->panic_no = n1;
+ ot->part_no = n2;
+
+ size_t sz = fread(buffer, 1, sizeof(buffer), fp);
+ ot->text = strndup(buffer, sz);
+
+ ret:
+ fclose(fp);
+ return ot;
+}
+
+static
+int compare_oops_texts(const void *a, const void *b)
+{
+ struct oops_text *aa = *(struct oops_text **)a;
+ struct oops_text *bb = *(struct oops_text **)b;
+ if (aa->panic_no < bb->panic_no)
+ return -1;
+ if (aa->panic_no > bb->panic_no)
+ return 1;
+ if (aa->part_no < bb->part_no)
+ return -1;
+ return (aa->part_no > bb->part_no);
+}
+
+int main(int argc, char **argv)
+{
+ /* I18n */
+ setlocale(LC_ALL, "");
+#if ENABLE_NLS
+ bindtextdomain(PACKAGE, LOCALEDIR);
+ textdomain(PACKAGE);
+#endif
+
+ abrt_init(argv);
+
+ /* Can't keep these strings/structs static: _() doesn't support that */
+ const char *program_usage_string = _(
+ "& [-v] [-od] FILE...\n"
+ "\n"
+ "Scans files for split oops message. Can print and/or delete them."
+ );
+ enum {
+ OPT_v = 1 << 0,
+ OPT_o = 1 << 1,
+ OPT_d = 1 << 2,
+ };
+ /* Keep enum above and order of options below in sync! */
+ struct options program_options[] = {
+ OPT__VERBOSE(&g_verbose),
+ OPT_BOOL('o', NULL, NULL, _("Print found oopses")),
+ OPT_BOOL('d', NULL, NULL, _("Delete files with found oopses")),
+ OPT_END()
+ };
+ unsigned opts = parse_opts(argc, argv, program_options, program_usage_string);
+
+ export_abrt_envvars(0);
+
+ struct oops_text **v = xzalloc(sizeof(v[0]));
+ int i = 0;
+
+ while (*argv)
+ {
+ v[i] = parse_file(*argv);
+ if (v[i])
+ {
+ v = xrealloc(v, (++i + 1) * sizeof(v[0]));
+ v[i] = NULL;
+ }
+ argv++;
+ }
+
+ if (i == 0) /* nothing was found */
+ return 0;
+
+ qsort(v, i, sizeof(v[0]), compare_oops_texts);
+
+ if (opts & OPT_o)
+ {
+ struct oops_text **vv = v;
+ while (*vv)
+ {
+ struct oops_text *cur_oops = *vv;
+ fputs(cur_oops->text, stdout);
+ vv++;
+ }
+ }
+
+ if (opts & OPT_d)
+ {
+ struct oops_text **vv = v;
+ while (*vv)
+ {
+ struct oops_text *cur_oops = *vv;
+ if (unlink(cur_oops->filename) != 0)
+ perror_msg("Can't unlink '%s'", cur_oops->filename);
+ vv++;
+ }
+ }
+
+ return 0;
+}
--
1.8.1.4

36
0005-abrtd.service-start-after-livesys.service.patch
View file

@ -1,36 +0,0 @@
From f2c25245ec7c5d918a999ae718d969a77f3b53d8 Mon Sep 17 00:00:00 2001
From: Jakub Filak <jfilak@redhat.com>
Date: Fri, 3 May 2013 13:02:04 +0200
Subject: [ABRT PATCH 5/5] abrtd.service: start after livesys.service
Fedora's live cd mounts tmpfs into /var/tmp in livesys.service after
abrtd.service was started. The new filesystem hides /vat/tmp/abrt
directory but doesn't deletes it, therefore abrtd doens't known that
/var/tmp/abrt is not visible to the world.
Closes rhbz#928753
Signed-off-by: Jakub Filak <jfilak@redhat.com>
Signed-off-by: Jiri Moskovcak <jmoskovc@redhat.com>
---
init-scripts/abrtd.service | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/init-scripts/abrtd.service b/init-scripts/abrtd.service
index 1965c24..9ce15ec 100644
--- a/init-scripts/abrtd.service
+++ b/init-scripts/abrtd.service
@@ -1,6 +1,9 @@
[Unit]
Description=ABRT Automated Bug Reporting Tool
-After=syslog.target
+# livesys.service has been added because of live distributions mounting tmpfs
+# to /var/tmp after abrtd.service was started which was hiding /var/tmp/abrt
+# which was created before the mount to tmpfs happened
+After=syslog.target livesys.service
[Service]
ExecStart=/usr/sbin/abrtd -d -s
--
1.8.1.4

29
0006-use-last_occurrence-with-since.patch
View file

@ -1,29 +0,0 @@
From e583b56fd6c3922b149ca55d0f0d1a8cbd1da4a7 Mon Sep 17 00:00:00 2001
From: Jiri Moskovcak <jmoskovc@redhat.com>
Date: Mon, 6 May 2013 13:00:56 +0200
Subject: [ABRT PATCH 6/7] use last_occurrence with --since
closes #645
Signed-off-by: Jiri Moskovcak <jmoskovc@redhat.com>
Signed-off-by: Richard Marko <rmarko@redhat.com>
---
src/lib/problem_api.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/problem_api.c b/src/lib/problem_api.c
index b7dad47..d940767 100644
--- a/src/lib/problem_api.c
+++ b/src/lib/problem_api.c
@@ -174,7 +174,7 @@ GList *get_problem_dirs_for_element_in_time(uid_t uid,
};
const struct problem_condition timec = {
- .field_name = FILENAME_TIME,
+ .field_name = FILENAME_LAST_OCCURRENCE,
.args = &interval,
.evaluate = time_interval_problem_condition
};
--
1.8.1.4

27
0007-don-t-show-non-critical-errors-in-console-notificati.patch
View file

@ -1,27 +0,0 @@
From b3cd1e06c6605990ea0a3ed816ff1e95c65d9f2b Mon Sep 17 00:00:00 2001
From: Jiri Moskovcak <jmoskovc@redhat.com>
Date: Mon, 6 May 2013 13:00:57 +0200
Subject: [ABRT PATCH 7/7] don't show non critical errors in console
notification
closes #646
Signed-off-by: Jiri Moskovcak <jmoskovc@redhat.com>
Signed-off-by: Richard Marko <rmarko@redhat.com>
---
src/cli/abrt-console-notification.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/cli/abrt-console-notification.sh b/src/cli/abrt-console-notification.sh
index df02d05..cd4a779 100755
--- a/src/cli/abrt-console-notification.sh
+++ b/src/cli/abrt-console-notification.sh
@@ -11,4 +11,4 @@ fi
date +%s > "$TMPPATH"
mv "$TMPPATH" "$SINCEFILE"
-abrt-cli status --since="$SINCE"
+abrt-cli status --since="$SINCE" 2> /dev/null
--
1.8.1.4

68
abrt.spec
View file

@ -24,8 +24,8 @@
Summary: Automatic bug detection and reporting tool
Name: abrt
Version: 2.1.4
Release: 3%{?dist}
Version: 2.1.5
Release: 1%{?dist}
License: GPLv2+
Group: Applications/System
URL: https://fedorahosted.org/abrt/
@ -37,14 +37,6 @@ Patch2: abrt-2.1.1-hide_all_ureport_stuff.patch
Patch3: abrt-2.1.1-dont_enable_shortened_reporting_in_gnome.patch
Patch4: abrt-2.1.1-disable_autoreporting_dialog.patch
# Remove with 2.1.5
Patch5: 0001-updated-translation.patch
Patch6: 0002-abrt-uefioops-new-service.patch
Patch7: 0005-abrtd.service-start-after-livesys.service.patch
Patch8: install_uefi.patch
Patch9: 0006-use-last_occurrence-with-since.patch
Patch10:0007-don-t-show-non-critical-errors-in-console-notificati.patch
BuildRequires: dbus-devel
BuildRequires: gtk3-devel
BuildRequires: rpm-devel >= 4.6
@ -60,9 +52,9 @@ BuildRequires: nss-devel
BuildRequires: asciidoc
BuildRequires: doxygen
BuildRequires: xmlto
BuildRequires: libreport-devel >= 2.1.4
BuildRequires: libreport-devel >= 2.1.5
BuildRequires: btparser-devel >= 0.2.5
Requires: libreport >= 2.1.4
Requires: libreport >= 2.1.5
%if %{with systemd}
Requires: systemd-units
@ -133,6 +125,7 @@ Summary: %{name}'s retrace client
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Requires: xz
Requires: tar
%description retrace-client
This package contains the client application for Retrace server
@ -207,6 +200,7 @@ uncaught exception in python programs.
%package tui
Summary: %{name}'s command line interface
Group: User Interface/Desktops
Requires: %{name} = %{version}-%{release}
Requires: libreport-cli
Requires: abrt-libs = %{version}-%{release}
@ -287,6 +281,7 @@ uses PolicyKit to authorize to access the problem data.
Summary: ABRT Python API
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pygobject2
BuildRequires: python-nose
BuildRequires: python-sphinx
BuildArch: noarch
@ -316,12 +311,6 @@ to the shell
%endif
#Fedora
%patch1 -p1 -b .gpgcheck
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%build
autoconf
@ -330,7 +319,10 @@ make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} \
dbusabrtdocdir=%{_defaultdocdir}/%{name}-dbus-%{version}/html/ \
example_pythondir=%{_defaultdocdir}/%{name}-python-%{version}/examples
%find_lang %{name}
# remove all .la and .a files
@ -825,6 +817,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/dbus-1/system-services/org.freedesktop.problems.service
%{_datadir}/polkit-1/actions/abrt_polkit.policy
%config(noreplace) %{_sysconfdir}/libreport/events.d/dbus_event.conf
%dir %{_defaultdocdir}/%{name}-dbus-%{version}/
%dir %{_defaultdocdir}/%{name}-dbus-%{version}/html/
%{_defaultdocdir}/%{name}-dbus-%{version}/html/*.html
%{_defaultdocdir}/%{name}-dbus-%{version}/html/*.css
@ -832,12 +825,49 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files python
%{python_sitelib}/problem/
%{_mandir}/man5/abrt-python.5.gz
%dir %{_defaultdocdir}/%{name}-python-%{version}/
%{_defaultdocdir}/%{name}-python-%{version}/examples/
%files console-notification
%config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh
%changelog
* Fri Jun 14 2013 Jakub Filak <jfilak@redhat.com> 2.1.5-1
- abrt-retrace-client requires tar closes #635
- abrt-tui requires abrt closes #633
- a-d-oops: obtain kernel version from the oops
- a-a-p-ccpp-analysis: import all used attributes
- vmcore: provide all problem elements necessary for the reporting
- a-d-oops: add 'update' command line argument
- a-a-g-core-backtrace: don't crash if kernel file doesn't exist
- a-a-a-vmcore: save kernel version in 'kernel' file
- abrt-cli: make status help message more precise
- abrt-cli status: don't include reported problems into count
- abrt-cli list: implement --since and --until
- abrt-python: open dirs read-only if possible
- dbus: ChownProblemDir method really changes the owner
- python: disable events in collision with anaconda
- abrt-python requires pygobject2
- systemd units: start services only if it make sense
- abrt-harvest-uefioops.in: test for abrtd after testing for pstore, not before
- make abrt-uefioops.service conditional on /sys/fs/pstore being populated
- dbus: fix SetElement failing when shrinking an item
- spec: fix unowned directories
- abrt-python: whole python API path in POTFILES.skip
- abrt-python: fix dbus compatibility on RHEL6
- abrt-python: check if gid equals current users gid
- abrt-python: fix tests compatibility with python 2.6
- abrt-python: pass DD_OPEN_READONLY only if available
- abrt-python: fix deprecation warnings
- console notification shouldn't ask confirmation - closes #652
- Short BT deduplication false positives workaround
- Only problems of same type can be duplicates
- abrt-python: fix bug in problem.get
- abrt-python: pep8 cleanup
- koops parse: support <NMI> frame prefix
- don't show non critical errors in console notification
- Resolves: #958961, #974670
* Mon May 06 2013 Jakub Filak <jfilak@redhat.com> 2.1.4-3
- don't show non critical errors in console notification
- use last_occurrence with --since

323
install_uefi.patch
View file

@ -1,323 +0,0 @@
diff -ruN abrt-2.1.4/Makefile.in abrt-2.1.4.new/Makefile.in
--- abrt-2.1.4/Makefile.in 2013-04-30 17:04:44.000000000 +0200
+++ abrt-2.1.4.new/Makefile.in 2013-05-03 14:32:16.000000000 +0200
@@ -128,7 +128,8 @@
am__dist_systemdsystemunit_DATA_DIST = init-scripts/abrtd.service \
init-scripts/abrt-ccpp.service init-scripts/abrt-oops.service \
init-scripts/abrt-xorg.service \
- init-scripts/abrt-vmcore.service
+ init-scripts/abrt-vmcore.service \
+ init-scripts/abrt-uefioops.service
DATA = $(dist_systemdsystemunit_DATA) $(pkgconfig_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
@@ -408,14 +409,16 @@
@HAVE_SYSTEMD_TRUE@ init-scripts/abrt-ccpp.service \
@HAVE_SYSTEMD_TRUE@ init-scripts/abrt-oops.service \
@HAVE_SYSTEMD_TRUE@ init-scripts/abrt-xorg.service \
-@HAVE_SYSTEMD_TRUE@ init-scripts/abrt-vmcore.service
+@HAVE_SYSTEMD_TRUE@ init-scripts/abrt-vmcore.service \
+@HAVE_SYSTEMD_TRUE@ init-scripts/abrt-uefioops.service
@HAVE_SYSTEMD_FALSE@sysv_initdir = $(sysconfdir)/rc.d/init.d/
@HAVE_SYSTEMD_FALSE@sysv_init_SCRIPTS = init-scripts/abrtd \
@HAVE_SYSTEMD_FALSE@ init-scripts/abrt-ccpp \
@HAVE_SYSTEMD_FALSE@ init-scripts/abrt-oops \
@HAVE_SYSTEMD_FALSE@ init-scripts/abrt-xorg \
-@HAVE_SYSTEMD_FALSE@ init-scripts/abrt-vmcore
+@HAVE_SYSTEMD_FALSE@ init-scripts/abrt-vmcore \
+@HAVE_SYSTEMD_FALSE@ init-scripts/abrt-uefioops
RPM_DIRS = --define "_sourcedir `pwd`" \
--define "_rpmdir `pwd`" \
diff -ruN abrt-2.1.4/src/hooks/Makefile.in abrt-2.1.4.new/src/hooks/Makefile.in
--- abrt-2.1.4/src/hooks/Makefile.in 2013-04-30 17:04:47.000000000 +0200
+++ abrt-2.1.4.new/src/hooks/Makefile.in 2013-05-03 14:40:00.468156772 +0200
@@ -52,6 +52,7 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+bin_PROGRAMS = abrt-merge-uefioops$(EXEEXT)
libexec_PROGRAMS = abrt-hook-ccpp$(EXEEXT)
subdir = src/hooks
DIST_COMMON = $(dist_conf_DATA) $(dist_pluginsconf_DATA) \
@@ -65,10 +66,10 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" \
- "$(DESTDIR)$(pyhookdir)" "$(DESTDIR)$(confdir)" \
- "$(DESTDIR)$(pluginsconfdir)"
-PROGRAMS = $(libexec_PROGRAMS)
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
+ "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(pyhookdir)" \
+ "$(DESTDIR)$(confdir)" "$(DESTDIR)$(pluginsconfdir)"
+PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS)
am_abrt_hook_ccpp_OBJECTS = abrt_hook_ccpp-abrt-hook-ccpp.$(OBJEXT)
abrt_hook_ccpp_OBJECTS = $(am_abrt_hook_ccpp_OBJECTS)
am__DEPENDENCIES_1 =
@@ -77,6 +78,11 @@
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
+am_abrt_merge_uefioops_OBJECTS = \
+ abrt_merge_uefioops-abrt-merge-uefioops.$(OBJEXT)
+abrt_merge_uefioops_OBJECTS = $(am_abrt_merge_uefioops_OBJECTS)
+abrt_merge_uefioops_DEPENDENCIES = ../lib/libabrt.la \
+ $(am__DEPENDENCIES_1)
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -139,8 +145,9 @@
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
-SOURCES = $(abrt_hook_ccpp_SOURCES)
-DIST_SOURCES = $(abrt_hook_ccpp_SOURCES)
+SOURCES = $(abrt_hook_ccpp_SOURCES) $(abrt_merge_uefioops_SOURCES)
+DIST_SOURCES = $(abrt_hook_ccpp_SOURCES) \
+ $(abrt_merge_uefioops_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -175,7 +182,7 @@
DBUS_LIBS = @DBUS_LIBS@
DEFAULT_DUMP_DIR_MODE = @DEFAULT_DUMP_DIR_MODE@
DEFAULT_DUMP_LOCATION = @DEFAULT_DUMP_LOCATION@
-DEFS = @DEFS@
+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DOXYGEN = @DOXYGEN@
@@ -364,7 +371,8 @@
sbin_SCRIPTS = \
abrt-install-ccpp-hook \
- abrt-harvest-vmcore
+ abrt-harvest-vmcore \
+ abrt-harvest-uefioops
# abrt-hook-ccpp
@@ -385,10 +393,33 @@
../lib/libabrt.la \
$(LIBREPORT_LIBS)
-pyhook_PYTHON = abrt_exception_handler.py abrt.pth
+
+# abrt-merge-uefioops
+abrt_merge_uefioops_SOURCES = \
+ abrt-merge-uefioops.c
+
+abrt_merge_uefioops_CPPFLAGS = \
+ -I$(srcdir)/../include \
+ -I$(srcdir)/../lib \
+ -DVAR_RUN=\"$(VAR_RUN)\" \
+ -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
+ -DDEFAULT_DUMP_DIR_MODE=$(DEFAULT_DUMP_DIR_MODE) \
+ $(GLIB_CFLAGS) \
+ $(LIBREPORT_CFLAGS) \
+ -D_GNU_SOURCE
+
+abrt_merge_uefioops_LDADD = \
+ ../lib/libabrt.la \
+ $(LIBREPORT_LIBS)
+
+pyhook_PYTHON = \
+ abrt_exception_handler.py \
+ abrt.pth
+
EXTRA_DIST = abrt_exception_handler.py.in \
abrt-install-ccpp-hook.in \
- abrt-harvest-vmcore.in
+ abrt-harvest-vmcore.in \
+ abrt-harvest-uefioops.in
CLEANFILES := $(notdir $(wildcard *~)) $(notdir $(wildcard *\#)) $(notdir $(wildcard \.\#*)) $(notdir $(wildcard *.pyc)) $(man1_MANS)
all: all-am
@@ -425,6 +456,52 @@
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p || test -f $$p1; \
+ then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ } \
+ ; done
+
+uninstall-binPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+ -e 's/$$/$(EXEEXT)/' `; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+ @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+ echo " rm -f" $$list; \
+ rm -f $$list || exit $$?; \
+ test -n "$(EXEEXT)" || exit 0; \
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
install-libexecPROGRAMS: $(libexec_PROGRAMS)
@$(NORMAL_INSTALL)
@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
@@ -474,6 +551,9 @@
abrt-hook-ccpp$(EXEEXT): $(abrt_hook_ccpp_OBJECTS) $(abrt_hook_ccpp_DEPENDENCIES) $(EXTRA_abrt_hook_ccpp_DEPENDENCIES)
@rm -f abrt-hook-ccpp$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(abrt_hook_ccpp_OBJECTS) $(abrt_hook_ccpp_LDADD) $(LIBS)
+abrt-merge-uefioops$(EXEEXT): $(abrt_merge_uefioops_OBJECTS) $(abrt_merge_uefioops_DEPENDENCIES) $(EXTRA_abrt_merge_uefioops_DEPENDENCIES)
+ @rm -f abrt-merge-uefioops$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(abrt_merge_uefioops_OBJECTS) $(abrt_merge_uefioops_LDADD) $(LIBS)
install-sbinSCRIPTS: $(sbin_SCRIPTS)
@$(NORMAL_INSTALL)
@list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || list=; \
@@ -517,6 +597,7 @@
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/abrt_hook_ccpp-abrt-hook-ccpp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/abrt_merge_uefioops-abrt-merge-uefioops.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -553,6 +634,20 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(abrt_hook_ccpp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o abrt_hook_ccpp-abrt-hook-ccpp.obj `if test -f 'abrt-hook-ccpp.c'; then $(CYGPATH_W) 'abrt-hook-ccpp.c'; else $(CYGPATH_W) '$(srcdir)/abrt-hook-ccpp.c'; fi`
+abrt_merge_uefioops-abrt-merge-uefioops.o: abrt-merge-uefioops.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(abrt_merge_uefioops_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT abrt_merge_uefioops-abrt-merge-uefioops.o -MD -MP -MF $(DEPDIR)/abrt_merge_uefioops-abrt-merge-uefioops.Tpo -c -o abrt_merge_uefioops-abrt-merge-uefioops.o `test -f 'abrt-merge-uefioops.c' || echo '$(srcdir)/'`abrt-merge-uefioops.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/abrt_merge_uefioops-abrt-merge-uefioops.Tpo $(DEPDIR)/abrt_merge_uefioops-abrt-merge-uefioops.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='abrt-merge-uefioops.c' object='abrt_merge_uefioops-abrt-merge-uefioops.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(abrt_merge_uefioops_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o abrt_merge_uefioops-abrt-merge-uefioops.o `test -f 'abrt-merge-uefioops.c' || echo '$(srcdir)/'`abrt-merge-uefioops.c
+
+abrt_merge_uefioops-abrt-merge-uefioops.obj: abrt-merge-uefioops.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(abrt_merge_uefioops_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT abrt_merge_uefioops-abrt-merge-uefioops.obj -MD -MP -MF $(DEPDIR)/abrt_merge_uefioops-abrt-merge-uefioops.Tpo -c -o abrt_merge_uefioops-abrt-merge-uefioops.obj `if test -f 'abrt-merge-uefioops.c'; then $(CYGPATH_W) 'abrt-merge-uefioops.c'; else $(CYGPATH_W) '$(srcdir)/abrt-merge-uefioops.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/abrt_merge_uefioops-abrt-merge-uefioops.Tpo $(DEPDIR)/abrt_merge_uefioops-abrt-merge-uefioops.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='abrt-merge-uefioops.c' object='abrt_merge_uefioops-abrt-merge-uefioops.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(abrt_merge_uefioops_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o abrt_merge_uefioops-abrt-merge-uefioops.obj `if test -f 'abrt-merge-uefioops.c'; then $(CYGPATH_W) 'abrt-merge-uefioops.c'; else $(CYGPATH_W) '$(srcdir)/abrt-merge-uefioops.c'; fi`
+
mostlyclean-libtool:
-rm -f *.lo
@@ -739,7 +834,7 @@
check: check-am
all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(pyhookdir)" "$(DESTDIR)$(confdir)" "$(DESTDIR)$(pluginsconfdir)"; do \
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(pyhookdir)" "$(DESTDIR)$(confdir)" "$(DESTDIR)$(pluginsconfdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -775,8 +870,8 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libexecPROGRAMS clean-libtool \
- mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \
+ clean-libtool mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -803,7 +898,8 @@
install-dvi-am:
-install-exec-am: install-libexecPROGRAMS install-sbinSCRIPTS
+install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \
+ install-sbinSCRIPTS
install-html: install-html-am
@@ -843,30 +939,30 @@
ps-am:
-uninstall-am: uninstall-dist_confDATA uninstall-dist_pluginsconfDATA \
- uninstall-libexecPROGRAMS uninstall-pyhookPYTHON \
- uninstall-sbinSCRIPTS
+uninstall-am: uninstall-binPROGRAMS uninstall-dist_confDATA \
+ uninstall-dist_pluginsconfDATA uninstall-libexecPROGRAMS \
+ uninstall-pyhookPYTHON uninstall-sbinSCRIPTS
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libexecPROGRAMS clean-libtool cscopelist ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am \
- install-data-local install-dist_confDATA \
- install-dist_pluginsconfDATA install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-libexecPROGRAMS \
- install-man install-pdf install-pdf-am install-ps \
- install-ps-am install-pyhookPYTHON install-sbinSCRIPTS \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-dist_confDATA uninstall-dist_pluginsconfDATA \
- uninstall-libexecPROGRAMS uninstall-pyhookPYTHON \
- uninstall-sbinSCRIPTS
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ clean-generic clean-libexecPROGRAMS clean-libtool cscopelist \
+ ctags distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-binPROGRAMS \
+ install-data install-data-am install-data-local \
+ install-dist_confDATA install-dist_pluginsconfDATA install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am \
+ install-libexecPROGRAMS install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-pyhookPYTHON \
+ install-sbinSCRIPTS install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am uninstall-binPROGRAMS uninstall-dist_confDATA \
+ uninstall-dist_pluginsconfDATA uninstall-libexecPROGRAMS \
+ uninstall-pyhookPYTHON uninstall-sbinSCRIPTS
# Generate on build
@@ -893,6 +989,11 @@
sed -e s,\@CONF_DIR\@,\$(CONF_DIR)\,g \
-e s,\@DEFAULT_DUMP_LOCATION\@,$(DEFAULT_DUMP_LOCATION),g \
$< >$@
+
+abrt-harvest-uefioops: abrt-harvest-uefioops.in
+ sed -e s,\@CONF_DIR\@,\$(CONF_DIR)\,g \
+ -e s,\@DEFAULT_DUMP_LOCATION\@,$(DEFAULT_DUMP_LOCATION),g \
+ $< >$@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

2
sources
View file

@ -1 +1 @@
bca895b56c2d8020ffbf6537c52c9bd8 abrt-2.1.4.tar.gz
45e3dbbcb4c66aefda8bf5b5315bfdc6 abrt-2.1.5.tar.gz