diff --git a/abrt-2.1.1-disable_autoreporting_dialog.patch b/abrt-2.1.1-disable_autoreporting_dialog.patch new file mode 100644 index 0000000..c12a7ec --- /dev/null +++ b/abrt-2.1.1-disable_autoreporting_dialog.patch @@ -0,0 +1,30 @@ +diff -ur abrt-2.1.1/src/applet/applet.c abrt-2.1.1.new/src/applet/applet.c +--- abrt-2.1.1/src/applet/applet.c 2013-02-01 17:05:40.000000000 +0100 ++++ abrt-2.1.1.new/src/applet/applet.c 2013-03-05 12:16:42.463747490 +0100 +@@ -89,25 +89,7 @@ + + static void ask_start_autoreporting() + { +- /* The "Yes" response will be saved even if user don't check the +- * "Don't ask me again" box. +- */ +- const int ret = run_ask_yes_no_save_result_dialog("AutoreportingEnabled", +- _("The report which will be sent does not contain any security sensitive data. " +- "Therefore it is not necessary to bother you next time and require any further action by you. " +- "\nDo you want to enable automatically submitted anonymous crash reports?"), +- /*parent wnd */ NULL); +- +- /* Don't forget: +- * +- * The "Yes" response will be saved even if user don't check the +- * "Don't ask me again" box. +- */ +- if (ret != 0) +- set_user_setting("AutoreportingEnabled", "yes"); +- +- /* must be called immediately, otherwise the data could be lost in case of crash */ +- save_user_settings(); ++ return; + } + + static bool is_shortened_reporting_enabled() diff --git a/abrt-2.1.1-dont_enable_shortened_reporting_in_gnome.patch b/abrt-2.1.1-dont_enable_shortened_reporting_in_gnome.patch new file mode 100644 index 0000000..f74d957 --- /dev/null +++ b/abrt-2.1.1-dont_enable_shortened_reporting_in_gnome.patch @@ -0,0 +1,14 @@ +diff -ur abrt-2.1.1/src/applet/applet.c abrt-2.1.1.new/src/applet/applet.c +--- abrt-2.1.1/src/applet/applet.c 2013-02-01 17:05:40.000000000 +0100 ++++ abrt-2.1.1.new/src/applet/applet.c 2013-03-05 12:04:38.840227170 +0100 +@@ -117,9 +117,7 @@ + if (configured) + return string_to_bool(configured); + +- /* Default: enabled for GNOME desktop, else disabled */ +- const char *desktop_env = getenv("DESKTOP_SESSION"); +- return (desktop_env && strcasestr(desktop_env, "gnome") != NULL); ++ return false; + } + + /* diff --git a/abrt.spec b/abrt.spec index 99d2d1a..d1e0b62 100644 --- a/abrt.spec +++ b/abrt.spec @@ -34,8 +34,10 @@ Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz Patch0: abrt-rhelkeys.patch Patch1: disable_gpg_check.patch 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 this patch with abrt-2.1.3 -Patch3: abrt-2.1.2-recreate_dump_location.patch +Patch5: abrt-2.1.2-recreate_dump_location.patch BuildRequires: dbus-devel BuildRequires: gtk3-devel @@ -265,10 +267,12 @@ problems handled by ABRT in Python. %if 0%{?rhel} >= 7 %patch0 -p1 -b .rhel_gpg %patch2 -p1 -b .ureport +%patch3 -p1 -b .shoretened +%patch4 -p1 -b .autoreporting %endif #Fedora %patch1 -p1 -b .gpgcheck -%patch3 -p1 -b .dumplocation +%patch5 -p1 -b .dumplocation %build autoconf @@ -747,6 +751,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * Fri Mar 22 2013 Jakub Filak 2.1.2-2 - Require correct version of libreport - Add a patch for abrtd which ensures that the dump location always exists +- disable shortened and auto reporting in RHEL +- Resolves: #918040, #918041 * Tue Mar 19 2013 Jakub Filak 2.1.2-1 - Improve log messages