Merge branch 'f13' into f12

Conflicts:
	.gitignore
	abrt.spec
	sources

.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -1,89 +1,3 @@
+abrt-1.1.1.tar.gz
 abrt-1.1.10.tar.gz
 abrt-1.1.13.tar.gz
-/abrt-1.1.14.tar.gz
-/abrt-1.1.17.tar.gz
-/abrt-2.0.0.tar.gz
-/abrt-2.0.1.tar.gz
-/abrt-2.0.2.tar.gz
-/abrt-2.0.3.tar.gz
-/abrt-2.0.4.tar.gz
-/abrt-2.0.6.tar.gz
-/abrt-2.0.7.tar.gz
-/abrt-2.0.9.tar.gz
-/abrt-2.0.10.tar.gz
-/abrt-2.0.11.tar.gz
-/abrt-2.0.12.tar.gz
-/abrt-2.0.13.tar.gz
-/abrt-2.0.14.tar.gz
-/abrt-2.0.15.tar.gz
-/abrt-2.0.16.tar.gz
-/abrt-2.0.17.tar.gz
-/abrt-2.0.18.tar.gz
-/abrt-2.0.19.tar.gz
-/abrt-2.0.20.tar.gz
-/abrt-2.1.0.tar.gz
-/abrt-2.1.1.tar.gz
-/abrt-2.1.2.tar.gz
-/abrt-2.1.3.tar.gz
-/abrt-2.1.4.tar.gz
-/abrt-2.1.5.tar.gz
-/abrt-2.1.6.tar.gz
-/abrt-2.1.7.tar.gz
-/abrt-2.1.8.tar.gz
-/abrt-2.1.9.tar.gz
-/abrt-2.1.10.tar.gz
-/abrt-2.1.11.tar.gz
-/abrt-2.1.12.tar.gz
-/abrt-2.2.0.tar.gz
-/abrt-2.2.1.tar.gz
-/abrt-2.2.2.tar.gz
-/abrt-2.3.0.tar.gz
-/abrt-2.4.0.tar.gz
-/abrt-2.5.0.tar.gz
-/abrt-2.5.1.tar.gz
-/abrt-2.6.0.tar.gz
-/abrt-2.6.1.tar.gz
-/abrt-2.6.2.tar.gz
-/abrt-2.7.0.tar.gz
-/abrt-2.7.1.tar.gz
-/abrt-2.7.2.tar.gz
-/abrt-2.8.0.tar.gz
-/abrt-2.8.1.tar.gz
-/abrt-2.8.2.tar.gz
-/abrt-2.9.0.tar.gz
-/abrt-2.10.0.tar.gz
-/abrt-2.10.1.tar.gz
-/abrt-2.10.2.tar.gz
-/abrt-2.10.3.tar.gz
-/abrt-2.10.4.tar.gz
-/abrt-2.10.5.tar.gz
-/abrt-2.10.6.tar.gz
-/abrt-2.10.7.tar.gz
-/abrt-2.10.8.tar.gz
-/abrt-2.10.9.tar.gz
-/abrt-2.10.10.tar.gz
-/abrt-2.11.0.tar.gz
-/abrt-2.11.1.tar.gz
-/abrt-2.12.0.tar.gz
-/abrt-2.12.1.tar.gz
-/abrt-2.12.2.tar.gz
-/abrt-2.13.0.tar.gz
-/abrt-2.14.0.tar.gz
-/abrt-2.14.1.tar.gz
-/abrt-2.14.2.tar.gz
-/abrt-2.14.3.tar.gz
-/abrt-2.14.4.tar.gz
-/abrt-2.14.5.tar.gz
-/abrt-2.14.6.tar.gz
-/abrt-2.15.0.tar.gz
-/abrt-2.15.1.tar.gz
-/abrt-2.16.0.tar.gz
-/abrt-2.16.1.tar.gz
-/abrt-2.17.0.tar.gz
-/abrt-2.17.1.tar.gz
-/abrt-2.17.2.tar.gz
-/abrt-2.17.4.tar.gz
-/abrt-2.17.5.tar.gz
-/abrt-2.17.6.tar.gz
-/abrt-2.17.7.tar.gz
-/abrt-2.17.8.tar.gz

abrt-1.0.9-crash-function-detect.patch

@@ -0,0 +1,28 @@
+commit f05c9b25335c84c7b5861fce80fd941ec81212f3
+Author: Karel Klic <kklic@redhat.com>
+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);

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 @@
+                     <child>
+                       <widget class="GtkImageMenuItem" id="miPreferences">
+                         <property name="label">gtk-preferences</property>
+-                        <property name="visible">True</property>
++                        <property name="visible">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_stock">True</property>
+                         <property name="always_show_image">True</property>

abrt.init

@@ -0,0 +1,115 @@
+#!/bin/bash
+# Starts the abrt daemon
+#
+# chkconfig: 35 82 16
+# description: Daemon to detect crashing apps
+# processname: abrtd
+### BEGIN INIT INFO
+# Provides: abrt
+# Required-Start: $syslog $local_fs
+# Required-Stop: $syslog $local_fs
+# Default-Stop: 0 1 2 6
+# Default-Start: 3 5
+# Short-Description: start and stop abrt daemon
+# 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
+
+	# Check if abrt is executable
+	test -x $ABRT_BIN || exit 5
+}
+
+start() {
+
+	check
+
+	# Check if it is already running
+	if [ ! -f $LOCK ] && [ ! -f $OLD_LOCK ]; then
+		echo -n $"Starting abrt daemon: "
+		daemon $ABRT_BIN
+		RETVAL=$?
+		[ $RETVAL -eq 0 ] && touch $LOCK
+		echo
+	fi
+	return $RETVAL
+}
+
+stop() {
+
+	check
+
+	echo -n $"Stopping abrt daemon: "
+	killproc $ABRT_BIN
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && rm -f $LOCK
+	[ $RETVAL -eq 0 ] && rm -f $OLD_LOCK
+	echo
+	return $RETVAL
+}
+
+
+restart() {
+	stop
+	start
+}
+
+reload() {
+	restart
+}
+
+case "$1" in
+start)
+	start
+	;;
+stop)
+	stop
+	;;
+reload)
+	reload
+	;;
+force-reload)
+	echo "$0: Unimplemented feature."
+	RETVAL=3
+	;;
+restart)
+	restart
+	;;
+condrestart)
+	if [ -f $LOCK ]; then
+		restart
+	fi
+	# update from older version
+	if [ -f $OLD_LOCK ]; then
+		restart
+	fi
+	;;
+status)
+	status abrtd
+	RETVAL=$?
+	;;
+*)
+	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}"
+	RETVAL=2
+esac
+
+exit $RETVAL

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
+ #

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?
+ #

blacklist_mono.patch

@@ -0,0 +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-07-19 21:07:14.228273198 +0200
+@@ -5,7 +5,7 @@
+ # in the file gpg_keys
+ OpenGPGCheck = yes
+ # Blacklisted packages
+-BlackList = nspluginwrapper, valgrind, strace
++BlackList = nspluginwrapper, valgrind, strace, mono-core
+ # Process crashes in executables which do not belong to any package?
+ ProcessUnpackaged = no
+ # Blacklisted executable paths (shell patterns)

gating.yaml

@@ -1,15 +0,0 @@
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_testing
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
-
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}

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)

sources

@@ -1 +1 @@
-SHA512 (abrt-2.17.8.tar.gz) = 90b74229412e0186bfa109ee940a60c9f3c0f7ce8c1216acad6f05619a1bb591e7f0bae87363143a05034312c9f14fe5ace341b84f680780ceb93a1e624705b3
+9ec49694174ae692ac4d42475649425b  abrt-1.1.13.tar.gz

tests/smoke.fmf

@@ -1,10 +0,0 @@
-summary: Basic smoke test for abrt
-prepare:
-    how: install
-    # Do not attempt to install conflicting subpackages.
-    exclude:
-        - abrt-atomic
-        - abrt-java-connector-container
-        - python3-abrt-container-addon
-execute:
-    script: abrt-action-notify --help