old

(Portage version: 2.2_rc33/cvs/Linux i686)

3 files changed, 5 insertions, 155 deletions

diff --git a/media-gfx/jhead/ChangeLog b/media-gfx/jhead/ChangeLog
index 5070985803db..68039089a4f5 100644
--- a/media-gfx/jhead/ChangeLog
+++ b/media-gfx/jhead/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/jhead
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/ChangeLog,v 1.107 2009/05/20 17:57:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/ChangeLog,v 1.108 2009/05/21 08:59:12 maekke Exp $
+
+  21 May 2009; Markus Meier <maekke@gentoo.org> -jhead-2.84-r1.ebuild,
+  -files/jhead-2.84-bug243238.patch:
+  old
 
   20 May 2009; Raúl Porcel <armin76@gentoo.org> jhead-2.86.ebuild:
   ia64/sparc stable wrt #268864
diff --git a/media-gfx/jhead/files/jhead-2.84-bug243238.patch b/media-gfx/jhead/files/jhead-2.84-bug243238.patch
deleted file mode 100644
index 4ed8ff5c715b..000000000000
--- a/media-gfx/jhead/files/jhead-2.84-bug243238.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-this patch fixes gentoo bug #243238 (CVE-2008-{4640,4641})
-
-diff -ru jhead-2.84.orig/jhead.c jhead-2.84/jhead.c
---- jhead-2.84.orig/jhead.c	2008-10-04 18:10:35.000000000 +0200
-+++ jhead-2.84/jhead.c	2008-11-28 18:51:52.000000000 +0100
-@@ -295,44 +295,88 @@
- 
- 
- //--------------------------------------------------------------------------
-+// Escape an argument such that it is interpreted literally by the shell
-+// (returns the number of written characters)
-+//--------------------------------------------------------------------------
-+static int shellescape(char* to, const char* from)
-+{
-+    int i, j;
-+    i = j = 0;
-+
-+    // Enclosing characters in double quotes preserves the literal value of
-+    // all characters within the quotes, with the exception of $, `, and \.
-+    to[j++] = '"';
-+    while(from[i])
-+    {
-+#ifdef _WIN32
-+        // Under WIN32, there isn't really anything dangerous you can do with 
-+        // escape characters, plus windows users aren't as sercurity paranoid.
-+        // Hence, no need to do fancy escaping.
-+        to[j++] = from[i++];
-+#else
-+        switch(from[i]) {
-+            case '"':
-+            case '$':
-+            case '`':
-+            case '\\':
-+                to[j++] = '\\';
-+            default:
-+                to[j++] = from[i++];
-+        }
-+#endif 
-+        if (j >= PATH_MAX) ErrFatal("max path exceeded");
-+    }
-+    to[j++] = '"';
-+    return j;
-+}
-+
-+
-+//--------------------------------------------------------------------------
- // Apply the specified command to the JPEG file.
- //--------------------------------------------------------------------------
- static void DoCommand(const char * FileName, int ShowIt)
- {
-     int a,e;
--    char ExecString[PATH_MAX*2];
--    char TempName[PATH_MAX+1];
-+    char ExecString[PATH_MAX*3];
-+    char TempName[PATH_MAX+10];
-     int TempUsed = FALSE;
- 
-     e = 0;
- 
--    // Make a temporary file in the destination directory by changing last char.
--    strcpy(TempName, FileName);
--    a = strlen(TempName)-1;
--    TempName[a] = (char)(TempName[a] == 't' ? 'z' : 't');
-+    // Generate an unused temporary file name in the destination directory
-+    // (a is the number of characters to copy from FileName)
-+    a = strlen(FileName)-1;
-+    while(a > 0 && FileName[a-1] != '/') a--;
-+    memcpy(TempName, FileName, a);
-+    strcpy(TempName+a, "XXXXXX");
-+    mkstemp(TempName);
-+    if(!TempName[0]) {
-+        ErrFatal("Cannot find available temporary file name");
-+    }
-+
-+
- 
-     // Build the exec string.  &i and &o in the exec string get replaced by input and output files.
-     for (a=0;;a++){
-         if (ApplyCommand[a] == '&'){
-             if (ApplyCommand[a+1] == 'i'){
-                 // Input file.
--                e += sprintf(ExecString+e, "\"%s\"",FileName);
-+                e += shellescape(ExecString+e, FileName);
-                 a += 1;
-                 continue;
-             }
-             if (ApplyCommand[a+1] == 'o'){
-                 // Needs an output file distinct from the input file.
--                e += sprintf(ExecString+e, "\"%s\"",TempName);
-+                e += shellescape(ExecString+e, TempName);
-                 a += 1;
-                 TempUsed = TRUE;
--                unlink(TempName);// Remove any pre-existing temp file
-                 continue;
-             }
-         }
-         ExecString[e++] = ApplyCommand[a];
-         if (ApplyCommand[a] == 0) break;
-     }
--
-+ShowIt = 1;
-     if (ShowIt) printf("Cmd:%s\n",ExecString);
- 
-     errno = 0;
-@@ -638,7 +682,7 @@
-                 ErrFatal("Orientation screwup");
-             }
- 
--            sprintf(RotateCommand, "jpegtran -%s -outfile &o &i", Argument);
-+            sprintf(RotateCommand, "jpegtran -trim -%s -outfile &o &i", Argument);
-             ApplyCommand = RotateCommand;
-             DoCommand(FileName, FALSE);
-             ApplyCommand = NULL;
-@@ -657,7 +701,7 @@
-                 strcpy(ThumbTempName_out, FileName);
-                 strcat(ThumbTempName_out, ".tho");
-                 SaveThumbnail(ThumbTempName_in);
--                sprintf(RotateCommand,"jpegtran -%s -outfile \"%s\" \"%s\"",
-+                sprintf(RotateCommand,"jpegtran -trim -%s -outfile \"%s\" \"%s\"",
-                     Argument, ThumbTempName_out, ThumbTempName_in);
- 
-                 if (system(RotateCommand) == 0){
diff --git a/media-gfx/jhead/jhead-2.84-r1.ebuild b/media-gfx/jhead/jhead-2.84-r1.ebuild
deleted file mode 100644
index 6ffa7b12935c..000000000000
--- a/media-gfx/jhead/jhead-2.84-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/jhead-2.84-r1.ebuild,v 1.6 2008/12/01 15:51:59 ranger Exp $
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Exif Jpeg camera setting parser and thumbnail remover"
-HOMEPAGE="http://www.sentex.net/~mwandel/jhead"
-SRC_URI="http://www.sentex.net/~mwandel/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-bug243238.patch
-}
-
-src_compile() {
-	tc-export CC
-	emake || die "emake failed."
-}
-
-src_install() {
-	dobin ${PN} || die "dobin failed."
-	dodoc *.txt
-	dohtml *.html
-	doman ${PN}.1.gz
-}