Fix build with -Werror=format-security, bug #520984

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 47 insertions, 17 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/Manifest b/app-benchmarks/spew/Manifest
index 1b93f93b3cd9..9a11d9cdde69 100644
--- a/app-benchmarks/spew/Manifest
+++ b/app-benchmarks/spew/Manifest
@@ -2,27 +2,28 @@
 Hash: SHA256
 
 AUX fix-automake-1.13.patch 738 SHA256 b2ef8dfd2e1cd6d6b0e2dde2c87f17c62781b5844d3c64f69e8e1a6b901c61dc SHA512 d901296e786de378c669bf0e5303ccd1825d29ffa2116aba301250577abdef4a79b28e7e7a31587b373819cf940392b72b1cf0352ab4ec5d81861c72c70c76fb WHIRLPOOL 2cc08a143eb1ed793c981436aaf24390de5a696345c0af6bf32ee46da957c1d0aa8924a1d07df164fa791e682ead2a595ca0aa6c2624fe849f4b3e74ee2349c7
+AUX fix-format-security.patch 1209 SHA256 56c6e9cd07f649487d143c28ba4032d034708d785dfa85726122b4aa7f7b1790 SHA512 17437880d9780f70f3d7e6208e3bf6d0788290876b2a1c473ce2a5df25fe51ec6df91c8d950196b2d0f498eafdedd2896a36539e393c9d2429200b3ae80b6617 WHIRLPOOL 0ebdae64451f582180964e03bcd754dc2bf2156025c44fd6578510fd596cf868a6185363970fc680d43c6a8531fe25c95e9a0933310689b0a314ed4b7fe27872
 AUX fix-ncurses-tinfo.patch 1094 SHA256 a328c206fafc5399366f37bc2b47d04b843a2c7504f774cda45232bb6ccbfde0 SHA512 84afc54f824fab7c74e370b9879555edc24d1ba0139446781c0b61a72b09936acabb8f6c3151f9d5c4fe602188b65b69816cf6fa9bd80b2147a6ff8a2561065e WHIRLPOOL 4ae097ce86e50477a00d0e318692d8b8d6a22c5c85b8e0e5a591eafbdb2b0343511510967c19cca3e5789758df0087d7c151250a4c13af48e524c83e180015c4
 AUX remove-symlinks-makefile.patch 1125 SHA256 06e591faefec55e12d52576f7ac4972dc4e4d0ba550f20bac3c089c7df1253a1 SHA512 4cedf0afe234089cced001bc5f491d49c836fc3acdf2264eecdc6d5621e9130efe9b4b24ce2198ed3edd9a4ec413bb5cbf45a2803650f8525acf3a903511cccc WHIRLPOOL 45406c8d36368e8f90e6aa16b6b4adb9a8193c963f1745fe59cb3b2e7a4887985bfc60c74cffcb7a6869bcfe630401568b06023fa8d365a46f750cb9f29e4299
 DIST spew-1.0.8.tgz 162091 SHA256 200da1b4390a5e4bf91cb7278b3ad813194f0e395abc0da6296ac415e11a76cb SHA512 ec76a1e681bbaabef6cdc63ced5114a856a312e91c5ff3e0d1536221583a1c939f9308139863670695121c8c720123a6d0697491867ccafc091607888cc81b56 WHIRLPOOL 9aac2fec8b514271fcaf3e72eb6affa505fcaae274e1966e67371c7671aa8e46cf9c0ab7345b83de4ce60a6a51b72cb9e17c692839a4eb810762bc8b851bc20a
-EBUILD spew-1.0.8-r1.ebuild 1148 SHA256 9d6e16ea13a720b7c99e7d3d84c6e1d4dd9df1f61b9e8a0943b0b36ff3ab7780 SHA512 8842da2784f816f9e1505e4a928ce3bf542a40f84354d31ae7f60bd75fc35fe1ec621aaa5582047dd5ef10ed7f752d651a5293d05936ca23e66d9202ed75e369 WHIRLPOOL 617ca2b560f8b5de81f5c67d292832f77a7c4898dbd094778d8d4b4bfe4827ed3766bc53e631ee6249cdb1d8fe926ef7c073c8ba328dea0e26aa179bb27f404c
+EBUILD spew-1.0.8-r1.ebuild 1196 SHA256 3d69f6e768cd815bfaf774f2c39c8fe9ccab47c33ca4135d84710485488ead84 SHA512 b3f337ace2f92e9db6c16da8a60125898ef631122af9d0fa746b94ab3d60e8784214271ee11b7d5a05ac84211039f16023d3d7ad3bee5a13ab6cbbf75372f0cc WHIRLPOOL 77cf0a691885c625cd2225cbb48b57788804d1dd0c7b5138b3859ded6fdf5903ecb8bf556edca31aa5b249747e799423354689f39e343682747735830ffeca58
 EBUILD spew-1.0.8.ebuild 1097 SHA256 ca9d385c95dd2b365074a850d2f3a5b1b3175a1b0ccaf1c99497061ce9837df3 SHA512 e591fb380d1a640ddf30f13145ca5cec54148fded2e5ac18c4848faf093ac4c3570460f2c2d71c2bad748f3b1663b4c20595b1ccf3c63d23409a5c7bde728e24 WHIRLPOOL d7049354e71ca18ff9327bde6fa1600fc863d1e67bf7ea457b2b354c5a797b9a5e571bfe570df281a9034e9f5e0381bc89e45314d0b46ffbf490261dff600341
-MISC ChangeLog 1063 SHA256 ddd58b20b89345ee0a735558822c9fa7561a5d810cec7621fd594da5be6f14ca SHA512 09e66521b340ad188e5dbf6e053c68be706226cb0c014819bb3729126e16cc326ad4e8c5967f5e059fea427835ef6e19555bb3d630188b26e4107f6aabf1e908 WHIRLPOOL 5fcd3e36638446b9f922f1c25c637d9bfad95b2981cf4ef959a83ce3f878f84935ab433ee962817d59db826754de090c0f578095f9096c1935d05e98a37107c3
+MISC ChangeLog 1231 SHA256 f56b3c0265ae2f6d0f267bb1e99c5105ff7ee7d2eaaff9beaa65eef0294c9790 SHA512 705b7a46373c8c520105b25cfe8e385c6dbaafe988b4ffb3d4bed6ba76ac016b810f98aee0d8571f8451a9a06ac39927d4e24df99a57dba54f034ba2d6caf702 WHIRLPOOL 30cb635259124c1a8d12e2f0649add955996d2063f2632763dee07d5f96a51f024ed945fed0b7141585ce3b5588c8ce675ee563c101b56ae0389668cee504fde
 MISC metadata.xml 447 SHA256 364f375c7dadcede1d8384f71bf2ad059cbcfea4efc486e9e8e3f7a3ef78c037 SHA512 f62d684526c5cff32c9a2dce169019e3a0765f806edb22604e12443295081682126503a11d508fbc59730cf8a005b079e948bd8f7f73c63982febe554ad12256 WHIRLPOOL 1f42f7839ea0ad69a375c464d51c18b3c3108a3e478fc4cd9245618baedfe89a2a16d25d206ba016ace3793e58021998fecc57f83397378883886b7d855fefe3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUbJpLAAoJEJOE+m71LUu65QwP/AjZuoqSu1Wq4Z6OY9MN9hpH
-bfy0TNbPhozVGuJn2F7ZFhZs42RsF8lOdznGfQzXzaqnvLeZJ9cJOo1cZ/sNZocV
-SImFnKvrRBLH3jdL5qTmeaQwU7THaNdTLxpTZ1PoIzxA7TThyJ+0c5Nly8uB5UCx
-NGk79+2j+OD02QKZvLPibdw2FSm6t1520whDQCC9vf+7orA/Zwu0vcLeTesQhzC5
-wwAzZXxNhk6XyNxr+2M6kdazciR6/EPCxLHbqpZrY0mjkjW58BZ92iS8nYxTnOGN
-1Z4NVJJN2L6mX37FyF+mRb0kyrX/S/6JVpKLJQ27/y3+yFDvzL6z33BSC+SVu5oW
-usY3CCVmGsnLfYZOjmzkdxayd7MLK6vOeti4s4ddvz5xOgxX0ELOfmOL42w5njd6
-uG+nYryWGkk3yhcUzunc7coSZw8LPKhNoFxE+kxW5ORQdU1Rkc1QLjaX6TqY2JWi
-YhnmnXZO8XL0qlq28w6MjSvXqg4Nd3L238c8AruA6Wj4iD1CsfIb3D5J2sHzas2T
-4FDE1sV1OK4hjJ+z9AQXHcNxZT4cEE8prefDoKtTz13MF8QTnl4VzCxs8At0CVMb
-ubu2U3mIF1AK93Padx3RG1D0qYsWXPOdrrXEDruwIAcboSG/OJcBwjgUXfJBtuFi
-OqdNLBqBFTdpD9axDuSM
-=Jlqv
+iQIcBAEBCAAGBQJUbJ5QAAoJEJOE+m71LUu6L9YQAJLaTLpynxMKCH4fbtTnm1Am
+uqrFp5dAJM3Pqm+0qOO1ZQjWqjPSuq1zF6NheoUpY6Uiat6qK1snpepBRKA27/1r
+zJnT6OVXwsryE3cO74JFJi2Lb2nyp41m7hLhYc0SVtVA9oyCBE4EFbk2vg4PRD04
+ClDWyTURsFfxiVHv0ljbSELD63aA8z0DHFu8wR0O8SHSNCsD9erVCB09yUiZyhqi
+JlZXBrtJZUlPVSnjUd9ZeS8gOlx+oMEtg7iIBZGUR8T6b22Jb4BXoePz4vnGRvxt
+OCjMYc+kxOAFDsVCvaxVAS3N1ewqWpyxv/g9ZBTwqxeOsmVxix1f5Xs5DBkUifDH
+R7vvocgSSR0u/g7YrxV6TZF4Q9ljGAdj6ghTqwzv9lvhI/QZiNIeZu0Hov5TkV8/
+R/hXMfOGNUmX9CyX9zfSh1q0gNKoeKlebGhU3WCdj1TWbblWAcB5Zkj0CYF5YhYX
+V8ni/GCNQJ/gckTz2YNc6Uo+svV2tRRhVElPtCZJ3VPdxJjlEX4zTFA+lTVaoT5y
+rubfrxw/nvNjxarYGcnuiDEfR/DO8V3sYqQgvN6KxNeHKYcmuBwBL31hT7pFoXIo
+I622+eLKtK3l/sH2T9yhxtGR80ZjmTWWtIUg3M6MclYiO6sctMiWnT0f+3CAno0y
+aVcCA13O0sfKDjy5iFhK
+=48bC
 -----END PGP SIGNATURE-----
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