summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlkundrak <lkundrak>2007-07-04 13:31:36 +0000
committerlkundrak <lkundrak>2007-07-04 13:31:36 +0000
commit8321d69762e46ab64f101d67351b0e678a8c4607 (patch)
treea74363c028a66891415ee78461fc67b36822b41e
parent9f48d5da23616a420842a2de2dbc1ce5a94cbf49 (diff)
downloadpkgsrc_2007Q1.tar.gz
Reverted last commit. It should have been commited into HEAD instead.pkgsrc_2007Q1
-rw-r--r--graphics/gimp/Makefile4
-rw-r--r--graphics/gimp/distinfo3
-rw-r--r--graphics/gimp/patches/patch-ae19
3 files changed, 3 insertions, 23 deletions
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 4b333ca7ec9..d43b071deb8 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.152.2.2 2007/07/04 13:17:11 lkundrak Exp $
+# $NetBSD: Makefile,v 1.152.2.3 2007/07/04 13:31:36 lkundrak Exp $
DISTNAME= gimp-2.2.13
-PKGREVISION= 4
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/v2.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/v2.2/ \
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index df5d216e302..25d943a7943 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31.6.2 2007/07/04 13:17:11 lkundrak Exp $
+$NetBSD: distinfo,v 1.31.6.3 2007/07/04 13:31:39 lkundrak Exp $
SHA1 (gimp-2.2.13.tar.bz2) = 7f215396c817b2a16ef62fc2d90f98881fc91c65
RMD160 (gimp-2.2.13.tar.bz2) = cebd438c778cae175c26ae4fc4c4914f24711a9b
@@ -7,4 +7,3 @@ SHA1 (patch-aa) = 027e376c60279a561f55f22e55a8af09b6b3bd67
SHA1 (patch-ab) = ad4927755b7aff8299a9c8c2896742258b704cb3
SHA1 (patch-ac) = 48fbb6a3b486db6f05ac210c2915f9a06c9f6795
SHA1 (patch-ad) = 632c34e0fbeda69139b2b674d9c5ef80db40dcca
-SHA1 (patch-ae) = 079b081e8eb0c19d18060d9c21ea9d12df9c5cc4
diff --git a/graphics/gimp/patches/patch-ae b/graphics/gimp/patches/patch-ae
deleted file mode 100644
index f3e89842c19..00000000000
--- a/graphics/gimp/patches/patch-ae
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ae,v 1.6.6.1 2007/07/04 13:17:12 lkundrak Exp $
-
-Fix for CVE-2007-2949 heap overflow from upstream.
-
---- plug-ins/common/psd.c.orig 2007-07-04 15:11:22.000000000 +0200
-+++ plug-ins/common/psd.c
-@@ -1202,6 +1202,12 @@ seek_to_and_unpack_pixeldata(FILE* fd, g
- width = channel->width;
- height = channel->height;
-
-+ if (width > G_MAXINT16 || height > G_MAXINT16)
-+ {
-+ g_message ("Error: Invalid channel dimensions");
-+ gimp_quit ();
-+ }
-+
- IFDBG
- {
- printf("\t\t\tLayer (%d) Channel (%d:%d) Compression: %d (%s)\n",