Attachment 910473 Details for Bug 1037390 – Patch for rawhide

[patch] Patch for rawhide

0001-Fix-FTBFS-with-Werror-format-security-1037390-110720.patch (text/plain), 3.04 KB, created by Yaakov Selkowitz on 2014-06-19 16:25:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-19 16:25:21 UTC

Size: 3.04 KB

patch

obsolete

>From d57a8090846d7e7975efab7e2b8d03aead797944 Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowi@redhat.com>
>Date: Thu, 19 Jun 2014 11:23:39 -0500
>Subject: [PATCH] Fix FTBFS with -Werror=format-security (#1037390, #1107209)
>
>---
> xarchiver-0.5.2-format-security.patch | 23 +++++++++++++++++++++++
> xarchiver.spec                        |  8 +++++++-
> 2 files changed, 30 insertions(+), 1 deletion(-)
> create mode 100644 xarchiver-0.5.2-format-security.patch
>
>diff --git a/xarchiver-0.5.2-format-security.patch b/xarchiver-0.5.2-format-security.patch
>new file mode 100644
>index 0000000..d1ae516
>--- /dev/null
>+++ b/xarchiver-0.5.2-format-security.patch
>@@ -0,0 +1,23 @@
>+--- a/src/window.c
>++++ b/src/window.c
>+@@ -231,9 +231,9 @@ int xa_show_message_dialog (GtkWindow *window,int mode,int type,int button,const
>+ {
>+ 	int response;
>+ 
>+-	dialog = gtk_message_dialog_new (window,mode,type,button,message1);
>++	dialog = gtk_message_dialog_new (window,mode,type,button,"%s",message1);
>+ 	gtk_dialog_set_default_response (GTK_DIALOG (dialog),GTK_RESPONSE_NO);
>+-	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),message2);
>++	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),"%s",message2);
>+ 	response = gtk_dialog_run (GTK_DIALOG (dialog));
>+ 	gtk_widget_destroy (GTK_WIDGET (dialog));
>+ 	return response;
>+@@ -509,7 +509,7 @@ void xa_list_archive (GtkMenuItem *menuitem,gpointer data)
>+ 			g_fprintf (stream,_("Comment:\n"));
>+ 			if (bp)
>+ 				g_fprintf(stream,"</b><pre>");
>+-			g_fprintf (stream,archive[idx]->comment->str);
>++			g_fprintf (stream,"%s",archive[idx]->comment->str);
>+ 			if (bp)
>+ 				g_fprintf(stream,"</pre>");
>+ 			g_fprintf (stream,"\n");
>diff --git a/xarchiver.spec b/xarchiver.spec
>index 4119b09..f3a1711 100644
>--- a/xarchiver.spec
>+++ b/xarchiver.spec
>@@ -1,6 +1,6 @@
> Name:           xarchiver
> Version:        0.5.2
>-Release:        19%{?dist}
>+Release:        20%{?dist}
> Summary:        Archive manager for Xfce
> 
> Group:          Applications/Archiving
>@@ -29,6 +29,8 @@ Patch4:         xarchiver-0.5.2-segfault-open-with.patch
> Patch5:         xarchiver-0.5.2-fix_7z_support.patch
> # rhbz#784075 - extraction fails when the Drag'n'Drop target path contains spaces
> Patch6:         xarchiver-0.5.2-drag-n-drop_escaped_path.patch
>+# -Werror=format-security
>+Patch7:         xarchiver-0.5.2-format-security.patch
> 
> BuildRequires:  gtk2-devel, libxml2-devel, gettext, desktop-file-utils
> BuildRequires:  xfce4-dev-tools >= 4.3.90.2
>@@ -57,6 +59,7 @@ chmod -x src/mime.*
> %patch4 -p1 -b .segfault-open-with
> %patch5 -p1 -b .fix_7z_support
> %patch6 -p1 -b .dnd_escaped_path
>+%patch7 -p1 -b .formatsec
> 
> %build
> autoreconf -vif
>@@ -123,6 +126,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
> 
> 
> %changelog
>+* Thu Jun 19 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 0.5.2-20
>+- Fix FTBFS with -Werror=format-security (#1037390, #1107209)
>+
> * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.2-19
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1037390: 910473