From 3cee23bd7a852892eebf203aac7b1b279c6ed61e Mon Sep 17 00:00:00 2001
From: drochner <drochner@pkgsrc.org>
Date: Wed, 16 Dec 2009 19:16:49 +0000
Subject: update to 2.6.8 changes: -bugfixes -translation updates

---
 graphics/gimp/Makefile         |  5 ++---
 graphics/gimp/distinfo         |  9 ++++-----
 graphics/gimp/patches/patch-ad | 33 ---------------------------------
 3 files changed, 6 insertions(+), 41 deletions(-)
 delete mode 100644 graphics/gimp/patches/patch-ad

(limited to 'graphics')

diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 1eb52a3a79e..78c20a4b584 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.187 2009/11/13 17:29:50 drochner Exp $
+# $NetBSD: Makefile,v 1.188 2009/12/16 19:16:49 drochner Exp $
 
-DISTNAME=	gimp-2.6.7
-PKGREVISION=	2
+DISTNAME=	gimp-2.6.8
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v2.6/ \
 		${MASTER_SITE_GNU:=gimp/v2.6/} \
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index 7b8ae922e14..ec3e2e79155 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.50 2009/11/13 17:29:50 drochner Exp $
+$NetBSD: distinfo,v 1.51 2009/12/16 19:16:49 drochner Exp $
 
-SHA1 (gimp-2.6.7.tar.bz2) = 0661d162fecfd907e183ce42853dd5b9d3cb4c51
-RMD160 (gimp-2.6.7.tar.bz2) = c576674ba6547e4d31c34d6bb82c4d416addbaf1
-Size (gimp-2.6.7.tar.bz2) = 16341756 bytes
+SHA1 (gimp-2.6.8.tar.bz2) = a550943f086abc9bf6b96d576741337b7186a4f4
+RMD160 (gimp-2.6.8.tar.bz2) = da02fedcc00ebaac04bfd21c153a7130d3ff5e08
+Size (gimp-2.6.8.tar.bz2) = 16342377 bytes
 SHA1 (patch-aa) = 52d9b1995e47b3ae34510fef074c7000f2527adb
 SHA1 (patch-ab) = 4f5ba210bc69db55f79b67f0238aafc13992c050
 SHA1 (patch-ac) = b1f4b802eebbb2d2145e0e282e65d48a0409a6b8
-SHA1 (patch-ad) = 7b4111b98e3db75ed17acdb31bdfeded1fb78149
diff --git a/graphics/gimp/patches/patch-ad b/graphics/gimp/patches/patch-ad
deleted file mode 100644
index e3783a601ec..00000000000
--- a/graphics/gimp/patches/patch-ad
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2009/11/13 17:29:51 drochner Exp $
-
---- plug-ins/file-bmp/bmp-read.c.orig	2009-08-03 22:17:25.000000000 +0200
-+++ plug-ins/file-bmp/bmp-read.c
-@@ -424,7 +424,8 @@ ReadBMP (const gchar  *name,
-       return -1;
-     }
- 
--  if (Bitmap_Head.biWidth < 0)
-+  if (Bitmap_Head.biWidth < 0 ||
-+      ABS (Bitmap_Head.biHeight) < 0)
-     {
-       g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-                    _("'%s' is not a valid BMP file"),
-@@ -448,6 +449,18 @@ ReadBMP (const gchar  *name,
-       return -1;
-     }
- 
-+  /* protect against integer overflows caused by malicious BMPs */
-+
-+  if (((guint64) Bitmap_Head.biWidth) * Bitmap_Head.biBitCnt > G_MAXINT32 ||
-+      ((guint64) Bitmap_Head.biWidth) * ABS (Bitmap_Head.biHeight) > G_MAXINT32 ||
-+      ((guint64) Bitmap_Head.biWidth) * ABS (Bitmap_Head.biHeight) * 4 > G_MAXINT32)
-+    {
-+      g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-+                   _("'%s' is not a valid BMP file"),
-+                   gimp_filename_to_utf8 (filename));
-+      return -1;
-+    }
-+
-   /* Windows and OS/2 declare filler so that rows are a multiple of
-    * word length (32 bits == 4 bytes)
-    */
-- 
cgit v1.2.3