From c6d6d71b3afe7f88cea131f91322675ba2ae1f71 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 29 Mar 2017 15:21:12 -0400 Subject: [PATCH] Fix compilation errors when -Werror=format-security --- giflib-4.1.6-format-security.patch | 349 +++++++++++++++++++++++++++++ giflib.spec | 9 +- 2 files changed, 357 insertions(+), 1 deletion(-) create mode 100644 giflib-4.1.6-format-security.patch diff --git a/giflib-4.1.6-format-security.patch b/giflib-4.1.6-format-security.patch new file mode 100644 index 0000000..abe7946 --- /dev/null +++ b/giflib-4.1.6-format-security.patch @@ -0,0 +1,349 @@ +diff -ruN giflib-4.1.6.orig/util/gif2epsn.c giflib-4.1.6/util/gif2epsn.c +--- giflib-4.1.6.orig/util/gif2epsn.c 2017-03-29 13:56:44.778740660 -0400 ++++ giflib-4.1.6/util/gif2epsn.c 2017-03-29 15:19:12.024193066 -0400 +@@ -146,7 +146,7 @@ + } + + if (HelpFlag) { +- fprintf(stderr, VersionStr); ++ fprintf(stderr, "%s", VersionStr); + GAPrintHowTo(CtrlStr); + exit(EXIT_SUCCESS); + } +diff -ruN giflib-4.1.6.orig/util/gif2iris.c giflib-4.1.6/util/gif2iris.c +--- giflib-4.1.6.orig/util/gif2iris.c 2017-03-29 13:56:44.762740913 -0400 ++++ giflib-4.1.6/util/gif2iris.c 2017-03-29 15:19:12.013193238 -0400 +@@ -111,7 +111,7 @@ + } + + if (HelpFlag) { +- fprintf(stderr, VersionStr); ++ fprintf(stderr, "%s", VersionStr); + GAPrintHowTo(CtrlStr); + exit(EXIT_SUCCESS); + } +diff -ruN giflib-4.1.6.orig/util/gif2ps.c giflib-4.1.6/util/gif2ps.c +--- giflib-4.1.6.orig/util/gif2ps.c 2017-03-29 13:56:44.747741149 -0400 ++++ giflib-4.1.6/util/gif2ps.c 2017-03-29 15:19:12.002193410 -0400 +@@ -129,7 +129,7 @@ + } + + if (HelpFlag) { +- fprintf(stderr, VersionStr); ++ fprintf(stderr, "%s", VersionStr); + GAPrintHowTo(CtrlStr); + exit(EXIT_SUCCESS); + } +Binary files giflib-4.1.6.orig/util/.gif2ps.c.swp and giflib-4.1.6/util/.gif2ps.c.swp differ +diff -ruN giflib-4.1.6.orig/util/gif2rgb.c giflib-4.1.6/util/gif2rgb.c +--- giflib-4.1.6.orig/util/gif2rgb.c 2017-03-29 13:56:44.785740550 -0400 ++++ giflib-4.1.6/util/gif2rgb.c 2017-03-29 15:19:12.029192988 -0400 +@@ -108,7 +108,7 @@ + } + + if (HelpFlag) { +- fprintf(stderr, VersionStr); ++ fprintf(stderr, "%s", VersionStr); + GAPrintHowTo(CtrlStr); + exit(EXIT_SUCCESS); + } +diff -ruN giflib-4.1.6.orig/util/gif2rle.c giflib-4.1.6/util/gif2rle.c +--- giflib-4.1.6.orig/util/gif2rle.c 2017-03-29 13:56:44.783740581 -0400 ++++ giflib-4.1.6/util/gif2rle.c 2017-03-29 15:19:12.027193019 -0400 +@@ -103,7 +103,7 @@ + } + + if (HelpFlag) { +- fprintf(stderr, VersionStr); ++ fprintf(stderr, "%s", VersionStr); + GAPrintHowTo(CtrlStr); + exit(EXIT_SUCCESS); + } +diff -ruN giflib-4.1.6.orig/util/gif2x11.c giflib-4.1.6/util/gif2x11.c +--- giflib-4.1.6.orig/util/gif2x11.c 2017-03-29 13:56:44.759740960 -0400 ++++ giflib-4.1.6/util/gif2x11.c 2017-03-29 15:19:12.011193270 -0400 +@@ -143,7 +143,7 @@ + } + + if (HelpFlag) { +- fprintf(stderr, VersionStr); ++ fprintf(stderr, "%s", VersionStr); + GAPrintHowTo(CtrlStr); + exit(EXIT_SUCCESS); + } +diff -ruN giflib-4.1.6.orig/util/gifasm.c giflib-4.1.6/util/gifasm.c +--- giflib-4.1.6.orig/util/gifasm.c 2017-03-29 13:56:44.781740613 -0400 ++++ giflib-4.1.6/util/gifasm.c 2017-03-29 15:19:12.026193035 -0400 +@@ -98,7 +98,7 @@ + } + + if (HelpFlag) { +- fprintf(stderr, VersionStr); ++ fprintf(stderr, "%s", VersionStr); + GAPrintHowTo(CtrlStr); + exit(EXIT_SUCCESS); + } +diff -ruN giflib-4.1.6.orig/util/gifbg.c giflib-4.1.6/util/gifbg.c +--- giflib-4.1.6.orig/util/gifbg.c 2017-03-29 13:56:44.787740518 -0400 ++++ giflib-4.1.6/util/gifbg.c 2017-03-29 15:19:12.031192956 -0400 +@@ -130,7 +130,7 @@ + } + + if (HelpFlag) { +- fprintf(stderr, VersionStr); ++ fprintf(stderr, "%s", VersionStr); + GAPrintHowTo(CtrlStr); + exit(EXIT_SUCCESS); + } +diff -ruN giflib-4.1.6.orig/util/gifclip.c giflib-4.1.6/util/gifclip.c +--- giflib-4.1.6.orig/util/gifclip.c 2017-03-29 13:56:44.734741354 -0400 ++++ giflib-4.1.6/util/gifclip.c 2017-03-29 15:19:11.995193520 -0400 +@@ -92,7 +92,7 @@ + } + + if (HelpFlag) { +- fprintf(stderr, VersionStr); ++ fprintf(stderr, "%s", VersionStr); + GAPrintHowTo(CtrlStr); + exit(EXIT_SUCCESS); + } +diff -ruN giflib-4.1.6.orig/util/gifclrmp.c giflib-4.1.6/util/gifclrmp.c +--- giflib-4.1.6.orig/util/gifclrmp.c 2017-03-29 13:56:44.795740392 -0400 ++++ giflib-4.1.6/util/gifclrmp.c 2017-03-29 15:19:12.035192894 -0400 +@@ -111,7 +111,7 @@ + } + + if (HelpFlag) { +- fprintf(stderr, VersionStr); ++ fprintf(stderr, "%s", VersionStr); + GAPrintHowTo(CtrlStr); + exit(EXIT_SUCCESS); + } +diff -ruN giflib-4.1.6.orig/util/gifcolor.c giflib-4.1.6/util/gifcolor.c +--- giflib-4.1.6.orig/util/gifcolor.c 2017-03-29 13:56:44.724741512 -0400 ++++ giflib-4.1.6/util/gifcolor.c 2017-03-29 15:19:11.984193692 -0400 +@@ -89,7 +89,7 @@ + } + + if (HelpFlag) { +- fprintf(stderr, VersionStr); ++ fprintf(stderr, "%s", VersionStr); + GAPrintHowTo(CtrlStr); + exit(EXIT_SUCCESS); + } +diff -ruN giflib-4.1.6.orig/util/gifcomb.c giflib-4.1.6/util/gifcomb.c +--- giflib-4.1.6.orig/util/gifcomb.c 2017-03-29 13:56:44.744741197 -0400 ++++ giflib-4.1.6/util/gifcomb.c 2017-03-29 15:19:12.001193426 -0400 +@@ -93,7 +93,7 @@ + } + + if (HelpFlag) { +- fprintf(stderr, VersionStr); ++ fprintf(stderr, "%s", VersionStr); + GAPrintHowTo(CtrlStr); + exit(EXIT_SUCCESS); + } +diff -ruN giflib-4.1.6.orig/util/giffix.c giflib-4.1.6/util/giffix.c +--- giflib-4.1.6.orig/util/giffix.c 2017-03-29 13:56:44.737741307 -0400 ++++ giflib-4.1.6/util/giffix.c 2017-03-29 15:19:11.998193473 -0400 +@@ -90,7 +90,7 @@ + } + + if (HelpFlag) { +- fprintf(stderr, VersionStr); ++ fprintf(stderr, "%s", VersionStr); + GAPrintHowTo(CtrlStr); + exit(EXIT_SUCCESS); + } +diff -ruN giflib-4.1.6.orig/util/gifflip.c giflib-4.1.6/util/gifflip.c +--- giflib-4.1.6.orig/util/gifflip.c 2017-03-29 13:56:44.732741386 -0400 ++++ giflib-4.1.6/util/gifflip.c 2017-03-29 15:19:11.994193536 -0400 +@@ -104,7 +104,7 @@ + } + + if (HelpFlag) { +- fprintf(stderr, VersionStr); ++ fprintf(stderr, "%s", VersionStr); + GAPrintHowTo(CtrlStr); + exit(EXIT_SUCCESS); + } +diff -ruN giflib-4.1.6.orig/util/gifhisto.c giflib-4.1.6/util/gifhisto.c +--- giflib-4.1.6.orig/util/gifhisto.c 2017-03-29 13:56:44.773740739 -0400 ++++ giflib-4.1.6/util/gifhisto.c 2017-03-29 15:19:12.021193113 -0400 +@@ -112,7 +112,7 @@ + } + + if (HelpFlag) { +- fprintf(stderr, VersionStr); ++ fprintf(stderr, "%s", VersionStr); + GAPrintHowTo(CtrlStr); + exit(EXIT_SUCCESS); + } +diff -ruN giflib-4.1.6.orig/util/gifinfo.c giflib-4.1.6/util/gifinfo.c +--- giflib-4.1.6.orig/util/gifinfo.c 2017-03-29 13:56:44.730741417 -0400 ++++ giflib-4.1.6/util/gifinfo.c 2017-03-29 15:19:11.992193567 -0400 +@@ -104,7 +104,7 @@ + } + + if (HelpFlag) { +- fprintf(stderr, VersionStr); ++ fprintf(stderr, "%s", VersionStr); + GAPrintHowTo(CtrlStr); + printf("Format: quoted text string used for formating of information\n"); + printf(" Special characters for various information can be used\n"); +diff -ruN giflib-4.1.6.orig/util/gifinter.c giflib-4.1.6/util/gifinter.c +--- giflib-4.1.6.orig/util/gifinter.c 2017-03-29 13:56:44.751741086 -0400 ++++ giflib-4.1.6/util/gifinter.c 2017-03-29 15:19:12.007193332 -0400 +@@ -98,7 +98,7 @@ + } + + if (HelpFlag) { +- fprintf(stderr, VersionStr); ++ fprintf(stderr, "%s", VersionStr); + GAPrintHowTo(CtrlStr); + exit(EXIT_SUCCESS); + } +diff -ruN giflib-4.1.6.orig/util/gifinto.c giflib-4.1.6/util/gifinto.c +--- giflib-4.1.6.orig/util/gifinto.c 2017-03-29 13:56:44.769740802 -0400 ++++ giflib-4.1.6/util/gifinto.c 2017-03-29 15:19:12.019193144 -0400 +@@ -96,7 +96,7 @@ + } + + if (HelpFlag) { +- fprintf(stderr, VersionStr); ++ fprintf(stderr, "%s", VersionStr); + GAPrintHowTo(CtrlStr); + exit(EXIT_SUCCESS); + } +diff -ruN giflib-4.1.6.orig/util/gifovly.c giflib-4.1.6/util/gifovly.c +--- giflib-4.1.6.orig/util/gifovly.c 2017-03-29 13:56:44.739741275 -0400 ++++ giflib-4.1.6/util/gifovly.c 2017-03-29 15:19:11.999193457 -0400 +@@ -73,7 +73,7 @@ + } + + if (HelpFlag) { +- fprintf(stderr, VersionStr); ++ fprintf(stderr, "%s", VersionStr); + GAPrintHowTo(CtrlStr); + exit(EXIT_SUCCESS); + } +diff -ruN giflib-4.1.6.orig/util/gifpos.c giflib-4.1.6/util/gifpos.c +--- giflib-4.1.6.orig/util/gifpos.c 2017-03-29 13:56:44.756741007 -0400 ++++ giflib-4.1.6/util/gifpos.c 2017-03-29 15:19:12.010193285 -0400 +@@ -90,7 +90,7 @@ + } + + if (HelpFlag) { +- fprintf(stderr, VersionStr); ++ fprintf(stderr, "%s", VersionStr); + GAPrintHowTo(CtrlStr); + exit(EXIT_SUCCESS); + } +diff -ruN giflib-4.1.6.orig/util/gifrotat.c giflib-4.1.6/util/gifrotat.c +--- giflib-4.1.6.orig/util/gifrotat.c 2017-03-29 13:56:44.771740771 -0400 ++++ giflib-4.1.6/util/gifrotat.c 2017-03-29 15:19:12.020193129 -0400 +@@ -117,7 +117,7 @@ + } + + if (HelpFlag) { +- fprintf(stderr, VersionStr); ++ fprintf(stderr, "%s", VersionStr); + GAPrintHowTo(CtrlStr); + exit(EXIT_SUCCESS); + } +diff -ruN giflib-4.1.6.orig/util/gifrsize.c giflib-4.1.6/util/gifrsize.c +--- giflib-4.1.6.orig/util/gifrsize.c 2017-03-29 13:56:44.754741039 -0400 ++++ giflib-4.1.6/util/gifrsize.c 2017-03-29 15:19:12.008193317 -0400 +@@ -113,7 +113,7 @@ + } + + if (HelpFlag) { +- fprintf(stderr, VersionStr); ++ fprintf(stderr, "%s", VersionStr); + GAPrintHowTo(CtrlStr); + exit(EXIT_SUCCESS); + } +diff -ruN giflib-4.1.6.orig/util/giftext.c giflib-4.1.6/util/giftext.c +--- giflib-4.1.6.orig/util/giftext.c 2017-03-29 13:56:44.764740881 -0400 ++++ giflib-4.1.6/util/giftext.c 2017-03-29 15:19:12.015193207 -0400 +@@ -102,7 +102,7 @@ + } + + if (HelpFlag) { +- fprintf(stderr, VersionStr); ++ fprintf(stderr, "%s", VersionStr); + GAPrintHowTo(CtrlStr); + exit(EXIT_SUCCESS); + } +diff -ruN giflib-4.1.6.orig/util/gifwedge.c giflib-4.1.6/util/gifwedge.c +--- giflib-4.1.6.orig/util/gifwedge.c 2017-03-29 13:56:44.789740487 -0400 ++++ giflib-4.1.6/util/gifwedge.c 2017-03-29 15:19:12.032192941 -0400 +@@ -94,7 +94,7 @@ + } + + if (HelpFlag) { +- fprintf(stderr, VersionStr); ++ fprintf(stderr, "%s", VersionStr); + GAPrintHowTo(CtrlStr); + exit(EXIT_SUCCESS); + } +diff -ruN giflib-4.1.6.orig/util/icon2gif.c giflib-4.1.6/util/icon2gif.c +--- giflib-4.1.6.orig/util/icon2gif.c 2017-03-29 13:56:44.766740850 -0400 ++++ giflib-4.1.6/util/icon2gif.c 2017-03-29 15:19:12.016193191 -0400 +@@ -94,7 +94,7 @@ + } + + if (HelpFlag) { +- fprintf(stderr, VersionStr); ++ fprintf(stderr, "%s", VersionStr); + GAPrintHowTo(CtrlStr); + exit(EXIT_SUCCESS); + } +diff -ruN giflib-4.1.6.orig/util/raw2gif.c giflib-4.1.6/util/raw2gif.c +--- giflib-4.1.6.orig/util/raw2gif.c 2017-03-29 13:56:44.776740692 -0400 ++++ giflib-4.1.6/util/raw2gif.c 2017-03-29 15:19:12.022193098 -0400 +@@ -118,7 +118,7 @@ + } + + if (HelpFlag) { +- fprintf(stderr, VersionStr); ++ fprintf(stderr, "%s", VersionStr); + GAPrintHowTo(CtrlStr); + exit(EXIT_SUCCESS); + } +diff -ruN giflib-4.1.6.orig/util/rgb2gif.c giflib-4.1.6/util/rgb2gif.c +--- giflib-4.1.6.orig/util/rgb2gif.c 2017-03-29 13:56:44.741741244 -0400 ++++ giflib-4.1.6/util/rgb2gif.c 2017-03-29 15:19:12.000193442 -0400 +@@ -111,7 +111,7 @@ + } + + if (HelpFlag) { +- fprintf(stderr, VersionStr); ++ fprintf(stderr, "%s", VersionStr); + GAPrintHowTo(CtrlStr); + exit(EXIT_SUCCESS); + } +diff -ruN giflib-4.1.6.orig/util/rle2gif.c giflib-4.1.6/util/rle2gif.c +--- giflib-4.1.6.orig/util/rle2gif.c 2017-03-29 13:56:44.768740818 -0400 ++++ giflib-4.1.6/util/rle2gif.c 2017-03-29 15:19:12.018193160 -0400 +@@ -105,7 +105,7 @@ + } + + if (HelpFlag) { +- fprintf(stderr, VersionStr); ++ fprintf(stderr, "%s", VersionStr); + GAPrintHowTo(CtrlStr); + exit(EXIT_SUCCESS); + } +diff -ruN giflib-4.1.6.orig/util/text2gif.c giflib-4.1.6/util/text2gif.c +--- giflib-4.1.6.orig/util/text2gif.c 2017-03-29 13:56:44.729741433 -0400 ++++ giflib-4.1.6/util/text2gif.c 2017-03-29 15:19:11.989193614 -0400 +@@ -107,7 +107,7 @@ + } + + if (HelpFlag) { +- fprintf(stderr, VersionStr); ++ fprintf(stderr, "%s", VersionStr); + GAPrintHowTo(CtrlStr); + exit(EXIT_SUCCESS); + } diff --git a/giflib.spec b/giflib.spec index 58f8d62..e45a372 100644 --- a/giflib.spec +++ b/giflib.spec @@ -1,7 +1,7 @@ Summary: Library for manipulating GIF format image files Name: giflib Version: 4.1.6 -Release: 16%{?dist} +Release: 17%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.sourceforge.net/projects/%{name}/ @@ -11,6 +11,9 @@ BuildRequires: perl-generators Provides: libungif = %{version}-%{release} Obsoletes: libungif <= %{version}-%{release} +# Patches +Patch1: giflib-4.1.6-format-security.patch + %description The giflib package contains a shared library of functions for loading and saving GIF format image files. It is API and ABI compatible with libungif, @@ -43,6 +46,7 @@ files. %prep %setup -q +%patch1 -p1 %build %configure @@ -83,6 +87,9 @@ rm -f doc/Makefile* %{_bindir}/* %changelog +* Wed Mar 29 2017 Stephen Gallagher - 4.1.6-17 +- Fix compilation errors when -Werror=format-security + * Fri Feb 10 2017 Fedora Release Engineering - 4.1.6-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild