diff options
| author | tron <tron@pkgsrc.org> | 2007-05-26 15:00:22 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2007-05-26 15:00:22 +0000 |
| commit | 2b13b684cf3cc06c6e4077109ddb17f786be5100 (patch) | |
| tree | 44cd8b6f3f44281b3e4811be8c14fc97a3537ec6 /graphics/gimp | |
| parent | 48521db4fb51c3db059c4e98ea46cc767e8e9941 (diff) | |
| download | pkgsrc-2b13b684cf3cc06c6e4077109ddb17f786be5100.tar.gz | |
Add patch from GIMP SVN repository to fix the vulnerability reported
in CVE-2007-2356. Bump package revision.
Diffstat (limited to 'graphics/gimp')
| -rw-r--r-- | graphics/gimp/Makefile | 3 | ||||
| -rw-r--r-- | graphics/gimp/distinfo | 3 | ||||
| -rw-r--r-- | graphics/gimp/patches/patch-ac | 51 |
3 files changed, 55 insertions, 2 deletions
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index 6b1ae6f703c..ccfb451e4cb 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.153 2007/04/30 12:03:05 adam Exp $ +# $NetBSD: Makefile,v 1.154 2007/05/26 15:00:22 tron Exp $ DISTNAME= gimp-2.2.14 +PKGREVISION= 1 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 26ea55192fb..9af4dc6c578 100644 --- a/graphics/gimp/distinfo +++ b/graphics/gimp/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.32 2007/04/30 12:03:06 adam Exp $ +$NetBSD: distinfo,v 1.33 2007/05/26 15:00:23 tron Exp $ SHA1 (gimp-2.2.14.tar.bz2) = cf0926b9f0ca910b31219bafa8188a8b7ebabe10 RMD160 (gimp-2.2.14.tar.bz2) = cf43fb0436a6086a0bc85fd4a33b009bee557aa0 Size (gimp-2.2.14.tar.bz2) = 12836732 bytes SHA1 (patch-aa) = 6a25d14a018e02d353e6f10364384e9df7a30ebd SHA1 (patch-ab) = 461467b76c45e53042da8e3aee4bb9f556730792 +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..cf388eb9eab --- /dev/null +++ b/graphics/gimp/patches/patch-ac @@ -0,0 +1,51 @@ +$NetBSD: patch-ac,v 1.14 2007/05/26 15:00:23 tron 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); + } + |