diff options
| author |   Alon Bar-Lev <alonbl@gentoo.org> | 2012-12-22 20:51:04 +0000 |
|---|---|---|
| committer | Alon Bar-Lev <alonbl@gentoo.org> | 2012-12-22 20:51:04 +0000 |
| commit | 460ae0fc46abf3fbf84efd3adb3dc9c5ab0df3d1 (patch) | |
| tree | 23e3d9e7c5e03582d67905e4056dcff6fda4ec47 /app-crypt | |
| parent | Removed old. (diff) | |
| download | gentoo-2-460ae0fc46abf3fbf84efd3adb3dc9c5ab0df3d1.tar.gz gentoo-2-460ae0fc46abf3fbf84efd3adb3dc9c5ab0df3d1.tar.bz2 gentoo-2-460ae0fc46abf3fbf84efd3adb3dc9c5ab0df3d1.zip | |
Rework sprintf patch to remove RCS substitution in patch, as it invalidate it
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'app-crypt')
| -rw-r--r-- | app-crypt/mcrypt/ChangeLog | 6 | ||||
| -rw-r--r-- | app-crypt/mcrypt/files/mcrypt-2.6.8-sprintf.patch | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/app-crypt/mcrypt/ChangeLog b/app-crypt/mcrypt/ChangeLog index 880d2d6c776f..1ed8d28d9446 100644 --- a/app-crypt/mcrypt/ChangeLog +++ b/app-crypt/mcrypt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-crypt/mcrypt # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/mcrypt/ChangeLog,v 1.36 2012/12/22 20:31:00 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/mcrypt/ChangeLog,v 1.37 2012/12/22 20:51:04 alonbl Exp $ + + 22 Dec 2012; Alon Bar-Lev <alonbl@gentoo.org> + files/mcrypt-2.6.8-sprintf.patch, mcrypt-2.6.8-r2.ebuild: + Rework sprintf patch to remove RCS substitution in patch, as it invalidate it 22 Dec 2012; Alon Bar-Lev <alonbl@gentoo.org> +files/mcrypt-2.6.8-format-string.patch, +files/mcrypt-2.6.8-sprintf.patch, diff --git a/app-crypt/mcrypt/files/mcrypt-2.6.8-sprintf.patch b/app-crypt/mcrypt/files/mcrypt-2.6.8-sprintf.patch index 9678192b6108..a287680958bb 100644 --- a/app-crypt/mcrypt/files/mcrypt-2.6.8-sprintf.patch +++ b/app-crypt/mcrypt/files/mcrypt-2.6.8-sprintf.patch @@ -17,16 +17,10 @@ Index: mcrypt-2.6.8/src/mcrypt.c =================================================================== --- mcrypt-2.6.8.orig/src/mcrypt.c +++ mcrypt-2.6.8/src/mcrypt.c -@@ -41,10 +41,13 @@ - # include <time.h> - #endif +@@ -41,4 +41,6 @@ +/* Temporary error message can contain one file name and 1k of text */ +#define ERRWIDTH ((PATH_MAX)+1024) -+ - static char rcsid[] = - "$Id: mcrypt-2.6.8-sprintf.patch,v 1.1 2012/12/22 20:31:00 alonbl Exp $"; - -char tmperr[128]; +char tmperr[ERRWIDTH]; unsigned int stream_flag = FALSE; |