[pkgsrc/pkgsrc-2004Q4]: pkgsrc/graphics/xpm Pullup ticket 350 - requested by ...

[snj <snj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2e5405d05015
branches:  pkgsrc-2004Q4
changeset: 485969:2e5405d05015
user:      snj <snj%pkgsrc.org@localhost>
date:      Fri Mar 11 06:38:33 2005 +0000

description:
Pullup ticket 350 - requested by Lubomir Sedlacik
security fix for xpm

Revisions pulled up:
- pkgsrc/graphics/xpm/Makefile          1.39
- pkgsrc/graphics/xpm/distinfo          1.12
- pkgsrc/graphics/xpm/patches/patch-ak  1.2


    Module Name:    pkgsrc
    Committed By:   wiz
    Date:           Thu Mar 10 15:23:10 UTC 2005

    Modified Files:
            pkgsrc/graphics/xpm: Makefile distinfo
            pkgsrc/graphics/xpm/patches: patch-ak

    Log Message:
    Add patch to fix CAN-2005-0605. Bump PKGREVISION.

diffstat:

 graphics/xpm/Makefile         |   4 ++--
 graphics/xpm/distinfo         |   4 ++--
 graphics/xpm/patches/patch-ak |  14 ++++++++++++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 9d4d0d7452aa -r 2e5405d05015 graphics/xpm/Makefile
--- a/graphics/xpm/Makefile     Fri Mar 11 06:09:01 2005 +0000
+++ b/graphics/xpm/Makefile     Fri Mar 11 06:38:33 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2004/09/16 15:09:01 minskim Exp $
+# $NetBSD: Makefile,v 1.38.4.1 2005/03/11 06:38:33 snj Exp $
 
 DISTNAME=       xpm-3.4k
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    graphics x11
 MASTER_SITES=  http://koala.ilog.fr/ftp/pub/xpm/ \
                ${MASTER_SITE_XCONTRIB:=libraries/}
diff -r 9d4d0d7452aa -r 2e5405d05015 graphics/xpm/distinfo
--- a/graphics/xpm/distinfo     Fri Mar 11 06:09:01 2005 +0000
+++ b/graphics/xpm/distinfo     Fri Mar 11 06:38:33 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2004/09/16 15:09:01 minskim Exp $
+$NetBSD: distinfo,v 1.10.4.1 2005/03/11 06:38:33 snj Exp $
 
 SHA1 (xpm-3.4k.tar.gz) = a8eac19e5772bf7b3b177353686c1401fbf334bd
 Size (xpm-3.4k.tar.gz) = 148887 bytes
@@ -12,4 +12,4 @@
 SHA1 (patch-ah) = 075229583814bbdd0a3d7ac8dcb6ad0507d182ff
 SHA1 (patch-ai) = 79472013037a1866739b96e97d740378086cc46f
 SHA1 (patch-aj) = 98048e40c338f69915e233aa11df0f95deff75a4
-SHA1 (patch-ak) = b84999d5e981bbe6edd6fc76310681c16263e8b5
+SHA1 (patch-ak) = a949e05f82d5ed9ce48348bcedf4811cff119a03
diff -r 9d4d0d7452aa -r 2e5405d05015 graphics/xpm/patches/patch-ak
--- a/graphics/xpm/patches/patch-ak     Fri Mar 11 06:09:01 2005 +0000
+++ b/graphics/xpm/patches/patch-ak     Fri Mar 11 06:38:33 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.1 2004/09/16 15:09:01 minskim Exp $
+$NetBSD: patch-ak,v 1.1.4.1 2005/03/11 06:38:33 snj Exp $
 
---- lib/scan.c.orig    Thu Mar 19 13:51:00 1998
+--- lib/scan.c.orig    1998-03-19 20:51:00.000000000 +0100
 +++ lib/scan.c
 @@ -103,7 +103,8 @@ LFUNC(MSWGetImagePixels, int, (Display *
  LFUNC(ScanTransparentColor, int, (XpmColor *color, unsigned int cpp,
@@ -66,3 +66,13 @@
      xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors);
      if (!xcolors)
        return (XpmNoMemory);
+@@ -615,6 +628,9 @@ GetImagePixels(image, width, height, pma
+     ibpp = image->bits_per_pixel;
+     offset = image->xoffset;
+ 
++    if (image->bitmap_unit < 0)
++          return (XpmNoMemory);
++
+     if ((image->bits_per_pixel | image->depth) == 1) {
+       ibu = image->bitmap_unit;
+       for (y = 0; y < height; y++)