New upstream release 2.1.10

Resolves: #909536

.gitignore

@@ -14,3 +14,21 @@ abrt-1.1.13.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.1-disable_autoreporting_dialog.patch

@@ -0,0 +1,30 @@
+diff -ur abrt-2.1.1/src/applet/applet.c abrt-2.1.1.new/src/applet/applet.c
+--- abrt-2.1.1/src/applet/applet.c	2013-02-01 17:05:40.000000000 +0100
++++ abrt-2.1.1.new/src/applet/applet.c	2013-03-05 12:16:42.463747490 +0100
+@@ -89,25 +89,7 @@
+ 
+ static void ask_start_autoreporting()
+ {
+-    /* The "Yes" response will be saved even if user don't check the
+-     * "Don't ask me again" box.
+-     */
+-    const int ret = run_ask_yes_no_save_result_dialog("AutoreportingEnabled",
+-     _("The report which will be sent does not contain any security sensitive data. "
+-       "Therefore it is not necessary to bother you next time and require any further action by you. "
+-       "\nDo you want to enable automatically submitted anonymous crash reports?"),
+-       /*parent wnd */ NULL);
+-
+-    /* Don't forget:
+-     *
+-     * The "Yes" response will be saved even if user don't check the
+-     * "Don't ask me again" box.
+-     */
+-    if (ret != 0)
+-        set_user_setting("AutoreportingEnabled", "yes");
+-
+-    /* must be called immediately, otherwise the data could be lost in case of crash */
+-    save_user_settings();
++    return;
+ }
+ 
+ static bool is_shortened_reporting_enabled()

abrt-2.1.10-gtk3_deprecated_API.patch

@@ -0,0 +1,31 @@
+From 8004afb7100e94efbca60ad4a08e599d7c2112f4 Mon Sep 17 00:00:00 2001
+From: Jakub Filak <jfilak@redhat.com>
+Date: Wed, 11 Dec 2013 17:04:52 +0100
+Subject: [ABRT PATCH] configui: do not use deprecated gtk3 API
+
+Signed-off-by: Jakub Filak <jfilak@redhat.com>
+---
+ src/configuration-gui/system-config-abrt.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/configuration-gui/system-config-abrt.c b/src/configuration-gui/system-config-abrt.c
+index d5afb43..4638dd6 100644
+--- a/src/configuration-gui/system-config-abrt.c
++++ b/src/configuration-gui/system-config-abrt.c
+@@ -45,8 +45,13 @@ GtkWidget *system_config_abrt_widget_new(void)
+     GtkWidget *buttons = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, /*spacing*/0);
+     gtk_box_pack_start(GTK_BOX(box), buttons, /*expand*/TRUE, /*fill*/FALSE, /*padding*/0);
+ 
++#if ((GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION < 11) || (GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION == 11 && GTK_MICRO_VERSION < 2))
+     gtk_widget_set_margin_left(buttons, 10);
+     gtk_widget_set_margin_right(buttons, 10);
++#else
++    gtk_widget_set_margin_start(buttons, 10);
++    gtk_widget_set_margin_end(buttons, 10);
++#endif
+     gtk_widget_set_margin_top(buttons, 10);
+     gtk_widget_set_margin_bottom(buttons, 10);
+ 
+-- 
+1.8.3.1
+

abrt-2.1.6.rhel-dont_enable_shortened_reporting_in_gnome.patch

@@ -0,0 +1,17 @@
+diff -ruN abrt-2.1.6.new/src/lib/abrt_conf.c abrt-2.1.6.old/src/lib/abrt_conf.c
+--- abrt-2.1.6.new/src/lib/abrt_conf.c	2013-07-26 11:20:33.803925230 +0200
++++ abrt-2.1.6.old/src/lib/abrt_conf.c	2013-07-26 11:57:24.785656742 +0200
+@@ -99,9 +99,13 @@
+     }
+     else
+     {
++#if 0
+         /* Default: enabled for GNOME desktop, else disabled */
+         const char *desktop_env = getenv("DESKTOP_SESSION");
+         g_settings_shortenedreporting = (desktop_env && strcasestr(desktop_env, "gnome") != NULL);
++#else
++        g_settings_shortenedreporting = 0;
++#endif
+     }
+ 
+     GHashTableIter iter;

abrt-2.1.6.rhel-remove_all_ureport_lines_from_config.patch

@@ -0,0 +1,110 @@
+diff -ur abrt-2.1.1/src/daemon/abrt.conf abrt-2.1.1.new/src/daemon/abrt.conf
+--- abrt-2.1.1/src/daemon/abrt.conf    2013-02-01 12:59:58.000000000 +0100
++++ abrt-2.1.1.new/src/daemon/abrt.conf        2013-03-05 10:01:11.347789231 +0100
+@@ -28,9 +28,7 @@
+ # In order to run this event automatically after detection, the
+ # AutoreportingEnabled option must be configured to 'yes'
+ #
+-# Default value: report_uReport
+-#
+-AutoreportingEvent = report_uReport
++AutoreportingEvent = empty
+ 
+ # Enables automatic running of the event configured in AutoreportingEvent option.
+ #
+diff -ur abrt-2.1.1/src/daemon/abrt_event.conf abrt-2.1.1.new/src/daemon/abrt_event.conf
+--- abrt-2.1.1/src/daemon/abrt_event.conf      2013-02-01 17:05:40.000000000 +0100
++++ abrt-2.1.1.new/src/daemon/abrt_event.conf  2013-03-05 10:00:58.406693336 +0100
+@@ -95,3 +95,7 @@
+ 
+ EVENT=open-gui
+         report-gtk -x -- "$DUMP_DIR"
++
++# no operation event, used for AutoreportingEvent to override the default value
++EVENT=empty
++    exit 0
+diff -ruN abrt-2.1.6.new/src/plugins/ccpp_event.conf abrt-2.1.6.old/src/plugins/ccpp_event.conf
+--- abrt-2.1.6.new/src/plugins/ccpp_event.conf	2013-07-26 11:20:33.808925269 +0200
++++ abrt-2.1.6.old/src/plugins/ccpp_event.conf	2013-07-26 11:21:37.642419583 +0200
+@@ -77,14 +77,6 @@
+                 -F "/etc/libreport/plugins/$format" \
+                 -A "/etc/libreport/plugins/$formatdup"
+ 
+-# Send micro report
+-EVENT=report_uReport analyzer=CCpp
+-        /usr/libexec/abrt-action-ureport
+-
+-# update ABRT database after successful report to bugzilla
+-EVENT=post_report analyzer=CCpp
+-        reporter-ureport -r
+-
+ EVENT=analyze_CCpp analyzer=CCpp
+         abrt-action-perform-ccpp-analysis
+ 
+@@ -93,4 +85,4 @@
+         report-gtk -- "$DUMP_DIR"
+ 
+ EVENT=report-cli analyzer=CCpp
+-        report-cli -e report_uReport -e analyze_CCpp -e report_Bugzilla -e post_report -- "$DUMP_DIR"
++        report-cli -e analyze_LocalGDB -e report_Bugzilla -- "$DUMP_DIR"
+diff -ruN abrt-2.1.6.new/src/plugins/koops_event.conf abrt-2.1.6.old/src/plugins/koops_event.conf
+--- abrt-2.1.6.new/src/plugins/koops_event.conf	2013-07-26 11:20:33.810925284 +0200
++++ abrt-2.1.6.old/src/plugins/koops_event.conf	2013-07-26 11:22:09.051662800 +0200
+@@ -20,17 +20,9 @@
+         reporter-bugzilla -b \
+                 -F /etc/libreport/plugins/bugzilla_format_kernel.conf
+ 
+-# Send micro report
+-EVENT=report_uReport analyzer=Kerneloops
+-        /usr/libexec/abrt-action-ureport
+-
+-# Update ABRT database after successful report to bugzilla
+-EVENT=post_report analyzer=Kerneloops
+-        reporter-ureport -r
+-
+ # Automatic/simple GUI-based kernel oopses reporting will do this:
+ EVENT=report-gui analyzer=Kerneloops
+         report-gtk -- "$DUMP_DIR"
+ 
+ EVENT=report-cli analyzer=Kerneloops
+-        report-cli -e report_uReport -e report_Bugzilla -e post_report -- "$DUMP_DIR"
++        report-cli -e report_Bugzilla -- "$DUMP_DIR"
+diff -ruN abrt-2.1.6.new/src/plugins/python_event.conf abrt-2.1.6.old/src/plugins/python_event.conf
+--- abrt-2.1.6.new/src/plugins/python_event.conf	2013-07-26 11:20:33.809925276 +0200
++++ abrt-2.1.6.old/src/plugins/python_event.conf	2013-07-26 11:22:23.992778495 +0200
+@@ -15,17 +15,9 @@
+                 -c /etc/libreport/plugins/bugzilla.conf
+         # TODO? -F /etc/libreport/plugins/bugzilla_format_python.conf
+ 
+-# Send micro report
+-EVENT=report_uReport analyzer=Python
+-        /usr/libexec/abrt-action-ureport
+-
+-# update ABRT database after successful report to bugzilla
+-EVENT=post_report analyzer=Python
+-        reporter-ureport -r
+-
+ # Reporting of python exceptions
+ EVENT=report-gui analyzer=Python component!=anaconda
+         report-gtk -- "$DUMP_DIR"
+ 
+ EVENT=report-cli analyzer=Python
+-        report-cli -e report_uReport -e report_Bugzilla -e post_report -- "$DUMP_DIR"
++        report-cli -e report_Bugzilla -- "$DUMP_DIR"
+diff -ruN abrt-2.1.6.new/src/plugins/vmcore_event.conf abrt-2.1.6.old/src/plugins/vmcore_event.conf
+--- abrt-2.1.6.new/src/plugins/vmcore_event.conf	2013-07-26 11:20:33.811925292 +0200
++++ abrt-2.1.6.old/src/plugins/vmcore_event.conf	2013-07-26 11:23:36.103336857 +0200
+@@ -19,12 +19,8 @@
+         reporter-bugzilla -b \
+                 -F /etc/libreport/plugins/bugzilla_format_kernel.conf
+ 
+-# Send micro report
+-EVENT=report_uReport analyzer=vmcore
+-        /usr/libexec/abrt-action-ureport
+-
+ EVENT=report-gui analyzer=vmcore
+     report-gtk -- "$DUMP_DIR"
+ 
+ EVENT=report-cli analyzer=vmcore
+-    report-cli -e analyze_VMcore -e report_uReport -e report_Bugzilla -e post_report -- "$DUMP_DIR"
++    report-cli -e analyze_VMcore -e report_Bugzilla -- "$DUMP_DIR"

abrt1_to_abrt2

@@ -1,115 +0,0 @@
-#! /usr/bin/python
-#-*- coding: utf-8 -*-
-
-import os
-
-# abrt_v4 TABLE columns:
-UUID         = 0
-UID          = 1
-INFORMALL    = 2
-DUMPDIR_PATH = 3
-COUNT        = 4
-REPORTED     = 5
-TIME         = 6
-MESSAGE      = 7
-
-# abrt_v4_reportresult columns:
-#UUID     = 0
-#UID      = 1
-REPORTER = 2
-RESULT_MESSAGE  = 3
-
-def get_db_path():
-    path = "/var/spool/abrt/abrt-db"
-    try:
-        with open("/etc/abrt/plugins/SQLite3.conf") as f:
-            for line in f:
-                line = line.split('=', 1)
-                if len(line) == 2 and line[0].strip() == "DBPath":
-                    path = line[1].strip()
-    except Exception, ex:
-        pass
-    return path
-
-def get_url_from_text(text):
-    url_marks = ["http://", "https://", "ftp://", "ftps://", "file://"]
-    lines = text.split('\n')
-    url = ""
-    for mark in url_marks:
-        for line in lines:
-            last_mark = line.find(mark)
-            if last_mark != -1:
-                url_end = line.find(' ',last_mark)
-                if url_end == -1:
-                    url_end = len(line)
-                url = "URL=" + line[last_mark:url_end]
-    return url
-
-def format_reported_to(reported_to):
-    reporter = reported_to[REPORTER]
-    url = get_url_from_text(reported_to[RESULT_MESSAGE])
-    if not url:
-        url = reported_to[RESULT_MESSAGE]
-    return reporter + ": " + url
-
-if __name__ == "__main__":
-    try:
-        from sqlite3 import dbapi2 as sqlite
-        db = sqlite.connect(get_db_path())
-        crashes = db.execute("SELECT * FROM abrt_v4")
-        # abrt_v4 TABLE columns:
-        # UUID | UID | INFORMALL | DUMPDIR_PATH | COUNT | REPORTED | TIME | MESSAGE
-        for crash in crashes:
-            # abrt_v4_reportresult columns:
-            # UUID | UID | REPORTER | MESSAGE
-            report_results = db.execute("SELECT * FROM abrt_v4_reportresult WHERE UUID='%s'" % crash[UUID])
-
-            # save count from db to file
-            count_file = "%s/count" % crash[DUMPDIR_PATH]
-            # don't overwrite
-            if not os.path.exists(count_file):
-                try:
-                    fout = open(count_file, "w")
-                    fout.write(str(crash[COUNT]))
-                    fout.close()
-                except Exception, ex:
-                    # silently ignore errors -> probably stalled db, but we can't
-                    # do much about it, so it's better to not polute the rpm output
-                    pass
-
-            # save uuid from db to file
-            uuid_file = "%s/uuid" % crash[DUMPDIR_PATH]
-            # don't overwrite
-            if not os.path.exists(uuid_file):
-                try:
-                    fout = open(uuid_file, "w")
-                    fout.write(str(crash[UUID]))
-                    fout.close()
-                except Exception, ex:
-                    # silently ignore errors -> probably stalled db, but we can't
-                    # do much about it, so it's better to not polute the rpm output
-                    pass
-
-            results = report_results.fetchall()
-            if results:
-                # save report results from db to file
-                reported_to_file = "%s/reported_to" % crash[DUMPDIR_PATH]
-                if not os.path.exists(reported_to_file):
-                    try:
-                        fout = open(reported_to_file, "w")
-                    except Exception, ex:
-                        # silently ignore errors -> probably stalled db, but we can't
-                        # do much about it, so it's better to not polute the rpm output
-                        continue
-
-                    for report_result in results:
-                        # print "\t", format_reported_to(report_result)
-                        # I know, it adds a '\n' to the end, but it's not a problem
-                        fout.write("%s\n" % format_reported_to(report_result))
-                    fout.close()
-        db.close()
-    except Exception, ex:
-        # in case of any unhandled error, just ignore it, the worst, what
-        # can happen is that the old reports are marked as unreported
-        #print ex
-        pass

sources

@@ -1 +1 @@
-38d882e5a67efe80abde806188e33953  abrt-2.0.13.tar.gz
+eb3a8430cd0fdacddc5ac3dd74e92142  abrt-2.1.10.tar.gz