diff options
| author | wiz <wiz@pkgsrc.org> | 2005-03-10 16:07:26 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2005-03-10 16:07:26 +0000 |
| commit | 97dedc5718d75647849003522ea624c84910c814 (patch) | |
| tree | 8231de5b0e5babcfd0206374ecf942a0faf789d6 /x11 | |
| parent | 096bb8ea84a9ce14ed3de6d460c0856a06708260 (diff) | |
| download | pkgsrc-97dedc5718d75647849003522ea624c84910c814.tar.gz | |
Add patch to fix CAN-2005-0605. Bump PKGREVISION.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/lesstif/Makefile | 5 | ||||
| -rw-r--r-- | x11/lesstif/distinfo | 4 | ||||
| -rw-r--r-- | x11/lesstif/patches/patch-ab | 17 | ||||
| -rw-r--r-- | x11/lesstif/patches/patch-ac | 25 |
4 files changed, 48 insertions, 3 deletions
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile index 069f3172b10..6185dfde503 100644 --- a/x11/lesstif/Makefile +++ b/x11/lesstif/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.77 2005/01/05 11:16:38 adam Exp $ +# $NetBSD: Makefile,v 1.78 2005/03/10 16:07:26 wiz Exp $ DISTNAME= lesstif-0.94.0 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lesstif/} EXTRACT_SUFX= .tar.bz2 @@ -15,7 +16,7 @@ USE_BUILDLINK3= YES USE_X11BASE= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES -GNU_CONFIGURE= # defined +GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-production --disable-debug --disable-verbose CONFIGURE_ARGS+= --enable-editres --enable-xdnd diff --git a/x11/lesstif/distinfo b/x11/lesstif/distinfo index a50af94cf9c..65373147eaa 100644 --- a/x11/lesstif/distinfo +++ b/x11/lesstif/distinfo @@ -1,9 +1,11 @@ -$NetBSD: distinfo,v 1.12 2005/02/23 17:36:16 wiz Exp $ +$NetBSD: distinfo,v 1.13 2005/03/10 16:07:27 wiz Exp $ SHA1 (lesstif-0.94.0.tar.bz2) = 50456f6f2fe48354a7b1d1cbe4b58b5244aa2fa5 RMD160 (lesstif-0.94.0.tar.bz2) = 529a5f7dcc5997ca3282f415f50ebd0634c9ad16 Size (lesstif-0.94.0.tar.bz2) = 2425210 bytes SHA1 (patch-aa) = c464f492e7c53bba85b0ad2dcc93caedf1f1be03 +SHA1 (patch-ab) = 8839488b15ae6a01bb4d6af46e386e894eb2cddf +SHA1 (patch-ac) = 0e7bd9c469d98ea6a4257e734f69e321f8fee442 SHA1 (patch-am) = aa596b7cfe30c5764bf7ce908e5f400649b91d23 SHA1 (patch-an) = 01b8538e39797bf3ec54a8df61ab277ab6f961b9 SHA1 (patch-ao) = f122671c96e510f4b235e943b1502cd0b77a01b7 diff --git a/x11/lesstif/patches/patch-ab b/x11/lesstif/patches/patch-ab new file mode 100644 index 00000000000..a3c90c925a5 --- /dev/null +++ b/x11/lesstif/patches/patch-ab @@ -0,0 +1,17 @@ +$NetBSD: patch-ab,v 1.16 2005/03/10 16:07:27 wiz Exp $ + +--- lib/Xm-2.1/Xpmcreate.c.orig 2004-11-18 22:00:58.000000000 +0100 ++++ lib/Xm-2.1/Xpmcreate.c +@@ -1265,10 +1265,10 @@ PutImagePixels(image, width, height, pix + register char *src; + register char *dst; + register unsigned int *iptr; +- register unsigned int x, y, i; ++ register unsigned int x, y; + register char *data; + Pixel pixel, px; +- int nbytes, depth, ibu, ibpp; ++ int nbytes, depth, ibu, ibpp, i; + + data = image->data; + iptr = pixelindex; diff --git a/x11/lesstif/patches/patch-ac b/x11/lesstif/patches/patch-ac new file mode 100644 index 00000000000..4bc70fd42cc --- /dev/null +++ b/x11/lesstif/patches/patch-ac @@ -0,0 +1,25 @@ +$NetBSD: patch-ac,v 1.17 2005/03/10 16:07:27 wiz Exp $ + +--- lib/Xm-2.1/Xpmscan.c.orig 2004-11-18 22:00:59.000000000 +0100 ++++ lib/Xm-2.1/Xpmscan.c +@@ -672,8 +672,8 @@ GetImagePixels(image, width, height, pma + char *dst; + unsigned int *iptr; + char *data; +- unsigned int x, y, i; +- int bits, depth, ibu, ibpp, offset; ++ unsigned int x, y; ++ int bits, depth, ibu, ibpp, offset, i; + unsigned long lbt; + Pixel pixel, px; + +@@ -684,6 +684,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++) |