Apply patch from X.org to fix:

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0914

While I'm here, make this build again on NetBSD -current, which has not
/usr/include/threadlib.h.

Bump PKGREVISION.

3 files changed, 36 insertions, 8 deletions

diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile
index ea7d213b4e7..b066b4b026a 100644
--- a/x11/xorg-libs/Makefile
+++ b/x11/xorg-libs/Makefile
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.9 2004/10/22 06:31:42 xtraeme Exp $
+# $NetBSD: Makefile,v 1.10 2004/12/20 14:45:25 xtraeme Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		xorg-libs-${XORG_VER}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XORG}
 DISTFILES=		X11R${XORG_VER}-src1.tar.gz X11R${XORG_VER}-src2.tar.gz \
 			X11R${XORG_VER}-src3.tar.gz
+PATCH_SITES=		http://www.x.org/pub/X11R6.8.1/patches/
+PATCHFILES=		xorg-681-CAN-2004-0914.patch
 
 MAINTAINER=		xtraeme@NetBSD.org
 HOMEPAGE=		http://www.x.org/
@@ -34,7 +36,7 @@ XINSTALL_DIRS=		include lib nls programs/Xserver/include \
 			programs/Xserver/hw/xfree86/parser
 XINSTALL_MAN_DIRS=	${XINSTALL_DIRS}
 
-SUBST_CLASSES=		mkstrs
+SUBST_CLASSES+=		mkstrs
 SUBST_STAGE.mkstrs=	post-patch
 SUBST_FILES.mkstrs=	config/cf/Library.tmpl
 SUBST_SED.mkstrs=	-e 's,@MAKESTRS@,${X11ROOT}/bin/makestrs,g'
@@ -45,6 +47,21 @@ post-install:
 	@${LDCONFIG} ${X11ROOT}/lib || ${TRUE}
 .endif
 
+.if !empty(MACHINE_PLATFORM:MNetBSD-2.[0-9]*)
+.  if exists(/usr/include/threadlib.h)
+SUBST_CLASSES+=		thr
+SUBST_STAGE.thr=	post-patch
+SUBST_FILES.thr=	config/cf/NetBSD.cf.in
+SUBST_SED.thr=		-e 's|@@NETBSD_THREADLIB@@|-DUSE_NBSD_THREADLIB|'
+SUBST_MESSAGE.thr=	"Fixes for threadlib.h."
+.  else
+SUBST_CLASSES+=		nada
+SUBST_STAGE.nada=	post-patch
+SUBST_FILES.nada=	config/cf/NetBSD.cf.in
+SUBST_SED.nada=		-e 's|@@NETBSD_THREADLIB@@||'
+.  endif
+.endif
+
 pre-install:
 .if !exists(${X11ROOT}/lib/pkgconfig)
 	${INSTALL_DATA_DIR} ${X11BASE}/lib/pkgconfig
diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo
index cbc00d5f5e8..dc06f656f62 100644
--- a/x11/xorg-libs/distinfo
+++ b/x11/xorg-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2004/11/15 11:15:48 hira Exp $
+$NetBSD: distinfo,v 1.8 2004/12/20 14:45:25 xtraeme Exp $
 
 SHA1 (X11R6.8.1-src1.tar.gz) = 027d16317e07d9df166c0176a1f28b2614f38cc9
 Size (X11R6.8.1-src1.tar.gz) = 30562401 bytes
@@ -6,8 +6,10 @@ SHA1 (X11R6.8.1-src2.tar.gz) = 17f543f49599290b6e4cd4d963c643cd8c19158a
 Size (X11R6.8.1-src2.tar.gz) = 5808949 bytes
 SHA1 (X11R6.8.1-src3.tar.gz) = e17afc90b0c43f4f40b2ff7410f4ff5d4297de28
 Size (X11R6.8.1-src3.tar.gz) = 10014808 bytes
+SHA1 (xorg-681-CAN-2004-0914.patch) = 56b8db629045942c84c13d48192a1e8722b330ca
+Size (xorg-681-CAN-2004-0914.patch) = 55411 bytes
 SHA1 (patch-aa) = 009b7a2679ae98ebd7071e4fa6169c3401273ca1
-SHA1 (patch-ac) = 938c15a6103d741aa29f1ec45e19be2284fb2a0b
+SHA1 (patch-ac) = 1c12d9c5b976ac5c9b6667e0f3a98792eef433fc
 SHA1 (patch-ad) = 7843332769ee47bc8a52a9adb1047b1a637af71b
 SHA1 (patch-ae) = a06752ee9f55e64a407fac6fbde3547fd096c71d
 SHA1 (patch-ag) = 178d556fa11818420cd685308cf179ee5f6f7dac
diff --git a/x11/xorg-libs/patches/patch-ac b/x11/xorg-libs/patches/patch-ac
index 693f72ddf28..295f18d7932 100644
--- a/x11/xorg-libs/patches/patch-ac
+++ b/x11/xorg-libs/patches/patch-ac
@@ -1,7 +1,16 @@
-$NetBSD: patch-ac,v 1.2 2004/11/15 11:15:48 hira Exp $
+$NetBSD: patch-ac,v 1.3 2004/12/20 14:45:25 xtraeme Exp $
 
---- config/cf/NetBSD.cf.in.orig	2004-08-15 09:03:36.000000000 +0900
-+++ config/cf/NetBSD.cf.in	2004-11-03 16:54:50.000000000 +0900
+--- config/cf/NetBSD.cf.in.orig	2004-08-15 02:03:36.000000000 +0200
++++ config/cf/NetBSD.cf.in	2004-12-20 15:33:15.000000000 +0100
+@@ -123,7 +123,7 @@
+ # define ThreadedX		YES
+ # define HasThreadSafeAPI	YES
+ # define ThreadsLibraries	-lpthread
+-# define LibraryMTDefines	-DUSE_NBSD_THREADLIB
++# define LibraryMTDefines	@@NETBSD_THREADLIB@@
+ # define SystemMTDefines	-D_REENTRANT
+ # define MTSafeAPIDefines	-DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
+ #else 
 @@ -146,7 +146,7 @@
  #define MkdirHierCmd		mkdir -p