[mboxgrep] Fix FTBFS with -Werror=format-security (#1037192, #1106178)

Yaakov Selkowitz yselkowitz at fedoraproject.org
Tue Jul 8 04:46:48 UTC 2014


commit d66af0a1fcac85d14abfea9ed5b58068ab8c306d
Author: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
Date:   Mon Jun 30 15:53:04 2014 -0500

    Fix FTBFS with -Werror=format-security (#1037192, #1106178)

 mboxgrep-0.7.9-format-security.patch |   13 +++++++++++++
 mboxgrep.spec                        |   14 +++++++-------
 2 files changed, 20 insertions(+), 7 deletions(-)
---
diff --git a/mboxgrep-0.7.9-format-security.patch b/mboxgrep-0.7.9-format-security.patch
new file mode 100644
index 0000000..cd08bfe
--- /dev/null
+++ b/mboxgrep-0.7.9-format-security.patch
@@ -0,0 +1,13 @@
+diff --git a/src/info.c b/src/info.c
+index 02abdff..6e897b7 100644
+--- a/src/info.c
++++ b/src/info.c
+@@ -31,7 +31,7 @@ print_wrap (char *str, int len, int *n)
+      /* {{{  */
+ {
+   *n += len;
+-  fprintf (stdout, str);
++  fprintf (stdout, "%s", str);
+   if (*n >= 50)
+     {
+       fprintf (stdout, "\n");
diff --git a/mboxgrep.spec b/mboxgrep.spec
index 788fca5..d8eb480 100644
--- a/mboxgrep.spec
+++ b/mboxgrep.spec
@@ -1,13 +1,13 @@
 Summary: Displays e-mail messages matching a pattern
 Name: mboxgrep
 Version: 0.7.9
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0: mboxgrep-debug.diff
+Patch1: mboxgrep-0.7.9-format-security.patch
 URL: http://www.mboxgrep.org
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: zlib-devel, bzip2-devel, pcre-devel
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -23,18 +23,15 @@ folders.
 %prep
 %setup -q
 %patch0 -p 1 -b .debug
+%patch1 -p1 -b .format
 
 %build
 %configure
 %{__make} %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
 %makeinstall
 
-%clean
-rm -rf %{buildroot}
-
 %post
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
 
@@ -44,13 +41,16 @@ if [ $1 = 0 ]; then
 fi
 
 %files
-%defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
 %{_bindir}/mboxgrep
 %{_mandir}/man1/mboxgrep.1*
 %{_infodir}/mboxgrep.info*
 
 %changelog
+* Mon Jun 30 2014 Yaakov Selkowitz <yselkowi at redhat.com> - 0.7.9-17
+- Fix FTBFS with -Werror=format-security (#1037192, #1106178)
+- Cleanup spec
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.9-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list