diff --git a/.gitignore b/.gitignore index 0cd6ac5..d41aa06 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ abrt-1.1.10.tar.gz abrt-1.1.13.tar.gz /abrt-1.1.14.tar.gz +/abrt-1.1.17.tar.gz diff --git a/abrt-1.1.14-rpm-digestalgo.patch b/abrt-1.1.14-rpm-digestalgo.patch deleted file mode 100644 index d8560ff..0000000 --- a/abrt-1.1.14-rpm-digestalgo.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up abrt-1.1.14/src/Daemon/RPM.cpp.rpm49-hashalgo abrt-1.1.14/src/Daemon/RPM.cpp ---- abrt-1.1.14/src/Daemon/RPM.cpp.rpm49-hashalgo 2010-11-15 14:46:06.000000000 +0200 -+++ abrt-1.1.14/src/Daemon/RPM.cpp 2011-01-18 10:57:57.000000000 +0200 -@@ -112,7 +112,6 @@ bool CheckHash(const char* pPackage, con - if (header != NULL) - { - rpmfi fi = rpmfiNew(ts, header, RPMTAG_BASENAMES, RPMFI_NOHEADER); -- pgpHashAlgo hashAlgo; - std::string headerHash; - char computedHash[1024] = ""; - -@@ -120,8 +119,8 @@ bool CheckHash(const char* pPackage, con - { - if (strcmp(pPath, rpmfiFN(fi)) == 0) - { -- headerHash = rpmfiFDigestHex(fi, &hashAlgo); -- rpmDoDigest(hashAlgo, pPath, 1, (unsigned char*) computedHash, NULL); -+ headerHash = rpmfiFDigestHex(fi, NULL); -+ rpmDoDigest(rpmfiDigestAlgo(fi), pPath, 1, (unsigned char*) computedHash, NULL); - ret = (headerHash != "" && headerHash == computedHash); - break; - } diff --git a/abrt.spec b/abrt.spec index 59a5032..ac75762 100644 --- a/abrt.spec +++ b/abrt.spec @@ -15,12 +15,12 @@ %if "0%{?_buildid}" != "0" %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.1.14 +Version: 1.1.17 Release: %{?pkg_release} License: GPLv2+ Group: Applications/System @@ -30,8 +30,6 @@ Source1: abrt.init Patch0: abrt-1.0.9-hideprefs.patch Patch1: abrt_disable_gpgcheck.diff Patch2: blacklist.patch -Patch4: libnotify_07.patch -Patch5: abrt-1.1.14-rpm-digestalgo.patch BuildRequires: dbus-devel BuildRequires: gtk2-devel BuildRequires: curl-devel @@ -241,8 +239,6 @@ Virtual package to make easy default installation on desktop environments. %patch1 -p1 -b .disable_gpg_check # general patches %patch2 -p1 -b .blacklist_mono -%patch4 -p1 -b .libnotify07 -%patch5 -p1 -b .rpm49 %build %configure @@ -283,8 +279,10 @@ desktop-file-install \ rm -rf $RPM_BUILD_ROOT %pre -getent group abrt >/dev/null || groupadd -f --system abrt -getent passwd abrt >/dev/null || useradd --system -g abrt -d /etc/abrt -s /sbin/nologin abrt +#uidgid pair 173:173 reserved in setup rhbz#670231 +%define abrt_gid_uid 173 +getent group abrt >/dev/null || groupadd -f -g %{abrt_gid_uid} --system abrt +getent passwd abrt >/dev/null || useradd --system -g abrt -u %{abrt_gid_uid} -d /etc/abrt -s /sbin/nologin abrt exit 0 %post @@ -360,7 +358,6 @@ fi %{_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 @@ -373,7 +370,6 @@ fi %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/plugins %dir %{_libdir}/%{name} -%{_mandir}/man1/%{name}-backtrace.1.gz %{_mandir}/man8/abrtd.8.gz %{_mandir}/man5/%{name}.conf.5.gz #%{_mandir}/man5/pyhook.conf.5.gz @@ -497,6 +493,37 @@ fi %defattr(-,root,root,-) %changelog +* Sat Feb 05 2011 Jiri Moskovcak 1.1.17-1 +- rewritten abrt-debuginfo-install script to use the yum API +- GUI: added search box to backtrace view rhbz#612017 (jmoskovc@redhat.com) +- fixed some gui warnings rhbz#671488 (jmoskovc@redhat.com) +- btparser/dupechecker improvements: + - Better handling of glibc architecture-specific functions (kklic@redhat.com) + - support format of thread header: "Thread 8 (LWP 6357):" (kklic@redhat.com) + +* Fri Feb 04 2011 Jiri Moskovcak 1.1.16-1 +- rhtsupport: added list of attachments to comment rhbz#668875 +- rhtsupport: stop consuming non-standard header rhbz#670492 +- Resolves: #670492, #668875 + +* Wed Jan 19 2011 Jiri Moskovcak 1.1.15-2 +- add a gui/uid to useradd/groupadd command (reserved in setup rhbz#670231) +- Resolves: #650975 + +* Wed Jan 19 2011 Jiri Moskovcak 1.1.15-1 +- removed unused files (jmoskovc@redhat.com) +- update po files (jmoskovc@redhat.com) +- removed some unused files (jmoskovc@redhat.com) +- pass old pattern to ccpp hook and use it (dvlasenk@redhat.com) +- GUI: added warning when gnome-keyring can't be accessed rhbz#576866 (jmoskovc@redhat.com) +- 666893 - Unable to make sense of XML-RPC response from server (npajkovs@redhat.com) +- PyHook: ignore SystemExit exception rhbz#636913 (jmoskovc@redhat.com) +- 665405 - ABRT's usage of sos does not grab /var/log/messages (npajkovs@redhat.com) +- add a note in report if kernel is tainted (npajkovs@redhat.com) +- KerneloopsScanner.cpp: make a room for NULL byte (npajkovs@redhat.com) +- fix multicharacter warring (npajkovs@redhat.com) +- open help page instead of about rhbz#666267 + * Wed Jan 19 2011 Jiri Moskovcak 1.1.14-3 - fixed build with rpm 4.9 (thx panu pmatilai for the patch) @@ -514,11 +541,10 @@ fi - make the bt viewer not-editable rhbz#621871 - removed unneeded patches - * Wed Nov 10 2010 Jiri Moskovcak 1.1.13-3 - Rebuild for libnotify-0.7 -* Wed Aug 25 2010 Jochen Schmitt 1.1.13-2%{?dist} +* Wed Aug 25 2010 Jochen Schmitt 1.1.13-2 - Rebuild for python-2.7 * Tue Aug 10 2010 Jiri Moskovcak 1.1.13-1 diff --git a/libnotify_07.patch b/libnotify_07.patch deleted file mode 100644 index 9c1ff04..0000000 --- a/libnotify_07.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- abrt-1.1.13/src/Applet/CCApplet.cpp 2010-08-02 15:12:39.000000000 +0200 -+++ abrt-1.1.13_/src/Applet/CCApplet.cpp 2010-11-10 19:02:04.131162987 +0100 -@@ -36,7 +36,7 @@ - static NotifyNotification *new_warn_notification() - { - NotifyNotification *notification; -- notification = notify_notification_new(_("Warning"), NULL, NULL, NULL); -+ notification = notify_notification_new(_("Warning"), NULL, NULL); - g_signal_connect(notification, "closed", G_CALLBACK(on_notify_close), NULL); - - GdkPixbuf *pixbuf = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), diff --git a/polkit.patch b/polkit.patch deleted file mode 100644 index ebabe4a..0000000 --- a/polkit.patch +++ /dev/null @@ -1,104 +0,0 @@ -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 b358154..3ac8690 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4bde3133efe28e929ce3dd24ee682955 abrt-1.1.14.tar.gz +71e8ff8bc5616a44ac38d07365b68452 abrt-1.1.17.tar.gz