Attachment 910867 Details for Bug 1037382 – Patch for rawhide

[patch] Patch for rawhide

0001-Fix-FTBFS-with-Werror-format-security-1037382-110713.patch (text/plain), 4.53 KB, created by Yaakov Selkowitz on 2014-06-20 18:27:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-20 18:27:15 UTC

Size: 4.53 KB

patch

obsolete

>From 703b8e017067345d1d075d547c0f0a9e94657afd Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowi@redhat.com>
>Date: Fri, 20 Jun 2014 13:27:02 -0500
>Subject: [PATCH] Fix FTBFS with -Werror=format-security (#1037382, #1107132)
>
>---
> wavbreaker-0.10-format-security.patch | 58 +++++++++++++++++++++++++++++++++++
> wavbreaker.spec                       |  7 ++++-
> 2 files changed, 64 insertions(+), 1 deletion(-)
> create mode 100644 wavbreaker-0.10-format-security.patch
>
>diff --git a/wavbreaker-0.10-format-security.patch b/wavbreaker-0.10-format-security.patch
>new file mode 100644
>index 0000000..8b07340
>--- /dev/null
>+++ b/wavbreaker-0.10-format-security.patch
>@@ -0,0 +1,58 @@
>+--- a/src/popupmessage.c
>++++ b/src/popupmessage.c
>+@@ -38,9 +38,9 @@ void popupmessage_show( GtkWidget *main_window, const char *message, const char
>+                                      GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
>+                                      GTK_MESSAGE_INFO,
>+                                      buttons_type,
>+-                                     message);
>++                                     "%s", message);
>+ 
>+-    gtk_message_dialog_format_secondary_text( GTK_MESSAGE_DIALOG(dialog), description);
>++    gtk_message_dialog_format_secondary_text( GTK_MESSAGE_DIALOG(dialog), "%s", description);
>+     gtk_window_set_title( GTK_WINDOW(dialog), message);
>+ 
>+     g_signal_connect( G_OBJECT(dialog), "response", (GtkSignalFunc)popupmessage_hide, dialog);
>+--- a/src/reallyquit.c
>++++ b/src/reallyquit.c
>+@@ -36,11 +36,11 @@ void reallyquit_show(GtkWidget *main_window)
>+                                      GTK_DIALOG_DESTROY_WITH_PARENT,
>+                                      GTK_MESSAGE_QUESTION,
>+                                      GTK_BUTTONS_YES_NO,
>+-                                     message);
>++                                     "%s", message);
>+ 
>+ 
>+     gtk_window_set_title( GTK_WINDOW(dialog), message);
>+-    gtk_message_dialog_format_secondary_text( dialog, info_text);
>++    gtk_message_dialog_format_secondary_text( dialog, "%s", info_text);
>+ 
>+     result = gtk_dialog_run( GTK_DIALOG(dialog));
>+     switch( result) {
>+--- a/src/sample.c
>++++ b/src/sample.c
>+@@ -268,12 +268,12 @@ int ask_open_as_raw()
>+                                      GTK_DIALOG_DESTROY_WITH_PARENT,
>+                                      GTK_MESSAGE_QUESTION,
>+                                      GTK_BUTTONS_CANCEL,
>+-                                     message);
>++                                     "%s", message);
>+     
>+     gtk_dialog_add_button( GTK_DIALOG(dialog), _("Big endian"), WB_RESPONSE_BIG_ENDIAN);
>+     gtk_dialog_add_button( GTK_DIALOG(dialog), _("Little endian"), WB_RESPONSE_LITTLE_ENDIAN);
>+ 
>+-    gtk_message_dialog_format_secondary_text( dialog, info_text);
>++    gtk_message_dialog_format_secondary_text( dialog, "%s", info_text);
>+     gtk_window_set_title( GTK_WINDOW(dialog), message);
>+ 
>+     result = gtk_dialog_run( GTK_DIALOG(dialog));
>+--- a/src/wavinfo.c
>++++ b/src/wavinfo.c
>+@@ -37,7 +37,7 @@ int main(int argc, char *argv[])
>+         printf( "Header info for: %s\n", argv[i]);
>+     
>+         if( wav_read_header( argv[i], &sampleInfo, 1) != 0) {
>+-            printf( wav_get_error_message());
>++            printf( "%s", wav_get_error_message());
>+         }
>+ 
>+         printf("\n");
>diff --git a/wavbreaker.spec b/wavbreaker.spec
>index e7c9c04..f65fc3c 100644
>--- a/wavbreaker.spec
>+++ b/wavbreaker.spec
>@@ -1,12 +1,13 @@
> Summary:	Tool for splitting .wav files
> Name:		wavbreaker
> Version: 	0.10
>-Release: 	11%{?dist}
>+Release: 	12%{?dist}
> License: 	GPLv2+
> Group: 		Applications/Multimedia
> URL: 		http://wavbreaker.sourceforge.net
> Source: 	http://downloads.sourceforge.net/wavbreaker/%{name}-%{version}.tar.gz
> Patch:		wavbreaker-0.8-desktop-file.patch
>+Patch1:		wavbreaker-0.10-format-security.patch
> BuildRequires:	gtk2-devel, libxml2-devel, desktop-file-utils, alsa-lib-devel
> BuildRequires:	gettext
> Requires(post):	desktop-file-utils
>@@ -22,6 +23,7 @@ convert ogg, mp3, etc. files and then break them up.
> %prep
> %setup -q
> %patch -p1
>+%patch1 -p1
> 
> %build
> %configure
>@@ -52,6 +54,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null ||:
> %doc ChangeLog CONTRIBUTORS NEWS AUTHORS COPYING README TODO
> 
> %changelog
>+* Fri Jun 20 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 0.10-12
>+- Fix FTBFS with -Werror=format-security (#1037382, #1107132)
>+
> * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-11
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1037382: 910867