Attachment 912218 Details for Bug 1037389 – Patch for rawhide

[patch] Patch for rawhide

0001-Fix-FTBFS-with-Werror-format-security-1037389-110720.patch (text/plain), 2.42 KB, created by Yaakov Selkowitz on 2014-06-25 19:42:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-25 19:42:24 UTC

Size: 2.42 KB

patch

obsolete

>From f5d0ca573c034e55a3fc27c4465b7f3162483054 Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
>Date: Wed, 25 Jun 2014 14:41:03 -0500
>Subject: [PATCH] Fix FTBFS with -Werror=format-security (#1037389, #1107203)
>
>---
> xaos-3.5-format-security.patch | 19 +++++++++++++++++++
> xaos.spec                      |  7 ++++++-
> 2 files changed, 25 insertions(+), 1 deletion(-)
> create mode 100644 xaos-3.5-format-security.patch
>
>diff --git a/xaos-3.5-format-security.patch b/xaos-3.5-format-security.patch
>new file mode 100644
>index 0000000..f131e3c
>--- /dev/null
>+++ b/xaos-3.5-format-security.patch
>@@ -0,0 +1,19 @@
>+--- a/src/ui-hlp/render.c
>++++ b/src/ui-hlp/render.c
>+@@ -605,14 +605,14 @@ uih_renderimage(struct uih_context *gc1, xio_file af,
>+ 	printmsg(gettext("Loading catalogs"));
>+ 	uih_loadcatalog(uih, "english");
>+ 	if (uih->errstring) {
>+-	    fprintf(stderr, uih->errstring);
>++	    fprintf(stderr, "%s", uih->errstring);
>+ 	    uih_clearmessages(uih);
>+ 	    uih->errstring = NULL;
>+ 	}
>+ 	if (catalog != NULL)
>+ 	    uih_loadcatalog(uih, catalog);
>+ 	if (uih->errstring) {
>+-	    fprintf(stderr, uih->errstring);
>++	    fprintf(stderr, "%s", uih->errstring);
>+ 	    uih_clearmessages(uih);
>+ 	    uih->errstring = NULL;
>+ 	}
>diff --git a/xaos.spec b/xaos.spec
>index 5e10a15..4b13513 100644
>--- a/xaos.spec
>+++ b/xaos.spec
>@@ -1,6 +1,6 @@
> Name:           xaos
> Version:        3.5
>-Release:        10%{?dist}
>+Release:        11%{?dist}
> Summary:        A fast, portable real-time interactive fractal zoomer
> 
> Group:          Applications/Multimedia
>@@ -9,6 +9,7 @@ URL:            http://xaos.sourceforge.net
> Source0:        http://surfnet.dl.sourceforge.net/sourceforge/xaos/xaos-%{version}.tar.gz
> Source1:	xaos.png
> Patch0:	xaos-3.5-fix-conflicting-register-types.patch
>+Patch1:	xaos-3.5-format-security.patch
> BuildRequires:  slang-devel
> BuildRequires:	zlib-devel
> BuildRequires:	libpng-devel
>@@ -43,6 +44,7 @@ on-the-fly plane switching.
> %prep
> %setup0 -q 
> %patch0 -p1 -b .proto
>+%patch1 -p1 -b .formatsec
> # disable stripping binaries when installing
> sed -i 's| -s | |' Makefile.in
> 
>@@ -132,6 +134,9 @@ fi
> 
> 
> %changelog
>+* Wed Jun 25 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 3.5-11
>+- Fix FTBFS with -Werror=format-security (#1037389, #1107203)
>+
> * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5-10
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1037389: 912218