From 37b2ab9bcf7fc6d42726de36dfd4c9b8af45679a Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 08:14:00 +0000 Subject: [PATCH 01/32] Initialize branch F-12 for abrt --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 98901db53671000f301c9413e7cc76c4258ca7f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Fri, 16 Oct 2009 10:29:30 +0000 Subject: [PATCH 02/32] - new version - many fixes --- .cvsignore | 2 +- abrt.spec | 38 +++++++++++++++++++++++++++++++++----- sources | 2 +- 3 files changed, 35 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0458ab7..5b73039 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abrt-0.0.9.tar.gz +abrt-0.0.10.tar.gz diff --git a/abrt.spec b/abrt.spec index bbe21e5..dbb20a3 100644 --- a/abrt.spec +++ b/abrt.spec @@ -3,8 +3,8 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: Automatic bug detection and reporting tool Name: abrt -Version: 0.0.9 -Release: 2%{?dist} +Version: 0.0.10 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/abrt/ @@ -24,6 +24,7 @@ BuildRequires: python-devel BuildRequires: gettext BuildRequires: nss-devel BuildRequires: polkit-devel +BuildRequires: libzip-devel, libtar-devel, bzip2-devel, zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-libs = %{version}-%{release} @@ -51,7 +52,8 @@ Development libraries and headers for %{name}. Summary: %{name}'s gui Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} -Requires: dbus-python, pygtk2, pygtk2-libglade,gnome-python2-gnomevfs +Requires: dbus-python, pygtk2, pygtk2-libglade, +Requires: gnome-python2-gnomevfs, gnome-python2-gnomekeyring # only if gtk2 version < 2.17 #Requires: python-sexy Provides: abrt-applet = %{version}-%{release} @@ -248,10 +250,12 @@ fi %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/plugins %dir %{_libdir}/%{name} -%{_mandir}/man8/%{name}.8.gz +%{_mandir}/man8/abrtd.8.gz %{_mandir}/man5/%{name}.conf.5.gz +%{_mandir}/man5/pyhook.conf.5.gz %{_mandir}/man7/%{name}-plugins.7.gz %{_datadir}/polkit-1/actions/org.fedoraproject.abrt.policy +%{_datadir}/dbus-1/system-services/com.redhat.abrt.service %files libs %defattr(-,root,root,-) @@ -354,7 +358,31 @@ fi %defattr(-,root,root,-) %changelog -* Wed Sep 23 2009 jiri Moskovcak 0.0.9-2 +* Thu Oct 15 2009 Jiri Moskovcak 0.0.10-1 +- new version +- added more logging (vda.linux@googlemail.com) +- made polkit policy to be more permissive when installing debuginfo (jmoskovc@redhat.com) +- lib/Plugins/CCpp.cpp: add build-ids to backtrace (vda.linux@googlemail.com) +- lib/Plugins/CCpp.cpp: do not use temp file for gdb commands - use -ex CMD instead (vda.linux@googlemail.com) +- GUI: added refresh button, added sanity check to plugin settings (jmoskovc@redhat.com) +- Initial man page for abrt-cli (kklic@redhat.com) +- Added --version, -V, --help, -? options. Fixed crash caused by unknown option. (kklic@redhat.com) +- Date/time honors current system locale (kklic@redhat.com) +- fixed saving/reading user config (jmoskovc@redhat.com) +- SPEC: added gnome-python2-gnomekeyring to requirements (jmoskovc@redhat.com) +- GUI: call Report() with the latest pluginsettings (jmoskovc@redhat.com) +- Fix Bug 526220 - [abrt] crash detected in abrt-gui-0.0.9-2.fc12 (vda.linux@googlemail.com) +- removed unsecure reading/writting from ~HOME directory rhbz#522878 (jmoskovc@redhat.com) +- error checking added to archive creation (danny@rawhide.localdomain) +- try using pk-debuginfo-install before falling back to debuginfo-install (vda.linux@googlemail.com) +- abrt-gui: make "report" toolbar button work even if abrtd is not running (vda.linux@googlemail.com) +- set LIMIT_MESSAGE to 16k, typo fix and daemon now reads config information from dbus (npajkovs@redhat.com) +- add support for abrtd autostart (vda.linux@googlemail.com) +- GUI: reversed the dumplist, so the latest crashes are at the top (jmoskovc@redhat.com) +- rewrite FileTransfer to use library calls instead of commandline calls for compression (dnovotny@redhat.com) +- and many minor fixes .. + +* Wed Sep 23 2009 Jiri Moskovcak 0.0.9-2 - added bug-buddy to provides rhbz#524934 * Tue Sep 22 2009 Jiri Moskovcak 0.0.9-1 diff --git a/sources b/sources index b2e23fa..a4a158b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2d668c6d53564c05b8266eadff90f2c6 abrt-0.0.9.tar.gz +64e6a3a8516870b1e9bbd59b0d6e112b abrt-0.0.10.tar.gz From 8e5e78d8c41645cbb3bf11ebd20e325f1f498453 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Tue, 3 Nov 2009 17:35:59 +0000 Subject: [PATCH 03/32] New version --- .cvsignore | 2 +- abrt.spec | 70 +++++++++++++++++++++++++++++++++++++++++++++++++----- sources | 2 +- 3 files changed, 66 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5b73039..a856bbf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abrt-0.0.10.tar.gz +abrt-0.0.11.tar.gz diff --git a/abrt.spec b/abrt.spec index dbb20a3..9a3950b 100644 --- a/abrt.spec +++ b/abrt.spec @@ -3,7 +3,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: Automatic bug detection and reporting tool Name: abrt -Version: 0.0.10 +Version: 0.0.11 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -68,7 +68,9 @@ GTK+ wizard for convenient bug reporting. %package addon-ccpp Summary: %{name}'s C/C++ addon Group: System Environment/Libraries -Requires: gdb +Requires: gdb >= 7.0-3 +Requires: elfutils +Requires: yum-utils Requires: %{name} = %{version}-%{release} %description addon-ccpp @@ -148,6 +150,14 @@ Requires: %{name} = %{version}-%{release} %description plugin-bugzilla Plugin to report bugs into the bugzilla. +%package plugin-catcut +Summary: %{name}'s catcut plugin +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} + +%description plugin-catcut +Plugin to report bugs into the catcut. + %package plugin-ticketuploader Summary: %{name}'s ticketuploader plugin Group: System Environment/Libraries @@ -186,8 +196,9 @@ the sockets. Summary: Virtual package to install all necessary packages for usage from desktop environment Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} -Requires: %{name}-plugin-sqlite3, %{name}-plugin-bugzilla -Requires: %{name}-gui, %{name}-addon-kerneloops +Requires: %{name}-plugin-sqlite3, %{name}-plugin-bugzilla, %{name}-plugin-logger +Requires: %{name}-gui +Requires: %{name}-addon-kerneloops Requires: %{name}-addon-ccpp, %{name}-addon-python %description desktop @@ -214,10 +225,14 @@ find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f mkdir -p ${RPM_BUILD_ROOT}/%{_initrddir} install -m 755 %SOURCE1 ${RPM_BUILD_ROOT}/%{_initrddir}/abrtd mkdir -p $RPM_BUILD_ROOT/var/cache/%{name} +mkdir -p $RPM_BUILD_ROOT/var/cache/%{name}-di +mkdir -p $RPM_BUILD_ROOT/var/run/%{name} desktop-file-install \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - src/Gui/%{name}.desktop + --vendor fedora \ + --delete-original \ + ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop desktop-file-install \ --dir ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart \ @@ -239,14 +254,22 @@ fi %postun libs -p /sbin/ldconfig +%posttrans +if [ "$1" -eq "0" ]; then + service %{name}d condrestart >/dev/null 2>&1 || : +fi + %files -f %{name}.lang %defattr(-,root,root,-) %doc README COPYING %{_sbindir}/%{name}d +%{_bindir}/%{name}-debuginfo-install %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/dbus-%{name}.conf %{_initrddir}/%{name}d %dir /var/cache/%{name} +%dir /var/cache/%{name}-di +%dir /var/run/%{name} %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/plugins %dir %{_libdir}/%{name} @@ -269,7 +292,8 @@ fi %defattr(-,root,root,-) %{_bindir}/%{name}-gui %{_datadir}/%{name} -%{_datadir}/applications/%{name}.desktop +%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/pixmaps/abrt.png %{_bindir}/%{name}-applet %{_sysconfdir}/xdg/autostart/%{name}-applet.desktop @@ -330,6 +354,13 @@ fi %{_libdir}/%{name}/Bugzilla.GTKBuilder %{_mandir}/man7/%{name}-Bugzilla.7.gz +%files plugin-catcut +%defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/%{name}/plugins/Catcut.conf +%{_libdir}/%{name}/libCatcut.so* +%{_libdir}/%{name}/Catcut.GTKBuilder +#%{_mandir}/man7/%{name}-Catcut.7.gz + %files plugin-ticketuploader %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/TicketUploader.conf @@ -345,6 +376,7 @@ fi %files addon-python %defattr(-,root,root,-) +%{_bindir}/%{name}-pyhook-helper %config(noreplace) %{_sysconfdir}/%{name}/pyhook.conf %{python_sitearch}/ABRTUtils.so %{_libdir}/%{name}/libPython.so* @@ -353,11 +385,37 @@ fi %files cli %defattr(-,root,root,-) %{_bindir}/abrt-cli +%{_mandir}/man1/abrt-cli.1.gz +%{_sysconfdir}/bash_completion.d/abrt-cli.bash %files desktop %defattr(-,root,root,-) %changelog +* Mon Nov 2 2009 Jiri Moskovcak 0.0.11-1 +- re-enabled kerneloops +- abrt-debuginfo-install: download packages one-by-one - better logging (vda.linux@googlemail.com) +- do not report empty fields (vda.linux@googlemail.com) +- Added abrt.png, fixed rhbz#531181 (jmoskovc@redhat.com) +- added option DebugInfoCacheMB to limit size of unpacked debuginfos (vda.linux@googlemail.com) +- fixed the problem with overwriting the default plugin settings (jmoskovc@redhat.com) +- disabled kerneloops in config file (jmoskovc@redhat.com) +- added dependency to gdb >= 7.0 (jmoskovc@redhat.com) +- better format of report text (vda.linux@googlemail.com) +- Python backtrace size limited to 1 MB (kklic@redhat.com) +- lib/Plugins/Bugzilla: better message at login failure (vda.linux@googlemail.com) +- build fixes, added plugin-logger to abrt-desktop (jmoskovc@redhat.com) +- blacklisted nspluginwrapper, because it causes too many useless reports (jmoskovc@redhat.com) +- GUI: Wrong settings window is not shown behind the reporter dialog rhbz#531119 (jmoskovc@redhat.com) +- Normal user can see kerneloops and report it Bugzilla memory leaks fix (npajkovs@redhat.com) +- dumpoops: add -s option to dump results to stdout (vda.linux@googlemail.com) +- removed kerneloops from abrt-desktop rhbz#528395 (jmoskovc@redhat.com) +- GUI: fixed exception when enabling plugin rhbz#530495 (jmoskovc@redhat.com) +- Improved abrt-cli (kklic@redhat.com) +- Added backtrace rating to CCpp analyzer (dnovotny@redhat.com) +- GUI improvements (jmoskovc@redhat.com) +- Added abrt-pyhook-helper (kklic@redhat.com) + * Thu Oct 15 2009 Jiri Moskovcak 0.0.10-1 - new version - added more logging (vda.linux@googlemail.com) diff --git a/sources b/sources index a4a158b..2b08f29 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -64e6a3a8516870b1e9bbd59b0d6e112b abrt-0.0.10.tar.gz +49a85b0eb8c1daff67028015ede70ee9 abrt-0.0.11.tar.gz From 9a776a01aba8b554d834f69591652396b07ad6e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Tue, 10 Nov 2009 17:05:54 +0000 Subject: [PATCH 04/32] spec file fixes --- abrt.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/abrt.spec b/abrt.spec index 9a3950b..b9d2e49 100644 --- a/abrt.spec +++ b/abrt.spec @@ -4,7 +4,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 0.0.11 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/abrt/ @@ -61,6 +61,8 @@ Obsoletes: abrt-applet < 0.0.5 Conflicts: abrt-applet < 0.0.5 Obsoletes: bug-buddy Provides: bug-buddy +# workaround for broken upgrade, remove! +Requires: abrt-desktop %description gui GTK+ wizard for convenient bug reporting. @@ -197,7 +199,8 @@ Summary: Virtual package to install all necessary packages for usage from deskto Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} Requires: %{name}-plugin-sqlite3, %{name}-plugin-bugzilla, %{name}-plugin-logger -Requires: %{name}-gui +#workaround for broken upgrade, remove! +#Requires: %{name}-gui Requires: %{name}-addon-kerneloops Requires: %{name}-addon-ccpp, %{name}-addon-python @@ -392,6 +395,9 @@ fi %defattr(-,root,root,-) %changelog +* Tue Nov 10 2009 Jiri Moskovcak 0.0.11-2 +- spec file fixes + * Mon Nov 2 2009 Jiri Moskovcak 0.0.11-1 - re-enabled kerneloops - abrt-debuginfo-install: download packages one-by-one - better logging (vda.linux@googlemail.com) From 6881875b3a2c0cdbebf050deb771727e1e8403f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Sun, 22 Nov 2009 20:28:21 +0000 Subject: [PATCH 05/32] New version --- .cvsignore | 2 +- abrt.spec | 63 ++++++++++++++++++++++++++++++++++++++++++++++++------ sources | 2 +- 3 files changed, 59 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index a856bbf..9dfea8c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abrt-0.0.11.tar.gz +abrt-1.0.0.tar.gz diff --git a/abrt.spec b/abrt.spec index b9d2e49..8f8d414 100644 --- a/abrt.spec +++ b/abrt.spec @@ -3,8 +3,8 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: Automatic bug detection and reporting tool Name: abrt -Version: 0.0.11 -Release: 2%{?dist} +Version: 1.0.0 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/abrt/ @@ -25,8 +25,10 @@ BuildRequires: gettext BuildRequires: nss-devel BuildRequires: polkit-devel BuildRequires: libzip-devel, libtar-devel, bzip2-devel, zlib-devel +BuildRequires: intltool BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-libs = %{version}-%{release} +Requires(pre): /usr/sbin/groupadd %description %{name} is a tool to help users to detect defects in applications and @@ -61,7 +63,7 @@ Obsoletes: abrt-applet < 0.0.5 Conflicts: abrt-applet < 0.0.5 Obsoletes: bug-buddy Provides: bug-buddy -# workaround for broken upgrade, remove! +#FIXME: upgrade workaround Requires: abrt-desktop %description gui @@ -79,6 +81,17 @@ Requires: %{name} = %{version}-%{release} This package contains hook for C/C++ crashed programs and %{name}'s C/C++ analyzer plugin. +#%package plugin-firefox +#Summary: %{name}'s Firefox analyzer plugin +#Group: System Environment/Libraries +#Requires: gdb >= 7.0-3 +#Requires: elfutils +#Requires: yum-utils +#Requires: %{name} = %{version}-%{release} + +#%description plugin-firefox +#This package contains hook for Firefox + %package addon-kerneloops Summary: %{name}'s kerneloops addon Group: System Environment/Libraries @@ -203,6 +216,7 @@ Requires: %{name}-plugin-sqlite3, %{name}-plugin-bugzilla, %{name}-plugin-logger #Requires: %{name}-gui Requires: %{name}-addon-kerneloops Requires: %{name}-addon-ccpp, %{name}-addon-python +#Requires: %{name}-plugin-firefox %description desktop Virtual package to make easy default instalation on desktop environments. @@ -244,6 +258,9 @@ desktop-file-install \ %clean rm -rf $RPM_BUILD_ROOT +%pre +/usr/sbin/groupadd -f --system abrt + %post /sbin/chkconfig --add %{name}d @@ -270,7 +287,7 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/dbus-%{name}.conf %{_initrddir}/%{name}d -%dir /var/cache/%{name} +%dir %attr(0775, root, abrt) /var/cache/%{name} %dir /var/cache/%{name}-di %dir /var/run/%{name} %dir %{_sysconfdir}/%{name} @@ -297,6 +314,7 @@ fi %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/pixmaps/abrt.png +%{_datadir}/icons/hicolor/48x48/apps/*.png %{_bindir}/%{name}-applet %{_sysconfdir}/xdg/autostart/%{name}-applet.desktop @@ -306,8 +324,12 @@ fi %{_libdir}/%{name}/libCCpp.so* %{_libexecdir}/hookCCpp +#%files plugin-firefox +#%{_libdir}/%{name}/libFirefox.so* + %files addon-kerneloops %defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/%{name}/plugins/Kerneloops.conf %config(noreplace) %{_sysconfdir}/%{name}/plugins/KerneloopsScanner.conf %{_bindir}/dumpoops %{_libdir}/%{name}/libKerneloops.so* @@ -379,9 +401,9 @@ fi %files addon-python %defattr(-,root,root,-) -%{_bindir}/%{name}-pyhook-helper +%attr(2755, root, abrt) %{_bindir}/%{name}-pyhook-helper %config(noreplace) %{_sysconfdir}/%{name}/pyhook.conf -%{python_sitearch}/ABRTUtils.so +#%{python_sitearch}/ABRTUtils.so %{_libdir}/%{name}/libPython.so* %{python_site}/*.py* @@ -395,6 +417,35 @@ fi %defattr(-,root,root,-) %changelog +* Fri Nov 20 2009 Jiri Moskovcak 1.0.0-1 +- new version +- comment input wraps words rhbz#531276 +- fixed hiding password dialog rhbz#529583 +- easier kerneloops reporting rhbz#528395 +- made menu entry translatable rhbz#536878 (jmoskovc@redhat.com) +- GUI: don't read the g-k every time we want to use the setting (jmoskovc@redhat.com) +- GUI: survive if g-k access is denied rhbz#534171 (jmoskovc@redhat.com) +- include more info into oops (we were losing the stack dump) (vda.linux@googlemail.com) +- make BZ insert small text attachments inline; move text file detection code (vda.linux@googlemail.com) +- GUI: fixed text wrapping in comment field rhbz#531276 (jmoskovc@redhat.com) +- GUI: added cancel to send dialog rhbz#537238 (jmoskovc@redhat.com) +- include abrt version in bug descriptions (vda.linux@googlemail.com) +- ccpp hook: implemented ReadonlyLocalDebugInfoDirs directive (vda.linux@googlemail.com) +- GUI: added window icon rhbz#537240 (jmoskovc@redhat.com) +- add support for \" escaping in config file (vda.linux@googlemail.com) +- add experimental saving of /var/log/Xorg*.log for X crashes (vda.linux@googlemail.com) +- APPLET: changed icon from default gtk-warning to abrt specific, add animation (jmoskovc@redhat.com) +- don't show icon on abrtd start/stop rhbz#537630 (jmoskovc@redhat.com) +- /var/cache/abrt permissions 1775 -> 0775 in spec file (kklic@redhat.com) +- Daemon properly checks /var/cache/abrt attributes (kklic@redhat.com) +- abrt user group; used by abrt-pyhook-helper (kklic@redhat.com) +- pyhook-helper: uid taken from system instead of command line (kklic@redhat.com) +- KerneloopsSysLog: fix breakage in code which detects abrt marker (vda.linux@googlemail.com) +- GUI: added support for backtrace rating (jmoskovc@redhat.com) +- InformAllUsers support. enabled by default for Kerneloops. Tested wuth CCpp. (vda.linux@googlemail.com) +- abrtd: call res_init() if /etc/resolv.conf or friends were changed rhbz#533589 (vda.linux@googlemail.com) +- supress errors in python hook to not colide with the running script (jmoskovc@redhat.com) + * Tue Nov 10 2009 Jiri Moskovcak 0.0.11-2 - spec file fixes diff --git a/sources b/sources index 2b08f29..f9df441 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -49a85b0eb8c1daff67028015ede70ee9 abrt-0.0.11.tar.gz +62a8a6a1d7712472133b97b38469683e abrt-1.0.0.tar.gz From 21bf03af130405e61e735432f6fe48baade1aea5 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:24:33 +0000 Subject: [PATCH 06/32] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3ff0a60..f46d35a 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := abrt SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 24479e450c5f8f4a0ed46b0f43c7127332f5e159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Tue, 8 Dec 2009 18:20:41 +0000 Subject: [PATCH 07/32] new version --- .cvsignore | 2 +- abrt.spec | 110 ++++++++++++++++++++++++++++------------------------- sources | 2 +- 3 files changed, 60 insertions(+), 54 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9dfea8c..59f72c6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abrt-1.0.0.tar.gz +abrt-1.0.1.tar.gz diff --git a/abrt.spec b/abrt.spec index 8f8d414..90829b1 100644 --- a/abrt.spec +++ b/abrt.spec @@ -3,7 +3,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: Automatic bug detection and reporting tool Name: abrt -Version: 1.0.0 +Version: 1.0.1 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -26,9 +26,11 @@ BuildRequires: nss-devel BuildRequires: polkit-devel BuildRequires: libzip-devel, libtar-devel, bzip2-devel, zlib-devel BuildRequires: intltool +BuildRequires: bison BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-libs = %{version}-%{release} -Requires(pre): /usr/sbin/groupadd +Requires(pre): shadow-utils +Obsoletes: abrt-plugin-sqlite3 %description %{name} is a tool to help users to detect defects in applications and @@ -56,15 +58,12 @@ Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} Requires: dbus-python, pygtk2, pygtk2-libglade, Requires: gnome-python2-gnomevfs, gnome-python2-gnomekeyring -# only if gtk2 version < 2.17 +# only if gtk2 version < 2.17: #Requires: python-sexy +# we used to have abrt-applet, now abrt-gui includes it: Provides: abrt-applet = %{version}-%{release} Obsoletes: abrt-applet < 0.0.5 Conflicts: abrt-applet < 0.0.5 -Obsoletes: bug-buddy -Provides: bug-buddy -#FIXME: upgrade workaround -Requires: abrt-desktop %description gui GTK+ wizard for convenient bug reporting. @@ -95,32 +94,16 @@ analyzer plugin. %package addon-kerneloops Summary: %{name}'s kerneloops addon Group: System Environment/Libraries -Requires: %{name}-plugin-kerneloopsreporter = %{version}-%{release} +Requires: curl Requires: %{name} = %{version}-%{release} Obsoletes: kerneloops Obsoletes: abrt-plugin-kerneloops +Obsoletes: abrt-plugin-kerneloopsreporter %description addon-kerneloops -This package contains plugins for kernel crashes information collecting. - -%package plugin-kerneloopsreporter -Summary: %{name}'s kerneloops reporter plugin -Group: System Environment/Libraries -Requires: curl -Requires: %{name} = %{version}-%{release} - -%description plugin-kerneloopsreporter -This package contains reporter plugin, that sends, collected by %{name}'s kerneloops -addon, information about kernel crashes to specified server, e.g. kerneloops.org. - -%package plugin-sqlite3 -Summary: %{name}'s SQLite3 database plugin -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} - -%description plugin-sqlite3 -This package contains SQLite3 database plugin. It is used for storing the data -required for creating a bug report. +This package contains plugin for collecting kernel crash information +and reporter plugin which sends this information to specified server, +usually to kerneloops.org. %package plugin-logger Summary: %{name}'s logger reporter plugin @@ -128,7 +111,7 @@ Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} %description plugin-logger -The simple reporter plugin, which writes a report to a specified file. +The simple reporter plugin which writes a report to a specified file. %package plugin-mailx Summary: %{name}'s mailx reporter plugin @@ -137,8 +120,8 @@ Requires: %{name} = %{version}-%{release} Requires: mailx %description plugin-mailx -The simple reporter plugin, which sends a report via mailx to a specified -email. +The simple reporter plugin which sends a report via mailx to a specified +email address. %package plugin-runapp Summary: %{name}'s runapp plugin @@ -210,13 +193,19 @@ the sockets. %package desktop Summary: Virtual package to install all necessary packages for usage from desktop environment Group: User Interface/Desktops +# This package gets installed when anything requests bug-buddy - +# happens when users upgrade Fn to Fn+1; +# or if user just wants "typical desktop installation". +# Installing abrt-desktop should result in the abrt which works without +# any tweaking in abrt.conf (IOW: all plugins mentioned there must be installed) Requires: %{name} = %{version}-%{release} -Requires: %{name}-plugin-sqlite3, %{name}-plugin-bugzilla, %{name}-plugin-logger -#workaround for broken upgrade, remove! -#Requires: %{name}-gui Requires: %{name}-addon-kerneloops Requires: %{name}-addon-ccpp, %{name}-addon-python +Requires: %{name}-gui +Requires: %{name}-plugin-bugzilla, %{name}-plugin-logger, %{name}-plugin-runapp #Requires: %{name}-plugin-firefox +Obsoletes: bug-buddy +Provides: bug-buddy %description desktop Virtual package to make easy default instalation on desktop environments. @@ -259,7 +248,8 @@ desktop-file-install \ rm -rf $RPM_BUILD_ROOT %pre -/usr/sbin/groupadd -f --system abrt +getent group abrt >/dev/null || groupadd -f --system abrt +exit 0 %post /sbin/chkconfig --add %{name}d @@ -284,21 +274,24 @@ fi %doc README COPYING %{_sbindir}/%{name}d %{_bindir}/%{name}-debuginfo-install +%{_bindir}/%{name}-backtrace %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/dbus-%{name}.conf %{_initrddir}/%{name}d -%dir %attr(0775, root, abrt) /var/cache/%{name} -%dir /var/cache/%{name}-di +%dir %attr(0775, root, abrt) %{_localstatedir}/cache/%{name} %dir /var/run/%{name} %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/plugins %dir %{_libdir}/%{name} %{_mandir}/man8/abrtd.8.gz %{_mandir}/man5/%{name}.conf.5.gz -%{_mandir}/man5/pyhook.conf.5.gz +#%{_mandir}/man5/pyhook.conf.5.gz %{_mandir}/man7/%{name}-plugins.7.gz %{_datadir}/polkit-1/actions/org.fedoraproject.abrt.policy %{_datadir}/dbus-1/system-services/com.redhat.abrt.service +%config(noreplace) %{_sysconfdir}/%{name}/plugins/SQLite3.conf +%{_libdir}/%{name}/libSQLite3.so* +%{_mandir}/man7/%{name}-SQLite3.7.gz %files libs %defattr(-,root,root,-) @@ -321,8 +314,9 @@ fi %files addon-ccpp %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/CCpp.conf +%dir %{_localstatedir}/cache/%{name}-di %{_libdir}/%{name}/libCCpp.so* -%{_libexecdir}/hookCCpp +%{_libexecdir}/abrt-hook-ccpp #%files plugin-firefox #%{_libdir}/%{name}/libFirefox.so* @@ -330,25 +324,14 @@ fi %files addon-kerneloops %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/Kerneloops.conf -%config(noreplace) %{_sysconfdir}/%{name}/plugins/KerneloopsScanner.conf %{_bindir}/dumpoops %{_libdir}/%{name}/libKerneloops.so* %{_libdir}/%{name}/libKerneloopsScanner.so* %{_mandir}/man7/%{name}-KerneloopsScanner.7.gz - -%files plugin-kerneloopsreporter -%defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/%{name}/plugins/KerneloopsReporter.conf %{_libdir}/%{name}/libKerneloopsReporter.so* %{_libdir}/%{name}/KerneloopsReporter.GTKBuilder %{_mandir}/man7/%{name}-KerneloopsReporter.7.gz -%files plugin-sqlite3 -%defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/%{name}/plugins/SQLite3.conf -%{_libdir}/%{name}/libSQLite3.so* -%{_mandir}/man7/%{name}-SQLite3.7.gz - %files plugin-logger %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/Logger.conf @@ -402,8 +385,6 @@ fi %files addon-python %defattr(-,root,root,-) %attr(2755, root, abrt) %{_bindir}/%{name}-pyhook-helper -%config(noreplace) %{_sysconfdir}/%{name}/pyhook.conf -#%{python_sitearch}/ABRTUtils.so %{_libdir}/%{name}/libPython.so* %{python_site}/*.py* @@ -417,6 +398,31 @@ fi %defattr(-,root,root,-) %changelog +* Tue Dec 8 2009 Jiri Moskovcak 1.0.1-1 +- PyHook: better logic for checking if abrtd is running rhbz#539987 (jmoskovc@redhat.com) +- re-enabled gpg sign checking (jmoskovc@redhat.com) +- PyHook: use repr() for displaying variables rhbz#545070 (jmoskovc@redhat.com) +- kerneloops: fix the linux kernel version identification (aarapov@redhat.com) +- gui review (rrakus@redhat.com) +- when we trim the dir, we must delete it from DB too rhbz#541854 (vda.linux@googlemail.com) +- improved dupe checking (kklic@redhat.com) +- GUI: handle cases when gui fails to start daemon on demand rhbz#543725 (jmoskovc@redhat.com) +- Add abrt group only if it is missing; fixes rhbz#543250 (kklic@redhat.com) +- GUI: more string fixes rhbz#543266 (jmoskovc@redhat.com) +- abrt.spec: straighten out relations between abrt-desktop and abrt-gui (vda.linux@googlemail.com) +- refuse to start if some required plugins are missing rhbz#518422 (vda.linux@googlemail.com) +- GUI: survive gnome-keyring access denial rhbz#543200 (jmoskovc@redhat.com) +- typo fixes rhbz#543266 (jmoskovc@redhat.com) +- abrt-debuginfo-install: better fix for incorrect passing double quotes (vda.linux@googlemail.com) +- APPLET: stop animation when it's not needed rhbz#542157 (jmoskovc@redhat.com) +- ccpp hook: reanme it, and add "crash storm protection" (see rhbz#542003) (vda.linux@googlemail.com) +- Hooks/CCpp.cpp: add MakeCompatCore = yes/no directive. Fixes rhbz#541707 (vda.linux@googlemail.com) +- SPEC: removed sqlite3 package, fixed some update problems (jmoskovc@redhat.com) +- Kerneloops are reported automaticky now when AutoReportUIDs = root is in Kerneloops.conf (npajkovs@redhat.com) +- remove word 'detected' from description rhbz#541459 (vda.linux@googlemail.com) +- src/Hooks/CCpp.cpp: do save abrtd's own coredumps, but carefully... (vda.linux@googlemail.com) +- CCpp.cpp: quote parameters if needed rhbz#540164 (vda.linux@googlemail.com) + * Fri Nov 20 2009 Jiri Moskovcak 1.0.0-1 - new version - comment input wraps words rhbz#531276 diff --git a/sources b/sources index f9df441..9080439 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -62a8a6a1d7712472133b97b38469683e abrt-1.0.0.tar.gz +85b4fb411f8d969afd02cb998d527235 abrt-1.0.1.tar.gz From d86861ded7fdb3eaea0128bc63260d443f7feddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Mon, 14 Dec 2009 16:26:56 +0000 Subject: [PATCH 08/32] Nev version --- .cvsignore | 2 +- abrt.spec | 19 +++++++++++++++++-- sources | 2 +- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 59f72c6..1bb3c17 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abrt-1.0.1.tar.gz +abrt-1.0.2.tar.gz diff --git a/abrt.spec b/abrt.spec index 90829b1..4c0a900 100644 --- a/abrt.spec +++ b/abrt.spec @@ -3,7 +3,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: Automatic bug detection and reporting tool Name: abrt -Version: 1.0.1 +Version: 1.0.2 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -384,7 +384,7 @@ fi %files addon-python %defattr(-,root,root,-) -%attr(2755, root, abrt) %{_bindir}/%{name}-pyhook-helper +%attr(2755, root, abrt) %{_libexecdir}/abrt-hook-python %{_libdir}/%{name}/libPython.so* %{python_site}/*.py* @@ -398,6 +398,21 @@ fi %defattr(-,root,root,-) %changelog +* Mon Dec 14 2009 Jiri Moskovcak 1.0.2-1 +- disabled GPG check again (jmoskovc@redhat.com) +- abrt-pyhook-helper rename (vda.linux@googlemail.com) +- abrt-cli: report success/failure of reporting. closes bug 71 (vda.linux@googlemail.com) +- less logging (vda.linux@googlemail.com) +- mkde abrt-gui --help and --version behave as expected. closes bug 85 (vda.linux@googlemail.com) +- dbus lib: fix parsing of 0-element arrays. Fixes bug 95 (vda.linux@googlemail.com) +- make "abrt-cli --delete randomuuid" report that deletion failed. closes bug 59 (vda.linux@googlemail.com) +- applet: make animation stop after 1 minute. (closes bug 108) (vda.linux@googlemail.com) +- show comment and how to reproduce fields, when BT rating > 3 (jmoskovc@redhat.com) +- Gui: make report status window's text wrap. Fixes bug 82 (vda.linux@googlemail.com) +- CCpp analyzer: added "info sharedlib" (https://fedorahosted.org/abrt/ticket/90) (vda.linux@googlemail.com) +- added link to bugzilla new account page to Bugzilla config dialog (jmoskovc@redhat.com) +- GUI: added log window (jmoskovc@redhat.com) + * Tue Dec 8 2009 Jiri Moskovcak 1.0.1-1 - PyHook: better logic for checking if abrtd is running rhbz#539987 (jmoskovc@redhat.com) - re-enabled gpg sign checking (jmoskovc@redhat.com) diff --git a/sources b/sources index 9080439..eac3698 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -85b4fb411f8d969afd02cb998d527235 abrt-1.0.1.tar.gz +755f119d24511b613b02270b51d09312 abrt-1.0.2.tar.gz From 523fe3ce99c985199e7c2033288497e899bc79a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Tue, 5 Jan 2010 20:42:27 +0000 Subject: [PATCH 09/32] new version --- .cvsignore | 2 +- abrt.spec | 25 ++++++++++++++++++++++++- sources | 2 +- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1bb3c17..cb3f9f1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abrt-1.0.2.tar.gz +abrt-1.0.3.tar.gz diff --git a/abrt.spec b/abrt.spec index 4c0a900..715ff1e 100644 --- a/abrt.spec +++ b/abrt.spec @@ -3,7 +3,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: Automatic bug detection and reporting tool Name: abrt -Version: 1.0.2 +Version: 1.0.3 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -283,6 +283,7 @@ fi %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/plugins %dir %{_libdir}/%{name} +%{_mandir}/man1/%{name}-backtrace.1.gz %{_mandir}/man8/abrtd.8.gz %{_mandir}/man5/%{name}.conf.5.gz #%{_mandir}/man5/pyhook.conf.5.gz @@ -398,6 +399,28 @@ fi %defattr(-,root,root,-) %changelog +* Tue Jan 5 2010 Jiri Moskovcak 1.0.3-1 +- speed optimalization of abrt-debuginfo-install (jmoskovc@redhat.com) +- updated credits (jmoskovc@redhat.com) +- GUI: fixed crash when abrt-gui is run without X server rhbz#552039 (jmoskovc@redhat.com) +- abrt-backtrace manpage installed (kklic@redhat.com) +- cmdline and daemon checking is done by abrt-python-hook (kklic@redhat.com) +- moved get_cmdline() and daemon_is_ok() to abrtlib (kklic@redhat.com) +- large file support for whole abrt (kklic@redhat.com) +- made s_signal_caught volatile (vda.linux@googlemail.com) +- abrt-debuginfo-install: fixes for runs w/o cachedir (vda.linux@googlemail.com) +- remove unsafe log() from signal handler (vda.linux@googlemail.com) +- src/Hooks/CCpp.cpp: use and honour 'c' (core limit size). (vda.linux@googlemail.com) +- lib/Plugins/CCpp.cpp: save gdb error messages too (vda.linux@googlemail.com) +- prevent destructors from throwing exceptions; check curl_easy_init errors (vda.linux@googlemail.com) +- don't blame python for every crash in /usr/bin/python rhbz#533521 trac#109 (jmoskovc@redhat.com) +- GUI: autoscroll log window (jmoskovc@redhat.com) +- Kerneloops.conf: better comments (vda.linux@googlemail.com) +- applet: reduce blinking time to 30 seconds (vda.linux@googlemail.com) +- add paranoia checks on setuid/setgid (vda.linux@googlemail.com) +- more "obviously correct" code for secure opening of /dev/null (vda.linux@googlemail.com) +- get rid of ugly sleep call inside while() (vda.linux@googlemail.com) + * Mon Dec 14 2009 Jiri Moskovcak 1.0.2-1 - disabled GPG check again (jmoskovc@redhat.com) - abrt-pyhook-helper rename (vda.linux@googlemail.com) diff --git a/sources b/sources index eac3698..acc49ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -755f119d24511b613b02270b51d09312 abrt-1.0.2.tar.gz +916c302d18309caad77b3e3e8fa4bb2c abrt-1.0.3.tar.gz From c99afc4a2ce85faefce6d132399fadf09ad2ffe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Fri, 22 Jan 2010 15:05:23 +0000 Subject: [PATCH 10/32] new version --- .cvsignore | 2 +- abrt.spec | 43 +++++++++++++++++++++++++++++++++++++------ sources | 2 +- 3 files changed, 39 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index cb3f9f1..2cba6c4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abrt-1.0.3.tar.gz +abrt-1.0.4.tar.gz diff --git a/abrt.spec b/abrt.spec index 715ff1e..90b5968 100644 --- a/abrt.spec +++ b/abrt.spec @@ -3,7 +3,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: Automatic bug detection and reporting tool Name: abrt -Version: 1.0.3 +Version: 1.0.4 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -16,13 +16,12 @@ BuildRequires: curl-devel BuildRequires: rpm-devel >= 4.6 BuildRequires: sqlite-devel > 3.0 BuildRequires: desktop-file-utils -BuildRequires: nss-devel +#BuildRequires: nss-devel BuildRequires: libnotify-devel BuildRequires: xmlrpc-c-devel BuildRequires: file-devel BuildRequires: python-devel BuildRequires: gettext -BuildRequires: nss-devel BuildRequires: polkit-devel BuildRequires: libzip-devel, libtar-devel, bzip2-devel, zlib-devel BuildRequires: intltool @@ -71,7 +70,6 @@ GTK+ wizard for convenient bug reporting. %package addon-ccpp Summary: %{name}'s C/C++ addon Group: System Environment/Libraries -Requires: gdb >= 7.0-3 Requires: elfutils Requires: yum-utils Requires: %{name} = %{version}-%{release} @@ -201,6 +199,8 @@ Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} Requires: %{name}-addon-kerneloops Requires: %{name}-addon-ccpp, %{name}-addon-python +# Default config of addon-ccpp requires gdb +Requires: gdb >= 7.0-3 Requires: %{name}-gui Requires: %{name}-plugin-bugzilla, %{name}-plugin-logger, %{name}-plugin-runapp #Requires: %{name}-plugin-firefox @@ -249,6 +249,7 @@ rm -rf $RPM_BUILD_ROOT %pre getent group abrt >/dev/null || groupadd -f --system abrt +getent passwd abrt >/dev/null || useradd --system -g abrt -d /etc/abrt -s /sbin/nologin abrt exit 0 %post @@ -278,7 +279,7 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/dbus-%{name}.conf %{_initrddir}/%{name}d -%dir %attr(0775, root, abrt) %{_localstatedir}/cache/%{name} +%dir %attr(0755, abrt, abrt) %{_localstatedir}/cache/%{name} %dir /var/run/%{name} %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/plugins @@ -385,10 +386,12 @@ fi %files addon-python %defattr(-,root,root,-) -%attr(2755, root, abrt) %{_libexecdir}/abrt-hook-python +%config(noreplace) %{_sysconfdir}/%{name}/plugins/Python.conf +%attr(4755, abrt, abrt) %{_libexecdir}/abrt-hook-python %{_libdir}/%{name}/libPython.so* %{python_site}/*.py* + %files cli %defattr(-,root,root,-) %{_bindir}/abrt-cli @@ -399,6 +402,34 @@ fi %defattr(-,root,root,-) %changelog +* Wed Jan 20 2010 Jiri Moskovcak 1.0.4-1 +- GUI: redesign of reporter dialog (jmoskovc@redhat.com) +- Set the prgname to "Automatic Bug Reporting Tool" fixes rhbz#550357 (jmoskovc@redhat.com) +- CCpp analyzer: display __abort_msg in backtrace. closes rhbz#549735 (vda.linux@googlemail.com) +- s/os.exit/sys.exit - closes rhbz#556313 (vda.linux@googlemail.com) +- use repr() to print variable values in python hook rhbz#545070 (jmoskovc@redhat.com) +- gui: add logging infrastructure (vda.linux@googlemail.com) +- Added "Enabled = yes" to all plugin's config files (jmoskovc@redhat.com) +- *: disable plugin loading/unloading through GUI. Document keyring a bit (vda.linux@googlemail.com) +- fix memory leaks in catcut plugin (npajkovs@redhat.com) +- fix memory leaks in bugzilla (npajkovs@redhat.com) +- abrt-hook-python: sanitize input more; log to syslog (vda.linux@googlemail.com) +- Fixed /var/cache/abrt/ permissions (kklic@redhat.com) +- Kerneloops: we require commandline for every crash, save dummy one for oopses (vda.linux@googlemail.com) +- *: remove nss dependencies (vda.linux@googlemail.com) +- CCpp: use our own sha1 implementation (less pain with nss libs) (vda.linux@googlemail.com) +- DebugDump: more consistent logic in setting mode and uid:gid on dump dir (vda.linux@googlemail.com) +- fixes based on security review (vda.linux@googlemail.com) +- SOSreport/TicketUploader: use more restrictive file modes (vda.linux@googlemail.com) +- abrt-hook-python: add input sanitization and directory size guard (vda.linux@googlemail.com) +- RunApp: safer chdir. Overhauled "sparn a child and get its output" in general (vda.linux@googlemail.com) +- DebugDump: use more restrictive modes (vda.linux@googlemail.com) +- SQLite3: check for SQL injection (vda.linux@googlemail.com) +- replace plugin enabling via EnabledPlugins by par-plugin Enabled = yes/no (vda.linux@googlemail.com) +- abrt.spec: move "requires: gdb" to abrt-desktop (vda.linux@googlemail.com) +- ccpp: add a possibility to disable backtrace generation (vda.linux@googlemail.com) +- abrtd: limit the number of frames in backtrace to 3000 (vda.linux@googlemail.com) + * Tue Jan 5 2010 Jiri Moskovcak 1.0.3-1 - speed optimalization of abrt-debuginfo-install (jmoskovc@redhat.com) - updated credits (jmoskovc@redhat.com) diff --git a/sources b/sources index acc49ca..f5017ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -916c302d18309caad77b3e3e8fa4bb2c abrt-1.0.3.tar.gz +4f345ad766f8d43125faf73dad3e997f abrt-1.0.4.tar.gz From 4a95ca786b8480c1e190d38fec9300506740ea6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Sat, 30 Jan 2010 15:39:09 +0000 Subject: [PATCH 11/32] New version --- .cvsignore | 2 +- abrt.spec | 24 +++++++++++++++++++++++- sources | 2 +- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2cba6c4..fd802f2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abrt-1.0.4.tar.gz +abrt-1.0.5.tar.gz diff --git a/abrt.spec b/abrt.spec index 90b5968..b4db520 100644 --- a/abrt.spec +++ b/abrt.spec @@ -3,7 +3,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: Automatic bug detection and reporting tool Name: abrt -Version: 1.0.4 +Version: 1.0.5 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -277,6 +277,7 @@ fi %{_bindir}/%{name}-debuginfo-install %{_bindir}/%{name}-backtrace %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf +%config(noreplace) %{_sysconfdir}/%{name}/gpg_keys %config(noreplace) %{_sysconfdir}/dbus-1/system.d/dbus-%{name}.conf %{_initrddir}/%{name}d %dir %attr(0755, abrt, abrt) %{_localstatedir}/cache/%{name} @@ -402,6 +403,27 @@ fi %defattr(-,root,root,-) %changelog +* Fri Jan 29 2010 Jiri Moskovcak 1.0.5-1 +- moved the gpg key list from abrt.conf to gpg_keys file (jmoskovc@redhat.com) +- Logger: create log file with mode 0600 (vda.linux@googlemail.com) +- GUI: fixed the rating logic, to prevent sending BT with rating < 3 (jmoskovc@redhat.com) +- Report GUI: made more fields copyable - closed rhbz#526209; tweaked wording (vda.linux@googlemail.com) +- GUI: fixed bug caused by failed gk-authorization (jmoskovc@redhat.com) +- fix bug 559881 (kerneloops not shown in "new" GUI) (vda.linux@googlemail.com) +- GUI ReporterDialog: hide log button (vda.linux@googlemail.com) +- added valgrind and strace to blacklist (jmoskovc@redhat.com) +- SOSreport: do not leave stray files in /tmp (vda.linux@googlemail.com) +- Save the core where it belongs if ulimit -c is > 0 (jmoskovc@redhat.com) +- reenabled gpg check (jmoskovc@redhat.com) +- SOSreport: run it niced (vda.linux@googlemail.com) +- report GUI: rename buttons: Log -> Show log, Send -> Send report (vda.linux@googlemail.com) +- applet: reduce blinking timeout to 3 sec (vda.linux@googlemail.com) +- fix dbus autostart (vda.linux@googlemail.com) +- abrtd: set "Reported" status only if at least one reporter succeeded (vda.linux@googlemail.com) +- SQLite3: disable newline escaping, SQLite does not handle it (vda.linux@googlemail.com) +- SOSreport: make it avoid double runs; add forced regeneration; upd PLUGINS-HOWTO (vda.linux@googlemail.com) +- attribute SEGVs in perl to script's package, like we already do for python (vda.linux@googlemail.com) + * Wed Jan 20 2010 Jiri Moskovcak 1.0.4-1 - GUI: redesign of reporter dialog (jmoskovc@redhat.com) - Set the prgname to "Automatic Bug Reporting Tool" fixes rhbz#550357 (jmoskovc@redhat.com) diff --git a/sources b/sources index f5017ba..3a36fa7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4f345ad766f8d43125faf73dad3e997f abrt-1.0.4.tar.gz +0a34ad1c30771d52e6327d1d84b9ceda abrt-1.0.5.tar.gz From 43380d6b3501c4b7a83b2d44cc1e720fbef349d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Wed, 3 Feb 2010 15:04:28 +0000 Subject: [PATCH 12/32] New version 1.0.6 --- .cvsignore | 2 +- abrt.spec | 31 ++++++++++++++++++++++++++----- sources | 2 +- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index fd802f2..4e5bc58 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abrt-1.0.5.tar.gz +abrt-1.0.6.tar.gz diff --git a/abrt.spec b/abrt.spec index b4db520..33609d7 100644 --- a/abrt.spec +++ b/abrt.spec @@ -3,7 +3,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: Automatic bug detection and reporting tool Name: abrt -Version: 1.0.5 +Version: 1.0.6 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -176,16 +176,19 @@ Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} %description addon-python -This package contains python hook and python analyzer plugin for hadnling +This package contains python hook and python analyzer plugin for handling uncaught exception in python programs. %package cli Summary: %{name}'s command line interface Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} +Requires: %{name}-addon-kerneloops +Requires: %{name}-addon-ccpp, %{name}-addon-python +Requires: %{name}-plugin-bugzilla, %{name}-plugin-logger, %{name}-plugin-runapp %description cli -This package contains simple command line client for controling abrt daemon over +This package contains simple command line client for controlling abrt daemon over the sockets. %package desktop @@ -208,7 +211,7 @@ Obsoletes: bug-buddy Provides: bug-buddy %description desktop -Virtual package to make easy default instalation on desktop environments. +Virtual package to make easy default installation on desktop environments. %prep %setup -q @@ -356,8 +359,10 @@ fi %files plugin-sosreport %defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/%{name}/plugins/SOSreport.conf %{_libdir}/%{name}/libSOSreport.so* + %files plugin-bugzilla %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/Bugzilla.conf @@ -403,12 +408,28 @@ fi %defattr(-,root,root,-) %changelog -* Fri Jan 29 2010 Jiri Moskovcak 1.0.5-1 +* Tue Feb 2 2010 Jiri Moskovcak 1.0.6-1 +- print __glib_assert_msg (rhbz#549735); +- SPEC: added some requires to abrt-cli to make it work out-of-the-box (jmoskovc@redhat.com) +- abrt-hook-ccpp: fix rhbz#560612 "limit '18446744073709551615' is bogus" rhbz#560612(vda.linux@googlemail.com) +- APPLET: don't show the icon when abrtd is not running rhbz#557866 (jmoskovc@redhat.com) +- GUI: made report message labels wrap (jmoskovc@redhat.com) +- GUI: don't die if daemon doesn't send the gpg keys (jmoskovc@redhat.com) +- disabled the autoreporting of kerneloopses (jmoskovc@redhat.com) +- Kerneloops: fix BZ reporting of oopses (vda.linux@googlemail.com) +- GUI: wider report message dialog (jmoskovc@redhat.com) - moved the gpg key list from abrt.conf to gpg_keys file (jmoskovc@redhat.com) - Logger: create log file with mode 0600 (vda.linux@googlemail.com) - GUI: fixed the rating logic, to prevent sending BT with rating < 3 (jmoskovc@redhat.com) - Report GUI: made more fields copyable - closed rhbz#526209; tweaked wording (vda.linux@googlemail.com) - GUI: fixed bug caused by failed gk-authorization (jmoskovc@redhat.com) + +* Fri Jan 29 2010 Jiri Moskovcak 1.0.5-1 +- moved the gpg key list from abrt.conf to gpg_keys file (jmoskovc@redhat.com) +- Logger: create log file with mode 0600 rhbz#559545 (vda.linux@googlemail.com) +- GUI: fixed the rating logic, to prevent sending BT with rating < 3 (jmoskovc@redhat.com) +- Report GUI: made more fields copyable - closed rhbz#526209; tweaked wording (vda.linux@googlemail.com) +- GUI: fixed bug caused by failed gk-authorization (jmoskovc@redhat.com) - fix bug 559881 (kerneloops not shown in "new" GUI) (vda.linux@googlemail.com) - GUI ReporterDialog: hide log button (vda.linux@googlemail.com) - added valgrind and strace to blacklist (jmoskovc@redhat.com) diff --git a/sources b/sources index 3a36fa7..d0b9043 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0a34ad1c30771d52e6327d1d84b9ceda abrt-1.0.5.tar.gz +dd6d64ad3aab3eedc88af843de4320cf abrt-1.0.6.tar.gz From d9c7079b28b666455659df8ef9c20a0439ad6f5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Mon, 15 Feb 2010 13:12:23 +0000 Subject: [PATCH 13/32] New version --- .cvsignore | 2 +- abrt.spec | 34 ++++++++++++++++++++++++++++++++-- sources | 2 +- 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4e5bc58..c0afaf1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abrt-1.0.6.tar.gz +abrt-1.0.7.tar.gz diff --git a/abrt.spec b/abrt.spec index 33609d7..1d52014 100644 --- a/abrt.spec +++ b/abrt.spec @@ -3,7 +3,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: Automatic bug detection and reporting tool Name: abrt -Version: 1.0.6 +Version: 1.0.7 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -205,7 +205,7 @@ Requires: %{name}-addon-ccpp, %{name}-addon-python # Default config of addon-ccpp requires gdb Requires: gdb >= 7.0-3 Requires: %{name}-gui -Requires: %{name}-plugin-bugzilla, %{name}-plugin-logger, %{name}-plugin-runapp +Requires: %{name}-plugin-logger, %{name}-plugin-bugzilla, %{name}-plugin-runapp #Requires: %{name}-plugin-firefox Obsoletes: bug-buddy Provides: bug-buddy @@ -408,6 +408,34 @@ fi %defattr(-,root,root,-) %changelog +* Fri Feb 12 2010 Jiri Moskovcak 1.0.7-1 +- enabled column sorting rhbz#541853 +- Load plugin settings also from ~/.abrt/*.conf (kklic@redhat.com) +- fix bz#541088 "abrt should not catch python excp EPIPE" (vda.linux@googlemail.com) +- fix bz#554242 "Cannot tab between input areas in report dialog" (vda.linux@googlemail.com) +- fix bz#563484 "abrt uses unnecessary disk space when getting debug info" (vda.linux@googlemail.com) +- Don't show empty 'Not loaded plugins' section - fix#2 rhbz#560971 (jmoskovc@redhat.com) +- fix big-endian build problem (vda.linux@googlemail.com) +- Fixes, displays package owners (kklic@redhat.com) +- GUI: fixed exception in plugin settings dialog rhbz#560851 (jmoskovc@redhat.com) +- GUI: respect system settings for toolbars rhbz#552161 (jmoskovc@redhat.com) +- python hook: move UUID generation to abrtd; generate REASON, add it to bz title (vda.linux@googlemail.com) +- make "reason" field less verbose; bz reporter: include it in "summary" (vda.linux@googlemail.com) +- added avant-window-navigator to blacklist per maintainer request (jmoskovc@redhat.com) +- CCpp analyzer: fix rhbz#552435 (bt rating misinterpreting # chars) (vda.linux@googlemail.com) +- Ask for login and password if missing from reporter plugin. (kklic@redhat.com) +- abrtd: fix handling of dupes (weren't deleting dup's directory); better logging (vda.linux@googlemail.com) +- abrtd: handle "perl -w /usr/bin/script" too (vda.linux@googlemail.com) +- Component-wise duplicates (kklic@redhat.com) +- abrtd: fix rhbz#560642 - don't die on bad plugin names (vda.linux@googlemail.com) +- Fixed parsing backtrace from rhbz#549293 (kklic@redhat.com) +- GUI: fixed scrolling in reporter dialog rhbz#559687 (jmoskovc@redhat.com) +- fixed button order in plugins windows rhbz#560961 (jmoskovc@redhat.com) +- GUI: fixed windows icons and titles rhbz#537240, rhbz#560964 (jmoskovc@redhat.com) +- Fix to successfully parse a backtrace from rhbz#550642 (kklic@redhat.com) +- cli: fix the problem of not showing oops text in editor (vda.linux@googlemail.com) +- GUI: fix rhbz#560971 "Don't show empty 'Not loaded plugins' section" (vda.linux@googlemail.com) + * Tue Feb 2 2010 Jiri Moskovcak 1.0.6-1 - print __glib_assert_msg (rhbz#549735); - SPEC: added some requires to abrt-cli to make it work out-of-the-box (jmoskovc@redhat.com) @@ -446,6 +474,8 @@ fi - attribute SEGVs in perl to script's package, like we already do for python (vda.linux@googlemail.com) * Wed Jan 20 2010 Jiri Moskovcak 1.0.4-1 +- enabled sosreport +- fixes in ticketuploader - GUI: redesign of reporter dialog (jmoskovc@redhat.com) - Set the prgname to "Automatic Bug Reporting Tool" fixes rhbz#550357 (jmoskovc@redhat.com) - CCpp analyzer: display __abort_msg in backtrace. closes rhbz#549735 (vda.linux@googlemail.com) diff --git a/sources b/sources index d0b9043..f98f571 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dd6d64ad3aab3eedc88af843de4320cf abrt-1.0.6.tar.gz +cd4afb4d9547251e5a72055a75a5914a abrt-1.0.7.tar.gz From 415d141972c588e2b6bd53e207c24fda25c2691c Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 00:49:54 +0000 Subject: [PATCH 14/32] Initialize branch F-13 for abrt --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From d96a8fa0108cd2cd3f79be2710a0c504a488d8af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Mon, 22 Feb 2010 16:53:03 +0000 Subject: [PATCH 15/32] New version Realated: #557386 --- .cvsignore | 2 +- abrt.spec | 44 ++++++++++++++++++++++++++++++++++++++++++-- sources | 2 +- 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4e5bc58..44a8899 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abrt-1.0.6.tar.gz +abrt-1.0.8.tar.gz diff --git a/abrt.spec b/abrt.spec index 33609d7..92c8311 100644 --- a/abrt.spec +++ b/abrt.spec @@ -3,7 +3,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: Automatic bug detection and reporting tool Name: abrt -Version: 1.0.6 +Version: 1.0.8 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -19,6 +19,7 @@ BuildRequires: desktop-file-utils #BuildRequires: nss-devel BuildRequires: libnotify-devel BuildRequires: xmlrpc-c-devel +BuildRequires: xmlrpc-c-client BuildRequires: file-devel BuildRequires: python-devel BuildRequires: gettext @@ -205,7 +206,7 @@ Requires: %{name}-addon-ccpp, %{name}-addon-python # Default config of addon-ccpp requires gdb Requires: gdb >= 7.0-3 Requires: %{name}-gui -Requires: %{name}-plugin-bugzilla, %{name}-plugin-logger, %{name}-plugin-runapp +Requires: %{name}-plugin-logger, %{name}-plugin-bugzilla, %{name}-plugin-runapp #Requires: %{name}-plugin-firefox Obsoletes: bug-buddy Provides: bug-buddy @@ -408,6 +409,43 @@ fi %defattr(-,root,root,-) %changelog +* Mon Feb 22 2010 Jiri Moskovcak 1.0.8-1 +- fix initscript (npajkovs@redhat.com) +- Kerneloops: make hashing more likely to produce same hash on different oopses (vda.linux@googlemail.com) + +* Mon Feb 22 2010 Jiri Moskovcak 1.0.8-0.git-20100222 +- Kerneloops: make hashing more likely to produce same hash on different oopses (vda.linux@googlemail.com) +- make abrt work with the latest kernels (>= 2.6.33) (jmoskovc@redhat.com) +- lib/Utils/abrt_dbus: utf8-sanitize all strings in dbus messages (fixes #565876) (vda.linux@googlemail.com) + +* Fri Feb 12 2010 Jiri Moskovcak 1.0.7-1 +- enabled column sorting rhbz#541853 +- Load plugin settings also from ~/.abrt/*.conf (kklic@redhat.com) +- fix bz#541088 "abrt should not catch python excp EPIPE" (vda.linux@googlemail.com) +- fix bz#554242 "Cannot tab between input areas in report dialog" (vda.linux@googlemail.com) +- fix bz#563484 "abrt uses unnecessary disk space when getting debug info" (vda.linux@googlemail.com) +- Don't show empty 'Not loaded plugins' section - fix#2 rhbz#560971 (jmoskovc@redhat.com) +- fix big-endian build problem (vda.linux@googlemail.com) +- Fixes, displays package owners (kklic@redhat.com) +- GUI: fixed exception in plugin settings dialog rhbz#560851 (jmoskovc@redhat.com) +- GUI: respect system settings for toolbars rhbz#552161 (jmoskovc@redhat.com) +- python hook: move UUID generation to abrtd; generate REASON, add it to bz title (vda.linux@googlemail.com) +- make "reason" field less verbose; bz reporter: include it in "summary" (vda.linux@googlemail.com) +- added avant-window-navigator to blacklist per maintainer request (jmoskovc@redhat.com) +- CCpp analyzer: fix rhbz#552435 (bt rating misinterpreting # chars) (vda.linux@googlemail.com) +- Ask for login and password if missing from reporter plugin. (kklic@redhat.com) +- abrtd: fix handling of dupes (weren't deleting dup's directory); better logging (vda.linux@googlemail.com) +- abrtd: handle "perl -w /usr/bin/script" too (vda.linux@googlemail.com) +- Component-wise duplicates (kklic@redhat.com) +- abrtd: fix rhbz#560642 - don't die on bad plugin names (vda.linux@googlemail.com) +- Fixed parsing backtrace from rhbz#549293 (kklic@redhat.com) +- GUI: fixed scrolling in reporter dialog rhbz#559687 (jmoskovc@redhat.com) +- fixed button order in plugins windows rhbz#560961 (jmoskovc@redhat.com) +- GUI: fixed windows icons and titles rhbz#537240, rhbz#560964 (jmoskovc@redhat.com) +- Fix to successfully parse a backtrace from rhbz#550642 (kklic@redhat.com) +- cli: fix the problem of not showing oops text in editor (vda.linux@googlemail.com) +- GUI: fix rhbz#560971 "Don't show empty 'Not loaded plugins' section" (vda.linux@googlemail.com) + * Tue Feb 2 2010 Jiri Moskovcak 1.0.6-1 - print __glib_assert_msg (rhbz#549735); - SPEC: added some requires to abrt-cli to make it work out-of-the-box (jmoskovc@redhat.com) @@ -446,6 +484,8 @@ fi - attribute SEGVs in perl to script's package, like we already do for python (vda.linux@googlemail.com) * Wed Jan 20 2010 Jiri Moskovcak 1.0.4-1 +- enabled sosreport +- fixes in ticketuploader - GUI: redesign of reporter dialog (jmoskovc@redhat.com) - Set the prgname to "Automatic Bug Reporting Tool" fixes rhbz#550357 (jmoskovc@redhat.com) - CCpp analyzer: display __abort_msg in backtrace. closes rhbz#549735 (vda.linux@googlemail.com) diff --git a/sources b/sources index d0b9043..9f112fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dd6d64ad3aab3eedc88af843de4320cf abrt-1.0.6.tar.gz +0e480999bb77b3babe19373c03057df4 abrt-1.0.8.tar.gz From 76038bfe2f22a90708eaf50d09a911f64ff54457 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Wed, 3 Mar 2010 14:14:21 +0000 Subject: [PATCH 16/32] - fix initscript even more (npajkovs@redhat.com) - remove -R2 from yum command line Mon Feb 22 2010 Jiri Moskovcak 1.0.8-1 - fix initscript (npajkovs@redhat.com) - Kerneloops: make hashing more likely to produce same hash on different oopses (vda.linux@googlemail.com) Mon Feb 22 2010 Jiri Moskovcak 1.0.8-0.git-20100222 - Kerneloops: make hashing more likely to produce same hash on different oopses (vda.linux@googlemail.com) - make abrt work with the latest kernels (>= 2.6.33) (jmoskovc@redhat.com) - lib/Utils/abrt_dbus: utf8-sanitize all strings in dbus messages (fixes #565876) (vda.linux@googlemail.com) --- .cvsignore | 2 +- abrt.init | 35 ++++++++++++++++++++++++----------- abrt.spec | 20 ++++++++++++++++++-- remove_R2.patch | 13 +++++++++++++ sources | 2 +- 5 files changed, 57 insertions(+), 15 deletions(-) create mode 100644 remove_R2.patch diff --git a/.cvsignore b/.cvsignore index c0afaf1..44a8899 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abrt-1.0.7.tar.gz +abrt-1.0.8.tar.gz diff --git a/abrt.init b/abrt.init index f1dc410..0701fe2 100644 --- a/abrt.init +++ b/abrt.init @@ -11,24 +11,32 @@ # Default-Stop: 0 1 2 6 # Default-Start: 3 5 # Short-Description: start and stop abrt daemon -# Description: Listen and dispatch crash events +# Description: Listen to and dispatch crash events ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions - +ABRT_BIN="/usr/sbin/abrtd" +LOCK="/var/lock/subsys/abrtd" +OLD_LOCK="/var/lock/subsys/abrt" RETVAL=0 +# +# Set these variables if you are behind proxy +# +#export http_proxy= +#export https_proxy= + # # See how we were called. # check() { # Check that we're a privileged user - [ `id -u` = 0 ] || exit 4 + [ "`id -u`" = 0 ] || exit 4 # Check if abrt is executable - test -x /usr/sbin/abrtd || exit 5 + test -x $ABRT_BIN || exit 5 } start() { @@ -36,11 +44,11 @@ start() { check # Check if it is already running - if [ ! -f /var/lock/subsys/abrt ]; then + if [ ! -f $LOCK ] && [ ! -f $OLD_LOCK ]; then echo -n $"Starting abrt daemon: " - daemon /usr/sbin/abrtd + daemon $ABRT_BIN RETVAL=$? - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/abrt + [ $RETVAL -eq 0 ] && touch $LOCK echo fi return $RETVAL @@ -51,9 +59,10 @@ stop() { check echo -n $"Stopping abrt daemon: " - killproc /usr/sbin/abrtd + killproc $ABRT_BIN RETVAL=$? - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/abrt + [ $RETVAL -eq 0 ] && rm -f $LOCK + [ $RETVAL -eq 0 ] && rm -f $OLD_LOCK echo return $RETVAL } @@ -86,8 +95,12 @@ restart) restart ;; condrestart) - if [ -f /var/lock/subsys/abrt ]; then - restart + if [ -f $LOCK ]; then + restart + fi + # update from older version + if [ -f $OLD_LOCK ]; then + restart fi ;; status) diff --git a/abrt.spec b/abrt.spec index 1d52014..f1e5065 100644 --- a/abrt.spec +++ b/abrt.spec @@ -3,13 +3,14 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: Automatic bug detection and reporting tool Name: abrt -Version: 1.0.7 -Release: 1%{?dist} +Version: 1.0.8 +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/abrt/ Source: http://jmoskovc.fedorapeople.org/%{name}-%{version}.tar.gz Source1: abrt.init +Patch1: remove_R2.patch BuildRequires: dbus-devel BuildRequires: gtk2-devel BuildRequires: curl-devel @@ -19,6 +20,7 @@ BuildRequires: desktop-file-utils #BuildRequires: nss-devel BuildRequires: libnotify-devel BuildRequires: xmlrpc-c-devel +BuildRequires: xmlrpc-c-client BuildRequires: file-devel BuildRequires: python-devel BuildRequires: gettext @@ -215,6 +217,7 @@ Virtual package to make easy default installation on desktop environments. %prep %setup -q +%patch1 -b .~remove_R2 -p1 %build %configure @@ -408,6 +411,19 @@ fi %defattr(-,root,root,-) %changelog +* Wed Mar 3 2010 Denys Vlasenko 1.0.8-2 +- fix initscript even more (npajkovs@redhat.com) +- remove -R2 from yum command line + +* Mon Feb 22 2010 Jiri Moskovcak 1.0.8-1 +- fix initscript (npajkovs@redhat.com) +- Kerneloops: make hashing more likely to produce same hash on different oopses (vda.linux@googlemail.com) + +* Mon Feb 22 2010 Jiri Moskovcak 1.0.8-0.git-20100222 +- Kerneloops: make hashing more likely to produce same hash on different oopses (vda.linux@googlemail.com) +- make abrt work with the latest kernels (>= 2.6.33) (jmoskovc@redhat.com) +- lib/Utils/abrt_dbus: utf8-sanitize all strings in dbus messages (fixes #565876) (vda.linux@googlemail.com) + * Fri Feb 12 2010 Jiri Moskovcak 1.0.7-1 - enabled column sorting rhbz#541853 - Load plugin settings also from ~/.abrt/*.conf (kklic@redhat.com) diff --git a/remove_R2.patch b/remove_R2.patch new file mode 100644 index 0000000..8e7bb1a --- /dev/null +++ b/remove_R2.patch @@ -0,0 +1,13 @@ +diff -uprN abrt-1.0.7.orig/src/Daemon/abrt-debuginfo-install abrt-1.0.7/src/Daemon/abrt-debuginfo-install +--- abrt-1.0.7.orig/src/Daemon/abrt-debuginfo-install 2010-02-14 19:54:14.000000000 +0100 ++++ abrt-1.0.7/src/Daemon/abrt-debuginfo-install 2010-03-03 14:58:24.692030800 +0100 +@@ -146,8 +146,7 @@ print_package_names() { + # when we look for debuginfo we need only -debuginfo* repos, so we can disable the rest and thus make it faster + # also we want only fedora repositories, because abrt won't work for other packages anyway + # --showduplicates: do not just show the latest package +- # -R2: wait two minutes max (hopefully this prevents infinite hang on yum lock) +- local cmd="yum $yumopts '--disablerepo=*' '--enablerepo=fedora-debuginfo*' '--enablerepo=updates-debuginfo*' --showduplicates -R2 --quiet provides $missing_debuginfo_files" ++ local cmd="yum $yumopts '--disablerepo=*' '--enablerepo=fedora-debuginfo*' '--enablerepo=updates-debuginfo*' --showduplicates --quiet provides $missing_debuginfo_files" + echo "$cmd" >"yum_provides.$1.OUT" + # eval is needed to strip away ''s; cant remove them above and just use + # $cmd, that would perform globbing on '*' diff --git a/sources b/sources index f98f571..9f112fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cd4afb4d9547251e5a72055a75a5914a abrt-1.0.7.tar.gz +0e480999bb77b3babe19373c03057df4 abrt-1.0.8.tar.gz From 4fc9310869f4cde83f521a81d4fdc20934c90a33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Sun, 14 Mar 2010 22:43:34 +0000 Subject: [PATCH 17/32] - fixed debuginfo-install on F13 - fixed oops reporting --- abrt-1.0.8-debuginfoinstall-latest-yum.patch | 22 +++++++ abrt-1.0.8-oops.patch | 29 ++++++++++ abrt-1.0.8-use-only-enabledrepos.patch | 60 ++++++++++++++++++++ abrt.init | 35 ++++++++---- abrt.spec | 23 +++++++- remove_R2.patch | 28 +++++++++ 6 files changed, 184 insertions(+), 13 deletions(-) create mode 100644 abrt-1.0.8-debuginfoinstall-latest-yum.patch create mode 100644 abrt-1.0.8-oops.patch create mode 100644 abrt-1.0.8-use-only-enabledrepos.patch create mode 100644 remove_R2.patch diff --git a/abrt-1.0.8-debuginfoinstall-latest-yum.patch b/abrt-1.0.8-debuginfoinstall-latest-yum.patch new file mode 100644 index 0000000..c68620e --- /dev/null +++ b/abrt-1.0.8-debuginfoinstall-latest-yum.patch @@ -0,0 +1,22 @@ +commit 87cc9488bd08a5f17318ddd70cbfcdb4182f8b16 +Author: Jiri Moskovcak +Date: Thu Mar 11 23:50:47 2010 +0100 + + minor fix in abrt-debuginfo-install to make it work with yum >= 3.2.26 + + - yum repolist has different output, so it needs to bu run + with additional parameter 'all' + +diff --git a/src/Daemon/abrt-debuginfo-install b/src/Daemon/abrt-debuginfo-install +index 0d9401b..521d42a 100755 +--- a/src/Daemon/abrt-debuginfo-install ++++ b/src/Daemon/abrt-debuginfo-install +@@ -303,7 +303,7 @@ $debug && echo "build_ids:$build_ids" + # When we look for debuginfo we need only -debuginfo* repos, we can disable the rest + # and thus make it faster. + yum_repo_opts="'--disablerepo=*'" +-for enabled_repo in `yum repolist | grep 'enabled:' | cut -f1 -d' ' | grep -v -- '-debuginfo'`; do ++for enabled_repo in `yum repolist all | grep 'enabled:' | cut -f1 -d' ' | grep -v -- '-debuginfo'`; do + yum_repo_opts="$yum_repo_opts '--enablerepo=${enabled_repo}-debuginfo*'" + done + diff --git a/abrt-1.0.8-oops.patch b/abrt-1.0.8-oops.patch new file mode 100644 index 0000000..e038d0a --- /dev/null +++ b/abrt-1.0.8-oops.patch @@ -0,0 +1,29 @@ +commit cbec527eea140de7c2001c08c321f6afeff2a5e1 +Author: Denys Vlasenko +Date: Wed Mar 3 14:03:00 2010 +0100 + + fix bz#570081 (self.is_oops is not defined) + + Signed-off-by: Denys Vlasenko + +diff --git a/src/Gui/CCReporterDialog.py b/src/Gui/CCReporterDialog.py +index bc4a1e0..989f7cb 100644 +--- a/src/Gui/CCReporterDialog.py ++++ b/src/Gui/CCReporterDialog.py +@@ -214,6 +214,7 @@ class ReporterDialog(): + self.editable = [] + self.old_comment = COMMENT_HINT_TEXT + self.old_how_to_reproduce = HOW_TO_HINT_TEXT ++ self.is_oops = False + for item in self.report: + try: + log2("report[%s]:%s/%s/%s", item, self.report[item][0], self.report[item][1], self.report[item][2][0:20]) +@@ -306,7 +307,7 @@ class ReporterDialog(): + text = buff.get_text(buff.get_start_iter(), buff.get_end_iter()) + if self.old_how_to_reproduce != text: + self.report[FILENAME_REPRODUCE] = [CD_TXT, 'y', text] +- #handle backtrace ++ # handle backtrace + tev_backtrace = self.builder.get_object("tvBacktrace") + buff = tev_backtrace.get_buffer() + text = buff.get_text(buff.get_start_iter(), buff.get_end_iter()) diff --git a/abrt-1.0.8-use-only-enabledrepos.patch b/abrt-1.0.8-use-only-enabledrepos.patch new file mode 100644 index 0000000..3497fe9 --- /dev/null +++ b/abrt-1.0.8-use-only-enabledrepos.patch @@ -0,0 +1,60 @@ +commit 4432b7407e6afbbb5e91ad24455556d0e679a4f9 +Author: Denys Vlasenko +Date: Thu Mar 4 20:37:10 2010 +0100 + + abrt-debuginfo-install: use -debuginfo repos which match enabled "usual" repos + + Signed-off-by: Denys Vlasenko + +diff --git a/src/Daemon/abrt-debuginfo-install b/src/Daemon/abrt-debuginfo-install +index 1b6af74..0d9401b 100755 +--- a/src/Daemon/abrt-debuginfo-install ++++ b/src/Daemon/abrt-debuginfo-install +@@ -145,14 +145,12 @@ print_package_names() { + else + echo "`count_words $missing_debuginfo_files` missing debuginfos, getting package list from repositories" >&2 + fi +- # when we look for debuginfo we need only -debuginfo* repos, so we can disable the rest and thus make it faster +- # also we want only fedora repositories, because abrt won't work for other packages anyway + # --showduplicates: do not just show the latest package + # (tried to use -R2 to abort on stuck yum lock but -R is not about that) +- local cmd="yum $yumopts '--disablerepo=*' '--enablerepo=fedora-debuginfo*' '--enablerepo=updates-debuginfo*' --showduplicates --quiet provides $missing_debuginfo_files" ++ local cmd="yum $yumopts $yum_repo_opts --showduplicates --quiet provides $missing_debuginfo_files" + echo "$cmd" >"yum_provides.$1.OUT" + $debug && echo "Running: $cmd" >&2 +- # eval is needed to strip away ''s; cant remove them above and just use ++ # eval is needed to strip away ''s in $yum_repo_opts; cant remove them and just use + # unquoted $cmd, that would perform globbing on '*' + local yum_provides_OUT="`eval $cmd 2>&1`" + local err=$? +@@ -199,9 +197,10 @@ download_packages() { + for pkg in $packages; do + echo "Download $i/$num_packages: $pkg" + echo "Download $i/$num_packages: $pkg" >>yumdownloader.OUT +- # We can't handle packages from non Fedora repos, so we look and download only +- # from Fedora repos which makes it faster +- yumdownloader --disablerepo="*" --enablerepo="fedora-debuginfo*" --enablerepo="updates-debuginfo*" --quiet $pkg >>yumdownloader.OUT 2>&1 ++ cmd="yumdownloader $yum_repo_opts --quiet $pkg" ++ $debug && echo "Running: $cmd" >&2 ++ # eval is needed to strip away ''s in $yum_repo_opts ++ eval $cmd >>yumdownloader.OUT 2>&1 + err=$? + echo "exitcode:$err" >>yumdownloader.OUT + echo >>yumdownloader.OUT +@@ -299,6 +298,16 @@ build_ids=`printf "%s\n" "$eu_unstrip_OUT" \ + done | sort | uniq | xargs` + $debug && echo "build_ids:$build_ids" + ++ ++# Prepare list of repos to use. ++# When we look for debuginfo we need only -debuginfo* repos, we can disable the rest ++# and thus make it faster. ++yum_repo_opts="'--disablerepo=*'" ++for enabled_repo in `yum repolist | grep 'enabled:' | cut -f1 -d' ' | grep -v -- '-debuginfo'`; do ++ yum_repo_opts="$yum_repo_opts '--enablerepo=${enabled_repo}-debuginfo*'" ++done ++ ++ + # We try to not run yum without -C unless absolutely necessary. + # Therefore we loop. yum is run by print_package_names function, + # on first iteration it is run with -C, on second - without, diff --git a/abrt.init b/abrt.init index f1dc410..0701fe2 100644 --- a/abrt.init +++ b/abrt.init @@ -11,24 +11,32 @@ # Default-Stop: 0 1 2 6 # Default-Start: 3 5 # Short-Description: start and stop abrt daemon -# Description: Listen and dispatch crash events +# Description: Listen to and dispatch crash events ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions - +ABRT_BIN="/usr/sbin/abrtd" +LOCK="/var/lock/subsys/abrtd" +OLD_LOCK="/var/lock/subsys/abrt" RETVAL=0 +# +# Set these variables if you are behind proxy +# +#export http_proxy= +#export https_proxy= + # # See how we were called. # check() { # Check that we're a privileged user - [ `id -u` = 0 ] || exit 4 + [ "`id -u`" = 0 ] || exit 4 # Check if abrt is executable - test -x /usr/sbin/abrtd || exit 5 + test -x $ABRT_BIN || exit 5 } start() { @@ -36,11 +44,11 @@ start() { check # Check if it is already running - if [ ! -f /var/lock/subsys/abrt ]; then + if [ ! -f $LOCK ] && [ ! -f $OLD_LOCK ]; then echo -n $"Starting abrt daemon: " - daemon /usr/sbin/abrtd + daemon $ABRT_BIN RETVAL=$? - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/abrt + [ $RETVAL -eq 0 ] && touch $LOCK echo fi return $RETVAL @@ -51,9 +59,10 @@ stop() { check echo -n $"Stopping abrt daemon: " - killproc /usr/sbin/abrtd + killproc $ABRT_BIN RETVAL=$? - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/abrt + [ $RETVAL -eq 0 ] && rm -f $LOCK + [ $RETVAL -eq 0 ] && rm -f $OLD_LOCK echo return $RETVAL } @@ -86,8 +95,12 @@ restart) restart ;; condrestart) - if [ -f /var/lock/subsys/abrt ]; then - restart + if [ -f $LOCK ]; then + restart + fi + # update from older version + if [ -f $OLD_LOCK ]; then + restart fi ;; status) diff --git a/abrt.spec b/abrt.spec index 92c8311..99b47b6 100644 --- a/abrt.spec +++ b/abrt.spec @@ -4,12 +4,16 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 1.0.8 -Release: 1%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/abrt/ -Source: http://jmoskovc.fedorapeople.org/%{name}-%{version}.tar.gz +Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz Source1: abrt.init +Patch1: remove_R2.patch +Patch2: abrt-1.0.8-oops.patch +Patch3: abrt-1.0.8-use-only-enabledrepos.patch +Patch4: abrt-1.0.8-debuginfoinstall-latest-yum.patch BuildRequires: dbus-devel BuildRequires: gtk2-devel BuildRequires: curl-devel @@ -216,6 +220,10 @@ Virtual package to make easy default installation on desktop environments. %prep %setup -q +%patch1 -b .~remove_R2 -p1 +%patch2 -b .~oops -p1 +%patch3 -b .~only-enabled -p1 +%patch4 -b .~latest-yum -p1 %build %configure @@ -409,6 +417,17 @@ fi %defattr(-,root,root,-) %changelog +* Sat Mar 13 2010 Jiri Moskovcak 1.0.8-3 +- fixed kerneloops reporting rhbz#570081 +- fixed Source url +- fixed debuginfo-install to work on F13 + - improved debuginfo-install (vda.linux@googlemail.com) + - fix debuginfo-install to work with yum >= 3.2.26 (jmoskovc@redhat.com) + +* Wed Mar 3 2010 Denys Vlasenko 1.0.8-2 +- fix initscript even more (npajkovs@redhat.com) +- remove -R2 from yum command line + * Mon Feb 22 2010 Jiri Moskovcak 1.0.8-1 - fix initscript (npajkovs@redhat.com) - Kerneloops: make hashing more likely to produce same hash on different oopses (vda.linux@googlemail.com) diff --git a/remove_R2.patch b/remove_R2.patch new file mode 100644 index 0000000..baf415b --- /dev/null +++ b/remove_R2.patch @@ -0,0 +1,28 @@ +commit 9d109b568bbbdee069bb5dfcbca3c259a74e98a8 +Author: Denys Vlasenko +Date: Wed Mar 3 11:45:33 2010 +0100 + + abrt-debuginfo-install: remove -R2 from yum! it's not "anti-yum-lock" option! + + Signed-off-by: Denys Vlasenko + +diff --git a/src/Daemon/abrt-debuginfo-install b/src/Daemon/abrt-debuginfo-install +index 3bb9c41..1b6af74 100755 +--- a/src/Daemon/abrt-debuginfo-install ++++ b/src/Daemon/abrt-debuginfo-install +@@ -146,11 +148,12 @@ print_package_names() { + # when we look for debuginfo we need only -debuginfo* repos, so we can disable the rest and thus make it faster + # also we want only fedora repositories, because abrt won't work for other packages anyway + # --showduplicates: do not just show the latest package +- # -R2: wait two minutes max (hopefully this prevents infinite hang on yum lock) +- local cmd="yum $yumopts '--disablerepo=*' '--enablerepo=fedora-debuginfo*' '--enablerepo=updates-debuginfo*' --showduplicates -R2 --quiet provides $missing_debuginfo_files" ++ # (tried to use -R2 to abort on stuck yum lock but -R is not about that) ++ local cmd="yum $yumopts '--disablerepo=*' '--enablerepo=fedora-debuginfo*' '--enablerepo=updates-debuginfo*' --showduplicates --quiet provides $missing_debuginfo_files" + echo "$cmd" >"yum_provides.$1.OUT" ++ $debug && echo "Running: $cmd" >&2 + # eval is needed to strip away ''s; cant remove them above and just use +- # $cmd, that would perform globbing on '*' ++ # unquoted $cmd, that would perform globbing on '*' + local yum_provides_OUT="`eval $cmd 2>&1`" + local err=$? + printf "%s\nyum exitcode:%s\n" "$yum_provides_OUT" $err >>"yum_provides.$1.OUT" From 00e5fd5cdd7e7b78d5786d9ece8ec2dcb2a4b68a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Wed, 31 Mar 2010 19:47:52 +0000 Subject: [PATCH 18/32] new version 1.0.9pre --- abrt-1.0.9-hideprefs.patch | 11 ++++ abrt.spec | 126 +++++++++++++++++++++++++++++-------- 2 files changed, 110 insertions(+), 27 deletions(-) create mode 100644 abrt-1.0.9-hideprefs.patch diff --git a/abrt-1.0.9-hideprefs.patch b/abrt-1.0.9-hideprefs.patch new file mode 100644 index 0000000..668f092 --- /dev/null +++ b/abrt-1.0.9-hideprefs.patch @@ -0,0 +1,11 @@ +--- abrt-1.0.9/src/Gui/ccgui.glade 2010-03-31 10:34:14.000000000 +0200 ++++ abrt-1.0.9_hideprefs/src/Gui/ccgui.glade 2010-03-31 21:39:27.653364662 +0200 +@@ -102,7 +102,7 @@ + + + gtk-preferences +- True ++ False + True + True + True diff --git a/abrt.spec b/abrt.spec index 99b47b6..2a32004 100644 --- a/abrt.spec +++ b/abrt.spec @@ -1,19 +1,29 @@ %{!?python_site: %define python_site %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")} # platform-dependent %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + +# please modify the "_buildid" define in a way that identifies +# that the built package isn't the stock distribution package, +# for example, by setting the define to ".local" or ".bz123456" +# +%define _buildid 201003311 + +%if 0%{?_buildid} +%define pkg_release 0.%{?_buildid}%{?dist} +%else +%define pkg_release 1%{?dist} +%endif + Summary: Automatic bug detection and reporting tool Name: abrt -Version: 1.0.8 -Release: 3%{?dist} +Version: 1.0.9 +Release: %{?pkg_release} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/abrt/ Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz Source1: abrt.init -Patch1: remove_R2.patch -Patch2: abrt-1.0.8-oops.patch -Patch3: abrt-1.0.8-use-only-enabledrepos.patch -Patch4: abrt-1.0.8-debuginfoinstall-latest-yum.patch +Patch0: abrt-1.0.9-hideprefs.patch BuildRequires: dbus-devel BuildRequires: gtk2-devel BuildRequires: curl-devel @@ -83,17 +93,6 @@ Requires: %{name} = %{version}-%{release} This package contains hook for C/C++ crashed programs and %{name}'s C/C++ analyzer plugin. -#%package plugin-firefox -#Summary: %{name}'s Firefox analyzer plugin -#Group: System Environment/Libraries -#Requires: gdb >= 7.0-3 -#Requires: elfutils -#Requires: yum-utils -#Requires: %{name} = %{version}-%{release} - -#%description plugin-firefox -#This package contains hook for Firefox - %package addon-kerneloops Summary: %{name}'s kerneloops addon Group: System Environment/Libraries @@ -151,6 +150,22 @@ Requires: %{name} = %{version}-%{release} %description plugin-bugzilla Plugin to report bugs into the bugzilla. +%package plugin-rhfastcheck +Summary: %{name}'s rhfastcheck plugin +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} + +%description plugin-rhfastcheck +Plugin to quickly check RH support DB for known solution. + +%package plugin-rhticket +Summary: %{name}'s rhticket plugin +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} + +%description plugin-rhticket +Plugin to report bugs into RH support system. + %package plugin-catcut Summary: %{name}'s catcut plugin Group: System Environment/Libraries @@ -220,10 +235,7 @@ Virtual package to make easy default installation on desktop environments. %prep %setup -q -%patch1 -b .~remove_R2 -p1 -%patch2 -b .~oops -p1 -%patch3 -b .~only-enabled -p1 -%patch4 -b .~latest-yum -p1 +%patch0 -p1 -b .hideprefs %build %configure @@ -267,6 +279,13 @@ exit 0 %post /sbin/chkconfig --add %{name}d +%post gui +# update icon cache +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + %post libs -p /sbin/ldconfig %preun @@ -277,6 +296,12 @@ fi %postun libs -p /sbin/ldconfig +%postun gui +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + %posttrans if [ "$1" -eq "0" ]; then service %{name}d condrestart >/dev/null 2>&1 || : @@ -319,10 +344,13 @@ fi %files gui %defattr(-,root,root,-) %{_bindir}/%{name}-gui -%{_datadir}/%{name} +%dir %{_datadir}/%{name} +# all glade, gtkbuilder and py files for gui +%{_datadir}/%{name}/*.py* +%{_datadir}/%{name}/*.glade %{_datadir}/applications/fedora-%{name}.desktop -%{_datadir}/pixmaps/abrt.png -%{_datadir}/icons/hicolor/48x48/apps/*.png +%{_datadir}/icons/hicolor/*/apps/* +%{_datadir}/%{name}/icons/hicolor/*/status/* %{_bindir}/%{name}-applet %{_sysconfdir}/xdg/autostart/%{name}-applet.desktop @@ -333,9 +361,6 @@ fi %{_libdir}/%{name}/libCCpp.so* %{_libexecdir}/abrt-hook-ccpp -#%files plugin-firefox -#%{_libdir}/%{name}/libFirefox.so* - %files addon-kerneloops %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/Kerneloops.conf @@ -379,6 +404,20 @@ fi %{_libdir}/%{name}/Bugzilla.GTKBuilder %{_mandir}/man7/%{name}-Bugzilla.7.gz +%files plugin-rhfastcheck +%defattr(-,root,root,-) +#%config(noreplace) %{_sysconfdir}/%{name}/plugins/rhfastcheck.conf +%{_libdir}/%{name}/librhfastcheck.so* +#%{_libdir}/%{name}/rhfastcheck.GTKBuilder +#%{_mandir}/man7/%{name}-rhfastcheck.7.gz + +%files plugin-rhticket +%defattr(-,root,root,-) +#%config(noreplace) %{_sysconfdir}/%{name}/plugins/rhticket.conf +%{_libdir}/%{name}/librhticket.so* +#%{_libdir}/%{name}/rhticket.GTKBuilder +#%{_mandir}/man7/%{name}-rhticket.7.gz + %files plugin-catcut %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/Catcut.conf @@ -405,6 +444,7 @@ fi %attr(4755, abrt, abrt) %{_libexecdir}/abrt-hook-python %{_libdir}/%{name}/libPython.so* %{python_site}/*.py* +%{python_site}/abrt.pth %files cli @@ -417,6 +457,38 @@ fi %defattr(-,root,root,-) %changelog +* Wed Mar 31 2010 Jiri Moskovcak 1.0.9-0.201003312045.1 +- test day build +- updated translation +- minor fix to sosreport to make it work with latest sos rhbz#576861 (jmoskovc@redhat.com) +- GUI: total rewrite based on design from Mairin Duffy (jmoskovc@redhat.com) +- trivial: better HTTP/curl error reporting (vda.linux@googlemail.com) +- Use backtrace parser from abrtutils, new backtrace rating algorithm, store crash function if it's known (kklic@redhat.com) +- abrt-rate-backtrace is replaced by abrt-backtrace --rate (kklic@redhat.com) +- Ignore some temp files (kklic@redhat.com) +- PYHOOK: don't use sitecustomize.py rhbz#539497 (jmoskovc@redhat.com) +- rhfastcheck: a new reporter plugin based on Gavin's work (vda.linux@googlemail.com) +- rhticket: new reporter plugin (vda.linux@googlemail.com) +- GUI: fixed few window icons (jmoskovc@redhat.com) +- Allow user to select which reporter he wants to use to report a crash using CLI.(kklic@redhat.com) +- bz reporter: s/uuid/duphash; more understandable message; simplify result str generation; fix indentation (vda.linux@googlemail.com) +- GUI: fixed crash count column sorting rhbz#573139 (jmoskovc@redhat.com) +- Kerneloops: use 1st line of oops as REASON. Closes rhbz#574196. (vda.linux@googlemail.com) +- Kerneloops: fix a case when we file an oops w/o backtrace (vda.linux@googlemail.com) +- minor fix in abrt-debuginfo-install to make it work with yum >= 3.2.26 (jmoskovc@redhat.com) +- GUI: added action to applet to directly report last crash (jmoskovc@redhat.com) +- Never flag backtrace as binary file (fixes problem observed in bz#571411) (vda.linux@googlemail.com) +- improve syslog file detection. closes bz#565983 (vda.linux@googlemail.com) +- add arch, package and release in comment (npajkovs@redhat.com) +- add ProcessUnpackaged option to abrt.conf (vda.linux@googlemail.com) +- abrt-debuginfo-install: use -debuginfo repos which match enabled "usual" repos (vda.linux@googlemail.com) +- fix format security error (fcrozat@mandriva.com) +- icons repackaging (jmoskovc@redhat.com) +- partial fix for bz#565983 (vda.linux@googlemail.com) +- SPEC: Updated source URL (jmoskovc@redhat.com) +- removed unneeded patches +- and much more ... + * Sat Mar 13 2010 Jiri Moskovcak 1.0.8-3 - fixed kerneloops reporting rhbz#570081 - fixed Source url From f44de37df11d5f25076fba24cfffb08b0812057a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Wed, 31 Mar 2010 20:20:28 +0000 Subject: [PATCH 19/32] forgot to update sources --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 44a8899..9d5f94a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abrt-1.0.8.tar.gz +abrt-1.0.9.tar.gz diff --git a/sources b/sources index 9f112fc..14507e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0e480999bb77b3babe19373c03057df4 abrt-1.0.8.tar.gz +585d1092fee7ece9cbcc6d1866fe7195 abrt-1.0.9.tar.gz From e1f75acbe3aae85ce3d8695e9cc0842f82af64ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Tue, 6 Apr 2010 18:00:34 +0000 Subject: [PATCH 20/32] New version --- abrt.spec | 11 ++++++++++- sources | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/abrt.spec b/abrt.spec index 2a32004..9ecca6b 100644 --- a/abrt.spec +++ b/abrt.spec @@ -6,7 +6,7 @@ # that the built package isn't the stock distribution package, # for example, by setting the define to ".local" or ".bz123456" # -%define _buildid 201003311 +# % define _buildid .local %if 0%{?_buildid} %define pkg_release 0.%{?_buildid}%{?dist} @@ -457,6 +457,15 @@ fi %defattr(-,root,root,-) %changelog +* Tue Apr 06 2010 Jiri Moskovcak 1.0.9-1 +- hooklib: fix excessive rounding down in free space calculation (bz#575644) (vda.linux@googlemail.com) +- gui: fix 551989 "crash detected in abrt-gui-1.0.0-1.fc12" and such (vda.linux@googlemail.com) +- trivial: fix 566806 "abrt-gui sometimes can't be closed" (vda.linux@googlemail.com) +- gui: fix the last case where gnome-keyring's find_items_sync() may throw DeniedError (vda.linux@googlemail.com) +- fixed some compilation problems on F13 (jmoskovc@redhat.com) +- updated translations (jmoskovc@redhat.com) +- minor fix to sosreport to make it work with latest sos rhbz#576861 (jmoskovc@redhat.com) + * Wed Mar 31 2010 Jiri Moskovcak 1.0.9-0.201003312045.1 - test day build - updated translation diff --git a/sources b/sources index 14507e0..d0b613c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -585d1092fee7ece9cbcc6d1866fe7195 abrt-1.0.9.tar.gz +aaa31f787ae7c144c57837928d26fdc9 abrt-1.0.9.tar.gz From b4923fcfa6ca76e69bebd61d3498654b7681bfd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Wed, 14 Apr 2010 13:46:47 +0000 Subject: [PATCH 21/32] - fixed problems with localized yum messages - improved BZ summary - ignore unpackaged scripts --- abrt.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 9ecca6b..581dd67 100644 --- a/abrt.spec +++ b/abrt.spec @@ -11,7 +11,7 @@ %if 0%{?_buildid} %define pkg_release 0.%{?_buildid}%{?dist} %else -%define pkg_release 1%{?dist} +%define pkg_release 2%{?dist} %endif Summary: Automatic bug detection and reporting tool @@ -24,6 +24,9 @@ URL: https://fedorahosted.org/abrt/ Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz Source1: abrt.init Patch0: abrt-1.0.9-hideprefs.patch +Patch1: abrt-localizedyum.patch +Patch2: abrt-1.0.9-better-bz-summary.patch +Patch3: abrt-1.0.9-ignore_user_scripts.patch BuildRequires: dbus-devel BuildRequires: gtk2-devel BuildRequires: curl-devel @@ -236,6 +239,9 @@ Virtual package to make easy default installation on desktop environments. %prep %setup -q %patch0 -p1 -b .hideprefs +%patch1 -p1 -b .localizedyum +%patch2 -p1 -b .better_bz +%patch3 -p1 -b .ingore_unp_scripts %build %configure @@ -457,6 +463,11 @@ fi %defattr(-,root,root,-) %changelog +* Wed Apr 14 2010 Jiri Moskovcak 1.0.9-2 +- fixed problem with localized yum messages rhbz#581804 +- better bugzilla summary (napjkovs@redhat.com) +- ignore interpreter (py,perl) crashes caused by unpackaged scripts (kklic@redhat.com) + * Tue Apr 06 2010 Jiri Moskovcak 1.0.9-1 - hooklib: fix excessive rounding down in free space calculation (bz#575644) (vda.linux@googlemail.com) - gui: fix 551989 "crash detected in abrt-gui-1.0.0-1.fc12" and such (vda.linux@googlemail.com) From 58a66ca160afe40b99a1adea9b1fcbdcdc7654dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Wed, 14 Apr 2010 13:51:28 +0000 Subject: [PATCH 22/32] forgot to add the patches --- abrt-1.0.9-better-bz-summary.patch | 28 ++++++ abrt-1.0.9-ignore_user_scripts.patch | 126 +++++++++++++++++++++++++++ abrt-localizedyum.patch | 19 ++++ 3 files changed, 173 insertions(+) create mode 100644 abrt-1.0.9-better-bz-summary.patch create mode 100644 abrt-1.0.9-ignore_user_scripts.patch create mode 100644 abrt-localizedyum.patch diff --git a/abrt-1.0.9-better-bz-summary.patch b/abrt-1.0.9-better-bz-summary.patch new file mode 100644 index 0000000..6d3f0c3 --- /dev/null +++ b/abrt-1.0.9-better-bz-summary.patch @@ -0,0 +1,28 @@ +commit fcde1a65a0a283ed785cafa8a44ae219e1a79912 +Author: Nikola Pajkovsky +Date: Wed Apr 7 17:47:32 2010 +0200 + + add function name into summary(if it's found) + + Signed-off-by: Nikola Pajkovsky + +diff --git a/lib/Plugins/Bugzilla.cpp b/lib/Plugins/Bugzilla.cpp +index e59e9a7..bffccc1 100644 +--- a/lib/Plugins/Bugzilla.cpp ++++ b/lib/Plugins/Bugzilla.cpp +@@ -352,8 +352,15 @@ xmlrpc_int32 ctx::new_bug(const map_crash_data_t& pCrashData) + const std::string& arch = get_crash_data_item_content(pCrashData, FILENAME_ARCHITECTURE); + const std::string& duphash = get_crash_data_item_content(pCrashData, CD_DUPHASH); + const char *reason = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_REASON); ++ const char *function = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_CRASH_FUNCTION); + + std::string summary = "[abrt] crash in " + package; ++ if (function != NULL && strlen(function) < 30) ++ { ++ summary += ": "; ++ summary += function; ++ } ++ + if (reason != NULL) + { + summary += ": "; diff --git a/abrt-1.0.9-ignore_user_scripts.patch b/abrt-1.0.9-ignore_user_scripts.patch new file mode 100644 index 0000000..fe3783a --- /dev/null +++ b/abrt-1.0.9-ignore_user_scripts.patch @@ -0,0 +1,126 @@ +commit a6daecbb32cf5fb0f71bdc14dddd35e7422dd4bb +Author: Karel Klic +Date: Tue Apr 13 14:57:20 2010 +0200 + + do not catch perl/python crashes when the script is not of known package origin + +diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp +index a0ead47..5c9ecb7 100644 +--- a/src/Daemon/MiddleWare.cpp ++++ b/src/Daemon/MiddleWare.cpp +@@ -594,43 +594,51 @@ void LoadOpenGPGPublicKey(const char* key) + } + + /** +- * Get a package name from executable name and save +- * package description to particular debugdump directory of a crash. +- * @param pExecutable A name of crashed application. +- * @param pDebugDumpDir A debugdump dir containing all necessary data. +- * @return It return results of operation. See mw_result_t. ++ * Returns the first full path argument in the command line or NULL. ++ * Skips options are in form "-XXX". ++ * Caller must delete the returned string using free(). + */ + static char *get_argv1_if_full_path(const char* cmdline) + { +- char *argv1 = (char*) strchr(cmdline, ' '); ++ const char *argv1 = strpbrk(cmdline, " \t"); + while (argv1 != NULL) + { + /* we found space in cmdline, so it might contain + * path to some script like: + * /usr/bin/python [-XXX] /usr/bin/system-control-network + */ +- argv1++; +- if (*argv1 == '-') ++ argv1++; /* skip the space */ ++ if (*argv1 == '-') /* skip arguments */ + { + /* looks like -XXX in "perl -XXX /usr/bin/script.pl", skip */ +- argv1 = strchr(argv1, ' '); ++ argv1 = strpbrk(argv1, " \t"); + continue; + } +- /* if the string following the space doesn't start +- * with '/' it's probably not a full path to script +- * and we can't use it to determine the package name +- */ +- if (*argv1 != '/') ++ else if (*argv1 == ' ' || *argv1 == '\t') /* skip multiple spaces */ ++ continue; ++ else if (*argv1 != '/') + { +- return NULL; ++ /* if the string following the space doesn't start ++ * with '/' it's probably not a full path to script ++ * and we can't use it to determine the package name ++ */ ++ break; + } ++ ++ /* cut the rest of cmdline arguments */ + int len = strchrnul(argv1, ' ') - argv1; +- /* cut the cmdline arguments */ +- argv1 = xstrndup(argv1, len); +- break; ++ return xstrndup(argv1, len); + } +- return argv1; ++ return NULL; + } ++ ++/** ++ * Get a package name from executable name and save ++ * package description to particular debugdump directory of a crash. ++ * @param pExecutable A name of crashed application. ++ * @param pDebugDumpDir A debugdump dir containing all necessary data. ++ * @return It return results of operation. See mw_result_t. ++ */ + static mw_result_t SavePackageDescriptionToDebugDump( + const char *pExecutable, + const char *cmdline, +@@ -692,6 +700,7 @@ static mw_result_t SavePackageDescriptionToDebugDump( + * This will work only if the cmdline contains the whole path. + * Example: python /usr/bin/system-control-network + */ ++ bool knownOrigin = false; + char *script_name = get_argv1_if_full_path(cmdline); + if (script_name) + { +@@ -707,9 +716,16 @@ static mw_result_t SavePackageDescriptionToDebugDump( + rpm_pkg = script_pkg; + scriptName = script_name; + pExecutable = scriptName.c_str(); ++ knownOrigin = true; + } + free(script_name); + } ++ ++ if (!knownOrigin && !g_settings_bProcessUnpackaged) ++ { ++ log("Interpreter crashed, but no packaged script detected: '%s'", cmdline); ++ return MW_PACKAGE_ERROR; ++ } + } + + package = rpm_pkg; +@@ -717,7 +733,7 @@ static mw_result_t SavePackageDescriptionToDebugDump( + VERB2 log("Package:'%s' short:'%s'", rpm_pkg, packageName.c_str()); + free(rpm_pkg); + +- if (g_setBlackList.find(packageName) != g_setBlackList.end()) ++ if (g_setBlackList.find(packageName) != g_setBlackList.end()) + { + log("Blacklisted package '%s'", packageName.c_str()); + return MW_BLACKLISTED; +@@ -838,8 +854,8 @@ static void RunAnalyzerActions(const char *pAnalyzer, const char *pDebugDumpDir, + if (!action) + { + /* GetAction() already complained if no such plugin. +- * If plugin exists but isn't an Action, it's not an error. +- */ ++ * If plugin exists but isn't an Action, it's not an error. ++ */ + continue; + } + try diff --git a/abrt-localizedyum.patch b/abrt-localizedyum.patch new file mode 100644 index 0000000..4567a55 --- /dev/null +++ b/abrt-localizedyum.patch @@ -0,0 +1,19 @@ +commit 306a4686200c33e34c0650b6ad09b1a5a3f32a77 +Author: Jiri Moskovcak +Date: Tue Apr 13 16:51:30 2010 +0200 + + fixed problem with localized yum output rhbz#581804 + +diff --git a/src/Daemon/abrt-debuginfo-install b/src/Daemon/abrt-debuginfo-install +index 521d42a..84d2446 100755 +--- a/src/Daemon/abrt-debuginfo-install ++++ b/src/Daemon/abrt-debuginfo-install +@@ -303,7 +303,7 @@ $debug && echo "build_ids:$build_ids" + # When we look for debuginfo we need only -debuginfo* repos, we can disable the rest + # and thus make it faster. + yum_repo_opts="'--disablerepo=*'" +-for enabled_repo in `yum repolist all | grep 'enabled:' | cut -f1 -d' ' | grep -v -- '-debuginfo'`; do ++for enabled_repo in `LANG=C yum repolist all | grep 'enabled:' | cut -f1 -d' ' | grep -v -- '-debuginfo'`; do + yum_repo_opts="$yum_repo_opts '--enablerepo=${enabled_repo}-debuginfo*'" + done + From a85baa79dbf325bdabc3d31f5f08036232b30e50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Thu, 15 Apr 2010 13:07:22 +0000 Subject: [PATCH 23/32] new upstream version --- .cvsignore | 2 +- abrt-1.0.9-better-bz-summary.patch | 28 ++++++ abrt-1.0.9-hideprefs.patch | 11 +++ abrt-1.0.9-ignore_user_scripts.patch | 126 +++++++++++++++++++++++++++ abrt-localizedyum.patch | 19 ++++ abrt.spec | 118 +++++++++++++++++++++++-- remove_R2.patch | 25 ++++-- sources | 2 +- 8 files changed, 316 insertions(+), 15 deletions(-) create mode 100644 abrt-1.0.9-better-bz-summary.patch create mode 100644 abrt-1.0.9-hideprefs.patch create mode 100644 abrt-1.0.9-ignore_user_scripts.patch create mode 100644 abrt-localizedyum.patch diff --git a/.cvsignore b/.cvsignore index 44a8899..9d5f94a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abrt-1.0.8.tar.gz +abrt-1.0.9.tar.gz diff --git a/abrt-1.0.9-better-bz-summary.patch b/abrt-1.0.9-better-bz-summary.patch new file mode 100644 index 0000000..6d3f0c3 --- /dev/null +++ b/abrt-1.0.9-better-bz-summary.patch @@ -0,0 +1,28 @@ +commit fcde1a65a0a283ed785cafa8a44ae219e1a79912 +Author: Nikola Pajkovsky +Date: Wed Apr 7 17:47:32 2010 +0200 + + add function name into summary(if it's found) + + Signed-off-by: Nikola Pajkovsky + +diff --git a/lib/Plugins/Bugzilla.cpp b/lib/Plugins/Bugzilla.cpp +index e59e9a7..bffccc1 100644 +--- a/lib/Plugins/Bugzilla.cpp ++++ b/lib/Plugins/Bugzilla.cpp +@@ -352,8 +352,15 @@ xmlrpc_int32 ctx::new_bug(const map_crash_data_t& pCrashData) + const std::string& arch = get_crash_data_item_content(pCrashData, FILENAME_ARCHITECTURE); + const std::string& duphash = get_crash_data_item_content(pCrashData, CD_DUPHASH); + const char *reason = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_REASON); ++ const char *function = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_CRASH_FUNCTION); + + std::string summary = "[abrt] crash in " + package; ++ if (function != NULL && strlen(function) < 30) ++ { ++ summary += ": "; ++ summary += function; ++ } ++ + if (reason != NULL) + { + summary += ": "; diff --git a/abrt-1.0.9-hideprefs.patch b/abrt-1.0.9-hideprefs.patch new file mode 100644 index 0000000..668f092 --- /dev/null +++ b/abrt-1.0.9-hideprefs.patch @@ -0,0 +1,11 @@ +--- abrt-1.0.9/src/Gui/ccgui.glade 2010-03-31 10:34:14.000000000 +0200 ++++ abrt-1.0.9_hideprefs/src/Gui/ccgui.glade 2010-03-31 21:39:27.653364662 +0200 +@@ -102,7 +102,7 @@ + + + gtk-preferences +- True ++ False + True + True + True diff --git a/abrt-1.0.9-ignore_user_scripts.patch b/abrt-1.0.9-ignore_user_scripts.patch new file mode 100644 index 0000000..fe3783a --- /dev/null +++ b/abrt-1.0.9-ignore_user_scripts.patch @@ -0,0 +1,126 @@ +commit a6daecbb32cf5fb0f71bdc14dddd35e7422dd4bb +Author: Karel Klic +Date: Tue Apr 13 14:57:20 2010 +0200 + + do not catch perl/python crashes when the script is not of known package origin + +diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp +index a0ead47..5c9ecb7 100644 +--- a/src/Daemon/MiddleWare.cpp ++++ b/src/Daemon/MiddleWare.cpp +@@ -594,43 +594,51 @@ void LoadOpenGPGPublicKey(const char* key) + } + + /** +- * Get a package name from executable name and save +- * package description to particular debugdump directory of a crash. +- * @param pExecutable A name of crashed application. +- * @param pDebugDumpDir A debugdump dir containing all necessary data. +- * @return It return results of operation. See mw_result_t. ++ * Returns the first full path argument in the command line or NULL. ++ * Skips options are in form "-XXX". ++ * Caller must delete the returned string using free(). + */ + static char *get_argv1_if_full_path(const char* cmdline) + { +- char *argv1 = (char*) strchr(cmdline, ' '); ++ const char *argv1 = strpbrk(cmdline, " \t"); + while (argv1 != NULL) + { + /* we found space in cmdline, so it might contain + * path to some script like: + * /usr/bin/python [-XXX] /usr/bin/system-control-network + */ +- argv1++; +- if (*argv1 == '-') ++ argv1++; /* skip the space */ ++ if (*argv1 == '-') /* skip arguments */ + { + /* looks like -XXX in "perl -XXX /usr/bin/script.pl", skip */ +- argv1 = strchr(argv1, ' '); ++ argv1 = strpbrk(argv1, " \t"); + continue; + } +- /* if the string following the space doesn't start +- * with '/' it's probably not a full path to script +- * and we can't use it to determine the package name +- */ +- if (*argv1 != '/') ++ else if (*argv1 == ' ' || *argv1 == '\t') /* skip multiple spaces */ ++ continue; ++ else if (*argv1 != '/') + { +- return NULL; ++ /* if the string following the space doesn't start ++ * with '/' it's probably not a full path to script ++ * and we can't use it to determine the package name ++ */ ++ break; + } ++ ++ /* cut the rest of cmdline arguments */ + int len = strchrnul(argv1, ' ') - argv1; +- /* cut the cmdline arguments */ +- argv1 = xstrndup(argv1, len); +- break; ++ return xstrndup(argv1, len); + } +- return argv1; ++ return NULL; + } ++ ++/** ++ * Get a package name from executable name and save ++ * package description to particular debugdump directory of a crash. ++ * @param pExecutable A name of crashed application. ++ * @param pDebugDumpDir A debugdump dir containing all necessary data. ++ * @return It return results of operation. See mw_result_t. ++ */ + static mw_result_t SavePackageDescriptionToDebugDump( + const char *pExecutable, + const char *cmdline, +@@ -692,6 +700,7 @@ static mw_result_t SavePackageDescriptionToDebugDump( + * This will work only if the cmdline contains the whole path. + * Example: python /usr/bin/system-control-network + */ ++ bool knownOrigin = false; + char *script_name = get_argv1_if_full_path(cmdline); + if (script_name) + { +@@ -707,9 +716,16 @@ static mw_result_t SavePackageDescriptionToDebugDump( + rpm_pkg = script_pkg; + scriptName = script_name; + pExecutable = scriptName.c_str(); ++ knownOrigin = true; + } + free(script_name); + } ++ ++ if (!knownOrigin && !g_settings_bProcessUnpackaged) ++ { ++ log("Interpreter crashed, but no packaged script detected: '%s'", cmdline); ++ return MW_PACKAGE_ERROR; ++ } + } + + package = rpm_pkg; +@@ -717,7 +733,7 @@ static mw_result_t SavePackageDescriptionToDebugDump( + VERB2 log("Package:'%s' short:'%s'", rpm_pkg, packageName.c_str()); + free(rpm_pkg); + +- if (g_setBlackList.find(packageName) != g_setBlackList.end()) ++ if (g_setBlackList.find(packageName) != g_setBlackList.end()) + { + log("Blacklisted package '%s'", packageName.c_str()); + return MW_BLACKLISTED; +@@ -838,8 +854,8 @@ static void RunAnalyzerActions(const char *pAnalyzer, const char *pDebugDumpDir, + if (!action) + { + /* GetAction() already complained if no such plugin. +- * If plugin exists but isn't an Action, it's not an error. +- */ ++ * If plugin exists but isn't an Action, it's not an error. ++ */ + continue; + } + try diff --git a/abrt-localizedyum.patch b/abrt-localizedyum.patch new file mode 100644 index 0000000..4567a55 --- /dev/null +++ b/abrt-localizedyum.patch @@ -0,0 +1,19 @@ +commit 306a4686200c33e34c0650b6ad09b1a5a3f32a77 +Author: Jiri Moskovcak +Date: Tue Apr 13 16:51:30 2010 +0200 + + fixed problem with localized yum output rhbz#581804 + +diff --git a/src/Daemon/abrt-debuginfo-install b/src/Daemon/abrt-debuginfo-install +index 521d42a..84d2446 100755 +--- a/src/Daemon/abrt-debuginfo-install ++++ b/src/Daemon/abrt-debuginfo-install +@@ -303,7 +303,7 @@ $debug && echo "build_ids:$build_ids" + # When we look for debuginfo we need only -debuginfo* repos, we can disable the rest + # and thus make it faster. + yum_repo_opts="'--disablerepo=*'" +-for enabled_repo in `yum repolist all | grep 'enabled:' | cut -f1 -d' ' | grep -v -- '-debuginfo'`; do ++for enabled_repo in `LANG=C yum repolist all | grep 'enabled:' | cut -f1 -d' ' | grep -v -- '-debuginfo'`; do + yum_repo_opts="$yum_repo_opts '--enablerepo=${enabled_repo}-debuginfo*'" + done + diff --git a/abrt.spec b/abrt.spec index f1e5065..b148d54 100644 --- a/abrt.spec +++ b/abrt.spec @@ -3,14 +3,17 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: Automatic bug detection and reporting tool Name: abrt -Version: 1.0.8 -Release: 2%{?dist} +Version: 1.0.9 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/abrt/ -Source: http://jmoskovc.fedorapeople.org/%{name}-%{version}.tar.gz +Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz Source1: abrt.init -Patch1: remove_R2.patch +Patch0: abrt-1.0.9-hideprefs.patch +Patch1: abrt-localizedyum.patch +Patch2: abrt-1.0.9-better-bz-summary.patch +Patch3: abrt-1.0.9-ignore_user_scripts.patch BuildRequires: dbus-devel BuildRequires: gtk2-devel BuildRequires: curl-devel @@ -148,6 +151,22 @@ Requires: %{name} = %{version}-%{release} %description plugin-bugzilla Plugin to report bugs into the bugzilla. +%package plugin-rhfastcheck +Summary: %{name}'s rhfastcheck plugin +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} + +%description plugin-rhfastcheck +Plugin to quickly check RH support DB for known solution. + +%package plugin-rhticket +Summary: %{name}'s rhticket plugin +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} + +%description plugin-rhticket +Plugin to report bugs into RH support system. + %package plugin-catcut Summary: %{name}'s catcut plugin Group: System Environment/Libraries @@ -217,7 +236,10 @@ Virtual package to make easy default installation on desktop environments. %prep %setup -q -%patch1 -b .~remove_R2 -p1 +%patch0 -p1 -b ~hideprefs +%patch1 -p1 -b ~localizedyum +%patch2 -p1 -b ~better_bz +%patch3 -p1 -b ~ingore_unp_scripts %build %configure @@ -261,6 +283,13 @@ exit 0 %post /sbin/chkconfig --add %{name}d +%post gui +# update icon cache +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + %post libs -p /sbin/ldconfig %preun @@ -271,6 +300,12 @@ fi %postun libs -p /sbin/ldconfig +%postun gui +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + %posttrans if [ "$1" -eq "0" ]; then service %{name}d condrestart >/dev/null 2>&1 || : @@ -313,10 +348,13 @@ fi %files gui %defattr(-,root,root,-) %{_bindir}/%{name}-gui -%{_datadir}/%{name} +%dir %{_datadir}/%{name} +# all glade, gtkbuilder and py files for gui +%{_datadir}/%{name}/*.py* +%{_datadir}/%{name}/*.glade %{_datadir}/applications/fedora-%{name}.desktop -%{_datadir}/pixmaps/abrt.png -%{_datadir}/icons/hicolor/48x48/apps/*.png +%{_datadir}/icons/hicolor/*/apps/* +%{_datadir}/%{name}/icons/hicolor/*/status/* %{_bindir}/%{name}-applet %{_sysconfdir}/xdg/autostart/%{name}-applet.desktop @@ -373,6 +411,20 @@ fi %{_libdir}/%{name}/Bugzilla.GTKBuilder %{_mandir}/man7/%{name}-Bugzilla.7.gz +%files plugin-rhfastcheck +%defattr(-,root,root,-) +#%config(noreplace) %{_sysconfdir}/%{name}/plugins/rhfastcheck.conf +%{_libdir}/%{name}/librhfastcheck.so* +#%{_libdir}/%{name}/rhfastcheck.GTKBuilder +#%{_mandir}/man7/%{name}-rhfastcheck.7.gz + +%files plugin-rhticket +%defattr(-,root,root,-) +#%config(noreplace) %{_sysconfdir}/%{name}/plugins/rhticket.conf +%{_libdir}/%{name}/librhticket.so* +#%{_libdir}/%{name}/rhticket.GTKBuilder +#%{_mandir}/man7/%{name}-rhticket.7.gz + %files plugin-catcut %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/Catcut.conf @@ -399,6 +451,7 @@ fi %attr(4755, abrt, abrt) %{_libexecdir}/abrt-hook-python %{_libdir}/%{name}/libPython.so* %{python_site}/*.py* +%{python_site}/abrt.pth %files cli @@ -411,6 +464,55 @@ fi %defattr(-,root,root,-) %changelog +* Thu Apr 15 2010 Jiri Moskovcak 1.0.9-1 +- fixed problem with localized yum messages rhbz#581804 +- better bugzilla summary (napjkovs@redhat.com) +- ignore interpreter (py,perl) crashes caused by unpackaged scripts (kklic@redhat.com) +- hooklib: fix excessive rounding down in free space calculation (bz#575644) (vda.linux@googlemail.com) +- gui: fix 551989 "crash detected in abrt-gui-1.0.0-1.fc12" and such (vda.linux@googlemail.com) +- trivial: fix 566806 "abrt-gui sometimes can't be closed" (vda.linux@googlemail.com) +- gui: fix the last case where gnome-keyring's find_items_sync() may throw DeniedError (vda.linux@googlemail.com) +- fixed some compilation problems on F13 (jmoskovc@redhat.com) +- updated translations (jmoskovc@redhat.com) +- minor fix to sosreport to make it work with latest sos rhbz#576861 (jmoskovc@redhat.com) +- test day build +- updated translation +- minor fix to sosreport to make it work with latest sos rhbz#576861 (jmoskovc@redhat.com) +- GUI: total rewrite based on design from Mairin Duffy (jmoskovc@redhat.com) +- trivial: better HTTP/curl error reporting (vda.linux@googlemail.com) +- Use backtrace parser from abrtutils, new backtrace rating algorithm, store crash function if it's known (kklic@redhat.com) +- abrt-rate-backtrace is replaced by abrt-backtrace --rate (kklic@redhat.com) +- Ignore some temp files (kklic@redhat.com) +- PYHOOK: don't use sitecustomize.py rhbz#539497 (jmoskovc@redhat.com) +- rhfastcheck: a new reporter plugin based on Gavin's work (vda.linux@googlemail.com) +- rhticket: new reporter plugin (vda.linux@googlemail.com) +- GUI: fixed few window icons (jmoskovc@redhat.com) +- Allow user to select which reporter he wants to use to report a crash using CLI.(kklic@redhat.com) +- bz reporter: s/uuid/duphash; more understandable message; simplify result str generation; fix indentation (vda.linux@googlemail.com) +- GUI: fixed crash count column sorting rhbz#573139 (jmoskovc@redhat.com) +- Kerneloops: use 1st line of oops as REASON. Closes rhbz#574196. (vda.linux@googlemail.com) +- Kerneloops: fix a case when we file an oops w/o backtrace (vda.linux@googlemail.com) +- minor fix in abrt-debuginfo-install to make it work with yum >= 3.2.26 (jmoskovc@redhat.com) +- GUI: added action to applet to directly report last crash (jmoskovc@redhat.com) +- Never flag backtrace as binary file (fixes problem observed in bz#571411) (vda.linux@googlemail.com) +- improve syslog file detection. closes bz#565983 (vda.linux@googlemail.com) +- add arch, package and release in comment (npajkovs@redhat.com) +- add ProcessUnpackaged option to abrt.conf (vda.linux@googlemail.com) +- abrt-debuginfo-install: use -debuginfo repos which match enabled "usual" repos (vda.linux@googlemail.com) +- fix format security error (fcrozat@mandriva.com) +- icons repackaging (jmoskovc@redhat.com) +- partial fix for bz#565983 (vda.linux@googlemail.com) +- SPEC: Updated source URL (jmoskovc@redhat.com) +- removed unneeded patches +- and much more ... + +* Sat Mar 13 2010 Jiri Moskovcak 1.0.8-3 +- fixed kerneloops reporting rhbz#570081 +- fixed Source url +- fixed debuginfo-install to work on F13 + - improved debuginfo-install (vda.linux@googlemail.com) + - fix debuginfo-install to work with yum >= 3.2.26 (jmoskovc@redhat.com) + * Wed Mar 3 2010 Denys Vlasenko 1.0.8-2 - fix initscript even more (npajkovs@redhat.com) - remove -R2 from yum command line diff --git a/remove_R2.patch b/remove_R2.patch index 8e7bb1a..baf415b 100644 --- a/remove_R2.patch +++ b/remove_R2.patch @@ -1,13 +1,28 @@ -diff -uprN abrt-1.0.7.orig/src/Daemon/abrt-debuginfo-install abrt-1.0.7/src/Daemon/abrt-debuginfo-install ---- abrt-1.0.7.orig/src/Daemon/abrt-debuginfo-install 2010-02-14 19:54:14.000000000 +0100 -+++ abrt-1.0.7/src/Daemon/abrt-debuginfo-install 2010-03-03 14:58:24.692030800 +0100 -@@ -146,8 +146,7 @@ print_package_names() { +commit 9d109b568bbbdee069bb5dfcbca3c259a74e98a8 +Author: Denys Vlasenko +Date: Wed Mar 3 11:45:33 2010 +0100 + + abrt-debuginfo-install: remove -R2 from yum! it's not "anti-yum-lock" option! + + Signed-off-by: Denys Vlasenko + +diff --git a/src/Daemon/abrt-debuginfo-install b/src/Daemon/abrt-debuginfo-install +index 3bb9c41..1b6af74 100755 +--- a/src/Daemon/abrt-debuginfo-install ++++ b/src/Daemon/abrt-debuginfo-install +@@ -146,11 +148,12 @@ print_package_names() { # when we look for debuginfo we need only -debuginfo* repos, so we can disable the rest and thus make it faster # also we want only fedora repositories, because abrt won't work for other packages anyway # --showduplicates: do not just show the latest package - # -R2: wait two minutes max (hopefully this prevents infinite hang on yum lock) - local cmd="yum $yumopts '--disablerepo=*' '--enablerepo=fedora-debuginfo*' '--enablerepo=updates-debuginfo*' --showduplicates -R2 --quiet provides $missing_debuginfo_files" ++ # (tried to use -R2 to abort on stuck yum lock but -R is not about that) + local cmd="yum $yumopts '--disablerepo=*' '--enablerepo=fedora-debuginfo*' '--enablerepo=updates-debuginfo*' --showduplicates --quiet provides $missing_debuginfo_files" echo "$cmd" >"yum_provides.$1.OUT" ++ $debug && echo "Running: $cmd" >&2 # eval is needed to strip away ''s; cant remove them above and just use - # $cmd, that would perform globbing on '*' +- # $cmd, that would perform globbing on '*' ++ # unquoted $cmd, that would perform globbing on '*' + local yum_provides_OUT="`eval $cmd 2>&1`" + local err=$? + printf "%s\nyum exitcode:%s\n" "$yum_provides_OUT" $err >>"yum_provides.$1.OUT" diff --git a/sources b/sources index 9f112fc..d0b613c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0e480999bb77b3babe19373c03057df4 abrt-1.0.8.tar.gz +aaa31f787ae7c144c57837928d26fdc9 abrt-1.0.9.tar.gz From df3531bd5d9f01cd166928f484898f3a3a511ab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Kl=C3=AD=C4=8D?= Date: Mon, 3 May 2010 09:03:09 +0000 Subject: [PATCH 24/32] Crash function detection fix --- abrt-1.0.9-crash-function-detect.patch | 28 ++++++++++++++++++++++++++ abrt.spec | 7 ++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 abrt-1.0.9-crash-function-detect.patch diff --git a/abrt-1.0.9-crash-function-detect.patch b/abrt-1.0.9-crash-function-detect.patch new file mode 100644 index 0000000..0b5667a --- /dev/null +++ b/abrt-1.0.9-crash-function-detect.patch @@ -0,0 +1,28 @@ +commit f05c9b25335c84c7b5861fce80fd941ec81212f3 +Author: Karel Klic +Date: Thu Apr 15 12:12:59 2010 +0200 + + Crash function is now detected even for threads without an abort frame. + +diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp +index 9bdcda9..cf25c73 100644 +--- a/lib/Plugins/CCpp.cpp ++++ b/lib/Plugins/CCpp.cpp +@@ -761,13 +761,12 @@ void CAnalyzerCCpp::CreateReport(const char *pDebugDumpDir, int force) + /* Get the function name from the crash frame. */ + if (crash_thread) + { ++ struct frame *crash_frame = crash_thread->frames; + struct frame *abort_frame = thread_find_abort_frame(crash_thread); + if (abort_frame) +- { +- struct frame *crash_frame = abort_frame->next; +- if (crash_frame && crash_frame->function && 0 != strcmp(crash_frame->function, "??")) +- dd.SaveText(FILENAME_CRASH_FUNCTION, crash_frame->function); +- } ++ crash_frame = abort_frame->next; ++ if (crash_frame && crash_frame->function && 0 != strcmp(crash_frame->function, "??")) ++ dd.SaveText(FILENAME_CRASH_FUNCTION, crash_frame->function); + } + + backtrace_free(backtrace); diff --git a/abrt.spec b/abrt.spec index 581dd67..4e4999a 100644 --- a/abrt.spec +++ b/abrt.spec @@ -11,7 +11,7 @@ %if 0%{?_buildid} %define pkg_release 0.%{?_buildid}%{?dist} %else -%define pkg_release 2%{?dist} +%define pkg_release 3%{?dist} %endif Summary: Automatic bug detection and reporting tool @@ -27,6 +27,7 @@ Patch0: abrt-1.0.9-hideprefs.patch Patch1: abrt-localizedyum.patch Patch2: abrt-1.0.9-better-bz-summary.patch Patch3: abrt-1.0.9-ignore_user_scripts.patch +Patch4: abrt-1.0.9-crash-function-detect.patch BuildRequires: dbus-devel BuildRequires: gtk2-devel BuildRequires: curl-devel @@ -242,6 +243,7 @@ Virtual package to make easy default installation on desktop environments. %patch1 -p1 -b .localizedyum %patch2 -p1 -b .better_bz %patch3 -p1 -b .ingore_unp_scripts +%patch4 -p1 -b .crash_function_detect %build %configure @@ -463,6 +465,9 @@ fi %defattr(-,root,root,-) %changelog +* Mon May 03 2010 Karel Klic 1.0.9-3 +- fixed crash function detection (a part of duplication detection) + * Wed Apr 14 2010 Jiri Moskovcak 1.0.9-2 - fixed problem with localized yum messages rhbz#581804 - better bugzilla summary (napjkovs@redhat.com) From 5af28856619ede1e71be4e1e35641b829e728310 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Kl=C3=AD=C4=8D?= Date: Mon, 3 May 2010 09:27:29 +0000 Subject: [PATCH 25/32] Fixed crash function detection --- abrt-1.0.9-crash-function-detect.patch | 28 ++++++++++++++++++++++++++ abrt.spec | 7 ++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 abrt-1.0.9-crash-function-detect.patch diff --git a/abrt-1.0.9-crash-function-detect.patch b/abrt-1.0.9-crash-function-detect.patch new file mode 100644 index 0000000..0b5667a --- /dev/null +++ b/abrt-1.0.9-crash-function-detect.patch @@ -0,0 +1,28 @@ +commit f05c9b25335c84c7b5861fce80fd941ec81212f3 +Author: Karel Klic +Date: Thu Apr 15 12:12:59 2010 +0200 + + Crash function is now detected even for threads without an abort frame. + +diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp +index 9bdcda9..cf25c73 100644 +--- a/lib/Plugins/CCpp.cpp ++++ b/lib/Plugins/CCpp.cpp +@@ -761,13 +761,12 @@ void CAnalyzerCCpp::CreateReport(const char *pDebugDumpDir, int force) + /* Get the function name from the crash frame. */ + if (crash_thread) + { ++ struct frame *crash_frame = crash_thread->frames; + struct frame *abort_frame = thread_find_abort_frame(crash_thread); + if (abort_frame) +- { +- struct frame *crash_frame = abort_frame->next; +- if (crash_frame && crash_frame->function && 0 != strcmp(crash_frame->function, "??")) +- dd.SaveText(FILENAME_CRASH_FUNCTION, crash_frame->function); +- } ++ crash_frame = abort_frame->next; ++ if (crash_frame && crash_frame->function && 0 != strcmp(crash_frame->function, "??")) ++ dd.SaveText(FILENAME_CRASH_FUNCTION, crash_frame->function); + } + + backtrace_free(backtrace); diff --git a/abrt.spec b/abrt.spec index b148d54..a2706e3 100644 --- a/abrt.spec +++ b/abrt.spec @@ -4,7 +4,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 1.0.9 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/abrt/ @@ -14,6 +14,7 @@ Patch0: abrt-1.0.9-hideprefs.patch Patch1: abrt-localizedyum.patch Patch2: abrt-1.0.9-better-bz-summary.patch Patch3: abrt-1.0.9-ignore_user_scripts.patch +Patch4: abrt-1.0.9-crash-function-detect.patch BuildRequires: dbus-devel BuildRequires: gtk2-devel BuildRequires: curl-devel @@ -240,6 +241,7 @@ Virtual package to make easy default installation on desktop environments. %patch1 -p1 -b ~localizedyum %patch2 -p1 -b ~better_bz %patch3 -p1 -b ~ingore_unp_scripts +%patch4 -p1 -b .crash_function_detect %build %configure @@ -464,6 +466,9 @@ fi %defattr(-,root,root,-) %changelog +* Mon May 03 2010 Karel Klic 1.0.9-2 +- fixed crash function detection (a part of duplication detection) + * Thu Apr 15 2010 Jiri Moskovcak 1.0.9-1 - fixed problem with localized yum messages rhbz#581804 - better bugzilla summary (napjkovs@redhat.com) From e841b57eb1b1089f073c493a3416dfabfea621bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Mon, 3 May 2010 16:51:37 +0000 Subject: [PATCH 26/32] updated to the latest upstream version --- .cvsignore | 2 +- abrt.spec | 29 +++++++++++++++++------------ sources | 2 +- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9d5f94a..60f2cee 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abrt-1.0.9.tar.gz +abrt-1.1.0.tar.gz diff --git a/abrt.spec b/abrt.spec index 4e4999a..53c5f85 100644 --- a/abrt.spec +++ b/abrt.spec @@ -11,12 +11,12 @@ %if 0%{?_buildid} %define pkg_release 0.%{?_buildid}%{?dist} %else -%define pkg_release 3%{?dist} +%define pkg_release 1%{?dist} %endif Summary: Automatic bug detection and reporting tool Name: abrt -Version: 1.0.9 +Version: 1.1.0 Release: %{?pkg_release} License: GPLv2+ Group: Applications/System @@ -24,10 +24,6 @@ URL: https://fedorahosted.org/abrt/ Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz Source1: abrt.init Patch0: abrt-1.0.9-hideprefs.patch -Patch1: abrt-localizedyum.patch -Patch2: abrt-1.0.9-better-bz-summary.patch -Patch3: abrt-1.0.9-ignore_user_scripts.patch -Patch4: abrt-1.0.9-crash-function-detect.patch BuildRequires: dbus-devel BuildRequires: gtk2-devel BuildRequires: curl-devel @@ -240,10 +236,6 @@ Virtual package to make easy default installation on desktop environments. %prep %setup -q %patch0 -p1 -b .hideprefs -%patch1 -p1 -b .localizedyum -%patch2 -p1 -b .better_bz -%patch3 -p1 -b .ingore_unp_scripts -%patch4 -p1 -b .crash_function_detect %build %configure @@ -358,6 +350,7 @@ fi %{_datadir}/%{name}/*.glade %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/*/apps/* +%{_datadir}/icons/hicolor/*/status/* %{_datadir}/%{name}/icons/hicolor/*/status/* %{_bindir}/%{name}-applet %{_sysconfdir}/xdg/autostart/%{name}-applet.desktop @@ -465,8 +458,20 @@ fi %defattr(-,root,root,-) %changelog -* Mon May 03 2010 Karel Klic 1.0.9-3 -- fixed crash function detection (a part of duplication detection) +* Mon May 03 2010 Jiri Moskovcak 1.1.0-1 +- updated transaltions +- added Hebrew into languages +- updated icons rhbz#587698 (jmoskovc@redhat.com) +- Bugzilla login/password emptiness check uses 'or' instead of 'and' (kklic@redhat.com) +- Show error message when abrtd service is run as non-root. rhbz#584352 (kklic@redhat.com) +- Rename EnableOpenGPG to OpenGPGCheck in the man page rhbz#584332 (kklic@redhat.com) +- Document ProcessUnpackaged in abrt.conf.5. Document default values. (kklic@redhat.com) +- Crash function is now detected even for threads without an abort frame (kklic@redhat.com) +- comment can be private (npajkovs@redhat.com) +- do not catch perl/python crashes when the script is not of known package origin (kklic@redhat.com) +- kerneloop is more informative when failed (npajkovs@redhat.com) +- add function name into summary(if it's found) (npajkovs@redhat.com) +- Change kerneloops message when it fails (npajkovs@redhat.com) * Wed Apr 14 2010 Jiri Moskovcak 1.0.9-2 - fixed problem with localized yum messages rhbz#581804 diff --git a/sources b/sources index d0b613c..b3468b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aaa31f787ae7c144c57837928d26fdc9 abrt-1.0.9.tar.gz +0c35a564a6621ddead37a8db9d4af8e0 abrt-1.1.0.tar.gz From 858080396c04a22062041290d492f19f1691fbac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Fri, 28 May 2010 07:47:23 +0000 Subject: [PATCH 27/32] new version --- .cvsignore | 2 +- abrt-1.0.8-debuginfoinstall-latest-yum.patch | 22 ---- abrt-1.0.8-oops.patch | 29 ----- abrt-1.0.8-use-only-enabledrepos.patch | 60 --------- abrt-1.0.9-better-bz-summary.patch | 28 ----- abrt-1.0.9-crash-function-detect.patch | 28 ----- abrt-1.0.9-ignore_user_scripts.patch | 126 ------------------- abrt-localizedyum.patch | 19 --- abrt.spec | 17 ++- remove_R2.patch | 28 ----- sources | 2 +- 11 files changed, 18 insertions(+), 343 deletions(-) delete mode 100644 abrt-1.0.8-debuginfoinstall-latest-yum.patch delete mode 100644 abrt-1.0.8-oops.patch delete mode 100644 abrt-1.0.8-use-only-enabledrepos.patch delete mode 100644 abrt-1.0.9-better-bz-summary.patch delete mode 100644 abrt-1.0.9-crash-function-detect.patch delete mode 100644 abrt-1.0.9-ignore_user_scripts.patch delete mode 100644 abrt-localizedyum.patch delete mode 100644 remove_R2.patch diff --git a/.cvsignore b/.cvsignore index 60f2cee..36dd2d7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abrt-1.1.0.tar.gz +abrt-1.1.1.tar.gz diff --git a/abrt-1.0.8-debuginfoinstall-latest-yum.patch b/abrt-1.0.8-debuginfoinstall-latest-yum.patch deleted file mode 100644 index c68620e..0000000 --- a/abrt-1.0.8-debuginfoinstall-latest-yum.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 87cc9488bd08a5f17318ddd70cbfcdb4182f8b16 -Author: Jiri Moskovcak -Date: Thu Mar 11 23:50:47 2010 +0100 - - minor fix in abrt-debuginfo-install to make it work with yum >= 3.2.26 - - - yum repolist has different output, so it needs to bu run - with additional parameter 'all' - -diff --git a/src/Daemon/abrt-debuginfo-install b/src/Daemon/abrt-debuginfo-install -index 0d9401b..521d42a 100755 ---- a/src/Daemon/abrt-debuginfo-install -+++ b/src/Daemon/abrt-debuginfo-install -@@ -303,7 +303,7 @@ $debug && echo "build_ids:$build_ids" - # When we look for debuginfo we need only -debuginfo* repos, we can disable the rest - # and thus make it faster. - yum_repo_opts="'--disablerepo=*'" --for enabled_repo in `yum repolist | grep 'enabled:' | cut -f1 -d' ' | grep -v -- '-debuginfo'`; do -+for enabled_repo in `yum repolist all | grep 'enabled:' | cut -f1 -d' ' | grep -v -- '-debuginfo'`; do - yum_repo_opts="$yum_repo_opts '--enablerepo=${enabled_repo}-debuginfo*'" - done - diff --git a/abrt-1.0.8-oops.patch b/abrt-1.0.8-oops.patch deleted file mode 100644 index e038d0a..0000000 --- a/abrt-1.0.8-oops.patch +++ /dev/null @@ -1,29 +0,0 @@ -commit cbec527eea140de7c2001c08c321f6afeff2a5e1 -Author: Denys Vlasenko -Date: Wed Mar 3 14:03:00 2010 +0100 - - fix bz#570081 (self.is_oops is not defined) - - Signed-off-by: Denys Vlasenko - -diff --git a/src/Gui/CCReporterDialog.py b/src/Gui/CCReporterDialog.py -index bc4a1e0..989f7cb 100644 ---- a/src/Gui/CCReporterDialog.py -+++ b/src/Gui/CCReporterDialog.py -@@ -214,6 +214,7 @@ class ReporterDialog(): - self.editable = [] - self.old_comment = COMMENT_HINT_TEXT - self.old_how_to_reproduce = HOW_TO_HINT_TEXT -+ self.is_oops = False - for item in self.report: - try: - log2("report[%s]:%s/%s/%s", item, self.report[item][0], self.report[item][1], self.report[item][2][0:20]) -@@ -306,7 +307,7 @@ class ReporterDialog(): - text = buff.get_text(buff.get_start_iter(), buff.get_end_iter()) - if self.old_how_to_reproduce != text: - self.report[FILENAME_REPRODUCE] = [CD_TXT, 'y', text] -- #handle backtrace -+ # handle backtrace - tev_backtrace = self.builder.get_object("tvBacktrace") - buff = tev_backtrace.get_buffer() - text = buff.get_text(buff.get_start_iter(), buff.get_end_iter()) diff --git a/abrt-1.0.8-use-only-enabledrepos.patch b/abrt-1.0.8-use-only-enabledrepos.patch deleted file mode 100644 index 3497fe9..0000000 --- a/abrt-1.0.8-use-only-enabledrepos.patch +++ /dev/null @@ -1,60 +0,0 @@ -commit 4432b7407e6afbbb5e91ad24455556d0e679a4f9 -Author: Denys Vlasenko -Date: Thu Mar 4 20:37:10 2010 +0100 - - abrt-debuginfo-install: use -debuginfo repos which match enabled "usual" repos - - Signed-off-by: Denys Vlasenko - -diff --git a/src/Daemon/abrt-debuginfo-install b/src/Daemon/abrt-debuginfo-install -index 1b6af74..0d9401b 100755 ---- a/src/Daemon/abrt-debuginfo-install -+++ b/src/Daemon/abrt-debuginfo-install -@@ -145,14 +145,12 @@ print_package_names() { - else - echo "`count_words $missing_debuginfo_files` missing debuginfos, getting package list from repositories" >&2 - fi -- # when we look for debuginfo we need only -debuginfo* repos, so we can disable the rest and thus make it faster -- # also we want only fedora repositories, because abrt won't work for other packages anyway - # --showduplicates: do not just show the latest package - # (tried to use -R2 to abort on stuck yum lock but -R is not about that) -- local cmd="yum $yumopts '--disablerepo=*' '--enablerepo=fedora-debuginfo*' '--enablerepo=updates-debuginfo*' --showduplicates --quiet provides $missing_debuginfo_files" -+ local cmd="yum $yumopts $yum_repo_opts --showduplicates --quiet provides $missing_debuginfo_files" - echo "$cmd" >"yum_provides.$1.OUT" - $debug && echo "Running: $cmd" >&2 -- # eval is needed to strip away ''s; cant remove them above and just use -+ # eval is needed to strip away ''s in $yum_repo_opts; cant remove them and just use - # unquoted $cmd, that would perform globbing on '*' - local yum_provides_OUT="`eval $cmd 2>&1`" - local err=$? -@@ -199,9 +197,10 @@ download_packages() { - for pkg in $packages; do - echo "Download $i/$num_packages: $pkg" - echo "Download $i/$num_packages: $pkg" >>yumdownloader.OUT -- # We can't handle packages from non Fedora repos, so we look and download only -- # from Fedora repos which makes it faster -- yumdownloader --disablerepo="*" --enablerepo="fedora-debuginfo*" --enablerepo="updates-debuginfo*" --quiet $pkg >>yumdownloader.OUT 2>&1 -+ cmd="yumdownloader $yum_repo_opts --quiet $pkg" -+ $debug && echo "Running: $cmd" >&2 -+ # eval is needed to strip away ''s in $yum_repo_opts -+ eval $cmd >>yumdownloader.OUT 2>&1 - err=$? - echo "exitcode:$err" >>yumdownloader.OUT - echo >>yumdownloader.OUT -@@ -299,6 +298,16 @@ build_ids=`printf "%s\n" "$eu_unstrip_OUT" \ - done | sort | uniq | xargs` - $debug && echo "build_ids:$build_ids" - -+ -+# Prepare list of repos to use. -+# When we look for debuginfo we need only -debuginfo* repos, we can disable the rest -+# and thus make it faster. -+yum_repo_opts="'--disablerepo=*'" -+for enabled_repo in `yum repolist | grep 'enabled:' | cut -f1 -d' ' | grep -v -- '-debuginfo'`; do -+ yum_repo_opts="$yum_repo_opts '--enablerepo=${enabled_repo}-debuginfo*'" -+done -+ -+ - # We try to not run yum without -C unless absolutely necessary. - # Therefore we loop. yum is run by print_package_names function, - # on first iteration it is run with -C, on second - without, diff --git a/abrt-1.0.9-better-bz-summary.patch b/abrt-1.0.9-better-bz-summary.patch deleted file mode 100644 index 6d3f0c3..0000000 --- a/abrt-1.0.9-better-bz-summary.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit fcde1a65a0a283ed785cafa8a44ae219e1a79912 -Author: Nikola Pajkovsky -Date: Wed Apr 7 17:47:32 2010 +0200 - - add function name into summary(if it's found) - - Signed-off-by: Nikola Pajkovsky - -diff --git a/lib/Plugins/Bugzilla.cpp b/lib/Plugins/Bugzilla.cpp -index e59e9a7..bffccc1 100644 ---- a/lib/Plugins/Bugzilla.cpp -+++ b/lib/Plugins/Bugzilla.cpp -@@ -352,8 +352,15 @@ xmlrpc_int32 ctx::new_bug(const map_crash_data_t& pCrashData) - const std::string& arch = get_crash_data_item_content(pCrashData, FILENAME_ARCHITECTURE); - const std::string& duphash = get_crash_data_item_content(pCrashData, CD_DUPHASH); - const char *reason = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_REASON); -+ const char *function = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_CRASH_FUNCTION); - - std::string summary = "[abrt] crash in " + package; -+ if (function != NULL && strlen(function) < 30) -+ { -+ summary += ": "; -+ summary += function; -+ } -+ - if (reason != NULL) - { - summary += ": "; diff --git a/abrt-1.0.9-crash-function-detect.patch b/abrt-1.0.9-crash-function-detect.patch deleted file mode 100644 index 0b5667a..0000000 --- a/abrt-1.0.9-crash-function-detect.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit f05c9b25335c84c7b5861fce80fd941ec81212f3 -Author: Karel Klic -Date: Thu Apr 15 12:12:59 2010 +0200 - - Crash function is now detected even for threads without an abort frame. - -diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp -index 9bdcda9..cf25c73 100644 ---- a/lib/Plugins/CCpp.cpp -+++ b/lib/Plugins/CCpp.cpp -@@ -761,13 +761,12 @@ void CAnalyzerCCpp::CreateReport(const char *pDebugDumpDir, int force) - /* Get the function name from the crash frame. */ - if (crash_thread) - { -+ struct frame *crash_frame = crash_thread->frames; - struct frame *abort_frame = thread_find_abort_frame(crash_thread); - if (abort_frame) -- { -- struct frame *crash_frame = abort_frame->next; -- if (crash_frame && crash_frame->function && 0 != strcmp(crash_frame->function, "??")) -- dd.SaveText(FILENAME_CRASH_FUNCTION, crash_frame->function); -- } -+ crash_frame = abort_frame->next; -+ if (crash_frame && crash_frame->function && 0 != strcmp(crash_frame->function, "??")) -+ dd.SaveText(FILENAME_CRASH_FUNCTION, crash_frame->function); - } - - backtrace_free(backtrace); diff --git a/abrt-1.0.9-ignore_user_scripts.patch b/abrt-1.0.9-ignore_user_scripts.patch deleted file mode 100644 index fe3783a..0000000 --- a/abrt-1.0.9-ignore_user_scripts.patch +++ /dev/null @@ -1,126 +0,0 @@ -commit a6daecbb32cf5fb0f71bdc14dddd35e7422dd4bb -Author: Karel Klic -Date: Tue Apr 13 14:57:20 2010 +0200 - - do not catch perl/python crashes when the script is not of known package origin - -diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp -index a0ead47..5c9ecb7 100644 ---- a/src/Daemon/MiddleWare.cpp -+++ b/src/Daemon/MiddleWare.cpp -@@ -594,43 +594,51 @@ void LoadOpenGPGPublicKey(const char* key) - } - - /** -- * Get a package name from executable name and save -- * package description to particular debugdump directory of a crash. -- * @param pExecutable A name of crashed application. -- * @param pDebugDumpDir A debugdump dir containing all necessary data. -- * @return It return results of operation. See mw_result_t. -+ * Returns the first full path argument in the command line or NULL. -+ * Skips options are in form "-XXX". -+ * Caller must delete the returned string using free(). - */ - static char *get_argv1_if_full_path(const char* cmdline) - { -- char *argv1 = (char*) strchr(cmdline, ' '); -+ const char *argv1 = strpbrk(cmdline, " \t"); - while (argv1 != NULL) - { - /* we found space in cmdline, so it might contain - * path to some script like: - * /usr/bin/python [-XXX] /usr/bin/system-control-network - */ -- argv1++; -- if (*argv1 == '-') -+ argv1++; /* skip the space */ -+ if (*argv1 == '-') /* skip arguments */ - { - /* looks like -XXX in "perl -XXX /usr/bin/script.pl", skip */ -- argv1 = strchr(argv1, ' '); -+ argv1 = strpbrk(argv1, " \t"); - continue; - } -- /* if the string following the space doesn't start -- * with '/' it's probably not a full path to script -- * and we can't use it to determine the package name -- */ -- if (*argv1 != '/') -+ else if (*argv1 == ' ' || *argv1 == '\t') /* skip multiple spaces */ -+ continue; -+ else if (*argv1 != '/') - { -- return NULL; -+ /* if the string following the space doesn't start -+ * with '/' it's probably not a full path to script -+ * and we can't use it to determine the package name -+ */ -+ break; - } -+ -+ /* cut the rest of cmdline arguments */ - int len = strchrnul(argv1, ' ') - argv1; -- /* cut the cmdline arguments */ -- argv1 = xstrndup(argv1, len); -- break; -+ return xstrndup(argv1, len); - } -- return argv1; -+ return NULL; - } -+ -+/** -+ * Get a package name from executable name and save -+ * package description to particular debugdump directory of a crash. -+ * @param pExecutable A name of crashed application. -+ * @param pDebugDumpDir A debugdump dir containing all necessary data. -+ * @return It return results of operation. See mw_result_t. -+ */ - static mw_result_t SavePackageDescriptionToDebugDump( - const char *pExecutable, - const char *cmdline, -@@ -692,6 +700,7 @@ static mw_result_t SavePackageDescriptionToDebugDump( - * This will work only if the cmdline contains the whole path. - * Example: python /usr/bin/system-control-network - */ -+ bool knownOrigin = false; - char *script_name = get_argv1_if_full_path(cmdline); - if (script_name) - { -@@ -707,9 +716,16 @@ static mw_result_t SavePackageDescriptionToDebugDump( - rpm_pkg = script_pkg; - scriptName = script_name; - pExecutable = scriptName.c_str(); -+ knownOrigin = true; - } - free(script_name); - } -+ -+ if (!knownOrigin && !g_settings_bProcessUnpackaged) -+ { -+ log("Interpreter crashed, but no packaged script detected: '%s'", cmdline); -+ return MW_PACKAGE_ERROR; -+ } - } - - package = rpm_pkg; -@@ -717,7 +733,7 @@ static mw_result_t SavePackageDescriptionToDebugDump( - VERB2 log("Package:'%s' short:'%s'", rpm_pkg, packageName.c_str()); - free(rpm_pkg); - -- if (g_setBlackList.find(packageName) != g_setBlackList.end()) -+ if (g_setBlackList.find(packageName) != g_setBlackList.end()) - { - log("Blacklisted package '%s'", packageName.c_str()); - return MW_BLACKLISTED; -@@ -838,8 +854,8 @@ static void RunAnalyzerActions(const char *pAnalyzer, const char *pDebugDumpDir, - if (!action) - { - /* GetAction() already complained if no such plugin. -- * If plugin exists but isn't an Action, it's not an error. -- */ -+ * If plugin exists but isn't an Action, it's not an error. -+ */ - continue; - } - try diff --git a/abrt-localizedyum.patch b/abrt-localizedyum.patch deleted file mode 100644 index 4567a55..0000000 --- a/abrt-localizedyum.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 306a4686200c33e34c0650b6ad09b1a5a3f32a77 -Author: Jiri Moskovcak -Date: Tue Apr 13 16:51:30 2010 +0200 - - fixed problem with localized yum output rhbz#581804 - -diff --git a/src/Daemon/abrt-debuginfo-install b/src/Daemon/abrt-debuginfo-install -index 521d42a..84d2446 100755 ---- a/src/Daemon/abrt-debuginfo-install -+++ b/src/Daemon/abrt-debuginfo-install -@@ -303,7 +303,7 @@ $debug && echo "build_ids:$build_ids" - # When we look for debuginfo we need only -debuginfo* repos, we can disable the rest - # and thus make it faster. - yum_repo_opts="'--disablerepo=*'" --for enabled_repo in `yum repolist all | grep 'enabled:' | cut -f1 -d' ' | grep -v -- '-debuginfo'`; do -+for enabled_repo in `LANG=C yum repolist all | grep 'enabled:' | cut -f1 -d' ' | grep -v -- '-debuginfo'`; do - yum_repo_opts="$yum_repo_opts '--enablerepo=${enabled_repo}-debuginfo*'" - done - diff --git a/abrt.spec b/abrt.spec index 53c5f85..997a726 100644 --- a/abrt.spec +++ b/abrt.spec @@ -16,7 +16,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 1.1.0 +Version: 1.1.1 Release: %{?pkg_release} License: GPLv2+ Group: Applications/System @@ -194,6 +194,8 @@ Plugin to uploading files to a server. Summary: %{name}'s addon for catching and analyzing Python exceptions Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} +Obsoletes: gnome-python2-bugbuddy +Provides: gnome-python2-bugbuddy %description addon-python This package contains python hook and python analyzer plugin for handling @@ -458,6 +460,19 @@ fi %defattr(-,root,root,-) %changelog +* Wed May 12 2010 Jiri Moskovcak 1.1.1-1 +- updated translations +- removed avant-window-navigator from blacklist (jmoskovc@redhat.com) +- Abort debuginfo download if low on disk space (partially addresses #564451) (vda.linux@googlemail.com) +- fix bug 588945 - sparse core files performance hit (vda.linux@googlemail.com) +- Add BlackListedPaths option to abrt.conf. Fixes #582421 (vda.linux@googlemail.com) +- Do not die when /var/cache/abrt/*/uid does not contain a number (rhbz#580899) (kklic@redhat.com) +- rid of rewriting config in /etc/abrt/abrt.conf (npajkovs@redhat.com) +- fix bug 571411: backtrace attachment of the form /var/cache/abrt/foo-12345-67890/backtrace (vda.linux@googlemail.com) +- Do not echo password to terminal in abrt-cli (kklic@redhat.com) +- obsolete gnome-python2-bugbuddy rhbz#579748 (jmoskovc@redhat.com) +- removed unused patches + * Mon May 03 2010 Jiri Moskovcak 1.1.0-1 - updated transaltions - added Hebrew into languages diff --git a/remove_R2.patch b/remove_R2.patch deleted file mode 100644 index baf415b..0000000 --- a/remove_R2.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 9d109b568bbbdee069bb5dfcbca3c259a74e98a8 -Author: Denys Vlasenko -Date: Wed Mar 3 11:45:33 2010 +0100 - - abrt-debuginfo-install: remove -R2 from yum! it's not "anti-yum-lock" option! - - Signed-off-by: Denys Vlasenko - -diff --git a/src/Daemon/abrt-debuginfo-install b/src/Daemon/abrt-debuginfo-install -index 3bb9c41..1b6af74 100755 ---- a/src/Daemon/abrt-debuginfo-install -+++ b/src/Daemon/abrt-debuginfo-install -@@ -146,11 +148,12 @@ print_package_names() { - # when we look for debuginfo we need only -debuginfo* repos, so we can disable the rest and thus make it faster - # also we want only fedora repositories, because abrt won't work for other packages anyway - # --showduplicates: do not just show the latest package -- # -R2: wait two minutes max (hopefully this prevents infinite hang on yum lock) -- local cmd="yum $yumopts '--disablerepo=*' '--enablerepo=fedora-debuginfo*' '--enablerepo=updates-debuginfo*' --showduplicates -R2 --quiet provides $missing_debuginfo_files" -+ # (tried to use -R2 to abort on stuck yum lock but -R is not about that) -+ local cmd="yum $yumopts '--disablerepo=*' '--enablerepo=fedora-debuginfo*' '--enablerepo=updates-debuginfo*' --showduplicates --quiet provides $missing_debuginfo_files" - echo "$cmd" >"yum_provides.$1.OUT" -+ $debug && echo "Running: $cmd" >&2 - # eval is needed to strip away ''s; cant remove them above and just use -- # $cmd, that would perform globbing on '*' -+ # unquoted $cmd, that would perform globbing on '*' - local yum_provides_OUT="`eval $cmd 2>&1`" - local err=$? - printf "%s\nyum exitcode:%s\n" "$yum_provides_OUT" $err >>"yum_provides.$1.OUT" diff --git a/sources b/sources index b3468b2..d7e0297 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0c35a564a6621ddead37a8db9d4af8e0 abrt-1.1.0.tar.gz +3a358fa88e1746b5f755b1e1fb2f15c6 abrt-1.1.1.tar.gz From e3c74954f77156e924f627e618c6483a9d49d69f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Fri, 28 May 2010 12:31:06 +0000 Subject: [PATCH 28/32] new version --- .cvsignore | 2 +- abrt-1.0.9-better-bz-summary.patch | 28 ------ abrt-1.0.9-ignore_user_scripts.patch | 126 --------------------------- abrt-localizedyum.patch | 19 ---- abrt.spec | 54 +++++++----- remove_R2.patch | 28 ------ sources | 2 +- 7 files changed, 32 insertions(+), 227 deletions(-) delete mode 100644 abrt-1.0.9-better-bz-summary.patch delete mode 100644 abrt-1.0.9-ignore_user_scripts.patch delete mode 100644 abrt-localizedyum.patch delete mode 100644 remove_R2.patch diff --git a/.cvsignore b/.cvsignore index 9d5f94a..36dd2d7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abrt-1.0.9.tar.gz +abrt-1.1.1.tar.gz diff --git a/abrt-1.0.9-better-bz-summary.patch b/abrt-1.0.9-better-bz-summary.patch deleted file mode 100644 index 6d3f0c3..0000000 --- a/abrt-1.0.9-better-bz-summary.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit fcde1a65a0a283ed785cafa8a44ae219e1a79912 -Author: Nikola Pajkovsky -Date: Wed Apr 7 17:47:32 2010 +0200 - - add function name into summary(if it's found) - - Signed-off-by: Nikola Pajkovsky - -diff --git a/lib/Plugins/Bugzilla.cpp b/lib/Plugins/Bugzilla.cpp -index e59e9a7..bffccc1 100644 ---- a/lib/Plugins/Bugzilla.cpp -+++ b/lib/Plugins/Bugzilla.cpp -@@ -352,8 +352,15 @@ xmlrpc_int32 ctx::new_bug(const map_crash_data_t& pCrashData) - const std::string& arch = get_crash_data_item_content(pCrashData, FILENAME_ARCHITECTURE); - const std::string& duphash = get_crash_data_item_content(pCrashData, CD_DUPHASH); - const char *reason = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_REASON); -+ const char *function = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_CRASH_FUNCTION); - - std::string summary = "[abrt] crash in " + package; -+ if (function != NULL && strlen(function) < 30) -+ { -+ summary += ": "; -+ summary += function; -+ } -+ - if (reason != NULL) - { - summary += ": "; diff --git a/abrt-1.0.9-ignore_user_scripts.patch b/abrt-1.0.9-ignore_user_scripts.patch deleted file mode 100644 index fe3783a..0000000 --- a/abrt-1.0.9-ignore_user_scripts.patch +++ /dev/null @@ -1,126 +0,0 @@ -commit a6daecbb32cf5fb0f71bdc14dddd35e7422dd4bb -Author: Karel Klic -Date: Tue Apr 13 14:57:20 2010 +0200 - - do not catch perl/python crashes when the script is not of known package origin - -diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp -index a0ead47..5c9ecb7 100644 ---- a/src/Daemon/MiddleWare.cpp -+++ b/src/Daemon/MiddleWare.cpp -@@ -594,43 +594,51 @@ void LoadOpenGPGPublicKey(const char* key) - } - - /** -- * Get a package name from executable name and save -- * package description to particular debugdump directory of a crash. -- * @param pExecutable A name of crashed application. -- * @param pDebugDumpDir A debugdump dir containing all necessary data. -- * @return It return results of operation. See mw_result_t. -+ * Returns the first full path argument in the command line or NULL. -+ * Skips options are in form "-XXX". -+ * Caller must delete the returned string using free(). - */ - static char *get_argv1_if_full_path(const char* cmdline) - { -- char *argv1 = (char*) strchr(cmdline, ' '); -+ const char *argv1 = strpbrk(cmdline, " \t"); - while (argv1 != NULL) - { - /* we found space in cmdline, so it might contain - * path to some script like: - * /usr/bin/python [-XXX] /usr/bin/system-control-network - */ -- argv1++; -- if (*argv1 == '-') -+ argv1++; /* skip the space */ -+ if (*argv1 == '-') /* skip arguments */ - { - /* looks like -XXX in "perl -XXX /usr/bin/script.pl", skip */ -- argv1 = strchr(argv1, ' '); -+ argv1 = strpbrk(argv1, " \t"); - continue; - } -- /* if the string following the space doesn't start -- * with '/' it's probably not a full path to script -- * and we can't use it to determine the package name -- */ -- if (*argv1 != '/') -+ else if (*argv1 == ' ' || *argv1 == '\t') /* skip multiple spaces */ -+ continue; -+ else if (*argv1 != '/') - { -- return NULL; -+ /* if the string following the space doesn't start -+ * with '/' it's probably not a full path to script -+ * and we can't use it to determine the package name -+ */ -+ break; - } -+ -+ /* cut the rest of cmdline arguments */ - int len = strchrnul(argv1, ' ') - argv1; -- /* cut the cmdline arguments */ -- argv1 = xstrndup(argv1, len); -- break; -+ return xstrndup(argv1, len); - } -- return argv1; -+ return NULL; - } -+ -+/** -+ * Get a package name from executable name and save -+ * package description to particular debugdump directory of a crash. -+ * @param pExecutable A name of crashed application. -+ * @param pDebugDumpDir A debugdump dir containing all necessary data. -+ * @return It return results of operation. See mw_result_t. -+ */ - static mw_result_t SavePackageDescriptionToDebugDump( - const char *pExecutable, - const char *cmdline, -@@ -692,6 +700,7 @@ static mw_result_t SavePackageDescriptionToDebugDump( - * This will work only if the cmdline contains the whole path. - * Example: python /usr/bin/system-control-network - */ -+ bool knownOrigin = false; - char *script_name = get_argv1_if_full_path(cmdline); - if (script_name) - { -@@ -707,9 +716,16 @@ static mw_result_t SavePackageDescriptionToDebugDump( - rpm_pkg = script_pkg; - scriptName = script_name; - pExecutable = scriptName.c_str(); -+ knownOrigin = true; - } - free(script_name); - } -+ -+ if (!knownOrigin && !g_settings_bProcessUnpackaged) -+ { -+ log("Interpreter crashed, but no packaged script detected: '%s'", cmdline); -+ return MW_PACKAGE_ERROR; -+ } - } - - package = rpm_pkg; -@@ -717,7 +733,7 @@ static mw_result_t SavePackageDescriptionToDebugDump( - VERB2 log("Package:'%s' short:'%s'", rpm_pkg, packageName.c_str()); - free(rpm_pkg); - -- if (g_setBlackList.find(packageName) != g_setBlackList.end()) -+ if (g_setBlackList.find(packageName) != g_setBlackList.end()) - { - log("Blacklisted package '%s'", packageName.c_str()); - return MW_BLACKLISTED; -@@ -838,8 +854,8 @@ static void RunAnalyzerActions(const char *pAnalyzer, const char *pDebugDumpDir, - if (!action) - { - /* GetAction() already complained if no such plugin. -- * If plugin exists but isn't an Action, it's not an error. -- */ -+ * If plugin exists but isn't an Action, it's not an error. -+ */ - continue; - } - try diff --git a/abrt-localizedyum.patch b/abrt-localizedyum.patch deleted file mode 100644 index 4567a55..0000000 --- a/abrt-localizedyum.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 306a4686200c33e34c0650b6ad09b1a5a3f32a77 -Author: Jiri Moskovcak -Date: Tue Apr 13 16:51:30 2010 +0200 - - fixed problem with localized yum output rhbz#581804 - -diff --git a/src/Daemon/abrt-debuginfo-install b/src/Daemon/abrt-debuginfo-install -index 521d42a..84d2446 100755 ---- a/src/Daemon/abrt-debuginfo-install -+++ b/src/Daemon/abrt-debuginfo-install -@@ -303,7 +303,7 @@ $debug && echo "build_ids:$build_ids" - # When we look for debuginfo we need only -debuginfo* repos, we can disable the rest - # and thus make it faster. - yum_repo_opts="'--disablerepo=*'" --for enabled_repo in `yum repolist all | grep 'enabled:' | cut -f1 -d' ' | grep -v -- '-debuginfo'`; do -+for enabled_repo in `LANG=C yum repolist all | grep 'enabled:' | cut -f1 -d' ' | grep -v -- '-debuginfo'`; do - yum_repo_opts="$yum_repo_opts '--enablerepo=${enabled_repo}-debuginfo*'" - done - diff --git a/abrt.spec b/abrt.spec index a2706e3..92aa66d 100644 --- a/abrt.spec +++ b/abrt.spec @@ -3,18 +3,14 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: Automatic bug detection and reporting tool Name: abrt -Version: 1.0.9 -Release: 2%{?dist} +Version: 1.1.1 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/abrt/ Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz Source1: abrt.init Patch0: abrt-1.0.9-hideprefs.patch -Patch1: abrt-localizedyum.patch -Patch2: abrt-1.0.9-better-bz-summary.patch -Patch3: abrt-1.0.9-ignore_user_scripts.patch -Patch4: abrt-1.0.9-crash-function-detect.patch BuildRequires: dbus-devel BuildRequires: gtk2-devel BuildRequires: curl-devel @@ -84,17 +80,6 @@ Requires: %{name} = %{version}-%{release} This package contains hook for C/C++ crashed programs and %{name}'s C/C++ analyzer plugin. -#%package plugin-firefox -#Summary: %{name}'s Firefox analyzer plugin -#Group: System Environment/Libraries -#Requires: gdb >= 7.0-3 -#Requires: elfutils -#Requires: yum-utils -#Requires: %{name} = %{version}-%{release} - -#%description plugin-firefox -#This package contains hook for Firefox - %package addon-kerneloops Summary: %{name}'s kerneloops addon Group: System Environment/Libraries @@ -196,6 +181,8 @@ Plugin to uploading files to a server. Summary: %{name}'s addon for catching and analyzing Python exceptions Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} +Obsoletes: gnome-python2-bugbuddy +Provides: gnome-python2-bugbuddy %description addon-python This package contains python hook and python analyzer plugin for handling @@ -238,10 +225,6 @@ Virtual package to make easy default installation on desktop environments. %prep %setup -q %patch0 -p1 -b ~hideprefs -%patch1 -p1 -b ~localizedyum -%patch2 -p1 -b ~better_bz -%patch3 -p1 -b ~ingore_unp_scripts -%patch4 -p1 -b .crash_function_detect %build %configure @@ -356,6 +339,7 @@ fi %{_datadir}/%{name}/*.glade %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/*/apps/* +%{_datadir}/icons/hicolor/*/status/* %{_datadir}/%{name}/icons/hicolor/*/status/* %{_bindir}/%{name}-applet %{_sysconfdir}/xdg/autostart/%{name}-applet.desktop @@ -367,9 +351,6 @@ fi %{_libdir}/%{name}/libCCpp.so* %{_libexecdir}/abrt-hook-ccpp -#%files plugin-firefox -#%{_libdir}/%{name}/libFirefox.so* - %files addon-kerneloops %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/Kerneloops.conf @@ -466,6 +447,31 @@ fi %defattr(-,root,root,-) %changelog +* Wed May 28 2010 Jiri Moskovcak 1.1.1-1 +- removed avant-window-navigator from blacklist (jmoskovc@redhat.com) +- Abort debuginfo download if low on disk space (partially addresses #564451) (vda.linux@googlemail.com) +- fix bug 588945 - sparse core files performance hit (vda.linux@googlemail.com) +- Add BlackListedPaths option to abrt.conf. Fixes #582421 (vda.linux@googlemail.com) +- Do not die when /var/cache/abrt/*/uid does not contain a number (rhbz#580899) (kklic@redhat.com) +- rid of rewriting config in /etc/abrt/abrt.conf (npajkovs@redhat.com) +- fix bug 571411: backtrace attachment of the form /var/cache/abrt/foo-12345-67890/backtrace (vda.linux@googlemail.com) +- Do not echo password to terminal in abrt-cli (kklic@redhat.com) +- obsolete gnome-python2-bugbuddy rhbz#579748 (jmoskovc@redhat.com) +- removed unused patches +- updated transaltions +- added Hebrew into languages +- updated icons rhbz#587698 (jmoskovc@redhat.com) +- Bugzilla login/password emptiness check uses 'or' instead of 'and' (kklic@redhat.com) +- Show error message when abrtd service is run as non-root. rhbz#584352 (kklic@redhat.com) +- Rename EnableOpenGPG to OpenGPGCheck in the man page rhbz#584332 (kklic@redhat.com) +- Document ProcessUnpackaged in abrt.conf.5. Document default values. (kklic@redhat.com) +- Crash function is now detected even for threads without an abort frame (kklic@redhat.com) +- comment can be private (npajkovs@redhat.com) +- do not catch perl/python crashes when the script is not of known package origin (kklic@redhat.com) +- kerneloop is more informative when failed (npajkovs@redhat.com) +- add function name into summary(if it's found) (npajkovs@redhat.com) +- Change kerneloops message when it fails (npajkovs@redhat.com) + * Mon May 03 2010 Karel Klic 1.0.9-2 - fixed crash function detection (a part of duplication detection) diff --git a/remove_R2.patch b/remove_R2.patch deleted file mode 100644 index baf415b..0000000 --- a/remove_R2.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 9d109b568bbbdee069bb5dfcbca3c259a74e98a8 -Author: Denys Vlasenko -Date: Wed Mar 3 11:45:33 2010 +0100 - - abrt-debuginfo-install: remove -R2 from yum! it's not "anti-yum-lock" option! - - Signed-off-by: Denys Vlasenko - -diff --git a/src/Daemon/abrt-debuginfo-install b/src/Daemon/abrt-debuginfo-install -index 3bb9c41..1b6af74 100755 ---- a/src/Daemon/abrt-debuginfo-install -+++ b/src/Daemon/abrt-debuginfo-install -@@ -146,11 +148,12 @@ print_package_names() { - # when we look for debuginfo we need only -debuginfo* repos, so we can disable the rest and thus make it faster - # also we want only fedora repositories, because abrt won't work for other packages anyway - # --showduplicates: do not just show the latest package -- # -R2: wait two minutes max (hopefully this prevents infinite hang on yum lock) -- local cmd="yum $yumopts '--disablerepo=*' '--enablerepo=fedora-debuginfo*' '--enablerepo=updates-debuginfo*' --showduplicates -R2 --quiet provides $missing_debuginfo_files" -+ # (tried to use -R2 to abort on stuck yum lock but -R is not about that) -+ local cmd="yum $yumopts '--disablerepo=*' '--enablerepo=fedora-debuginfo*' '--enablerepo=updates-debuginfo*' --showduplicates --quiet provides $missing_debuginfo_files" - echo "$cmd" >"yum_provides.$1.OUT" -+ $debug && echo "Running: $cmd" >&2 - # eval is needed to strip away ''s; cant remove them above and just use -- # $cmd, that would perform globbing on '*' -+ # unquoted $cmd, that would perform globbing on '*' - local yum_provides_OUT="`eval $cmd 2>&1`" - local err=$? - printf "%s\nyum exitcode:%s\n" "$yum_provides_OUT" $err >>"yum_provides.$1.OUT" diff --git a/sources b/sources index d0b613c..d7e0297 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aaa31f787ae7c144c57837928d26fdc9 abrt-1.0.9.tar.gz +3a358fa88e1746b5f755b1e1fb2f15c6 abrt-1.1.1.tar.gz From ce7b433a6062c011eec5942eed16babdbb99f4fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Mon, 19 Jul 2010 19:12:10 +0000 Subject: [PATCH 29/32] blacklisted mono-core --- abrt.spec | 7 ++++++- blacklist_mono.patch | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 blacklist_mono.patch diff --git a/abrt.spec b/abrt.spec index 997a726..a403c49 100644 --- a/abrt.spec +++ b/abrt.spec @@ -11,7 +11,7 @@ %if 0%{?_buildid} %define pkg_release 0.%{?_buildid}%{?dist} %else -%define pkg_release 1%{?dist} +%define pkg_release 2%{?dist} %endif Summary: Automatic bug detection and reporting tool @@ -24,6 +24,7 @@ URL: https://fedorahosted.org/abrt/ Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz Source1: abrt.init Patch0: abrt-1.0.9-hideprefs.patch +Patch1: blacklist_mono.patch BuildRequires: dbus-devel BuildRequires: gtk2-devel BuildRequires: curl-devel @@ -238,6 +239,7 @@ Virtual package to make easy default installation on desktop environments. %prep %setup -q %patch0 -p1 -b .hideprefs +%patch1 -p1 -b .blacklist_mono %build %configure @@ -460,6 +462,9 @@ fi %defattr(-,root,root,-) %changelog +* Mon Jul 19 2010 Jiri Moskovcak 1.1.1-2 +- blacklisted mono + * Wed May 12 2010 Jiri Moskovcak 1.1.1-1 - updated translations - removed avant-window-navigator from blacklist (jmoskovc@redhat.com) diff --git a/blacklist_mono.patch b/blacklist_mono.patch new file mode 100644 index 0000000..ae0819d --- /dev/null +++ b/blacklist_mono.patch @@ -0,0 +1,11 @@ +--- abrt-1.1.1/src/Daemon/abrt.conf 2010-05-12 15:48:18.000000000 +0200 ++++ abrt-1.1.1_/src/Daemon/abrt.conf 2010-07-19 21:07:14.228273198 +0200 +@@ -5,7 +5,7 @@ + # in the file gpg_keys + OpenGPGCheck = yes + # Blacklisted packages +-BlackList = nspluginwrapper, valgrind, strace ++BlackList = nspluginwrapper, valgrind, strace, mono-core + # Process crashes in executables which do not belong to any package? + ProcessUnpackaged = no + # Blacklisted executable paths (shell patterns) From fc41577e403a6c68438a1f03d7b3b86fdf86fcec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Mon, 19 Jul 2010 19:45:09 +0000 Subject: [PATCH 30/32] blacklisted mono-core --- abrt.spec | 7 ++++++- blacklist_mono.patch | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 blacklist_mono.patch diff --git a/abrt.spec b/abrt.spec index 92aa66d..41d6fba 100644 --- a/abrt.spec +++ b/abrt.spec @@ -4,13 +4,14 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 1.1.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/abrt/ Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz Source1: abrt.init Patch0: abrt-1.0.9-hideprefs.patch +Patch1: blacklist_mono.patch BuildRequires: dbus-devel BuildRequires: gtk2-devel BuildRequires: curl-devel @@ -225,6 +226,7 @@ Virtual package to make easy default installation on desktop environments. %prep %setup -q %patch0 -p1 -b ~hideprefs +%patch1 -p1 -b .blacklist_mono %build %configure @@ -447,6 +449,9 @@ fi %defattr(-,root,root,-) %changelog +* Mon Jul 19 2010 Jiri Moskovcak 1.1.1-2 +- blacklisted mono-core + * Wed May 28 2010 Jiri Moskovcak 1.1.1-1 - removed avant-window-navigator from blacklist (jmoskovc@redhat.com) - Abort debuginfo download if low on disk space (partially addresses #564451) (vda.linux@googlemail.com) diff --git a/blacklist_mono.patch b/blacklist_mono.patch new file mode 100644 index 0000000..ae0819d --- /dev/null +++ b/blacklist_mono.patch @@ -0,0 +1,11 @@ +--- abrt-1.1.1/src/Daemon/abrt.conf 2010-05-12 15:48:18.000000000 +0200 ++++ abrt-1.1.1_/src/Daemon/abrt.conf 2010-07-19 21:07:14.228273198 +0200 +@@ -5,7 +5,7 @@ + # in the file gpg_keys + OpenGPGCheck = yes + # Blacklisted packages +-BlackList = nspluginwrapper, valgrind, strace ++BlackList = nspluginwrapper, valgrind, strace, mono-core + # Process crashes in executables which do not belong to any package? + ProcessUnpackaged = no + # Blacklisted executable paths (shell patterns) From eacfb1a94ab588901f71543d1e80ef15405f263e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:33:32 +0000 Subject: [PATCH 31/32] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index f46d35a..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: abrt -# $Id$ -NAME := abrt -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 From eda8d44acbc1762c316c3c0cdb0f6c4f75968bfe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:33:34 +0000 Subject: [PATCH 32/32] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index f46d35a..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: abrt -# $Id$ -NAME := abrt -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12