diff options
| author | ghen <ghen@pkgsrc.org> | 2007-05-26 17:36:01 +0000 |
|---|---|---|
| committer | ghen <ghen@pkgsrc.org> | 2007-05-26 17:36:01 +0000 |
| commit | a9f96d4261121d7d44483624ce245fed37dffb97 (patch) | |
| tree | cfe77f773731a1cf4506908f976ced64e86dab75 | |
| parent | b13d5ab820f0c0c629b8579046a7d6b51a125db6 (diff) | |
| download | pkgsrc-a9f96d4261121d7d44483624ce245fed37dffb97.tar.gz | |
Pullup ticket 2098 - requested by tron
security fix for gimp
- pkgsrc/graphics/gimp/Makefile patch
- pkgsrc/graphics/gimp/distinfo 1.33 via patch
- pkgsrc/graphics/gimp/patches/patch-ac 1.14
Module Name: pkgsrc
Committed By: tron
Date: Sat May 26 15:00:23 UTC 2007
Modified Files:
pkgsrc/graphics/gimp: Makefile distinfo
Added Files:
pkgsrc/graphics/gimp/patches: patch-ac
Log Message:
Add patch from GIMP SVN repository to fix the vulnerability reported
in CVE-2007-2356. Bump package revision.
| -rw-r--r-- | graphics/gimp/Makefile | 4 | ||||
| -rw-r--r-- | graphics/gimp/distinfo | 3 | ||||
| -rw-r--r-- | graphics/gimp/patches/patch-ac | 51 |
3 files changed, 55 insertions, 3 deletions
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index dc7f20ce7ac..dd967bc9902 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.152 2007/03/21 12:05:46 wiz Exp $ +# $NetBSD: Makefile,v 1.152.2.1 2007/05/26 17:36:01 ghen Exp $ DISTNAME= gimp-2.2.13 -PKGREVISION= 2 +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 fae7136a11a..80042c2f1ac 100644 --- a/graphics/gimp/distinfo +++ b/graphics/gimp/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.31 2006/08/26 07:44:04 adam Exp $ +$NetBSD: distinfo,v 1.31.6.1 2007/05/26 17:36:01 ghen Exp $ SHA1 (gimp-2.2.13.tar.bz2) = 7f215396c817b2a16ef62fc2d90f98881fc91c65 RMD160 (gimp-2.2.13.tar.bz2) = cebd438c778cae175c26ae4fc4c4914f24711a9b Size (gimp-2.2.13.tar.bz2) = 12930670 bytes SHA1 (patch-aa) = 027e376c60279a561f55f22e55a8af09b6b3bd67 SHA1 (patch-ab) = ad4927755b7aff8299a9c8c2896742258b704cb3 +SHA1 (patch-ac) = 48fbb6a3b486db6f05ac210c2915f9a06c9f6795 SHA1 (patch-ad) = 632c34e0fbeda69139b2b674d9c5ef80db40dcca diff --git a/graphics/gimp/patches/patch-ac b/graphics/gimp/patches/patch-ac new file mode 100644 index 00000000000..3fe5e4d7a1b --- /dev/null +++ b/graphics/gimp/patches/patch-ac @@ -0,0 +1,51 @@ +$NetBSD: patch-ac,v 1.13.6.1 2007/05/26 17:36:02 ghen Exp $ + +--- plug-ins/common/sunras.c.orig 2007-04-17 22:11:23.000000000 +0100 ++++ plug-ins/common/sunras.c 2007-05-26 15:40:09.000000000 +0100 +@@ -102,8 +102,7 @@ + gint32 image_ID, + gint32 drawable_ID); + +-static void set_color_table (gint32, L_SUNFILEHEADER *, unsigned char *); +- ++static void set_color_table (gint32, L_SUNFILEHEADER *, const guchar *); + static gint32 create_new_image (const gchar *filename, + guint width, + guint height, +@@ -865,19 +864,20 @@ + static void + set_color_table (gint32 image_ID, + L_SUNFILEHEADER *sunhdr, +- guchar *suncolmap) ++ const guchar *suncolmap) + { +- int ncols, j; +- guchar ColorMap[256*3]; ++ guchar ColorMap[256 * 3]; ++ gint ncols, j; + + ncols = sunhdr->l_ras_maplength / 3; +- if (ncols <= 0) return; ++ if (ncols <= 0) ++ return; + +- for (j = 0; j < ncols; j++) ++ for (j = 0; j < MIN (ncols, 256); j++) + { +- ColorMap[j*3] = suncolmap[j]; +- ColorMap[j*3+1] = suncolmap[j+ncols]; +- ColorMap[j*3+2] = suncolmap[j+2*ncols]; ++ ColorMap[j * 3 + 0] = suncolmap[j]; ++ ColorMap[j * 3 + 1] = suncolmap[j + ncols]; ++ ColorMap[j * 3 + 2] = suncolmap[j + 2 * ncols]; + } + + #ifdef DEBUG +@@ -886,6 +886,7 @@ + printf ("%3d: 0x%02x 0x%02x 0x%02x\n", j, + ColorMap[j*3], ColorMap[j*3+1], ColorMap[j*3+2]); + #endif ++ + gimp_image_set_colormap (image_ID, ColorMap, ncols); + } + |