pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2004Q4]: pkgsrc/x11/lesstif Pullup ticket 352 - requested by L...
details: https://anonhg.NetBSD.org/pkgsrc/rev/9351cb5d1195
branches: pkgsrc-2004Q4
changeset: 485973:9351cb5d1195
user: snj <snj%pkgsrc.org@localhost>
date: Fri Mar 11 06:55:42 2005 +0000
description:
Pullup ticket 352 - requested by Lubomir Sedlacik
security fix for lesstif
Revisions pulled up:
- pkgsrc/x11/lesstif/Makefile 1.77,1.78
- pkgsrc/x11/lesstif/buildlink3.mk 1.4
- pkgsrc/x11/lesstif/distinfo 1.11,1.13
- pkgsrc/x11/lesstif/PLIST 1.9
- pkgsrc/x11/lesstif/patches/patch-ab 1.16
- pkgsrc/x11/lesstif/patches/patch-ac 1.17
Module Name: pkgsrc
Committed By: adam
Date: Wed Jan 5 11:16:38 UTC 2005
Modified Files:
pkgsrc/x11/lesstif: Makefile distinfo
Log Message:
Changes 0.94.0:
* XPM security fixes
* memory leak fixes
* other fixes
----
Module Name: pkgsrc
Committed By: wiz
Date: Thu Mar 10 16:07:16 UTC 2005
Modified Files:
pkgsrc/x11/lesstif: PLIST
Log Message:
Sort.
----
Module Name: pkgsrc
Committed By: wiz
Date: Thu Mar 10 16:07:27 UTC 2005
Modified Files:
pkgsrc/x11/lesstif: Makefile distinfo
Added Files:
pkgsrc/x11/lesstif/patches: patch-ab patch-ac
Log Message:
Add patch to fix CAN-2005-0605. Bump PKGREVISION.
----
Module Name: pkgsrc
Committed By: salo
Date: Fri Mar 11 00:34:19 UTC 2005
Modified Files:
pkgsrc/x11/lesstif: buildlink3.mk
Log Message:
Bump BUILDLINK_RECOMMENDED for security update. (hi wiz!)
diffstat:
x11/lesstif/Makefile | 7 ++++---
x11/lesstif/PLIST | 6 +++---
x11/lesstif/buildlink3.mk | 4 ++--
x11/lesstif/distinfo | 8 +++++---
x11/lesstif/patches/patch-ab | 17 +++++++++++++++++
x11/lesstif/patches/patch-ac | 25 +++++++++++++++++++++++++
6 files changed, 56 insertions(+), 11 deletions(-)
diffs (129 lines):
diff -r cee2ad49ae12 -r 9351cb5d1195 x11/lesstif/Makefile
--- a/x11/lesstif/Makefile Fri Mar 11 06:45:18 2005 +0000
+++ b/x11/lesstif/Makefile Fri Mar 11 06:55:42 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.76 2004/11/22 14:30:18 adam Exp $
+# $NetBSD: Makefile,v 1.76.2.1 2005/03/11 06:55:42 snj Exp $
-DISTNAME= lesstif-0.93.97
+DISTNAME= lesstif-0.94.0
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lesstif/}
EXTRACT_SUFX= .tar.bz2
@@ -15,7 +16,7 @@
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 -r cee2ad49ae12 -r 9351cb5d1195 x11/lesstif/PLIST
--- a/x11/lesstif/PLIST Fri Mar 11 06:45:18 2005 +0000
+++ b/x11/lesstif/PLIST Fri Mar 11 06:55:42 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/09/22 08:10:05 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8.2.1 2005/03/11 06:55:42 snj Exp $
bin/mwm
bin/mxmkmf
bin/uil
@@ -174,10 +174,10 @@
include/uil/UilSymDef.h
include/uil/UilSymGl.h
include/uil/XmAppl.uil
+lib/X11/app-defaults/Mwm
+lib/X11/config/LessTif.def
lib/X11/config/LessTif.rules
lib/X11/config/LessTif.tmpl
-lib/X11/config/LessTif.def
-lib/X11/app-defaults/Mwm
lib/X11/mwm/README
lib/X11/mwm/alt.map
lib/X11/mwm/system.mwmrc
diff -r cee2ad49ae12 -r 9351cb5d1195 x11/lesstif/buildlink3.mk
--- a/x11/lesstif/buildlink3.mk Fri Mar 11 06:45:18 2005 +0000
+++ b/x11/lesstif/buildlink3.mk Fri Mar 11 06:55:42 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:18:36 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3.2.1 2005/03/11 06:55:42 snj Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LESSTIF_BUILDLINK3_MK:= ${LESSTIF_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@
.if !empty(LESSTIF_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.lesstif+= lesstif>=0.91.4
-BUILDLINK_RECOMMENDED.lesstif+= lesstif>=0.93.96nb1
+BUILDLINK_RECOMMENDED.lesstif+= lesstif>=0.94.0nb1
BUILDLINK_PKGSRCDIR.lesstif?= ../../x11/lesstif
.endif # LESSTIF_BUILDLINK3_MK
diff -r cee2ad49ae12 -r 9351cb5d1195 x11/lesstif/distinfo
--- a/x11/lesstif/distinfo Fri Mar 11 06:45:18 2005 +0000
+++ b/x11/lesstif/distinfo Fri Mar 11 06:55:42 2005 +0000
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.10 2004/11/22 14:30:18 adam Exp $
+$NetBSD: distinfo,v 1.10.2.1 2005/03/11 06:55:42 snj Exp $
-SHA1 (lesstif-0.93.97.tar.bz2) = dff0075ffffd3912a222b1196bf6e0e14b0b995f
-Size (lesstif-0.93.97.tar.bz2) = 2415508 bytes
+SHA1 (lesstif-0.94.0.tar.bz2) = 50456f6f2fe48354a7b1d1cbe4b58b5244aa2fa5
+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 -r cee2ad49ae12 -r 9351cb5d1195 x11/lesstif/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/lesstif/patches/patch-ab Fri Mar 11 06:55:42 2005 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.15.10.1 2005/03/11 06:55:42 snj 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 -r cee2ad49ae12 -r 9351cb5d1195 x11/lesstif/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/lesstif/patches/patch-ac Fri Mar 11 06:55:42 2005 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-ac,v 1.16.2.1 2005/03/11 06:55:42 snj 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++)
Home |
Main Index |
Thread Index |
Old Index