--- a/open-src/xserver/xorg/dtlogin-userinfo.patch	Mon Jul 30 15:57:04 2007 -0700
+++ b/open-src/xserver/xorg/dtlogin-userinfo.patch	Tue Jul 31 15:09:29 2007 -0700
@@ -26,10 +26,10 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 
-diff -urp -x '*~' configure.ac configure.ac
---- configure.ac	2006-12-21 14:21:37.260843000 -0800
-+++ configure.ac	2006-12-21 14:21:51.350495000 -0800
-@@ -881,6 +881,7 @@ PKG_CHECK_MODULES([XSERVERCFLAGS], [$REQ
+diff -urp -x '*~' -x '*.orig' configure.ac configure.ac
+--- configure.ac	2007-07-30 18:33:18.270657000 -0700
++++ configure.ac	2007-07-30 18:33:33.880185000 -0700
+@@ -887,6 +887,7 @@ PKG_CHECK_MODULES([XSERVERCFLAGS], [$REQ
  PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS])
  
  XSERVER_CFLAGS="${XSERVERCFLAGS_CFLAGS}"
@@ -37,9 +37,9 @@
  XSERVER_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS}"
  AC_SUBST([SYS_LIBS])
  
-diff -urp -x '*~' os/Makefile.am os/Makefile.am
---- os/Makefile.am	2006-12-21 14:21:37.266897000 -0800
-+++ os/Makefile.am	2006-12-21 14:21:51.334148000 -0800
+diff -urp -x '*~' -x '*.orig' os/Makefile.am os/Makefile.am
+--- os/Makefile.am	2007-07-30 18:33:18.179832000 -0700
++++ os/Makefile.am	2007-07-30 18:33:33.905121000 -0700
 @@ -27,6 +27,7 @@ libos_la_SOURCES = 	\
  	xdmauth.c	\
  	xstrans.c	\
@@ -49,7 +49,7 @@
  
  if XCSECURITY
 @@ -41,6 +42,8 @@ if NEED_STRLCAT
- libos_la_SOURCES += $(STRLCAT_SOURCES)
+ libos_la_SOURCES += $(STRLCAT_SRCS)
  endif
  
 +libos_la_LIBADD = -lproject
@@ -57,9 +57,9 @@
  libcwrapper_la_SOURCES = \
  	$(top_srcdir)/hw/xfree86/os-support/shared/libc_wrapper.c
  libcwrapper_la_CFLAGS = \
-diff -urp -x '*~' os/auth.c os/auth.c
---- os/auth.c	2006-11-13 16:59:41.000000000 -0800
-+++ os/auth.c	2006-12-21 14:21:51.334597000 -0800
+diff -urp -x '*~' -x '*.orig' os/auth.c os/auth.c
+--- os/auth.c	2006-09-17 23:04:18.000000000 -0700
++++ os/auth.c	2007-07-30 18:33:33.905663000 -0700
 @@ -332,6 +332,19 @@ AddAuthorization (unsigned name_length, 
      return 0;
  }
@@ -80,9 +80,9 @@
  #ifdef XCSECURITY
  
  XID
-diff -urp -x '*~' os/connection.c os/connection.c
---- os/connection.c	2006-12-21 14:21:37.267651000 -0800
-+++ os/connection.c	2006-12-21 14:21:51.340845000 -0800
+diff -urp -x '*~' -x '*.orig' os/connection.c os/connection.c
+--- os/connection.c	2007-07-30 18:33:18.168637000 -0700
++++ os/connection.c	2007-07-30 18:33:33.906523000 -0700
 @@ -176,6 +176,10 @@ typedef const char *string;
  # include "../dix/Xserver-dtrace.h"
  #endif