[packages/libreport] - updated to 2.2.2 - updated format-security patch

[qboosh]

commit 4e7d543608e5b9a7dade8e09573f8686a66decca
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jun 14 17:57:15 2014 +0200

    - updated to 2.2.2
    - updated format-security patch

 format-security.patch | 17 +++++++++++++----
 libreport.spec        |  7 +++++--
 2 files changed, 18 insertions(+), 6 deletions(-)
---
diff --git a/libreport.spec b/libreport.spec
index e3f2f20..d9d8ccc 100644
--- a/libreport.spec
+++ b/libreport.spec
@@ -6,12 +6,12 @@
 Summary:	Generic library for reporting various problems
 Summary(pl.UTF-8):	Ogólna biblioteka do zgłaszania różnych problemów
 Name:		libreport
-Version:	2.2.0
+Version:	2.2.2
 Release:	1
 License:	GPL v2+
 Group:		Libraries
 Source0:	https://fedorahosted.org/released/abrt/%{name}-%{version}.tar.gz
-# Source0-md5:	09af2b13375ed2d6288b86ce6de8b182
+# Source0-md5:	0183ac40c8d6e701087a33bcc1b95a6d
 Patch0:		format-security.patch
 URL:		https://fedorahosted.org/abrt/
 BuildRequires:	asciidoc
@@ -383,6 +383,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/libreport/events
 %dir %{_datadir}/libreport/workflows
 %{_mandir}/man5/forbidden_words.conf.5*
+%{_mandir}/man5/ignored_words.conf.5*
 %{_mandir}/man5/report_event.conf.5*
 
 %files devel
@@ -513,6 +514,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/reporter-upload
 %config(noreplace) %{_sysconfdir}/libreport/events.d/uploader_event.conf
+%config(noreplace) %{_sysconfdir}/libreport/plugins/upload.conf
+%{_datadir}/libreport/conf.d/plugins/upload.conf
 %{_datadir}/libreport/events/report_Uploader.xml
 %{_datadir}/libreport/workflows/workflow_Upload.xml
 %{_mandir}/man1/reporter-upload.1*
diff --git a/format-security.patch b/format-security.patch
index 6830206..2c96bb3 100644
--- a/format-security.patch
+++ b/format-security.patch
@@ -9,9 +9,9 @@
  
              ret = EXIT_STOP_EVENT_RUN;
          }
---- libreport-2.0.16/src/gui-wizard-gtk/wizard.c~	2012-10-10 18:11:04.000000000 +0200
-+++ libreport-2.0.16/src/gui-wizard-gtk/wizard.c	2012-10-15 12:55:58.123197354 +0200
-@@ -281,7 +281,7 @@
+--- libreport-2.2.2/src/gui-wizard-gtk/wizard.c.orig	2014-04-20 22:07:04.000000000 +0200
++++ libreport-2.2.2/src/gui-wizard-gtk/wizard.c	2014-06-14 17:08:36.638269706 +0200
+@@ -320,7 +320,7 @@
          GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
          GTK_MESSAGE_WARNING,
          GTK_BUTTONS_CLOSE,
@@ -20,7 +20,16 @@
  
      gtk_window_set_transient_for(GTK_WINDOW(wrong_settings), GTK_WINDOW(g_wnd_assistant));
      gtk_message_dialog_set_markup(GTK_MESSAGE_DIALOG(wrong_settings),
-@@ -2753,7 +2753,7 @@
+@@ -1935,7 +1935,7 @@
+         GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+         GTK_MESSAGE_WARNING,
+         GTK_BUTTONS_YES_NO,
+-        message);
++        "%s", message);
+ 
+     gtk_window_set_transient_for(GTK_WINDOW(old_private_group), GTK_WINDOW(g_wnd_assistant));
+     gtk_message_dialog_set_markup(GTK_MESSAGE_DIALOG(old_private_group),
+@@ -3118,7 +3118,7 @@
                  GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                  GTK_MESSAGE_WARNING,
                  GTK_BUTTONS_CLOSE,
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libreport.git/commitdiff/4e7d543608e5b9a7dade8e09573f8686a66decca