Fix broken Manifest, bug #241216. Remove leftover patch from filesdir.

(Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 x86_64)

2 files changed, 5 insertions, 72 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 1974935238b8..8ca211877fc7 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.329 2008/10/10 20:26:35 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.330 2008/10/11 15:57:03 tgurr Exp $
+
+  11 Oct 2008; Timo Gurr <tgurr@gentoo.org>
+  -files/cups-1.3.7-CVE-2008-1722.patch:
+  Fix broken Manifest, bug #241216. Remove leftover patch from filesdir.
 
   10 Oct 2008; Timo Gurr <tgurr@gentoo.org> cups-1.2.12-r8.ebuild:
   Doh, correct copy&paste error.
diff --git a/net-print/cups/files/cups-1.3.7-CVE-2008-1722.patch b/net-print/cups/files/cups-1.3.7-CVE-2008-1722.patch
deleted file mode 100644
index 908134c47ee4..000000000000
--- a/net-print/cups/files/cups-1.3.7-CVE-2008-1722.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -Naur cups-1.3.7/filter/image-png.c cups-1.3.7.new/filter/image-png.c
---- cups-1.3.7/filter/image-png.c	2007-07-11 23:46:42.000000000 +0200
-+++ cups-1.3.7.new/filter/image-png.c	2008-04-14 15:48:56.641188980 +0200
-@@ -3,7 +3,7 @@
-  *
-  *   PNG image routines for the Common UNIX Printing System (CUPS).
-  *
-- *   Copyright 2007 by Apple Inc.
-+ *   Copyright 2007-2008 by Apple Inc.
-  *   Copyright 1993-2007 by Easy Software Products.
-  *
-  *   These coded instructions, statements, and computer programs are the
-@@ -170,16 +170,56 @@
-     * Interlaced images must be loaded all at once...
-     */
- 
-+    size_t bufsize;			/* Size of buffer */
-+
-+
-     if (color_type == PNG_COLOR_TYPE_GRAY ||
- 	color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
--      in = malloc(img->xsize * img->ysize);
-+    {
-+      bufsize = img->xsize * img->ysize;
-+
-+      if ((bufsize / img->ysize) != img->xsize)
-+      {
-+	fprintf(stderr, "DEBUG: PNG image dimensions (%ux%u) too large!\n",
-+		(unsigned)width, (unsigned)height);
-+	fclose(fp);
-+	return (1);
-+      }
-+    }
-     else
--      in = malloc(img->xsize * img->ysize * 3);
-+    {
-+      bufsize = img->xsize * img->ysize * 3;
-+
-+      if ((bufsize / (img->ysize * 3)) != img->xsize)
-+      {
-+	fprintf(stderr, "DEBUG: PNG image dimensions (%ux%u) too large!\n",
-+		(unsigned)width, (unsigned)height);
-+	fclose(fp);
-+	return (1);
-+      }
-+    }
-+
-+    in = malloc(bufsize);
-   }
- 
-   bpp = cupsImageGetDepth(img);
-   out = malloc(img->xsize * bpp);
- 
-+  if (!in || !out)
-+  {
-+    fputs("DEBUG: Unable to allocate memory for PNG image!\n", stderr);
-+
-+    if (in)
-+      free(in);
-+
-+    if (out)
-+      free(out);
-+
-+    fclose(fp);
-+
-+    return (1);
-+  }
-+
-  /*
-   * Read the image, interlacing as needed...
-   */