summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2014-11-19 13:40:03 +0000
committerAnthony G. Basile <blueness@gentoo.org>2014-11-19 13:40:03 +0000
commit777ed686be1b12f605e17b640e0b402b5a05853d (patch)
tree65cff258e16be3eee20d251e59e66830e0d4f9fb /app-benchmarks
parentFix bug #529764 (diff)
downloadgentoo-2-777ed686be1b12f605e17b640e0b402b5a05853d.tar.gz
gentoo-2-777ed686be1b12f605e17b640e0b402b5a05853d.tar.bz2
gentoo-2-777ed686be1b12f605e17b640e0b402b5a05853d.zip
Fix build with -Werror=format-security, bug #520984
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Diffstat (limited to 'app-benchmarks')
-rw-r--r--app-benchmarks/spew/ChangeLog6
-rw-r--r--app-benchmarks/spew/files/fix-format-security.patch24
-rw-r--r--app-benchmarks/spew/spew-1.0.8-r1.ebuild3
3 files changed, 31 insertions, 2 deletions
diff --git a/app-benchmarks/spew/ChangeLog b/app-benchmarks/spew/ChangeLog
index 679d867e8db8..079bb86d4252 100644
--- a/app-benchmarks/spew/ChangeLog
+++ b/app-benchmarks/spew/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-benchmarks/spew
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/spew/ChangeLog,v 1.8 2014/11/19 13:22:12 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/spew/ChangeLog,v 1.9 2014/11/19 13:40:03 blueness Exp $
+
+ 19 Nov 2014; Anthony G. Basile <blueness@gentoo.org>
+ +files/fix-format-security.patch, spew-1.0.8-r1.ebuild:
+ Fix build with -Werror=format-security, bug #520984
*spew-1.0.8-r1 (19 Nov 2014)
diff --git a/app-benchmarks/spew/files/fix-format-security.patch b/app-benchmarks/spew/files/fix-format-security.patch
new file mode 100644
index 000000000000..dd34d875bd0e
--- /dev/null
+++ b/app-benchmarks/spew/files/fix-format-security.patch
@@ -0,0 +1,24 @@
+diff -Naur spew-1.0.8.orig/src/spew.cpp spew-1.0.8/src/spew.cpp
+--- spew-1.0.8.orig/src/spew.cpp 2010-05-14 01:06:18.000000000 -0400
++++ spew-1.0.8/src/spew.cpp 2014-11-19 08:39:31.806338597 -0500
+@@ -285,7 +285,7 @@
+ PATTERN_LOOKUP[Job::PATTERN_USER_DEFINED],
+ PATTERN_LOOKUP[Job::PATTERN_USER_DEFINED],
+ PATTERN_LOOKUP[DEFAULT_PATTERN]);
+- fprintf(stdout, outStr);
++ fprintf(stdout, "%s", outStr);
+
+ fprintf(stdout, "\nReport bugs to Andrew Patterson <andrew.patterson@hp.com>.\n");
+ }
+diff -Naur spew-1.0.8.orig/src/SpewTuiStatisticsWindow.cpp spew-1.0.8/src/SpewTuiStatisticsWindow.cpp
+--- spew-1.0.8.orig/src/SpewTuiStatisticsWindow.cpp 2008-05-13 00:47:17.000000000 -0400
++++ spew-1.0.8/src/SpewTuiStatisticsWindow.cpp 2014-11-19 08:39:52.527339540 -0500
+@@ -278,7 +278,7 @@
+ "");
+ if (mSpewTui->getCurrentIteration() > 0)
+ {
+- int len = snprintf(NULL, 0, (char *)mTotalRunTime.getElapsedTimeStr().c_str());
++ int len = snprintf(NULL, 0, "%s", (char *)mTotalRunTime.getElapsedTimeStr().c_str());
+ mvwprintw(mWindow,
+ RUNTIME_FIELD_STARTY,
+ RUNTIME_FIELD_STARTX + RUNTIME_FIELD_WIDTH - len,
diff --git a/app-benchmarks/spew/spew-1.0.8-r1.ebuild b/app-benchmarks/spew/spew-1.0.8-r1.ebuild
index 9aa684f8409c..afb2400d77ab 100644
--- a/app-benchmarks/spew/spew-1.0.8-r1.ebuild
+++ b/app-benchmarks/spew/spew-1.0.8-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/spew/spew-1.0.8-r1.ebuild,v 1.1 2014/11/19 13:22:12 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/spew/spew-1.0.8-r1.ebuild,v 1.2 2014/11/19 13:40:03 blueness Exp $
EAPI=4
@@ -20,6 +20,7 @@ DEPEND="static? ( sys-libs/ncurses[-gpm] dev-libs/popt[static-libs] )
RDEPEND="${DEPEND}"
src_prepare() {
+ epatch "${FILESDIR}"/fix-format-security.patch
epatch "${FILESDIR}"/fix-automake-1.13.patch
epatch "${FILESDIR}"/remove-symlinks-makefile.patch
epatch "${FILESDIR}"/fix-ncurses-tinfo.patch