Cleaned out files dir.

(Portage version: 2.1.2.9)

4 files changed, 6 insertions, 130 deletions

diff --git a/media-libs/libexif/ChangeLog b/media-libs/libexif/ChangeLog
index 00e8852ea524..30af3b8194a0 100644
--- a/media-libs/libexif/ChangeLog
+++ b/media-libs/libexif/ChangeLog
@@ -1,12 +1,15 @@
 # ChangeLog for media-libs/libexif
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/ChangeLog,v 1.77 2007/06/05 08:45:07 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/ChangeLog,v 1.78 2007/06/05 08:51:04 eradicator Exp $
 
   05 Jun 2007; Jeremy Huddleston <eradicator@gentoo.org>
   -libexif-0.5.12-r3.ebuild, libexif-0.6.12-r4.ebuild,
-  libexif-0.6.13-r1.ebuild, -libexif-0.6.13-r2.ebuild:
+  libexif-0.6.13-r1.ebuild, -libexif-0.6.13-r2.ebuild,
+  -files/libexif-0.5-CAN-2005-0664.patch,
+  -files/libexif-0.5.12-recurse.patch,
+  -files/libexif-0.6-CAN-2005-0664.patch:
   Removing old insecure versions and just leaving keyword laggers on remaining
-  insecure versions: arm, mips, s390, sh on <0.6.15
+  insecure versions: arm, mips, s390, sh on <0.6.15.  Cleaned out files dir.
 
   05 Jun 2007; Jeremy Huddleston <eradicator@gentoo.org>
   libexif-0.6.15.ebuild, libexif-0.6.15-r1.ebuild:
diff --git a/media-libs/libexif/files/libexif-0.5-CAN-2005-0664.patch b/media-libs/libexif/files/libexif-0.5-CAN-2005-0664.patch
deleted file mode 100644
index 7621c49651c1..000000000000
--- a/media-libs/libexif/files/libexif-0.5-CAN-2005-0664.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- libexif-0.5.12/libexif/exif-data.c.buffer-overflow	2005-03-08 05:24:31.000000000 -0500
-+++ libexif-0.5.12/libexif/exif-data.c	2005-03-08 05:26:30.000000000 -0500
-@@ -551,7 +551,7 @@
- #endif
- 
- 	/* Byte order (offset 6, length 2) */
--	if (size < 12)
-+	if (size < 14)
- 		return;
- 	if (!memcmp (d + 6, "II", 2))
- 		data->priv->order = EXIF_BYTE_ORDER_INTEL;
-@@ -570,12 +570,18 @@
- 	printf ("IFD 0 at %i.\n", (int) offset);
- #endif
- 
-+	if (size < 6 + 4 + offset)
-+		return;
-+
- 	/* Parse the actual exif data (offset 14) */
- 	exif_data_load_data_content (data, data->ifd[EXIF_IFD_0], d + 6,
- 				     size - 6, offset);
- 
- 	/* IFD 1 offset */
- 	n = exif_get_short (d + 6 + offset, data->priv->order);
-+	if (size < 6 + offset + 2 + 12 * n + 4)
-+		return;
-+
- 	offset = exif_get_long (d + 6 + offset + 2 + 12 * n, data->priv->order);
- 	if (offset) {
- #ifdef DEBUG
diff --git a/media-libs/libexif/files/libexif-0.5.12-recurse.patch b/media-libs/libexif/files/libexif-0.5.12-recurse.patch
deleted file mode 100644
index a877c7f22ac2..000000000000
--- a/media-libs/libexif/files/libexif-0.5.12-recurse.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -Naurp libexif-0.5.12.orig/libexif/exif-data.c libexif-0.5.12/libexif/exif-data.c
---- libexif-0.5.12.orig/libexif/exif-data.c	2005-05-09 13:40:51.000000000 -0700
-+++ libexif-0.5.12/libexif/exif-data.c	2005-05-09 13:43:26.000000000 -0700
-@@ -172,9 +172,10 @@ exif_data_load_data_thumbnail (ExifData 
- }
- 
- static void
--exif_data_load_data_content (ExifData *data, ExifContent *ifd,
--			     const unsigned char *d,
--			     unsigned int ds, unsigned int offset)
-+exif_data_load_data_content_recurse (ExifData *data, ExifContent *ifd,
-+				     const unsigned char *d,
-+				     unsigned int ds, unsigned int offset,
-+				     unsigned int level)
- {
- 	ExifLong o, thumbnail_offset = 0, thumbnail_length = 0;
- 	ExifShort n;
-@@ -182,6 +183,11 @@ exif_data_load_data_content (ExifData *d
- 	unsigned int i;
- 	ExifTag tag;
- 
-+	if (level > 150)
-+	  {
-+	    return 0;
-+	  }
-+
- 	/* Read the number of entries */
- 	n = exif_get_short (d + offset, data->priv->order);
- #ifdef DEBUG
-@@ -205,16 +213,16 @@ exif_data_load_data_content (ExifData *d
- 					   data->priv->order);
- 			switch (tag) {
- 			case EXIF_TAG_EXIF_IFD_POINTER:
--				exif_data_load_data_content (data,
--					data->ifd[EXIF_IFD_EXIF], d, ds, o);
-+				exif_data_load_data_content_recurse (data,
-+					data->ifd[EXIF_IFD_EXIF], d, ds, o, level + 1);
- 				break;
- 			case EXIF_TAG_GPS_INFO_IFD_POINTER:
--				exif_data_load_data_content (data,
--					data->ifd[EXIF_IFD_GPS], d, ds, o);
-+				exif_data_load_data_content_recurse (data,
-+					data->ifd[EXIF_IFD_GPS], d, ds, o, level + 1);
- 				break;
- 			case EXIF_TAG_INTEROPERABILITY_IFD_POINTER:
--				exif_data_load_data_content (data,
--					data->ifd[EXIF_IFD_INTEROPERABILITY], d, ds, o);
-+				exif_data_load_data_content_recurse (data,
-+					data->ifd[EXIF_IFD_INTEROPERABILITY], d, ds, o, level + 1);
- 				break;
- 			case EXIF_TAG_JPEG_INTERCHANGE_FORMAT:
- #ifdef DEBUG
-@@ -252,6 +260,14 @@ exif_data_load_data_content (ExifData *d
- }
- 
- static void
-+exif_data_load_data_content (ExifData *data, ExifContent *ifd,
-+			     const unsigned char *d,
-+			     unsigned int ds, unsigned int offset)
-+{
-+  exif_data_load_data_content_recurse (data, ifd, d, ds, offset, 0);
-+}
-+
-+static void
- exif_data_save_data_content (ExifData *data, ExifContent *ifd,
- 			     unsigned char **d, unsigned int *ds,
- 			     unsigned int offset)
diff --git a/media-libs/libexif/files/libexif-0.6-CAN-2005-0664.patch b/media-libs/libexif/files/libexif-0.6-CAN-2005-0664.patch
deleted file mode 100644
index 0a1e73fa51a9..000000000000
--- a/media-libs/libexif/files/libexif-0.6-CAN-2005-0664.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- libexif-0.6.9/libexif/exif-data.c~	2005-03-03 22:54:52.333049248 +0100
-+++ libexif-0.6.9/libexif/exif-data.c	2005-03-03 22:50:57.117807400 +0100
-@@ -640,7 +640,7 @@
- #endif
- 
- 	/* Byte order (offset 6, length 2) */
--	if (ds < 12)
-+	if (ds < 14)
- 		return;
- 	if (!memcmp (d + 6, "II", 2))
- 		data->priv->order = EXIF_BYTE_ORDER_INTEL;
-@@ -659,12 +659,18 @@
- 	printf ("IFD 0 at %i.\n", (int) offset);
- #endif
- 
-+	if (ds < 6 + 4 + offset)
-+		return;
-+
- 	/* Parse the actual exif data (offset 14) */
- 	exif_data_load_data_content (data, data->ifd[EXIF_IFD_0], d + 6,
- 				     ds - 6, offset);
- 
- 	/* IFD 1 offset */
- 	n = exif_get_short (d + 6 + offset, data->priv->order);
-+	if (ds < 6 + offset + 2 + 12 * n + 4)
-+		return;
-+
- 	offset = exif_get_long (d + 6 + offset + 2 + 12 * n, data->priv->order);
- 	if (offset) {
- #ifdef DEBUG