Fix building with -Werror=format-security. Thanks to Agostino Sarubbo in bug #517576.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x215AD14D

4 files changed, 84 insertions, 19 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 8913ec0927d7..d2eff3392f35 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.219 2014/06/18 20:31:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.220 2014/09/13 23:48:31 billie Exp $
+
+  13 Sep 2014; Daniel Pielmeier <billie@gentoo.org> mjpegtools-2.1.0-r2.ebuild,
+  +files/mjpegtools-2.1.0-no_format.patch:
+  Fix building with -Werror=format-security. Thanks to Agostino Sarubbo in bug
+  #517576.
 
   18 Jun 2014; Michał Górny <mgorny@gentoo.org> mjpegtools-2.1.0-r2.ebuild:
   Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index e02196e814ea..4bd62e39e738 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,29 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX mjpegtools-2.1.0-no_format.patch 2800 SHA256 52e16f3fbc8181fb6da424c422dad2add38127f6dc570810fa7fd3efc1b8d4fd SHA512 234c02625898f67994261e00ca940bbd597c60d2060507ee1e7391ea61353e00906325aec608d2ba545a7b4725d1ad645bd9d2cd33d23669490de3646998005b WHIRLPOOL 1f68e2961eb95796190ee490ffca8a1df3c76c4e96b8bc84511baf0b755d4fdbcf6728fb86b209733da7e4723166db3911f0928e8183640f2e7b13b86f2bc649
 AUX mjpegtools-2.1.0-pic.patch 2282 SHA256 1b8c08c993d01838b6fe04094c00fd07220ae543c8f115c79ffaae32edc8c5c2 SHA512 3ad9d0b488a4fcc29fab8c0cc8322d99e63c755234c02a7fe7ad7efa974f67871460f43db05ca8097c358fdf7aafcc852967959a2abc83460c258aa38a448e28 WHIRLPOOL 6986af27769fa540706e7dd575b6d42f9a5c5e817929db2c08de2842d32c9cb361f97ecadc0b00bb37563a0be12727e4e4c6719b2dacfe3a684949589314c05a
 AUX mjpegtools-2.1.0-sdl-cflags.patch 387 SHA256 fcba002f1f12f1fd864179f2c9971acab1bf298d9a719f74ceacc231e7232a99 SHA512 67b43ab22d1358755a6e109b8eaf21b14058c6a4f4dc511e27162c4205274eacbe4fb9016a5c8a3938ca071f6d4f1898801ed3ab0571b011aab170771a1b7602 WHIRLPOOL 1eb9815a12d425acc8345a825258f7e71c2e362e79cf064484edc4dfdd67164f4935c1b9de44f8460e791340e315fd9a40127d1899a45a81b74c6a7a880e24c8
 DIST mjpegtools-2.1.0.tar.gz 1844336 SHA256 864f143d7686377f8ab94d91283c696ebd906bf256b2eacc7e9fb4dddcedc407 SHA512 10d3288f47d7cc4de87fa63f65e0fd4bd0a9af95db77155eecccecae7a7e60ebab83eaec44cf7a2c3d9e627f0cc086eda208abee1a7a74cbf3f85e87bb979ac5 WHIRLPOOL e2e869a328e95dab22331ea1f03a669553ee01682a8e76d27d33da8b1cda46e042d252ff2b1974d08b2109ab1a664f4d5247ee92d7846876d496c7e63b472af9
 EBUILD mjpegtools-2.1.0-r1.ebuild 2360 SHA256 201d2b5558ec039c603ebc2a8e7ccbc9ba95ebb0a0547ba4952d5ee3fac9249e SHA512 4383f412617e14865b0305421f4e35110c92b0db75d02506255f32cae04374ab952cc794674057e89b9568884946aeb2c55dcf142465dd4e6abe6fcee81eaafd WHIRLPOOL 2bc08ee9c62570b5f970430e6f49b0c01f67cc24a84a4853dacf69343c5e1b0efd5aa1245e5881641250c2dbce4c08ca33357a2bc64e2e2c605e74b4fec661b0
-EBUILD mjpegtools-2.1.0-r2.ebuild 3292 SHA256 92662fd08de473b4bdf10e38665323ead3d03195eb4dda952e97fda477af5895 SHA512 8d30011d5523c8f5fc2f992b0fcb76ba9852c2fb0099eef720743ec29ffdaa07bb2177af5b71f8c0f171adb11bea6f8a4dea7e6b664bc64d2b05af2755b72c0b WHIRLPOOL a72ceaaa1e7bd87e2b9ca40604fc6b7d5bf27a0658e381abe8c24560e4c7a22c76e694618638bfa46a0f9709c9657946e84b9d5255c9abcabcb0397989d49dab
-MISC ChangeLog 36555 SHA256 a9b727b9cda9221dc7deef5fac6e62465e596917ca8f84eab7d0750365e62d74 SHA512 e0cfb78832355f2a667d7e995ed9956864da34132bf280b89d5871bc9ee9f73f554da90f2c3119127fa30a906d75447b20e8d4d72bf148b8b4d2198341428b38 WHIRLPOOL 1c82464fb924f63323626d0ddb957dd3759bc779d3b8384e69c89918d327f90c5f1b2eb73561d06bb5e25dd2f717a4204a2b927a17e8266951f0c4e1faa2dd14
+EBUILD mjpegtools-2.1.0-r2.ebuild 3347 SHA256 48b43646908ee274f14c3e59344094154c2580d21e971051887276e9633e6e3a SHA512 c428f8d8b449710044aea24360ef84330f99b233ef7d65878d09e2b3b2219a1a3ab0925fb084a611425b8cfb6e1178e0bbe60bad3a960df44e1f814c3a101c20 WHIRLPOOL 2c996ea3b5c7811f0007051cddaff3a0459b4de0951fd36faae753bc09ebc36484528fbf07dfee1c60499f643fc7188625d082de8d5b14c9d78cc00934c04f06
+MISC ChangeLog 36769 SHA256 b8816a8eadd159eceb0654a623ae8268b97858856c8e28295edf0dd4cada9984 SHA512 904aa157f7c9ccbd4c5aa330a3cf47bac5f5b0f08f00f630725ac2a1ba1bcb9bc89972220b3d061c0bc9ec59531b4332597a0115492470614da63e3bdd19774e WHIRLPOOL 16a4f7ca03e65d5e9b79723adf2832eb53757c095e72647f9f711afe71ed42e2dd8999f0db35a0190bf0112d12618f8f2e637b66e05fe8b8a73a3a8aa8f7ae26
 MISC metadata.xml 372 SHA256 1a22854e4e0449f6e855f21962f4af646a81eeb7cfa0de905c87ffb52a7081b7 SHA512 a1b0beff78a45667fb4095c203c59c0a63f262ac486b98858f7432fe1f4295f51e9c59c056149c1408e413c5e975abb41b971d1036179ecdea48772a04a5b222 WHIRLPOOL 90544f87533aaf15dba62efcea8ebf4039f29e6e3fef86a5a6907e2245c1f443132f967d65a6651393ad3e64ecedc1b0b73365662d2e770cb74f3abe1fa09b7f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTofcRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOMqYP/Rl7yW+d5E01RssQCogeTTX0
-hTE1TbDbD9PM5Mtsh9dAzz+q3NDfH8auAOf69gMhTRm0mlTgjatT3wVkuMyUZ4FX
-bK/OXVpf5UYayT21G9niPALZtLcSJGCIFYYz0/euAehjnfs8D1h9Tf8F5ewZLvAb
-mvlXX+iNeERAku5HXYHCpARvHUe49GVrZzNfne0cRIXYgJvq6NGlltXsAQKnr0Vx
-fEZsrO9Wy41C9Q/BWDY/Mfh9onC7QN6uDtIeCODx8OF43Uosqa+hu98l2xCINlwp
-hG/O9IhETtR5R/9wy/CZdE3Cy7WvoT5wPL/7vWZBCoMnFqtZ1SiIdYR/7k7WHk3r
-8/P3lMzaXayQVKEIa1QmlTCzCLdCVIeSyLb9QfrYn1DNcFzS3OXPDfd8IdvcP0Ao
-ni6jAJ9vhlP0h6hwL9e/2R2TFZr+hXJRXwItL3SbcWQMSeqCUAYbrlgSQoZua973
-W9VRuV8+SNkNanLtCuta+rg8iCFLIGgsYgK6+7qIOoyI2VWSw4V69gsneevYnvf3
-EKrj8RWrSfmuV49FKMpeZ1q6RmCWDmU8LQP2Btdi7X7nusUQRS3NXoBvpcVZ2Cj/
-j7o5YiaEvAcq1rNWmT/Q/F7lu/iJz3F/xbc1r/Z+6ON4tL+CKoGtHZI/NmRYDRGe
-S9pBDd3VPDOrsexWgRo6
-=Ch3i
+iEYEAREIAAYFAlQU188ACgkQlcuUeyFa0U2llwCglTVwURgV3f6zN4WVvW8lDyCw
+KxIAoPV5+IdtINGA0FRSLg7nMcd/SzDN
+=qgKE
 -----END PGP SIGNATURE-----
diff --git a/media-video/mjpegtools/files/mjpegtools-2.1.0-no_format.patch b/media-video/mjpegtools/files/mjpegtools-2.1.0-no_format.patch
new file mode 100644
index 000000000000..20ed99628fb6
--- /dev/null
+++ b/media-video/mjpegtools/files/mjpegtools-2.1.0-no_format.patch
@@ -0,0 +1,70 @@
+--- ./lavtools/lav_io.c.orig	2014-07-27 17:48:21.474622974 +0100
++++ ./lavtools/lav_io.c	2014-07-27 17:48:48.838881166 +0100
+@@ -926,7 +926,7 @@ lav_file_t *lav_open_input_file(char *fi
+             strcat(errmsg, ", quicktime");
+ #endif
+ 	    strcat(errmsg, ").\n");
+-            fprintf(stderr, errmsg);
++        fprintf(stderr, "%s", errmsg);
+ 	    free(lav_fd);
+ 	    internal_error = ERROR_FORMAT; /* Format not recognized */
+ 	    return 0;
+--- ./lavtools/lavtrans.c.orig	2014-07-27 17:58:09.410282056 +0100
++++ ./lavtools/lavtrans.c	2014-07-27 17:59:24.769016140 +0100
+@@ -275,7 +275,7 @@ int main(int argc, char ** argv)
+    if (process_image_frame != -1)
+    {
+       nv = el_get_video_frame(vbuff, process_image_frame, &el);
+-      sprintf(imgfname,outfile);
++      sprintf(imgfname, "%s", outfile);
+       imgfd = fopen(imgfname,"wb");
+       if (imgfd==0) system_error("opening image file","fopen");
+       res = fwrite(vbuff,nv,1,imgfd);
+--- ./lavtools/jpeg2yuv.c.orig	2014-07-27 18:00:55.600900476 +0100
++++ ./lavtools/jpeg2yuv.c	2014-07-27 18:01:36.848301893 +0100
+@@ -451,7 +451,7 @@ static int generate_YUV4MPEG(parameters_
+            
+            if (firstjpeg) {
+                p = firstjpeg;
+-               sprintf(jpegname, firstjpeg);
++               sprintf(jpegname, "%s", firstjpeg);
+                firstjpeg = NULL;
+            }
+            else {
+--- ./mplex/main.cpp.orig	2014-07-27 18:11:38.282143657 +0100
++++ ./mplex/main.cpp	2014-07-27 18:06:40.352252415 +0100
+@@ -614,7 +614,7 @@ bool CmdLineMultiplexJob::ParseWorkaroun
+                 if( flag_table[flag].longname != 0 )
+                     message += sep;
+             }
+-            mjpeg_error( message.c_str() );
++            mjpeg_error( "%s", message.c_str() );
+             return false;
+         }
+ 
+--- ./yuvfilters/yuvkineco.c.orig	2014-07-27 18:15:01.476097522 +0100
++++ ./yuvfilters/yuvkineco.c	2014-07-27 18:15:29.540366245 +0100
+@@ -48,7 +48,7 @@ buf_debug(char *buf, FILE *fp, const cha
+     } else {
+ #ifdef MJPEGTOOLS
+       buf[n] = '\0';
+-      mjpeg_debug(buf);
++      mjpeg_debug("%s", buf);
+ #else
+       fputs(buf, stderr);
+ #endif
+--- ./yuvfilters/yuvfilters.h.orig	2014-07-27 18:37:02.712645244 +0100
++++ ./yuvfilters/yuvfilters.h	2014-07-27 19:13:28.156101800 +0100
+@@ -34,9 +34,9 @@ extern "C" {
+ 
+ #ifdef MJPEGTOOLS
+ # define perror(MSG) mjpeg_error("%s: %s", MSG, strerror(errno))
+-# define WERROR(MSG) mjpeg_error(MSG)
+-# define WERRORL(MSG) mjpeg_error(MSG)
+-# define WWARN(MSG) mjpeg_warn(MSG)
++# define WERROR(MSG) mjpeg_error("%s", MSG)
++# define WERRORL(MSG) mjpeg_error("%s", MSG)
++# define WWARN(MSG) mjpeg_warn("%s", MSG)
+ #else
+ # define WERROR(MSG) write(2, MSG "\n", sizeof MSG)
+ # define WERRORL(MSG) do { write(2, MSG, strlen(MSG)); write(2, "\n", 1); } while (0)
diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild
index 3af43c7789a5..60e2561997bf 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r2.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/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild,v 1.3 2014/06/18 20:31:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild,v 1.4 2014/09/13 23:48:31 billie Exp $
 
 EAPI=5
 
@@ -49,6 +49,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-pic.patch
 	# https://sourceforge.net/p/mjpeg/bugs/139/
 	epatch "${FILESDIR}"/${P}-sdl-cflags.patch
+	epatch "${FILESDIR}"/mjpegtools-2.1.0-no_format.patch
 	eautoreconf
 	sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
 }