[SCM] mjpegtools/master: Avoid format security warning and build breakage

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 724aa3bea2e8013f7fdbda1a8ffcf7c31b52b05f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Sep 2 15:04:34 2012 +0200

    Avoid format security warning and build breakage

diff --git a/debian/patches/16_fix_ftbfs_format_security.patch b/debian/patches/16_fix_ftbfs_format_security.patch
new file mode 100644
index 0000000..d044c77
--- /dev/null
+++ b/debian/patches/16_fix_ftbfs_format_security.patch
@@ -0,0 +1,87 @@
+From: Reinhard Tartler
+Subject: Avoid format security warning and build breakage
+
+--- a/lavtools/lav_io.c
++++ b/lavtools/lav_io.c
+@@ -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;
+--- a/lavtools/lavtrans.c
++++ b/lavtools/lavtrans.c
+@@ -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);
+@@ -307,7 +307,7 @@ int main(int argc, char ** argv)
+             break;
+ 
+          case 'i':
+-            sprintf(imgfname,outfile,nframe);
++            sprintf(imgfname,"%s%d",outfile,nframe);
+             imgfd = fopen(imgfname,"wb");
+             if (imgfd==0) system_error("opening image file","fopen");
+             res = fwrite(vbuff,nv,1,imgfd);
+--- a/lavtools/jpeg2yuv.c
++++ b/lavtools/jpeg2yuv.c
+@@ -451,7 +451,7 @@ static int generate_YUV4MPEG(parameters_
+            
+            if (firstjpeg) {
+                p = firstjpeg;
+-               sprintf(jpegname, firstjpeg);
++               sprintf(jpegname, "%s", firstjpeg);
+                firstjpeg = NULL;
+            }
+            else {
+--- a/mplex/main.cpp
++++ b/mplex/main.cpp
+@@ -615,7 +615,7 @@ bool CmdLineMultiplexJob::ParseWorkaroun
+                     message += sep;
+             }
+             while( flag_table[flag].longname != 0 );
+-            mjpeg_error( message.c_str() );
++            mjpeg_error( "%s", message.c_str() );
+             return false;
+         }
+ 
+--- a/yuvfilters/yuvkineco.c
++++ b/yuvfilters/yuvkineco.c
+@@ -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
+--- a/yuvfilters/main.c
++++ b/yuvfilters/main.c
+@@ -53,7 +53,7 @@ usage(char **argv)
+   char buf[1024];
+ 
+   sprintf(buf, "Usage: %s %s", argv[0], (*MODULE.usage)());
+-  WERRORL(buf);
++  mjpeg_error("%s", buf);
+ }
+ 
+ int
+@@ -91,7 +91,7 @@ main(int argc, char **argv)
+   if (ret == Y4M_ERR_EOF)
+     ret = Y4M_OK;
+   if (ret != Y4M_OK)
+-    WERRORL(y4m_strerr(ret));
++    mjpeg_error("%s", y4m_strerr(ret));
+ 
+  FINI:
+   for (h = hreader; h; h = hreader) {
diff --git a/debian/patches/series b/debian/patches/series
index f1cd89d..3d856d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
 13_fix_lav2yuv_linking.diff
 14_fix_mplex_linking.diff
 15_fix_qttoy4m_linking.diff
+16_fix_ftbfs_format_security.patch

-- 
mjpegtools packaging