Attachment 908705 Details for Bug 1037112 – Patch for rawhide

[patch] Patch for rawhide

0001-Fix-FTBFS-with-Werror-format-security-1037112-110673.patch (text/plain), 2.89 KB, created by Yaakov Selkowitz on 2014-06-13 21:06:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-13 21:06:38 UTC

Size: 2.89 KB

patch

obsolete

>From 0ee75ac46d2e952a7a9f6e91f5d6bc056e9424b6 Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
>Date: Fri, 13 Jun 2014 16:05:05 -0500
>Subject: [PATCH] Fix FTBFS with -Werror=format-security (#1037112, #1106737)
>
>---
> gtk-splitter-2.2.1-format-security.patch | 34 ++++++++++++++++++++++++++++++++
> gtk-splitter.spec                        |  7 ++++++-
> 2 files changed, 40 insertions(+), 1 deletion(-)
> create mode 100644 gtk-splitter-2.2.1-format-security.patch
>
>diff --git a/gtk-splitter-2.2.1-format-security.patch b/gtk-splitter-2.2.1-format-security.patch
>new file mode 100644
>index 0000000..918e10b
>--- /dev/null
>+++ b/gtk-splitter-2.2.1-format-security.patch
>@@ -0,0 +1,34 @@
>+diff --git a/src/dostextfile.c b/src/dostextfile.c
>+index 9a4ddb5..c6b807f 100644
>+--- a/src/dostextfile.c
>++++ b/src/dostextfile.c
>+@@ -30,14 +30,14 @@
>+ /* Write a string to the file pointed to by b without the eoln. */
>+ void write_dostextfile(FILE *b, char *data)
>+ {
>+-   fprintf( b, data );
>++   fprintf( b, "%s", data );
>+    fflush( b );
>+ }
>+ 
>+ /* Write a string to the file pointed to by b with the eoln. */
>+ void writeln_dostextfile(FILE *b, char *data)
>+ {
>+-   fprintf( b, data );
>++   fprintf( b, "%s", data );
>+    fputc( 0x0d, b );
>+    fputc( 0x0a, b );
>+    fflush( b );
>+diff --git a/src/interface.c b/src/interface.c
>+index 085f39c..dc6e9e9 100644
>+--- a/src/interface.c
>++++ b/src/interface.c
>+@@ -216,7 +216,7 @@ void display_error( gchar *error )
>+                                     GTK_DIALOG_MODAL,
>+                                     GTK_MESSAGE_ERROR,
>+                                     GTK_BUTTONS_CLOSE,
>+-                                    error );
>++                                    "%s", error );
>+                                     
>+    /* Display the error dialog. */  
>+    gtk_dialog_run( GTK_DIALOG ( dialog ) );
>diff --git a/gtk-splitter.spec b/gtk-splitter.spec
>index 8dbd9e4..d066ec4 100644
>--- a/gtk-splitter.spec
>+++ b/gtk-splitter.spec
>@@ -1,11 +1,12 @@
> Name:           gtk-splitter
> Version:        2.2.1
>-Release:        10%{?dist}
>+Release:        11%{?dist}
> Summary:        A file splitter
> 
> License:        GPLv2+
> URL:            http://gtk-splitter.sourceforge.net/
> Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
>+Patch0:         gtk-splitter-2.2.1-format-security.patch
> 
> BuildRequires:  mhash-devel
> BuildRequires:  gtk2-devel
>@@ -21,6 +22,7 @@ etc.
> 
> %prep
> %setup -q
>+%patch0 -p1
> 
> %build
> %configure
>@@ -41,6 +43,9 @@ desktop-file-install                                    \
> %{_datadir}/pixmaps/%{name}.png
> 
> %changelog
>+* Fri Jun 13 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 2.2.1-11
>+- Fix FTBFS with -Werror=format-security (#1037112, #1106737)
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.1-10
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1037112: 908705