From 0e7799da6a4faf8d7875890cc464e618c200d779 Mon Sep 17 00:00:00 2001 From: Jiri Moskovcak Date: Aug 12 2010 13:10:09 +0000 Subject: Merge branch 'f13' into f12 Conflicts: .gitignore abrt.spec sources --- diff --git a/.gitignore b/.gitignore index 36dd2d7..00576df 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ abrt-1.1.1.tar.gz +abrt-1.1.10.tar.gz +abrt-1.1.13.tar.gz diff --git a/abrt.init b/abrt.init index 0701fe2..dde5950 100644 --- a/abrt.init +++ b/abrt.init @@ -104,7 +104,7 @@ condrestart) fi ;; status) - status abrt + status abrtd RETVAL=$? ;; *) diff --git a/abrt.spec b/abrt.spec index 41d6fba..109ca6f 100644 --- a/abrt.spec +++ b/abrt.spec @@ -1,17 +1,36 @@ %{!?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" +# +# % 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.1.1 -Release: 2%{?dist} +Version: 1.1.13 +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 Patch0: abrt-1.0.9-hideprefs.patch -Patch1: blacklist_mono.patch +Patch1: abrt_disable_gpgcheck.diff +Patch2: blacklist.patch +Patch3: polkit.patch BuildRequires: dbus-devel BuildRequires: gtk2-devel BuildRequires: curl-devel @@ -25,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 @@ -138,36 +161,24 @@ 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 +%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-rhticket +%description plugin-rhtsupport Plugin to report bugs into RH support system. -%package plugin-catcut -Summary: %{name}'s catcut plugin +%package plugin-reportuploader +Summary: %{name}'s reportuploader plugin Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} +Obsoletes: abrt-plugin-ticketuploader -%description plugin-catcut -Plugin to report bugs into the catcut. - -%package plugin-ticketuploader -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 @@ -225,13 +236,18 @@ Virtual package to make easy default installation on desktop environments. %prep %setup -q -%patch0 -p1 -b ~hideprefs -%patch1 -p1 -b .blacklist_mono +%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 +%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 @@ -245,9 +261,12 @@ 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} +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 \ @@ -268,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 @@ -279,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 @@ -297,18 +341,32 @@ 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 %{_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 +# /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 @@ -330,7 +388,10 @@ fi %files devel %defattr(-,root,root,-) +%{_includedir}/* %{_libdir}/lib*.so +%{_libdir}/pkgconfig/* +%doc doc/abrt-plugin doc/howto-write-reporter %files gui %defattr(-,root,root,-) @@ -361,21 +422,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 @@ -393,36 +454,22 @@ 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-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.glade +#%{_mandir}/man7/%{name}-RHTSupport.7.gz -%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.glade +%{_mandir}/man7/%{name}-ReportUploader.7.gz %files plugin-filetransfer %defattr(-,root,root,-) @@ -433,7 +480,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 @@ -449,10 +495,127 @@ 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) +- blacklist /usr/bin/nspluginviewer +- minor build fixes +- 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) +- 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) +- added reporting wizard +- fixed few leaked fds +- fixed kerneloops --- cut here --- problem +- updated translations +- More fixes for /var/cache/abrt -> /var/spool/abrt conversion +- fixed spec file to create /var/spool/abrt rhbz#593670 +- updated init script to reflect the pid file renaming +- 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) + * Mon Jul 19 2010 Jiri Moskovcak 1.1.1-2 -- blacklisted mono-core +- blacklisted mono -* Wed May 28 2010 Jiri Moskovcak 1.1.1-1 +* 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) @@ -461,8 +624,9 @@ fi - 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 +- 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) @@ -477,13 +641,15 @@ fi - 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 +* Fri Apr 30 2010 Karel Klic 1.0.9-3 - fixed crash function detection (a part of duplication detection) -* Thu Apr 15 2010 Jiri Moskovcak 1.0.9-1 +* 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) - trivial: fix 566806 "abrt-gui sometimes can't be closed" (vda.linux@googlemail.com) @@ -491,6 +657,8 @@ fi - 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) diff --git a/abrt_disable_gpgcheck.diff b/abrt_disable_gpgcheck.diff new file mode 100644 index 0000000..26e00fc --- /dev/null +++ b/abrt_disable_gpgcheck.diff @@ -0,0 +1,11 @@ +--- 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 + # diff --git a/blacklist.patch b/blacklist.patch new file mode 100644 index 0000000..cccc80b --- /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, /usr/lib/xulrunner-*/plugin-container + + # 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? + # 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 d7e0297..f654f69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3a358fa88e1746b5f755b1e1fb2f15c6 abrt-1.1.1.tar.gz +9ec49694174ae692ac4d42475649425b abrt-1.1.13.tar.gz