From b0716eac4e800a0ea53e1b949250f671702f28a0 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Tue, 30 Oct 2012 15:39:24 -0400
Subject: apply workaround to CVE-2012-4527

--- mcrypt-2.6.8.orig/src/mcrypt.c
+++ mcrypt-2.6.8/src/mcrypt.c
@@ -41,6 +41,8 @@
 # include <time.h>
 #endif
 
+#define WIDTH 80
+
 static char rcsid[] =
     "$Id: mcrypt.c,v 1.2 2007/11/07 17:10:21 nmav Exp $";
 
@@ -482,7 +484,7 @@
 #ifdef HAVE_STAT
       if (stream_flag == FALSE) {
 	 if (is_normal_file(file[i]) == FALSE) {
-	    sprintf(tmperr,
+	    snprintf(tmperr, WIDTH,
 		    _
 		    ("%s: %s is not a regular file. Skipping...\n"),
 		    program_name, file[i]);
@@ -501,7 +503,7 @@
 	    dinfile = file[i];
 	 if ((isatty(fileno((FILE *) (stdin))) == 1)
 	     && (stream_flag == TRUE) && (force == 0)) {	/* not a tty */
-	    sprintf(tmperr,
+	    snprintf(tmperr, WIDTH,
 		    _
 		    ("%s: Encrypted data will not be read from a terminal.\n"),
 		    program_name);
@@ -520,7 +522,7 @@
 	    </td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=6958eb58e9b26e9f3172c40e8115667c9167d05d'>refs</a><a href='/guix/log/gnu/packages/image.scm'>log</a><a class='active' href='/guix/tree/gnu/packages/image.scm?id=6958eb58e9b26e9f3172c40e8115667c9167d05d'>tree</a><a href='/guix/commit/gnu/packages/image.scm?id=6958eb58e9b26e9f3172c40e8115667c9167d05d'>commit</a><a href='/guix/diff/gnu/packages/image.scm?id=6958eb58e9b26e9f3172c40e8115667c9167d05d'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/image.scm'>
<input type='hidden' name='id' value='6958eb58e9b26e9f3172c40e8115667c9167d05d'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/tree/?id=6958eb58e9b26e9f3172c40e8115667c9167d05d'>root</a>/<a href='/guix/tree/gnu?id=6958eb58e9b26e9f3172c40e8115667c9167d05d'>gnu</a>/<a href='/guix/tree/gnu/packages?id=6958eb58e9b26e9f3172c40e8115667c9167d05d'>packages</a>/<a href='/guix/tree/gnu/packages/image.scm?id=6958eb58e9b26e9f3172c40e8115667c9167d05d'>image.scm</a></div><div class='content'>blob: 8cba9c298b15e372232a887f39276d91684886d3 (<a href='/guix/about/gnu/packages/image.scm?id=6958eb58e9b26e9f3172c40e8115667c9167d05d'>about</a>) (<a href='/guix/plain/gnu/packages/image.scm?id=6958eb58e9b26e9f3172c40e8115667c9167d05d'>plain</a>)
<table summary='blob content' class='blob'>
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
<a id='n2' href='#n2'>2</a>
<a id='n3' href='#n3'>3</a>
<a id='n4' href='#n4'>4</a>
<a id='n5' href='#n5'>5</a>
<a