diff --git a/.gitignore b/.gitignore index 2691f64..d84f99d 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ abrt-1.1.13.tar.gz /abrt-2.1.12.tar.gz /abrt-2.2.0.tar.gz /abrt-2.2.1.tar.gz +/abrt-2.2.2.tar.gz diff --git a/0002-dbus-Fix-desktop-centric-polkit-policy-file.patch b/0002-dbus-Fix-desktop-centric-polkit-policy-file.patch deleted file mode 100644 index f5743e9..0000000 --- a/0002-dbus-Fix-desktop-centric-polkit-policy-file.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e98c8766655216db3d9a08b1fa52ba7decf57c46 Mon Sep 17 00:00:00 2001 -From: Stef Walter -Date: Mon, 5 May 2014 08:41:00 +0200 -Subject: [PATCH 2/2] dbus: Fix desktop centric polkit policy file - -In order to allow use of ABRT's DBus API on servers, the polkit -policy should allow admin usage even when not logged in an active -seat (ie: monitor and keyboard). Otherwise use from ssh logins and -Cockpit is prevented. ---- - src/dbus/abrt_polkit.policy | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/dbus/abrt_polkit.policy b/src/dbus/abrt_polkit.policy -index 06008b4..a3425d9 100644 ---- a/src/dbus/abrt_polkit.policy -+++ b/src/dbus/abrt_polkit.policy -@@ -19,9 +19,9 @@ Copyright (c) 2012 ABRT Team - Get problems from all users - Reading others problems requires authentication - -- no -+ auth_admin - auth_admin_keep -- no -+ auth_admin - - - -@@ -30,9 +30,9 @@ Copyright (c) 2012 ABRT Team - Set value of configuration properties - Update configuration values reuquires authentication - -- no -+ auth_admin - auth_admin_keep -- no -+ auth_admin - - - --- -1.9.0 - diff --git a/0003-dbus-Fix-invalid-dbus-policy-file.patch b/0003-dbus-Fix-invalid-dbus-policy-file.patch deleted file mode 100644 index 29d5e44..0000000 --- a/0003-dbus-Fix-invalid-dbus-policy-file.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 050ebb0786dc2ea24ffbb560b16bc2cbc7ccfedc Mon Sep 17 00:00:00 2001 -From: Stef Walter -Date: Tue, 6 May 2014 14:12:22 +0200 -Subject: [PATCH 3/3] dbus: Fix invalid dbus policy file - -The use of at_console is a bit of a relic from times before polkit. - -But more importantly I've removed a section that has no effect, and -opens up the dbus policy for an invalid name: org.freedesktop.org ---- - src/dbus/dbus-abrt.conf | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/src/dbus/dbus-abrt.conf b/src/dbus/dbus-abrt.conf -index 159d5ef..3bac353 100644 ---- a/src/dbus/dbus-abrt.conf -+++ b/src/dbus/dbus-abrt.conf -@@ -16,11 +16,6 @@ - - - -- -- -- -- -- - - - --- -1.9.0 - diff --git a/0004-gdb-disable-loading-of-auto-loaded-files.patch b/0004-gdb-disable-loading-of-auto-loaded-files.patch deleted file mode 100644 index 4ba8d0c..0000000 --- a/0004-gdb-disable-loading-of-auto-loaded-files.patch +++ /dev/null @@ -1,121 +0,0 @@ -From 77a270a948216a8bb5bcc960042aeb467794b593 Mon Sep 17 00:00:00 2001 -From: Jakub Filak -Date: Mon, 9 Jun 2014 17:13:09 +0200 -Subject: [ABRT PATCH 4/5] gdb: disable loading of auto-loaded files - -https://sourceware.org/gdb/onlinedocs/gdb/Auto_002dloading.html - -There are two main reasons for doing so: -1. we cannot trust anybody - - the auto-loaded file may change the output format - - security? -2. bugs in such a files (#817) - -Signed-off-by: Jakub Filak ---- - src/lib/hooklib.c | 40 +++++++++++++++++++++------------------- - 1 file changed, 21 insertions(+), 19 deletions(-) - -diff --git a/src/lib/hooklib.c b/src/lib/hooklib.c -index 4a50727..21ad9e0 100644 ---- a/src/lib/hooklib.c -+++ b/src/lib/hooklib.c -@@ -252,10 +252,12 @@ char *get_backtrace(const char *dump_dir_name, unsigned timeout_sec, const char - /* Let user know what's going on */ - log(_("Generating backtrace")); - -- char *args[21]; -+ char *args[23]; - args[0] = (char*)"gdb"; - args[1] = (char*)"-batch"; - args[2] = (char*)"-ex"; -+ args[3] = (char*)"set auto-load off"; -+ args[4] = (char*)"-ex"; - struct strbuf *set_debug_file_directory = strbuf_new(); - if(debuginfo_dirs == NULL) - { -@@ -278,7 +280,7 @@ char *get_backtrace(const char *dump_dir_name, unsigned timeout_sec, const char - p = colon_or_nul; - } - } -- args[3] = strbuf_free_nobuf(set_debug_file_directory); -+ args[5] = strbuf_free_nobuf(set_debug_file_directory); - - /* "file BINARY_FILE" is needed, without it gdb cannot properly - * unwind the stack. Currently the unwind information is located -@@ -300,27 +302,27 @@ char *get_backtrace(const char *dump_dir_name, unsigned timeout_sec, const char - * TODO: check mtimes on COREFILE and BINARY_FILE and not supply - * BINARY_FILE if it is newer (to at least avoid gdb complaining). - */ -- args[4] = (char*)"-ex"; -- args[5] = xasprintf("file %s", executable); -- free(executable); -- - args[6] = (char*)"-ex"; -- args[7] = xasprintf("core-file %s/"FILENAME_COREDUMP, dump_dir_name); -+ args[7] = xasprintf("file %s", executable); -+ free(executable); - - args[8] = (char*)"-ex"; -- /*args[9] = ... see below */ -+ args[9] = xasprintf("core-file %s/"FILENAME_COREDUMP, dump_dir_name); -+ - args[10] = (char*)"-ex"; -- args[11] = (char*)"info sharedlib"; -- /* glibc's abort() stores its message in __abort_msg variable */ -+ /*args[11] = ... see below */ - args[12] = (char*)"-ex"; -- args[13] = (char*)"print (char*)__abort_msg"; -+ args[13] = (char*)"info sharedlib"; -+ /* glibc's abort() stores its message in __abort_msg variable */ - args[14] = (char*)"-ex"; -- args[15] = (char*)"print (char*)__glib_assert_msg"; -+ args[15] = (char*)"print (char*)__abort_msg"; - args[16] = (char*)"-ex"; -- args[17] = (char*)"info all-registers"; -+ args[17] = (char*)"print (char*)__glib_assert_msg"; - args[18] = (char*)"-ex"; -- args[19] = (char*)"disassemble"; -- args[20] = NULL; -+ args[19] = (char*)"info all-registers"; -+ args[20] = (char*)"-ex"; -+ args[21] = (char*)"disassemble"; -+ args[22] = NULL; - - /* Get the backtrace, but try to cap its size */ - /* Limit bt depth. With no limit, gdb sometimes OOMs the machine */ -@@ -330,9 +332,9 @@ char *get_backtrace(const char *dump_dir_name, unsigned timeout_sec, const char - char *bt = NULL; - while (1) - { -- args[9] = xasprintf("%s backtrace %u%s", thread_apply_all, bt_depth, full); -+ args[11] = xasprintf("%s backtrace %u%s", thread_apply_all, bt_depth, full); - bt = exec_vp(args, /*redirect_stderr:*/ 1, timeout_sec, NULL); -- free(args[9]); -+ free(args[11]); - if ((bt && strnlen(bt, 256*1024) < 256*1024) || bt_depth <= 32) - { - break; -@@ -357,7 +359,7 @@ char *get_backtrace(const char *dump_dir_name, unsigned timeout_sec, const char - * End of assembler dump. - * (IOW: "empty" dump) - */ -- args[19] = (char*)"disassemble $pc-20, $pc+64"; -+ args[21] = (char*)"disassemble $pc-20, $pc+64"; - - if (bt_depth <= 64 && thread_apply_all[0] != '\0') - { -@@ -373,9 +375,9 @@ char *get_backtrace(const char *dump_dir_name, unsigned timeout_sec, const char - } - } - -- free(args[3]); - free(args[5]); - free(args[7]); -+ free(args[9]); - return bt; - } - --- -1.8.3.1 - diff --git a/0005-replace-deprecated-GTK3-functions.patch b/0005-replace-deprecated-GTK3-functions.patch deleted file mode 100644 index 1e1db14..0000000 --- a/0005-replace-deprecated-GTK3-functions.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 4f468492682212eeff91a4d7e35e868820d05c9b Mon Sep 17 00:00:00 2001 -From: Jakub Filak -Date: Tue, 10 Jun 2014 10:39:19 +0200 -Subject: [ABRT PATCH 5/5] replace deprecated GTK3 functions - -Closes rhbz#1105940 - -Signed-off-by: Jakub Filak ---- - src/configuration-gui/abrt-config-widget.c | 7 +++++++ - src/configuration-gui/system-config-abrt.c | 4 ++++ - 2 files changed, 11 insertions(+) - -diff --git a/src/configuration-gui/abrt-config-widget.c b/src/configuration-gui/abrt-config-widget.c -index 45eac95..664180d 100644 ---- a/src/configuration-gui/abrt-config-widget.c -+++ b/src/configuration-gui/abrt-config-widget.c -@@ -280,7 +280,14 @@ abrt_config_widget_init(AbrtConfigWidget *self) - connect_switch_with_option(self, ABRT_OPT_SILENT_SHORTENED_REPORTING, "switch_silent_shortened_reporting"); - connect_switch_with_option(self, ABRT_OPT_NOTIFY_INCOMPLETE_PROBLEMS, "switch_notify_incomplete_problems"); - -+#if ((GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION < 13) || (GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION == 13 && GTK_MICRO_VERSION == 1)) -+ /* https://developer.gnome.org/gtk3/3.13/GtkWidget.html#gtk-widget-reparent */ -+ /* gtk_widget_reparent has been deprecated since version 3.13.2 and should not be used in newly-written code. */ - gtk_widget_reparent(WID("grid"), GTK_WIDGET(self)); -+#else -+ gtk_container_remove(GTK_CONTAINER(WID("window1")), WID("grid")); -+ gtk_container_add(GTK_CONTAINER(self), WID("grid")); -+#endif - - /* Set the initial state of the properties */ - gtk_widget_show_all(GTK_WIDGET(self)); -diff --git a/src/configuration-gui/system-config-abrt.c b/src/configuration-gui/system-config-abrt.c -index bd9f13f..b3bf1b0 100644 ---- a/src/configuration-gui/system-config-abrt.c -+++ b/src/configuration-gui/system-config-abrt.c -@@ -53,9 +53,13 @@ GtkWidget *system_config_abrt_widget_new_with_close_button(system_config_abrt_wi - gtk_widget_set_visible(GTK_WIDGET(config), TRUE); - gtk_box_pack_start(box, GTK_WIDGET(config), /*expand*/TRUE, /*fill*/TRUE, /*padding*/0); - -+#if ((GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION < 13) || (GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION == 13 && GTK_MICRO_VERSION == 1)) -+ /* https://developer.gnome.org/gtk3/3.13/GtkAlignment.html#gtk-alignment-new */ -+ /* GtkAlignment has been deprecated. Use GtkWidget alignment and margin properties */ - gtk_box_pack_start(GTK_BOX(box), - gtk_alignment_new(/*xalign*/.5, /*yalign*/.5, /*xscale*/.5, /*yscale*/.5), - /*expand*/TRUE, /*fill*/TRUE, /*padding*/0); -+#endif - - GtkWidget *buttons = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, /*spacing*/0); - gtk_box_pack_start(GTK_BOX(box), buttons, /*expand*/TRUE, /*fill*/FALSE, /*padding*/0); --- -1.8.3.1 - diff --git a/abrt.spec b/abrt.spec index 517da03..d45f5a9 100644 --- a/abrt.spec +++ b/abrt.spec @@ -34,13 +34,13 @@ %define docdirversion -%{version} %endif -%define libreport_ver 2.2.2 -%define satyr_ver 0.13 +%define libreport_ver 2.2.3 +%define satyr_ver 0.14 Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.2.1 -Release: 6%{?dist} +Version: 2.2.2 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/abrt/ @@ -48,11 +48,6 @@ Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz # don't remove this patch, packages in rawhide are not signed! Patch0: disable-OpenGPGCheck-in-Fedora-Rawhide.patch -Patch2: 0002-dbus-Fix-desktop-centric-polkit-policy-file.patch -Patch3: 0003-dbus-Fix-invalid-dbus-policy-file.patch -Patch4: 0004-gdb-disable-loading-of-auto-loaded-files.patch -Patch5: 0005-replace-deprecated-GTK3-functions.patch - # '%%autosetup -S git' -> git BuildRequires: git @@ -927,6 +922,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Tue Jul 08 2014 Jakub Filak 2.2.2-1 +- applet: chown each notified problem before reporting it +- koops: don't analyze MCEs like standard oopses +- koops: don't drop not-reportable oopses by default +- abrt_event: fix post-create reporter-uploader examples +- local duplicates must have matching executables +- Resolves: #1105316 + * Tue Jun 10 2014 Jakub Filak - 2.2.1-6 - configui: do not use deprecated gtk3 API - gdb: disable auto-loaded files diff --git a/sources b/sources index 2f38eb1..9853fec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -799e55397e1f72dde9486395abe17605 abrt-2.2.1.tar.gz +5133980911a7d841d073c61a75a490a1 abrt-2.2.2.tar.gz