Update xorg-libs to 6.8.2nb6

If _POSIX_REENTRANT_FUNCTIONS on NetBSD is defined, use the correct
getpwnam_r() and gerpwuid_r() forms. This sidesteps the issue as to
whether _POSIX_REENTRANT_FUNCTIONS _should_ be defined on NetBSD.

3 files changed, 30 insertions, 8 deletions

diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile
index c01307da5e2..c3dc4cdd9fc 100644
--- a/x11/xorg-libs/Makefile
+++ b/x11/xorg-libs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2005/12/12 19:52:17 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2006/01/08 14:51:11 abs Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		xorg-libs-${XORG_VER}
-PKGREVISION=		5
+PKGREVISION=		6
 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/distinfo b/x11/xorg-libs/distinfo
index 76156534161..ee71155e784 100644
--- a/x11/xorg-libs/distinfo
+++ b/x11/xorg-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2005/12/12 19:52:17 joerg Exp $
+$NetBSD: distinfo,v 1.26 2006/01/08 14:51:11 abs Exp $
 
 SHA1 (X11R6.8.2-src1.tar.gz) = 23c60680274062a1db17f646a8388149309dc45c
 RMD160 (X11R6.8.2-src1.tar.gz) = bb170d7a11416c3d9bd1d23d461ba4cea9b1b2c8
@@ -35,7 +35,7 @@ SHA1 (patch-ay) = b154d0d4e95ea15c79921b605266701ee773d144
 SHA1 (patch-az) = 3fc898c7c91037710b0fd27eff55ca8b55a19b4b
 SHA1 (patch-ba) = 710acb72c80c38e52ba949053a9e43c72c0205f6
 SHA1 (patch-bb) = 126e217b3bb0df8bb072f26f1575af9c610b9ba6
-SHA1 (patch-bc) = 04ccf6c3f718d31f6af3012bed7c7269b6393c4d
+SHA1 (patch-bc) = 6f2061570de06125fc556fb01c050bc51d9d3ddb
 SHA1 (patch-bd) = f370cbbacbd9061f526f3a1d4924c55bd77559fb
 SHA1 (patch-be) = 19573fbc5b27a6fd17366e51801ec5a84bd3a063
 SHA1 (patch-bf) = 0661e6e787e57c865844c10ba27b381f525673b5
diff --git a/x11/xorg-libs/patches/patch-bc b/x11/xorg-libs/patches/patch-bc
index 1af0c7ec473..b33973f3f35 100644
--- a/x11/xorg-libs/patches/patch-bc
+++ b/x11/xorg-libs/patches/patch-bc
@@ -1,6 +1,6 @@
-$NetBSD: patch-bc,v 1.2 2005/12/12 19:52:17 joerg Exp $
+$NetBSD: patch-bc,v 1.3 2006/01/08 14:51:11 abs Exp $
 
---- include/Xos_r.h.orig	2005-12-12 19:16:02.000000000 +0000
+--- include/Xos_r.h.orig	2004-04-23 19:43:05.000000000 +0100
 +++ include/Xos_r.h
 @@ -205,6 +205,9 @@ extern void XtProcessUnlock(
  # undef _POSIX_THREAD_SAFE_FUNCTIONS
@@ -21,7 +21,29 @@ $NetBSD: patch-bc,v 1.2 2005/12/12 19:52:17 joerg Exp $
  static __inline__ void _Xpw_copyPasswd(_Xgetpwparams p)
  {
     memcpy(&(p).pws, (p).pwp, sizeof(struct passwd));
-@@ -427,7 +430,7 @@ typedef int _Xgetservbynameparams; /* du
+@@ -335,7 +338,20 @@ typedef struct {
+   char pwbuf[X_LINE_MAX];
+ } _Xgetpwparams;
+ # if defined(_POSIX_REENTRANT_FUNCTIONS) || !defined(SVR4) || defined(Lynx)
+-#  ifndef Lynx
++#  if defined(__NetBSD__)
++static __inline__ struct passwd * _XGetpwuid(uid_t u, _Xgetpwparams p)
++{ 
++    struct passwd *pwp;
++    return (getpwuid_r(u, &p.pws, p.pwbuf, sizeof((p).pwbuf), &pwp) == -1)
++							? NULL : &p.pws;
++}   
++static __inline__ struct passwd * _XGetpwnam(const char *n, _Xgetpwparams p)
++{ 
++    struct passwd *pwp;
++    return (getpwnam_r(n, &p.pws, p.pwbuf, sizeof((p).pwbuf), &pwp) == -1)
++							? NULL : &p.pws;
++}   
++#  elif !defined(Lynx)
+ #   define _XGetpwuid(u,p) \
+ ((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : &(p).pws)
+ #   define _XGetpwnam(u,p) \
+@@ -427,7 +443,7 @@ typedef int _Xgetservbynameparams; /* du
  /* UnixWare 2.0, or other systems with thread support but no _r API. */
  /* WARNING:  The h_addr_list and s_aliases values are *not* copied! */
  
@@ -30,7 +52,7 @@ $NetBSD: patch-bc,v 1.2 2005/12/12 19:52:17 joerg Exp $
  #include <sys/param.h>
  #endif
  
-@@ -652,6 +655,15 @@ extern int _Preaddir_r(DIR *, struct dir
+@@ -652,6 +668,15 @@ extern int _Preaddir_r(DIR *, struct dir
  # elif defined(SVR4)
  /* Pre-POSIX API, returns non-NULL on success. */
  #  define _XReaddir(d,p)	(readdir_r((d), &(p).dir_entry))