Add fix for format-security, bug #553314

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

5 files changed, 115 insertions, 17 deletions

diff --git a/dev-python/pyfltk/ChangeLog b/dev-python/pyfltk/ChangeLog
index fa182edcc190..c5b02d674555 100644
--- a/dev-python/pyfltk/ChangeLog
+++ b/dev-python/pyfltk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pyfltk
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/ChangeLog,v 1.45 2015/06/23 15:59:54 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/ChangeLog,v 1.46 2015/06/26 12:05:17 jlec Exp $
+
+  26 Jun 2015; Justin Lecher <jlec@gentoo.org>
+  +files/pyfltk-1.3.0-format-security.patch, pyfltk-1.3.0-r2.ebuild,
+  pyfltk-1.3.3.ebuild:
+  Add fix for format-security, bug #553314
 
 *pyfltk-1.3.3 (23 Jun 2015)
 *pyfltk-1.3.0-r2 (23 Jun 2015)
diff --git a/dev-python/pyfltk/Manifest b/dev-python/pyfltk/Manifest
index 35ddfa00f05a..e8d6ed02d25c 100644
--- a/dev-python/pyfltk/Manifest
+++ b/dev-python/pyfltk/Manifest
@@ -1,22 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX fltk_wrap.patch 411 SHA256 f690b276171302a96dcdd4511115023e5a973c71c2dd8f5edbae559289b62938 SHA512 1f55c0068e614c80c0ca0fd7671db18b699945e81074c4d734b1cc49456b1b4646bb1231ec7e3276c3dd405d5ea7d6c33b2a81f3d2f8bac488afd8bf1ec1b11a WHIRLPOOL c7cdb337af606e595e9197a7d5b3c45a7288fb3cc97dceedb8d49b19d1d10b7711abe534f7f5b0f476b20b150f067111114876360dc3b6c3f7f5c954afb5f48b
 AUX ignore-func.patch 248 SHA256 95c6dfae9368aeb5ee8d2ce708c6e743926e03496cd155897b3203b2d8097f5b SHA512 3c73c3fcf79ab18abcf7331ffef6cc7ce916c0c6f3c8f430a0fead1686fd779e9faa3a4cedb3ddaa64ecac6e1445bcd5c08cfb41b942ec01204e17299616113e WHIRLPOOL aed15dcb25d4abf9d3c4567461ad23329fbef83f3029d2b103d225a7ae68fb4772a6142745eed81c461439a66160d88e8b4be00713b284161e95c6fa593c31e8
+AUX pyfltk-1.3.0-format-security.patch 2430 SHA256 f78154d407b6d4cc0b66933749a9c2204a794b510e763574e7245732e12304f4 SHA512 60c06f84b02b8ccce31e71152cf126c3ba03aa74630a70ebc3259ec7c2018b64850de6187e74e6b39729a3031c846e1763554ac3f271e74ce51c8c318a409934 WHIRLPOOL 76240d5e4e6655acb05a76619276e4011c34cbb5b704fcb6fd0819cc532ee478effa8eecee2ad35805ce587f710e8c0229fa8b3d9c4c6a65d85b737b5bed52ce
 AUX pyfltk-1.3.0-linux-3.x-detection.patch 679 SHA256 ccc7ce0949cdacace00b71c1e438f343c87255fd8fbfa6fc9aad1911670edc55 SHA512 0201aa68ea7fae626d0ac37642efbc398b39cdccefa80c7ccea4a208d3e9d671d5a5be2efd5aa779d1eadfdb183d0450a9220295127646ee1ff552f534cc9d98 WHIRLPOOL 67c29af042618dc0fcfd093ae1bfa3c22544bae181465a10a384589a55c508fa942441923f57fcd8923e2f728338bb94417d93980f51d165e357ce27004aa0fa
 DIST pyFltk-1.3.0.tar.gz 915600 SHA256 c52852d21ee17d495185259b46ac9603d683edde7d7e6d4b6f9268da4ee3de57 SHA512 908a6d9581741454440da92fe921f0a2a01be86a5ec01cbbf2d953eb5f0437efd8e635d7bff6c18015afc877a984872a6592df834709f93a1287307e17fbcc61 WHIRLPOOL 62281ef5c798986f1af82da53887fe40a6cd4f4bcfe7fab8d60fc7f3c4ad9cc2d481ced6b2e2bad7638ef843b9dcf396aa246838f173d2afaeaac530e0236d3b
 DIST pyFltk-1.3.3.tar.gz 946763 SHA256 246b92c99b8d5610532456a4c956b355f6140514324916cf35efbe6468c4a188 SHA512 dd4bbef8e82d455237dd085622e78e046ac522449fe63610ee5405c24d759482a89aeab07435fefb5223db78cc1f810f1eca8355afb1d0ff3e4b5e10b73bef8f WHIRLPOOL 8d94349db36cd78eeee722e75c9e1cef088e0f2743bd522eb0496f76faf70a159d6987902f308478a992bd7f2cb62a5bb770a80eee25c3e9feaf08b513956ce1
 EBUILD pyfltk-1.3.0-r1.ebuild 1080 SHA256 1a909c4b6a599e83058e0aa76f9b0bac77ff946415f851ee9f199116f3573196 SHA512 baec8c571105d5e2e958428e8a517e4cd6790da33bb48c8e5b0e7902640e6525e4fe8c87abee4f1c2e05dd6a4a882e111ee6827345855d7fa205003d798346b6 WHIRLPOOL d01c860e435c2f67e37a3df57007f4d2a056b9d36b852501604748f631ff640e88cbefd3c43a55d0b6633c077f16568eedc1a9b0576070edcfbb75bdf2477b67
-EBUILD pyfltk-1.3.0-r2.ebuild 1142 SHA256 a4d84476b0c6ce5f92b1c4400855042e6b92af5ace01060f71ec241994c9b702 SHA512 604354a35f756ecc3f1eb987e9502221228d8a022a408cc5e9eab72c52d2c23e749ce47c643eb2de43f0f29c6d471719f05721164347adfb1531a3c6076286f4 WHIRLPOOL 9ce790e982cdc31b254638c7227b46c615036141cb149fc922e9bdbd8778b6fdbe7404a339245aa16a175f017b19e562bba35156e157e08acf52b8960d52ae5c
-EBUILD pyfltk-1.3.3.ebuild 1144 SHA256 3ed2c4b68e52c7291affcdab69e03bab0b3466a58fa3562cc273f4c5f43a9de2 SHA512 1213b244ecf4db0ba1aeea678855ebb6ac2a41c680bc8b61279df4242dc254f297201a156774f4b4c8e86c64680f1da744b4df50858188b94a6717ef69f27d4c WHIRLPOOL 36002ff2b7c67c5945ca127c63846f6e18fe434db083e458600860c74bf61db985235e6e722826fa023f8ead0321fa856a1de72db4be83bfa3a14fe1d13c9f2f
-MISC ChangeLog 6082 SHA256 8cf942a97e23e811723c6a40fbafc41677f6377d723419ddea6d2258b466bd04 SHA512 49a1834da2c7a319b908bdfa55c6fa9215e735acfdaaab1139dff69ebe51bc988b8c1ffa9e34a862680bffdb4913126c5de685db0c82514df9e1143866e08cfe WHIRLPOOL fdb7ce4dc9b0f5fed1196c5d245289c87efdbb9f9450aa5d3a3ef84bf4d0217bbd595ca941f2382443a13c0e246c23ef56f1e94f026ff77f2a635749558eb36a
+EBUILD pyfltk-1.3.0-r2.ebuild 1182 SHA256 94a4a21c4901ade4e02ce94448de67d64abfb3db98ec69fd15d070694832a53c SHA512 582ee017ac3b08f1f61c57044734a30d3f4012d20653fae142a2db3625d0e4ffc70d559947d632d06d4e2a6b81d90a94a913588c61367df0e7a89d5ed515cfd6 WHIRLPOOL 4045cdbb52813faba93a2538e0f5a58e7f8a790ca851c4327749521fe978da5d1be43c5b1bd7f0ba4840114657b93a1c35ffb43721d9fa04a4d2cbd2abb63553
+EBUILD pyfltk-1.3.3.ebuild 1144 SHA256 91a5dd2aef1cf6443984bacd048ee021e27acf9cd81f0c25d21ddc6b66b7d1e7 SHA512 c439ce321ee8b915094c052421c51266bf4dc0df49e71da2254807f4a243af1a7748ed04b589a421ff324815c9e766bb863bf7b68d6b45a40ff2e14c6aa934c3 WHIRLPOOL 0bc97bc941e746c3ee3f51c644900b22070f41cd28103b805a971ccb8c2fff1c1097f63ea73027a76c76bcabd82ac3917a753559b66e1d969d8ae9aed12ac9db
+MISC ChangeLog 6262 SHA256 f7c94c22562c9d01493bd17b12da8e8791a4896ef2ab5f46a9be0539fb72a285 SHA512 bce39c3700aa1e9033b86fbaa9d5ec0176716c39ff2f8abd24fe81b17e45dc5a14f283792bd36fab130e8ce0b1ed8fce655abd245b4119c92a6f3f4c76d94fc6 WHIRLPOOL 6c0973ed9ef1cd7932ea02330ff68dc6837308ce26847a0b3d1980ea35e50adcc7b740d812ede9933f072d1ab5f92355f4942ce71c11b57c91af17cf9d538c85
 MISC metadata.xml 392 SHA256 21f03a0476266b10dc9cd86c42de0881fc153ac1fbcdbfffe372d7626a937561 SHA512 e44498afe5a37129341fd0ae88985777c1f87f0592f3ec0e063d25c97773b890090b23ea7c38089eba308e1512eaedea2d05b1b5e168bb9a7f6591becbbc3e5c WHIRLPOOL 88a105e53df4edfb005d6df84b8ceccec10e85d83c302636278777837b96baa03c61a8140adf30ae090ee3c8d8c3b95ad31b5f40ab3bd43c48ab839d5d4c42f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iKYEAREIAGYFAlWJgnxfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDdDQUM1OUY0ODkzMERBREU1NUQ1RjJBRkIy
-OEVDMjEzQjgwNzJCMEQACgkQso7CE7gHKw3frQCeIiLDV/BUpEggnC8q1iIWf1VI
-n6oAn3Ne5uEfvaegG3QEOQ/f7CUYMFSX
-=9qr0
+iQJ8BAEBCgBmBQJVjT/+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiwvQP/iJTQKQsPZ70O/SGebR/Flku
+c5Gbo9K2p762cFjWI9blJQnEJKMzfsgtEZ4uSbvHtCbZtnWlWLH3f7nvD6uM8am+
+FJzgsBlUg9Zy+OSZsqXvWq8BXfydSjiS5DrSLPcBsV2Cg84T0mhTo8zMz5x0F2sd
+AyAps6KbvTzyd40ydGtY2NDhLroXxqk31SWUd3HhRn5hgxTVITHsPB2RD3yZwnJA
+HSFMf0UsBOZstwCKVzpAPDX1rXbbk3aQM5WBMSAzcTT1zSgvQv8weytgxggQ8Vot
+ghjcRnNlh7p6AWRE6FykshW+ldmi6egBOoC26FkCvrLm/yeIsIDzYwHkNJIDLWmK
+PeO1v2HLbxPdU1ZeNoVWPW41CK9LEoXq8yMqBSus3hoH2INDD5w13RlwVj9m+GzZ
+jYobAnC62MGt4hgHTK4Mahc3l9W3a4t/ityERCVfAI+MpbMbL2zInj7ohZtKwOtD
+UP9zBQRt8RvjWUE0teAZ6upv7di2p99uNFicBheOn5FfEWUyMeKeiA5NrNgKKQdw
+vqW82CXQtmyx0frEB4y2MNTmPKCEq0Ql75JbCeKfn+F1v8Tj05MmuBDrYxjtplrw
+vg8XT8Ka3+3uDUV5UVrtYsidpfNlKFL5K/WvrtRSf+si1s8Lm8N2gPnqMrgSq/TN
+hzpOs+iMF88I6hfYxWZB
+=eClv
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pyfltk/files/pyfltk-1.3.0-format-security.patch b/dev-python/pyfltk/files/pyfltk-1.3.0-format-security.patch
new file mode 100644
index 000000000000..f29b7b3c9221
--- /dev/null
+++ b/dev-python/pyfltk/files/pyfltk-1.3.0-format-security.patch
@@ -0,0 +1,74 @@
+ python/fltk_wrap.cpp | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/python/fltk_wrap.cpp b/python/fltk_wrap.cpp
+index 9c16f59..ad42e89 100644
+--- a/python/fltk_wrap.cpp
++++ b/python/fltk_wrap.cpp
+@@ -5238,13 +5238,13 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, PyObject *args)
+ 
+   const char *fl_vararg_input(const char *label, const char *deflt = 0) {
+     const char* result = 0;
+-    result = fl_input(label, deflt);
++    result = fl_input("%s", deflt, label);
+     return result;
+   };
+ 
+   const char *fl_vararg_password(const char *label, const char *deflt = 0) {
+     const char* result = 0;
+-    result = fl_password(label, deflt);
++    result = fl_password("%s", deflt, label);
+     return result;
+   };
+ 
+@@ -5282,20 +5282,20 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, PyObject *args)
+ 
+   void fl_mt_message(const char* text) {
+     Py_BEGIN_ALLOW_THREADS;
+-    fl_message(text);
++    fl_message("%s", text);
+     Py_END_ALLOW_THREADS;
+   };
+ 
+   void fl_mt_alert(const char* text) {
+     Py_BEGIN_ALLOW_THREADS;
+-    fl_alert(text);
++    fl_alert("%s", text);
+     Py_END_ALLOW_THREADS;
+   };
+ 
+   int fl_mt_ask(const char* text) {
+     int status = 0;
+     Py_BEGIN_ALLOW_THREADS;
+-    status = fl_ask(text);
++    status = fl_ask("%s", text);
+     Py_END_ALLOW_THREADS;
+     return status;
+   };
+@@ -5303,7 +5303,7 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, PyObject *args)
+   int fl_mt_choice(const char *q,const char *b0,const char *b1,const char *b2) {
+     int status = 0;
+     Py_BEGIN_ALLOW_THREADS;
+-    status = fl_choice(q, b0, b1, b2);
++    status = fl_choice("%s", b0, b1, b2, q);
+     Py_END_ALLOW_THREADS;
+     return status;
+   };
+@@ -5311,7 +5311,7 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, PyObject *args)
+   const char *fl_mt_input(const char *label, const char *deflt = 0) {
+     const char* result = 0;
+     Py_BEGIN_ALLOW_THREADS;
+-    result = fl_input(label, deflt);
++    result = fl_input("%s", deflt, label);
+     Py_END_ALLOW_THREADS;
+     return result;
+   };
+@@ -5319,7 +5319,7 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, PyObject *args)
+   const char *fl_mt_password(const char *label, const char *deflt = 0) {
+     const char* result = 0;
+     Py_BEGIN_ALLOW_THREADS;
+-    result = fl_password(label, deflt);
++    result = fl_password("%s", deflt, label);
+     Py_END_ALLOW_THREADS;
+     return result;
+   };
diff --git a/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild b/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild
index 3c6972caaa88..94b64cad2cd4 100644
--- a/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild
+++ b/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild,v 1.1 2015/06/23 15:59:54 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild,v 1.2 2015/06/26 12:05:17 jlec Exp $
 
 # FIXME: MakeSwig.py execution should be made work from pyfltk-1.1.5.ebuild
 
 EAPI=5
+
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 flag-o-matic
@@ -25,9 +26,12 @@ RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
-PATCHES=( "${FILESDIR}"/${P}-linux-3.x-detection.patch
-		"${FILESDIR}"/ignore-func.patch
-		"${FILESDIR}"/fltk_wrap.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-linux-3.x-detection.patch
+	"${FILESDIR}"/${P}-format-security.patch
+	"${FILESDIR}"/ignore-func.patch
+	"${FILESDIR}"/fltk_wrap.patch
+	)
 
 python_prepare_all() {
 	# Disable installation of documentation and tests.
diff --git a/dev-python/pyfltk/pyfltk-1.3.3.ebuild b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
index 500d39368ce3..704380b02f7d 100644
--- a/dev-python/pyfltk/pyfltk-1.3.3.ebuild
+++ b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/pyfltk-1.3.3.ebuild,v 1.1 2015/06/23 15:59:54 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/pyfltk-1.3.3.ebuild,v 1.2 2015/06/26 12:05:17 jlec Exp $
 
 # FIXME: MakeSwig.py execution should be made work from pyfltk-1.1.5.ebuild
 
 EAPI=5
+
 PYTHON_COMPAT=( python{3_3,3_4} )
 
 inherit distutils-r1 flag-o-matic
@@ -25,8 +26,11 @@ DEPEND=">=x11-libs/fltk-1.3.0:1[opengl]"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_PN}
-PATCHES=( "${FILESDIR}"/ignore-func.patch
-		"${FILESDIR}"/fltk_wrap.patch )
+
+PATCHES=(
+	"${FILESDIR}"/ignore-func.patch
+	"${FILESDIR}"/fltk_wrap.patch
+	)
 
 python_prepare_all() {
 	# Disable installation of documentation and tests.