- rel 20

[packages/X11.git] / x11r6.9.0-setuid.diff

diff --git a/x11r6.9.0-setuid.diff b/x11r6.9.0-setuid.diff
index e35bd0373f7f1e40971501014b0b2fc8a3a955d4..06291ac1652bc85fdccd76618f70b9511e0454b2 100644 (file)
--- a/x11r6.9.0-setuid.diff
+++ b/x11r6.9.0-setuid.diff
@@ -1,12 +1,5 @@
 --- xc/programs/Xserver/hw/xfree86/common/xf86Init.c   14 Dec 2005 20:12:00 -0000      1.29
 +++ xc/programs/Xserver/hw/xfree86/common/xf86Init.c   5 Jun 2006 10:35:19 -0000
-@@ -1,5 +1,5 @@
- /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 3.212 2004/01/27 01:31:45 dawes Exp $ */
--/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 1.29 2005-12-14 20:12:00 ajax Exp $ */
-+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 1.29 2005/12/14 20:12:00 ajax Exp $ */
- 
- /*
-  * Loosely based on code bearing the following copyright:
 @@ -1905,7 +1905,11 @@
            FatalError("xf86RunVtInit: fork failed (%s)\n", strerror(errno));
            break;
@@ -50,12 +43,6 @@
                        break;
 --- xc/programs/Xserver/os/utils.c     8 Nov 2005 06:33:30 -0000       1.21
 +++ xc/programs/Xserver/os/utils.c     5 Jun 2006 10:35:20 -0000
-@@ -1,4 +1,4 @@
--/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.21 2005-11-08 06:33:30 jkj Exp $ */
-+/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.21 2005/11/08 06:33:30 jkj Exp $ */
- /* $Xorg: utils.c,v 1.5 2001/02/09 02:05:24 xorgcvs Exp $ */
- /*
- 
 @@ -1718,8 +1718,10 @@
      case -1:  /* error */
        p = -1;
@@ -97,12 +84,6 @@
                /* stdout */
 --- xc/programs/xdm/session.c  8 Nov 2005 06:33:31 -0000       1.3
 +++ xc/programs/xdm/session.c  5 Jun 2006 10:35:21 -0000
-@@ -1,4 +1,4 @@
--/* $XdotOrg: xc/programs/xdm/session.c,v 1.3 2005-11-08 06:33:31 jkj Exp $ */
-+/* $XdotOrg: xc/programs/xdm/session.c,v 1.3 2005/11/08 06:33:31 jkj Exp $ */
- /* $Xorg: session.c,v 1.8 2001/02/09 02:05:40 xorgcvs Exp $ */
- /*
- 
 @@ -488,8 +488,14 @@
      else
        ResetServer (d);
@@ -159,13 +140,6 @@
     XF86DGASetViewPort(dis, DefaultScreen(dis), 0, 0);
 --- xc/programs/xinit/xinit.c  4 Oct 2005 01:27:34 -0000       1.4
 +++ xc/programs/xinit/xinit.c  5 Jun 2006 10:35:21 -0000
-@@ -1,5 +1,5 @@
- /* $Xorg: xinit.c,v 1.5 2001/02/09 02:05:49 xorgcvs Exp $ */
--/* $XdotOrg: xc/programs/xinit/xinit.c,v 1.4 2005-10-04 01:27:34 ajax Exp $ */
-+/* $XdotOrg: xc/programs/xinit/xinit.c,v 1.4 2005/10/04 01:27:34 ajax Exp $ */
- 
- /*
- 
 @@ -692,7 +692,10 @@
  startClient(char *client[])
  {