diff --git a/0025-bodhi-fix-typo-in-error-messages.patch b/0025-bodhi-fix-typo-in-error-messages.patch new file mode 100644 index 0000000..dfa8cdc --- /dev/null +++ b/0025-bodhi-fix-typo-in-error-messages.patch @@ -0,0 +1,39 @@ +From 288c3de2a74f82972e35465fb82227cd7bfc5766 Mon Sep 17 00:00:00 2001 +From: Matej Habrnal +Date: Mon, 21 Sep 2015 10:11:22 +0200 +Subject: [PATCH] bodhi: fix typo in error messages + +"Reselase" -> "Release" + +Related to rhbz#1264591 + +Signed-off-by: Matej Habrnal +--- + src/plugins/bodhi.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/plugins/bodhi.c b/src/plugins/bodhi.c +index bbd88f7..809d398 100644 +--- a/src/plugins/bodhi.c ++++ b/src/plugins/bodhi.c +@@ -492,7 +492,7 @@ int main(int argc, char **argv) + { + /* There are no bodhi updates for Rawhide */ + if (strcasecmp(release, "rawhide") == 0) +- error_msg_and_die("Reselase \"%s\" is not supported",release); ++ error_msg_and_die("Release \"%s\" is not supported",release); + + query = strbuf_append_strf(query, "releases=%s&", release); + } +@@ -524,7 +524,7 @@ int main(int argc, char **argv) + if (rawhide) + { + strbuf_free(query); +- error_msg_and_die("Reselase \"Rawhide\" is not supported"); ++ error_msg_and_die("Release \"Rawhide\" is not supported"); + } + } + } +-- +2.5.0 + diff --git a/0026-abrt-dump-xorg-support-Xorg-log-backtraces-prefixed-.patch b/0026-abrt-dump-xorg-support-Xorg-log-backtraces-prefixed-.patch new file mode 100644 index 0000000..82b8fc0 --- /dev/null +++ b/0026-abrt-dump-xorg-support-Xorg-log-backtraces-prefixed-.patch @@ -0,0 +1,109 @@ +From edf897e2d62e6cb290b314e41a471894e2a2ca8f Mon Sep 17 00:00:00 2001 +From: Matej Habrnal +Date: Thu, 24 Sep 2015 10:30:47 +0200 +Subject: [PATCH] abrt-dump-xorg: support Xorg log backtraces prefixed by (EE) + +The backtraces looks like + [ 60244.259] (EE) Backtrace + [ 60244.262] (EE) 0: /usr/libexec/Xorg (OsLookupColor+0x139) [0x59add9] + [ 60244.264] (EE) 1: /lib64/libc.so.6 (__restore_rt+0x0) [0x7f61be425b1f] + ... + [ 60244.273] (EE) 13: ? (?+0x29) [0x29] + [ 60244.273] (EE) + [ 60244.273] (EE) Segmentation fault at address 0x7f61d93f6160 + +This format of Xorg log files was not supported by abrt-dump-xorg tool. + +Related to rhbz#1264739 + +Signed-off-by: Matej Habrnal +--- + src/plugins/abrt-dump-xorg.c | 57 +++++++++++++++++++++++++++++--------------- + 1 file changed, 38 insertions(+), 19 deletions(-) + +diff --git a/src/plugins/abrt-dump-xorg.c b/src/plugins/abrt-dump-xorg.c +index 4aaff11..6cdfc95 100644 +--- a/src/plugins/abrt-dump-xorg.c ++++ b/src/plugins/abrt-dump-xorg.c +@@ -51,8 +51,19 @@ static char *skip_pfx(char *p) + char *q = strchr(p, ']'); + if (!q) + return p; ++ + if (q[1] == ' ') +- return q + 2; ++ { ++ q += 2; ++ /* if there is (EE), ignore it */ ++ if (strncmp(q, "(EE)", 4) == 0) ++ { ++ /* if ' ' follows (EE), ignore it too */ ++ return q + (4 + (q[4] == ' ')); ++ } ++ ++ return q; ++ } + return p; + } + +@@ -114,24 +125,24 @@ static void save_bt_to_dump_dir(const char *bt, const char *exe, const char *rea + /* Called after "Backtrace:" line was read. + * Example (yes, stray newline before 'B' is real): + [ 86985.879] +-Backtrace: +-[ 86985.880] 0: /usr/bin/Xorg (xorg_backtrace+0x2f) [0x462d8f] +-[ 86985.880] 1: /usr/bin/Xorg (0x400000+0x67b56) [0x467b56] +-[ 86985.880] 2: /lib64/libpthread.so.0 (0x30a5800000+0xf4f0) [0x30a580f4f0] +-[ 86985.880] 3: /usr/lib64/xorg/modules/extensions/librecord.so (0x7ff6c225e000+0x26c3) [0x7ff6c22606c3] +-[ 86985.880] 4: /usr/bin/Xorg (_CallCallbacks+0x3c) [0x43820c] +-[ 86985.880] 5: /usr/bin/Xorg (WriteToClient+0x1f5) [0x466315] +-[ 86985.880] 6: /usr/lib64/xorg/modules/extensions/libdri2.so (ProcDRI2WaitMSCReply+0x4f) [0x7ff6c1e4feef] +-[ 86985.880] 7: /usr/lib64/xorg/modules/extensions/libdri2.so (DRI2WaitMSCComplete+0x52) [0x7ff6c1e4e6d2] +-[ 86985.880] 8: /usr/lib64/xorg/modules/drivers/intel_drv.so (0x7ff6c1bfb000+0x25ae4) [0x7ff6c1c20ae4] +-[ 86985.880] 9: /usr/lib64/libdrm.so.2 (drmHandleEvent+0xa3) [0x376b407513] +-[ 86985.880] 10: /usr/bin/Xorg (WakeupHandler+0x6b) [0x4379db] +-[ 86985.880] 11: /usr/bin/Xorg (WaitForSomething+0x1a9) [0x460289] +-[ 86985.880] 12: /usr/bin/Xorg (0x400000+0x3379a) [0x43379a] +-[ 86985.880] 13: /usr/bin/Xorg (0x400000+0x22dc5) [0x422dc5] +-[ 86985.880] 14: /lib64/libc.so.6 (__libc_start_main+0xed) [0x30a542169d] +-[ 86985.880] 15: /usr/bin/Xorg (0x400000+0x230b1) [0x4230b1] +-[ 86985.880] Segmentation fault at address 0x7ff6bf09e010 ++[ 60244.259] (EE) Backtrace: ++[ 60244.262] (EE) 0: /usr/libexec/Xorg (OsLookupColor+0x139) [0x59add9] ++[ 60244.264] (EE) 1: /lib64/libc.so.6 (__restore_rt+0x0) [0x7f61be425b1f] ++[ 60244.266] (EE) 2: /usr/lib64/xorg/modules/drivers/intel_drv.so (_init+0xa9fc) [0x7f61b903116c] ++[ 60244.267] (EE) 3: /usr/lib64/xorg/modules/drivers/intel_drv.so (_init+0xbe27) [0x7f61b90339a7] ++[ 60244.268] (EE) 4: /usr/lib64/xorg/modules/drivers/intel_drv.so (_init+0x31060) [0x7f61b907db00] ++[ 60244.269] (EE) 5: /usr/lib64/xorg/modules/drivers/intel_drv.so (_init+0x3fb73) [0x7f61b909b0c3] ++[ 60244.270] (EE) 6: /usr/lib64/xorg/modules/drivers/intel_drv.so (_init+0x3fe1a) [0x7f61b909b77a] ++[ 60244.270] (EE) 7: /usr/libexec/Xorg (DamageRegionAppend+0x3783) [0x525003] ++[ 60244.270] (EE) 8: /usr/libexec/Xorg (SendGraphicsExpose+0xeb3) [0x4340b3] ++[ 60244.270] (EE) 9: /usr/libexec/Xorg (SendErrorToClient+0x2df) [0x43684f] ++[ 60244.271] (EE) 10: /usr/libexec/Xorg (remove_fs_handlers+0x453) [0x43a893] ++[ 60244.272] (EE) 11: /lib64/libc.so.6 (__libc_start_main+0xf0) [0x7f61be411580] ++[ 60244.272] (EE) 12: /usr/libexec/Xorg (_start+0x29) [0x424b79] ++[ 60244.273] (EE) 13: ? (?+0x29) [0x29] ++[ 60244.273] (EE) ++[ 60244.273] (EE) Segmentation fault at address 0x7f61d93f6160 ++[ 60244.273] (EE) + */ + static void process_xorg_bt(void) + { +@@ -144,6 +155,14 @@ static void process_xorg_bt(void) + { + char *p = skip_pfx(line); + ++ /* ignore empty lines ++ * [ 60244.273] (EE) 13: ? (?+0x29) [0x29] ++ * [ 60244.273] (EE) <--- ++ * [ 60244.273] (EE) Segmentation fault at address 0x7f61d93f6160 ++ */ ++ if (*p == '\0') ++ continue; ++ + /* xorg-server-1.12.0/os/osinit.c: + * if (sip->si_code == SI_USER) { + * ErrorF("Recieved signal %d sent by process %ld, uid %ld\n", +-- +2.5.0 + diff --git a/0027-a-a-a-ccpp-local-don-t-delete-build_ids.patch b/0027-a-a-a-ccpp-local-don-t-delete-build_ids.patch new file mode 100644 index 0000000..67ea214 --- /dev/null +++ b/0027-a-a-a-ccpp-local-don-t-delete-build_ids.patch @@ -0,0 +1,27 @@ +From 7b393bb4b8eae7873996467ea11706127e1dbf85 Mon Sep 17 00:00:00 2001 +From: Richard Marko +Date: Wed, 17 Jun 2015 15:16:03 +0200 +Subject: [PATCH] a-a-a-ccpp-local don't delete build_ids + +rm -f always succeeds that causes further actions to run. + +Signed-off-by: Richard Marko +--- + src/plugins/abrt-action-analyze-ccpp-local.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/plugins/abrt-action-analyze-ccpp-local.in b/src/plugins/abrt-action-analyze-ccpp-local.in +index 5a42a03..d3df01d 100644 +--- a/src/plugins/abrt-action-analyze-ccpp-local.in ++++ b/src/plugins/abrt-action-analyze-ccpp-local.in +@@ -28,7 +28,6 @@ if $INSTALL_DI; then + else + abrt-action-analyze-core --core=coredump -o build_ids && @LIBEXEC_DIR@/abrt-action-install-debuginfo-to-abrt-cache --size_mb=4096 + fi +- rm -f build_ids + fi + + if [ $? = 0 ]; then +-- +2.5.0 + diff --git a/0028-abrt-retrace-client-use-atoll-for-_size-conversion.patch b/0028-abrt-retrace-client-use-atoll-for-_size-conversion.patch new file mode 100644 index 0000000..87a0c43 --- /dev/null +++ b/0028-abrt-retrace-client-use-atoll-for-_size-conversion.patch @@ -0,0 +1,35 @@ +From e5a29b08bb48b408c5e88fa5382f8253ca90a937 Mon Sep 17 00:00:00 2001 +From: Richard Marko +Date: Thu, 8 Oct 2015 15:03:26 +0200 +Subject: [PATCH] abrt-retrace-client: use atoll for _size conversion + +Otherwise we get + +The size of your crash is 28.1 MiB, but the retrace server only accepts +crashes smaller or equal to 16.0 EiB. + +(gdb) print settings->max_unpacked_size +$4 = -50331648 +--- + src/plugins/abrt-retrace-client.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/plugins/abrt-retrace-client.c b/src/plugins/abrt-retrace-client.c +index 0b67773..540cdc9 100644 +--- a/src/plugins/abrt-retrace-client.c ++++ b/src/plugins/abrt-retrace-client.c +@@ -256,9 +256,9 @@ struct retrace_settings *get_settings() + else if (0 == strcasecmp("max_running_tasks", row)) + settings->max_running_tasks = atoi(value); + else if (0 == strcasecmp("max_packed_size", row)) +- settings->max_packed_size = atoi(value) * 1024 * 1024; ++ settings->max_packed_size = atoll(value) * 1024 * 1024; + else if (0 == strcasecmp("max_unpacked_size", row)) +- settings->max_unpacked_size = atoi(value) * 1024 * 1024; ++ settings->max_unpacked_size = atoll(value) * 1024 * 1024; + else if (0 == strcasecmp("supported_formats", row)) + { + char *space; +-- +2.5.0 + diff --git a/0029-doc-fix-default-DumpLocation-in-abrt.conf-man-page.patch b/0029-doc-fix-default-DumpLocation-in-abrt.conf-man-page.patch new file mode 100644 index 0000000..29dde63 --- /dev/null +++ b/0029-doc-fix-default-DumpLocation-in-abrt.conf-man-page.patch @@ -0,0 +1,28 @@ +From 6bb7cdc454a824826362c68af66cdb92b4bc6653 Mon Sep 17 00:00:00 2001 +From: Matej Habrnal +Date: Mon, 12 Oct 2015 14:03:13 +0200 +Subject: [PATCH] doc: fix default DumpLocation in abrt.conf man page + +ABRT no longer stores crashes to /var/tmp/abrt by default. + +Signed-off-by: Matej Habrnal +--- + doc/abrt.conf.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/abrt.conf.txt b/doc/abrt.conf.txt +index d782e3d..6626596 100644 +--- a/doc/abrt.conf.txt ++++ b/doc/abrt.conf.txt +@@ -16,7 +16,7 @@ A description of each item follows: + + DumpLocation = 'directory':: + The directory where should 'abrt' store coredumps and all files which are +- needed for reporting. The default is /var/tmp/abrt. ++ needed for reporting. The default is /var/spool/abrt. + + MaxCrashReportsSize = 'number':: + The maximum disk space (specified in megabytes) that 'abrt' +-- +2.5.0 + diff --git a/abrt.spec b/abrt.spec index 113904b..a125582 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.6.1 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: Applications/System URL: https://abrt.readthedocs.org/ @@ -83,6 +83,11 @@ Patch0021: 0021-bodhi-add-ignoring-of-Rawhide.patch Patch0022: 0022-bodhi-add-parsing-of-error-responses.patch Patch0023: 0023-doc-actualize-the-abrt-bodhi-man-page.patch Patch0024: 0024-bodhi-fix-a-segfault-when-testing-an-os-release-opt-.patch +Patch0025: 0025-bodhi-fix-typo-in-error-messages.patch +Patch0026: 0026-abrt-dump-xorg-support-Xorg-log-backtraces-prefixed-.patch +Patch0027: 0027-a-a-a-ccpp-local-don-t-delete-build_ids.patch +Patch0028: 0028-abrt-retrace-client-use-atoll-for-_size-conversion.patch +Patch0029: 0029-doc-fix-default-DumpLocation-in-abrt.conf-man-page.patch # '%%autosetup -S git' -> git BuildRequires: git @@ -1071,6 +1076,13 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Fri Oct 16 2015 Matej Habrnal 2.6.1-6 +- doc: fix default DumpLocation in abrt.conf man page +- abrt-retrace-client: use atoll for _size conversion +- a-a-a-ccpp-local don't delete build_ids +- abrt-dump-xorg: support Xorg log backtraces prefixed by (EE +- bodhi: fix typo in error messages + * Thu Sep 17 2015 Matej Habrnal 2.6.1-5 - doc: actualize the abrt-bodhi man page - bodhi: fix a segfault when testing an os-release opt for 'rawhide'