update from fedora (secure mktemp, xauth args changes)

[packages/xorg-xserver-server.git] / xorg-xserver-server-xwrapper.patch

diff --git a/xorg-xserver-server-xwrapper.patch b/xorg-xserver-server-xwrapper.patch
index b3d65a4f3a5a28d282e6b6f8bf7b25d899a86353..8c46f36964c9d502d6620dbc586a3621206e606a 100644 (file)
--- a/xorg-xserver-server-xwrapper.patch
+++ b/xorg-xserver-server-xwrapper.patch
@@ -1,18 +1,18 @@
 --- hw/xfree86/os-support/linux/lnx_init.c     2005-08-26 09:35:55.000000000 +0200
 +++ hw/xfree86/os-support/linux/lnx_init.c     2005-12-22 10:52:06.630963000 +0100
-@@ -104,8 +104,10 @@
+@@ -82,8 +82,10 @@
  
-       /* when KeepTty check if we're run with euid==0 */
-       if (KeepTty && geteuid() != 0) 
--          FatalError("xf86OpenConsole:"
--                     " Server must be suid root for option \"KeepTTY\"\n");
-+          FatalError("xf86OpenConsole: Server must be running with root "
-+                          "permissions\n"
-+                          "You should be using Xwrapper to start the server or xdm.\n"
-+                          "We strongly advise against making the server SUID root!\n");
+         /* when KeepTty check if we're run with euid==0 */
+         if (KeepTty && geteuid() != 0)
+-            FatalError("xf86OpenConsole:"
+-                       " Server must be suid root for option \"KeepTTY\"\n");
++            FatalError("xf86OpenConsole: Server must be running with root "
++                           "permissions\n"
++                           "You should be using Xwrapper to start the server or xdm.\n"
++                           "We strongly advise against making the server SUID root!\n");
  
-       /*
-        * setup the virtual terminal manager
+         /*
+          * setup the virtual terminal manager
 --- os/wrapper.c       1970-01-01 01:00:00.000000000 +0100
 +++ os/wrapper.c       2005-12-22 10:50:53.610963000 +0100
 @@ -0,0 +1,304 @@
@@ -322,16 +322,15 @@
 +
 --- os/Makefile.am     2005-12-06 16:50:35.000000000 +0100
 +++ os/Makefile.am     2006-02-05 14:36:53.211755250 +0100
-@@ -29,6 +29,11 @@
+@@ -24,6 +24,11 @@
        xprintf.c       \
-       $(XORG_SOURCES)
+       $(XORG_SRCS)
  
 +bin_PROGRAMS = Xwrapper
 +Xwrapper_SOURCES = wrapper.c
 +Xwrapper_CFLAGS = -DUSE_PAM -DXSERVER_PATH=\"/usr/bin/Xorg\" $(AM_CFLAGS)
 +Xwrapper_LDADD = -lpam_misc
 +
- if XCSECURITY
- libos_la_SOURCES += $(XCSECURITY_SOURCES)
+ if SECURE_RPC
+ libos_la_SOURCES += $(SECURERPC_SRCS)
  endif
-