diff --git a/.cvsignore b/.cvsignore index 60f2cee..36dd2d7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abrt-1.1.0.tar.gz +abrt-1.1.1.tar.gz diff --git a/abrt-1.0.8-debuginfoinstall-latest-yum.patch b/abrt-1.0.8-debuginfoinstall-latest-yum.patch deleted file mode 100644 index c68620e..0000000 --- a/abrt-1.0.8-debuginfoinstall-latest-yum.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 87cc9488bd08a5f17318ddd70cbfcdb4182f8b16 -Author: Jiri Moskovcak -Date: Thu Mar 11 23:50:47 2010 +0100 - - minor fix in abrt-debuginfo-install to make it work with yum >= 3.2.26 - - - yum repolist has different output, so it needs to bu run - with additional parameter 'all' - -diff --git a/src/Daemon/abrt-debuginfo-install b/src/Daemon/abrt-debuginfo-install -index 0d9401b..521d42a 100755 ---- a/src/Daemon/abrt-debuginfo-install -+++ b/src/Daemon/abrt-debuginfo-install -@@ -303,7 +303,7 @@ $debug && echo "build_ids:$build_ids" - # When we look for debuginfo we need only -debuginfo* repos, we can disable the rest - # and thus make it faster. - yum_repo_opts="'--disablerepo=*'" --for enabled_repo in `yum repolist | grep 'enabled:' | cut -f1 -d' ' | grep -v -- '-debuginfo'`; do -+for enabled_repo in `yum repolist all | grep 'enabled:' | cut -f1 -d' ' | grep -v -- '-debuginfo'`; do - yum_repo_opts="$yum_repo_opts '--enablerepo=${enabled_repo}-debuginfo*'" - done - diff --git a/abrt-1.0.8-oops.patch b/abrt-1.0.8-oops.patch deleted file mode 100644 index e038d0a..0000000 --- a/abrt-1.0.8-oops.patch +++ /dev/null @@ -1,29 +0,0 @@ -commit cbec527eea140de7c2001c08c321f6afeff2a5e1 -Author: Denys Vlasenko -Date: Wed Mar 3 14:03:00 2010 +0100 - - fix bz#570081 (self.is_oops is not defined) - - Signed-off-by: Denys Vlasenko - -diff --git a/src/Gui/CCReporterDialog.py b/src/Gui/CCReporterDialog.py -index bc4a1e0..989f7cb 100644 ---- a/src/Gui/CCReporterDialog.py -+++ b/src/Gui/CCReporterDialog.py -@@ -214,6 +214,7 @@ class ReporterDialog(): - self.editable = [] - self.old_comment = COMMENT_HINT_TEXT - self.old_how_to_reproduce = HOW_TO_HINT_TEXT -+ self.is_oops = False - for item in self.report: - try: - log2("report[%s]:%s/%s/%s", item, self.report[item][0], self.report[item][1], self.report[item][2][0:20]) -@@ -306,7 +307,7 @@ class ReporterDialog(): - text = buff.get_text(buff.get_start_iter(), buff.get_end_iter()) - if self.old_how_to_reproduce != text: - self.report[FILENAME_REPRODUCE] = [CD_TXT, 'y', text] -- #handle backtrace -+ # handle backtrace - tev_backtrace = self.builder.get_object("tvBacktrace") - buff = tev_backtrace.get_buffer() - text = buff.get_text(buff.get_start_iter(), buff.get_end_iter()) diff --git a/abrt-1.0.8-use-only-enabledrepos.patch b/abrt-1.0.8-use-only-enabledrepos.patch deleted file mode 100644 index 3497fe9..0000000 --- a/abrt-1.0.8-use-only-enabledrepos.patch +++ /dev/null @@ -1,60 +0,0 @@ -commit 4432b7407e6afbbb5e91ad24455556d0e679a4f9 -Author: Denys Vlasenko -Date: Thu Mar 4 20:37:10 2010 +0100 - - abrt-debuginfo-install: use -debuginfo repos which match enabled "usual" repos - - Signed-off-by: Denys Vlasenko - -diff --git a/src/Daemon/abrt-debuginfo-install b/src/Daemon/abrt-debuginfo-install -index 1b6af74..0d9401b 100755 ---- a/src/Daemon/abrt-debuginfo-install -+++ b/src/Daemon/abrt-debuginfo-install -@@ -145,14 +145,12 @@ print_package_names() { - else - echo "`count_words $missing_debuginfo_files` missing debuginfos, getting package list from repositories" >&2 - fi -- # when we look for debuginfo we need only -debuginfo* repos, so we can disable the rest and thus make it faster -- # also we want only fedora repositories, because abrt won't work for other packages anyway - # --showduplicates: do not just show the latest package - # (tried to use -R2 to abort on stuck yum lock but -R is not about that) -- local cmd="yum $yumopts '--disablerepo=*' '--enablerepo=fedora-debuginfo*' '--enablerepo=updates-debuginfo*' --showduplicates --quiet provides $missing_debuginfo_files" -+ local cmd="yum $yumopts $yum_repo_opts --showduplicates --quiet provides $missing_debuginfo_files" - echo "$cmd" >"yum_provides.$1.OUT" - $debug && echo "Running: $cmd" >&2 -- # eval is needed to strip away ''s; cant remove them above and just use -+ # eval is needed to strip away ''s in $yum_repo_opts; cant remove them and just use - # unquoted $cmd, that would perform globbing on '*' - local yum_provides_OUT="`eval $cmd 2>&1`" - local err=$? -@@ -199,9 +197,10 @@ download_packages() { - for pkg in $packages; do - echo "Download $i/$num_packages: $pkg" - echo "Download $i/$num_packages: $pkg" >>yumdownloader.OUT -- # We can't handle packages from non Fedora repos, so we look and download only -- # from Fedora repos which makes it faster -- yumdownloader --disablerepo="*" --enablerepo="fedora-debuginfo*" --enablerepo="updates-debuginfo*" --quiet $pkg >>yumdownloader.OUT 2>&1 -+ cmd="yumdownloader $yum_repo_opts --quiet $pkg" -+ $debug && echo "Running: $cmd" >&2 -+ # eval is needed to strip away ''s in $yum_repo_opts -+ eval $cmd >>yumdownloader.OUT 2>&1 - err=$? - echo "exitcode:$err" >>yumdownloader.OUT - echo >>yumdownloader.OUT -@@ -299,6 +298,16 @@ build_ids=`printf "%s\n" "$eu_unstrip_OUT" \ - done | sort | uniq | xargs` - $debug && echo "build_ids:$build_ids" - -+ -+# Prepare list of repos to use. -+# When we look for debuginfo we need only -debuginfo* repos, we can disable the rest -+# and thus make it faster. -+yum_repo_opts="'--disablerepo=*'" -+for enabled_repo in `yum repolist | grep 'enabled:' | cut -f1 -d' ' | grep -v -- '-debuginfo'`; do -+ yum_repo_opts="$yum_repo_opts '--enablerepo=${enabled_repo}-debuginfo*'" -+done -+ -+ - # We try to not run yum without -C unless absolutely necessary. - # Therefore we loop. yum is run by print_package_names function, - # on first iteration it is run with -C, on second - without, diff --git a/abrt-1.0.9-better-bz-summary.patch b/abrt-1.0.9-better-bz-summary.patch deleted file mode 100644 index 6d3f0c3..0000000 --- a/abrt-1.0.9-better-bz-summary.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit fcde1a65a0a283ed785cafa8a44ae219e1a79912 -Author: Nikola Pajkovsky -Date: Wed Apr 7 17:47:32 2010 +0200 - - add function name into summary(if it's found) - - Signed-off-by: Nikola Pajkovsky - -diff --git a/lib/Plugins/Bugzilla.cpp b/lib/Plugins/Bugzilla.cpp -index e59e9a7..bffccc1 100644 ---- a/lib/Plugins/Bugzilla.cpp -+++ b/lib/Plugins/Bugzilla.cpp -@@ -352,8 +352,15 @@ xmlrpc_int32 ctx::new_bug(const map_crash_data_t& pCrashData) - const std::string& arch = get_crash_data_item_content(pCrashData, FILENAME_ARCHITECTURE); - const std::string& duphash = get_crash_data_item_content(pCrashData, CD_DUPHASH); - const char *reason = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_REASON); -+ const char *function = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_CRASH_FUNCTION); - - std::string summary = "[abrt] crash in " + package; -+ if (function != NULL && strlen(function) < 30) -+ { -+ summary += ": "; -+ summary += function; -+ } -+ - if (reason != NULL) - { - summary += ": "; diff --git a/abrt-1.0.9-crash-function-detect.patch b/abrt-1.0.9-crash-function-detect.patch deleted file mode 100644 index 0b5667a..0000000 --- a/abrt-1.0.9-crash-function-detect.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit f05c9b25335c84c7b5861fce80fd941ec81212f3 -Author: Karel Klic -Date: Thu Apr 15 12:12:59 2010 +0200 - - Crash function is now detected even for threads without an abort frame. - -diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp -index 9bdcda9..cf25c73 100644 ---- a/lib/Plugins/CCpp.cpp -+++ b/lib/Plugins/CCpp.cpp -@@ -761,13 +761,12 @@ void CAnalyzerCCpp::CreateReport(const char *pDebugDumpDir, int force) - /* Get the function name from the crash frame. */ - if (crash_thread) - { -+ struct frame *crash_frame = crash_thread->frames; - struct frame *abort_frame = thread_find_abort_frame(crash_thread); - if (abort_frame) -- { -- struct frame *crash_frame = abort_frame->next; -- if (crash_frame && crash_frame->function && 0 != strcmp(crash_frame->function, "??")) -- dd.SaveText(FILENAME_CRASH_FUNCTION, crash_frame->function); -- } -+ crash_frame = abort_frame->next; -+ if (crash_frame && crash_frame->function && 0 != strcmp(crash_frame->function, "??")) -+ dd.SaveText(FILENAME_CRASH_FUNCTION, crash_frame->function); - } - - backtrace_free(backtrace); diff --git a/abrt-1.0.9-ignore_user_scripts.patch b/abrt-1.0.9-ignore_user_scripts.patch deleted file mode 100644 index fe3783a..0000000 --- a/abrt-1.0.9-ignore_user_scripts.patch +++ /dev/null @@ -1,126 +0,0 @@ -commit a6daecbb32cf5fb0f71bdc14dddd35e7422dd4bb -Author: Karel Klic -Date: Tue Apr 13 14:57:20 2010 +0200 - - do not catch perl/python crashes when the script is not of known package origin - -diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp -index a0ead47..5c9ecb7 100644 ---- a/src/Daemon/MiddleWare.cpp -+++ b/src/Daemon/MiddleWare.cpp -@@ -594,43 +594,51 @@ void LoadOpenGPGPublicKey(const char* key) - } - - /** -- * Get a package name from executable name and save -- * package description to particular debugdump directory of a crash. -- * @param pExecutable A name of crashed application. -- * @param pDebugDumpDir A debugdump dir containing all necessary data. -- * @return It return results of operation. See mw_result_t. -+ * Returns the first full path argument in the command line or NULL. -+ * Skips options are in form "-XXX". -+ * Caller must delete the returned string using free(). - */ - static char *get_argv1_if_full_path(const char* cmdline) - { -- char *argv1 = (char*) strchr(cmdline, ' '); -+ const char *argv1 = strpbrk(cmdline, " \t"); - while (argv1 != NULL) - { - /* we found space in cmdline, so it might contain - * path to some script like: - * /usr/bin/python [-XXX] /usr/bin/system-control-network - */ -- argv1++; -- if (*argv1 == '-') -+ argv1++; /* skip the space */ -+ if (*argv1 == '-') /* skip arguments */ - { - /* looks like -XXX in "perl -XXX /usr/bin/script.pl", skip */ -- argv1 = strchr(argv1, ' '); -+ argv1 = strpbrk(argv1, " \t"); - continue; - } -- /* if the string following the space doesn't start -- * with '/' it's probably not a full path to script -- * and we can't use it to determine the package name -- */ -- if (*argv1 != '/') -+ else if (*argv1 == ' ' || *argv1 == '\t') /* skip multiple spaces */ -+ continue; -+ else if (*argv1 != '/') - { -- return NULL; -+ /* if the string following the space doesn't start -+ * with '/' it's probably not a full path to script -+ * and we can't use it to determine the package name -+ */ -+ break; - } -+ -+ /* cut the rest of cmdline arguments */ - int len = strchrnul(argv1, ' ') - argv1; -- /* cut the cmdline arguments */ -- argv1 = xstrndup(argv1, len); -- break; -+ return xstrndup(argv1, len); - } -- return argv1; -+ return NULL; - } -+ -+/** -+ * Get a package name from executable name and save -+ * package description to particular debugdump directory of a crash. -+ * @param pExecutable A name of crashed application. -+ * @param pDebugDumpDir A debugdump dir containing all necessary data. -+ * @return It return results of operation. See mw_result_t. -+ */ - static mw_result_t SavePackageDescriptionToDebugDump( - const char *pExecutable, - const char *cmdline, -@@ -692,6 +700,7 @@ static mw_result_t SavePackageDescriptionToDebugDump( - * This will work only if the cmdline contains the whole path. - * Example: python /usr/bin/system-control-network - */ -+ bool knownOrigin = false; - char *script_name = get_argv1_if_full_path(cmdline); - if (script_name) - { -@@ -707,9 +716,16 @@ static mw_result_t SavePackageDescriptionToDebugDump( - rpm_pkg = script_pkg; - scriptName = script_name; - pExecutable = scriptName.c_str(); -+ knownOrigin = true; - } - free(script_name); - } -+ -+ if (!knownOrigin && !g_settings_bProcessUnpackaged) -+ { -+ log("Interpreter crashed, but no packaged script detected: '%s'", cmdline); -+ return MW_PACKAGE_ERROR; -+ } - } - - package = rpm_pkg; -@@ -717,7 +733,7 @@ static mw_result_t SavePackageDescriptionToDebugDump( - VERB2 log("Package:'%s' short:'%s'", rpm_pkg, packageName.c_str()); - free(rpm_pkg); - -- if (g_setBlackList.find(packageName) != g_setBlackList.end()) -+ if (g_setBlackList.find(packageName) != g_setBlackList.end()) - { - log("Blacklisted package '%s'", packageName.c_str()); - return MW_BLACKLISTED; -@@ -838,8 +854,8 @@ static void RunAnalyzerActions(const char *pAnalyzer, const char *pDebugDumpDir, - if (!action) - { - /* GetAction() already complained if no such plugin. -- * If plugin exists but isn't an Action, it's not an error. -- */ -+ * If plugin exists but isn't an Action, it's not an error. -+ */ - continue; - } - try diff --git a/abrt-localizedyum.patch b/abrt-localizedyum.patch deleted file mode 100644 index 4567a55..0000000 --- a/abrt-localizedyum.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 306a4686200c33e34c0650b6ad09b1a5a3f32a77 -Author: Jiri Moskovcak -Date: Tue Apr 13 16:51:30 2010 +0200 - - fixed problem with localized yum output rhbz#581804 - -diff --git a/src/Daemon/abrt-debuginfo-install b/src/Daemon/abrt-debuginfo-install -index 521d42a..84d2446 100755 ---- a/src/Daemon/abrt-debuginfo-install -+++ b/src/Daemon/abrt-debuginfo-install -@@ -303,7 +303,7 @@ $debug && echo "build_ids:$build_ids" - # When we look for debuginfo we need only -debuginfo* repos, we can disable the rest - # and thus make it faster. - yum_repo_opts="'--disablerepo=*'" --for enabled_repo in `yum repolist all | grep 'enabled:' | cut -f1 -d' ' | grep -v -- '-debuginfo'`; do -+for enabled_repo in `LANG=C yum repolist all | grep 'enabled:' | cut -f1 -d' ' | grep -v -- '-debuginfo'`; do - yum_repo_opts="$yum_repo_opts '--enablerepo=${enabled_repo}-debuginfo*'" - done - diff --git a/abrt.spec b/abrt.spec index 53c5f85..997a726 100644 --- a/abrt.spec +++ b/abrt.spec @@ -16,7 +16,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 1.1.0 +Version: 1.1.1 Release: %{?pkg_release} License: GPLv2+ Group: Applications/System @@ -194,6 +194,8 @@ Plugin to uploading files to a server. Summary: %{name}'s addon for catching and analyzing Python exceptions Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} +Obsoletes: gnome-python2-bugbuddy +Provides: gnome-python2-bugbuddy %description addon-python This package contains python hook and python analyzer plugin for handling @@ -458,6 +460,19 @@ fi %defattr(-,root,root,-) %changelog +* Wed May 12 2010 Jiri Moskovcak 1.1.1-1 +- updated translations +- removed avant-window-navigator from blacklist (jmoskovc@redhat.com) +- Abort debuginfo download if low on disk space (partially addresses #564451) (vda.linux@googlemail.com) +- fix bug 588945 - sparse core files performance hit (vda.linux@googlemail.com) +- Add BlackListedPaths option to abrt.conf. Fixes #582421 (vda.linux@googlemail.com) +- Do not die when /var/cache/abrt/*/uid does not contain a number (rhbz#580899) (kklic@redhat.com) +- rid of rewriting config in /etc/abrt/abrt.conf (npajkovs@redhat.com) +- fix bug 571411: backtrace attachment of the form /var/cache/abrt/foo-12345-67890/backtrace (vda.linux@googlemail.com) +- Do not echo password to terminal in abrt-cli (kklic@redhat.com) +- obsolete gnome-python2-bugbuddy rhbz#579748 (jmoskovc@redhat.com) +- removed unused patches + * Mon May 03 2010 Jiri Moskovcak 1.1.0-1 - updated transaltions - added Hebrew into languages diff --git a/remove_R2.patch b/remove_R2.patch deleted file mode 100644 index baf415b..0000000 --- a/remove_R2.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 9d109b568bbbdee069bb5dfcbca3c259a74e98a8 -Author: Denys Vlasenko -Date: Wed Mar 3 11:45:33 2010 +0100 - - abrt-debuginfo-install: remove -R2 from yum! it's not "anti-yum-lock" option! - - Signed-off-by: Denys Vlasenko - -diff --git a/src/Daemon/abrt-debuginfo-install b/src/Daemon/abrt-debuginfo-install -index 3bb9c41..1b6af74 100755 ---- a/src/Daemon/abrt-debuginfo-install -+++ b/src/Daemon/abrt-debuginfo-install -@@ -146,11 +148,12 @@ print_package_names() { - # when we look for debuginfo we need only -debuginfo* repos, so we can disable the rest and thus make it faster - # also we want only fedora repositories, because abrt won't work for other packages anyway - # --showduplicates: do not just show the latest package -- # -R2: wait two minutes max (hopefully this prevents infinite hang on yum lock) -- local cmd="yum $yumopts '--disablerepo=*' '--enablerepo=fedora-debuginfo*' '--enablerepo=updates-debuginfo*' --showduplicates -R2 --quiet provides $missing_debuginfo_files" -+ # (tried to use -R2 to abort on stuck yum lock but -R is not about that) -+ local cmd="yum $yumopts '--disablerepo=*' '--enablerepo=fedora-debuginfo*' '--enablerepo=updates-debuginfo*' --showduplicates --quiet provides $missing_debuginfo_files" - echo "$cmd" >"yum_provides.$1.OUT" -+ $debug && echo "Running: $cmd" >&2 - # eval is needed to strip away ''s; cant remove them above and just use -- # $cmd, that would perform globbing on '*' -+ # unquoted $cmd, that would perform globbing on '*' - local yum_provides_OUT="`eval $cmd 2>&1`" - local err=$? - printf "%s\nyum exitcode:%s\n" "$yum_provides_OUT" $err >>"yum_provides.$1.OUT" diff --git a/sources b/sources index b3468b2..d7e0297 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0c35a564a6621ddead37a8db9d4af8e0 abrt-1.1.0.tar.gz +3a358fa88e1746b5f755b1e1fb2f15c6 abrt-1.1.1.tar.gz