From 3ac3bbb37ab87928386d57ab53987e960417e784 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 15:54:35 +0000 Subject: [PATCH 01/24] new version - fixes problem with recent kernels (2.6.33) --- .cvsignore | 2 +- abrt.spec | 42 +++++++++++++++++++++++++++++++++++++++--- sources | 2 +- 3 files changed, 41 insertions(+), 5 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..8e3ccdd 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: 1.0.6 -Release: 1%{?dist} +Version: 1.0.8 +Release: 0.git20100222%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/abrt/ @@ -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,39 @@ fi %defattr(-,root,root,-) %changelog +* 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 +480,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..ae466cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dd6d64ad3aab3eedc88af843de4320cf abrt-1.0.6.tar.gz +1c20d0197b4db9f2870db53effe752a2 abrt-1.0.8.tar.gz From de16c9bc5333f7aa3ce20b1ce9a0cf6ee3ef8c78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Tue, 23 Feb 2010 13:02:54 +0000 Subject: [PATCH 02/24] Updated to latest stable version --- abrt.spec | 8 +++++++- abrt_disable_gpgcheck.diff | 12 ++++++++++++ sources | 2 +- 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 abrt_disable_gpgcheck.diff diff --git a/abrt.spec b/abrt.spec index 8e3ccdd..4cda131 100644 --- a/abrt.spec +++ b/abrt.spec @@ -4,7 +4,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 1.0.8 -Release: 0.git20100222%{?dist} +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/abrt/ @@ -31,6 +31,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-libs = %{version}-%{release} Requires(pre): shadow-utils Obsoletes: abrt-plugin-sqlite3 +Patch0: abrt_disable_gpgcheck.diff %description %{name} is a tool to help users to detect defects in applications and @@ -216,6 +217,7 @@ Virtual package to make easy default installation on desktop environments. %prep %setup -q +%patch0 -p1 -b .disable_gpg %build %configure @@ -409,6 +411,10 @@ 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) diff --git a/abrt_disable_gpgcheck.diff b/abrt_disable_gpgcheck.diff new file mode 100644 index 0000000..6594bab --- /dev/null +++ b/abrt_disable_gpgcheck.diff @@ -0,0 +1,12 @@ +--- abrt-1.0.8_old/src/Daemon/abrt.conf 2010-02-11 23:52:28.000000000 +0100 ++++ abrt-1.0.8/src/Daemon/abrt.conf 2010-02-23 13:40:25.232039367 +0100 +@@ -3,7 +3,8 @@ + # only crashes in signed packages will be analyzed. + # the list of public keys used to check the signature is + # in the file gpg_keys +-OpenGPGCheck = yes ++# disable for rawhide, because the packages are not signed ++OpenGPGCheck = no + # Blacklisted packages + BlackList = nspluginwrapper, valgrind, strace, avant-window-navigator + # Which database plugin to use diff --git a/sources b/sources index ae466cf..9f112fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1c20d0197b4db9f2870db53effe752a2 abrt-1.0.8.tar.gz +0e480999bb77b3babe19373c03057df4 abrt-1.0.8.tar.gz From f3025fa350ef9983c1e2361cb572d9a7d0d92556 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Wed, 7 Apr 2010 13:38:25 +0000 Subject: [PATCH 03/24] New version --- .cvsignore | 2 +- abrt-1.0.9-hideprefs.patch | 11 +++ abrt.spec | 142 +++++++++++++++++++++++++++++++------ sources | 2 +- 4 files changed, 133 insertions(+), 24 deletions(-) create mode 100644 abrt-1.0.9-hideprefs.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-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 4cda131..9ecca6b 100644 --- a/abrt.spec +++ b/abrt.spec @@ -1,15 +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 .local + +%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: 1%{?dist} +Version: 1.0.9 +Release: %{?pkg_release} 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 +Patch0: abrt-1.0.9-hideprefs.patch BuildRequires: dbus-devel BuildRequires: gtk2-devel BuildRequires: curl-devel @@ -31,7 +45,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-libs = %{version}-%{release} Requires(pre): shadow-utils Obsoletes: abrt-plugin-sqlite3 -Patch0: abrt_disable_gpgcheck.diff %description %{name} is a tool to help users to detect defects in applications and @@ -80,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 @@ -148,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 @@ -217,7 +235,7 @@ Virtual package to make easy default installation on desktop environments. %prep %setup -q -%patch0 -p1 -b .disable_gpg +%patch0 -p1 -b .hideprefs %build %configure @@ -261,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 @@ -271,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 || : @@ -313,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 @@ -327,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 @@ -373,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 @@ -399,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 @@ -411,6 +457,58 @@ 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 +- 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 + * 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/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 07ee5fb4007168c04054fb8dfc1d35a45092daf5 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 08:56:54 +0000 Subject: [PATCH 04/24] - fixed problem with localized yum messages - improved bz summary - ignore unpacked user scripts --- abrt-1.0.9-better-bz-summary.patch | 28 ++++++ abrt-1.0.9-ignore_user_scripts.patch | 126 +++++++++++++++++++++++++++ abrt-localizedyum.patch | 19 ++++ abrt.spec | 13 ++- 4 files changed, 185 insertions(+), 1 deletion(-) 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 + diff --git a/abrt.spec b/abrt.spec index 9ecca6b..7d22840 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 15 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 6b692ce5426f035a8b0ff3d3bdd2ca46695916cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Kl=C3=AD=C4=8D?= Date: Fri, 30 Apr 2010 08:28:35 +0000 Subject: [PATCH 05/24] 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 7d22840..8c802c0 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 +* Fri Apr 30 2010 Karel Klic 1.0.9-3 +- fixed crash function detection (a part of duplication detection) + * Wed Apr 15 2010 Jiri Moskovcak 1.0.9-2 - fixed problem with localized yum messages rhbz#581804 - better bugzilla summary (napjkovs@redhat.com) From b8aa7d7ba1655a9681dab11889b958651ff9fb87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Thu, 13 May 2010 09:13:28 +0000 Subject: [PATCH 06/24] new upstream version --- .cvsignore | 2 +- abrt.spec | 42 +++++++++++++++++++++++++++++++----------- sources | 2 +- 3 files changed, 33 insertions(+), 13 deletions(-) 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.spec b/abrt.spec index 8c802c0..d348090 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.1 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,10 +458,37 @@ fi %defattr(-,root,root,-) %changelog +* Thu May 13 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) +- improved daemon error messages (kklic@redhat.com) + +* 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) + * Fri Apr 30 2010 Karel Klic 1.0.9-3 - fixed crash function detection (a part of duplication detection) -* Wed Apr 15 2010 Jiri Moskovcak 1.0.9-2 +* 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) 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 371617acf4419766f890e8d1b8174cfc3eb24e64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Thu, 13 May 2010 09:17:15 +0000 Subject: [PATCH 07/24] disable gpg check for rawhide --- abrt.spec | 3 +++ abrt_disable_gpgcheck.diff | 11 +++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/abrt.spec b/abrt.spec index d348090..7e58044 100644 --- a/abrt.spec +++ b/abrt.spec @@ -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: abrt_disable_gpgcheck.diff BuildRequires: dbus-devel BuildRequires: gtk2-devel BuildRequires: curl-devel @@ -236,6 +237,8 @@ Virtual package to make easy default installation on desktop environments. %prep %setup -q %patch0 -p1 -b .hideprefs +# rawhide packages are not signed, so we need to disable the gpg check +%patch1 -p1 -b .disable_gpg_check %build %configure diff --git a/abrt_disable_gpgcheck.diff b/abrt_disable_gpgcheck.diff index 6594bab..7699939 100644 --- a/abrt_disable_gpgcheck.diff +++ b/abrt_disable_gpgcheck.diff @@ -1,12 +1,11 @@ ---- abrt-1.0.8_old/src/Daemon/abrt.conf 2010-02-11 23:52:28.000000000 +0100 -+++ abrt-1.0.8/src/Daemon/abrt.conf 2010-02-23 13:40:25.232039367 +0100 -@@ -3,7 +3,8 @@ +--- 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-05-13 11:15:15.773258050 +0200 +@@ -3,7 +3,7 @@ # only crashes in signed packages will be analyzed. # the list of public keys used to check the signature is # in the file gpg_keys -OpenGPGCheck = yes -+# disable for rawhide, because the packages are not signed +OpenGPGCheck = no # Blacklisted packages - BlackList = nspluginwrapper, valgrind, strace, avant-window-navigator - # Which database plugin to use + BlackList = nspluginwrapper, valgrind, strace + # Process crashes in executables which do not belong to any package? From c8513d28d20cd632fb8fb812b7fd92e93d70b165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Tue, 18 May 2010 22:25:28 +0000 Subject: [PATCH 08/24] new version --- .cvsignore | 2 +- abrt.spec | 16 +++++++++++++++- sources | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 36dd2d7..39ac9ff 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abrt-1.1.1.tar.gz +abrt-1.1.2.tar.gz diff --git a/abrt.spec b/abrt.spec index 7e58044..2c849ce 100644 --- a/abrt.spec +++ b/abrt.spec @@ -16,7 +16,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 1.1.1 +Version: 1.1.2 Release: %{?pkg_release} License: GPLv2+ Group: Applications/System @@ -195,6 +195,7 @@ 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 %description addon-python This package contains python hook and python analyzer plugin for handling @@ -461,6 +462,19 @@ fi %defattr(-,root,root,-) %changelog +* Wed May 19 2010 Jiri Moskovcak 1.1.2-1 +- updated translation +- obsolete gnome-python2-bugbuddy rhbz#579748 (jmoskovc@redhat.com) +- Report "INFO: possible recursive locking detected rhbz#582378 (vda.linux@googlemail.com) +- kill yumdownloader if abrt-debuginfo-install is terminated mid-flight (vda.linux@googlemail.com) +- do not create Python dumps if argv[0] is not absolute (vda.linux@googlemail.com) +- improve kerneloops hash (vda.linux@googlemail.com) +- Move /var/cache/abrt to /var/spool/abrt. rhbz#568101. (vda.linux@googlemail.com) +- bugzilla: better summary and decription messages (npajkovs@redhat.com) +- renamed daemon pid and lock file rhbz#588315 (jmoskovc@redhat.com) +- Daemon socket for reporting crashes (kklic@redhat.com) +- Move hooklib from src/Hooks to lib/Utils (kklic@redhat.com) + * Thu May 13 2010 Jiri Moskovcak 1.1.1-1 - updated translations - removed avant-window-navigator from blacklist (jmoskovc@redhat.com) diff --git a/sources b/sources index d7e0297..3309e41 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3a358fa88e1746b5f755b1e1fb2f15c6 abrt-1.1.1.tar.gz +47d553a62c206471df501eb624dc7677 abrt-1.1.2.tar.gz From 5939e9b0b19d6daf9f8aecc09dc4ca75bfb68efa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Fri, 21 May 2010 13:38:43 +0000 Subject: [PATCH 09/24] - spec file fixes rhbz#593670 - updated init script --- abrt.init | 37 +++++++++++++++++++++++++------------ abrt.spec | 8 +++++++- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/abrt.init b/abrt.init index f1dc410..dde5950 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,12 +95,16 @@ 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) - status abrt + status abrtd RETVAL=$? ;; *) diff --git a/abrt.spec b/abrt.spec index 2c849ce..9e02313 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 @@ -261,6 +261,7 @@ 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} +mkdir -p $RPM_BUILD_ROOT/var/spool/%{name} desktop-file-install \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ @@ -322,6 +323,7 @@ fi %config(noreplace) %{_sysconfdir}/dbus-1/system.d/dbus-%{name}.conf %{_initrddir}/%{name}d %dir %attr(0755, abrt, abrt) %{_localstatedir}/cache/%{name} +%dir %attr(0755, abrt, abrt) %{_localstatedir}/spool/%{name} %dir /var/run/%{name} %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/plugins @@ -462,6 +464,10 @@ fi %defattr(-,root,root,-) %changelog +* Fri May 21 2010 Jiri Moskovcak 1.1.2-3 +- fixed spec file to create /var/spool/abrt rhbz#593670 +- updated init script to reflect the pid file renaming + * Wed May 19 2010 Jiri Moskovcak 1.1.2-1 - updated translation - obsolete gnome-python2-bugbuddy rhbz#579748 (jmoskovc@redhat.com) From 54f7d178d3345ebec9051f7c63fb80f180476d3f Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 21 May 2010 14:25:02 +0000 Subject: [PATCH 10/24] - More fixes for /var/cache/abrt -> /var/spool/abrt conversion --- .cvsignore | 2 +- abrt.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 39ac9ff..16b7be2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abrt-1.1.2.tar.gz +abrt-1.1.3.tar.gz diff --git a/abrt.spec b/abrt.spec index 9e02313..aa5947c 100644 --- a/abrt.spec +++ b/abrt.spec @@ -11,12 +11,12 @@ %if 0%{?_buildid} %define pkg_release 0.%{?_buildid}%{?dist} %else -%define pkg_release 2%{?dist} +%define pkg_release 1%{?dist} %endif Summary: Automatic bug detection and reporting tool Name: abrt -Version: 1.1.2 +Version: 1.1.3 Release: %{?pkg_release} License: GPLv2+ Group: Applications/System @@ -258,6 +258,7 @@ make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} 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 +# /var/cache/%{name} is to be removed in 1.3.x timeframe 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} @@ -464,6 +465,9 @@ fi %defattr(-,root,root,-) %changelog +* Fri May 21 2010 Denys Vlasenko 1.1.3-1 +- More fixes for /var/cache/abrt -> /var/spool/abrt conversion + * Fri May 21 2010 Jiri Moskovcak 1.1.2-3 - fixed spec file to create /var/spool/abrt rhbz#593670 - updated init script to reflect the pid file renaming diff --git a/sources b/sources index 3309e41..6ac0af8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -47d553a62c206471df501eb624dc7677 abrt-1.1.2.tar.gz +28ad7bde10485c255ed60945fa690313 abrt-1.1.3.tar.gz From e96f5e28a2cf9ccf60dc05fb13f2f1ead2a32a8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Wed, 26 May 2010 21:56:26 +0000 Subject: [PATCH 11/24] new version --- .cvsignore | 2 +- 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 | 8 +- sources | 2 +- 7 files changed, 9 insertions(+), 204 deletions(-) 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 diff --git a/.cvsignore b/.cvsignore index 16b7be2..c05a4b0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abrt-1.1.3.tar.gz +abrt-1.1.4.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-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 aa5947c..e19425d 100644 --- a/abrt.spec +++ b/abrt.spec @@ -16,7 +16,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 1.1.3 +Version: 1.1.4 Release: %{?pkg_release} License: GPLv2+ Group: Applications/System @@ -465,6 +465,12 @@ fi %defattr(-,root,root,-) %changelog +* Wed May 26 2010 Jiri Moskovcak 1.1.4-1 +- added reporting wizard +- fixed few leaked fds +- fixed kerneloops --- cut here --- problem +- updated translations + * Fri May 21 2010 Denys Vlasenko 1.1.3-1 - More fixes for /var/cache/abrt -> /var/spool/abrt conversion diff --git a/sources b/sources index 6ac0af8..f38ac94 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -28ad7bde10485c255ed60945fa690313 abrt-1.1.3.tar.gz +5921a5f60e3fb0af9482fffbe6078bb0 abrt-1.1.4.tar.gz From 97652d8ae509e022daa82abe63e9edf401bda028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Thu, 10 Jun 2010 13:05:43 +0000 Subject: [PATCH 12/24] new version --- .cvsignore | 2 +- abrt.spec | 20 +++++++++++++++++++- sources | 2 +- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index c05a4b0..6f9b278 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abrt-1.1.4.tar.gz +abrt-1.1.5.tar.gz diff --git a/abrt.spec b/abrt.spec index e19425d..c169681 100644 --- a/abrt.spec +++ b/abrt.spec @@ -16,7 +16,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 1.1.4 +Version: 1.1.5 Release: %{?pkg_release} License: GPLv2+ Group: Applications/System @@ -465,6 +465,24 @@ fi %defattr(-,root,root,-) %changelog +* Thu Jun 10 2010 Jiri Moskovcak 1.1.5-1 +- GUI: polished the reporter assistant (jmoskovc@redhat.com) +- Logger reporter: do not store useless info (vda.linux@googlemail.com) +- ccpp hook: add SaveBinaryImage option which saves of the crashed binary (vda.linux@googlemail.com) +- SPEC: added CFLAGS="-fno-strict-aliasing" to fix the rpmdiff warnings rhbz#599364 (jmoskovc@redhat.com) +- GUI: don't remove user comments when re-reporting the bug rhbz#601779 (jmoskovc@redhat.com) +- remove "(deleted)" from executable path rhbz#593037 (jmoskovc@redhat.com) +- CCpp analyzer: add 60 sec cap on gdb run time. (vda.linux@googlemail.com) +- add new file *hostname* into debugdump directory (npajkovs@redhat.com) +- rhticket: upload real tarball, not a bogus file (vda.linux@googlemail.com) +- abrt-hook-ccpp: eliminate race between process exit and compat coredump creation rhbz#584554 (vda.linux@googlemail.com) +- rhticket: actually do create ticket, using Gavin's lib code (vda.linux@googlemail.com) +- properly obsolete gnome-python2-bugbuddy rhbz#579748 (jmoskovc@redhat.com) +- GUI: remember comment and howto on backtrace refresh rhbz#545690 (jmoskovc@redhat.com) +- use header case in button label rhbz#565812 (jmoskovc@redhat.com) +- make log window resizable (vda.linux@googlemail.com) +- rename a few remaining /var/cache/abrt -> /var/spool/abrt (vda.linux@googlemail.com) + * Wed May 26 2010 Jiri Moskovcak 1.1.4-1 - added reporting wizard - fixed few leaked fds diff --git a/sources b/sources index f38ac94..0b717f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5921a5f60e3fb0af9482fffbe6078bb0 abrt-1.1.4.tar.gz +39dfb3c2cf130dc2ffa0a99b40964e07 abrt-1.1.5.tar.gz From 9b6272f383deb606f49959b24aacb75be9336daa Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 22 Jun 2010 20:17:04 +0000 Subject: [PATCH 13/24] Add VCS key --- abrt.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/abrt.spec b/abrt.spec index c169681..e92271b 100644 --- a/abrt.spec +++ b/abrt.spec @@ -21,6 +21,7 @@ Release: %{?pkg_release} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/abrt/ +#VCS: git:git://git.fedorahosted.org/git/abrt.git Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz Source1: abrt.init Patch0: abrt-1.0.9-hideprefs.patch From 0b28a30f45120fda0be803621f5ceda0c8b00d3b Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Thu, 22 Jul 2010 00:33:14 +0000 Subject: [PATCH 14/24] - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index e92271b..7ea0776 100644 --- a/abrt.spec +++ b/abrt.spec @@ -17,7 +17,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 1.1.5 -Release: %{?pkg_release} +Release: %{?pkg_release}.1 License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/abrt/ @@ -466,6 +466,9 @@ fi %defattr(-,root,root,-) %changelog +* Wed Jul 21 2010 David Malcolm - 1.1.5-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + * Thu Jun 10 2010 Jiri Moskovcak 1.1.5-1 - GUI: polished the reporter assistant (jmoskovc@redhat.com) - Logger reporter: do not store useless info (vda.linux@googlemail.com) From 02218746cb0df748a1ee69dbe95c61a5e842d313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Mon, 26 Jul 2010 12:20:42 +0000 Subject: [PATCH 15/24] new version --- abrt.spec | 133 ++++++++++++++++++++++++------------- abrt_disable_gpgcheck.diff | 12 ++-- blacklist_mono.patch | 11 +++ 3 files changed, 102 insertions(+), 54 deletions(-) create mode 100644 blacklist_mono.patch diff --git a/abrt.spec b/abrt.spec index 7ea0776..14eadee 100644 --- a/abrt.spec +++ b/abrt.spec @@ -16,8 +16,8 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 1.1.5 -Release: %{?pkg_release}.1 +Version: 1.1.10 +Release: %{?pkg_release} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/abrt/ @@ -26,6 +26,7 @@ Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz Source1: abrt.init Patch0: abrt-1.0.9-hideprefs.patch Patch1: abrt_disable_gpgcheck.diff +Patch2: blacklist_mono.patch BuildRequires: dbus-devel BuildRequires: gtk2-devel BuildRequires: curl-devel @@ -152,36 +153,23 @@ Requires: %{name} = %{version}-%{release} %description plugin-bugzilla Plugin to report bugs into the bugzilla. -%package plugin-rhfastcheck -Summary: %{name}'s rhfastcheck plugin +%package plugin-rhtsupport +Summary: %{name}'s RHTSupport plugin Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} +Obsoletes: abrt-plugin-catcut +Obsoletes: abrt-plugin-rhfastcheck +Obsoletes: abrt-plugin-rhticket -%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 +%description plugin-rhtsupport Plugin to report bugs into RH support system. -%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 +%package plugin-reportuploader Summary: %{name}'s ticketuploader plugin Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} -%description plugin-ticketuploader +%description plugin-reportuploader Plugin to report bugs into anonymous FTP site associated with ticketing system. %package plugin-filetransfer @@ -241,6 +229,8 @@ Virtual package to make easy default installation on desktop environments. %patch0 -p1 -b .hideprefs # rawhide packages are not signed, so we need to disable the gpg check %patch1 -p1 -b .disable_gpg_check +# general patches +%patch2 -p1 -b .blacklist_mono %build %configure @@ -319,6 +309,7 @@ fi %doc README COPYING %{_sbindir}/%{name}d %{_bindir}/%{name}-debuginfo-install +%{_bindir}/%{name}-handle-upload %{_bindir}/%{name}-backtrace %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %config(noreplace) %{_sysconfdir}/%{name}/gpg_keys @@ -347,7 +338,9 @@ fi %files devel %defattr(-,root,root,-) +%{_includedir}/* %{_libdir}/lib*.so +%{_libdir}/pkgconfig/* %files gui %defattr(-,root,root,-) @@ -413,33 +406,18 @@ fi %{_libdir}/%{name}/Bugzilla.GTKBuilder %{_mandir}/man7/%{name}-Bugzilla.7.gz -%files plugin-rhfastcheck +%files plugin-rhtsupport %defattr(-,root,root,-) -#%config(noreplace) %{_sysconfdir}/%{name}/plugins/rhfastcheck.conf -%{_libdir}/%{name}/librhfastcheck.so* -#%{_libdir}/%{name}/rhfastcheck.GTKBuilder -#%{_mandir}/man7/%{name}-rhfastcheck.7.gz +%config(noreplace) %{_sysconfdir}/%{name}/plugins/RHTSupport.conf +%{_libdir}/%{name}/libRHTSupport.so* +%{_libdir}/%{name}/RHTSupport.GTKBuilder -%files plugin-rhticket +%files plugin-reportuploader %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 -%{_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 -%{_libdir}/%{name}/libTicketUploader.so* -%{_libdir}/%{name}/TicketUploader.GTKBuilder -%{_mandir}/man7/%{name}-TicketUploader.7.gz +%config(noreplace) %{_sysconfdir}/%{name}/plugins/ReportUploader.conf +%{_libdir}/%{name}/libReportUploader.so* +%{_libdir}/%{name}/ReportUploader.GTKBuilder +%{_mandir}/man7/%{name}-ReportUploader.7.gz %files plugin-filetransfer %defattr(-,root,root,-) @@ -450,7 +428,6 @@ fi %files addon-python %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/Python.conf -%attr(4755, abrt, abrt) %{_libexecdir}/abrt-hook-python %{_libdir}/%{name}/libPython.so* %{python_site}/*.py* %{python_site}/abrt.pth @@ -466,6 +443,66 @@ fi %defattr(-,root,root,-) %changelog +* Mon Jul 26 2010 Jiri Moskovcak 1.1.10-1 +- blacklisted mono-core package +- die with an error message if the database plugin is not accessible when needed (kklic@redhat.com) +- change RHTSupport URL protocol from HTTP to HTTPS (dvlasenk@redhat.com) +- the Logger plugin returns a message as the result of Report() call instead of a file URL (kklic@redhat.com) +- Cut off prelink suffixes from executable name if any (mtoman@redhat.com) +- CCpp: abrt-debuginfo-install output lines can be long, accomodate them (dvlasenk@redhat.com) +- do not pop up message on crash if the same crash is the same (dvlasenk@redhat.com) +- fedora bugs do not depend on rhel bugs (npajkovs@redhat.com) +- GUI: fixed problem with no gkeyring and just one reporter enabled rhbz#612457 (jmoskovc@redhat.com) +- added a document about interpreted language integration (kklic@redhat.com) +- moved devel header files to inc/ and included them in -devel package (jmoskovc@redhat.com, npajkovs@redhat.com) +- renamed abrt-utils.pc to abrt.pc (jmoskovc@redhat.com) +- string updates based on a UI text review (kklic@redhat.com) +- rhtsupport obsoletes the old rh plugins (jmoskovc@redhat.com) +- list allowed items in RHTSupport.conf (kklic@redhat.com) +- GUI: fixed package name in warning message when the packge is kernel rhbz#612191 (jmoskovc@redhat.com) +- remove rating for python crashes (jmoskovc@redhat.com) +- CCpp: give zero rating to an empty backtrace (jmoskovc@redhat.com) +- GUI: allow sending crashes without rating (jmoskovc@redhat.com) +- RHTSupport: set default URL to api.access.redhat.com/rs (dvlasenk@redhat.com) +- abort initialization on abrt.conf parsing errors (dvlasenk@redhat.com) +- changing NoSSLVerify to SSLVerify in bugzilla plugin (mtoman@redhat.com) +- added rating to python crashes +- show hostname in cli (kklic@redhat.com) +- updated po files (jmoskovc@redhat.com) +- added support for package specific actions rhbz#606917 (jmoskovc@redhat.com) +- renamed TicketUploader to ReportUploader (jmoskovc@redhat.com) +- bad hostnames on remote crashes (npajkovs@redhat.com) +- unlimited MaxCrashReportsSize (npajkovs@redhat.com) +- abrt_rh_support: improve error messages rhbz#608698 (vda.linux@googlemail.com) +- Added BacktraceRemotes option. (kklic@redhat.com) +- Allow remote crashes to not to belong to a package. Skip GPG check on remote crashes. (kklic@redhat.com) +- remove obsolete Catcut and rhfastcheck reporters (vda.linux@googlemail.com) +- make rhel bug point to correct place rhbz#578397 (npajkovs@redhat.com) +- Show comment and how to reproduce fields when reporing crashes in abrt-cli (kklic@redhat.com) +- Bash completion update (kklic@redhat.com) +- Rename --get-list to --list (kklic@redhat.com) +- Update man page (kklic@redhat.com) +- Options overhaul (kklic@redhat.com) +- abrt should not point to Fedora bugs but create new RHEL bug instead (npajkovs@redhat.com) +- Don't show global uuid in report (npajkovs@redhat.com) +- GUI: don't try to use action plugins as reporters (jmoskovc@redhat.com) +- Added WatchCrashdumpArchiveDir directive to abrt.conf and related code (vda.linux@googlemail.com) +- GUI: don't show the placehondler icon rhbz#605693 (jmoskovc@redhat.com) +- Make "Loaded foo.conf" message less confusing (vda.linux@googlemail.com) +- Fixed a flaw in strbuf_prepend_str (kklic@redhat.com) +- TicketUploader: do not add '\n' to text files in crashdump (vda.linux@googlemail.com) +- GUI: skip the plugin selection, if it's not needed (jmoskovc@redhat.com) +- Check conf file for syntax errors (kklic@redhat.com) +- move misplaced sanity checks in cron parser (vda.linux@googlemail.com) +- GUI: don't require the rating for all reporters (jmoskovc@redhat.com) +- GUI: fixed exception when there is no configure dialog for plugin rhbz#603745 (jmoskovc@redhat.com) +- Add a GUI config dialog for RHTSupport plugin (vda.linux@googlemail.com) +- abrt_curl: fix a problem with incorrect content-length on 32-bit arches (vda.linux@googlemail.com) +- sosreport: save the dump directly to crashdump directory (vda.linux@googlemail.com) +- plugin rename: rhticket -> RHTSupport (vda.linux@googlemail.com) +- Daemon socket for reporting crashes (karel@localhost.localdomain) +- GUI: fixed few typos (jmoskovc@redhat.com) + * Wed Jul 21 2010 David Malcolm - 1.1.5-1.1 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild diff --git a/abrt_disable_gpgcheck.diff b/abrt_disable_gpgcheck.diff index 7699939..26e00fc 100644 --- a/abrt_disable_gpgcheck.diff +++ b/abrt_disable_gpgcheck.diff @@ -1,11 +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-05-13 11:15:15.773258050 +0200 -@@ -3,7 +3,7 @@ - # only crashes in signed packages will be analyzed. +--- abrt-1.1.10/src/Daemon/abrt.conf 2010-06-30 15:08:48.000000000 +0200 ++++ abrt-1.1.10_/src/Daemon/abrt.conf 2010-07-26 13:59:27.484253074 +0200 +@@ -4,7 +4,7 @@ # the list of public keys used to check the signature is # in the file gpg_keys + # -OpenGPGCheck = yes +OpenGPGCheck = no + # Blacklisted packages - BlackList = nspluginwrapper, valgrind, strace - # Process crashes in executables which do not belong to any package? + # diff --git a/blacklist_mono.patch b/blacklist_mono.patch new file mode 100644 index 0000000..11fde35 --- /dev/null +++ b/blacklist_mono.patch @@ -0,0 +1,11 @@ +--- abrt-1.1.10/src/Daemon/abrt.conf 2010-07-26 14:00:36.914502040 +0200 ++++ abrt-1.1.10_/src/Daemon/abrt.conf 2010-07-26 14:01:07.597502575 +0200 +@@ -8,7 +8,7 @@ + + # Blacklisted packages + # +-BlackList = nspluginwrapper, valgrind, strace ++BlackList = nspluginwrapper, valgrind, strace, mono-core + + # Process crashes in executables which do not belong to any package? + # From 5486183fd722e5ca5d45fdbd5c7d14034cac4489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Mon, 26 Jul 2010 12:24:27 +0000 Subject: [PATCH 16/24] uploaded new sources --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6f9b278..97e3258 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abrt-1.1.5.tar.gz +abrt-1.1.10.tar.gz diff --git a/sources b/sources index 0b717f0..e01e196 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -39dfb3c2cf130dc2ffa0a99b40964e07 abrt-1.1.5.tar.gz +c7901207e7e917ef376880a9c9f9dfff abrt-1.1.10.tar.gz From 247876f55ba2b633fbcc54e1581d53676aed769b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Mon, 26 Jul 2010 14:07:20 +0000 Subject: [PATCH 17/24] build fixes --- abrt-1.1.10-applet.patch | 36 ++++++++++++++++++++++++++++++++++++ abrt.spec | 7 ++++++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 abrt-1.1.10-applet.patch diff --git a/abrt-1.1.10-applet.patch b/abrt-1.1.10-applet.patch new file mode 100644 index 0000000..3c3281a --- /dev/null +++ b/abrt-1.1.10-applet.patch @@ -0,0 +1,36 @@ +commit 406c8793bef87fb49333d7196ea23d42be87c21e +Author: Jiri Moskovcak +Date: Mon Jul 26 15:33:02 2010 +0200 + + APPLET: minor build fix + +diff --git a/src/Applet/CCApplet.cpp b/src/Applet/CCApplet.cpp +index 8596f4c..02d911d 100644 +--- a/src/Applet/CCApplet.cpp ++++ b/src/Applet/CCApplet.cpp +@@ -361,7 +361,7 @@ void CApplet::Disable(const char *reason) + if (pixbuf) + { + gray_scaled = gdk_pixbuf_copy(pixbuf); +- gdk_pixbuf_saturate_and_pixelate(pixbuf, gray_scaled, 0.0, NULL); ++ gdk_pixbuf_saturate_and_pixelate(pixbuf, gray_scaled, 0.0, false); + gtk_status_icon_set_from_pixbuf(m_pStatusIcon, gray_scaled); + //do we need to free pixbufs nere? + } +diff --git a/src/Applet/Makefile.am b/src/Applet/Makefile.am +index 6abef3b..77c9fc9 100644 +--- a/src/Applet/Makefile.am ++++ b/src/Applet/Makefile.am +@@ -26,10 +26,10 @@ abrt_applet_LDADD = \ + -lglib-2.0 \ + -lgthread-2.0 \ + $(DBUS_LIBS) \ +- $(LIBNOTIFY_LIBS) ++ $(LIBNOTIFY_LIBS) \ ++ $(GTK_LIBS) + # ../../lib/Utils/libABRTdUtils.la + # $(DL_LIBS) +-# $(GTK_LIBS) + + EXTRA_DIST = abrt-applet.desktop + diff --git a/abrt.spec b/abrt.spec index 14eadee..908a671 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 @@ -27,6 +27,7 @@ Source1: abrt.init Patch0: abrt-1.0.9-hideprefs.patch Patch1: abrt_disable_gpgcheck.diff Patch2: blacklist_mono.patch +Patch3: abrt-1.1.10-applet.patch BuildRequires: dbus-devel BuildRequires: gtk2-devel BuildRequires: curl-devel @@ -231,6 +232,7 @@ Virtual package to make easy default installation on desktop environments. %patch1 -p1 -b .disable_gpg_check # general patches %patch2 -p1 -b .blacklist_mono +%patch3 -p1 -b .applet_build %build %configure @@ -443,6 +445,9 @@ fi %defattr(-,root,root,-) %changelog +* Mon Jul 26 2010 Jiri Moskovcak 1.1.10-2 +- minor build fixes + * Mon Jul 26 2010 Jiri Moskovcak 1.1.10-1 - blacklisted mono-core package - die with an error message if the database plugin is not accessible when needed (kklic@redhat.com) From 05020c875db0e41cc8566b8b0a347526e65ea49a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Tue, 27 Jul 2010 14:39:54 +0000 Subject: [PATCH 18/24] blacklisted nspluginviewer --- abrt.spec | 7 +++++-- blacklist.patch | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 blacklist.patch diff --git a/abrt.spec b/abrt.spec index 908a671..1316b7f 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 @@ -26,7 +26,7 @@ Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz Source1: abrt.init Patch0: abrt-1.0.9-hideprefs.patch Patch1: abrt_disable_gpgcheck.diff -Patch2: blacklist_mono.patch +Patch2: blacklist.patch Patch3: abrt-1.1.10-applet.patch BuildRequires: dbus-devel BuildRequires: gtk2-devel @@ -445,6 +445,9 @@ fi %defattr(-,root,root,-) %changelog +* Tue Jul 27 2010 Jiri Moskovcak 1.1.10-3 +- blacklist /usr/bin/nspluginviewer + * Mon Jul 26 2010 Jiri Moskovcak 1.1.10-2 - minor build fixes diff --git a/blacklist.patch b/blacklist.patch new file mode 100644 index 0000000..4c3de56 --- /dev/null +++ b/blacklist.patch @@ -0,0 +1,22 @@ +--- abrt-1.1.10/src/Daemon/abrt.conf 2010-07-27 16:16:45.376241759 +0200 ++++ abrt-1.1.10_rhel6/src/Daemon/abrt.conf 2010-07-27 16:16:32.988241693 +0200 +@@ -16,7 +16,7 @@ + + # Blacklisted executable paths (shell patterns) + # +-BlackListedPaths = /usr/share/doc/*, */example* ++BlackListedPaths = /usr/share/doc/*, */example*, /usr/bin/nspluginviewer + + # Which database plugin to use + # +--- abrt-1.1.10/src/Daemon/abrt.conf 2010-07-26 14:00:36.914502040 +0200 ++++ abrt-1.1.10_/src/Daemon/abrt.conf 2010-07-26 14:01:07.597502575 +0200 +@@ -8,7 +8,7 @@ + + # Blacklisted packages + # +-BlackList = nspluginwrapper, valgrind, strace ++BlackList = nspluginwrapper, valgrind, strace, mono-core + + # Process crashes in executables which do not belong to any package? + # From b354eba42ce760f97670fdc7b1ce486cc95433f2 Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Tue, 27 Jul 2010 15:05:58 +0000 Subject: [PATCH 19/24] rebuild --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 1316b7f..7b5d18f 100644 --- a/abrt.spec +++ b/abrt.spec @@ -11,7 +11,7 @@ %if 0%{?_buildid} %define pkg_release 0.%{?_buildid}%{?dist} %else -%define pkg_release 3%{?dist} +%define pkg_release 4%{?dist} %endif Summary: Automatic bug detection and reporting tool @@ -445,6 +445,9 @@ fi %defattr(-,root,root,-) %changelog +* Tue Jul 27 2010 David Malcolm - 1.1.10-0.%{?_buildid}%{?dist} +- rebuild + * Tue Jul 27 2010 Jiri Moskovcak 1.1.10-3 - blacklist /usr/bin/nspluginviewer From 558e5bc148204b90d4ee218209ec2db5bd892b4a Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Tue, 27 Jul 2010 15:06:38 +0000 Subject: [PATCH 20/24] fix %changelog --- abrt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 7b5d18f..c9580ad 100644 --- a/abrt.spec +++ b/abrt.spec @@ -445,7 +445,7 @@ fi %defattr(-,root,root,-) %changelog -* Tue Jul 27 2010 David Malcolm - 1.1.10-0.%{?_buildid}%{?dist} +* Tue Jul 27 2010 David Malcolm - 1.1.10-4 - rebuild * Tue Jul 27 2010 Jiri Moskovcak 1.1.10-3 From fed9634092e4058ca3174518d3cd2fc80b9f3d8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Moskov=C4=8D=C3=A1k?= Date: Tue, 27 Jul 2010 15:25:52 +0000 Subject: [PATCH 21/24] removed unused patch --- blacklist_mono.patch | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 blacklist_mono.patch diff --git a/blacklist_mono.patch b/blacklist_mono.patch deleted file mode 100644 index 11fde35..0000000 --- a/blacklist_mono.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- abrt-1.1.10/src/Daemon/abrt.conf 2010-07-26 14:00:36.914502040 +0200 -+++ abrt-1.1.10_/src/Daemon/abrt.conf 2010-07-26 14:01:07.597502575 +0200 -@@ -8,7 +8,7 @@ - - # Blacklisted packages - # --BlackList = nspluginwrapper, valgrind, strace -+BlackList = nspluginwrapper, valgrind, strace, mono-core - - # Process crashes in executables which do not belong to any package? - # From 9606c697605fe1409ebe67f9be601ba6c0f72a08 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:33:37 +0000 Subject: [PATCH 22/24] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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) From f40c2708c3e301700c970a218acd65d715e24912 Mon Sep 17 00:00:00 2001 From: Jiri Moskovcak Date: Tue, 10 Aug 2010 14:13:31 +0200 Subject: [PATCH 23/24] removed unused patch --- abrt-1.1.10-applet.patch | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 abrt-1.1.10-applet.patch diff --git a/abrt-1.1.10-applet.patch b/abrt-1.1.10-applet.patch deleted file mode 100644 index 3c3281a..0000000 --- a/abrt-1.1.10-applet.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit 406c8793bef87fb49333d7196ea23d42be87c21e -Author: Jiri Moskovcak -Date: Mon Jul 26 15:33:02 2010 +0200 - - APPLET: minor build fix - -diff --git a/src/Applet/CCApplet.cpp b/src/Applet/CCApplet.cpp -index 8596f4c..02d911d 100644 ---- a/src/Applet/CCApplet.cpp -+++ b/src/Applet/CCApplet.cpp -@@ -361,7 +361,7 @@ void CApplet::Disable(const char *reason) - if (pixbuf) - { - gray_scaled = gdk_pixbuf_copy(pixbuf); -- gdk_pixbuf_saturate_and_pixelate(pixbuf, gray_scaled, 0.0, NULL); -+ gdk_pixbuf_saturate_and_pixelate(pixbuf, gray_scaled, 0.0, false); - gtk_status_icon_set_from_pixbuf(m_pStatusIcon, gray_scaled); - //do we need to free pixbufs nere? - } -diff --git a/src/Applet/Makefile.am b/src/Applet/Makefile.am -index 6abef3b..77c9fc9 100644 ---- a/src/Applet/Makefile.am -+++ b/src/Applet/Makefile.am -@@ -26,10 +26,10 @@ abrt_applet_LDADD = \ - -lglib-2.0 \ - -lgthread-2.0 \ - $(DBUS_LIBS) \ -- $(LIBNOTIFY_LIBS) -+ $(LIBNOTIFY_LIBS) \ -+ $(GTK_LIBS) - # ../../lib/Utils/libABRTdUtils.la - # $(DL_LIBS) --# $(GTK_LIBS) - - EXTRA_DIST = abrt-applet.desktop - From b87d8aa73d7917feb4b778497850666e95e801df Mon Sep 17 00:00:00 2001 From: Jiri Moskovcak Date: Tue, 10 Aug 2010 16:03:04 +0200 Subject: [PATCH 24/24] new version 1.1.13 --- .gitignore | 1 + abrt.spec | 113 +++++++++++++++++++++++++++++++++++++++--------- blacklist.patch | 2 +- polkit.patch | 104 ++++++++++++++++++++++++++++++++++++++++++++ sources | 2 +- 5 files changed, 200 insertions(+), 22 deletions(-) create mode 100644 polkit.patch diff --git a/.gitignore b/.gitignore index 97e3258..7e7694e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ abrt-1.1.10.tar.gz +abrt-1.1.13.tar.gz diff --git a/abrt.spec b/abrt.spec index c9580ad..c177aa0 100644 --- a/abrt.spec +++ b/abrt.spec @@ -1,7 +1,11 @@ %{!?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)")} - +%if 0%{?fedora} >= 14 + %define with_systemd 1 +%else + %define with_systemd 0 +%endif # 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" @@ -11,23 +15,22 @@ %if 0%{?_buildid} %define pkg_release 0.%{?_buildid}%{?dist} %else -%define pkg_release 4%{?dist} +%define pkg_release 1%{?dist} %endif Summary: Automatic bug detection and reporting tool Name: abrt -Version: 1.1.10 +Version: 1.1.13 Release: %{?pkg_release} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/abrt/ -#VCS: git:git://git.fedorahosted.org/git/abrt.git Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz Source1: abrt.init Patch0: abrt-1.0.9-hideprefs.patch Patch1: abrt_disable_gpgcheck.diff Patch2: blacklist.patch -Patch3: abrt-1.1.10-applet.patch +Patch3: polkit.patch BuildRequires: dbus-devel BuildRequires: gtk2-devel BuildRequires: curl-devel @@ -41,10 +44,14 @@ BuildRequires: xmlrpc-c-client BuildRequires: file-devel BuildRequires: python-devel BuildRequires: gettext +BuildRequires: libxml2-devel BuildRequires: polkit-devel -BuildRequires: libzip-devel, libtar-devel, bzip2-devel, zlib-devel +BuildRequires: libtar-devel, bzip2-devel, zlib-devel BuildRequires: intltool BuildRequires: bison +%if %{?with_systemd} +Requires: systemd-units +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-libs = %{version}-%{release} Requires(pre): shadow-utils @@ -166,9 +173,10 @@ Obsoletes: abrt-plugin-rhticket Plugin to report bugs into RH support system. %package plugin-reportuploader -Summary: %{name}'s ticketuploader plugin +Summary: %{name}'s reportuploader plugin Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} +Obsoletes: abrt-plugin-ticketuploader %description plugin-reportuploader Plugin to report bugs into anonymous FTP site associated with ticketing system. @@ -186,6 +194,7 @@ 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 @@ -232,12 +241,13 @@ Virtual package to make easy default installation on desktop environments. %patch1 -p1 -b .disable_gpg_check # general patches %patch2 -p1 -b .blacklist_mono -%patch3 -p1 -b .applet_build +%patch3 -p1 -b .polkit %build %configure sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +CFLAGS="-fno-strict-aliasing" make %{?_smp_mflags} %install @@ -256,6 +266,7 @@ 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} mkdir -p $RPM_BUILD_ROOT/var/spool/%{name} +mkdir -p $RPM_BUILD_ROOT/var/spool/%{name}-upload desktop-file-install \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ @@ -276,7 +287,38 @@ getent passwd abrt >/dev/null || useradd --system -g abrt -d /etc/abrt -s /sbin/ exit 0 %post +if [ $1 -eq 1 ]; then /sbin/chkconfig --add %{name}d +fi +#systemd +%if %{?with_systemd} +#if [ $1 -eq 1 ]; then +# Enable (but don't start) the units by default + /bin/systemctl enable %{name}d.service >/dev/null 2>&1 || : +#fi +%endif + +%preun +if [ "$1" -eq "0" ] ; then + service %{name}d stop >/dev/null 2>&1 + /sbin/chkconfig --del %{name}d +fi +#systemd +%if %{?with_systemd} +if [ "$1" -eq "0" ] ; then + /bin/systemctl stop %{name}d.service >/dev/null 2>&1 || : + /bin/systemctl disable %{name}d.service >/dev/null 2>&1 || : +fi +%endif + +%postun +#systemd +%if %{?with_systemd} +if [ $1 -ge 1 ] ; then +# On upgrade, reload init system configuration if we changed unit files + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi +%endif %post gui # update icon cache @@ -287,12 +329,6 @@ fi %post libs -p /sbin/ldconfig -%preun -if [ "$1" -eq "0" ] ; then - service %{name}d stop >/dev/null 2>&1 - /sbin/chkconfig --del %{name}d -fi - %postun libs -p /sbin/ldconfig %postun gui @@ -305,10 +341,21 @@ fi if [ "$1" -eq "0" ]; then service %{name}d condrestart >/dev/null 2>&1 || : fi +#systemd +%if %{?with_systemd} +if [ "$1" -eq "0" ]; then + /bin/systemctl try-restart %{name}d.service >/dev/null 2>&1 || : +fi +%endif + %files -f %{name}.lang %defattr(-,root,root,-) %doc README COPYING +#systemd +%if %{?with_systemd} +/lib/systemd/system/%{name}d.service +%endif %{_sbindir}/%{name}d %{_bindir}/%{name}-debuginfo-install %{_bindir}/%{name}-handle-upload @@ -317,8 +364,10 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/gpg_keys %config(noreplace) %{_sysconfdir}/dbus-1/system.d/dbus-%{name}.conf %{_initrddir}/%{name}d +# /var/cache/%{name} is to be removed in 1.3.x timeframe %dir %attr(0755, abrt, abrt) %{_localstatedir}/cache/%{name} %dir %attr(0755, abrt, abrt) %{_localstatedir}/spool/%{name} +%dir %attr(0700, abrt, abrt) %{_localstatedir}/spool/%{name}-upload %dir /var/run/%{name} %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/plugins @@ -343,6 +392,7 @@ fi %{_includedir}/* %{_libdir}/lib*.so %{_libdir}/pkgconfig/* +%doc doc/abrt-plugin doc/howto-write-reporter %files gui %defattr(-,root,root,-) @@ -373,21 +423,21 @@ fi %{_libdir}/%{name}/libKerneloopsScanner.so* %{_mandir}/man7/%{name}-KerneloopsScanner.7.gz %{_libdir}/%{name}/libKerneloopsReporter.so* -%{_libdir}/%{name}/KerneloopsReporter.GTKBuilder +%{_libdir}/%{name}/KerneloopsReporter.glade %{_mandir}/man7/%{name}-KerneloopsReporter.7.gz %files plugin-logger %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/Logger.conf %{_libdir}/%{name}/libLogger.so* -%{_libdir}/%{name}/Logger.GTKBuilder +%{_libdir}/%{name}/Logger.glade %{_mandir}/man7/%{name}-Logger.7.gz %files plugin-mailx %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/Mailx.conf %{_libdir}/%{name}/libMailx.so* -%{_libdir}/%{name}/Mailx.GTKBuilder +%{_libdir}/%{name}/Mailx.glade %{_mandir}/man7/%{name}-Mailx.7.gz %files plugin-runapp @@ -405,20 +455,21 @@ fi %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/Bugzilla.conf %{_libdir}/%{name}/libBugzilla.so* -%{_libdir}/%{name}/Bugzilla.GTKBuilder +%{_libdir}/%{name}/Bugzilla.glade %{_mandir}/man7/%{name}-Bugzilla.7.gz %files plugin-rhtsupport %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/RHTSupport.conf %{_libdir}/%{name}/libRHTSupport.so* -%{_libdir}/%{name}/RHTSupport.GTKBuilder +%{_libdir}/%{name}/RHTSupport.glade +#%{_mandir}/man7/%{name}-RHTSupport.7.gz %files plugin-reportuploader %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/ReportUploader.conf %{_libdir}/%{name}/libReportUploader.so* -%{_libdir}/%{name}/ReportUploader.GTKBuilder +%{_libdir}/%{name}/ReportUploader.glade %{_mandir}/man7/%{name}-ReportUploader.7.gz %files plugin-filetransfer @@ -445,6 +496,28 @@ fi %defattr(-,root,root,-) %changelog +* Tue Aug 10 2010 Jiri Moskovcak 1.1.13-1 +- updated translation +- added native systemd file rhbz#617316 (jmoskovc@redhat.com) +- added ar to LINGUAS (jmoskovc@redhat.com) +- made /etc/abrt/plugins/Bugzilla.conf world-readable again (jmoskovc@redhat.com) +- l10n: adding fa locale (lashar@fedoraproject.org) +- l10n: new Persian (lashar@fedoraproject.org) +- remove libzip code (npajkovs@redhat.com) +- add libxml-2.0 into configure (npajkovs@redhat.com) +- fixed typo in man page rhbz#610748 (jmoskovc@redhat.com) +- RHTSupport: GUI's SSLVerify checkbox had one missing bit of code (vda.linux@googlemail.com) +- abrt_curl: discard headers from HTTP redirection (vda.linux@googlemail.com) +- moved abrt.socket and abrtd.lock into /var/run/abrt making selinux happy (jmoskovc@redhat.com) +- Mention --info and --backtrace in the abrt-cli man page. (kklic@redhat.com) +- build fixes for gcc 4.5 (jmoskovc@redhat.com) +- abrt-hook-ccpp: small fixes prompted by testing on RHEL5 (vda.linux@googlemail.com) +- Added --info action to abrt-cli (mtoman@redhat.com) +- wire up SSLVerify in RHTSupport.conf to actually have the desired effect (vda.linux@googlemail.com) +- fixed tooltip localization rhbz#574693 (jmoskovc@redhat.com) +- dumpoops/KerneloopsScanner: add pid to crashdump name (vda.linux@googlemail.com) +- A message change suggested by dhensley (kklic@redhat.com) + * Tue Jul 27 2010 David Malcolm - 1.1.10-4 - rebuild diff --git a/blacklist.patch b/blacklist.patch index 4c3de56..cccc80b 100644 --- a/blacklist.patch +++ b/blacklist.patch @@ -5,7 +5,7 @@ # Blacklisted executable paths (shell patterns) # -BlackListedPaths = /usr/share/doc/*, */example* -+BlackListedPaths = /usr/share/doc/*, */example*, /usr/bin/nspluginviewer ++BlackListedPaths = /usr/share/doc/*, */example*, /usr/bin/nspluginviewer, /usr/lib/xulrunner-*/plugin-container # Which database plugin to use # diff --git a/polkit.patch b/polkit.patch new file mode 100644 index 0000000..ebabe4a --- /dev/null +++ b/polkit.patch @@ -0,0 +1,104 @@ +diff -urp abrt-1.1.13/lib/Plugins/CCpp.cpp abrt-1.1.13_nopolkit/lib/Plugins/CCpp.cpp +--- abrt-1.1.13/lib/Plugins/CCpp.cpp 2010-07-28 15:35:14.000000000 +0200 ++++ abrt-1.1.13_nopolkit/lib/Plugins/CCpp.cpp 2010-08-10 15:21:18.569491108 +0200 +@@ -28,7 +28,9 @@ + #include "abrt_exception.h" + #include "debug_dump.h" + #include "comm_layer_inner.h" +-#include "Polkit.h" ++#if 0 ++ #include "Polkit.h" ++#endif + #include "backtrace.h" + #include "CCpp_sha1.h" + +@@ -675,7 +677,7 @@ string CAnalyzerCCpp::GetGlobalUUID(cons + return create_hash(hash_base.c_str()); + } + } +- ++#if 0 + static bool DebuginfoCheckPolkit(uid_t uid) + { + fflush(NULL); +@@ -704,6 +706,7 @@ static bool DebuginfoCheckPolkit(uid_t u + log("UID %d is not authorized to install debuginfos", uid); + return false; + } ++#endif + + void CAnalyzerCCpp::CreateReport(const char *pDebugDumpDir, int force) + { +@@ -738,7 +741,7 @@ void CAnalyzerCCpp::CreateReport(const c + dd.Close(); /* do not keep dir locked longer than needed */ + + string build_ids; +- if (m_bInstallDebugInfo && DebuginfoCheckPolkit(xatoi_u(UID.c_str()))) ++ if (m_bInstallDebugInfo) + { + if (m_nDebugInfoCacheMB > 0) + trim_debuginfo_cache(m_nDebugInfoCacheMB); +diff -urp abrt-1.1.13/lib/Utils/Makefile.am abrt-1.1.13_nopolkit/lib/Utils/Makefile.am +--- abrt-1.1.13/lib/Utils/Makefile.am 2010-08-04 17:15:16.000000000 +0200 ++++ abrt-1.1.13_nopolkit/lib/Utils/Makefile.am 2010-08-10 14:54:21.779492300 +0200 +@@ -56,8 +56,7 @@ libABRTdUtils_la_SOURCES = \ + $(HEADER_DIR)/abrt_xmlrpc.h abrt_xmlrpc.cpp \ + abrt_rh_support.h abrt_rh_support.cpp \ + abrt_curl.h abrt_curl.cpp \ +- $(HEADER_DIR)/plugin.h Plugin.cpp \ +- Polkit.h Polkit.cpp ++ $(HEADER_DIR)/plugin.h Plugin.cpp + + libABRTdUtils_la_CPPFLAGS = \ + -Wall -Werror \ +Only in abrt-1.1.13/: po +diff -urp abrt-1.1.13/src/Daemon/PluginManager.cpp abrt-1.1.13_nopolkit/src/Daemon/PluginManager.cpp +--- abrt-1.1.13/src/Daemon/PluginManager.cpp 2010-07-19 17:44:32.000000000 +0200 ++++ abrt-1.1.13_nopolkit/src/Daemon/PluginManager.cpp 2010-08-10 15:20:18.288241242 +0200 +@@ -22,7 +22,9 @@ + #include "abrtlib.h" + #include "abrt_exception.h" + #include "comm_layer_inner.h" +-#include "Polkit.h" ++#ifdef PLUGIN_DYNAMIC_LOAD_UNLOAD ++ #include "Polkit.h" ++#endif + #include "PluginManager.h" + + using namespace std; +diff -urp abrt-1.1.13/src/Daemon/Settings.cpp abrt-1.1.13_nopolkit/src/Daemon/Settings.cpp +--- abrt-1.1.13/src/Daemon/Settings.cpp 2010-07-22 14:07:45.000000000 +0200 ++++ abrt-1.1.13_nopolkit/src/Daemon/Settings.cpp 2010-08-10 15:20:18.293241459 +0200 +@@ -19,7 +19,10 @@ + #include "Settings.h" + #include "abrtlib.h" + #include "abrt_types.h" +-#include "Polkit.h" ++ ++#if 0 ++ #include "Polkit.h" ++#endif + + #define SECTION_COMMON "Common" + #define SECTION_ANALYZER_ACTIONS_AND_REPORTERS "AnalyzerActionsAndReporters" +@@ -525,10 +528,10 @@ map_abrt_settings_t GetSettings() + + return ABRTSettings; + } +- + /* dbus call to change some .conf file data */ + void SetSettings(const map_abrt_settings_t& pSettings, const char *dbus_sender) + { ++#if 0 + int polkit_result; + + polkit_result = polkit_check_authorization(dbus_sender, +@@ -539,7 +542,7 @@ void SetSettings(const map_abrt_settings + return; + } + log("user %s succesfully authorized", dbus_sender); +- ++#endif + map_abrt_settings_t::const_iterator it = pSettings.find(SECTION_COMMON); + map_abrt_settings_t::const_iterator end = pSettings.end(); + if (it != end) diff --git a/sources b/sources index e01e196..f654f69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c7901207e7e917ef376880a9c9f9dfff abrt-1.1.10.tar.gz +9ec49694174ae692ac4d42475649425b abrt-1.1.13.tar.gz