From b87d8aa73d7917feb4b778497850666e95e801df Mon Sep 17 00:00:00 2001 From: Jiri Moskovcak Date: Aug 10 2010 14:03:04 +0000 Subject: new version 1.1.13 --- 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