- updated for 4.2.0

Changed files:
    XFree86-Xwrapper.patch -> 1.5
    XFree86-config-s3.patch -> 1.2
    XFree86-imake-kernel-version.patch -> 1.3
    XFree86-xdm-fixes.patch -> 1.5
    XFree86-xfs-logger.patch -> 1.2
    XFree86-xman.patch -> 1.4

diff --git a/XFree86-Xwrapper.patch b/XFree86-Xwrapper.patch
index b4bafa4a70333a9c606011c8e81ccb7e99c550d4..437a7b3bd132b01a9eb11a98f47a8e2647cbdf51 100644 (file)
--- a/XFree86-Xwrapper.patch
+++ b/XFree86-Xwrapper.patch
@@ -111,13 +111,13 @@ diff -urN XFree86-4.1.0.orig/xc/programs/Xserver/os/Imakefile XFree86-4.1.0/xc/p
 --- XFree86-4.1.0.orig/xc/programs/Xserver/os/Imakefile        Mon Apr 23 18:17:12 2001
 +++ XFree86-4.1.0/xc/programs/Xserver/os/Imakefile     Sun Jun 17 20:18:35 2001
 @@ -116,6 +116,7 @@
- #endif
-         DEFINES = -DXSERV_t -DTRANS_SERVER $(CONNECTION_FLAGS) $(MEM_DEFINES) $(XDMAUTHDEFS) $(RPCDEFS) $(SIGNAL_DEFINES) $(OS_DEFINES) $(KRB5_DEFINES) $(RGB_DEFINES)
-        INCLUDES = -I.  -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(TOP)/lib/Xau -I../lbx Krb5Includes
+        INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
+                 -I$(SERVERSRC)/Xext -I$(FONTINCSRC) \
+                 -I$(TOP)/lib/Xau -I../lbx Krb5Includes
 +  EXTRA_DEFINES = -DUSE_PAM
-  DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) $(TRANS_INCLUDES) $(CONNECTION_FLAGS) DependDefines
+  DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) \
+                 $(TRANS_INCLUDES) $(CONNECTION_FLAGS) DependDefines
         LINTLIBS = ../dix/llib-ldix.ln
- 
 @@ -159,6 +160,14 @@
        cc -c $(DBM_DEFINES) $(CDEBUGFLAGS) $(ALLDEFINES) $*.c
  #else

diff --git a/XFree86-config-s3.patch b/XFree86-config-s3.patch
index 5097107aa637dad777d824402d216123d22257d5..23f7f8512d491673ee7034ff8c13717b9979b822 100644 (file)
--- a/XFree86-config-s3.patch
+++ b/XFree86-config-s3.patch
@@ -9,41 +9,3 @@
                                neomagic i740 tdfx savage \
                                cirrus vmware tseng trident chips apm \
                                GlideDriver fbdev i128 \
---- XFree86-4.1.0/xc/config/cf/xfree86.cf.orig Tue Jul  3 10:10:40 2001
-+++ XFree86-4.1.0/xc/config/cf/xfree86.cf      Tue Jul  3 10:10:42 2001
-@@ -302,7 +302,7 @@
- 
- /* Pure PCI drivers should go first */
- # ifndef XF86CardDrivers
--#  define XF86CardDrivers     mga glint nv tga s3virge sis rendition \
-+#  define XF86CardDrivers     mga glint nv tga s3 s3virge sis rendition \
-                               neomagic i740 tdfx savage \
-                               cirrus vmware tseng trident chips apm \
-                               GlideDriver fbdev i128 \
-@@ -472,7 +472,7 @@
- # endif
- 
- # ifndef XF86CardDrivers
--#  define XF86CardDrivers     mga glint nv s3virge sis savage \
-+#  define XF86CardDrivers     mga glint nv s3 s3virge sis savage \
-                               trident chips tdfx fbdev ati \
-                               DevelDrivers newport \
-                               XF86OSCardDrivers XF86ExtraCardDrivers
-@@ -555,7 +555,7 @@
- 
- /* Pure PCI drivers should go first */
- # ifndef XF86CardDrivers
--#  define XF86CardDrivers     mga tdfx glint s3virge rendition tga \
-+#  define XF86CardDrivers     mga tdfx glint s3 s3virge rendition tga \
-                               savage nv DevelDrivers siliconmotion vga \
-                               XF86OSCardDrivers XF86ExtraCardDrivers
- # endif
-@@ -648,7 +648,7 @@
- 
- /* Pure PCI drivers should go first */
- # ifndef XF86CardDrivers
--#  define XF86CardDrivers     mga glint s3virge sis savage\
-+#  define XF86CardDrivers     mga glint s3 s3virge sis savage\
-                               trident chips tdfx fbdev \
-                               DevelDrivers vga \
-                               XF86OSCardDrivers XF86ExtraCardDrivers

diff --git a/XFree86-imake-kernel-version.patch b/XFree86-imake-kernel-version.patch
index cd4701feda1773172a19299716212c3a92a5dadf..e584cab372e5b9e6158a30c15f249681a484e3f8 100644 (file)
--- a/XFree86-imake-kernel-version.patch
+++ b/XFree86-imake-kernel-version.patch
@@ -2,11 +2,11 @@ diff -ur XFree86-4.0.2/xc/config/imake/Imakefile XFree86-4.0.2.new/xc/config/ima
 --- XFree86-4.0.2/xc/config/imake/Imakefile    Sat Aug 14 12:49:01 1999
 +++ XFree86-4.0.2.new/xc/config/imake/Imakefile        Sat Dec 23 17:48:28 2000
 @@ -15,10 +15,14 @@
- INCLUDES = -I$(TOP)/include $(TOP_X_INCLUDES)/X11
- CPP_PROGRAM = CppCmd
  CPP_DEFINES = -DCPP_PROGRAM="\"$(CPP_PROGRAM)\""
--DEFINES = $(SIGNAL_DEFINES) $(BOOTSTRAPCFLAGS) $(CPP_DEFINES)
-+DEFINES = $(SIGNAL_DEFINES) $(BOOTSTRAPCFLAGS) $(CPP_DEFINES) -DDEFAULT_OS_CPU_FROB="\"$(DEFAULT_OS_CPU_FROB)\""
+ GCC_COMMAND = $(CC) -fmerge-constants -xc /dev/null -S -o /dev/null 2> /dev/null 1> /dev/null
+ GCC_DEFINES = -DHAS_MERGE_CONSTANTS=`if $(GCC_COMMAND); then echo 1; else echo 0; fi`
+-DEFINES = $(SIGNAL_DEFINES) $(BOOTSTRAPCFLAGS) $(CPP_DEFINES) $(GCC_DEFINES)
++DEFINES = $(SIGNAL_DEFINES) $(BOOTSTRAPCFLAGS) $(CPP_DEFINES) $(GCC_DEFINES) -DDEFAULT_OS_CPU_FROB="\"$(DEFAULT_OS_CPU_FROB)\""
  
  #if defined(MacIIArchitecture) || defined(SequentArchitecture) || defined(i386ScoArchitecture)
  XBSDLIB = /**/

diff --git a/XFree86-xdm-fixes.patch b/XFree86-xdm-fixes.patch
index 91e1e6a22aff2fa6db85345ddcc2a5f6ca16dfc0..aafc7968a2504541119151dabeff19b580639b3a 100644 (file)
--- a/XFree86-xdm-fixes.patch
+++ b/XFree86-xdm-fixes.patch
@@ -41,7 +41,7 @@ diff -Nur XFree86-4.0.2.org/xc/programs/xdm/config/Imakefile XFree86-4.0.2/xc/pr
  #endif
  
  CppFileTarget(Xservers.ws,Xserv.ws.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT),NullParameter)
--CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR),NullParameter)
+-CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU),NullParameter)
 +#ifdef LinuxArchitecture
 +CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DLINUX=1 -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DXDMVARDIR=$(XDMVARDIR),NullParameter)
 +#else

diff --git a/XFree86-xfs-logger.patch b/XFree86-xfs-logger.patch
index 5cbe5fde1063e720a3db1f45aafd5769d5c0ee42..b980b7b5a009193d6795a5442240d78011ea0623 100644 (file)
--- a/XFree86-xfs-logger.patch
+++ b/XFree86-xfs-logger.patch
@@ -1,16 +1,14 @@
 diff -Nur xc/programs/xfs.org/difs/main.c xc/programs/xfs/difs/main.c
 --- xc/programs/xfs.org/difs/main.c    Fri Apr  7 10:14:45 2000
 +++ xc/programs/xfs/difs/main.c        Fri Apr  7 10:02:01 2000
-@@ -56,6 +56,9 @@
+@@ -56,6 +56,7 @@
  #include      "dispatch.h"
  #include      "extentst.h"
  #include      "difs.h"
-+
 +#include      "debug.h"
-+
- #include <unistd.h>
- #include <pwd.h>
- #include <sys/types.h>
+ 
+ char       *ConnectionInfo;
+ int         ConnInfoLen;
 @@ -77,6 +80,7 @@
  static Bool create_connection_block(void);
  
@@ -20,13 +18,13 @@ diff -Nur xc/programs/xfs.org/difs/main.c xc/programs/xfs/difs/main.c
  
  extern OldListenRec *OldListen;
 @@ -92,6 +96,7 @@
-     argvGlobal = argv;
-     droppriv = 0;
-     becomeDaemon = 0;
+     int         i, oldumask;
+ 
+     argcGlobal = argc;
 +    debug_level = 0;
+     argvGlobal = argv;
  
      configfilename = DEFAULT_CONFIG_FILE;
- 
 diff -Nur xc/programs/xfs.org/include/debug.h xc/programs/xfs/include/debug.h
 --- xc/programs/xfs.org/include/debug.h        Thu Jan  1 01:00:00 1970
 +++ xc/programs/xfs/include/debug.h    Fri Apr  7 10:02:35 2000
@@ -37,22 +35,22 @@ diff -Nur xc/programs/xfs.org/os/utils.c xc/programs/xfs/os/utils.c
 --- xc/programs/xfs.org/os/utils.c     Fri Apr  7 10:14:45 2000
 +++ xc/programs/xfs/os/utils.c Fri Apr  7 10:04:38 2000
 @@ -91,6 +91,7 @@
- #endif
+ #include <stdlib.h>
  
  extern char *configfilename;
 +extern int  debug_level;
- extern int  droppriv; /* whether or not to drop root privileges */
- extern int  becomeDaemon; /* whether to become a daemon or not */
- char       *progname;
+ static Bool dropPriv = FALSE; /* whether or not to drop root privileges */
+ #ifdef DEFAULT_DAEMON
+ static Bool becomeDaemon = TRUE; /* whether to become a daemon or not */
 @@ -191,7 +192,7 @@
  static void
  usage(void)
  {
--    fprintf(stderr, "usage: %s [-config config_file] [-port tcp_port] [-droppriv] [-daemon]\n",
-+    fprintf(stderr, "usage: %s [-config config_file] [-port tcp_port] [-droppriv] [-daemon] [-d debug_level]\n",
+-    fprintf(stderr, "usage: %s [-config config_file] [-port tcp_port] [-droppriv] [-daemon] [-nodaemon] [-user user_name]\n",
++    fprintf(stderr, "usage: %s [-config config_file] [-port tcp_port] [-droppriv] [-daemon] [-nodaemon] [-user user_name] [-d debug_level]\n",
            progname);
      exit(1);
- }
+ 
 @@ -295,6 +296,8 @@
                ProcessLSoption (argv[++i]);
            else

diff --git a/XFree86-xman.patch b/XFree86-xman.patch
index 1d03ddd87bef5f3d5daa2186cfeb2d0a808dddf5..e7a1d2e6b3df542d8edf413f558a03a86ea9a36c 100644 (file)
--- a/XFree86-xman.patch
+++ b/XFree86-xman.patch
@@ -2,9 +2,9 @@ diff -urN XFree86-4.1.0.orig/xc/programs/xman/vendor.h XFree86-4.1.0/xc/programs
 --- XFree86-4.1.0.orig/xc/programs/xman/vendor.h       Thu Apr 19 21:54:51 2001
 +++ XFree86-4.1.0/xc/programs/xman/vendor.h    Sun Jun 17 22:42:16 2001
 @@ -62,7 +62,7 @@
- #if defined(__FreeBSD__)
+ #if defined(MANCONFIGSTYLE_FreeBSD)
  # define MANCONF "/etc/manpath.config"
- #elif (defined(BSD) && (BSD >= 199103)) || defined(linux)
+ #elif defined(MANCONFIGSTYLE_Linux) || defined(MANCONFIGSTYLE_OpenBSD) || defined(MANCONFIGSTYLE_BSD)
 -# define MANCONF "/etc/man.conf"
 +# define MANCONF "/etc/man.config"
  #endif