From ae1e20e3af40a7d2b6e91f7f53b783d694548809 Mon Sep 17 00:00:00 2001 From: kloczek Date: Thu, 15 May 2003 01:45:28 +0000 Subject: [PATCH] - fixes for RA-branch. Changed files: XFree86-XTerm.ad.patch -> 1.4.2.1 XFree86-Xwrapper.patch -> 1.6.2.1 XFree86-pic.patch -> 1.1.2.1 XFree86-xdm-fixes.patch -> 1.5.4.1 XFree86-xfs-logger.patch -> 1.2.4.1 XFree86-xman-manpaths.patch -> 1.1.2.1 XFree86-xman.patch -> 1.4.4.1 --- XFree86-XTerm.ad.patch | 54 ++++++++++++++++--------------------- XFree86-Xwrapper.patch | 18 ++++++------- XFree86-pic.patch | 17 ++++++------ XFree86-xdm-fixes.patch | 29 ++++++-------------- XFree86-xfs-logger.patch | 24 ++++++++--------- XFree86-xman-manpaths.patch | 10 +++---- XFree86-xman.patch | 13 --------- 7 files changed, 64 insertions(+), 101 deletions(-) diff --git a/XFree86-XTerm.ad.patch b/XFree86-XTerm.ad.patch index d3909bb..cbdfc47 100644 --- a/XFree86-XTerm.ad.patch +++ b/XFree86-XTerm.ad.patch @@ -1,26 +1,32 @@ ---- XFree86-4.2.1/xc/programs/xterm/XTerm.ad~ Thu Sep 5 10:05:48 2002 -+++ XFree86-4.2.1/xc/programs/xterm/XTerm.ad Thu Sep 5 10:05:48 2002 -@@ -5,115 +5,115 @@ - ! - ! $XFree86: xc/programs/xterm/XTerm.ad,v 3.22 2002/01/05 22:05:02 dickey Exp $ +--- XFree86-4.3.0/xc/programs/xterm/XTerm.ad.orig Mon Sep 30 02:39:05 2002 ++++ XFree86-4.3.0/xc/programs/xterm/XTerm.ad Wed May 14 22:38:16 2003 +@@ -7,112 +7,112 @@ --XTerm.JoinSession:False -+XTerm.JoinSession: False + ! This is nonsense: if the xterm has no session management capabilities, + ! it is useless, and if it does, it is harmful. +-!XTerm.JoinSession:False ++XTerm.JoinSession:False -*SimpleMenu*BackingStore: NotUseful -*SimpleMenu*menuLabel.font: -adobe-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-* --*SimpleMenu*menuLabel.vertSpace: 100 ++*SimpleMenu*BackingStore: NotUseful ++*SimpleMenu*menuLabel.font: -adobe-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-* + *SimpleMenu*menuLabel.vertSpace: 100 -*SimpleMenu*HorizontalMargins: 16 -*SimpleMenu*Sme.height: 16 -- ++*SimpleMenu*HorizontalMargins: 16 ++*SimpleMenu*Sme.height: 16 + -*SimpleMenu*Cursor: left_ptr -- ++*SimpleMenu*Cursor: left_ptr + -*mainMenu.Label: Main Options -*mainMenu*securekbd*Label: Secure Keyboard -*mainMenu*allowsends*Label: Allow SendEvents +-*mainMenu*redraw*Label: Redraw Window -*mainMenu*logging*Label: Log to File -*mainMenu*print*Label: Print Window --*mainMenu*redraw*Label: Redraw Window +-*mainMenu*print-redir*Label: Redirect to Printer -*mainMenu*8-bit control*Label: 8-Bit Controls -*mainMenu*backarrow key*Label: Backarrow Key (BS/DEL) -*mainMenu*num-lock*Label: Alt/NumLock Modifiers @@ -82,21 +88,14 @@ -*fontMenu*font6*Label: Huge -*VT100*font6: 10x20 -*fontMenu*fontescape*Label: Escape Sequence -+*SimpleMenu*BackingStore: NotUseful -+*SimpleMenu*menuLabel.font: -adobe-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-* -+*SimpleMenu*menuLabel.vertSpace: 100 -+*SimpleMenu*HorizontalMargins: 16 -+*SimpleMenu*Sme.height: 16 -+ -+*SimpleMenu*Cursor: left_ptr -+ +*mainMenu.Label: Main Options +*mainMenu*securekbd*Label: Secure Keyboard +*mainMenu*allowsends*Label: Allow SendEvents ++*mainMenu*redraw*Label: Redraw Window +*mainMenu*logging*Label: Log to File +*mainMenu*print*Label: Print Window -+*mainMenu*redraw*Label: Redraw Window -+*mainMenu*8-bit control*Label 8-Bit Controls ++*mainMenu*print-redir*Label: Redirect to Printer ++*mainMenu*8-bit control*Label: 8-Bit Controls +*mainMenu*backarrow key*Label: Backarrow Key (BS/DEL) +*mainMenu*num-lock*Label: Alt/NumLock Modifiers +*mainMenu*meta-esc*Label: Meta Sends Escape @@ -201,7 +200,7 @@ +*tek4014*fontSmall: 6x10 ! Enable Colour by default. -- + -*VT100*colorMode: on -*VT100*boldColors: on -*VT100*dynamicColors: on @@ -210,15 +209,8 @@ +*VT100*dynamicColors: on ! Uncomment this to use color for underline attribute --!*VT100*colorULMode: on --!*VT100*underLine: off -+*VT100*colorULMode: on -+*VT100*colorULMode: on -+*VT100*underLine: on - - ! Uncomment this to use color for the bold attribute - !*VT100*colorBDMode: on -@@ -121,21 +121,177 @@ + !*VT100*colorULMode: on +@@ -124,21 +124,177 @@ ! Uncomment this to use the bold/underline colors in preference to other colors !*VT100*colorAttrMode: on diff --git a/XFree86-Xwrapper.patch b/XFree86-Xwrapper.patch index cff478f..b046895 100644 --- a/XFree86-Xwrapper.patch +++ b/XFree86-Xwrapper.patch @@ -17,32 +17,30 @@ diff -urN XFree86-4.1.0.orig/xc/config/cf/Server.tmpl XFree86-4.1.0/xc/config/cf #endif /* -diff -urN XFree86-4.1.0.orig/xc/config/cf/xf86site.def XFree86-4.1.0/xc/config/cf/xf86site.def ---- XFree86-4.1.0.orig/xc/config/cf/xf86site.def Sun Jun 17 19:42:08 2001 -+++ XFree86-4.1.0/xc/config/cf/xf86site.def Sun Jun 17 20:17:24 2001 -@@ -348,13 +348,15 @@ +--- XFree86-4.3.0/xc/config/cf/xf86site.def.orig Wed May 14 16:38:12 2003 ++++ XFree86-4.3.0/xc/config/cf/xf86site.def Wed May 14 16:40:08 2003 +@@ -69,14 +69,15 @@ */ /* - * If you only run the X server under xdm the X servers don't need to be - * installed SetUID, and you may comment out the lines below. If you run - * the servers by hand (with xinit or startx), then they do need to be -- * installed SetUID on most OSs. -- * Consult your system administrator before making the X server setuid. +- * installed SetUID on most platforms. + * The X servers need to run as root on most OSs. We're now using a + * wrapper in that case, but we still need to make it known that the + * servers need SetUID. When only using xdm, this (and the wrapper) + * are not required. Disabling this automatically disables use of the + * wrapper. * --#define InstallXserverSetUID NO +- * Consult your system administrator before making the X server setuid. + * If you're only starting the Xservers with xdm set this to NO -+ * + * +-#define InstallXserverSetUID NO +#define XserverNeedsSetUID NO */ - /* -diff -urN XFree86-4.1.0.orig/xc/config/cf/xfree86.cf XFree86-4.1.0/xc/config/cf/xfree86.cf + --- XFree86-4.1.0.orig/xc/config/cf/xfree86.cf Sun Jun 17 19:42:08 2001 +++ XFree86-4.1.0/xc/config/cf/xfree86.cf Sun Jun 17 20:17:24 2001 @@ -720,12 +720,15 @@ diff --git a/XFree86-pic.patch b/XFree86-pic.patch index c1f53aa..1667e3c 100644 --- a/XFree86-pic.patch +++ b/XFree86-pic.patch @@ -1,12 +1,13 @@ ---- XFree86-4.0.1Z/xc/config/cf/Library.tmpl.pic Wed Dec 13 16:19:03 2000 -+++ XFree86-4.0.1Z/xc/config/cf/Library.tmpl Wed Dec 13 16:19:28 2000 -@@ -147,8 +147,8 @@ - # define _NormalCleanDir() LibCleanDir(unshared) - # else - # define _NormalLibMkdir() $(_NULLCMD_) --# define _NormalObjCompile(options) NormalLibObjCompile(options) +--- XFree86-4.3.0/xc/config/cf/Library.tmpl.orig Sat Jan 4 03:48:24 2003 ++++ XFree86-4.3.0/xc/config/cf/Library.tmpl Wed May 14 22:28:11 2003 +@@ -212,9 +212,9 @@ + # if !DoSharedLib && defined(IncludeSharedObjectInNormalLib) + # define _NormalObjCompile(options) NormalRelocLibObjCompile(options) + # else +-# define _NormalObjCompile(options) NormalLibObjCompile(options) ++# define _NormalObjCompile(options) NormalLibObjCompile(options $(PICFLAGS)) + # endif -# define _NormalObjCplusplusCompile(options) NormalLibObjCplusplusCompile(options) -+# define _NormalObjCompile(options) NormalLibObjCompile(options $(PICFLAGS)) +# define _NormalObjCplusplusCompile(options) NormalLibObjCplusplusCompile(options $(PICFLAGS)) # define _NormalCleanDir() $(_NULLCMD_) # endif diff --git a/XFree86-xdm-fixes.patch b/XFree86-xdm-fixes.patch index aafc796..3a20fdf 100644 --- a/XFree86-xdm-fixes.patch +++ b/XFree86-xdm-fixes.patch @@ -1,20 +1,19 @@ -diff -Nur XFree86-4.0.2.org/xc/programs/xdm/Imakefile XFree86-4.0.2/xc/programs/xdm/Imakefile ---- XFree86-4.0.2.org/xc/programs/xdm/Imakefile Wed Nov 29 17:46:07 2000 -+++ XFree86-4.0.2/xc/programs/xdm/Imakefile Thu Dec 21 13:10:37 2000 -@@ -225,9 +225,9 @@ +--- XFree86-4.3.0/xc/programs/xdm/Imakefile.orig Sat Dec 7 21:31:04 2002 ++++ XFree86-4.3.0/xc/programs/xdm/Imakefile Wed May 14 22:07:20 2003 +@@ -256,9 +256,9 @@ '-DDEF_SYSTEM_SHELL="$(BOURNE_SHELL)"' \ '-DDEF_FAILSAFE_CLIENT="$(BINDIR)/xterm"' \ '-DDEF_XDM_CONFIG="$(XDMDIR)/xdm-config"' \ - '-DDEF_CHOOSER="$(XDMDIR)/chooser"' \ - '-DDEF_AUTH_DIR="$(XDMDIR)"' \ - '-DDEF_GREETER_LIB="$(XDMDIR)/libXdmGreet.so"' -+ '-DDEF_CHOOSER="$(BINDIR)/chooser"' \ -+ '-DDEF_AUTH_DIR="$(XDMVARDIR)"' \ -+ '-DDEF_GREETER_LIB="$(USRLIBDIR)/libXdmGreet.so"' - #endif ++ '-DDEF_CHOOSER="$(BINDIR)/chooser"' \ ++ '-DDEF_AUTH_DIR="$(XDMVARDIR)"' \ ++ '-DDEF_GREETER_LIB="$(USRLIBDIR)/libXdmGreet.so"' ComplexProgramTarget_1(xdm,$(LOCAL_LIBRARIES),NullParameter) -@@ -247,7 +247,7 @@ + LinkConfDirectory(xdm,.,xdm,.) +@@ -277,7 +277,7 @@ #if BuildChooser SpecialCObjectRule(chooser, $(ICONFIGFILES), $(SOCK_DEFINES)) NormalProgramTarget(chooser,$(OBJS3),$(DEPLIBS3),$(LIBS3),NullParameter) @@ -73,15 +72,3 @@ diff -Nur XFree86-4.0.2.org/xc/programs/xdm/config/Xres.cpp XFree86-4.0.2/xc/pro #endif /* XPM */ xlogin*failColor: red *Foreground: black -diff -Nur XFree86-4.0.2.org/xc/programs/xdm/greeter/Imakefile XFree86-4.0.2/xc/programs/xdm/greeter/Imakefile ---- XFree86-4.0.2.org/xc/programs/xdm/greeter/Imakefile Wed Jun 14 21:43:32 2000 -+++ XFree86-4.0.2/xc/programs/xdm/greeter/Imakefile Thu Dec 21 13:20:13 2000 -@@ -77,8 +77,6 @@ - DEFINES = $(GREETER_DEFINES) $(XDMAUTH_DEFINES) $(RPC_DEFINES) \ - $(KRBIV_DEFINES) $(KRB5_DEFINES) $(PWD_DEFINES) $(PAM_DEFINES) - --SHLIBDIR = $(XDMDIR) -- - SRCS = greet.c verify.c Login.c - OBJS = greet.o verify.o Login.o - diff --git a/XFree86-xfs-logger.patch b/XFree86-xfs-logger.patch index b980b7b..afa83dc 100644 --- a/XFree86-xfs-logger.patch +++ b/XFree86-xfs-logger.patch @@ -1,6 +1,5 @@ -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 +--- XFree86-4.3.0/xc/programs/xfs.org/difs/main.c Fri Apr 7 10:14:45 2000 ++++ XFree86-4.3.0/xc/programs/xfs/difs/main.c Fri Apr 7 10:02:01 2000 @@ -56,6 +56,7 @@ #include "dispatch.h" #include "extentst.h" @@ -31,10 +30,9 @@ diff -Nur xc/programs/xfs.org/include/debug.h xc/programs/xfs/include/debug.h @@ -0,0 +1 @@ +/* debug.h */ \ No newline at end of file -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 @@ +--- XFree86-4.3.0/xc/programs/xfs/os./utils.c.orig Tue Oct 15 03:45:03 2002 ++++ XFree86-4.3.0/xc/programs/xfs/os/utils.c Wed May 14 17:12:58 2003 +@@ -93,6 +93,7 @@ #include extern char *configfilename; @@ -42,21 +40,21 @@ diff -Nur xc/programs/xfs.org/os/utils.c xc/programs/xfs/os/utils.c 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 @@ +@@ -219,7 +219,7 @@ static void usage(void) { -- 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", +- fprintf(stderr, "usage: %s [-config config_file] [-port tcp_port] [-droppriv] [-daemon] [-nodaemon] [-user user_name] [-ls listen_socket]\n", ++ fprintf(stderr, "usage: %s [-config config_file] [-port tcp_port] [-droppriv] [-daemon] [-nodaemon] [-user user_name] [-ls listen_socket] [-d debug_level]\n", progname); exit(1); - -@@ -295,6 +296,8 @@ + } +@@ -333,6 +335,8 @@ ProcessLSoption (argv[++i]); else usage(); + } else if (!strcmp(argv[i], "-d") || !strcmp(argv[i], "--debug")) { + debug_level = atoi(argv[++i]); } else if (!strcmp(argv[i], "-droppriv")) { - droppriv = 1; + dropPriv = TRUE; } else if (!strcmp(argv[i], "-daemon")) { diff --git a/XFree86-xman-manpaths.patch b/XFree86-xman-manpaths.patch index 0c3e2db..f7e3da8 100644 --- a/XFree86-xman-manpaths.patch +++ b/XFree86-xman-manpaths.patch @@ -1,11 +1,11 @@ ---- XFree86-4.2.0/xc/programs/xman/vendor.h.orig Sun Mar 17 01:50:17 2002 -+++ XFree86-4.2.0/xc/programs/xman/vendor.h Sun Mar 17 01:54:57 2002 -@@ -77,7 +77,7 @@ +--- XFree86-4.3.0/xc/programs/xman/vendor.h.orig Sat Sep 21 04:38:25 2002 ++++ XFree86-4.3.0/xc/programs/xman/vendor.h Wed May 14 23:04:25 2003 +@@ -71,7 +71,7 @@ # define SYSMANPATH "/usr/catman/u_man:/usr/catman/a_man" #elif defined(__bsdi__) # define SYSMANPATH "/usr/share/man:/usr/contrib/man:/usr/contrib/isode/man:/usr/local/man" --#elif defined(__OpenBSD__) -+#elif defined(__OpenBSD__) || defined(linux) +-#elif defined(__OpenBSD__) || defined(__DARWIN__) ++#elif defined(__OpenBSD__) || defined(__DARWIN__) || defined(linux) # define SYSMANPATH "/usr/share/man:/usr/local/man:/usr/X11R6/man" #elif defined(SVR4) || defined(__osf__) || (defined(BSD) && (BSD >= 199103)) # define SYSMANPATH "/usr/share/man" diff --git a/XFree86-xman.patch b/XFree86-xman.patch index e7a1d2e..7772462 100644 --- a/XFree86-xman.patch +++ b/XFree86-xman.patch @@ -1,16 +1,3 @@ -diff -urN XFree86-4.1.0.orig/xc/programs/xman/vendor.h XFree86-4.1.0/xc/programs/xman/vendor.h ---- 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(MANCONFIGSTYLE_FreeBSD) - # define MANCONF "/etc/manpath.config" - #elif defined(MANCONFIGSTYLE_Linux) || defined(MANCONFIGSTYLE_OpenBSD) || defined(MANCONFIGSTYLE_BSD) --# define MANCONF "/etc/man.conf" -+# define MANCONF "/etc/man.config" - #endif - - /* -diff -urN XFree86-4.1.0.orig/xc/programs/xman/xman.man XFree86-4.1.0/xc/programs/xman/xman.man --- XFree86-4.1.0.orig/xc/programs/xman/xman.man Sat Jan 27 19:21:18 2001 +++ XFree86-4.1.0/xc/programs/xman/xman.man Sun Jun 17 22:41:25 2001 @@ -93,8 +93,8 @@ -- 2.44.0