* Apply patch from OpenBSD CVS to fix libXpm vulnerability:

	http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2005-0605
* Apply patch from FreeBSD/ports to fix the problem with the radeon
  driver switching from graphics to text mode.

Bump PKGREVISION.

5 files changed, 79 insertions, 4 deletions

diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile
index 1c74440f80b..2322533925f 100644
--- a/x11/xorg-libs/Makefile
+++ b/x11/xorg-libs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:48:15 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/04/14 21:35:51 xtraeme Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		xorg-libs-${XORG_VER}
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XORG}
 DISTFILES=		X11R${XORG_VER}-src1.tar.gz X11R${XORG_VER}-src2.tar.gz \
diff --git a/x11/xorg-libs/buildlink3.mk b/x11/xorg-libs/buildlink3.mk
index ddbfc72c9df..1620f280be5 100644
--- a/x11/xorg-libs/buildlink3.mk
+++ b/x11/xorg-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2005/03/02 08:26:54 grant Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2005/04/14 21:35:51 xtraeme Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XORG_LIBS_BUILDLINK3_MK:=	${XORG_LIBS_BUILDLINK3_MK}+
@@ -19,7 +19,7 @@ BUILDLINK_PACKAGES:=	xorg-libs ${BUILDLINK_PACKAGES}
 .if !empty(XORG_LIBS_BUILDLINK3_MK:M+)
 
 BUILDLINK_DEPENDS.xorg-libs+=		xorg-libs>=6.8.1
-BUILDLINK_RECOMMENDED.xorg-libs+=	xorg-libs>=6.8.2
+BUILDLINK_RECOMMENDED.xorg-libs+=	xorg-libs>=6.8.2nb1
 BUILDLINK_PKGSRCDIR.xorg-libs?=		../../x11/xorg-libs
 BUILDLINK_TRANSFORM.xorg-libs+=	-e "s|/${X11ROOT_PREFIX}/|/|"
 
diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo
index 3c721c5639b..9d34e867841 100644
--- a/x11/xorg-libs/distinfo
+++ b/x11/xorg-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2005/03/22 14:00:25 adam Exp $
+$NetBSD: distinfo,v 1.17 2005/04/14 21:35:51 xtraeme Exp $
 
 SHA1 (X11R6.8.2-src1.tar.gz) = 23c60680274062a1db17f646a8388149309dc45c
 RMD160 (X11R6.8.2-src1.tar.gz) = bb170d7a11416c3d9bd1d23d461ba4cea9b1b2c8
@@ -32,3 +32,5 @@ SHA1 (patch-au) = fd2bcdb1c37ce0cc748b0f5c2a12d226e4486d0d
 SHA1 (patch-av) = 99e9764ca1afdfb5882d62e453ccaea7dfa7f182
 SHA1 (patch-aw) = d305ea935ba10d443f9bfdcfc2c74bab5a03ba60
 SHA1 (patch-ay) = b154d0d4e95ea15c79921b605266701ee773d144
+SHA1 (patch-az) = 3fc898c7c91037710b0fd27eff55ca8b55a19b4b
+SHA1 (patch-ba) = b024c5046d7581c16afb298a932f9fc7f2f57ffd
diff --git a/x11/xorg-libs/patches/patch-az b/x11/xorg-libs/patches/patch-az
new file mode 100644
index 00000000000..fe1bc35c004
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-az
@@ -0,0 +1,22 @@
+$NetBSD: patch-az,v 1.1 2005/04/14 21:35:51 xtraeme Exp $
+
+--- programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c.orig
++++ programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
+@@ -5748,7 +5748,7 @@ static void RADEONSave(ScrnInfoPtr pScrn
+ 	 */
+ 	vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE); /* Save mode only */
+ #else
+-	vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS); /* Save mode
++	vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_ALL); /* Save mode
+ 						       * & fonts & cmap
+ 						       */
+ #endif
+@@ -5818,7 +5818,7 @@ static void RADEONRestore(ScrnInfoPtr pS
+ 	 */
+ 	vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE );
+ #else
+-	vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS );
++	vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_ALL );
+ #endif
+ 	vgaHWLock(hwp);
+     } else {
diff --git a/x11/xorg-libs/patches/patch-ba b/x11/xorg-libs/patches/patch-ba
new file mode 100644
index 00000000000..00cbe27cd96
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-ba
@@ -0,0 +1,50 @@
+$NetBSD: patch-ba,v 1.1 2005/04/14 21:35:51 xtraeme Exp $
+
+Index: extras/Xpm/lib/scan.c
+===================================================================
+RCS file: /cvs/OpenBSD/XF4/xc/extras/Xpm/lib/scan.c,v
+retrieving revision 1.4
+diff -u -r1.4 scan.c
+--- scan.c	17 Nov 2004 20:22:05 -0000	1.4
++++ scan.c	15 Feb 2005 21:34:05 -0000
+@@ -621,8 +621,8 @@
+     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;
+ 
+@@ -632,6 +632,9 @@
+     lbt = low_bits_table[depth];
+     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;
+Index: extras/Xpm/lib/create.c
+===================================================================
+RCS file: /cvs/OpenBSD/XF4/xc/extras/Xpm/lib/create.c,v
+retrieving revision 1.7
+diff -u -r1.7 create.c
+--- create.c	19 Dec 2004 17:45:01 -0000	1.7
++++ create.c	15 Feb 2005 21:39:53 -0000
+@@ -1215,10 +1215,10 @@
+     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;