- uniformized configs to use system-auth where possible

[packages/X11.git] / XFree86-Xwrapper.patch

diff --git a/XFree86-Xwrapper.patch b/XFree86-Xwrapper.patch
index f12ce2b703b8b831503730a73e0449f029c41d36..44e71c22f6cac440803a7ae20f015f14cf5c9d13 100644 (file)
--- a/XFree86-Xwrapper.patch
+++ b/XFree86-Xwrapper.patch
@@ -80,11 +80,12 @@ diff -urN xc.orig/programs/Xserver/Imakefile xc/programs/Xserver/Imakefile
  #include <Server.tmpl>
  
  #ifdef XFree86Version
-@@ -1146,6 +1141,11 @@
+@@ -1146,6 +1141,12 @@
  #endif /* XnestServer */
  
  
 +#if UseXserverWrapper
++all:: Xwrapper
 +SetUIDProgramTarget(Xwrapper,os/wrapper.o,NullParameter,$(PAMLIBS),NullParameter)
 +InstallProgramWithFlags(Xwrapper,$(BINDIR),$(INSTUIDFLAGS))
 +#endif
@@ -107,14 +108,21 @@ diff -urN xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c xc/pro
        }
  
        /*
-diff -urN xc.orig/programs/Xserver/os/Imakefile xc/programs/Xserver/os/Imakefile
---- xc.orig/programs/Xserver/os/Imakefile      Mon Dec 30 15:53:58 2002
-+++ xc/programs/Xserver/os/Imakefile   Mon Dec 30 17:31:52 2002
-@@ -166,6 +167,14 @@
+--- xc/programs/Xserver/os/Imakefile.orig      2006-02-19 16:51:31.000000000 +0100
++++ xc/programs/Xserver/os/Imakefile   2006-07-19 21:30:56.576028250 +0200
+@@ -193,6 +193,7 @@
+                 -I$(SERVERSRC)/Xext -I$(SERVERSRC)/render \
+                 -I$(SERVERSRC)/lbx -I$(SERVERSRC)/Xprint \
+                 -I$(TOP)/lib/Xau Krb5Includes
++  EXTRA_DEFINES = -DUSE_PAM
+  DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) \
+                 $(TRANS_INCLUDES) $(CONNECTION_FLAGS) DependDefines
+        LINTLIBS = ../dix/llib-ldix.ln
+@@ -239,6 +240,14 @@
  SpecialCObjectRule(oscolor,$(ICONFIGFILES),$(DBM_DEFINES))
  #endif
  
-+#if UseXserverWrapper
++#if UseXserverWrapper && XF86Server
 +AllTarget(wrapper.o)
 +
 +       WRAPPER_DEFINES = -DXSERVER_PATH=\"/etc/X11/X\"
@@ -468,4 +476,3 @@ diff -urN xc.orig/programs/xinit/xinit.c xc/programs/xinit/xinit.c
  #else
            (**argv != '/' && **argv != '\\' && **argv != '.' &&
             !(isalpha(**argv) && (*argv)[1]==':'))) {
-