Cleaned out files dir.

Package-Manager: portage-2.1.2.9

5 files changed, 13 insertions, 149 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/Manifest b/media-libs/libexif/Manifest
index 43358ed7d33f..70c1d2b25baa 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -1,18 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX libexif-0.5-CAN-2005-0664.patch 860 RMD160 1c179d8c5e00180a4f7e28f27e3dd5f852f51ca6 SHA1 1b4bd2c6f9a9cd894438bf167e998e2bc6130f26 SHA256 2affec46d9081bfacfeb5d92ce7092636451f0e752407aed0d3603c03a8f2f86
-MD5 a8085215f21d54708b3bfca3e1aeb612 files/libexif-0.5-CAN-2005-0664.patch 860
-RMD160 1c179d8c5e00180a4f7e28f27e3dd5f852f51ca6 files/libexif-0.5-CAN-2005-0664.patch 860
-SHA256 2affec46d9081bfacfeb5d92ce7092636451f0e752407aed0d3603c03a8f2f86 files/libexif-0.5-CAN-2005-0664.patch 860
-AUX libexif-0.5.12-recurse.patch 2335 RMD160 bf53cceb4bea5c8237d5ca08b6b7706bfc41d0e7 SHA1 18485ab916f1a9890acd734c1f1cfaefe1f5718a SHA256 efaf4b3f9a2b98bd958877550715af39b2b0ab957d0ad9bf3727eb765636c0ea
-MD5 62b4010332297c9c79f534f541343c1e files/libexif-0.5.12-recurse.patch 2335
-RMD160 bf53cceb4bea5c8237d5ca08b6b7706bfc41d0e7 files/libexif-0.5.12-recurse.patch 2335
-SHA256 efaf4b3f9a2b98bd958877550715af39b2b0ab957d0ad9bf3727eb765636c0ea files/libexif-0.5.12-recurse.patch 2335
-AUX libexif-0.6-CAN-2005-0664.patch 833 RMD160 403973d73c0478a2fdc6bace478585fe71ff285f SHA1 6c3a14eaa8810ba5cf879ed99e49ab397eda2250 SHA256 151ec10aa5ff2ab620c2dc68fa397db003bdd7e762e2eebdcd477db9e662f31b
-MD5 656d5fb19cf1cdef7132ccb6fa72db2b files/libexif-0.6-CAN-2005-0664.patch 833
-RMD160 403973d73c0478a2fdc6bace478585fe71ff285f files/libexif-0.6-CAN-2005-0664.patch 833
-SHA256 151ec10aa5ff2ab620c2dc68fa397db003bdd7e762e2eebdcd477db9e662f31b files/libexif-0.6-CAN-2005-0664.patch 833
 AUX libexif-0.6.12-86740.patch 627 RMD160 39809a5aff5c2bc4c4d15ea6df6bf6589780e9f8 SHA1 10855340f03a4e0810c3205f976dacf7cf77f7c4 SHA256 017162e24b270ea2964ebb5e2a9b141ee9aa346fe4d0df509452f54b055adb4e
 MD5 a218f0d3896c793cf66fc505f743ef3b files/libexif-0.6.12-86740.patch 627
 RMD160 39809a5aff5c2bc4c4d15ea6df6bf6589780e9f8 files/libexif-0.6.12-86740.patch 627
@@ -68,10 +56,10 @@ EBUILD libexif-0.6.15.ebuild 1723 RMD160 0d35bddd76db5f0c4bf6efe809a850995406f5c
 MD5 7e714e4f76d67e8007d60d3b0ebf57fe libexif-0.6.15.ebuild 1723
 RMD160 0d35bddd76db5f0c4bf6efe809a850995406f5c0 libexif-0.6.15.ebuild 1723
 SHA256 a3db9a9ffafbce0076c20d3ead561069d351c7b049d87bfe124bb7b40e8e3a64 libexif-0.6.15.ebuild 1723
-MISC ChangeLog 11715 RMD160 e18246bcc13361979810f66dd3ef978b553406b6 SHA1 c8af81617e397e3b82afb4f46eca3c7d5a6dc0f9 SHA256 c276bc65e1ebf64777c2193a454cf3abcebc64f2c58d10e4ab55495d03e87c3c
-MD5 1b5918b3fc94352e17503419553a58fb ChangeLog 11715
-RMD160 e18246bcc13361979810f66dd3ef978b553406b6 ChangeLog 11715
-SHA256 c276bc65e1ebf64777c2193a454cf3abcebc64f2c58d10e4ab55495d03e87c3c ChangeLog 11715
+MISC ChangeLog 11863 RMD160 238288d47af4988b03421187a74db6efd52ce518 SHA1 abe0beda7627f365a3b827b97c0b58f21e08249b SHA256 c9066500cbf747bb891b9c8c9107e82d97f6a9a1184d89264e9d9835a496ad15
+MD5 5eb189fbcea7a015d0a603c79aa1f9ec ChangeLog 11863
+RMD160 238288d47af4988b03421187a74db6efd52ce518 ChangeLog 11863
+SHA256 c9066500cbf747bb891b9c8c9107e82d97f6a9a1184d89264e9d9835a496ad15 ChangeLog 11863
 MISC metadata.xml 259 RMD160 d1f5ea37202987c54db9697175a55e5609386654 SHA1 d7234631415b27fa166f13d440f0ea6e4d3f1044 SHA256 14f1bab6a31d434eda6319b2783239e50179d75501edb6e255bb6c3e665418cf
 MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259
 RMD160 d1f5ea37202987c54db9697175a55e5609386654 metadata.xml 259
@@ -91,7 +79,7 @@ SHA256 6d243c81c582e4fcf3b86f046f23029745fdfe450c7267ff4967b7af019036c4 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGZSKdjC1Anjf1NmMRAoxkAJ0b1oyW/gYhhMNKokTJLwsorxvUnACePh2c
-J9D25EM/Vt5LxMqNyy5h5wo=
-=jWPC
+iD8DBQFGZSQBjC1Anjf1NmMRAmOiAJ0QHse3/5c1EF2UPEd/vn3oLHEk8gCfZDW6
+ksN7nBgNtOV5pkaW4E4B5MY=
+=Phgp
 -----END PGP SIGNATURE-----
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