[ScrollZ] Fix RHBZ 1037319

[Dan Mashal]

commit b738d5546237c159f3d8ee5ffed231b7fe4e2bc0
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Wed Dec 4 14:37:55 2013 -0800

    Fix RHBZ 1037319

 ScrollZ.spec                  |    7 ++++++-
 format-security-scrollz.patch |   24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/ScrollZ.spec b/ScrollZ.spec
index b96a4bc..9df8210 100644
--- a/ScrollZ.spec
+++ b/ScrollZ.spec
@@ -10,13 +10,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u}  -n)
 BuildRequires: ncurses-devel openssl-devel glib2-devel 
 #Latest commits from github include various  bugfixes including manpage being installed to the proper directory amongst others
 Patch0: commits_rollup.patch
-
+#RHBZ 1037319
+Patch1: format-security-scrollz.patch
 %description
 ScrollZ is advanced IRC client based on ircII code. It adds features normally found in ircII scripts like Toolz, PhoEniX, GargOyle or Lice.
 
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1 
 
 %build
 %configure --with-ssl --enable-ipv6
@@ -35,6 +37,9 @@ make install DESTDIR=%{buildroot}
 %{_datadir}/scrollz
 
 %changelog
+* Wed Dec 04 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 2.2.2-6
+- Fix RHBZ 1037319 (enable "-Werror=format-security")
+
 * Fri Aug 02 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/format-security-scrollz.patch b/format-security-scrollz.patch
new file mode 100644
index 0000000..5da5ee8
--- /dev/null
+++ b/format-security-scrollz.patch
@@ -0,0 +1,24 @@
+diff -uNrp c/source/edit5.c d/source/edit5.c
+--- c/source/edit5.c	2011-04-29 01:21:18.000000000 -0700
++++ d/source/edit5.c	2013-12-04 14:02:48.347555085 -0800
+@@ -2722,7 +2722,7 @@ char *buffer;
+     }
+     while (count) {
+         sprintf(buffer," %s",thing);
+-        snprintf(thing,sizeof(thing),buffer);
++        snprintf(thing,"%s",sizeof(thing),buffer);
+         count--;
+     }
+     sprintf(buffer,"%s%s%-9s%s",thing,colnick,joiner->nick,Colors[COLOFF]);
+diff -uNrp c/source/edit6.c d/source/edit6.c
+--- c/source/edit6.c	2012-04-12 08:40:08.000000000 -0700
++++ d/source/edit6.c	2013-12-04 14:05:04.331283304 -0800
+@@ -580,7 +580,7 @@ void PrintMap() {
+         if (!tmpmap->distance || prevdist!=tmpmap->distance)
+             snprintf(tmpbuf2,sizeof(tmpbuf2),"[%s%d%s]",
+                     CmdsColors[COLLINKS].color3,tmpmap->distance,Colors[COLOFF]);
+-        else snprintf(tmpbuf2,sizeof(tmpbuf2),empty_string);
++        else snprintf(tmpbuf2,"%s",sizeof(tmpbuf2),empty_string);
+         snprintf(tmpbuf1,sizeof(tmpbuf1),"%%s%%%ds%%s%s%s%s %s",tmpmap->distance*4,
+                 CmdsColors[COLLINKS].color1,tmpmap->server,Colors[COLOFF],tmpbuf2);
+         say(tmpbuf1,CmdsColors[COLLINKS].color4,