rpms/xorg-x11/devel xorg-x11-6.8.2-loader-remove-propolice-junk.patch, NONE, 1.1 xorg-x11.spec, 1.226, 1.227

[fedora-cvs-commits at redhat.com]

Author: mharris

Update of /cvs/dist/rpms/xorg-x11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16089

Modified Files:
	xorg-x11.spec 
Added Files:
	xorg-x11-6.8.2-loader-remove-propolice-junk.patch 
Log Message:
- Wrote xorg-x11-6.8.2-loader-remove-propolice-junk.patch to remove IBM
  propolice support hack.  gcc has non-hack native support



xorg-x11-6.8.2-loader-remove-propolice-junk.patch:
 Imakefile |    9 ---------
 xf86sym.c |   12 ------------
 2 files changed, 21 deletions(-)

--- NEW FILE xorg-x11-6.8.2-loader-remove-propolice-junk.patch ---
--- xc/programs/Xserver/hw/xfree86/loader/xf86sym.c.loader-remove-propolice-junk	2005-09-23 15:37:28.000000000 -0400
+++ xc/programs/Xserver/hw/xfree86/loader/xf86sym.c	2005-09-23 15:38:00.000000000 -0400
@@ -235,12 +235,6 @@
 extern unsigned short ldw_brx(volatile unsigned char *, int);
 #endif
 
-#ifdef __SSP__
-/* Propolice! */
-extern long __guard[];
-extern void __stack_smash_handler(char [], int);
-#endif
-
 /* XFree86 things */
 
 LOOKUP xfree86LookupTab[] = {
@@ -1115,12 +1109,6 @@
 #endif
 #endif
 
-#ifdef __SSP__
-    /* propolice */
-    SYMFUNC(__stack_smash_handler)
-    SYMVAR(__guard)
-#endif
-
     /* Some variables. */
 
     SYMVAR(xf86stdin)
--- xc/programs/Xserver/hw/xfree86/loader/Imakefile.loader-remove-propolice-junk	2005-09-23 15:38:18.000000000 -0400
+++ xc/programs/Xserver/hw/xfree86/loader/Imakefile	2005-09-23 15:39:02.000000000 -0400
@@ -1,10 +1,5 @@
 XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/loader/Imakefile,v 1.38 2003/10/02 13:30:02 eich Exp $ */
 
-XCOMM #define ProPoliceSupport YES in host.def if you're on a propolice system
-#if ProPoliceSupport
-SSPOPTIONS=-D__SSP__
-#endif
-
 #include <Server.tmpl>
 #ifdef LoaderTest
 #define IHaveSubdirs
@@ -82,10 +77,6 @@
 SpecialCObjectRule(xf86sym,NullParameter,$(EXT_DEFINES))
 SpecialCObjectRule(dixsym,NullParameter,$(EXT_DEFINES))
 
-#if ProPoliceSupport
-SpecialCObjectRule(xf86sym,xf86sym.c,$(SSPOPTIONS) $(EXT_DEFINES))
-#endif
-
 #ifdef SparcArchitecture
 ObjectFromAsmSource(SparcMulDiv,NullParameter)
 #endif


Index: xorg-x11.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/devel/xorg-x11.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- xorg-x11.spec	22 Sep 2005 20:12:32 -0000	1.226
+++ xorg-x11.spec	23 Sep 2005 19:51:53 -0000	1.227
@@ -18,7 +18,7 @@
 
 Name: xorg-x11
 Version: 6.8.2
-Release: 51
+Release: 52
 #Release: 1.FC3.50.0
 #Release: ?.FC4.50.0
 
@@ -523,8 +523,7 @@
 Patch9720: xorg-x11-6.8.2-gcc4-fix.patch
 Patch9721: xorg-x11-6.8.2-xnest-update-modifier-state-fdo3030-fdo3664.patch
 Patch9722: xorg-x11-6.8.2-xnest-fix-warning-spew-fdo3513.patch
-Patch9723: xorg-x11-6.8.2-libvgahw-workaround-rh161242.patch
-
+Patch9723: xorg-x11-6.8.2-loader-remove-propolice-junk.patch
 
 # END OF 6.8.3 CANDIDATES
 # END OF DEVEL PATCHES
@@ -1190,6 +1189,7 @@
 %patch9720 -p0 -b .gcc4-fix
 %patch9721 -p0 -b .xnest-update-modifier-state-fdo3030-fdo3664
 %patch9722 -p0 -b .xnest-fix-warning-spew-fdo3513
+%patch9723 -p0 -b .loader-remove-propolice-junk
 
 # gcc-4.0.1-4 has a workaround for the volatile over-optimization so
 # disable this patch for now.
@@ -1234,7 +1234,6 @@
 %patch20007 -p0 -b .redhat-xcursorgen-do-not-build-included-cursors
 %endif
 
-
 ######################################################################
 #####  CREATE host-$arch.def  ##############################################
 pwd
@@ -3593,6 +3592,10 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT 
 
 %changelog
+* Fri Sep 23 2005 Mike A. Harris <mharris at redhat.com> 6.8.2-52
+- Wrote xorg-x11-6.8.2-loader-remove-propolice-junk.patch to remove IBM
+  propolice support hack.  gcc has non-hack native support
+
 * Thu Sep 22 2005 Mike A. Harris <mharris at redhat.com> 6.8.2-51
 - Update xorg-x11-6.8.2-ati-radeon-ppc-enable-dynamic-clocks.patch with new
   version from dwmw2 to fix bug (#152648)