diff --git a/.gitignore b/.gitignore index 002c08b..747f76b 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ abrt-1.1.13.tar.gz /abrt-2.1.9.tar.gz /abrt-2.1.10.tar.gz /abrt-2.1.11.tar.gz +/abrt-2.1.12.tar.gz diff --git a/abrt-2.1.1-disable_autoreporting_dialog.patch b/abrt-2.1.1-disable_autoreporting_dialog.patch deleted file mode 100644 index c12a7ec..0000000 --- a/abrt-2.1.1-disable_autoreporting_dialog.patch +++ /dev/null @@ -1,30 +0,0 @@ -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.6.rhel-dont_enable_shortened_reporting_in_gnome.patch b/abrt-2.1.6.rhel-dont_enable_shortened_reporting_in_gnome.patch deleted file mode 100644 index 027705f..0000000 --- a/abrt-2.1.6.rhel-dont_enable_shortened_reporting_in_gnome.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -ruN abrt-2.1.6.new/src/lib/abrt_conf.c abrt-2.1.6.old/src/lib/abrt_conf.c ---- abrt-2.1.6.new/src/lib/abrt_conf.c 2013-07-26 11:20:33.803925230 +0200 -+++ abrt-2.1.6.old/src/lib/abrt_conf.c 2013-07-26 11:57:24.785656742 +0200 -@@ -99,9 +99,13 @@ - } - else - { -+#if 0 - /* Default: enabled for GNOME desktop, else disabled */ - const char *desktop_env = getenv("DESKTOP_SESSION"); - g_settings_shortenedreporting = (desktop_env && strcasestr(desktop_env, "gnome") != NULL); -+#else -+ g_settings_shortenedreporting = 0; -+#endif - } - - GHashTableIter iter; diff --git a/abrt-2.1.6.rhel-remove_all_ureport_lines_from_config.patch b/abrt-2.1.6.rhel-remove_all_ureport_lines_from_config.patch deleted file mode 100644 index c2c4ede..0000000 --- a/abrt-2.1.6.rhel-remove_all_ureport_lines_from_config.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff -ur abrt-2.1.1/src/daemon/abrt.conf abrt-2.1.1.new/src/daemon/abrt.conf ---- abrt-2.1.1/src/daemon/abrt.conf 2013-02-01 12:59:58.000000000 +0100 -+++ abrt-2.1.1.new/src/daemon/abrt.conf 2013-03-05 10:01:11.347789231 +0100 -@@ -28,9 +28,7 @@ - # In order to run this event automatically after detection, the - # AutoreportingEnabled option must be configured to 'yes' - # --# Default value: report_uReport --# --AutoreportingEvent = report_uReport -+AutoreportingEvent = empty - - # Enables automatic running of the event configured in AutoreportingEvent option. - # -diff -ur abrt-2.1.1/src/daemon/abrt_event.conf abrt-2.1.1.new/src/daemon/abrt_event.conf ---- abrt-2.1.1/src/daemon/abrt_event.conf 2013-02-01 17:05:40.000000000 +0100 -+++ abrt-2.1.1.new/src/daemon/abrt_event.conf 2013-03-05 10:00:58.406693336 +0100 -@@ -95,3 +95,7 @@ - - EVENT=open-gui - report-gtk -x -- "$DUMP_DIR" -+ -+# no operation event, used for AutoreportingEvent to override the default value -+EVENT=empty -+ exit 0 -diff -ruN abrt-2.1.6.new/src/plugins/ccpp_event.conf abrt-2.1.6.old/src/plugins/ccpp_event.conf ---- abrt-2.1.6.new/src/plugins/ccpp_event.conf 2013-07-26 11:20:33.808925269 +0200 -+++ abrt-2.1.6.old/src/plugins/ccpp_event.conf 2013-07-26 11:21:37.642419583 +0200 -@@ -77,14 +77,6 @@ - -F "/etc/libreport/plugins/$format" \ - -A "/etc/libreport/plugins/$formatdup" - --# Send micro report --EVENT=report_uReport analyzer=CCpp -- /usr/libexec/abrt-action-ureport -- --# update ABRT database after successful report to bugzilla --EVENT=post_report analyzer=CCpp -- reporter-ureport -r -- - EVENT=analyze_CCpp analyzer=CCpp - abrt-action-perform-ccpp-analysis - -@@ -93,4 +85,4 @@ - report-gtk -- "$DUMP_DIR" - - EVENT=report-cli analyzer=CCpp -- report-cli -e report_uReport -e analyze_CCpp -e report_Bugzilla -e post_report -- "$DUMP_DIR" -+ report-cli -e analyze_LocalGDB -e report_Bugzilla -- "$DUMP_DIR" -diff -ruN abrt-2.1.6.new/src/plugins/koops_event.conf abrt-2.1.6.old/src/plugins/koops_event.conf ---- abrt-2.1.6.new/src/plugins/koops_event.conf 2013-07-26 11:20:33.810925284 +0200 -+++ abrt-2.1.6.old/src/plugins/koops_event.conf 2013-07-26 11:22:09.051662800 +0200 -@@ -20,17 +20,9 @@ - reporter-bugzilla -b \ - -F /etc/libreport/plugins/bugzilla_format_kernel.conf - --# Send micro report --EVENT=report_uReport analyzer=Kerneloops -- /usr/libexec/abrt-action-ureport -- --# Update ABRT database after successful report to bugzilla --EVENT=post_report analyzer=Kerneloops -- reporter-ureport -r -- - # Automatic/simple GUI-based kernel oopses reporting will do this: - EVENT=report-gui analyzer=Kerneloops - report-gtk -- "$DUMP_DIR" - - EVENT=report-cli analyzer=Kerneloops -- report-cli -e report_uReport -e report_Bugzilla -e post_report -- "$DUMP_DIR" -+ report-cli -e report_Bugzilla -- "$DUMP_DIR" -diff -ruN abrt-2.1.6.new/src/plugins/python_event.conf abrt-2.1.6.old/src/plugins/python_event.conf ---- abrt-2.1.6.new/src/plugins/python_event.conf 2013-07-26 11:20:33.809925276 +0200 -+++ abrt-2.1.6.old/src/plugins/python_event.conf 2013-07-26 11:22:23.992778495 +0200 -@@ -15,17 +15,9 @@ - -c /etc/libreport/plugins/bugzilla.conf - # TODO? -F /etc/libreport/plugins/bugzilla_format_python.conf - --# Send micro report --EVENT=report_uReport analyzer=Python -- /usr/libexec/abrt-action-ureport -- --# update ABRT database after successful report to bugzilla --EVENT=post_report analyzer=Python -- reporter-ureport -r -- - # Reporting of python exceptions - EVENT=report-gui analyzer=Python component!=anaconda - report-gtk -- "$DUMP_DIR" - - EVENT=report-cli analyzer=Python component!=anaconda -- report-cli -e report_uReport -e report_Bugzilla -e post_report -- "$DUMP_DIR" -+ report-cli -e report_Bugzilla -- "$DUMP_DIR" -diff -ruN abrt-2.1.6.new/src/plugins/vmcore_event.conf abrt-2.1.6.old/src/plugins/vmcore_event.conf ---- abrt-2.1.6.new/src/plugins/vmcore_event.conf 2013-07-26 11:20:33.811925292 +0200 -+++ abrt-2.1.6.old/src/plugins/vmcore_event.conf 2013-07-26 11:23:36.103336857 +0200 -@@ -19,12 +19,8 @@ - reporter-bugzilla -b \ - -F /etc/libreport/plugins/bugzilla_format_kernel.conf - --# Send micro report --EVENT=report_uReport analyzer=vmcore -- /usr/libexec/abrt-action-ureport -- - EVENT=report-gui analyzer=vmcore - report-gtk -- "$DUMP_DIR" - - EVENT=report-cli analyzer=vmcore -- report-cli -e analyze_VMcore -e report_uReport -e report_Bugzilla -e post_report -- "$DUMP_DIR" -+ report-cli -e analyze_VMcore -e report_Bugzilla -- "$DUMP_DIR" diff --git a/abrt.spec b/abrt.spec index 06e2906..bfe98bc 100644 --- a/abrt.spec +++ b/abrt.spec @@ -34,23 +34,17 @@ %define docdirversion -%{version} %endif -%define libreport_ver 2.1.11 +%define libreport_ver 2.1.12 %define satyr_ver 0.13 Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.1.11 +Version: 2.1.12 Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/abrt/ Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz -# don't remove this patch, packages in rawhide are not signed! -Patch1: disable_gpg_check.patch -Patch2: abrt-2.1.6.rhel-remove_all_ureport_lines_from_config.patch -Patch3: abrt-2.1.6.rhel-dont_enable_shortened_reporting_in_gnome.patch -Patch4: abrt-2.1.1-disable_autoreporting_dialog.patch - BuildRequires: dbus-devel BuildRequires: gtk3-devel @@ -181,10 +175,10 @@ Summary: %{name}'s kerneloops addon Group: System Environment/Libraries Requires: curl Requires: %{name} = %{version}-%{release} -Requires: abrt-libs = %{version}-%{release} %if 0%{!?rhel:1} Requires: libreport-plugin-kerneloops >= %{libreport_ver} %endif +Requires: abrt-libs = %{version}-%{release} %description addon-kerneloops This package contains plugin for collecting kernel crash information from @@ -195,6 +189,7 @@ Summary: %{name}'s Xorg addon Group: System Environment/Libraries Requires: curl Requires: %{name} = %{version}-%{release} +Requires: abrt-libs = %{version}-%{release} %description addon-xorg This package contains plugin for collecting Xorg crash information from Xorg @@ -272,6 +267,7 @@ Requires: abrt-addon-ccpp Requires: abrt-addon-python Requires: abrt-addon-xorg %if 0%{?rhel} +Requires: libreport-rhel >= %{libreport_ver} Requires: libreport-plugin-rhtsupport >= %{libreport_ver} %else Requires: abrt-retrace-client @@ -279,6 +275,8 @@ Requires: abrt-plugin-bodhi Requires: libreport-plugin-bugzilla >= %{libreport_ver} Requires: libreport-plugin-logger >= %{libreport_ver} Requires: libreport-plugin-ureport >= %{libreport_ver} + +Requires: libreport-fedora >= %{libreport_ver} %endif %description cli @@ -371,14 +369,6 @@ to the shell %prep %setup -q -#RHEL -%if 0%{?rhel} >= 7 -%patch2 -p1 -b .ureport -%patch3 -p1 -b .shoretened -%patch4 -p1 -b .autoreporting -%endif -#Fedora -%patch1 -p1 -b .gpgcheck %build autoconf @@ -387,7 +377,8 @@ 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%{docdirversion}/html/ %find_lang %{name} @@ -606,10 +597,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_mandir}/man5/abrt.conf.5.gz %{_mandir}/man5/abrt-action-save-package-data.conf.5.gz # {_mandir}/man5/pyhook.conf.5.gz + # filesystem package should own /usr/share/augeas/lenses directory %{_datadir}/augeas/lenses/abrt.aug - %files libs %defattr(-,root,root,-) %{_libdir}/libabrt.so.* @@ -665,7 +656,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %{_libexecdir}/abrt-hook-ccpp %{_libexecdir}/abrt-gdb-exploitable + +# attr(6755) ~= SETUID|SETGID %attr(6755, abrt, abrt) %{_libexecdir}/abrt-action-install-debuginfo-to-abrt-cache + %{_bindir}/abrt-action-analyze-c %{_bindir}/abrt-action-trim-files %{_bindir}/abrt-action-analyze-core @@ -683,8 +677,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %config(noreplace) %{_sysconfdir}/libreport/events.d/gconf_event.conf %{_mandir}/man5/gconf_event.conf.5.gz %config(noreplace) %{_sysconfdir}/libreport/events.d/vimrc_event.conf -%{_datadir}/libreport/events/analyze_CCpp.xml %{_mandir}/man5/vimrc_event.conf.5.gz +%{_datadir}/libreport/events/analyze_CCpp.xml %{_datadir}/libreport/events/analyze_LocalGDB.xml %{_datadir}/libreport/events/collect_xsession_errors.xml %{_datadir}/libreport/events/collect_GConf.xml @@ -714,6 +708,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %{_mandir}/man*/abrt-upload-watch.* + %files retrace-client %{_bindir}/abrt-retrace-client %{_mandir}/man1/abrt-retrace-client.1.gz @@ -763,9 +758,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %{_sbindir}/abrt-harvest-vmcore %{_bindir}/abrt-action-analyze-vmcore +%{_bindir}/abrt-action-check-oops-for-hw-error %{_mandir}/man1/abrt-harvest-vmcore.1* %{_mandir}/man5/abrt-vmcore.conf.5* %{_mandir}/man1/abrt-action-analyze-vmcore.1* +%{_mandir}/man1/abrt-action-check-oops-for-hw-error.1* %files addon-pstoreoops %defattr(-,root,root,-) @@ -784,7 +781,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %config(noreplace) %{_sysconfdir}/%{name}/plugins/python.conf %{_datadir}/%{name}/conf.d/plugins/python.conf %{_mandir}/man5/abrt-python.conf.5.gz -# TODO? Do we need %config(noreplace) in the below line too? +# TODO? Do we need %%config(noreplace) in the below line too? %config(noreplace) %{_sysconfdir}/libreport/events.d/python_event.conf %{_mandir}/man5/python_event.conf.5.gz %{_bindir}/abrt-action-analyze-python @@ -841,6 +838,20 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Thu Jan 30 2014 Jakub Filak 2.1.12-1 +- don't break the event run by failures of abrt-action-notify +- harvest-vmcore: properly handle inaccessible dir error +- spec: abrt-cli requires a pkg providing workflows +- applet: do not say the report is anonymous when ureport auth is enabled +- abrtd.service: Don't order after syslog.target +- vmcore: properly configure Augeas +- applet: don't notify missing ignored_problems file +- fix a double free error in abrt-applet +- configui: show 'Close' button in the dialog +- configure: remove all -Werror from O0CFLAGS +- fix handling of Machine Check Exceptions. +- Resolves: #1055502 + * Wed Jan 08 2014 Jakub Filak 2.1.11-1 - Update translations - harvest_vmcore: replace regexp config parsing with augeas @@ -1560,7 +1571,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - added mono-core to blacklist * Tue Mar 29 2011 Jiri Moskovcak 2.0.0-2 -- use %ghost on files in /var/run and /var/lock rhbz#656542 +- use %%ghost on files in /var/run and /var/lock rhbz#656542 - fixed notification persistence in gnome3 - added analyze selector to CLI - refuse reporting to bz without backtrace or hash diff --git a/disable_gpg_check.patch b/disable_gpg_check.patch deleted file mode 100644 index 6f471c2..0000000 --- a/disable_gpg_check.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- abrt-2.0.13/src/daemon/abrt-action-save-package-data.conf 2012-08-06 10:13:24.000000000 +0200 -+++ abrt-2.0.13_/src/daemon/abrt-action-save-package-data.conf 2012-09-21 16:20:19.943882773 +0200 -@@ -3,7 +3,7 @@ - # the list of public keys used to check the signature is - # in the file gpg_keys - # --OpenGPGCheck = yes -+OpenGPGCheck = no - - # Blacklisted packages - # diff --git a/sources b/sources index 862a67c..13a55a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fdd0c50b6f54fa664b2600e453a7f54b abrt-2.1.11.tar.gz +2e659a4acf115065aa0cf52398e2a9d5 abrt-2.1.12.tar.gz