SOURCES: XFree86-PLD.patch, XFree86-Xwrapper.patch, XFree86-elfloa...

qboosh qboosh at pld-linux.org
Mon Dec 3 19:21:16 CET 2007 

Author: qboosh                       Date: Mon Dec  3 18:21:16 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 4.7.0

---- Files affected:
SOURCES:
   XFree86-PLD.patch (1.23 -> 1.24) , XFree86-Xwrapper.patch (1.11 -> 1.12) , XFree86-elfloader-linux-non-exec-stack.patch (1.2 -> 1.3) , XFree86-xterm-256colors.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/XFree86-PLD.patch
diff -u SOURCES/XFree86-PLD.patch:1.23 SOURCES/XFree86-PLD.patch:1.24
--- SOURCES/XFree86-PLD.patch:1.23	Wed Jul 19 21:42:31 2006
+++ SOURCES/XFree86-PLD.patch	Mon Dec  3 19:21:11 2007
@@ -207,7 +207,7 @@
  #ifndef XF86OSCardDrivers
 --- xc/config/cf/site.def.orig	2006-01-09 15:56:13.000000000 +0100
 +++ xc/config/cf/site.def	2006-06-11 00:28:00.330502072 +0200
-@@ -104,10 +104,15 @@
+@@ -104,10 +104,10 @@
  #define HasSentinel	YES
  */
  
@@ -218,11 +218,6 @@
 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
 +#undef DefaultSystemPath
 +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
-+
-+
-+#define HasPam    YES
-+#define HasPamMisc    YES
-+#define HasFontconfig	YES
  
  
  /* You do NOT need SetUID if you only run the server under xdm */
@@ -276,7 +271,7 @@
   *
 -#define TermcapLibrary		-lncurses
   */
-+#define TermcapLibrary		-lncurses
++#define TermcapLibrary		-ltinfo
  
  /*
   * Build a server that dynamically loads the modules by setting
@@ -290,6 +285,16 @@
  
  /*
   * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
+@@ -691,4 +691,8 @@
+ #define X86EMU_LIBPATH /usr/local/lib
+  */ 
+ 
+-
++/* these must be before linux.cf is included */
++#define UsePam		YES
++#define HasPam		YES
++#define HasPamMisc	YES
++#define HasFontconfig	YES
 --- xc/config/cf/xfree86.cf.orig	2006-04-26 02:28:16.000000000 +0200
 +++ xc/config/cf/xfree86.cf	2006-06-11 00:28:00.337501008 +0200
 @@ -148,7 +148,7 @@
@@ -429,7 +434,7 @@
 -#else
 -InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
 -#endif
-+XCOMM Red Hat gets this from a different package
++XCOMM PLD gets this from a different package
 +XCOMM #if InstallXinitConfig
 +XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
 +XCOMM #else
@@ -438,9 +443,9 @@
  
  LinkConfDirectory(xinit,.,xinit,.)
  
---- xc/programs/xterm/Imakefile.orig	2006-04-10 02:34:36.000000000 +0200
-+++ xc/programs/xterm/Imakefile	2006-06-11 00:48:09.508679048 +0200
-@@ -94,6 +94,10 @@
+--- xc/programs/xterm/Imakefile.orig	2007-07-03 17:19:53.000000000 +0200
++++ xc/programs/xterm/Imakefile	2007-12-02 16:10:40.453362442 +0100
+@@ -102,6 +102,10 @@
  # endif
  #endif
  
@@ -451,12 +456,12 @@
  #ifndef SpecialCObjectRule
  #define SpecialCObjectRule(module,ignore,defines) \
  module.o: ; $(CC) -c defines $(CFLAGS) module.c
-@@ -179,7 +183,7 @@
-     XKB_DEFINES = XkbClientDefines
-    PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
-         DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(PUTENVDEF) $(IMAKEDEFINES) $(TRACEDEF)
--       INCLUDES = -I. $(XRFINCLUDES)
-+       INCLUDES = -I. -I/usr/include/ncurses $(XRFINCLUDES)
+@@ -204,7 +208,7 @@
+         DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) \
+                   $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) \
+                   $(PUTENVDEF) $(IMAKEDEFINES) $(TRACEDEF)
+-       INCLUDES = $(OBSOLETE_INCLUDES) $(XRFINCLUDES)
++       INCLUDES = $(OBSOLETE_INCLUDES) $(XRFINCLUDES) -I/usr/include/ncurses
  
  #ifdef OS2Architecture
          MAINSRC = os2main.c

================================================================
Index: SOURCES/XFree86-Xwrapper.patch
diff -u SOURCES/XFree86-Xwrapper.patch:1.11 SOURCES/XFree86-Xwrapper.patch:1.12
--- SOURCES/XFree86-Xwrapper.patch:1.11	Thu Jul 20 00:05:02 2006
+++ SOURCES/XFree86-Xwrapper.patch	Mon Dec  3 19:21:11 2007
@@ -86,7 +86,7 @@
  
 +#if UseXserverWrapper
 +all:: Xwrapper
-+SetUIDProgramTarget(Xwrapper,os/wrapper.o,NullParameter,$(PAMLIBS),NullParameter)
++SetUIDProgramTarget(Xwrapper,os/wrapper.o,NullParameter,$(SERVERPAMLIBRARIES),NullParameter)
 +InstallProgramWithFlags(Xwrapper,$(BINDIR),$(INSTUIDFLAGS))
 +#endif
 +
@@ -110,22 +110,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 @@
+@@ -239,6 +241,14 @@
  SpecialCObjectRule(oscolor,$(ICONFIGFILES),$(DBM_DEFINES))
  #endif
  
 +#if UseXserverWrapper && XF86Server
 +AllTarget(wrapper.o)
 +
-+       WRAPPER_DEFINES = -DXSERVER_PATH=\"/etc/X11/X\"
++       WRAPPER_DEFINES = -DXSERVER_PATH=\"/etc/X11/X\" $(PAMDEFINES)
 +
 +SpecialCObjectRule(wrapper,NullParameter,$(WRAPPER_DEFINES))
 +#endif

================================================================
Index: SOURCES/XFree86-elfloader-linux-non-exec-stack.patch
diff -u SOURCES/XFree86-elfloader-linux-non-exec-stack.patch:1.2 SOURCES/XFree86-elfloader-linux-non-exec-stack.patch:1.3
--- SOURCES/XFree86-elfloader-linux-non-exec-stack.patch:1.2	Tue May  1 08:45:33 2007
+++ SOURCES/XFree86-elfloader-linux-non-exec-stack.patch	Mon Dec  3 19:21:11 2007
@@ -1,15 +1,15 @@
---- xc/programs/Xserver/hw/xfree86/loader/elfloader.c.orig	2006-04-08 19:53:39.000000000 +0200
-+++ xc/programs/Xserver/hw/xfree86/loader/elfloader.c	2007-05-01 08:40:52.720051459 +0200
-@@ -1168,7 +1168,7 @@
+--- xc/programs/Xserver/hw/xfree86/loader/elfloader.c.orig	2007-04-09 17:37:17.000000000 +0200
++++ xc/programs/Xserver/hw/xfree86/loader/elfloader.c	2007-12-02 16:51:49.442062089 +0100
+@@ -1165,7 +1165,7 @@
  	    ErrorF("ELFCreateGOT() Unable to reallocate memory!!!!\n");
  	    return FALSE;
  	}
--#   if defined(linux) && defined(__ia64__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+#   if defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__)
+-#   if (defined(linux) && defined(__ia64__)) || \
++#   if defined(linux) || \
+        defined(__OpenBSD__) || defined(__NetBSD__)
  	{
  	    unsigned long page_size = getpagesize();
- 	    unsigned long round;
-@@ -3351,10 +3351,16 @@
+@@ -3483,10 +3483,16 @@
  	elffile->lsection[j].size = SecSize(i);
  	elffile->lsection[j].flags = flags;
  	switch (SecType(i)) {
@@ -28,12 +28,12 @@
  	    break;
  #endif
  	case SHT_SYMTAB:
-@@ -3556,7 +3562,7 @@
+@@ -3688,7 +3694,7 @@
  	ErrorF("Unable to allocate ELF sections\n");
  	return NULL;
      }
--#  if defined(linux) && defined(__ia64__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+#  if defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__)
+-#  if (defined(linux) && defined(__ia64__)) || \
++#  if defined(linux) || \
+       defined(__OpenBSD__) || defined(__NetBSD__)
      {
  	unsigned long page_size = getpagesize();
- 	unsigned long round;

================================================================
Index: SOURCES/XFree86-xterm-256colors.patch
diff -u SOURCES/XFree86-xterm-256colors.patch:1.3 SOURCES/XFree86-xterm-256colors.patch:1.4
--- SOURCES/XFree86-xterm-256colors.patch:1.3	Sun Jun 11 19:28:21 2006
+++ SOURCES/XFree86-xterm-256colors.patch	Mon Dec  3 19:21:11 2007
@@ -1,6 +1,6 @@
---- xc/programs/xterm/Imakefile.orig	2006-06-11 03:49:18.234381592 +0200
-+++ xc/programs/xterm/Imakefile	2006-06-11 03:52:43.109235880 +0200
-@@ -46,6 +46,8 @@
+--- xc/programs/xterm/Imakefile.orig	2007-12-02 16:41:43.351522957 +0100
++++ xc/programs/xterm/Imakefile	2007-12-02 16:43:16.500831234 +0100
+@@ -50,6 +50,8 @@
          UTMPLIB = -lutempter
  #endif
  
@@ -9,12 +9,12 @@
  /*
   * Fixes to allow compile with X11R5, etc.
   */
-@@ -185,7 +187,7 @@
-     XKB_DEFINES = XkbClientDefines
+@@ -209,7 +211,7 @@
     PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
-         DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(PUTENVDEF) $(IMAKEDEFINES) $(TRACEDEF)
--       INCLUDES = -I. -I/usr/include/ncurses $(XRFINCLUDES)
-+       INCLUDES = -I. -I/usr/include/ncurses $(COLORS_256) $(XRFINCLUDES)
+         DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) \
+                   $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) \
+-                  $(PUTENVDEF) $(IMAKEDEFINES) $(TRACEDEF)
++                  $(PUTENVDEF) $(IMAKEDEFINES) $(TRACEDEF) $(COLORS_256)
+        INCLUDES = $(OBSOLETE_INCLUDES) $(XRFINCLUDES) -I/usr/include/ncurses
  
  #ifdef OS2Architecture
-         MAINSRC = os2main.c
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/XFree86-PLD.patch?r1=1.23&r2=1.24&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/XFree86-Xwrapper.patch?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/XFree86-elfloader-linux-non-exec-stack.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/XFree86-xterm-256colors.patch?r1=1.3&r2=1.4&f=u

More information about the pld-cvs-commit mailing list