+++ /dev/null
---- xc.orig/config/cf/xfree86.cf 2004-08-08 14:23:13.000000000 +0200
-+++ xc/config/cf/xfree86.cf 2004-08-08 14:36:35.145813664 +0200
-@@ -1916,7 +1916,7 @@
- #endif
-
- #ifndef DefaultGcc2DebugOpt
--# define DefaultGcc2DebugOpt -g
-+# define DefaultGcc2DebugOpt
- #endif
-
- #ifndef DebuggableLibraries
+++ /dev/null
---- XFree86-4.3.99.14/xc/lib/GL/mesa/math/Imakefile.inc.orig 2003-10-10 13:02:44.000000000 +0200
-+++ XFree86-4.3.99.14/xc/lib/GL/mesa/math/Imakefile.inc 2003-10-12 14:33:09.000000000 +0200
-@@ -26,20 +23,14 @@
- LinkSourceFile(m_xform.c, $(MESASRCDIR)/src/math)
- #endif
-
-- MESA_MATH_OBJS = $(MESAMATHBUILDDIR)m_debug_clip.o \
-- $(MESAMATHBUILDDIR)m_debug_norm.o \
-- $(MESAMATHBUILDDIR)m_debug_xform.o \
-- $(MESAMATHBUILDDIR)m_eval.o \
-+ MESA_MATH_OBJS = $(MESAMATHBUILDDIR)m_eval.o \
- $(MESAMATHBUILDDIR)m_matrix.o \
- $(MESAMATHBUILDDIR)m_translate.o \
- $(MESAMATHBUILDDIR)m_vector.o \
- $(MESAMATHBUILDDIR)m_xform.o
-
- #if defined(DoSharedLib) && DoSharedLib
-- MESA_MATH_UOBJS = $(MESAMATHBUILDDIR)unshared/m_debug_clip.o \
-- $(MESAMATHBUILDDIR)unshared/m_debug_norm.o \
-- $(MESAMATHBUILDDIR)unshared/m_debug_xform.o \
-- $(MESAMATHBUILDDIR)unshared/m_eval.o \
-+ MESA_MATH_UOBJS = $(MESAMATHBUILDDIR)unshared/m_eval.o \
- $(MESAMATHBUILDDIR)unshared/m_matrix.o \
- $(MESAMATHBUILDDIR)unshared/m_translate.o \
- $(MESAMATHBUILDDIR)unshared/m_vector.o \
-@@ -48,19 +39,13 @@
- MATH_MESA_UOBJS = $(MESA_MATH_OBJS)
- #endif
-
-- MESA_MATH_DOBJS = $(MESAMATHBUILDDIR)debugger/m_debug_clip.o \
-- $(MESAMATHBUILDDIR)debugger/m_debug_norm.o \
-- $(MESAMATHBUILDDIR)debugger/m_debug_xform.o \
-- $(MESAMATHBUILDDIR)debugger/m_eval.o \
-+ MESA_MATH_DOBJS = $(MESAMATHBUILDDIR)debugger/m_eval.o \
- $(MESAMATHBUILDDIR)debugger/m_matrix.o \
- $(MESAMATHBUILDDIR)debugger/m_translate.o \
- $(MESAMATHBUILDDIR)debugger/m_vector.o \
- $(MESAMATHBUILDDIR)debugger/m_xform.o
-
-- MESA_MATH_POBJS = $(MESAMATHBUILDDIR)profiled/m_debug_clip.o \
-- $(MESAMATHBUILDDIR)profiled/m_debug_norm.o \
-- $(MESAMATHBUILDDIR)profiled/m_debug_xform.o \
-- $(MESAMATHBUILDDIR)profiled/m_eval.o \
-+ MESA_MATH_POBJS = $(MESAMATHBUILDDIR)profiled/m_eval.o \
- $(MESAMATHBUILDDIR)profiled/m_matrix.o \
- $(MESAMATHBUILDDIR)profiled/m_translate.o \
- $(MESAMATHBUILDDIR)profiled/m_vector.o \
+++ /dev/null
-diff -ur X11-6.9.0.org/xc/config/cf/Imake.cf X11-6.9.0/xc/config/cf/Imake.cf
---- X11-6.9.0.org/xc/config/cf/Imake.cf 2005-11-08 07:33:24.000000000 +0100
-+++ X11-6.9.0/xc/config/cf/Imake.cf 2005-12-22 10:27:11.890963000 +0100
-@@ -888,6 +888,10 @@
- # define s390Architecture
- # undef __s390__
- # endif /* s390 */
-+# ifdef alpha
-+# define AlphaArchitecture
-+# undef alpha
-+# endif /* alpha */
- # ifdef __alpha
- # define AlphaArchitecture
- # undef __alpha
-diff -ur X11-6.9.0.org/xc/config/cf/Imake.tmpl X11-6.9.0/xc/config/cf/Imake.tmpl
---- X11-6.9.0.org/xc/config/cf/Imake.tmpl 2005-11-08 07:33:24.000000000 +0100
-+++ X11-6.9.0/xc/config/cf/Imake.tmpl 2005-12-22 10:28:07.490963000 +0100
-@@ -266,7 +266,7 @@
-
- #ifndef BuildHtmlManPages
- #ifdef RmanCmd
--#define BuildHtmlManPages YES
-+#define BuildHtmlManPages NO
- #else
- #define BuildHtmlManPages NO
- #endif
-@@ -882,11 +882,7 @@
- #define LintlibDir $(USRLIBDIR)/lint
- #endif
- #ifndef SystemManDirectory
--#if SystemV4
- #define SystemManDirectory /usr/share/man
--#else
--#define SystemManDirectory /usr/man
--#endif
- #endif
- #ifndef ManDirectoryRoot
- #ifdef ProjectRoot
-@@ -1196,7 +1192,7 @@
- #define CppCmd /LibDirName/cpp
- #endif
- #ifndef RawCppCmd
--#define RawCppCmd CppCmd -undef
-+#define RawCppCmd CppCmd
- #endif
- #ifndef CppNoLineInfoOption
- #define CppNoLineInfoOption /**/
-diff -ur X11-6.9.0.org/xc/config/cf/linux.cf X11-6.9.0/xc/config/cf/linux.cf
---- X11-6.9.0.org/xc/config/cf/linux.cf 2005-10-21 21:10:27.000000000 +0200
-+++ X11-6.9.0/xc/config/cf/linux.cf 2005-12-22 10:40:10.100963000 +0100
-@@ -394,7 +394,7 @@
- #ifndef BuildLibGlxWithoutPIC
- # if BuildXF86DRI
- # if defined(i386Architecture)
--# define BuildLibGlxWithoutPIC YES
-+# define BuildLibGlxWithoutPIC NO
- # endif
- # endif
- #endif
-@@ -539,6 +539,10 @@
- # define HasExpat YES
- #endif
-
-+#ifndef HasFontconfig
-+# define HasFontconfig YES
-+#endif
-+
- #ifndef HasFreetype2
- # define HasFreetype2 YES
- #endif
-@@ -792,7 +796,7 @@
-
- #define HasVarRun YES
- #ifndef VarDbDirectory
--# define VarDbDirectory $(VARDIR)/lib
-+# define VarDbDirectory /var/lib
- #endif
-
- #ifndef XF86OSCardDrivers
-diff -ur X11-6.9.0.org/xc/config/cf/site.def X11-6.9.0/xc/config/cf/site.def
---- X11-6.9.0.org/xc/config/cf/site.def 2004-05-06 17:08:25.000000000 +0200
-+++ X11-6.9.0/xc/config/cf/site.def 2005-12-22 10:29:12.390963000 +0100
-@@ -124,6 +124,14 @@
- #define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
- */
-
-+#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
-+
-
- /* You do NOT need SetUID if you only run the server under xdm */
- /* You MAY need SetUID if users run the server by hand or under xinit */
-diff -ur X11-6.9.0.org/xc/config/cf/X11.tmpl X11-6.9.0/xc/config/cf/X11.tmpl
---- X11-6.9.0.org/xc/config/cf/X11.tmpl 2005-12-15 00:41:52.000000000 +0100
-+++ X11-6.9.0/xc/config/cf/X11.tmpl 2005-12-22 10:32:25.830963000 +0100
-@@ -597,7 +597,7 @@
- #define BuildXF86RushLibrary (BuildXF86RushExt && !BuildServersOnly)
- #endif
- #ifndef BuildDPSLibraries
--#define BuildDPSLibraries NO
-+#define BuildDPSLibraries YES
- #endif
- #ifndef BuildDPSLibrary
- #define BuildDPSLibrary BuildDPSLibraries
-@@ -693,7 +693,7 @@
- #endif
-
- #ifndef BuildXterm
--#define BuildXterm NO
-+#define BuildXterm YES
- #endif
-
- #ifndef BuildXkbcomp
-@@ -731,7 +731,7 @@
- #endif
-
- #ifndef InstallHardcopyDocs
--#define InstallHardcopyDocs YES
-+#define InstallHardcopyDocs NO
- #endif
-
- #ifndef InstallMiscManPages
-@@ -1395,8 +1395,12 @@
- # define UsbMouseSupport NO
- #endif
-
-+#ifndef EtcX11Directory
-+#define EtcX11Directory /etc/X11
-+#endif
-+
- #ifndef DefaultFSConfigFile
--#define DefaultFSConfigFile $(LIBDIR)/fs/config
-+#define DefaultFSConfigFile $(ETCX11DIR)/fs/config
- #endif
-
- #ifndef BinDir
-@@ -1483,7 +1487,7 @@
- #define ConfigDir $(LIBDIR)/config
- #endif
- #ifndef DocDir
--#define DocDir $(LIBDIR)/doc
-+#define DocDir $(LIBDIR)/share/doc
- #endif
- #ifndef DocHtmlDir
- #define DocHtmlDir $(DOCDIR)/html
-@@ -1495,34 +1499,34 @@
- #define DocPdfDir $(DOCDIR)/PDF
- #endif
- #ifndef FontDir
--#define FontDir $(LIBDIR)/fonts
-+#define FontDir /usr/share/fonts
- #endif
- #ifndef FontEncDir
--#define FontEncDir $(LIBDIR)/fonts/encodings
-+#define FontEncDir /usr/share/fonts/encodings
- #endif
- #ifndef AdmDir
--#define AdmDir /usr/adm
-+#define AdmDir /var/log
- #endif
- #ifndef XinitDir
--#define XinitDir $(LIBDIR)/xinit
-+#define XinitDir $(ETCX11DIR)/xinit
- #endif
- #ifndef XdmDir
--#define XdmDir $(LIBDIR)/xdm
-+#define XdmDir $(ETCX11DIR)/xdm
- #endif
- #ifndef XdmVarDir
- #define XdmVarDir $(VARLIBDIR)/xdm
- #endif
- #ifndef XdmAuthDir
--#define XdmAuthDir $(LIBDIR)/xdm
-+#define XdmAuthDir $(ETCX11DIR)/xdm
- #endif
- #ifndef XdmConfigurationSubdirectory /* under xdm sources */
- #define XdmConfigurationSubdirectory config
- #endif
- #ifndef TwmDir
--#define TwmDir $(LIBDIR)/twm
-+#define TwmDir $(ETCX11DIR)/twm
- #endif
- #ifndef XsmDir
--#define XsmDir $(LIBDIR)/xsm
-+#define XsmDir $(ETCX11DIR)/xsm
- #endif
- #ifndef NlsDir
- #define NlsDir $(LIBDIR)/nls
-@@ -1531,23 +1535,20 @@
- #define XLocaleDir $(LIBDIR)/locale
- #endif
- #ifndef LbxproxyDir
--#define LbxproxyDir $(LIBDIR)/lbxproxy
-+#define LbxproxyDir $(ETCX11DIR)/lbxproxy
- #endif
- #ifndef LbxproxyConfigSubdir /* under lbxproxy sources */
- #define LbxproxyConfigSubdir config
- #endif
- #ifndef ProxyManagerDir
--#define ProxyManagerDir $(LIBDIR)/proxymngr
-+#define ProxyManagerDir $(ETCX11DIR)/proxymngr
- #endif
- #ifndef ServerConfigDir
--#define ServerConfigDir $(LIBDIR)/xserver
-+#define ServerConfigDir $(ETCX11DIR)/xserver
- #endif
- #ifndef XPrintDir
- #define XPrintDir ServerConfigDir
- #endif
--#ifndef EtcX11Directory
--#define EtcX11Directory /etc/X11
--#endif
- #ifndef InstallSecurityConfig
- #define InstallSecurityConfig YES /* Install sample security policy */
- #endif
-@@ -1579,10 +1580,10 @@
- #define OsNameDefines /* as nothing */
- #endif
- #ifndef DefaultUserPath /* for xdm */
--#define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb
-+#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
- #endif
- #ifndef DefaultSystemPath /* for xdm */
--#define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR):/usr/ucb
-+#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
- #endif
- #ifndef DefaultSystemShell /* for xdm to set in SHELL */
- #define DefaultSystemShell BourneShell
-@@ -1719,7 +1720,7 @@
-
- HTMLINDEXCMD = HtmlIndexCmd
-
-- DOCUTILSRC = $(XTOP)/doc/util
-+ DOCUTILSRC = $(XTOP)/share/doc/util
- CLIENTSRC = $(TOP)/clients
- DEMOSRC = $(TOP)/demos
- XDOCMACROS = $(DOCUTILSRC)/macros.t
-@@ -1733,7 +1734,7 @@
- SERVERSRC = $(XTOP)/programs/Xserver
- CONTRIBSRC = ContribDir
- UNSUPPORTEDSRC = UnsupportedDir
-- DOCSRC = $(XTOP)/doc
-+ DOCSRC = $(XTOP)/share/doc
- RGBSRC = $(XTOP)/programs/rgb
- BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
- MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
-diff -ur X11-6.9.0.org/xc/config/cf/xorg.cf X11-6.9.0/xc/config/cf/xorg.cf
---- X11-6.9.0.org/xc/config/cf/xorg.cf 2005-10-03 18:08:44.000000000 +0200
-+++ X11-6.9.0/xc/config/cf/xorg.cf 2005-12-22 10:32:59.590963000 +0100
-@@ -136,7 +136,7 @@
- #define XConfigFile xorg.conf
- #endif
- #ifndef XConfigDir
--#define XConfigDir $(LIBDIR)
-+#define XConfigDir $(ETCX11DIR)
- #endif
- #ifndef XLogFile
- #define XLogFile Xorg
-@@ -408,7 +408,7 @@
- neomagic i740 tdfx savage \
- cirrus vmware tseng trident chips apm \
- GlideDriver i128 i386Drivers \
-- ati DevelDrivers ark \
-+ ati DevelDrivers ark fbdev \
- cyrix siliconmotion via \
- vesa vga \
- dummy XF86OSCardDrivers XF86ExtraCardDrivers
-diff -ur X11-6.9.0.org/xc/config/cf/xorgsite.def X11-6.9.0/xc/config/cf/xorgsite.def
---- X11-6.9.0.org/xc/config/cf/xorgsite.def 2005-07-16 09:59:50.000000000 +0200
-+++ X11-6.9.0/xc/config/cf/xorgsite.def 2005-12-22 10:33:48.940963000 +0100
-@@ -266,8 +266,8 @@
- /*
- * To not build/install the Cyrillic fonts, uncomment the following
- *
--#define BuildCyrillicFonts NO
- */
-+#define BuildCyrillicFonts YES
-
- /*
- * To not install the local font directory, uncomment the following
-@@ -435,8 +435,8 @@
- * Some Linux releases don't have a libtermcap. In this case you may need
- * to uncomment the following
- *
--#define TermcapLibrary -lncurses
- */
-+#define TermcapLibrary -lncurses
-
- /*
- * Build a server that dynamically loads the modules by setting
-@@ -610,8 +610,8 @@
- * To forceably build static libraries in addition to shared libraries,
- * uncomment this.
- *
--#define ForceNormalLib YES
- */
-+#define ForceNormalLib YES
-
- /*
- * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
-diff -ur X11-6.9.0.org/xc/config/imake/imake.c X11-6.9.0/xc/config/imake/imake.c
---- X11-6.9.0.org/xc/config/imake/imake.c 2005-11-08 07:33:24.000000000 +0100
-+++ X11-6.9.0/xc/config/imake/imake.c 2005-12-22 10:34:57.200963000 +0100
-@@ -1061,6 +1061,7 @@
- static char* suse = "/etc/SuSE-release";
- static char* redhat = "/etc/redhat-release";
- static char* debian = "/etc/debian_version";
-+ static char* pld = "/etc/pld-release";
-
- fprintf (inFile, "%s\n", "#define LinuxUnknown 0");
- fprintf (inFile, "%s\n", "#define LinuxSuSE 1");
-@@ -1075,6 +1076,7 @@
- fprintf (inFile, "%s\n", "#define LinuxTurbo 10");
- fprintf (inFile, "%s\n", "#define LinuxWare 11");
- fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12");
-+ fprintf (inFile, "%s\n", "#define LinuxPLD 13");
-
- #ifdef CROSSCOMPILE
- if (CrossCompiling) {
-@@ -1101,6 +1103,12 @@
- * at the content of /etc/debian_version */
- return;
- }
-+ if (lstat (pld, &sb) == 0) {
-+ fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD");
-+ fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD");
-+ return;
-+ }
-+
- /* what's the definitive way to tell what any particular distribution is? */
-
- fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
-diff -ur X11-6.9.0.org/xc/Makefile X11-6.9.0/xc/Makefile
---- X11-6.9.0.org/xc/Makefile 2005-12-15 00:41:52.000000000 +0100
-+++ X11-6.9.0/xc/Makefile 2005-12-22 10:39:28.160963000 +0100
-@@ -9,7 +9,7 @@
- # or add "MAKE = make" to this file.
-
- RELEASE = "Release 6.9"
--SHELL = /bin/sh
-+SHELL = /bin/sh -e
- RM = rm -f
- MV = mv
- WORLDOPTS =
-diff -ur X11-6.9.0.org/xc/programs/xdm/config/Xres.cpp X11-6.9.0/xc/programs/xdm/config/Xres.cpp
---- X11-6.9.0.org/xc/programs/xdm/config/Xres.cpp 2004-04-23 21:54:43.000000000 +0200
-+++ X11-6.9.0/xc/programs/xdm/config/Xres.cpp 2005-12-22 10:35:32.500963000 +0100
-@@ -70,10 +70,10 @@
- #endif /* XPM */
- XHASHendif
- #ifdef XPM
--XHASHif PLANES >= 8
--xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
-+XHASHif PLANES > 8
-+xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo.xpm
- XHASHelse
--xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
-+xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm
- XHASHendif
- xlogin*useShape: true
- xlogin*logoPadding: 10
-diff -ur X11-6.9.0.org/xc/programs/xdm/resource.c X11-6.9.0/xc/programs/xdm/resource.c
---- X11-6.9.0.org/xc/programs/xdm/resource.c 2005-11-08 07:33:31.000000000 +0100
-+++ X11-6.9.0/xc/programs/xdm/resource.c 2005-12-22 10:36:59.580963000 +0100
-@@ -85,31 +85,31 @@
- */
- #ifndef __EMX__
- #ifndef DEF_SERVER_LINE
--#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
-+#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0"
- #endif
- #ifndef XRDB_PROGRAM
--#define XRDB_PROGRAM "/usr/bin/X11/xrdb"
-+#define XRDB_PROGRAM "/usr/X11R6/X11/xrdb"
- #endif
- #ifndef DEF_SESSION
--#define DEF_SESSION "/usr/bin/X11/xterm -ls"
-+#define DEF_SESSION "/usr/X11R6/bin/xterm -ls"
- #endif
- #ifndef DEF_USER_PATH
--#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
-+#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin"
- #endif
- #ifndef DEF_SYSTEM_PATH
--#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
-+#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin"
- #endif
- #ifndef DEF_SYSTEM_SHELL
- #define DEF_SYSTEM_SHELL "/bin/sh"
- #endif
- #ifndef DEF_FAILSAFE_CLIENT
--#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm"
-+#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm"
- #endif
- #ifndef DEF_XDM_CONFIG
--#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config"
-+#define DEF_XDM_CONFIG "/etc/X11/xdm/xdm-config"
- #endif
- #ifndef DEF_CHOOSER
--#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser"
-+#define DEF_CHOOSER "/etc/X11/xdm/chooser"
- #endif
- #ifndef DEF_AUTH_NAME
- #ifdef HASXDMAUTH
-@@ -119,7 +119,7 @@
- #endif
- #endif
- #ifndef DEF_AUTH_DIR
--#define DEF_AUTH_DIR "/usr/lib/X11/xdm"
-+#define DEF_AUTH_DIR "/etc/X11/xdm"
- #endif
- #ifndef DEF_USER_AUTH_DIR
- #define DEF_USER_AUTH_DIR "/tmp"
-diff -ur X11-6.9.0.org/xc/programs/xinit/Imakefile X11-6.9.0/xc/programs/xinit/Imakefile
---- X11-6.9.0.org/xc/programs/xinit/Imakefile 2005-11-15 05:03:10.000000000 +0100
-+++ X11-6.9.0/xc/programs/xinit/Imakefile 2005-12-22 10:37:39.740963000 +0100
-@@ -72,7 +72,7 @@
-
- MakeScriptFromCpp(xinitrc, -DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) -DSHELL_CMD=$(SHELL_CMD) -DLIBDIR=$(LIBDIR))
-
--MakeScriptFromCpp(startx, -DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) $(COOKIEDEFS) -DSHELL_CMD=$(SHELL_CMD) -DLIBDIR=$(LIBDIR))
-+MakeScriptFromCpp(startx, -DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) $(COOKIEDEFS) -DSHELL_CMD=$(SHELL_CMD) -DBINDIR=$(BINDIR) -DLIBDIR=$(LIBDIR))
-
- #if defined(SCOArchitecture) || defined(USLArchitecture)
- ARCHMANDEFS=-D__SCOMAN__
-@@ -88,11 +88,12 @@
- #endif
- InstallManPage(startx,$(MANDIR))
-
--#if InstallXinitConfig
--InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
--#else
--InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
--#endif
-+XCOMM Red Hat gets this from a different package
-+XCOMM #if InstallXinitConfig
-+XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
-+XCOMM #else
-+XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
-+XCOMM #endif
-
- LinkConfDirectory(xinit,.,xinit,.)
-
-diff -ur X11-6.9.0.org/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile X11-6.9.0/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile
---- X11-6.9.0.org/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2005-08-23 03:14:35.000000000 +0200
-+++ X11-6.9.0/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2005-12-22 10:39:11.440963000 +0100
-@@ -110,7 +110,7 @@
-
- #if HasNCurses
- CURSESLIB = NCursesLibName
--CURSESDEFINES = -DHAS_NCURSES
-+CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses
- #endif
-
- XF86CONFIGFILE = XConfigFile
-diff -ur X11-6.9.0.org/xc/programs/xterm/Imakefile X11-6.9.0/xc/programs/xterm/Imakefile
---- X11-6.9.0.org/xc/programs/xterm/Imakefile 2005-12-15 00:28:27.000000000 +0100
-+++ X11-6.9.0/xc/programs/xterm/Imakefile 2005-12-22 10:38:51.510963000 +0100
-@@ -68,6 +68,10 @@
- # endif
- #endif
-
-+#if InstallXtermSetUID
-+#undef InstallXtermSetUID
-+#endif
-+
- #ifndef SpecialCObjectRule
- #define SpecialCObjectRule(module,ignore,defines) \
- module.o: ; $(CC) -c defines $(CFLAGS) module.c
-@@ -88,6 +92,7 @@
- PUCCPTYDDEF = -DPUCC_PTYD /* does not need to be setuid */
- PTYLIB = -lpucc
- #endif
-+ PTYLIB = -lutil
-
- #if defined(NetBSDArchitecture) || \
- defined(OpenBSDArchitecture) || \
-@@ -153,7 +158,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)
-
- #ifdef OS2Architecture
- MAINSRC = os2main.c
+++ /dev/null
---- xc/programs/xterm/XTerm-col.ad.orig 2003-09-25 13:06:59.000000000 +0200
-+++ xc/programs/xterm/XTerm-col.ad 2003-10-01 20:48:30.453913496 +0200
-@@ -24,7 +24,7 @@
- !*SimpleMenu*borderColor: gray15
-
- ! Uncomment this to use color for underline attribute
--!*VT100*colorULMode: on
-+*VT100*colorULMode: on
- *VT100*colorUL: yellow
-
- !*VT100*italicULMode: on
---- xc/programs/xterm/XTerm.ad.orig 2003-09-25 13:06:59.000000000 +0200
-+++ xc/programs/xterm/XTerm.ad 2003-10-01 20:49:35.565015104 +0200
-@@ -118,6 +118,170 @@
- *tek4014*font3: 6x13
- *tek4014*fontSmall: 6x10
-
-+
-+! This file causes when loaded using xrdb correct behaviour of xterm
-+! if you are using enclosed xterm.tcap and xterm.ti.
-+! Some keys would never normally work if they weren't here (like Alt
-+! something), some key definitions differ from one termcap/terminfo
-+! to the other. You may delete any line if you find out that mc
-+! sends exactly that string which is mentioned here.
-+! See xterm(1).
-+! Either put this into your ~/.Xdefaults, or to app-defaults/XTerm
-+! or wherever it will be loaded into xrm from.
-+! To know, why this works, see Xt documentation (appendix B).
-+! On some systems you may want to replace the a (alt) modifiers with
-+! m (meta) modifier in front of some <Key> events.
-+*vt100.translations: #override \
-+ Alt Ctrl<Btn4Down>: string(0x1b) string("OA")\n\
-+ Alt Ctrl<Btn5Down>: string(0x1b) string("OB")\n\
-+ Alt<Btn4Down>: string(0x1b) string("OA") string(0x1b) string("OA") string(0x1b) string("OA") string(0x1b) string("OA") string(0x1b) string("OA")\n\
-+ Alt<Btn5Down>: string(0x1b) string("OB") string(0x1b) string("OB") string(0x1b) string("OB") string(0x1b) string("OB") string(0x1b) string("OB")\n\
-+ Shift<Btn4Down>: scroll-back(1,page)\n\
-+ Shift<Btn5Down>: scroll-forw(1,page)\n\
-+ Ctrl<Btn4Down>: scroll-back(1,line)\n\
-+ Ctrl<Btn5Down>: scroll-forw(1,line)\n\
-+ <Btn4Down>: scroll-back(5,line)\n\
-+ <Btn5Down>: scroll-forw(5,line)\n\
-+ @Num_Lock<Key>KP_0: string(0)\n\
-+ @Num_Lock<Key>KP_1: string(1)\n\
-+ @Num_Lock<Key>KP_2: string(2)\n\
-+ @Num_Lock<Key>KP_3: string(3)\n\
-+ @Num_Lock<Key>KP_4: string(4)\n\
-+ @Num_Lock<Key>KP_5: string(5)\n\
-+ @Num_Lock<Key>KP_6: string(6)\n\
-+ @Num_Lock<Key>KP_7: string(7)\n\
-+ @Num_Lock<Key>KP_8: string(8)\n\
-+ @Num_Lock<Key>KP_9: string(9)\n\
-+ @Num_Lock<Key>KP_Add: string(+)\n\
-+ @Num_Lock<Key>KP_Decimal: string(.)\n\
-+ @Num_Lock<Key>KP_Divide: string(/)\n\
-+ @Num_Lock<Key>KP_Enter: string(\015)\n\
-+ @Num_Lock<Key>KP_Equal: string(=)\n\
-+ @Num_Lock<Key>KP_Multiply: string(*)\n\
-+ @Num_Lock<Key>KP_Subtract: string(-)\n\
-+ <Key>KP_Add: string(+)\n\
-+ <Key>KP_Divide: string(/)\n\
-+ <Key>KP_Enter: string(\015)\n\
-+ <Key>KP_Equal: string(=)\n\
-+ <Key>KP_Multiply: string(*)\n\
-+ <Key>KP_Subtract: string(-)\n\
-+ Shift<Key>KP_Home: scroll-back(100,page)\n\
-+ Shift<Key>KP_End: scroll-forw(100,page)\n\
-+ Shift<Key>Prior:scroll-back(1,page)\n\
-+ Shift<Key>Next:scroll-forw(1,page)\n\
-+ <Key>F16: start-extend() select-end(PRIMARY, CUT_BUFFER0, CLIPBOARD)\n\
-+ <Key>F18: insert-selection(PRIMARY, CLIPBOARD)\n\
-+ <Key>F27: scroll-back(100,page)\n\
-+ <Key>R13: scroll-forw(100,page)\n\
-+ Ctrl<Key>Home: string(0x1b) string("[1;5H")\n\
-+ Shift<Key>Home: string(0x1b) string("[1;2H")\n\
-+ Ctrl<Key>End: string(0x1b) string("[1;5F")\n\
-+ Shift<Key>End: string(0x1b) string("[1;2F")\n\
-+ Ctrl<Key>Insert: string(0x1b) string("[2;5~")\n\
-+ Shift<Key>Insert: string(0x1b) string("[2;2~")\n\
-+ ~Meta<Key>Insert: string(0x1b) string("[2~")\n\
-+ Meta<Key>Insert: string(0x1b) string(0x1b) string("[2~")\n\
-+ Ctrl<Key>Delete: string(0x1b) string("[3;5~")\n\
-+ Shift<Key>Delete: string(0x1b) string("[3;2~")\n\
-+ ~Meta<Key>Delete: string(0x1b) string("[3~")\n\
-+ Meta<Key>Delete: string(0x1b) string(0x1b) string("[3~")\n\
-+ Ctrl<Key>Page_Up: string(0x1b) string("[5;5~")\n\
-+ ~Meta<Key>Page_Up: string(0x1b) string("[5~")\n\
-+ Meta<Key>Page_Up: string(0x1b) string(0x1b) string("[5~")\n\
-+ Ctrl<Key>Page_Down: string(0x1b) string("[6;5~")\n\
-+ ~Meta<Key>Page_Down: string(0x1b) string("[6~")\n\
-+ Meta<Key>Page_Down: string(0x1b) string(0x1b) string("[6~")\n\
-+ ~Meta<Key>BackSpace: string(0x7f)\n\
-+ Meta<Key>BackSpace: string(0x1b) string(0x08)\n\
-+ Ctrl Shift<Key>Up: string(0x1b) string("[1;6A")\n\
-+ Ctrl<Key>Up: string(0x1b) string("[1;5A")\n\
-+ Shift<Key>Up: string(0x1b) string("[1;2A")\n\
-+ Meta<Key>Up: string(0x1b) string("[1;3A")\n\
-+ Ctrl Shift<Key>Down: string(0x1b) string("[1;6B")\n\
-+ Ctrl<Key>Down: string(0x1b) string("[1;5B")\n\
-+ Shift<Key>Down: string(0x1b) string("[1;2B")\n\
-+ Meta<Key>Down: string(0x1b) string("[1;3B")\n\
-+ Ctrl Shift<Key>Left: string(0x1b) string("[1;6D")\n\
-+ Ctrl<Key>Left: string(0x1b) string("[1;5D")\n\
-+ Shift<Key>Left: string(0x1b) string("[1;2D")\n\
-+ Mod5<Key>Left: string(0x1b) string("b")\n\
-+ Meta<Key>Left: string(0x1b) string("[1;3D")\n\
-+ Ctrl Shift<Key>Right: string(0x1b) string("[1;6C")\n\
-+ Ctrl<Key>Right: string(0x1b) string("[1;5C")\n\
-+ Shift<Key>Right: string(0x1b) string("[1;2C")\n\
-+ Mod5<Key>Right: string(0x1b) string("f")\n\
-+ Meta<Key>Right: string(0x1b) string("[1;3C")\n\
-+ ~Meta<Key>Return: string(0x0d)\n\
-+ Meta<Key>Return: string(0x1b) string(0x0d)\n\
-+ Ctrl<Key>Tab: string(0x1b) string(0x09)\n\
-+ Mod5<Key>Tab: string(0x1b) string(0x09)\n\
-+ ~Meta<Key>Tab: string(0x09)\n\
-+ Meta<Key>Tab: string(0x1b) string(0x09)\n\
-+ ~s<Key>F5: string(0x1b) string("[15~")\n\
-+ ~s<Key>F6: string(0x1b) string("[17~")\n\
-+ ~s<Key>F7: string(0x1b) string("[18~")\n\
-+ ~s<Key>F8: string(0x1b) string("[19~")\n\
-+ ~s<Key>F9: string(0x1b) string("[20~")\n\
-+ ~s<Key>F10: string(0x1b) string("[21~")\n\
-+ <Key>F11: string(0x1b) string("[23~")\n\
-+ <Key>F12: string(0x1b) string("[24~")\n\
-+ <Key>F13: string(0x1b) string("[25~")\n\
-+ <Key>F14: string(0x1b) string("[26~")\n\
-+ <Key>F15: string(0x1b) string("[28~")\n\
-+ <Key>F16: string(0x1b) string("[29~")\n\
-+ <Key>F17: string(0x1b) string("[31~")\n\
-+ <Key>F18: string(0x1b) string("[32~")\n\
-+ <Key>F19: string(0x1b) string("[33~")\n\
-+ <Key>F20: string(0x1b) string("[34~")\n\
-+ s<Key>F5: string(0x1b) string("[28~")\n\
-+ s<Key>F6: string(0x1b) string("[29~")\n\
-+ s<Key>F7: string(0x1b) string("[31~")\n\
-+ s<Key>F8: string(0x1b) string("[32~")\n\
-+ s<Key>F9: string(0x1b) string("[33~")\n\
-+ s<Key>F10: string(0x1b) string("[34~")\n\
-+ a<Key>space: string(0x1b) string(" ")\n\
-+ a s<Key>question: string(0x1b) string("?")\n\
-+ a s<Key>exclam: string(0x1b) string("!")\n\
-+ a <Key>period: string(0x1b) string(".")\n\
-+ a<Key>`: string(0x1b) string("`")\n\
-+ a<Key>1: string(0x1b) string("1")\n\
-+ a<Key>2: string(0x1b) string("2")\n\
-+ a<Key>3: string(0x1b) string("3")\n\
-+ a<Key>4: string(0x1b) string("4")\n\
-+ a<Key>5: string(0x1b) string("5")\n\
-+ a<Key>6: string(0x1b) string("6")\n\
-+ a<Key>7: string(0x1b) string("7")\n\
-+ a<Key>8: string(0x1b) string("8")\n\
-+ a<Key>9: string(0x1b) string("9")\n\
-+ a<Key>0: string(0x1b) string("0")\n\
-+ a<Key>a: string(0x1b) string("a")\n\
-+ a<Key>b: string(0x1b) string("b")\n\
-+ a<Key>c: string(0x1b) string("c")\n\
-+ a<Key>d: string(0x1b) string("d")\n\
-+ a<Key>e: string(0x1b) string("e")\n\
-+ a<Key>f: string(0x1b) string("f")\n\
-+ a<Key>g: string(0x1b) string("g")\n\
-+ a s<Key>h: string(0x1b) string("H")\n\
-+ a<Key>h: string(0x1b) string("h")\n\
-+ a<Key>i: string(0x1b) string("i")\n\
-+ a<Key>j: string(0x1b) string("j")\n\
-+ a<Key>k: string(0x1b) string("k")\n\
-+ a<Key>l: string(0x1b) string("l")\n\
-+ a<Key>m: string(0x1b) string("m")\n\
-+ a<Key>n: string(0x1b) string("n")\n\
-+ a<Key>o: string(0x1b) string("o")\n\
-+ a<Key>p: string(0x1b) string("p")\n\
-+ a<Key>q: string(0x1b) string("q")\n\
-+ a<Key>r: string(0x1b) string("r")\n\
-+ a<Key>s: string(0x1b) string("s")\n\
-+ a<Key>t: string(0x1b) string("t")\n\
-+ a<Key>u: string(0x1b) string("u")\n\
-+ a<Key>v: string(0x1b) string("v")\n\
-+ a<Key>w: string(0x1b) string("w")\n\
-+ a<Key>x: string(0x1b) string("x")\n\
-+ a<Key>y: string(0x1b) string("y")\n\
-+ a<Key>z: string(0x1b) string("z")
-+
- ! If xterm is built with a toolbar, the widget hierarchy looks like this,
- ! showing widget name / class names. The complete menu hierarchy is built
- ! at startup because it is needed to make the layout work for the menubar:
+++ /dev/null
-include/fonts/font.h
-lib/GL/dri/drm/drm.h
-lib/GL/glx/xf86dri.h
-lib/GL/glx/xf86dristr.h
-programs/Xserver/GL/dri/dri.h
-programs/Xserver/GL/dri/sarea.h
-programs/Xserver/Xext/dgaproc.h
-programs/Xserver/Xext/xvdix.h
-programs/Xserver/Xext/xvmcext.h
-programs/Xserver/cfb/cfb.h
-programs/Xserver/cfb/cfb16.h
-programs/Xserver/cfb/cfb32.h
-programs/Xserver/cfb/cfbmap.h
-programs/Xserver/cfb/cfbunmap.h
-programs/Xserver/fb/fb.h
-programs/Xserver/fb/fbrop.h
-programs/Xserver/hw/xfree86/common/compiler.h
-programs/Xserver/hw/xfree86/common/fourcc.h
-programs/Xserver/hw/xfree86/common/xf86.h
-programs/Xserver/hw/xfree86/common/xf86Module.h
-programs/Xserver/hw/xfree86/common/xf86Opt.h
-programs/Xserver/hw/xfree86/common/xf86PciInfo.h
-programs/Xserver/hw/xfree86/common/xf86Priv.h
-programs/Xserver/hw/xfree86/common/xf86Privstr.h
-programs/Xserver/hw/xfree86/common/xf86Resources.h
-programs/Xserver/hw/xfree86/common/xf86Xinput.h
-programs/Xserver/hw/xfree86/common/xf86cmap.h
-programs/Xserver/hw/xfree86/common/xf86fbman.h
-programs/Xserver/hw/xfree86/common/xf86str.h
-programs/Xserver/hw/xfree86/common/xf86xv.h
-programs/Xserver/hw/xfree86/common/xf86xvmc.h
-programs/Xserver/hw/xfree86/common/xisb.h
-programs/Xserver/hw/xfree86/ddc/edid.h
-programs/Xserver/hw/xfree86/ddc/vdif.h
-programs/Xserver/hw/xfree86/ddc/xf86DDC.h
-programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.h
-programs/Xserver/hw/xfree86/i2c/xf86i2c.h
-programs/Xserver/hw/xfree86/int10/xf86int10.h
-programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h
-programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h
-programs/Xserver/hw/xfree86/os-support/xf86_ansic.h
-programs/Xserver/hw/xfree86/os-support/xf86_libc.h
-programs/Xserver/hw/xfree86/os-support/xf86drm.h
-programs/Xserver/hw/xfree86/rac/xf86RAC.h
-programs/Xserver/hw/xfree86/ramdac/xf86Cursor.h
-programs/Xserver/hw/xfree86/shadowfb/shadowfb.h
-programs/Xserver/hw/xfree86/vbe/vbe.h
-programs/Xserver/hw/xfree86/vgahw/vgaHW.h
-programs/Xserver/hw/xfree86/xaa/xaa.h
-programs/Xserver/hw/xfree86/xaa/xaalocal.h
-programs/Xserver/hw/xfree86/xaa/xaarop.h
-programs/Xserver/hw/xfree86/xf86Version.h
-programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32.h
-programs/Xserver/include/XIstubs.h
-programs/Xserver/include/bstore.h
-programs/Xserver/include/bstorestr.h
-programs/Xserver/include/colormap.h
-programs/Xserver/include/colormapst.h
-programs/Xserver/include/cursor.h
-programs/Xserver/include/dix.h
-programs/Xserver/include/dixstruct.h
-programs/Xserver/include/exevents.h
-programs/Xserver/include/extension.h
-programs/Xserver/include/extnsionst.h
-programs/Xserver/include/gc.h
-programs/Xserver/include/gcstruct.h
-programs/Xserver/include/globals.h
-programs/Xserver/include/input.h
-programs/Xserver/include/inputstr.h
-programs/Xserver/include/misc.h
-programs/Xserver/include/miscstruct.h
-programs/Xserver/include/opaque.h
-programs/Xserver/include/os.h
-programs/Xserver/include/pixmap.h
-programs/Xserver/include/pixmapstr.h
-programs/Xserver/include/property.h
-programs/Xserver/include/propertyst.h
-programs/Xserver/include/region.h
-programs/Xserver/include/regionstr.h
-programs/Xserver/include/resource.h
-programs/Xserver/include/screenint.h
-programs/Xserver/include/scrnintstr.h
-programs/Xserver/include/servermd.h
-programs/Xserver/include/validate.h
-programs/Xserver/include/window.h
-programs/Xserver/include/windowstr.h
-programs/Xserver/mfb/mfb.h
-programs/Xserver/mi/mi.h
-programs/Xserver/mi/mibstore.h
-programs/Xserver/mi/micmap.h
-programs/Xserver/mi/micoord.h
-programs/Xserver/mi/migc.h
-programs/Xserver/mi/miline.h
-programs/Xserver/mi/mipointer.h
-programs/Xserver/mi/mizerarc.h
-programs/Xserver/render/glyphstr.h
-programs/Xserver/render/mipict.h
-programs/Xserver/render/picture.h
-programs/Xserver/render/picturestr.h
+++ /dev/null
-ln -sf ../hw/xfree86/common/xf86Module.h programs/Xserver/include/xf86Module.h
-ln -sf ../hw/xfree86/common/xf86Opt.h programs/Xserver/include/xf86Opt.h
-ln -sf ../hw/xfree86/os-support/xf86_libc.h programs/Xserver/include/xf86_libc.h
-ln -sf ../hw/xfree86/os-support/xf86_ansic.h programs/Xserver/include/xf86_ansic.h
-ln -sf ../hw/xfree86/xf86Version.h programs/Xserver/include/xf86Version.h
-ln -sf ../hw/xfree86/common/compiler.h programs/Xserver/include/compiler.h
-#ln -sf ../os/osdep.h programs/Xserver/include/osdep.h
-ln -sf ../../../../lib/GL/glx/xf86dri.h programs/Xserver/GL/dri/xf86dri.h
-ln -sf ../../../../lib/GL/glx/xf86dristr.h programs/Xserver/GL/dri/xf86dristr.h
-install -d programs/Xserver/hw/xfree86/os-support/linux/drm/kernel
-ln -sf ../../../../../../../../lib/GL/dri/drm/drm.h programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h
-ln -sf ../xf86Version.h programs/Xserver/hw/xfree86/common/xf86Version.h
-ln -sf ../os-support/bus/xf86Pci.h programs/Xserver/hw/xfree86/common/xf86Pci.h
+++ /dev/null
-diff -urN X11-6.9.0.org/xc/config/cf/Server.tmpl X11-6.9.0/xc/config/cf/Server.tmpl
---- X11-6.9.0.org/xc/config/cf/Server.tmpl 2004-04-23 20:41:58.000000000 +0200
-+++ X11-6.9.0/xc/config/cf/Server.tmpl 2005-12-22 10:50:30.350963000 +0100
-@@ -25,8 +25,14 @@
- #ifndef DoThreadedServer
- #define DoThreadedServer NO
- #endif
-+#ifndef XserverNeedsSetUID
-+#define XserverNeedsSetUID NO
-+#endif
-+#ifndef UseXserverWrapper
-+#define UseXserverWrapper XserverNeedsSetUID
-+#endif
- #ifndef InstallServerSetUID
--#define InstallServerSetUID NO
-+#define InstallServerSetUID (XserverNeedsSetUID && !UseXserverWrapper)
- #endif
-
- #ifdef CrossCompileDir
-diff -urN X11-6.9.0.org/xc/config/cf/xorg.cf X11-6.9.0/xc/config/cf/xorg.cf
---- X11-6.9.0.org/xc/config/cf/xorg.cf 2005-12-22 10:49:00.730963000 +0100
-+++ X11-6.9.0/xc/config/cf/xorg.cf 2005-12-22 10:50:53.520963000 +0100
-@@ -835,12 +835,15 @@
- #endif
-
- /*
-- * The default is to install the X servers setuid-root on most OSs.
-- * It the servers are only started by xdm, they should not be setuid-root.
-+ * 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.
- */
- #if !defined(i386MachArchitecture) && !defined(OS2Architecture)
--# ifndef InstallXserverSetUID
--# define InstallXserverSetUID YES
-+# ifndef XserverNeedsSetUID
-+# define XserverNeedsSetUID YES
- # endif
- #endif
-
-diff -urN X11-6.9.0.org/xc/config/cf/xorgsite.def X11-6.9.0/xc/config/cf/xorgsite.def
---- X11-6.9.0.org/xc/config/cf/xorgsite.def 2005-12-22 10:49:00.730963000 +0100
-+++ X11-6.9.0/xc/config/cf/xorgsite.def 2005-12-22 10:50:53.510963000 +0100
-@@ -75,14 +75,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 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.
- *
-- * 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 X11-6.9.0.org/xc/programs/xinit/startx.cpp X11-6.9.0/xc/programs/xinit/startx.cpp
---- X11-6.9.0.org/xc/programs/xinit/startx.cpp 2005-11-15 05:03:10.000000000 +0100
-+++ X11-6.9.0/xc/programs/xinit/startx.cpp 2005-12-22 10:53:22.620963000 +0100
-@@ -65,7 +65,7 @@
- userserverrc=$HOME/.xserverrc
- sysserverrc=XINITDIR/xserverrc
- defaultclient=XTERM
--defaultserver=XSERVER
-+defaultserver=BINDIR/Xwrapper
- defaultclientargs=""
- defaultserverargs=""
- clientargs=""
-diff -urN X11-6.9.0.org/xc/programs/xinit/xinit.c X11-6.9.0/xc/programs/xinit/xinit.c
---- X11-6.9.0.org/xc/programs/xinit/xinit.c 2005-10-04 03:27:34.000000000 +0200
-+++ X11-6.9.0/xc/programs/xinit/xinit.c 2005-12-22 10:50:53.630963000 +0100
-@@ -156,6 +156,7 @@
- #define OK_EXIT 0
- #define ERR_EXIT 1
-
-+char *default_wrapper = BINDIR "/Xwrapper";
- char *default_server = "X";
- char *default_display = ":0"; /* choose most efficient */
- char *default_client[] = {"xterm", "-geometry", "+1+1", "-n", "login", NULL};
-@@ -346,7 +347,10 @@
- if (argc == 0 ||
- #ifndef __UNIXOS2__
- (**argv != '/' && **argv != '.')) {
-- *sptr++ = default_server;
-+ if (access(default_wrapper, X_OK) == 0)
-+ *sptr++ = default_wrapper;
-+ else
-+ *sptr++ = default_server;
- #else
- (**argv != '/' && **argv != '\\' && **argv != '.' &&
- !(isalpha(**argv) && (*argv)[1]==':'))) {
-diff -urN X11-6.9.0.org/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c X11-6.9.0/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c
---- X11-6.9.0.org/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c 2005-08-26 09:35:55.000000000 +0200
-+++ X11-6.9.0/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c 2005-12-22 10:52:06.630963000 +0100
-@@ -104,8 +104,10 @@
-
- /* when KeepTty check if we're run with euid==0 */
- if (KeepTty && geteuid() != 0)
-- FatalError("xf86OpenConsole:"
-- " Server must be suid root for option \"KeepTTY\"\n");
-+ FatalError("xf86OpenConsole: Server must be running with root "
-+ "permissions\n"
-+ "You should be using Xwrapper to start the server or xdm.\n"
-+ "We strongly advise against making the server SUID root!\n");
-
- /*
- * setup the virtual terminal manager
-diff -urN X11-6.9.0.org/xc/programs/Xserver/Imakefile X11-6.9.0/xc/programs/Xserver/Imakefile
---- X11-6.9.0.org/xc/programs/Xserver/Imakefile 2005-11-18 19:15:23.000000000 +0100
-+++ X11-6.9.0/xc/programs/Xserver/Imakefile 2005-12-22 10:50:53.540963000 +0100
-@@ -5,11 +5,6 @@
- */
- XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.296 2003/11/23 06:47:00 torrey Exp $
-
--#ifndef InstallXserverSetUID
--#define InstallXserverSetUID NO
--#endif
--#define InstallServerSetUID InstallXserverSetUID
--
- #include <Server.tmpl>
-
- /* On most systems the linker requires the libraries in dependency order.
-@@ -893,6 +888,11 @@
- #endif /* XnestServer */
-
-
-+#if UseXserverWrapper
-+SetUIDProgramTarget(Xwrapper,os/wrapper.o,NullParameter,$(PAMLIBS),NullParameter)
-+InstallProgramWithFlags(Xwrapper,$(BINDIR),$(INSTUIDFLAGS))
-+#endif
-+
- #if defined(XnonServer) && XnonServer
- XCOMM
- XCOMM non server, just compile sources for build test
-diff -urN X11-6.9.0.org/xc/programs/Xserver/os/Imakefile X11-6.9.0/xc/programs/Xserver/os/Imakefile
---- X11-6.9.0.org/xc/programs/Xserver/os/Imakefile 2005-03-23 20:58:45.000000000 +0100
-+++ X11-6.9.0/xc/programs/Xserver/os/Imakefile 2005-12-22 10:52:36.410963000 +0100
-@@ -132,6 +132,7 @@
- INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
- -I$(SERVERSRC)/Xext -I$(FONTINCSRC) -I$(SERVERSRC)/render \
- -I$(TOP)/lib/Xau -I../lbx -I../Xprint Krb5Includes
-+ EXTRA_DEFINES = -DUSE_PAM
- DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) \
- $(TRANS_INCLUDES) $(CONNECTION_FLAGS) $(GETPEER_DEFINES) \
- DependDefines
-@@ -179,6 +180,14 @@
- SpecialCObjectRule(oscolor,$(ICONFIGFILES),$(DBM_DEFINES))
- #endif
-
-+#if UseXserverWrapper
-+AllTarget(wrapper.o)
-+
-+ WRAPPER_DEFINES = -DXSERVER_PATH=\"/etc/X11/X\"
-+
-+SpecialCObjectRule(wrapper,NullParameter,$(WRAPPER_DEFINES))
-+#endif
-+
- #if HasKrb5
- LinkSourceFile(k5encode.c,$(XAUTHSRC))
- #endif
-diff -urN X11-6.9.0.org/xc/programs/Xserver/os/wrapper.c X11-6.9.0/xc/programs/Xserver/os/wrapper.c
---- X11-6.9.0.org/xc/programs/Xserver/os/wrapper.c 1970-01-01 01:00:00.000000000 +0100
-+++ X11-6.9.0/xc/programs/Xserver/os/wrapper.c 2005-12-22 10:50:53.610963000 +0100
-@@ -0,0 +1,304 @@
-+/*
-+ * X server wrapper.
-+ *
-+ * This wrapper makes some sanity checks on the command line arguments
-+ * and environment variables when run with euid == 0 && euid != uid.
-+ * If the checks fail, the wrapper exits with a message.
-+ * If they succeed, it exec's the Xserver.
-+ */
-+
-+/*
-+ * Copyright (c) 1998 by The XFree86 Project, Inc. All Rights Reserved.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sublicense, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject
-+ * to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ * IN NO EVENT SHALL THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES
-+ * OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
-+ * OR OTHER DEALINGS IN THE SOFTWARE.
-+ *
-+ * Except as contained in this notice, the name of the XFree86 Project
-+ * shall not be used in advertising or otherwise to promote the sale,
-+ * use or other dealings in this Software without prior written
-+ * authorization from the XFree86 Project.
-+ */
-+
-+/* $XFree86: xc/programs/Xserver/os/wrapper.c,v 1.1.2.5 1998/02/27 15:28:59 dawes Exp $ */
-+
-+/* This is normally set in the Imakefile */
-+#ifndef XSERVER_PATH
-+#define XSERVER_PATH "/etc/X11/X"
-+#endif
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <errno.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+#ifdef USE_PAM
-+#include <security/pam_appl.h>
-+#include <security/pam_misc.h>
-+#include <pwd.h>
-+#endif /* USE_PAM */
-+
-+/* Neither of these should be required for XFree86 3.3.2 */
-+#ifndef REJECT_CONFIG
-+#define REJECT_CONFIG 0
-+#endif
-+#ifndef REJECT_XKBDIR
-+#define REJECT_XKBDIR 0
-+#endif
-+
-+/* Consider LD* variables insecure ? */
-+#ifndef REMOVE_ENV_LD
-+#define REMOVE_ENV_LD 1
-+#endif
-+
-+/* Remove long environment variables? */
-+#ifndef REMOVE_LONG_ENV
-+#define REMOVE_LONG_ENV 1
-+#endif
-+
-+/* Check args and env only if running setuid (euid == 0 && euid != uid) ? */
-+#ifndef CHECK_EUID
-+#define CHECK_EUID 1
-+#endif
-+
-+/*
-+ * Maybe the locale can be faked to make isprint(3) report that everything
-+ * is printable? Avoid it by default.
-+ */
-+#ifndef USE_ISPRINT
-+#define USE_ISPRINT 0
-+#endif
-+
-+#define MAX_ARG_LENGTH 128
-+#define MAX_ENV_LENGTH 256
-+#define MAX_ENV_PATH_LENGTH 2048
-+
-+#if USE_ISPRINT
-+#include <ctype.h>
-+#define checkPrintable(c) isprint(c)
-+#else
-+#define checkPrintable(c) (((c) & 0x7f) >= 0x20 && ((c) & 0x7f) != 0x7f)
-+#endif
-+
-+enum BadCode {
-+ NotBad = 0,
-+ UnsafeArg,
-+ ArgTooLong,
-+ UnprintableArg,
-+ EnvTooLong,
-+ InternalError,
-+#ifdef USE_PAM
-+ PamFailed,
-+ PamAuthFailed,
-+#endif /* USE_PAM */
-+};
-+
-+#define ARGMSG \
-+ "\nIf the arguments used are valid, and have been rejected incorrectly\n" \
-+ "please send details of the arguments and why they are valid to\n" \
-+ "XFree86@XFree86.org. In the meantime, you can start the Xserver as\n" \
-+ "the \"super user\" (root).\n"
-+
-+#define ENVMSG \
-+ "\nIf the environment is valid, and have been rejected incorrectly\n" \
-+ "please send details of the environment and why it is valid to\n" \
-+ "XFree86@XFree86.org. In the meantime, you can start the Xserver as\n" \
-+ "the \"super user\" (root).\n"
-+
-+#ifdef USE_PAM
-+static struct pam_conv conv = {
-+ misc_conv,
-+ NULL
-+};
-+#endif /* USE_PAM */
-+
-+
-+int
-+main(int argc, char **argv, char **envp)
-+{
-+ enum BadCode bad = NotBad;
-+ int i, j;
-+ char *a, *e;
-+#ifdef USE_PAM
-+ pam_handle_t *pamh = NULL;
-+ struct passwd *pw;
-+ int retval;
-+
-+ pw = getpwuid(getuid());
-+ if (pw == NULL) {
-+ bad = InternalError;
-+ }
-+
-+ if (!bad) {
-+ retval = pam_start("xserver", pw->pw_name, &conv, &pamh);
-+ if (retval != PAM_SUCCESS)
-+ bad = PamFailed;
-+ }
-+
-+ if (!bad) {
-+ retval = pam_authenticate(pamh, 0);
-+ if (retval != PAM_SUCCESS) {
-+ pam_end(pamh, retval);
-+ bad = PamAuthFailed;
-+ }
-+ }
-+
-+ if (!bad) {
-+ retval = pam_acct_mgmt(pamh, 0);
-+ if (retval != PAM_SUCCESS) {
-+ pam_end(pamh, retval);
-+ bad = PamAuthFailed;
-+ }
-+ }
-+
-+ /* this is not a session, so do not do session management */
-+
-+ if (!bad) pam_end(pamh, PAM_SUCCESS);
-+#endif /* USE_PAM */
-+
-+#if CHECK_EUID
-+ if (!bad && geteuid() == 0 && getuid() != geteuid()) {
-+#else
-+ if (!bad) {
-+#endif
-+ /* Check each argv[] */
-+ for (i = 1; i < argc; i++) {
-+
-+ /* Check for known bad arguments */
-+#if REJECT_CONFIG
-+ if (strcmp(argv[i], "-config") == 0) {
-+ bad = UnsafeArg;
-+ break;
-+ }
-+#endif
-+#if REJECT_XKBDIR
-+ if (strcmp(argv[i], "-xkbdir") == 0) {
-+ bad = UnsafeArg;
-+ break;
-+ }
-+#endif
-+ if (strlen(argv[i]) > MAX_ARG_LENGTH) {
-+ bad = ArgTooLong;
-+ break;
-+ }
-+ a = argv[i];
-+ while (*a) {
-+ if (checkPrintable(*a) == 0) {
-+ bad = UnprintableArg;
-+ break;
-+ }
-+ a++;
-+ }
-+ if (bad)
-+ break;
-+ }
-+ /* Check each envp[] */
-+ if (!bad)
-+ for (i = 0; envp[i]; i++) {
-+
-+ /* Check for bad environment variables and values */
-+#if REMOVE_ENV_LD
-+ while (envp[i] && (strncmp(envp[i], "LD", 2) == 0)) {
-+ for (j = i; envp[j]; j++) {
-+ envp[j] = envp[j+1];
-+ }
-+ }
-+#endif
-+ if (envp[i] && (strlen(envp[i]) > MAX_ENV_LENGTH)) {
-+#if REMOVE_LONG_ENV
-+ for (j = i; envp[j]; j++) {
-+ envp[j] = envp[j+1];
-+ }
-+ i--;
-+#else
-+ char *eq;
-+ int len;
-+
-+ eq = strchr(envp[i], '=');
-+ if (!eq)
-+ continue;
-+ len = eq - envp[i];
-+ e = malloc(len + 1);
-+ if (!e) {
-+ bad = InternalError;
-+ break;
-+ }
-+ strncpy(e, envp[i], len);
-+ e[len] = 0;
-+ if (len >= 4 &&
-+ (strcmp(e + len - 4, "PATH") == 0 ||
-+ strcmp(e, "TERMCAP") == 0)) {
-+ if (strlen(envp[i]) > MAX_ENV_PATH_LENGTH) {
-+ bad = EnvTooLong;
-+ break;
-+ } else {
-+ free(e);
-+ }
-+ } else {
-+ bad = EnvTooLong;
-+ break;
-+ }
-+#endif
-+ }
-+ }
-+ }
-+ switch (bad) {
-+ case NotBad:
-+ execve(XSERVER_PATH, argv, envp);
-+ fprintf(stderr, "execve failed for %s (errno %d)\n", XSERVER_PATH,
-+ errno);
-+ break;
-+ case UnsafeArg:
-+ fprintf(stderr, "Command line argument number %d is unsafe\n", i);
-+ fprintf(stderr, ARGMSG);
-+ break;
-+ case ArgTooLong:
-+ fprintf(stderr, "Command line argument number %d is too long\n", i);
-+ fprintf(stderr, ARGMSG);
-+ break;
-+ case UnprintableArg:
-+ fprintf(stderr, "Command line argument number %d contains unprintable"
-+ " characters\n", i);
-+ fprintf(stderr, ARGMSG);
-+ break;
-+ case EnvTooLong:
-+ fprintf(stderr, "Environment variable `%s' is too long\n", e);
-+ fprintf(stderr, ENVMSG);
-+ break;
-+ case InternalError:
-+ fprintf(stderr, "Internal Error\n");
-+ break;
-+#ifdef USE_PAM
-+ case PamFailed:
-+ fprintf(stderr, "Authentication System Failure, "
-+ "missing or mangled PAM configuration file or module?\n");
-+ break;
-+ case PamAuthFailed:
-+ fprintf(stderr, "PAM authentication failed\n");
-+ break;
-+#endif
-+ default:
-+ fprintf(stderr, "Unknown error\n");
-+ fprintf(stderr, ARGMSG);
-+ fprintf(stderr, ENVMSG);
-+ break;
-+ }
-+ exit(1);
-+}
-+
+++ /dev/null
-This fixes issues with the server choking when it's listening to acpid and
-acpid is shut down. See https://bugs.freedesktop.org/show_bug.cgi?id=5140
-and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=345537.
-
-This patch by Mattia Dongili.
-
-Index: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_acpi.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_acpi.c,v
-retrieving revision 1.2
-diff -u -r1.2 lnx_acpi.c
---- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_acpi.c 31 Oct 2005 05:45:40 -0000 1.2
-+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_acpi.c 2 Jan 2006 17:17:29 -0000
-@@ -45,6 +45,13 @@
- memset(ev, 0, LINE_LENGTH);
-
- n = read( fd, ev, LINE_LENGTH );
-+ if (n <= 0) {
-+ /* can only happen when reading from acpid socket */
-+ xf86MsgVerb(X_WARNING,3,"ACPI Event handler disappeared, reopening.\n");
-+ lnxCloseACPI();
-+ lnxACPIOpen();
-+ return 0;
-+ }
-
- /* Check that we have a video event */
- if (strstr(ev, "video") == ev) {
-@@ -160,6 +167,9 @@
- #ifdef DEBUG
- ErrorF("ACPI: Closing device\n");
- #endif
-+ xf86PMGetEventFromOs = NULL;
-+ xf86PMConfirmEventToOs = NULL;
-+
- if (ACPIihPtr) {
- fd = xf86RemoveInputHandler(ACPIihPtr);
- shutdown(fd, 2);
+++ /dev/null
---- xc.org/extras/drm/libdrm/xf86drm.c 2004-08-08 14:22:46.000000000 +0200
-+++ xc/extras/drm/libdrm/xf86drm.c 2004-08-08 15:14:36.693965624 +0200
-@@ -466,6 +466,9 @@
- #if !defined(XFree86Server)
- return -1;
- #else
-+ if (!xf86LoadKernelModule("agpgart")) {
-+ ErrorF("[drm] failed to load kernel module \"agpgart\"\n");
-+ }
- /* try to load the kernel module now */
- if (!xf86LoadKernelModule(name)) {
- ErrorF("[drm] failed to load kernel module \"%s\"\n",
+++ /dev/null
---- xc.orig/config/cf/X11.tmpl 2004-08-08 14:31:29.000000000 +0200
-+++ xc/config/cf/X11.tmpl 2004-08-08 14:48:48.483329416 +0200
-@@ -1546,7 +1546,7 @@
- #endif
- #ifndef XFileSearchPathBase
- /* avoid SCCS keyword */
--#define XFileSearchPathBase Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S)
-+#define XFileSearchPathBase $(LIBDIR)/%T/%L/%N%C%S:$(LIBDIR)/%T/%l/%N%C%S:$(LIBDIR)/%T/C/%N%C%S:$(LIBDIR)/%T/POSIX/%N%C%S:$(LIBDIR)/%T/%N%C%S:$(LIBDIR)/%T/%L/%N%S:$(LIBDIR)/%T/%l/%N%S:$(LIBDIR)/%T/C/%N%S:$(LIBDIR)/%T/POSIX/%N%S:$(LIBDIR)/%T/%N%S:$(LIBDIR)/%L/%T/%N%C%S:$(LIBDIR)/%l/%T/%N%C%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S
- #endif
- #ifndef XFileSearchPathDefault
- #ifdef XAppLoadDir
-@@ -3888,11 +3888,9 @@
- #if UseConfDirForAppDefaults
- #if InstallAppDefFiles
- #define InstallAppDefaultsLong(file,class) @@\
--LinkConfDirectory(app-defaults,.,app-defaults,.) @@\
- InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
- #else
- #define InstallAppDefaultsLong(file,class) @@\
--LinkConfDirectory(app-defaults,.,app-defaults,.) @@\
- InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
- #endif /* InstallAppDefFiles */
- #else /* UseConfDirForAppDefaults */
+++ /dev/null
---- xc/include/Xarch.h.orig Tue Jun 10 13:03:11 2003
-+++ xc/include/Xarch.h Thu Jun 12 20:20:05 2003
-@@ -40,7 +40,7 @@
-
- #else
-
--#ifdef SVR4
-+#if defined(SVR4) && !defined(linux)
- #if defined(NCR) || defined(Mips) || defined(__sgi)
- #include <sys/endian.h>
- #else
+++ /dev/null
---- XFree86-4.0.1/xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h.old Sat Jun 24 20:20:42 2000
-+++ XFree86-4.0.1/xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h Sat Sep 30 23:36:30 2000
-@@ -364,6 +363,7 @@
- # define LDSMAP PIO_SCRNMAP
- # define LDNMAP LDSMAP
- # define CLEARDTR_SUPPORT
-+# define CLEARRTS_SUPPORT
- # define USE_VT_SYSREQ
- # endif
-
-
+++ /dev/null
---- xc/programs/Xserver/hw/xfree86/xaa/xaaPict.c 3 Jul 2005 08:53:49 -0000 1.10
-+++ xc/programs/Xserver/hw/xfree86/xaa/xaaPict.c 2 Feb 2006 17:33:58 -0000
-@@ -506,12 +506,21 @@ XAAComposite (CARD8 op,
- XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
- XAA_RENDER_PROLOGUE(pScreen, Composite);
-
-- if((op == PictOpSrc) && !pMask && infoRec->pScrn->vtSema &&
-- infoRec->ScreenToScreenBitBlt &&
-- pSrc->pDrawable &&
-- DRAWABLE_IS_ON_CARD(pSrc->pDrawable) &&
-- DRAWABLE_IS_ON_CARD(pDst->pDrawable) &&
-- !pSrc->transform && !pSrc->repeat && (pSrc->format == pDst->format))
-+ if(!pMask && infoRec->pScrn->vtSema &&
-+ infoRec->ScreenToScreenBitBlt &&
-+ pSrc->pDrawable &&
-+ DRAWABLE_IS_ON_CARD(pSrc->pDrawable) &&
-+ DRAWABLE_IS_ON_CARD(pDst->pDrawable) &&
-+ !pSrc->transform &&
-+ (!pSrc->repeat || (xSrc >= 0 && ySrc >= 0 &&
-+ xSrc+width<=pSrc->pDrawable->width &&
-+ ySrc+height<=pSrc->pDrawable->height)) &&
-+ ((op == PictOpSrc && pSrc->format == pDst->format) ||
-+ (op == PictOpOver && !pSrc->alphaMap && !pDst->alphaMap &&
-+ ((pSrc->format==PICT_x8r8g8b8 &&
-+ (pDst->format==PICT_x8r8g8b8 || pDst->format==PICT_a8r8g8b8)) ||
-+ (pSrc->format==PICT_x8b8g8r8 &&
-+ (pDst->format==PICT_x8b8g8r8 || pDst->format==PICT_a8b8g8r8))))))
- {
- XAACompositeSrcCopy(pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height);
- } else if(!pSrc->pDrawable || (pMask && !pMask->pDrawable) ||
+++ /dev/null
---- X11-6.9.0/xc/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_xmesa.h.org 2005-12-22 20:16:59.219541500 +0000
-+++ X11-6.9.0/xc/extras/Mesa/src/mesa/drivers/dri/ffb/ffb_xmesa.h 2005-12-22 20:16:53.775201250 +0000
-@@ -3,6 +3,8 @@
- #ifndef _FFB_XMESA_H_
- #define _FFB_XMESA_H_
-
-+typedef int Bool;
-+
- #include <sys/time.h>
- #include "dri_util.h"
- #include "mtypes.h"
+++ /dev/null
---- xc/config/cf/xorgsite.def.wiget 2004-08-21 04:06:44.000000000 +0200
-+++ xc/config/cf/xorgsite.def 2004-09-09 16:16:53.193447976 +0200
-@@ -311,20 +311,20 @@
- * HasGlide2 to YES and set the Glide2IncDir variable.
- * HasGlide2 is per default NO.
- *
--#define HasGlide2 YES
- */
-+#define HasGlide2 YES
-
- /*
- * Set the path to your Glide include files.
- *
--#define Glide2IncDir /usr/include/glide
- */
-+#define Glide2IncDir /usr/include/glide
-
- /*
- * Have glide 3?
- *
--#define HasGlide3 YES
- */
-+#define HasGlide3 YES
-
- /*
- * Set the path to your Glide 3 include files.
-
+++ /dev/null
-diff -urN xc.orig/lib/dps/csconndi.c xc/lib/dps/csconndi.c
---- xc.orig/lib/dps/csconndi.c 2004-08-08 14:23:31.000000000 +0200
-+++ xc/lib/dps/csconndi.c 2004-08-08 14:52:18.313430392 +0200
-@@ -480,8 +480,8 @@
-
- #ifndef CSDPS_UNIX_PATH
- #ifdef hpux
--#define CSDPS_UNIX_DIR "/usr/spool/sockets/DPSNX"
--#define CSDPS_UNIX_PATH "/usr/spool/sockets/DPSNX/"
-+#define CSDPS_UNIX_DIR "/var/spool/sockets/DPSNX"
-+#define CSDPS_UNIX_PATH "/var/spool/sockets/DPSNX/"
- #else
- #define CSDPS_UNIX_DIR "/tmp/.DPSNX-unix"
- #define CSDPS_UNIX_PATH "/tmp/.DPSNX-unix/AGENT"
-diff -urN xc.orig/lib/dps/Xlibnet.h xc/lib/dps/Xlibnet.h
---- xc.orig/lib/dps/Xlibnet.h 2004-08-08 14:23:32.000000000 +0200
-+++ xc/lib/dps/Xlibnet.h 2004-08-08 14:52:18.295433128 +0200
-@@ -20,7 +20,7 @@
-
- #ifndef X_UNIX_PATH
- #ifdef hpux
--#define X_UNIX_PATH "/usr/spool/sockets/X11/"
-+#define X_UNIX_PATH "/var/spool/sockets/X11/"
- #define OLD_UNIX_PATH "/tmp/.X11-unix/X"
- #else
- #define X_UNIX_PATH "/tmp/.X11-unix/X"
-diff -urN xc.orig/lib/xtrans/Xtranssock.c xc/lib/xtrans/Xtranssock.c
---- xc.orig/lib/xtrans/Xtranssock.c 2004-08-08 14:23:28.000000000 +0200
-+++ xc/lib/xtrans/Xtranssock.c 2004-08-08 14:52:18.316429936 +0200
-@@ -216,30 +216,30 @@
- #ifdef hpux
-
- #if defined(X11_t)
--#define UNIX_PATH "/usr/spool/sockets/X11/"
--#define UNIX_DIR "/usr/spool/sockets/X11"
-+#define UNIX_PATH "/var/spool/sockets/X11/"
-+#define UNIX_DIR "/var/spool/sockets/X11"
- #define OLD_UNIX_PATH "/tmp/.X11-unix/X"
- #endif /* X11_t */
- #if defined(XIM_t)
--#define UNIX_PATH "/usr/spool/sockets/XIM/"
--#define UNIX_DIR "/usr/spool/sockets/XIM"
-+#define UNIX_PATH "/var/spool/sockets/XIM/"
-+#define UNIX_DIR "/var/spool/sockets/XIM"
- #define OLD_UNIX_PATH "/tmp/.XIM-unix/XIM"
- #endif /* XIM_t */
- #if defined(FS_t) || defined(FONT_t)
--#define UNIX_PATH "/usr/spool/sockets/fontserv/"
--#define UNIX_DIR "/usr/spool/sockets/fontserv"
-+#define UNIX_PATH "/var/spool/sockets/fontserv/"
-+#define UNIX_DIR "/var/spool/sockets/fontserv"
- #endif /* FS_t || FONT_t */
- #if defined(ICE_t)
--#define UNIX_PATH "/usr/spool/sockets/ICE/"
--#define UNIX_DIR "/usr/spool/sockets/ICE"
-+#define UNIX_PATH "/var/spool/sockets/ICE/"
-+#define UNIX_DIR "/var/spool/sockets/ICE"
- #endif /* ICE_t */
- #if defined(TEST_t)
--#define UNIX_PATH "/usr/spool/sockets/xtrans_test/"
--#define UNIX_DIR "/usr/spool/sockets/xtrans_test"
-+#define UNIX_PATH "/var/spool/sockets/xtrans_test/"
-+#define UNIX_DIR "/var/spool/sockets/xtrans_test"
- #endif
- #if defined(LBXPROXY_t)
--#define UNIX_PATH "/usr/spool/sockets/X11/"
--#define UNIX_DIR "/usr/spool/sockets/X11"
-+#define UNIX_PATH "/var/spool/sockets/X11/"
-+#define UNIX_DIR "/var/spool/sockets/X11"
- #endif
-
- #else /* !hpux */
-diff -urN xc.orig/programs/rstart/Imakefile xc/programs/rstart/Imakefile
---- xc.orig/programs/rstart/Imakefile 2004-08-08 14:22:59.000000000 +0200
-+++ xc/programs/rstart/Imakefile 2004-08-08 14:52:18.317429784 +0200
-@@ -37,7 +37,7 @@
- OS=
- CLIENTNAME=rstart
-
--MYLIBDIR=$(LIBDIR)/rstart
-+MYLIBDIR=/etc/X11/rstart
- ENVPREFIX=RSTART
- PACKAGEname=rstart
-
-diff -urN xc.orig/programs/xbiff/MailboxP.h xc/programs/xbiff/MailboxP.h
---- xc.orig/programs/xbiff/MailboxP.h 2004-08-08 14:23:00.000000000 +0200
-+++ xc/programs/xbiff/MailboxP.h 2004-08-08 14:52:18.317429784 +0200
-@@ -50,7 +50,7 @@
- #endif
-
- #ifndef MAILBOX_DIRECTORY
--#define MAILBOX_DIRECTORY "/usr/spool/mail"
-+#define MAILBOX_DIRECTORY "/var/mail"
- #endif
-
- typedef struct { /* new fields for mailbox widget */
-diff -urN xc.orig/programs/xmh/xmh.man xc/programs/xmh/xmh.man
---- xc.orig/programs/xmh/xmh.man 2004-08-08 14:22:57.000000000 +0200
-+++ xc/programs/xmh/xmh.man 2004-08-08 14:52:18.353424312 +0200
-@@ -1316,7 +1316,7 @@
- An example of \fI.xmhcheck\fP file format, for the folders ``inbox'' and
- ``xpert'':
- .nf
--inbox /usr/spool/mail/converse
-+inbox /var/mail/converse
- xpert /users/converse/maildrops/xpert
- .fi
- .sp
+++ /dev/null
---- X11-6.8.1/xc/nls/Compose/iso8859-16.orig 1970-01-01 01:00:00.000000000 +0100
-+++ X11-6.8.1/xc/nls/Compose/iso8859-16 2004-11-23 10:31:49.000000000 +0100
-@@ -0,0 +1,353 @@
-+# $TOG: fcd8859-16 /main/2 1998/06/17 15:53:45 kaleb $
-+#
-+# ISO 8859-16 (Latin1) Compose Sequence
-+#
-+# $XFree86: xc/nls/Compose/iso8859-16,v 1.8 2002/10/16 01:44:48 dawes Exp $
-+#
-+# Sequence Definition
-+#
-+# <Multi_key> Means <Compose>
-+# Special Character
-+<Multi_key> <plus> <plus> : "#" numbersign
-+<Multi_key> <apostrophe> <space> : "'" apostrophe
-+<Multi_key> <space> <apostrophe> : "'" apostrophe
-+<Multi_key> <A> <T> : "@" at
-+<Multi_key> <parenleft> <parenleft> : "[" bracketleft
-+<Multi_key> <slash> <slash> : "\\" backslash
-+<Multi_key> <slash> <less> : "\\" backslash
-+<Multi_key> <less> <slash> : "\\" backslash
-+<Multi_key> <parenright> <parenright> : "]" bracketright
-+<Multi_key> <asciicircum> <space> : "^" asciicircum
-+<Multi_key> <space> <asciicircum> : "^" asciicircum
-+<Multi_key> <greater> <space> : "^" asciicircum
-+<Multi_key> <space> <greater> : "^" asciicircum
-+<Multi_key> <grave> <space> : "`" grave
-+<Multi_key> <space> <grave> : "`" grave
-+<Multi_key> <parenleft> <minus> : "{" braceleft
-+<Multi_key> <minus> <parenleft> : "{" braceleft
-+<Multi_key> <slash> <asciicircum> : "|" bar
-+<Multi_key> <asciicircum> <slash> : "|" bar
-+<Multi_key> <V> <L> : "|" bar
-+<Multi_key> <L> <V> : "|" bar
-+<Multi_key> <v> <l> : "|" bar
-+<Multi_key> <l> <v> : "|" bar
-+<Multi_key> <parenright> <minus> : "}" braceright
-+<Multi_key> <minus> <parenright> : "}" braceright
-+<Multi_key> <asciitilde> <space> : "~" asciitilde
-+<Multi_key> <space> <asciitilde> : "~" asciitilde
-+<Multi_key> <minus> <space> : "~" asciitilde
-+<Multi_key> <space> <minus> : "~" asciitilde
-+<Multi_key> <C> <equal> : "\244" EuroSign
-+<Multi_key> <equal> <C> : "\244" EuroSign
-+<Multi_key> <E> <equal> : "\244" EuroSign
-+<Multi_key> <e> <equal> : "\244" EuroSign
-+<Multi_key> <greater> <comma> : "\245" doublelowquotemark
-+<Multi_key> <comma> <greater> : "\245" doublelowquotemark
-+<Multi_key> <s> <o> : "\247" section
-+<Multi_key> <o> <s> : "\247" section
-+<Multi_key> <S> <O> : "\247" section
-+<Multi_key> <O> <S> : "\247" section
-+<Multi_key> <S> <exclam> : "\247" section
-+<Multi_key> <exclam> <S> : "\247" section
-+<Multi_key> <s> <exclam> : "\247" section
-+<Multi_key> <exclam> <s> : "\247" section
-+<Multi_key> <S> <0> : "\247" section
-+<Multi_key> <0> <S> : "\247" section
-+<Multi_key> <s> <0> : "\247" section
-+<Multi_key> <0> <s> : "\247" section
-+<Multi_key> <c> <o> : "\251" copyright
-+<Multi_key> <o> <c> : "\251" copyright
-+<Multi_key> <C> <O> : "\251" copyright
-+<Multi_key> <O> <C> : "\251" copyright
-+<Multi_key> <c> <O> : "\251" copyright
-+<Multi_key> <O> <c> : "\251" copyright
-+<Multi_key> <C> <o> : "\251" copyright
-+<Multi_key> <o> <C> : "\251" copyright
-+<Multi_key> <c> <0> : "\251" copyright
-+<Multi_key> <0> <c> : "\251" copyright
-+<Multi_key> <C> <0> : "\251" copyright
-+<Multi_key> <0> <C> : "\251" copyright
-+<Multi_key> <parenleft> <c> : "\251" copyright
-+<Multi_key> <parenleft> <C> : "\251" copyright
-+<Multi_key> <less> <less> : "\253" guillemotleft
-+<Multi_key> <greater> <greater> : "\273" guillemotright
-+<Multi_key> <0> <asciicircum> : "\260" degree
-+<Multi_key> <asciicircum> <0> : "\260" degree
-+<Multi_key> <0> <asterisk> : "\260" degree
-+<Multi_key> <asterisk> <0> : "\260" degree
-+<Multi_key> <plus> <minus> : "\261" plusminus
-+<Multi_key> <minus> <plus> : "\261" plusminus
-+<Multi_key> <greater> <quotedbl> : "\265" rightdoublequotemark
-+<Multi_key> <quotedbl> <greater> : "\265" rightdoublequotemark
-+<Multi_key> <p> <exclam> : "\266" paragraph
-+<Multi_key> <exclam> <p> : "\266" paragraph
-+<Multi_key> <P> <exclam> : "\266" paragraph
-+<Multi_key> <exclam> <P> : "\266" paragraph
-+<Multi_key> <period> <asciicircum> : "\267" periodcentered
-+<Multi_key> <asciicircum> <period> : "\267" periodcentered
-+<Multi_key> <period> <period> : "\267" periodcentered
-+<Multi_key> <space> <space> : "\240" nobreakspace
-+<Multi_key> <minus> <minus> : "\255" hyphen
-+<Multi_key> <quotedbl> <quotedbl> : "\"" quotedbl
-+# Accented Alphabet
-+<Multi_key> <A> <grave> : "\300" Agrave
-+<Multi_key> <grave> <A> : "\300" Agrave
-+<Multi_key> <A> <apostrophe> : "\301" Aacute
-+<Multi_key> <apostrophe> <A> : "\301" Aacute
-+<Multi_key> <A> <asciicircum> : "\302" Acircumflex
-+<Multi_key> <asciicircum> <A> : "\302" Acircumflex
-+<Multi_key> <A> <greater> : "\302" Acircumflex
-+<Multi_key> <greater> <A> : "\302" Acircumflex
-+<Multi_key> <A> <U> : "\303" Abreve
-+<Multi_key> <A> <breve> : "\303" Abreve
-+<Multi_key> <breve> <A> : "\303" Abreve
-+<Multi_key> <A> <quotedbl> : "\304" Adiaeresis
-+<Multi_key> <quotedbl> <A> : "\304" Adiaeresis
-+<Multi_key> <A> <comma> : "\241" Aogonek
-+<Multi_key> <comma> <A> : "\241" Aogonek
-+<Multi_key> <a> <grave> : "\340" agrave
-+<Multi_key> <grave> <a> : "\340" agrave
-+<Multi_key> <a> <apostrophe> : "\341" aacute
-+<Multi_key> <apostrophe> <a> : "\341" aacute
-+<Multi_key> <a> <asciicircum> : "\342" acircumflex
-+<Multi_key> <asciicircum> <a> : "\342" acircumflex
-+<Multi_key> <a> <greater> : "\342" acircumflex
-+<Multi_key> <greater> <a> : "\342" acircumflex
-+<Multi_key> <a> <U> : "\343" abreve
-+<Multi_key> <a> <breve> : "\343" abreve
-+<Multi_key> <breve> <a> : "\343" abreve
-+<Multi_key> <a> <quotedbl> : "\344" adiaeresis
-+<Multi_key> <quotedbl> <a> : "\344" adiaeresis
-+<Multi_key> <a> <comma> : "\242" aogonek
-+<Multi_key> <comma> <a> : "\242" aogonek
-+<Multi_key> <A> <E> : "\306" AE
-+<Multi_key> <a> <e> : "\346" ae
-+<Multi_key> <C> <apostrophe> : "\305" Cacute
-+<Multi_key> <apostrophe> <C> : "\305" Cacute
-+<Multi_key> <C> <comma> : "\307" Ccedilla
-+<Multi_key> <comma> <C> : "\307" Ccedilla
-+<Multi_key> <C> <less> : "\262" Ccaron
-+<Multi_key> <less> <C> : "\262" Ccaron
-+<Multi_key> <c> <apostrophe> : "\345" cacute
-+<Multi_key> <apostrophe> <c> : "\345" cacute
-+<Multi_key> <c> <comma> : "\347" ccedilla
-+<Multi_key> <comma> <c> : "\347" ccedilla
-+<Multi_key> <c> <less> : "\271" ccaron
-+<Multi_key> <less> <c> : "\271" ccaron
-+<Multi_key> <D> <minus> : "\320" Dstroke
-+<Multi_key> <minus> <D> : "\320" Dstroke
-+<Multi_key> <d> <minus> : "\360" dstroke
-+<Multi_key> <minus> <d> : "\360" dstroke
-+<Multi_key> <E> <grave> : "\310" Egrave
-+<Multi_key> <grave> <E> : "\310" Egrave
-+<Multi_key> <E> <apostrophe> : "\311" Eacute
-+<Multi_key> <apostrophe> <E> : "\311" Eacute
-+<Multi_key> <E> <asciicircum> : "\312" Ecircumflex
-+<Multi_key> <asciicircum> <E> : "\312" Ecircumflex
-+<Multi_key> <E> <greater> : "\312" Ecircumflex
-+<Multi_key> <greater> <E> : "\312" Ecircumflex
-+<Multi_key> <E> <quotedbl> : "\313" Ediaeresis
-+<Multi_key> <quotedbl> <E> : "\313" Ediaeresis
-+<Multi_key> <E> <comma> : "\335" Eogonek
-+<Multi_key> <comma> <E> : "\335" Eogonek
-+<Multi_key> <e> <grave> : "\350" egrave
-+<Multi_key> <grave> <e> : "\350" egrave
-+<Multi_key> <e> <apostrophe> : "\351" eacute
-+<Multi_key> <apostrophe> <e> : "\351" eacute
-+<Multi_key> <e> <asciicircum> : "\352" ecircumflex
-+<Multi_key> <asciicircum> <e> : "\352" ecircumflex
-+<Multi_key> <e> <greater> : "\352" ecircumflex
-+<Multi_key> <greater> <e> : "\352" ecircumflex
-+<Multi_key> <e> <quotedbl> : "\353" ediaeresis
-+<Multi_key> <quotedbl> <e> : "\353" ediaeresis
-+<Multi_key> <e> <comma> : "\375" eogonek
-+<Multi_key> <comma> <e> : "\375" eogonek
-+<Multi_key> <I> <grave> : "\314" Igrave
-+<Multi_key> <grave> <I> : "\314" Igrave
-+<Multi_key> <I> <apostrophe> : "\315" Iacute
-+<Multi_key> <apostrophe> <I> : "\315" Iacute
-+<Multi_key> <I> <asciicircum> : "\316" Icircumflex
-+<Multi_key> <asciicircum> <I> : "\316" Icircumflex
-+<Multi_key> <I> <greater> : "\316" Icircumflex
-+<Multi_key> <greater> <I> : "\316" Icircumflex
-+<Multi_key> <I> <quotedbl> : "\317" Idiaeresis
-+<Multi_key> <quotedbl> <I> : "\317" Idiaeresis
-+<Multi_key> <i> <grave> : "\354" igrave
-+<Multi_key> <grave> <i> : "\354" igrave
-+<Multi_key> <i> <apostrophe> : "\355" iacute
-+<Multi_key> <apostrophe> <i> : "\355" iacute
-+<Multi_key> <i> <asciicircum> : "\356" icircumflex
-+<Multi_key> <asciicircum> <i> : "\356" icircumflex
-+<Multi_key> <i> <greater> : "\356" icircumflex
-+<Multi_key> <greater> <i> : "\356" icircumflex
-+<Multi_key> <i> <quotedbl> : "\357" idiaeresis
-+<Multi_key> <quotedbl> <i> : "\357" idiaeresis
-+<Multi_key> <L> <minus> : "\243" Lstroke
-+<Multi_key> <l> <minus> : "\263" lstroke
-+<Multi_key> <N> <apostrophe> : "\321" Nacute
-+<Multi_key> <apostrophe> <N> : "\321" Nacute
-+<Multi_key> <n> <apostrophe> : "\361" nacute
-+<Multi_key> <apostrophe> <n> : "\361" nacute
-+<Multi_key> <O> <grave> : "\322" Ograve
-+<Multi_key> <grave> <O> : "\322" Ograve
-+<Multi_key> <O> <apostrophe> : "\323" Oacute
-+<Multi_key> <apostrophe> <O> : "\323" Oacute
-+<Multi_key> <O> <asciicircum> : "\324" Ocircumflex
-+<Multi_key> <asciicircum> <O> : "\324" Ocircumflex
-+<Multi_key> <O> <greater> : "\324" Ocircumflex
-+<Multi_key> <greater> <O> : "\324" Ocircumflex
-+<Multi_key> <apostrophe> <apostrophe> <O> : "\325" Odoubleacute
-+<Multi_key> <O> <quotedbl> : "\326" Odiaeresis
-+<Multi_key> <quotedbl> <O> : "\326" Odiaeresis
-+<Multi_key> <o> <grave> : "\362" ograve
-+<Multi_key> <grave> <o> : "\362" ograve
-+<Multi_key> <o> <apostrophe> : "\363" oacute
-+<Multi_key> <apostrophe> <o> : "\363" oacute
-+<Multi_key> <o> <asciicircum> : "\364" ocircumflex
-+<Multi_key> <asciicircum> <o> : "\364" ocircumflex
-+<Multi_key> <o> <greater> : "\364" ocircumflex
-+<Multi_key> <greater> <o> : "\364" ocircumflex
-+<Multi_key> <apostrophe> <apostrophe> <o> : "\365" odoubleacute
-+<Multi_key> <o> <quotedbl> : "\366" odiaeresis
-+<Multi_key> <quotedbl> <o> : "\366" odiaeresis
-+<Multi_key> <O> <E> : "\274" OE
-+<Multi_key> <o> <e> : "\275" oe
-+<Multi_key> <S> <apostrophe> : "\327" Sacute
-+<Multi_key> <apostrophe> <S> : "\327" Sacute
-+<Multi_key> <S> <less> : "\246" Scaron
-+<Multi_key> <less> <S> : "\246" Scaron
-+<Multi_key> <s> <apostrophe> : "\367" sacute
-+<Multi_key> <apostrophe> <s> : "\367" sacute
-+<Multi_key> <s> <less> : "\250" scaron
-+<Multi_key> <less> <s> : "\250" scaron
-+<Multi_key> <s> <s> : "\337" ssharp
-+<Multi_key> <U> <grave> : "\331" Ugrave
-+<Multi_key> <grave> <U> : "\331" Ugrave
-+<Multi_key> <U> <apostrophe> : "\332" Uacute
-+<Multi_key> <apostrophe> <U> : "\332" Uacute
-+<Multi_key> <apostrophe> <apostrophe> <U> : "\330" Udoubleacute
-+<Multi_key> <U> <asciicircum> : "\333" Ucircumflex
-+<Multi_key> <asciicircum> <U> : "\333" Ucircumflex
-+<Multi_key> <U> <greater> : "\333" Ucircumflex
-+<Multi_key> <greater> <U> : "\333" Ucircumflex
-+<Multi_key> <U> <quotedbl> : "\334" Udiaeresis
-+<Multi_key> <quotedbl> <U> : "\334" Udiaeresis
-+<Multi_key> <u> <grave> : "\371" ugrave
-+<Multi_key> <grave> <u> : "\371" ugrave
-+<Multi_key> <u> <apostrophe> : "\372" uacute
-+<Multi_key> <apostrophe> <u> : "\372" uacute
-+<Multi_key> <apostrophe> <apostrophe> <u> : "\370" udoubleacute
-+<Multi_key> <u> <asciicircum> : "\373" ucircumflex
-+<Multi_key> <asciicircum> <u> : "\373" ucircumflex
-+<Multi_key> <u> <greater> : "\373" ucircumflex
-+<Multi_key> <greater> <u> : "\373" ucircumflex
-+<Multi_key> <u> <quotedbl> : "\374" udiaeresis
-+<Multi_key> <quotedbl> <u> : "\374" udiaeresis
-+<Multi_key> <Y> <quotedbl> : "\276" Ydiaeresis
-+<Multi_key> <quotedbl> <Y> : "\276" Ydiaeresis
-+<Multi_key> <y> <quotedbl> : "\377" ydiaeresis
-+<Multi_key> <quotedbl> <y> : "\377" ydiaeresis
-+<Multi_key> <Z> <apostrophe> : "\254" Zacute
-+<Multi_key> <apostrophe> <Z> : "\254" Zacute
-+<Multi_key> <Z> <less> : "\264" Zcaron
-+<Multi_key> <less> <Z> : "\264" Zcaron
-+<Multi_key> <Z> <period> : "\257" Zabovedot
-+<Multi_key> <z> <apostrophe> : "\256" zacute
-+<Multi_key> <apostrophe> <z> : "\256" zacute
-+<Multi_key> <z> <less> : "\270" zcaron
-+<Multi_key> <less> <z> : "\270" zcaron
-+<Multi_key> <z> <period> : "\277" zabovedot
-+#
-+# dead key accent keysyms
-+# Special Character
-+<dead_circumflex> <slash> : "|" bar
-+<dead_circumflex> <space> : "^" asciicircum
-+<dead_circumflex> <dead_circumflex> : "^" asciicircum
-+<dead_tilde> <space> : "~" asciitilde
-+<dead_tilde> <dead_tilde> : "~" asciitilde
-+<dead_grave> <space> : "`" grave
-+<dead_grave> <dead_grave> : "`" grave
-+# These are for us_intl, that does not have diaeresis, etc
-+<dead_acute> <space> : "'" apostrophe
-+<dead_diaeresis> <space> : "\"" quotedbl
-+<dead_diaeresis> <dead_diaeresis> : "\"" quotedbl
-+<dead_doubleacute> <space> : "\"" quotedbl
-+<dead_circumflex> <0> : "\260" degree
-+<dead_circumflex> <period> : "\267" periodcentered
-+<dead_diaeresis> <quotedbl> : "\"" quotedbl
-+# Accented Alphabet
-+<dead_grave> <A> : "\300" Agrave
-+<dead_acute> <A> : "\301" Aacute
-+<dead_circumflex> <A> : "\302" Acircumflex
-+<dead_breve> <A> : "\303" Abreve
-+<dead_diaeresis> <A> : "\304" Adiaeresis
-+<dead_ogonek> <A> : "\241" Aogonek
-+<dead_grave> <a> : "\340" agrave
-+<dead_acute> <a> : "\341" aacute
-+<dead_circumflex> <a> : "\342" acircumflex
-+<dead_breve> <a> : "\343" abreve
-+<dead_diaeresis> <a> : "\344" adiaeresis
-+<dead_ogonek> <a> : "\242" aogonek
-+<dead_acute> <C> : "\305" Cacute
-+<dead_cedilla> <C> : "\307" Ccedilla
-+<dead_caron> <C> : "\262" Ccaron
-+<dead_acute> <c> : "\345" cacute
-+<dead_cedilla> <c> : "\347" ccedilla
-+<dead_caron> <c> : "\271" ccaron
-+<dead_grave> <E> : "\310" Egrave
-+<dead_acute> <E> : "\311" Eacute
-+<dead_circumflex> <E> : "\312" Ecircumflex
-+<dead_diaeresis> <E> : "\313" Ediaeresis
-+<dead_ogonek> <E> : "\335" Eogonek
-+<dead_grave> <e> : "\350" egrave
-+<dead_acute> <e> : "\351" eacute
-+<dead_circumflex> <e> : "\352" ecircumflex
-+<dead_diaeresis> <e> : "\353" ediaeresis
-+<dead_ogonek> <e> : "\375" eogonek
-+<dead_grave> <I> : "\314" Igrave
-+<dead_acute> <I> : "\315" Iacute
-+<dead_circumflex> <I> : "\316" Icircumflex
-+<dead_diaeresis> <I> : "\317" Idiaeresis
-+<dead_grave> <i> : "\354" igrave
-+<dead_acute> <i> : "\355" iacute
-+<dead_circumflex> <i> : "\356" icircumflex
-+<dead_diaeresis> <i> : "\357" idiaeresis
-+<dead_acute> <N> : "\321" Nacute
-+<dead_acute> <n> : "\361" nacute
-+<dead_grave> <O> : "\322" Ograve
-+<dead_acute> <O> : "\323" Oacute
-+<dead_circumflex> <O> : "\324" Ocircumflex
-+<dead_doubleacute> <O> : "\325" Odoubleacute
-+<dead_diaeresis> <O> : "\326" Odiaeresis
-+<dead_grave> <o> : "\362" ograve
-+<dead_acute> <o> : "\363" oacute
-+<dead_circumflex> <o> : "\364" ocircumflex
-+<dead_doubleacute> <o> : "\365" odoubleacute
-+<dead_diaeresis> <o> : "\366" odiaeresis
-+<dead_acute> <S> : "\327" Sacute
-+<dead_caron> <S> : "\246" Scaron
-+<dead_circumflex> <S> : "\246" Scaron
-+<dead_acute> <s> : "\367" sacute
-+<dead_circumflex> <s> : "\250" scaron
-+<dead_caron> <s> : "\250" scaron
-+<dead_grave> <U> : "\331" Ugrave
-+<dead_acute> <U> : "\332" Uacute
-+<dead_doubleacute> <U> : "\330" Udoubleacute
-+<dead_circumflex> <U> : "\333" Ucircumflex
-+<dead_diaeresis> <U> : "\334" Udiaeresis
-+<dead_grave> <u> : "\371" ugrave
-+<dead_acute> <u> : "\372" uacute
-+<dead_doubleacute> <u> : "\370" udoubleacute
-+<dead_circumflex> <u> : "\373" ucircumflex
-+<dead_diaeresis> <u> : "\374" udiaeresis
-+<dead_diaeresis> <Y> : "\276" Ydiaeresis
-+<dead_diaeresis> <y> : "\377" ydiaeresis
-+<dead_acute> <Z> : "\254" Zacute
-+<dead_caron> <Z> : "\264" Zcaron
-+<dead_circumflex> <Z> : "\264" Zcaron
-+<dead_abovedot> <Z> : "\257" Zabovedot
-+<dead_acute> <z> : "\256" zacute
-+<dead_caron> <z> : "\270" zcaron
-+<dead_circumflex> <z> : "\270" zcaron
-+<dead_abovedot> <z> : "\277" zabovedot
-+# End of Sequence Definition
---- X11-6.8.1/xc/nls/XI18N_OBJS/iso8859-16.orig 1970-01-01 01:00:00.000000000 +0100
-+++ X11-6.8.1/xc/nls/XI18N_OBJS/iso8859-16 2004-11-23 05:19:16.000000000 +0100
-@@ -0,0 +1,7 @@
-+# CATEGORY(XLC|XIM|OM) SHARED_LIBRARY_NAME FUNCTION_NAME
-+#
-+# XI18N objects table for iso8859-16 locale
-+#
-+XLC common/xlcDef _XlcDefaultLoader # XLC_open
-+XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister
-+XOM common/xomGeneric _XomGenericOpenOM # XOM_open
---- X11-6.8.1/xc/nls/XLC_LOCALE/iso8859-16.orig 1970-01-01 01:00:00.000000000 +0100
-+++ X11-6.8.1/xc/nls/XLC_LOCALE/iso8859-16 2004-11-23 05:19:11.000000000 +0100
-@@ -0,0 +1,80 @@
-+# $TOG: fcd8859-16 /main/1 1998/05/20 14:49:16 kaleb $
-+# XLocale Database Sample for fcd/dis/iso 8859-16.
-+# When Final Committee Draft (FCD) 8859-16 is formalized
-+# then this file will be renamed iso8859-16.
-+# This file is provided as preliminary support for the Latin-9
-+# (a.k.a. Latin-0) character set so that Europeans who want
-+# the Euro currency character can do so.
-+#
-+# $XFree86$
-+#
-+
-+#
-+# XLC_FONTSET category
-+#
-+XLC_FONTSET
-+# fs0 class
-+fs0 {
-+ charset {
-+ name ISO8859-1:GL
-+ }
-+ font {
-+ primary ISO8859-16:GL
-+ substitute ISO8859-16:GL
-+ vertical_rotate all
-+ }
-+}
-+# fs1 class
-+fs1 {
-+ charset {
-+ name ISO8859-16:GR
-+ }
-+ font {
-+ primary ISO8859-16:GR
-+ }
-+}
-+END XLC_FONTSET
-+
-+#
-+# XLC_XLOCALE category
-+#
-+XLC_XLOCALE
-+
-+encoding_name ISO8859-16
-+mb_cur_max 1
-+state_depend_encoding False
-+
-+wc_encoding_mask \x30000000
-+wc_shift_bits 7
-+
-+
-+
-+
-+
-+
-+use_stdc_env True
-+force_convert_to_mb True
-+
-+
-+# cs0 class
-+cs0 {
-+ side GL:Default
-+ length 1
-+ wc_encoding \x00000000
-+ ct_encoding ISO8859-16:GL; ISO8859-1:GL
-+}
-+
-+
-+# cs1 class
-+cs1 {
-+ side GR:Default
-+ length 1
-+
-+ wc_encoding \x30000000
-+
-+
-+
-+ ct_encoding ISO8859-16:GR
-+}
-+
-+END XLC_XLOCALE
---- X11-6.9.0/xc/nls/locale.dir.orig 2005-09-30 09:52:46.000000000 +0200
-+++ X11-6.9.0/xc/nls/locale.dir 2006-03-21 12:40:43.839062000 +0100
-@@ -9,8 +9,11 @@
- XCOMM
-
- C/XLC_LOCALE: C
-+iso8859-1/XLC_LOCALE: aa_DJ.ISO8859-1
- iso8859-1/XLC_LOCALE: af_ZA.ISO8859-1
-+iso8859-15/XLC_LOCALE: an_ES.ISO8859-15
- iso8859-6/XLC_LOCALE: ar_AA.ISO8859-6
-+iso8859-6/XLC_LOCALE: ar_AE.ISO8859-6
- iso8859-6/XLC_LOCALE: ar_BH.ISO8859-6
- iso8859-6/XLC_LOCALE: ar_DZ.ISO8859-6
- iso8859-6/XLC_LOCALE: ar_EG.ISO8859-6
-@@ -25,10 +28,12 @@
- iso8859-6/XLC_LOCALE: ar_SA.ISO8859-6
- iso8859-6/XLC_LOCALE: ar_SD.ISO8859-6
- iso8859-6/XLC_LOCALE: ar_SY.ISO8859-6
-+iso8859-6/XLC_LOCALE: ar_SD.ISO8859-6
-+iso8859-6/XLC_LOCALE: ar_SY.ISO8859-6
- iso8859-6/XLC_LOCALE: ar_TN.ISO8859-6
- iso8859-6/XLC_LOCALE: ar_YE.ISO8859-6
- iso8859-9e/XLC_LOCALE: az_AZ.ISO8859-9E
--koi8-c/XLC_LOCALE: az_AZ.KOI8-C
-+koi8-c/XLC_LOCALE: az_AZ.KOI8-K
- iso8859-5/XLC_LOCALE: be_BY.ISO8859-5
- microsoft-cp1251/XLC_LOCALE: be_BY.CP1251
- iso8859-5/XLC_LOCALE: bg_BG.ISO8859-5
-@@ -38,13 +43,13 @@
- iso8859-1/XLC_LOCALE: br_FR.ISO8859-1
- iso8859-14/XLC_LOCALE: br_FR.ISO8859-14
- iso8859-15/XLC_LOCALE: br_FR.ISO8859-15
-+iso8859-2/XLC_LOCALE: bs_BA.ISO8859-2
- iso8859-1/XLC_LOCALE: ca_ES.ISO8859-1
- iso8859-15/XLC_LOCALE: ca_ES.ISO8859-15
- iso8859-2/XLC_LOCALE: cs_CZ.ISO8859-2
- iso8859-1/XLC_LOCALE: cy_GB.ISO8859-1
- iso8859-14/XLC_LOCALE: cy_GB.ISO8859-14
- iso8859-15/XLC_LOCALE: cy_GB.ISO8859-15
--iso8859-2/XLC_LOCALE: cz_CZ.ISO8859-2
- iso8859-1/XLC_LOCALE: da_DK.ISO8859-1
- iso8859-15/XLC_LOCALE: da_DK.ISO8859-15
- iso8859-1/XLC_LOCALE: de_AT.ISO8859-1
-@@ -58,13 +63,14 @@
- iso8859-1/XLC_LOCALE: de_LI.ISO8859-1
- iso8859-1/XLC_LOCALE: de_LU.ISO8859-1
- iso8859-15/XLC_LOCALE: de_LU.ISO8859-15
-+iso8859-7/XLC_LOCALE: el_CY.ISO8859-7
- iso8859-7/XLC_LOCALE: el_GR.ISO8859-7
--iso8859-15/XLC_LOCALE: el_GR.ISO8859-15
- iso8859-1/XLC_LOCALE: en_AU.ISO8859-1
- iso8859-1/XLC_LOCALE: en_BE.ISO8859-1
--iso8859-1/XLC_LOCALE: en_BZ.ISO8859-1
- iso8859-1/XLC_LOCALE: en_BW.ISO8859-1
-+iso8859-1/XLC_LOCALE: en_BZ.ISO8859-1
- iso8859-1/XLC_LOCALE: en_CA.ISO8859-1
-+iso8859-1/XLC_LOCALE: en_DK.ISO8859-1
- iso8859-1/XLC_LOCALE: en_GB.ISO8859-1
- iso8859-15/XLC_LOCALE: en_GB.ISO8859-15
- iso8859-1/XLC_LOCALE: en_HK.ISO8859-1
-@@ -75,9 +81,11 @@
- iso8859-1/XLC_LOCALE: en_NZ.ISO8859-1
- iso8859-1/XLC_LOCALE: en_PH.ISO8859-1
- iso8859-1/XLC_LOCALE: en_SG.ISO8859-1
-+iso8859-1/XLC_LOCALE: en_PH.ISO8859-1
-+iso8859-1/XLC_LOCALE: en_SG.ISO8859-1
- iso8859-1/XLC_LOCALE: en_TT.ISO8859-1
--iso8859-1/XLC_LOCALE: en_UK.ISO8859-1
--iso8859-15/XLC_LOCALE: en_UK.ISO8859-15
-+iso8859-1/XLC_LOCALE: en_GB.ISO8859-1
-+iso8859-15/XLC_LOCALE: en_GB.ISO8859-15
- iso8859-1/XLC_LOCALE: en_US.ISO8859-1
- iso8859-15/XLC_LOCALE: en_US.ISO8859-15
- iso8859-1/XLC_LOCALE: en_ZA.ISO8859-1
-@@ -103,6 +111,7 @@
- iso8859-1/XLC_LOCALE: es_PY.ISO8859-1
- iso8859-1/XLC_LOCALE: es_SV.ISO8859-1
- iso8859-1/XLC_LOCALE: es_US.ISO8859-1
-+iso8859-1/XLC_LOCALE: es_US.ISO8859-1
- iso8859-1/XLC_LOCALE: es_UY.ISO8859-1
- iso8859-1/XLC_LOCALE: es_VE.ISO8859-1
- iso8859-1/XLC_LOCALE: et_EE.ISO8859-1
-@@ -114,6 +123,7 @@
- isiri-3342/XLC_LOCALE: fa_IR.ISIRI-3342
- iso8859-1/XLC_LOCALE: fi_FI.ISO8859-1
- iso8859-15/XLC_LOCALE: fi_FI.ISO8859-15
-+iso8859-1/XLC_LOCALE: fil_PH.ISO8859-1
- iso8859-1/XLC_LOCALE: fo_FO.ISO8859-1
- iso8859-15/XLC_LOCALE: fo_FO.ISO8859-15
- iso8859-1/XLC_LOCALE: fr_BE.ISO8859-1
-@@ -141,7 +151,9 @@
- microsoft-cp1255/XLC_LOCALE: he_IL.CP1255
- iscii-dev/XLC_LOCALE: hi_IN.ISCII-DEV
- iso8859-2/XLC_LOCALE: hr_HR.ISO8859-2
-+iso8859-2/XLC_LOCALE: hsb_DE.ISO8859-2
- iso8859-2/XLC_LOCALE: hu_HU.ISO8859-2
-+iso8859-16/XLC_LOCALE: hu_HU.ISO8859-16
- armscii-8/XLC_LOCALE: hy_AM.ARMSCII-8
- iso8859-1/XLC_LOCALE: id_ID.ISO8859-1
- iso8859-1/XLC_LOCALE: is_IS.ISO8859-1
-@@ -154,60 +166,70 @@
- ja.JIS/XLC_LOCALE: ja_JP.JIS7
- georgian-academy/XLC_LOCALE: ka_GE.GEORGIAN-ACADEMY
- georgian-ps/XLC_LOCALE: ka_GE.GEORGIAN-PS
-+XCOMM pt-154/XLC_LOCALE: kk_KZ.PT154
- iso8859-1/XLC_LOCALE: kl_GL.ISO8859-1
- ko/XLC_LOCALE: ko_KR.eucKR
- iso8859-1/XLC_LOCALE: kw_GB.ISO8859-1
- iso8859-14/XLC_LOCALE: kw_GB.ISO8859-14
- iso8859-15/XLC_LOCALE: kw_GB.ISO8859-15
-+iso8859-10/XLC_LOCALE: lg_UG.ISO8859-10
-+iso8859-1/XLC_LOCALE: li_BE.ISO8859-1
-+iso8859-15/XLC_LOCALE: li_BE.ISO8859-15
-+iso8859-1/XLC_LOCALE: li_NL.ISO8859-1
-+iso8859-15/XLC_LOCALE: li_NL.ISO8859-15
- ibm-cp1133/XLC_LOCALE: lo_LA.IBM-CP1133
- mulelao-1/XLC_LOCALE: lo_LA.MULELAO-1
- iso8859-4/XLC_LOCALE: lt_LT.ISO8859-4
- iso8859-13/XLC_LOCALE: lt_LT.ISO8859-13
- iso8859-4/XLC_LOCALE: lv_LV.ISO8859-4
- iso8859-13/XLC_LOCALE: lv_LV.ISO8859-13
--iso8859-13/XLC_LOCALE: mi_NZ.ISO8859-13
-+iso8859-1/XLC_LOCALE: mi_NZ.ISO8859-1
- iso8859-5/XLC_LOCALE: mk_MK.ISO8859-5
- microsoft-cp1251/XLC_LOCALE: mk_MK.CP1251
- iso8859-1/XLC_LOCALE: ms_MY.ISO8859-1
- iso8859-3/XLC_LOCALE: mt_MT.ISO8859-3
- iso8859-1/XLC_LOCALE: nb_NO.ISO8859-1
--iso8859-1/XLC_LOCALE: nb_NO.ISO8859-15
-+iso8859-15/XLC_LOCALE: nb_NO.ISO8859-15
-+iso8859-1/XLC_LOCALE: nds_DE.ISO8859-1
-+iso8859-15/XLC_LOCALE: nds_DE.ISO8859-15
- iso8859-1/XLC_LOCALE: nl_BE.ISO8859-1
- iso8859-15/XLC_LOCALE: nl_BE.ISO8859-15
- iso8859-1/XLC_LOCALE: nl_NL.ISO8859-1
- iso8859-15/XLC_LOCALE: nl_NL.ISO8859-15
- iso8859-1/XLC_LOCALE: nn_NO.ISO8859-1
- iso8859-1/XLC_LOCALE: nn_NO.ISO8859-15
--iso8859-1/XLC_LOCALE: no_NO.ISO8859-1
--iso8859-1/XLC_LOCALE: no_NO.ISO8859-15
- iso8859-1/XLC_LOCALE: nr_ZA.ISO8859-1
--iso8859-15/XLC_LOCALE: nso_ZA.ISO8859-15
--iso8859-1/XLC_LOCALE: ny_NO.ISO8859-1
--iso8859-1/XLC_LOCALE: ny_NO.ISO8859-15
-+iso8859-10/XLC_LOCALE: nso_ZA.ISO8859-10
- iso8859-1/XLC_LOCALE: oc_FR.ISO8859-1
- iso8859-15/XLC_LOCALE: oc_FR.ISO8859-15
-+iso8859-1/XLC_LOCALE: om_KE.ISO8859-1
-+iso8859-1/XLC_LOCALE: pap_AN.ISO8859-1
-+iso8859-15/XLC_LOCALE: pap_AN.ISO8859-15
- iso8859-1/XLC_LOCALE: pd_DE.ISO8859-1
--iso8859-1/XLC_LOCALE: ph_PH.ISO8859-1
- iso8859-2/XLC_LOCALE: pl_PL.ISO8859-2
--iso8859-1/XLC_LOCALE: pp_AN.ISO8859-1
-+iso8859-16/XLC_LOCALE: pl_PL.ISO8859-16
- iso8859-1/XLC_LOCALE: pt_BR.ISO8859-1
- iso8859-1/XLC_LOCALE: pt_PT.ISO8859-1
- iso8859-15/XLC_LOCALE: pt_PT.ISO8859-15
- iso8859-2/XLC_LOCALE: ro_RO.ISO8859-2
-+iso8859-16/XLC_LOCALE: ro_RO.ISO8859-16
- iso8859-5/XLC_LOCALE: ru_RU.ISO8859-5
- microsoft-cp1251/XLC_LOCALE: ru_RU.CP1251
- koi8-r/XLC_LOCALE: ru_RU.KOI8-R
- koi8-u/XLC_LOCALE: ru_UA.KOI8-U
-+microsoft-cp1251/XLC_LOCALE: ru_UA.CP1251
- iso8859-1/XLC_LOCALE: rw_RW.ISO8859-1
--iso8859-2/XLC_LOCALE: sh_YU.ISO8859-2
- iso8859-2/XLC_LOCALE: sk_SK.ISO8859-2
- iso8859-2/XLC_LOCALE: sl_SI.ISO8859-2
--iso8859-5/XLC_LOCALE: sp_YU.ISO8859-5
-+iso8859-16/XLC_LOCALE: sl_SI.ISO8859-16
-+iso8859-1/XLC_LOCALE: so_DJ.ISO8859-1
-+iso8859-1/XLC_LOCALE: so_KE.ISO8859-1
-+iso8859-1/XLC_LOCALE: so_SO.ISO8859-1
-+iso8859-1/XLC_LOCALE: sq_AL.ISO8859-1
- iso8859-2/XLC_LOCALE: sq_AL.ISO8859-2
--iso8859-2/XLC_LOCALE: sr_SP.ISO8859-2
--iso8859-2/XLC_LOCALE: sr_YU.ISO8859-2
--iso8859-5/XLC_LOCALE: sr_YU.ISO8859-5
--microsoft-cp1251/XLC_LOCALE: sr_YU.CP1251
-+iso8859-2/XLC_LOCALE: sr_CS.ISO8859-2
-+iso8859-5/XLC_LOCALE: sr_CS.ISO8859-5
-+microsoft-cp1251/XLC_LOCALE: sr_CS.CP1251
- iso8859-1/XLC_LOCALE: ss_ZA.ISO8859-1
- iso8859-1/XLC_LOCALE: st_ZA.ISO8859-1
- iso8859-1/XLC_LOCALE: sv_FI.ISO8859-1
-@@ -215,45 +237,51 @@
- iso8859-1/XLC_LOCALE: sv_SE.ISO8859-1
- iso8859-15/XLC_LOCALE: sv_SE.ISO8859-15
- tscii-0/XLC_LOCALE: ta_IN.TSCII-0
--koi8-c/XLC_LOCALE: tg_TJ.KOI8-C
-+koi8-c/XLC_LOCALE: tg_TJ.KOI8-K
-+koi8-t/XLC_LOCALE: tg_TJ.KOI8-T
- th_TH/XLC_LOCALE: th_TH.TIS620
- iso8859-11/XLC_LOCALE: th_TH.ISO8859-11
- iso8859-1/XLC_LOCALE: tl_PH.ISO8859-1
--iso8859-15/XLC_LOCALE: tn_ZA.ISO8859-15
-+iso8859-10/XLC_LOCALE: tn_ZA.ISO8859-10
-+iso8859-9/XLC_LOCALE: tr_CY.ISO8859-9
- iso8859-9/XLC_LOCALE: tr_TR.ISO8859-9
- iso8859-1/XLC_LOCALE: ts_ZA.ISO8859-1
- tatar-cyr/XLC_LOCALE: tt_RU.TATAR-CYR
--koi8-c/XLC_LOCALE: tt_RU.KOI8-C
-+koi8-c/XLC_LOCALE: tt_RU.KOI8-K
- iso8859-5/XLC_LOCALE: uk_UA.ISO8859-5
- microsoft-cp1251/XLC_LOCALE: uk_UA.CP1251
- koi8-u/XLC_LOCALE: uk_UA.KOI8-U
- microsoft-cp1256/XLC_LOCALE: ur_PK.CP1256
-+iso8859-1/XLC_LOCALE: uz_UZ.ISO8859-1
- vi_VN.tcvn/XLC_LOCALE: vi_VN.TCVN
- vi_VN.viscii/XLC_LOCALE: vi_VN.VISCII
- iso8859-1/XLC_LOCALE: wa_BE.ISO8859-1
- iso8859-15/XLC_LOCALE: wa_BE.ISO8859-15
- iso8859-1/XLC_LOCALE: xh_ZA.ISO8859-1
-+iso8859-1/XLC_LOCALE: xh_ZA.ISO8859-1
- microsoft-cp1255/XLC_LOCALE: yi_US.CP1255
- zh_CN/XLC_LOCALE: zh_CN.eucCN
- zh_CN/XLC_LOCALE: zh_CN.gb2312
- zh_CN.gbk/XLC_LOCALE: zh_CN.gbk
- zh_CN.gb18030/XLC_LOCALE: zh_CN.gb18030
- zh_HK.big5/XLC_LOCALE: zh_HK.big5
--zh_HK.big5hkscs/XLC_LOCALE: zh_HK.big5-hkscs
--zh_HK.big5hkscs/XLC_LOCALE: zh_HK.Big5-HKSCS
- zh_HK.big5hkscs/XLC_LOCALE: zh_HK.big5hkscs
--zh_HK.big5hkscs/XLC_LOCALE: zh_HK.Big5HKSCS
- zh_TW.big5/XLC_LOCALE: zh_TW.big5
- zh_TW/XLC_LOCALE: zh_TW.eucTW
- iso8859-1/XLC_LOCALE: zu_ZA.ISO8859-1
- XCOMM Note: The UTF-8 locales don't work correctly yet. Work in progress.
-+en_US.UTF-8/XLC_LOCALE: aa_DJ.UTF-8
-+en_US.UTF-8/XLC_LOCALE: aa_ER.UTF-8
-+en_US.UTF-8/XLC_LOCALE: aa_ET.UTF-8
- en_US.UTF-8/XLC_LOCALE: af_ZA.UTF-8
- en_US.UTF-8/XLC_LOCALE: am_ET.UTF-8
-+en_US.UTF-8/XLC_LOCALE: an_ES.UTF-8
- en_US.UTF-8/XLC_LOCALE: ar_AA.UTF-8
- en_US.UTF-8/XLC_LOCALE: ar_AE.UTF-8
- en_US.UTF-8/XLC_LOCALE: ar_BH.UTF-8
- en_US.UTF-8/XLC_LOCALE: ar_DZ.UTF-8
- en_US.UTF-8/XLC_LOCALE: ar_EG.UTF-8
-+en_US.UTF-8/XLC_LOCALE: ar_IN.UTF-8
- en_US.UTF-8/XLC_LOCALE: ar_IQ.UTF-8
- en_US.UTF-8/XLC_LOCALE: ar_JO.UTF-8
- en_US.UTF-8/XLC_LOCALE: ar_KW.UTF-8
-@@ -266,19 +294,23 @@
- en_US.UTF-8/XLC_LOCALE: ar_SA.UTF-8
- en_US.UTF-8/XLC_LOCALE: ar_SD.UTF-8
- en_US.UTF-8/XLC_LOCALE: ar_SY.UTF-8
-+en_US.UTF-8/XLC_LOCALE: ar_SD.UTF-8
-+en_US.UTF-8/XLC_LOCALE: ar_SY.UTF-8
- en_US.UTF-8/XLC_LOCALE: ar_TN.UTF-8
- en_US.UTF-8/XLC_LOCALE: ar_YE.UTF-8
- en_US.UTF-8/XLC_LOCALE: az_AZ.UTF-8
--en_US.UTF-8/XLC_LOCALE: a3_AZ.UTF-8
- en_US.UTF-8/XLC_LOCALE: be_BY.UTF-8
- en_US.UTF-8/XLC_LOCALE: bg_BG.UTF-8
- en_US.UTF-8/XLC_LOCALE: bn_BD.UTF-8
- en_US.UTF-8/XLC_LOCALE: bn_IN.UTF-8
-+en_US.UTF-8/XLC_LOCALE: bn_IN.UTF-8
- en_US.UTF-8/XLC_LOCALE: br_FR.UTF-8
-+en_US.UTF-8/XLC_LOCALE: bs_BA.UTF-8
-+en_US.UTF-8/XLC_LOCALE: byn_ER.UTF-8
- en_US.UTF-8/XLC_LOCALE: ca_ES.UTF-8
- en_US.UTF-8/XLC_LOCALE: cs_CZ.UTF-8
-+en_US.UTF-8/XLC_LOCALE: csb_PL.UTF-8
- en_US.UTF-8/XLC_LOCALE: cy_GB.UTF-8
--en_US.UTF-8/XLC_LOCALE: cs_CZ.UTF-8
- en_US.UTF-8/XLC_LOCALE: da_DK.UTF-8
- en_US.UTF-8/XLC_LOCALE: de_AT.UTF-8
- en_US.UTF-8/XLC_LOCALE: de_BE.UTF-8
-@@ -286,19 +318,26 @@
- en_US.UTF-8/XLC_LOCALE: de_DE.UTF-8
- en_US.UTF-8/XLC_LOCALE: de_LI.UTF-8
- en_US.UTF-8/XLC_LOCALE: de_LU.UTF-8
-+en_US.UTF-8/XLC_LOCALE: el_CY.UTF-8
- en_US.UTF-8/XLC_LOCALE: el_GR.UTF-8
- en_US.UTF-8/XLC_LOCALE: en_AU.UTF-8
- en_US.UTF-8/XLC_LOCALE: en_BE.UTF-8
-+en_US.UTF-8/XLC_LOCALE: en_BW.UTF-8
- en_US.UTF-8/XLC_LOCALE: en_BZ.UTF-8
- en_US.UTF-8/XLC_LOCALE: en_CA.UTF-8
-+en_US.UTF-8/XLC_LOCALE: en_DK.UTF-8
- en_US.UTF-8/XLC_LOCALE: en_GB.UTF-8
-+en_US.UTF-8/XLC_LOCALE: en_HK.UTF-8
- en_US.UTF-8/XLC_LOCALE: en_IE.UTF-8
-+en_US.UTF-8/XLC_LOCALE: en_IN.UTF-8
- en_US.UTF-8/XLC_LOCALE: en_JM.UTF-8
- en_US.UTF-8/XLC_LOCALE: en_NZ.UTF-8
-+en_US.UTF-8/XLC_LOCALE: en_PH.UTF-8
-+en_US.UTF-8/XLC_LOCALE: en_SG.UTF-8
- en_US.UTF-8/XLC_LOCALE: en_TT.UTF-8
--en_US.UTF-8/XLC_LOCALE: en_UK.UTF-8
- en_US.UTF-8/XLC_LOCALE: en_US.UTF-8
- en_US.UTF-8/XLC_LOCALE: en_ZA.UTF-8
-+en_US.UTF-8/XLC_LOCALE: en_ZW.UTF-8
- en_US.UTF-8/XLC_LOCALE: eo_EO.UTF-8
- en_US.UTF-8/XLC_LOCALE: eo_XX.UTF-8
- en_US.UTF-8/XLC_LOCALE: es_AR.UTF-8
-@@ -318,12 +357,14 @@
- en_US.UTF-8/XLC_LOCALE: es_PR.UTF-8
- en_US.UTF-8/XLC_LOCALE: es_PY.UTF-8
- en_US.UTF-8/XLC_LOCALE: es_SV.UTF-8
-+en_US.UTF-8/XLC_LOCALE: es_US.UTF-8
- en_US.UTF-8/XLC_LOCALE: es_UY.UTF-8
- en_US.UTF-8/XLC_LOCALE: es_VE.UTF-8
- en_US.UTF-8/XLC_LOCALE: et_EE.UTF-8
- en_US.UTF-8/XLC_LOCALE: eu_ES.UTF-8
- en_US.UTF-8/XLC_LOCALE: fa_IR.UTF-8
- en_US.UTF-8/XLC_LOCALE: fi_FI.UTF-8
-+en_US.UTF-8/XLC_LOCALE: fil_PH.UTF-8
- en_US.UTF-8/XLC_LOCALE: fo_FO.UTF-8
- en_US.UTF-8/XLC_LOCALE: fr_BE.UTF-8
- en_US.UTF-8/XLC_LOCALE: fr_CA.UTF-8
-@@ -332,12 +373,15 @@
- en_US.UTF-8/XLC_LOCALE: fr_LU.UTF-8
- en_US.UTF-8/XLC_LOCALE: ga_IE.UTF-8
- en_US.UTF-8/XLC_LOCALE: gd_GB.UTF-8
-+en_US.UTF-8/XLC_LOCALE: gez_ER.UTF-8
- en_US.UTF-8/XLC_LOCALE: gl_ES.UTF-8
- en_US.UTF-8/XLC_LOCALE: gu_IN.UTF-8
-+en_US.UTF-8/XLC_LOCALE: gu_IN.UTF-8
- en_US.UTF-8/XLC_LOCALE: gv_GB.UTF-8
- en_US.UTF-8/XLC_LOCALE: he_IL.UTF-8
- en_US.UTF-8/XLC_LOCALE: hi_IN.UTF-8
- en_US.UTF-8/XLC_LOCALE: hr_HR.UTF-8
-+en_US.UTF-8/XLC_LOCALE: hsb_DE.UTF-8
- en_US.UTF-8/XLC_LOCALE: hu_HU.UTF-8
- en_US.UTF-8/XLC_LOCALE: hy_AM.UTF-8
- en_US.UTF-8/XLC_LOCALE: id_ID.UTF-8
-@@ -347,32 +391,43 @@
- en_US.UTF-8/XLC_LOCALE: iu_CA.UTF-8
- ja_JP.UTF-8/XLC_LOCALE: ja_JP.UTF-8
- en_US.UTF-8/XLC_LOCALE: ka_GE.UTF-8
-+en_US.UTF-8/XLC_LOCALE: kk_KZ.UTF-8
- en_US.UTF-8/XLC_LOCALE: kl_GL.UTF-8
-+en_US.UTF-8/XLC_LOCALE: kn_IN.UTF-8
- ko_KR.UTF-8/XLC_LOCALE: ko_KR.UTF-8
-+en_US.UTF-8/XLC_LOCALE: ku_TR.UTF-8
- en_US.UTF-8/XLC_LOCALE: kw_GB.UTF-8
- en_US.UTF-8/XLC_LOCALE: ky_KG.UTF-8
-+en_US.UTF-8/XLC_LOCALE: lg_UG.UTF-8
-+en_US.UTF-8/XLC_LOCALE: li_BE.UTF-8
-+en_US.UTF-8/XLC_LOCALE: li_NL.UTF-8
-+en_US.UTF-8/XLC_LOCALE: ky_KG.UTF-8
- en_US.UTF-8/XLC_LOCALE: lo_LA.UTF-8
- en_US.UTF-8/XLC_LOCALE: lt_LT.UTF-8
- en_US.UTF-8/XLC_LOCALE: lv_LV.UTF-8
- en_US.UTF-8/XLC_LOCALE: mi_NZ.UTF-8
- en_US.UTF-8/XLC_LOCALE: mk_MK.UTF-8
- en_US.UTF-8/XLC_LOCALE: mr_IN.UTF-8
-+en_US.UTF-8/XLC_LOCALE: ml_IN.UTF-8
-+en_US.UTF-8/XLC_LOCALE: mn_MN.UTF-8
- en_US.UTF-8/XLC_LOCALE: ms_MY.UTF-8
-+en_US.UTF-8/XLC_LOCALE: mt_MT.UTF-8
-+en_US.UTF-8/XLC_LOCALE: nb_NO.UTF-8
-+en_US.UTF-8/XLC_LOCALE: nds_DE.UTF-8
- en_US.UTF-8/XLC_LOCALE: nl_BE.UTF-8
- en_US.UTF-8/XLC_LOCALE: nl_NL.UTF-8
--en_US.UTF-8/XLC_LOCALE: nb_NO.UTF-8
- en_US.UTF-8/XLC_LOCALE: nn_NO.UTF-8
--en_US.UTF-8/XLC_LOCALE: no_NO.UTF-8
- en_US.UTF-8/XLC_LOCALE: nr_ZA.UTF-8
- en_US.UTF-8/XLC_LOCALE: nso_ZA.UTF-8
--en_US.UTF-8/XLC_LOCALE: ny_NO.UTF-8
- en_US.UTF-8/XLC_LOCALE: oc_FR.UTF-8
-+en_US.UTF-8/XLC_LOCALE: om_ET.UTF-8
-+en_US.UTF-8/XLC_LOCALE: om_KE.UTF-8
-+en_US.UTF-8/XLC_LOCALE: or_IN.UTF-8
- en_US.UTF-8/XLC_LOCALE: pa_IN.UTF-8
-+en_US.UTF-8/XLC_LOCALE: pap_AN.UTF-8
- en_US.UTF-8/XLC_LOCALE: pd_DE.UTF-8
- en_US.UTF-8/XLC_LOCALE: pd_US.UTF-8
--en_US.UTF-8/XLC_LOCALE: ph_PH.UTF-8
- en_US.UTF-8/XLC_LOCALE: pl_PL.UTF-8
--en_US.UTF-8/XLC_LOCALE: pp_AN.UTF-8
- pt_BR.UTF-8/XLC_LOCALE: pt_BR.UTF-8
- en_US.UTF-8/XLC_LOCALE: pt_PT.UTF-8
- en_US.UTF-8/XLC_LOCALE: ro_RO.UTF-8
-@@ -380,23 +435,31 @@
- en_US.UTF-8/XLC_LOCALE: ru_UA.UTF-8
- en_US.UTF-8/XLC_LOCALE: rw_RW.UTF-8
- en_US.UTF-8/XLC_LOCALE: se_NO.UTF-8
--en_US.UTF-8/XLC_LOCALE: sh_YU.UTF-8
- en_US.UTF-8/XLC_LOCALE: si_LK.UTF-8
-+en_US.UTF-8/XLC_LOCALE: sid_ET.UTF-8
- en_US.UTF-8/XLC_LOCALE: sk_SK.UTF-8
- en_US.UTF-8/XLC_LOCALE: sl_SI.UTF-8
-+en_US.UTF-8/XLC_LOCALE: so_DJ.UTF-8
-+en_US.UTF-8/XLC_LOCALE: so_ET.UTF-8
-+en_US.UTF-8/XLC_LOCALE: so_KE.UTF-8
-+en_US.UTF-8/XLC_LOCALE: so_SO.UTF-8
- en_US.UTF-8/XLC_LOCALE: sq_AL.UTF-8
--en_US.UTF-8/XLC_LOCALE: sr_YU.UTF-8
-+en_US.UTF-8/XLC_LOCALE: sr_CS.UTF-8
- en_US.UTF-8/XLC_LOCALE: ss_ZA.UTF-8
- en_US.UTF-8/XLC_LOCALE: st_ZA.UTF-8
- en_US.UTF-8/XLC_LOCALE: sv_FI.UTF-8
- en_US.UTF-8/XLC_LOCALE: sv_SE.UTF-8
- en_US.UTF-8/XLC_LOCALE: ta_IN.UTF-8
-+en_US.UTF-8/XLC_LOCALE: te_IN.UTF-8
- en_US.UTF-8/XLC_LOCALE: tg_TJ.UTF-8
- th_TH.UTF-8/XLC_LOCALE: th_TH.UTF-8
- en_US.UTF-8/XLC_LOCALE: ti_ER.UTF-8
- en_US.UTF-8/XLC_LOCALE: ti_ET.UTF-8
-+en_US.UTF-8/XLC_LOCALE: tig_ER.UTF-8
-+en_US.UTF-8/XLC_LOCALE: tk_TM.UTF-8
- en_US.UTF-8/XLC_LOCALE: tl_PH.UTF-8
- en_US.UTF-8/XLC_LOCALE: tn_ZA.UTF-8
-+en_US.UTF-8/XLC_LOCALE: tr_CY.UTF-8
- en_US.UTF-8/XLC_LOCALE: tr_TR.UTF-8
- en_US.UTF-8/XLC_LOCALE: ts_ZA.UTF-8
- en_US.UTF-8/XLC_LOCALE: tt_RU.UTF-8
-@@ -404,13 +467,16 @@
- en_US.UTF-8/XLC_LOCALE: ur_PK.UTF-8
- en_US.UTF-8/XLC_LOCALE: uz_UZ.UTF-8
- en_US.UTF-8/XLC_LOCALE: ve_ZA.UTF-8
-+en_US.UTF-8/XLC_LOCALE: ve_ZA.UTF-8
- en_US.UTF-8/XLC_LOCALE: vi_VN.UTF-8
- en_US.UTF-8/XLC_LOCALE: wa_BE.UTF-8
- en_US.UTF-8/XLC_LOCALE: xh_ZA.UTF-8
-+en_US.UTF-8/XLC_LOCALE: xh_ZA.UTF-8
- en_US.UTF-8/XLC_LOCALE: yi_US.UTF-8
- zh_CN.UTF-8/XLC_LOCALE: zh_CN.UTF-8
- zh_HK.UTF-8/XLC_LOCALE: zh_HK.UTF-8
- zh_CN.UTF-8/XLC_LOCALE: zh_SG.UTF-8
-+en_US.UTF-8/XLC_LOCALE: zu_ZA.UTF-8
- zh_TW.UTF-8/XLC_LOCALE: zh_TW.UTF-8
- en_US.UTF-8/XLC_LOCALE: zu_ZA.UTF-8
- #ifdef __uxp__
---- X11-6.9.0/xc/nls/locale.alias.orig 2005-09-30 09:52:46.000000000 +0200
-+++ X11-6.9.0/xc/nls/locale.alias 2006-03-21 12:27:00.779062000 +0100
-@@ -1,3 +1,4 @@
-+# $XdotOrg: xc/nls/locale.alias,v 1.2 2004/04/23 18:44:33 eich Exp $
- XCOMM $XdotOrg: xc/nls/locale.alias,v 1.12 2005/09/30 07:52:46 daniels Exp $
- XCOMM $Xorg: locale.alias,v 1.3 2000/08/17 19:46:48 cpqbld Exp $
- XCOMM
-@@ -17,17 +18,38 @@
- Cextend: en_US.ISO8859-1
- Cextend.en: en_US.ISO8859-1
- English_United-States.437: C
-+aa_DJ: aa_DJ.ISO8859-1
-+aa_DJ.iso88591: aa_DJ.ISO8859-1
-+aa_DJ.ISO-8859-1: aa_DJ.ISO8859-1
-+aa_DJ.ISO_8859-1: aa_DJ.ISO8859-1
-+aa_DJ.utf8: aa_DJ.UTF-8
-+aa_ER: aa_ER.UTF-8
-+aa_ER.utf8: aa_ER.UTF-8
-+aa_ER@saaho: aa_ER.UTF-8
-+aa_ER.utf8@saaho: aa_ER.UTF-8
-+aa_ET: aa_ET.UTF-8
-+aa_ET.utf8: aa_ET.UTF-8
- XCOMM a3 is not an ISO 639 language code, but in Cyrillic, "Z" looks like "3".
--a3: a3_AZ.KOI8-C
--a3_AZ: a3_AZ.KOI8-C
--a3_AZ.koi8c: a3_AZ.KOI8-C
-+a3: a3_AZ.KOI8-K
-+a3_AZ: a3_AZ.KOI8-K
-+a3_AZ.koi8c: a3_AZ.KOI8-K
- af: af_ZA.ISO8859-1
- af_ZA: af_ZA.ISO8859-1
- af_ZA.iso88591: af_ZA.ISO8859-1
- af_ZA.ISO-8859-1: af_ZA.ISO8859-1
- af_ZA.utf8: af_ZA.UTF-8
-+af_ZA.ISO-8859-1: af_ZA.ISO8859-1
-+af_ZA.ISO_8859-1: af_ZA.ISO8859-1
-+af_ZA.utf8: af_ZA.UTF-8
- am: am_ET.UTF-8
- am_ET: am_ET.UTF-8
-+am_ET.utf8: am_ET.UTF-8
-+an_ES: an_ES.ISO8859-15
-+an_ES.iso885915: an_ES.ISO8859-15
-+an_ES.ISO-8859-15: an_ES.ISO8859-15
-+an_ES.ISO_8859-15: an_ES.ISO8859-15
-+an_ES.utf8: an_ES.UTF-8
-+am_ET: am_ET.UTF-8
- ar: ar_AA.ISO8859-6
- ar_AA: ar_AA.ISO8859-6
- AR_AA: ar_AA.ISO8859-6
-@@ -38,75 +60,98 @@
- ar_AE: ar_AE.ISO8859-6
- ar_AE.iso88596: ar_AE.ISO8859-6
- ar_AE.ISO-8859-6: ar_AE.ISO8859-6
-+ar_AE.ISO_8859-6: ar_AE.ISO8859-6
- ar_AE.utf8: ar_AE.UTF-8
- ar_BH: ar_BH.ISO8859-6
- ar_BH.iso88596: ar_BH.ISO8859-6
- ar_BH.ISO-8859-6: ar_BH.ISO8859-6
-+ar_BH.ISO_8859-6: ar_BH.ISO8859-6
- ar_BH.utf8: ar_BH.UTF-8
- ar_DZ: ar_DZ.ISO8859-6
- ar_DZ.iso88596: ar_DZ.ISO8859-6
- ar_DZ.ISO-8859-6: ar_DZ.ISO8859-6
-+ar_DZ.ISO_8859-6: ar_DZ.ISO8859-6
- ar_DZ.utf8: ar_DZ.UTF-8
- ar_EG: ar_EG.ISO8859-6
- ar_EG.iso88596: ar_EG.ISO8859-6
- ar_EG.ISO-8859-6: ar_EG.ISO8859-6
-+ar_EG.ISO_8859-6: ar_EG.ISO8859-6
- ar_EG.utf8: ar_EG.UTF-8
-+ar_IN: ar_IN.UTF-8
-+ar_IN.utf8: ar_IN.UTF-8
- ar_IQ: ar_IQ.ISO8859-6
- ar_IQ.iso88596: ar_IQ.ISO8859-6
- ar_IQ.ISO-8859-6: ar_IQ.ISO8859-6
-+ar_IQ.ISO_8859-6: ar_IQ.ISO8859-6
- ar_IQ.utf8: ar_IQ.UTF-8
- ar_JO: ar_JO.ISO8859-6
- ar_JO.iso88596: ar_JO.ISO8859-6
- ar_JO.ISO-8859-6: ar_JO.ISO8859-6
-+ar_JO.ISO_8859-6: ar_JO.ISO8859-6
- ar_JO.utf8: ar_JO.UTF-8
- ar_KW: ar_KW.ISO8859-6
- ar_KW.iso88596: ar_KW.ISO8859-6
--ar_KW.iso88596: ar_KW.ISO8859-6
- ar_KW.ISO-8859-6: ar_KW.ISO8859-6
-+ar_KW.ISO_8859-6: ar_KW.ISO8859-6
- ar_KW.utf8: ar_KW.UTF-8
- ar_LB: ar_LB.ISO8859-6
- ar_LB.iso88596: ar_LB.ISO8859-6
- ar_LB.ISO-8859-6: ar_LB.ISO8859-6
-+ar_LB.ISO_8859-6: ar_LB.ISO8859-6
- ar_LB.utf8: ar_LB.UTF-8
- ar_LY: ar_LY.ISO8859-6
- ar_LY.iso88596: ar_LY.ISO8859-6
- ar_LY.ISO-8859-6: ar_LY.ISO8859-6
-+ar_LY.ISO_8859-6: ar_LY.ISO8859-6
- ar_LY.utf8: ar_LY.UTF-8
- ar_MA: ar_MA.ISO8859-6
- ar_MA.iso88596: ar_MA.ISO8859-6
- ar_MA.ISO-8859-6: ar_MA.ISO8859-6
-+ar_MA.ISO_8859-6: ar_MA.ISO8859-6
- ar_MA.utf8: ar_MA.UTF-8
- ar_OM: ar_OM.ISO8859-6
- ar_OM.iso88596: ar_OM.ISO8859-6
- ar_OM.ISO-8859-6: ar_OM.ISO8859-6
-+ar_OM.ISO_8859-6: ar_OM.ISO8859-6
- ar_OM.utf8: ar_OM.UTF-8
- ar_QA: ar_QA.ISO8859-6
- ar_QA.iso88596: ar_QA.ISO8859-6
- ar_QA.ISO-8859-6: ar_QA.ISO8859-6
-+ar_QA.ISO_8859-6: ar_QA.ISO8859-6
- ar_QA.utf8: ar_QA.UTF-8
- ar_SA: ar_SA.ISO8859-6
- ar_SA.iso88596: ar_SA.ISO8859-6
- ar_SA.ISO-8859-6: ar_SA.ISO8859-6
-+ar_SA.ISO_8859-6: ar_SA.ISO8859-6
- ar_SA.utf8: ar_SA.UTF-8
- ar_SD: ar_SD.ISO8859-6
- ar_SD.iso88596: ar_SD.ISO8859-6
- ar_SD.ISO-8859-6: ar_SD.ISO8859-6
-+ar_SD.ISO_8859-6: ar_SD.ISO8859-6
- ar_SD.utf8: ar_SD.UTF-8
- ar_SY: ar_SY.ISO8859-6
- ar_SY.iso88596: ar_SY.ISO8859-6
- ar_SY.ISO-8859-6: ar_SY.ISO8859-6
-+ar_SY.ISO_8859-6: ar_SY.ISO8859-6
- ar_SY.utf8: ar_SY.UTF-8
- ar_TN: ar_TN.ISO8859-6
- ar_TN.iso88596: ar_TN.ISO8859-6
- ar_TN.ISO-8859-6: ar_TN.ISO8859-6
-+ar_TN.ISO_8859-6: ar_TN.ISO8859-6
- ar_TN.utf8: ar_TN.UTF-8
- ar_YE: ar_YE.ISO8859-6
- ar_YE.iso88596: ar_YE.ISO8859-6
- ar_YE.ISO-8859-6: ar_YE.ISO8859-6
-+ar_YE.ISO_8859-6: ar_YE.ISO8859-6
- ar_YE.utf8: ar_YE.UTF-8
--az: az_AZ.ISO8859-9E
--az_AZ: az_AZ.ISO8859-9E
-+az: az_AZ.UTF-8
-+az_AZ: az_AZ.UTF-8
- az_AZ.iso88599e: az_AZ.ISO8859-9E
-+az_AZ.utf8: az_AZ.UTF-8
-+az_AZ.utf8@cyrillic: az_AZ.UTF-8
-+az_AZ.koi8k: az_AZ.KOI8-K
-+az_AZ@cyrillic: az_AZ.KOI8-K
-+az_AZ.koi8k@cyrillic: az_AZ.KOI8-K
- be: be_BY.CP1251
- be_BY: be_BY.CP1251
- be_BY.cp1251: be_BY.CP1251
-@@ -120,37 +165,49 @@
- bg_BG.microsoftcp1251: bg_BG.CP1251
- bg_BG.microsoft-cp1251: bg_BG.CP1251
- bg_BG.MICROSOFT-CP1251: bg_BG.CP1251
--bg_BG.iso88595: bg_BG.ISO8859-5
- bg_BG.ISO-8859-5: bg_BG.ISO8859-5
- bg_BG.koi8r: bg_BG.KOI8-R
- be_BG.utf8: be_BG.UTF-8
- bn_IN.utf8: bn_IN.UTF-8
- bn_IN.UTF-8: bn_IN.UTF-8
-+bn: bn_BD.UTF-8
-+bn_BD: bn_BD.UTF-8
-+bn_BD.utf8: bn_BD.UTF-8
-+bn_IN: bn_IN.UTF-8
-+bn_IN.utf8: bn_IN.UTF-8
- br: br_FR.ISO8859-1
- br_FR: br_FR.ISO8859-1
- br_FR.iso88591: br_FR.ISO8859-1
- br_FR.ISO-8859-1: br_FR.ISO8859-1
-+br_FR.ISO_8859-1: br_FR.ISO8859-1
- br_FR.iso885914: br_FR.ISO8859-14
- br_FR.ISO-8859-14: br_FR.ISO8859-14
- br_FR.iso885915: br_FR.ISO8859-15
-+br_FR.iso885915@euro: br_FR.ISO8859-15
- br_FR.ISO-8859-15: br_FR.ISO8859-15
- br_FR.ISO-8859-15@euro: br_FR.ISO8859-15
-+br_FR.ISO_8859-15@euro: br_FR.ISO8859-15
- br_FR@euro: br_FR.ISO8859-15
-+br_FR.utf8: br_FR.UTF-8
- br_FR.UTF-8@euro: br_FR.UTF-8
- bs: bs_BA.ISO8859-2
- bs_BA: bs_BA.ISO8859-2
- bs_BA.iso88592: bs_BA.ISO8859-2
- bs_BA.ISO-8859-2: bs_BA.ISO8859-2
- bs_BA.ISO_8859-2: bs_BA.ISO8859-2
-+bs_BA.utf8: bs_BA.UTF-8
- ca: ca_ES.ISO8859-1
- ca_ES: ca_ES.ISO8859-1
- ca_ES@euro: ca_ES.ISO8859-15
- ca_ES.iso88591: ca_ES.ISO8859-1
- ca_ES.ISO-8859-1: ca_ES.ISO8859-1
-+ca_ES.ISO_8859-1: ca_ES.ISO8859-1
- ca_ES.iso885915: ca_ES.ISO8859-15
--ca_ES.utf8: ca_ES.UTF-8
-+ca_ES.iso885915@euro: ca_ES.ISO8859-15
- ca_ES.ISO-8859-15: ca_ES.ISO8859-15
- ca_ES.ISO-8859-15@euro: ca_ES.ISO8859-15
-+ca_ES.ISO_8859-15@euro: ca_ES.ISO8859-15
-+ca_ES.utf8: ca_ES.UTF-8
- ca_ES.UTF-8@euro: ca_ES.UTF-8
- cs: cs_CZ.ISO8859-2
- cs_CS: cs_CZ.ISO8859-2
-@@ -160,25 +217,33 @@
- cs_CZ.ISO-8859-2: cs_CZ.ISO8859-2
- cs_CZ.ISO_8859-2: cs_CZ.ISO8859-2
- cs_CZ.utf8: cs_CZ.UTF-8
--XCOMM cz is an old name for Czech (now cs), and should be deleted in the future.
--cz: cs_CZ.ISO8859-2
--cz_CZ: cs_CZ.ISO8859-2
--cz_CZ.utf8: cs_CZ.UTF-8
--cz_CZ.UTF-8: cs_CZ.UTF-8
--cy: cy_GB.ISO8859-1
--cy_GB: cy_GB.ISO8859-1
-+csb: csb_PL.UTF-8
-+csb_PL: csb_PL.UTF-8
-+csb_PL.utf8: csb_PL.UTF-8
-+cy: cy_GB.ISO8859-14
-+cy_GB: cy_GB.ISO8859-14
- cy_GB.iso88591: cy_GB.ISO8859-1
- cy_GB.ISO-8859-1: cy_GB.ISO8859-1
-+cy_GB.ISO_8859-1: cy_GB.ISO8859-1
- cy_GB.iso885914: cy_GB.ISO8859-14
- cy_GB.ISO-8859-14: cy_GB.ISO8859-14
-+cy_GB.ISO_8859-14: cy_GB.ISO8859-14
- cy_GB.iso885915: cy_GB.ISO8859-15
- cy_GB.ISO-8859-15: cy_GB.ISO8859-15
-+cy_GB.ISO_8859-15: cy_GB.ISO8859-15
-+cy_GB.utf8: cy_GB.UTF-8
-+XCOMM cz is an old name for Czech (now cs), and should be deleted in the future.
-+cz: cs_CZ.ISO8859-2
-+cz_CZ: cs_CZ.ISO8859-2
-+cz_CZ.utf8: cs_CZ.UTF-8
-+cz_CZ.UTF-8: cs_CZ.UTF-8
- da: da_DK.ISO8859-1
- da_DK: da_DK.ISO8859-1
- DA_DK: da_DK.ISO8859-1
- da_DK.88591: da_DK.ISO8859-1
- da_DK.88591.en: da_DK.ISO8859-1
- da_DK.iso88591: da_DK.ISO8859-1
-+da_DK.utf8: da_DK.UTF-8
- da_DK.ISO-8859-1: da_DK.ISO8859-1
- da_DK.ISO_8859-1: da_DK.ISO8859-1
- da_DK.iso885915: da_DK.ISO8859-15
-@@ -194,11 +259,17 @@
- de_AT.ISO_8859-1: de_AT.ISO8859-1
- de_AT.iso885915: de_AT.ISO8859-15
- de_AT.ISO-8859-15: de_AT.ISO8859-15
-+de_AT.iso885915@euro: de_AT.ISO8859-15
- de_AT.ISO-8859-15@euro: de_AT.ISO8859-15
-+de_AT.ISO_8859-15@euro: de_AT.ISO8859-15
- de_AT.UTF-8@euro: de_AT.UTF-8
- de_AT.utf8: de_AT.UTF-8
- de_BE: de_BE.ISO8859-1
-+de_BE.iso885915@euro: de_BE.ISO8859-15
-+de_BE.ISO_8859-15@euro: de_BE.ISO8859-15
-+de_BE.ISO-8859-15@euro: de_BE.ISO8859-15
- de_BE@euro: de_BE.ISO8859-15
-+de_BE.utf8: de_BE.UTF-8
- de_BE.iso88591: de_BE.ISO8859-1
- de_BE.ISO_8859-1: de_BE.ISO8859-1
- de_BE.ISO-8859-1: de_BE.ISO8859-1
-@@ -215,6 +286,7 @@
- de_CH.ISO_8859-15: de_CH.ISO8859-15
- de_CH.ISO-8859-15: de_CH.ISO8859-15
- de_CH.utf8: de_CH.UTF-8
-+de_CH.utf8: de_CH.UTF-8
- de_DE: de_DE.ISO8859-1
- de_DE@euro: de_DE.ISO8859-15
- de_DE.88591: de_DE.ISO8859-1
-@@ -227,7 +299,9 @@
- de_DE.ISO_8859-15: de_DE.ISO8859-15
- de_DE.8859-15: de_DE.ISO8859-15
- de_DE.8859-15@euro: de_DE.ISO8859-15
-+de_DE.iso885915@euro: de_DE.ISO8859-15
- de_DE.ISO-8859-15@euro: de_DE.ISO8859-15
-+de_DE.ISO_8859-15@euro: de_DE.ISO8859-15
- de_DE.UTF-8@euro: de_DE.UTF-8
- de_DE.utf8: de_DE.UTF-8
- de_LU: de_LU.ISO8859-1
-@@ -235,6 +309,9 @@
- de_LU.iso88591: de_LU.ISO8859-1
- de_LU.ISO_8859-1: de_LU.ISO8859-1
- de_LU.ISO-8859-1: de_LU.ISO8859-1
-+de_LU.iso885915@euro: de_LU.ISO8859-15
-+de_LU.ISO_8859-15@euro: de_LU.ISO8859-15
-+de_LU.ISO-8859-15@euro: de_LU.ISO8859-15
- de_LU.iso885915: de_LU.ISO8859-15
- de_LU.ISO_8859-15: de_LU.ISO8859-15
- de_LU.ISO-8859-15: de_LU.ISO8859-15
-@@ -243,14 +320,22 @@
- de_LU.utf8: de_LU.UTF-8
- GER_DE.8859: de_DE.ISO8859-1
- GER_DE.8859.in: de_DE.ISO8859-1
--ee: ee_EE.ISO8859-4
--ee_EE: ee_EE.ISO8859-4
--ee_EE.iso88594: ee_EE.ISO8859-4
-+XCOMM ee* are bogus
-+ee: et_EE.ISO8859-4
-+ee_EE: et_EE.ISO8859-4
-+ee_EE.iso88594: et_EE.ISO8859-4
- el: el_GR.ISO8859-7
-+el_CY: el_CY.ISO8859-7
-+el_CY.iso88597: el_CY.ISO8859-7
-+el_CY.ISO-8859-7: el_CY.ISO8859-7
-+el_CY.ISO_8859-7: el_CY.ISO8859-7
-+el_CY.utf8: el_CY.UTF-8
- el_GR: el_GR.ISO8859-7
- el_GR.iso88597: el_GR.ISO8859-7
- el_GR.ISO-8859-7: el_GR.ISO8859-7
--el_GR@euro: el_GR.ISO8859-15
-+el_GR.ISO_8859-7: el_GR.ISO8859-7
-+el_GR@euro: el_GR.UTF-8
-+el_GR.utf8: el_GR.UTF-8
- el_GR.utf8: el_GR.UTF-8
- en: en_US.ISO8859-1
- en.ISO-8859-1: en_US.ISO8859-1
-@@ -265,11 +350,20 @@
- en_BW: en_BW.ISO8859-1
- en_BW.iso88591: en_BW.ISO8859-1
- en_BW.ISO-8859-1: en_BW.ISO8859-1
-+en_BW.ISO_8859-1: en_BW.ISO8859-1
-+en_BW.utf8: en_BW.UTF-8
-+en_BW.iso88591: en_BW.ISO8859-1
-+en_BW.ISO-8859-1: en_BW.ISO8859-1
- en_CA: en_CA.ISO8859-1
- en_CA.iso88591: en_CA.ISO8859-1
- en_CA.ISO-8859-1: en_CA.ISO8859-1
- en_CA.ISO_8859-1: en_CA.ISO8859-1
- en_CA.utf8: en_CA.UTF-8
-+en_DK: en_DK.ISO8859-1
-+en_DK.iso88591: en_DK.ISO8859-1
-+en_DK.ISO-8859-1: en_DK.ISO8859-1
-+en_DK.ISO_8859-1: en_DK.ISO8859-1
-+en_DK.utf8: en_DK.UTF-8
- en_GB: en_GB.ISO8859-1
- en_GB.88591: en_GB.ISO8859-1
- en_GB.88591.en: en_GB.ISO8859-1
-@@ -280,31 +374,45 @@
- en_GB.ISO-8859-15: en_GB.ISO8859-15
- en_GB.utf8: en_GB.UTF-8
- en_UK: en_GB.ISO8859-1
-+en_UK.ISO8859-1: en_GB.ISO8859-1
-+en_UK.UTF-8: en_GB.UTF-8
- ENG_GB.8859: en_GB.ISO8859-1
- ENG_GB.8859.in: en_GB.ISO8859-1
- en_HK: en_HK.ISO8859-1
- en_HK.iso88591: en_HK.ISO8859-1
- en_HK.ISO-8859-1: en_HK.ISO8859-1
-+en_HK.ISO_8859-1: en_HK.ISO8859-1
-+en_HK.utf8: en_HK.UTF-8
- en_IE: en_IE.ISO8859-1
- en_IE.iso88591: en_IE.ISO8859-1
- en_IE.ISO-8859-1: en_IE.ISO8859-1
-+en_IE.ISO_8859-1: en_IE.ISO8859-1
- en_IE.iso885915: en_IE.ISO8859-15
- en_IE.ISO-8859-15: en_IE.ISO8859-15
-+en_IE.ISO_8859-15: en_IE.ISO8859-15
-+en_IE.iso885915@euro: en_IE.ISO8859-15
- en_IE.ISO-8859-15@euro: en_IE.ISO8859-15
-+en_IE.ISO_8859-15@euro: en_IE.ISO8859-15
- en_IE@euro: en_IE.ISO8859-15
- en_IE.UTF-8@euro: en_IE.UTF-8
- en_IE.utf8: en_IE.UTF-8
- en_IN: en_IN.ISO8859-1
-+en_IN.utf8: en_IN.UTF-8
- en_NZ: en_NZ.ISO8859-1
- en_NZ.iso88591: en_NZ.ISO8859-1
- en_NZ.ISO-8859-1: en_NZ.ISO8859-1
-+en_NZ.ISO_8859-1: en_NZ.ISO8859-1
- en_NZ.utf8: en_NZ.UTF-8
- en_PH: en_PH.ISO8859-1
- en_PH.iso88591: en_PH.ISO8859-1
- en_PH.ISO-8859-1: en_PH.ISO8859-1
-+en_PH.ISO_8859-1: en_PH.ISO8859-1
-+en_PH.utf8: en_PH.UTF-8
- en_SG: en_SG.ISO8859-1
- en_SG.iso88591: en_SG.ISO8859-1
- en_SG.ISO-8859-1: en_SG.ISO8859-1
-+en_SG.ISO_8859-1: en_SG.ISO8859-1
-+en_SG.utf8: en_SG.UTF-8
- en_US: en_US.ISO8859-1
- EN_US: en_US.ISO8859-1
- en_US.88591: en_US.ISO8859-1
-@@ -318,15 +426,6 @@
- en_US.ISO8859-15@euro: en_US.ISO8859-15
- en_US.utf8: en_US.UTF-8
- EN_US.UTF-8: en_US.UTF-8
--en_US.88591.en: en_US.ISO8859-1
--en_US.iso88591: en_US.ISO8859-1
--en_US.ISO-8859-1: en_US.ISO8859-1
--en_US.ISO_8859-1: en_US.ISO8859-1
--en_US.iso885915: en_US.ISO8859-15
--en_US.8859-15: en_US.ISO8859-15
--en_US.ISO8859-15@euro: en_US.ISO8859-15
--en_US.utf8: en_US.UTF-8
--EN_US.UTF-8: en_US.UTF-8
- en_ZA: en_ZA.ISO8859-1
- en_ZA.88591: en_ZA.ISO8859-1
- en_ZA.88591.en: en_ZA.ISO8859-1
-@@ -339,32 +438,52 @@
- en_ZW: en_ZW.ISO8859-1
- en_ZW.iso88591: en_ZW.ISO8859-1
- en_ZW.ISO-8859-1: en_ZW.ISO8859-1
-+en_ZW.ISO-8859-1: en_ZW.ISO8859-1
-+en_ZW.ISO_8859-1: en_ZW.ISO8859-1
-+en_ZW.iso88591: en_ZW.ISO8859-1
-+en_ZW.utf8: en_ZW.UTF-8
- eo: eo_XX.ISO8859-3
--eo_EO: eo_EO.ISO8859-3
--eo_EO.ISO8859-3: eo_EO.ISO8859-3
-+eo_EO: eo_XX.ISO8859-3
-+eo_EO.ISO8859-3: eo_XX.ISO8859-3
- eo_XX: eo_XX.ISO8859-3
--eo_XX.ISO8859-3: eo_XX.ISO8859-3
-+eo_XX.iso88593: eo_XX.ISO8859-3
-+eo_XX.ISO-8859-3: eo_XX.ISO8859-3
-+eo_XX.ISO_8859-3: eo_XX.ISO8859-3
- es: es_ES.ISO8859-1
- es_AR: es_AR.ISO8859-1
- es_AR.iso88591: es_AR.ISO8859-1
- es_AR.ISO-8859-1: es_AR.ISO8859-1
-+es_AR.ISO_8859-1: es_AR.ISO8859-1
-+es_AR.ISO-8859-1: es_AR.ISO8859-1
- es_AR.utf8: es_AR.UTF-8
- es_BO: es_BO.ISO8859-1
-+es_BO.ISO-8859-1: es_BO.ISO8859-1
-+es_BO.ISO_8859-1: es_BO.ISO8859-1
- es_BO.iso88591: es_BO.ISO8859-1
- es_BO.ISO-8859-1: es_BO.ISO8859-1
- es_BO.utf8: es_BO.UTF-8
-+es_CL.ISO-8859-1: es_CL.ISO8859-1
-+es_CL.ISO_8859-1: es_CL.ISO8859-1
- es_CL: es_CL.ISO8859-1
- es_CL.iso88591: es_CL.ISO8859-1
- es_CL.ISO-8859-1: es_CL.ISO8859-1
-+es_CO.ISO-8859-1: es_CO.ISO8859-1
-+es_CO.ISO_8859-1: es_CO.ISO8859-1
- es_CL.utf8: es_CL.UTF-8
- es_CO: es_CO.ISO8859-1
- es_CO.iso88591: es_CO.ISO8859-1
-+es_CR.ISO-8859-1: es_CR.ISO8859-1
-+es_CR.ISO_8859-1: es_CR.ISO8859-1
- es_CO.ISO-8859-1: es_CO.ISO8859-1
- es_CO.utf8: es_CO.UTF-8
- es_CR: es_CR.ISO8859-1
-+es_DO.ISO-8859-1: es_DO.ISO8859-1
-+es_DO.ISO_8859-1: es_DO.ISO8859-1
- es_CR.iso88591: es_CR.ISO8859-1
- es_CR.ISO-8859-1: es_CR.ISO8859-1
- es_CR.utf8: es_CR.UTF-8
-+es_EC.ISO-8859-1: es_EC.ISO8859-1
-+es_EC.ISO_8859-1: es_EC.ISO8859-1
- es_DO: es_DO.ISO8859-1
- es_DO.iso88591: es_DO.ISO8859-1
- es_DO.ISO-8859-1: es_DO.ISO8859-1
-@@ -373,19 +492,30 @@
- es_EC.iso88591: es_EC.ISO8859-1
- es_EC.ISO-8859-1: es_EC.ISO8859-1
- es_EC.utf8: es_EC.UTF-8
-+es_ES.iso885915@euro: es_ES.ISO8859-15
-+es_ES.ISO-88591-5@euro: es_ES.ISO8859-15
-+es_ES.ISO_88591-5@euro: es_ES.ISO8859-15
- es_ES: es_ES.ISO8859-1
- es_ES.88591: es_ES.ISO8859-1
- es_ES.88591.en: es_ES.ISO8859-1
- es_ES.iso88591: es_ES.ISO8859-1
-+es_GT.ISO-8859-1: es_GT.ISO8859-1
-+es_GT.ISO_8859-1: es_GT.ISO8859-1
- es_ES.ISO-8859-1: es_ES.ISO8859-1
- es_ES.ISO_8859-1: es_ES.ISO8859-1
- es_ES.iso885915: es_ES.ISO8859-15
-+es_HN.ISO-8859-1: es_HN.ISO8859-1
-+es_HN.ISO_8859-1: es_HN.ISO8859-1
- es_ES.ISO-8859-15: es_ES.ISO8859-15
- es_ES.ISO-8859-15@euro: es_ES.ISO8859-15
- es_ES@euro: es_ES.ISO8859-15
-+es_MX.ISO-8859-1: es_MX.ISO8859-1
-+es_MX.ISO_8859-1: es_MX.ISO8859-1
- es_ES.UTF-8@euro: es_ES.UTF-8
- es_ES.utf8: es_ES.UTF-8
- es_GT: es_GT.ISO8859-1
-+es_NI.ISO-8859-1: es_NI.ISO8859-1
-+es_NI.ISO_8859-1: es_NI.ISO8859-1
- es_GT.iso88591: es_GT.ISO8859-1
- es_GT.ISO-8859-1: es_GT.ISO8859-1
- es_GT.utf8: es_GT.UTF-8
-@@ -404,39 +534,53 @@
- es_PA: es_PA.ISO8859-1
- es_PA.iso88591: es_PA.ISO8859-1
- es_PA.ISO-8859-1: es_PA.ISO8859-1
--es_PA.iso885915: es_PA.ISO8859-15
-+es_PA.ISO-8859-1: es_PA.ISO8859-1
-+es_PA.ISO_8859-1: es_PA.ISO8859-1
- es_PA.utf8: es_PA.UTF-8
- es_PE: es_PE.ISO8859-1
- es_PE.iso88591: es_PE.ISO8859-1
- es_PE.ISO-8859-1: es_PE.ISO8859-1
--es_PE.iso885915: es_PE.ISO8859-15
-+es_PE.ISO-8859-1: es_PE.ISO8859-1
-+es_PE.ISO_8859-1: es_PE.ISO8859-1
- es_PE.utf8: es_PE.UTF-8
- es_PR: es_PR.ISO8859-1
- es_PR.iso88591: es_PR.ISO8859-1
- es_PR.ISO-8859-1: es_PR.ISO8859-1
-+es_PR.ISO_8859-1: es_PR.ISO8859-1
-+es_PR.ISO-8859-1: es_PR.ISO8859-1
- es_PR.utf8: es_PR.UTF-8
- es_PY: es_PY.ISO8859-1
- es_PY.iso88591: es_PY.ISO8859-1
- es_PY.ISO-8859-1: es_PY.ISO8859-1
--es_PY.iso885915: es_PY.ISO8859-15
-+es_PY.ISO-8859-1: es_PY.ISO8859-1
-+es_PY.ISO_8859-1: es_PY.ISO8859-1
- es_PY.utf8: es_PY.UTF-8
- es_SV: es_SV.ISO8859-1
- es_SV.iso88591: es_SV.ISO8859-1
- es_SV.ISO-8859-1: es_SV.ISO8859-1
-+es_SV.ISO_8859-1: es_SV.ISO8859-1
- es_SV.iso885915: es_SV.ISO8859-15
-+es_SV.ISO-8859-15: es_SV.ISO8859-15
-+es_SV.ISO_8859-15: es_SV.ISO8859-15
- es_SV.utf8: es_SV.UTF-8
- es_US: es_US.ISO8859-1
- es_US.iso88591: es_US.ISO8859-1
- es_US.ISO-8859-1: es_US.ISO8859-1
-+es_US.ISO_8859-1: es_US.ISO8859-1
-+es_US.utf8: es_US.UTF-8
- es_UY: es_UY.ISO8859-1
- es_UY.iso88591: es_UY.ISO8859-1
- es_UY.ISO-8859-1: es_UY.ISO8859-1
-+es_UY.ISO_8859-1: es_UY.ISO8859-1
- es_UY.iso885915: es_UY.ISO8859-15
-+es_UY.ISO-8859-15: es_UY.ISO8859-15
-+es_UY.ISO_8859-15: es_UY.ISO8859-15
- es_UY.utf8: es_UY.UTF-8
- es_VE: es_VE.ISO8859-1
- es_VE.iso88591: es_VE.ISO8859-1
- es_VE.ISO-8859-1: es_VE.ISO8859-1
--es_VE.iso885915: es_VE.ISO8859-15
-+es_VE.ISO-8859-1: es_VE.ISO8859-1
-+es_VE.ISO_8859-1: es_VE.ISO8859-1
- es_VE.utf8: es_VE.UTF-8
- #if defined(SVR4) && defined(sun)
- XCOMM Sun Solaris 2.6 has erroneously specified Estonian as a Latin-1
-@@ -444,13 +588,17 @@
- #endif
- XCOMM According to Estonian local standards, ISO8859-4 is not a recommended
- XCOMM charset. EVS8:2000 specifies ISO8859-15 as the base charset.
--et: et_EE.ISO8859-15
--et_EE: et_EE.ISO8859-15
-+XCOMM However we use ISO8859-1 for backward compatibility.
-+et: et_EE.ISO8859-1
-+et_EE: et_EE.ISO8859-1
- et_EE.iso88591: et_EE.ISO8859-1
- et_EE.ISO-8859-1: et_EE.ISO8859-1
-+et_EE.ISO_8859-1: et_EE.ISO8859-1
- et_EE.iso88594: et_EE.ISO8859-4
- et_EE.ISO-8859-4: et_EE.ISO8859-4
- et_EE.iso885913: et_EE.ISO8859-13
-+et_EE.ISO-8859-15: et_EE.ISO8859-15
-+et_EE.ISO_8859-15: et_EE.ISO8859-15
- et_EE.ISO-8859-13: et_EE.ISO8859-13
- et_EE.iso885915: et_EE.ISO8859-15
- et_EE.ISO-8859-15: et_EE.ISO8859-15
-@@ -459,32 +607,48 @@
- eu_ES: eu_ES.ISO8859-1
- eu_ES.iso88591: eu_ES.ISO8859-1
- eu_ES.ISO-8859-1: eu_ES.ISO8859-1
-+eu_ES.ISO_8859-1: eu_ES.ISO8859-1
- eu_ES.iso885915: eu_ES.ISO8859-15
- eu_ES.ISO-8859-15: eu_ES.ISO8859-15
-+eu_ES.ISO_8859-15: eu_ES.ISO8859-15
-+eu_ES.iso885915@euro: eu_ES.ISO8859-15
- eu_ES.ISO-8859-15@euro: eu_ES.ISO8859-15
-+eu_ES.ISO_8859-15@euro: eu_ES.ISO8859-15
- eu_ES@euro: eu_ES.ISO8859-15
- eu_ES.UTF-8@euro: eu_ES.UTF-8
-+eu_ES.utf8: eu_ES.UTF-8
- fa: fa_IR.UTF-8
- fa_IR: fa_IR.UTF-8
- fa_IR.isiri3342: fa_IR.ISIRI-3342
- fa_IR.utf8: fa_IR.UTF-8
--fi: fi_FI.ISO8859-15
--fi_FI: fi_FI.ISO8859-15
-+fi: fi_FI.ISO8859-1
-+fi_FI: fi_FI.ISO8859-1
- fi_FI.88591: fi_FI.ISO8859-1
- fi_FI.88591.en: fi_FI.ISO8859-1
- fi_FI.iso88591: fi_FI.ISO8859-1
- fi_FI.ISO-8859-1: fi_FI.ISO8859-1
- fi_FI.ISO_8859-1: fi_FI.ISO8859-1
- fi_FI.iso885915: fi_FI.ISO8859-15
-+fi_FI.iso885915@euro: fi_FI.ISO8859-15
-+fi_FI.ISO-8859-15@euro: fi_FI.ISO8859-15
-+fi_FI.ISO_8859-15@euro: fi_FI.ISO8859-15
- fi_FI.ISO-8859-15: fi_FI.ISO8859-15
- fi_FI.ISO-8859-15@euro: fi_FI.ISO8859-15
- fi_FI@euro: fi_FI.ISO8859-15
- fi_FI.utf8: fi_FI.UTF-8
- fi_FI.UTF-8@euro: fi_FI.UTF-8
-+fil: fil_PH.ISO8859-1
-+fil_PH: fil_PH.ISO8859-1
-+fil_PH.iso88591: fil_PH.ISO8859-1
-+fil_PH.ISO-8859-1: fil_PH.ISO8859-1
-+fil_PH.ISO_8859-1: fil_PH.ISO8859-1
-+fil_PH.utf8: fil_PH.UTF-8
- fo: fo_FO.ISO8859-1
- fo_FO: fo_FO.ISO8859-1
- fo_FO.iso88591: fo_FO.ISO8859-1
- fo_FO.ISO-8859-1: fo_FO.ISO8859-1
-+fo_FO.ISO_8859-1: fo_FO.ISO8859-1
-+fo_FO.ISO-8859-1: fo_FO.ISO8859-1
- fo_FO.iso885915: fo_FO.ISO8859-15
- fo_FO.ISO-8859-15: fo_FO.ISO8859-15
- fo_FO.utf8: fo_FO.UTF-8
-@@ -493,20 +657,28 @@
- fr_BE.88591: fr_BE.ISO8859-1
- fr_BE.88591.en: fr_BE.ISO8859-1
- fr_BE.ISO-8859-1: fr_BE.ISO8859-1
-+fr_BE.iso88591: fr_BE.ISO8859-1
-+fr_BE.ISO-8859-1: fr_BE.ISO8859-1
- fr_BE.ISO_8859-1: fr_BE.ISO8859-1
- fr_BE.iso885915: fr_BE.ISO8859-15
-+fr_BE.iso885915@euro: fr_BE.ISO8859-15
-+fr_BE.ISO-8859-15@euro: fr_BE.ISO8859-15
-+fr_BE.ISO_8859-15@euro: fr_BE.ISO8859-15
- fr_BE.ISO-8859-15: fr_BE.ISO8859-15
- fr_BE.ISO-8859-15@euro: fr_BE.ISO8859-15
- fr_BE@euro: fr_BE.ISO8859-15
- fr_BE.utf8: fr_BE.UTF-8
- fr_BE.UTF-8@euro: fr_BE.UTF-8
- fr_CA: fr_CA.ISO8859-1
-+fr_CA.ISO-8859-1: fr_CA.ISO8859-1
- fr_CA.88591: fr_CA.ISO8859-1
- fr_CA.88591.en: fr_CA.ISO8859-1
- fr_CA.iso88591: fr_CA.ISO8859-1
- fr_CA.ISO-8859-1: fr_CA.ISO8859-1
- fr_CA.ISO_8859-1: fr_CA.ISO8859-1
- fr_CA.iso885915: fr_CA.ISO8859-15
-+fr_CH.iso88591: fr_CH.ISO8859-1
-+fr_CH.ISO-8859-1: fr_CH.ISO8859-1
- fr_CA.ISO-8859-15: fr_CA.ISO8859-15
- fr_CA.utf8: fr_CA.UTF-8
- fr_CH: fr_CH.ISO8859-1
-@@ -517,6 +689,9 @@
- fr_CH.iso885915: fr_CH.ISO8859-15
- fr_CH.ISO-8859-15: fr_CH.ISO8859-15
- fr_CH.utf8: fr_CH.UTF-8
-+fr_FR.iso885915@euro: fr_FR.ISO8859-15
-+fr_FR.ISO-8859-15@euro: fr_FR.ISO8859-15
-+fr_FR.ISO_8859-15@euro: fr_FR.ISO8859-15
- fr_FR: fr_FR.ISO8859-1
- fr_FR.88591: fr_FR.ISO8859-1
- fr_FR.88591.en: fr_FR.ISO8859-1
-@@ -526,6 +701,9 @@
- fr_FR.iso885915: fr_FR.ISO8859-15
- fr_FR.ISO-8859-15: fr_FR.ISO8859-15
- fr_FR.ISO-8859-15@euro: fr_FR.ISO8859-15
-+fr_LU.iso885915@euro: fr_LU.ISO8859-15
-+fr_LU.ISO-8859-15@euro: fr_LU.ISO8859-15
-+fr_LU.ISO_8859-15@euro: fr_LU.ISO8859-15
- fr_FR@euro: fr_FR.ISO8859-15
- fr_FR.UTF-8@euro: fr_FR.UTF-8
- fr_FR.utf8: fr_FR.UTF-8
-@@ -547,11 +725,16 @@
- ga_IE: ga_IE.ISO8859-1
- ga_IE.iso88591: ga_IE.ISO8859-1
- ga_IE.ISO-8859-1: ga_IE.ISO8859-1
-+ga_IE.ISO_8859-1: ga_IE.ISO8859-1
- ga_IE.iso885914: ga_IE.ISO8859-14
- ga_IE.ISO-8859-14: ga_IE.ISO8859-14
-+ga_IE.ISO_8859-14: ga_IE.ISO8859-14
- ga_IE.iso885915: ga_IE.ISO8859-15
- ga_IE.ISO-8859-15: ga_IE.ISO8859-15
-+ga_IE.ISO_8859-15: ga_IE.ISO8859-15
-+ga_IE.iso885915@euro: ga_IE.ISO8859-15
- ga_IE.ISO-8859-15@euro: ga_IE.ISO8859-15
-+ga_IE.ISO_8859-15@euro: ga_IE.ISO8859-15
- ga_IE@euro: ga_IE.ISO8859-15
- ga_IE.UTF-8@euro: ga_IE.UTF-8
- ga_IE.utf8: ga_IE.UTF-8
-@@ -559,44 +742,62 @@
- gd_GB: gd_GB.ISO8859-1
- gd_GB.iso88591: gd_GB.ISO8859-1
- gd_GB.ISO-8859-1: gd_GB.ISO8859-1
-+gd_GB.ISO_8859-1: gd_GB.ISO8859-1
- gd_GB.iso885914: gd_GB.ISO8859-14
- gd_GB.ISO-8859-14: gd_GB.ISO8859-14
-+gd_GB.ISO_8859-14: gd_GB.ISO8859-14
- gd_GB.iso885915: gd_GB.ISO8859-15
- gd_GB.ISO-8859-15: gd_GB.ISO8859-15
-+gd_GB.ISO_8859-15: gd_GB.ISO8859-15
-+gez_ER: gez_ER.UTF-8
-+gez_ER@abegede: gez_ER.UTF-8
-+gez_ER.utf8: gez_ER.UTF-8
-+gez_ER.utf8@abegede: gez_ER.UTF-8
- gl: gl_ES.ISO8859-1
- gl_ES: gl_ES.ISO8859-1
- gl_ES.iso88591: gl_ES.ISO8859-1
- gl_ES.ISO-8859-1: gl_ES.ISO8859-1
-+gl_ES.ISO_8859-1: gl_ES.ISO8859-1
- gl_ES.iso885915: gl_ES.ISO8859-15
- gl_ES.ISO-8859-15: gl_ES.ISO8859-15
-+gl_ES.ISO_8859-15: gl_ES.ISO8859-15
-+gl_ES.iso885915@euro: gl_ES.ISO8859-15
- gl_ES.ISO-8859-15@euro: gl_ES.ISO8859-15
-+gl_ES.ISO_8859-15@euro: gl_ES.ISO8859-15
- gl_ES@euro: gl_ES.ISO8859-15
- gl_ES.UTF-8@euro: gl_ES.UTF-8
- gl_ES.utf8: gl_ES.UTF-8
-+gu: gu_IN.UTF-8
-+gu_IN: gu_IN.UTF-8
- gu_IN.utf8: gu_IN.UTF-8
- gu_IN.UTF-8: gu_IN.UTF-8
- gv: gv_GB.ISO8859-1
- gv_GB: gv_GB.ISO8859-1
- gv_GB.iso88591: gv_GB.ISO8859-1
- gv_GB.ISO-8859-1: gv_GB.ISO8859-1
-+gv_GB.ISO_8859-1: gv_GB.ISO8859-1
- gv_GB.iso885914: gv_GB.ISO8859-14
- gv_GB.ISO-8859-14: gv_GB.ISO8859-14
-+gv_GB.ISO_8859-14: gv_GB.ISO8859-14
- gv_GB.iso885915: gv_GB.ISO8859-15
- gv_GB.ISO-8859-15: gv_GB.ISO8859-15
-+gv_GB.ISO_8859-15: gv_GB.ISO8859-15
-+gv_GB.utf8: gv_GB.UTF-8
- he: he_IL.ISO8859-8
- he_IL: he_IL.ISO8859-8
- HE_IL: he_IL.ISO8859-8
- he_IL.iso88598: he_IL.ISO8859-8
- he_IL.ISO-8859-8: he_IL.ISO8859-8
-+he_IL.ISO_8859-8: he_IL.ISO8859-8
- he_IL.cp1255: he_IL.CP1255
- he_IL.microsoftcp1255: he_IL.CP1255
- he_IL.microsoft-cp1255: he_IL.CP1255
- he_IL.MICROSOFT-CP1255: he_IL.CP1255
- he_IL.utf8: he_IL.UTF-8
- HE_IL.UTF-8: he_IL.UTF-8
--hi: hi_IN.ISCII-DEV
--hi_IN: hi_IN.ISCII-DEV
--HI_IN: hi_IN.ISCII-DEV
-+hi: hi_IN.UTF-8
-+hi_IN: hi_IN.UTF-8
-+HI_IN: hi_IN.UTF-8
- hi_IN.isciidev: hi_IN.ISCII-DEV
- hi_IN.utf8: hi_IN.UTF-8
- HI_IN.UTF-8: hi_IN.UTF-8
-@@ -606,10 +807,31 @@
- hr_HR.ISO-8859-2: hr_HR.ISO8859-2
- hr_HR.ISO_8859-2: hr_HR.ISO8859-2
- hr_HR.utf8: hr_HR.UTF-8
-+hsb: hsb_DE.ISO8859-2
-+hsb_DE: hsb_DE.ISO8859-2
-+hsb_DE.iso88592: hsb_DE.ISO8859-2
-+hsb_DE.ISO-8859-2: hsb_DE.ISO8859-2
-+hsb_DE.ISO_8859-2: hsb_DE.ISO8859-2
-+hsb_DE.utf8: hsb_DE.UTF-8
- hu: hu_HU.ISO8859-2
- hu_HU: hu_HU.ISO8859-2
- hu_HU.iso88592: hu_HU.ISO8859-2
- hu_HU.ISO-8859-2: hu_HU.ISO8859-2
-+hu_HU.ISO_8859-2: hu_HU.ISO8859-2
-+hu_HU.iso885916: hu_HU.ISO8859-16
-+hu_HU.ISO-8859-16: hu_HU.ISO8859-16
-+hu_HU.ISO_8859-16: hu_HU.ISO8859-16
-+hu_HU.utf8: hu_HU.UTF-8
-+hy: hy_AM.UTF-8
-+hy_AM: hy_AM.UTF-8
-+hy_AM.armscii8: hy_AM.ARMSCII-8
-+hy_AM.utf8: hy_AM.UTF-8
-+id: id_ID.ISO8859-1
-+id_ID: id_ID.ISO8859-1
-+id_ID.iso88591: id_ID.ISO8859-1
-+id_ID.ISO-8859-1: id_ID.ISO8859-1
-+id_ID.ISO_8859-1: id_ID.ISO8859-1
-+id_ID.utf8: id_ID.UTF-8
- XCOMM in was the old ISO code for Indonesian (now id). These lines should be
- XCOMM deleted in the future.
- in: id_ID.ISO8859-1
-@@ -625,6 +847,7 @@
- it: it_IT.ISO8859-1
- it_CH: it_CH.ISO8859-1
- it_CH.iso88591: it_CH.ISO8859-1
-+it_CH.ISO-8859-1: it_CH.ISO8859-1
- it_CH.ISO_8859-1: it_CH.ISO8859-1
- it_CH.ISO-8859-1: it_CH.ISO8859-1
- it_CH.iso885915: it_CH.ISO8859-15
-@@ -637,13 +860,16 @@
- it_IT.ISO_8859-1: it_IT.ISO8859-1
- it_IT.iso885915: it_IT.ISO8859-15
- it_IT.ISO-8859-15: it_IT.ISO8859-15
-+it_IT.ISO_8859-15: it_IT.ISO8859-15
-+it_IT.iso885915@euro: it_IT.ISO8859-15
- it_IT.ISO-8859-15@euro: it_IT.ISO8859-15
-+it_IT.ISO_8859-15@euro: it_IT.ISO8859-15
- it_IT@euro: it_IT.ISO8859-15
- it_IT.utf8: it_IT.UTF-8
- it_IT.UTF-8@euro: it_IT.UTF-8
--iu: iu_CA.NUNACOM-8
--iu_CA: iu_CA.NUNACOM-8
--iu_CA.nunacom8: iu_CA.NUNACOM-8
-+iu: iu_CA.UTF-8
-+iu_CA: iu_CA.UTF-8
-+iu_CA.utf8: iu_CA.UTF-8
- XCOMM iw was the old ISO code for Hebrew (now he). These lines should be
- XCOMM deleted in the future.
- iw: he_IL.ISO8859-8
-@@ -652,20 +878,21 @@
- iw_IL.iso88598: he_IL.ISO8859-8
- iw_IL.ISO-8859-8: he_IL.ISO8859-8
- #ifndef __uxp__
-+ja: ja_JP.eucJP
- ja_JP: ja_JP.eucJP
- #else /* __uxp__ */
-+ja: ja_JP.U90
- ja_JP: ja_JP.U90
- ja_JP.U90: ja_JP.U90
- ja_JP.S90: ja_JP.S90
- #endif /* __uxp__ */
--ja: ja_JP.eucJP
- ja.JIS: ja_JP.JIS7
- ja.SJIS: ja_JP.SJIS
--ja_JP: ja_JP.eucJP
- ja_JP.ujis: ja_JP.eucJP
- ja_JP.eucjp: ja_JP.eucJP
- Jp_JP: ja_JP.eucJP
- ja_JP.AJEC: ja_JP.eucJP
-+ja_JP.eucjp: ja_JP.eucJP
- ja_JP.EUC: ja_JP.eucJP
- ja_JP.EUC-JP: ja_JP.eucJP
- ja_JP.EUC_JP: ja_JP.eucJP
-@@ -674,21 +901,29 @@
- ja_JP.JIS: ja_JP.JIS7
- ja_JP.jis7: ja_JP.JIS7
- ja_JP.mscode: ja_JP.SJIS
--ja_JP.SJIS: ja_JP.SJIS
- ja_JP.sjis: ja_JP.SJIS
- ja_JP.utf8: ja_JP.UTF-8
- JA_JP.utf8: ja_JP.UTF-8
--ka: ka_GE.GEORGIAN-ACADEMY
--ka_GE: ka_GE.GEORGIAN-ACADEMY
-+ka: ka_GE.GEORGIAN-PS
-+ka_GE: ka_GE.GEORGIAN-PS
- ka_GE.georgianacademy: ka_GE.GEORGIAN-ACADEMY
- ka_GE.georgianrs: ka_GE.GEORGIAN-ACADEMY
- ka_GE.georgianps: ka_GE.GEORGIAN-PS
-+ka_GE.utf8: ka_GE.UTF-8
-+kk: kk_KZ.PT154
-+kk_KZ kk_KZ.PT154
-+kk_KZ.pt154 kk_KZ.PT154
-+kk_KZ.utf8 kk_KZ.UTF-8
- kl: kl_GL.ISO8859-1
- kl_GL: kl_GL.ISO8859-1
- kl_GL.iso88591: kl_GL.ISO8859-1
- kl_GL.ISO-8859-1: kl_GL.ISO8859-1
--kl_GL.iso885915: kl_GL.ISO8859-15
-+kl_GL.ISO-8859-1: kl_GL.ISO8859-1
-+kl_GL.ISO_8859-1: kl_GL.ISO8859-1
- kl_GL.utf8: kl_GL.UTF-8
-+kn: kn_IN.UTF-8
-+kn_IN: kn_IN.UTF-8
-+kn_IN.utf8: kn_IN.UTF-8
- ko: ko_KR.eucKR
- ko_KR: ko_KR.eucKR
- KO_KR: ko_KR.eucKR
-@@ -698,23 +933,56 @@
- ko_KR.euckr: ko_KR.eucKR
- ko_KR.utf8: ko_KR.UTF-8
- KO_KR.UTF-8: ko_KR.UTF-8
-+ku: ku_TR.UTF-8
-+ku_TR: ku_TR.UTF-8
-+ku_TR.utf8: ku_TR.UTF-8
- kw: kw_GB.ISO8859-1
- kw_GB: kw_GB.ISO8859-1
- kw_GB.iso88591: kw_GB.ISO8859-1
- kw_GB.ISO-8859-1: kw_GB.ISO8859-1
-+kw_GB.ISO_8859-1: kw_GB.ISO8859-1
- kw_GB.iso885914: kw_GB.ISO8859-14
- kw_GB.ISO-8859-14: kw_GB.ISO8859-14
-+kw_GB.ISO_8859-14: kw_GB.ISO8859-14
- kw_GB.iso885915: kw_GB.ISO8859-15
- kw_GB.ISO-8859-15: kw_GB.ISO8859-15
-+kw_GB.ISO_8859-15: kw_GB.ISO8859-15
-+kw_GB.utf8: kw_GB.UTF-8
- ky: ky_KG.UTF-8
- ky_KG: ky_KG.UTF-8
- ky_KG.utf8: ky_KG.UTF-8
- ky_KG.UTF-8: ky_KG.UTF-8
--lo: lo_LA.MULELAO-1
--lo_LA: lo_LA.MULELAO-1
-+lg: lg_UG.ISO8859-10
-+lg_UG: lg_UG.ISO8859-10
-+lg_UG.iso885910: lg_UG.ISO8859-10
-+lg_UG.ISO-8859-10: lg_UG.ISO8859-10
-+lg_UG.ISO_8859-10: lg_UG.ISO8859-10
-+lg_UG.utf8: lg_UG.UTF-8
-+li: li_BE.ISO8859-1
-+li_BE: li_BE.ISO8859-1
-+li_BE.iso88591: li_BE.ISO8859-1
-+li_BE.ISO-8859-1: li_BE.ISO8859-1
-+li_BE.ISO_8859-1: li_BE.ISO8859-1
-+li_BE.iso885915@euro: li_BE.ISO8859-15
-+li_BE.ISO-8859-15@euro: li_BE.ISO8859-15
-+li_BE.ISO_8859-15@euro: li_BE.ISO8859-15
-+li_BE@euro: li_BE.ISO8859-15
-+li_BE.utf8: li_BE.UTF-8
-+li_NL: li_NL.ISO8859-1
-+li_NL.iso88591: li_NL.ISO8859-1
-+li_NL.ISO-8859-1: li_NL.ISO8859-1
-+li_NL.ISO_8859-1: li_NL.ISO8859-1
-+li_NL.iso885915@euro: li_NL.ISO8859-15
-+li_NL.ISO-8859-15@euro: li_NL.ISO8859-15
-+li_NL.ISO_8859-15@euro: li_NL.ISO8859-15
-+li_NL@euro: li_NL.ISO8859-15
-+li_NL.utf8: li_NL.UTF-8
-+lo: lo_LA.UTF-8
-+lo_LA: lo_LA.UTF-8
- lo_LA.cp1133: lo_LA.IBM-CP1133
- lo_LA.ibmcp1133: lo_LA.IBM-CP1133
- lo_LA.mulelao1: lo_LA.MULELAO-1
-+lo_LA.utf8: lo_LA.UTF-8
- #if defined(VeryOldFreeBSD)
- XCOMM most locales in FreeBSD 2.1.[56] do not work, allow use of FreeBSD's
- XCOMM generic Latin-1 locale name. N.B. "lt" is a bad code to use for a
-@@ -731,6 +999,8 @@
- lt_LT.ISO-8859-13: lt_LT.ISO8859-13
- lt_LT.ISO_8859-13: lt_LT.ISO8859-13
- lt_LT.utf8: lt_LT.UTF-8
-+lug: lg_UG.ISO8859-10
-+lug_UG: lg_UG.ISO8859-10
- lv: lv_LV.ISO8859-13
- lv_LV: lv_LV.ISO8859-13
- lv_LV.iso88594: lv_LV.ISO8859-4
-@@ -742,14 +1012,27 @@
- mi: mi_NZ.ISO8859-1
- mi_NZ: mi_NZ.ISO8859-1
- mi_NZ.iso88591: mi_NZ.ISO8859-1
-+mi_NZ.ISO-8859-1: mi_NZ.ISO8859-1
-+mi_NZ.ISO_8859-1: mi_NZ.ISO8859-1
-+mi_NZ.utf8: mi_NZ.UTF-8
- mk: mk_MK.ISO8859-5
- mk_MK: mk_MK.ISO8859-5
- mk_MK.iso88595: mk_MK.ISO8859-5
- mk_MK.ISO-8859-5: mk_MK.ISO8859-5
-+mk_MK.ISO_8859-5: mk_MK.ISO8859-5
-+mk_MK.ISO-8859-5: mk_MK.ISO8859-5
- mk_MK.cp1251: mk_MK.CP1251
- mk_MK.microsoftcp1251: mk_MK.CP1251
- mk_MK.microsoft-cp1251: mk_MK.CP1251
- mk_MK.MICROSOFT-CP1251: mk_MK.CP1251
-+ml: ml_IN.UTF-8
-+ml_IN: ml_IN.UTF-8
-+ml_IN.utf8: ml_IN.UTF-8
-+mn: mn_MN.UTF-8
-+mn_MN: mn_MN.UTF-8
-+mn_MN.utf8: mn_MN.UTF-8
-+mr: mr_IN.UTF-8
-+mr_IN: mr_IN.UTF-8
- mk_MK.utf8: mk_MK.UTF-8
- mr_IN: mr_IN.UTF-8
- mr_IN.utf8: mr_IN.UTF-8
-@@ -757,15 +1040,40 @@
- ms_MY: ms_MY.ISO8859-1
- ms_MY.iso88591: ms_MY.ISO8859-1
- ms_MY.ISO-8859-1: ms_MY.ISO8859-1
-+ms_MY.ISO_8859-1: ms_MY.ISO8859-1
-+ms_MY.utf8: ms_MY.UTF-8
- mt: mt_MT.ISO8859-3
- mt_MT: mt_MT.ISO8859-3
-+mt_MT.iso88593: mt_MT.ISO8859-3
- mt_MT.ISO-8859-3: mt_MT.ISO8859-3
-+mt_MT.ISO_8859-3: mt_MT.ISO8859-3
-+mt_MT.utf8: mt_MT.UTF-8
- nb: nb_NO.ISO8859-1
- nb_NO: nb_NO.ISO8859-1
- nb_NO.88591: nb_NO.ISO8859-1
- nb_NO.iso88591: nb_NO.ISO8859-1
- nb_NO.ISO-8859-1: nb_NO.ISO8859-1
-+nb_NO.ISO_8859-1: nb_NO.ISO8859-1
- nb_NO.iso885915: nb_NO.ISO8859-15
-+nb_NO.utf8: nb_NO.UTF-8
-+nds: nds_DE.ISO8859-1
-+nds_DE: nds_DE.ISO8859-1
-+nds_DE.iso88591: nds_DE.ISO8859-1
-+nds_DE.ISO-8859-1: nds_DE.ISO8859-1
-+nds_DE.ISO_8859-1: nds_DE.ISO8859-1
-+nds_DE.iso88591@traditional: nds_DE.ISO8859-1
-+nds_DE.ISO-8859-1@traditional: nds_DE.ISO8859-1
-+nds_DE.ISO_8859-1@traditional: nds_DE.ISO8859-1
-+nds_DE@traditional: nds_DE.ISO8859-1
-+nds_DE.iso885915: nds_DE.ISO8859-15
-+nds_DE.iso885915@euro: nds_DE.ISO8859-15
-+nds_DE.ISO-8859-15@euro: nds_DE.ISO8859-15
-+nds_DE.ISO_8859-15@euro: nds_DE.ISO8859-15
-+nds_DE@euro: nds_DE.ISO8859-15
-+nds_DE.utf8: nds_DE.UTF-8
-+ne: ne_NP.UTF-8
-+ne_NP: ne_NP.UTF-8
-+ne_NP.utf8: ne_NP.UTF-8
- nb_NO.ISO-8859-15: nb_NO.ISO8859-15
- nl: nl_NL.ISO8859-1
- nl_BE: nl_BE.ISO8859-1
-@@ -773,8 +1081,12 @@
- nl_BE.88591.en: nl_BE.ISO8859-1
- nl_BE.iso88591: nl_BE.ISO8859-1
- nl_BE.ISO-8859-1: nl_BE.ISO8859-1
-+nl_BE.ISO-8859-1: nl_BE.ISO8859-1
- nl_BE.ISO_8859-1: nl_BE.ISO8859-1
- nl_BE.iso885915: nl_BE.ISO8859-15
-+nl_BE.iso885915@euro: nl_BE.ISO8859-15
-+nl_BE.ISO-8859-15@euro: nl_BE.ISO8859-15
-+nl_BE.ISO_8859-15@euro: nl_BE.ISO8859-15
- nl_BE.ISO-8859-15: nl_BE.ISO8859-15
- nl_BE.ISO-8859-15@euro: nl_BE.ISO8859-15
- nl_BE@euro: nl_BE.ISO8859-15
-@@ -784,6 +1096,9 @@
- nl_NL.88591: nl_NL.ISO8859-1
- nl_NL.88591.en: nl_NL.ISO8859-1
- nl_NL.iso88591: nl_NL.ISO8859-1
-+nl_NL.iso885915@euro: nl_NL.ISO8859-15
-+nl_NL.ISO-8859-15@euro: nl_NL.ISO8859-15
-+nl_NL.ISO_8859-15@euro: nl_NL.ISO8859-15
- nl_NL.ISO-8859-1: nl_NL.ISO8859-1
- nl_NL.ISO_8859-1: nl_NL.ISO8859-1
- nl_NL.iso885915: nl_NL.ISO8859-15
-@@ -799,39 +1114,80 @@
- nn_NO.ISO_8859-1: nn_NO.ISO8859-1
- nn_NO.iso885915: nn_NO.ISO8859-15
- nn_NO.ISO-8859-15: nn_NO.ISO8859-15
--no: no_NO.ISO8859-1
--no_NO: no_NO.ISO8859-1
--no_NO.88591: no_NO.ISO8859-1
--no_NO.88591.en: no_NO.ISO8859-1
--no_NO.iso88591: no_NO.ISO8859-1
--no_NO.ISO-8859-1: no_NO.ISO8859-1
--no_NO.iso885915: no_NO.ISO8859-15
--no_NO.ISO-8859-15: no_NO.ISO8859-15
--no_NO.utf8: no_NO.UTF-8
-+nn_NO.ISO_8859-15: nn_NO.ISO8859-15
-+nn_NO.utf8: nn_NO.UTF-8
-+no: nb_NO.ISO8859-1
-+no_NO: nb_NO.ISO8859-1
-+no_NO.88591: nb_NO.ISO8859-1
-+no_NO.88591.en: nb_NO.ISO8859-1
-+no_NO.iso88591: nb_NO.ISO8859-1
-+no_NO.ISO-8859-1: nb_NO.ISO8859-1
-+no_NO.ISO_8859-1: nb_NO.ISO8859-1
-+no_NO.iso885915: nb_NO.ISO8859-15
-+no_NO.ISO-8859-15: nb_NO.ISO8859-15
-+no_NO.ISO_8859-15: nb_NO.ISO8859-15
-+no_NO.utf8: nb_NO.UTF-8
- nr: nr_ZA.ISO8859-1
- nr_ZA: nr_ZA.ISO8859-1
- nr_ZA.iso88591: nr_ZA.ISO8859-1
-+nr_ZA.ISO-8859-1: nr_ZA.ISO8859-1
-+nr_ZA.ISO_8859-1: nr_ZA.ISO8859-1
- nr_ZA.utf8: nr_ZA.UTF-8
--nso: nso_ZA.ISO8859-15
--nso_ZA: nso_ZA.ISO8859-15
-+nso: nso_ZA.ISO8859-10
-+nso_ZA: nso_ZA.ISO8859-10
-+nso_ZA.iso885910: nso_ZA.ISO8859-10
-+nso_ZA.ISO-8859-10: nso_ZA.ISO8859-10
-+nso_ZA.ISO_8859-10: nso_ZA.ISO8859-10
- nso_ZA.iso885915: nso_ZA.ISO8859-15
-+nso_ZA.ISO-8859-15: nso_ZA.ISO8859-15
-+nso_ZA.ISO_8859-15: nso_ZA.ISO8859-15
- nso_ZA.utf8: nso_ZA.UTF-8
--ny: ny_NO.ISO8859-1
--ny_NO: ny_NO.ISO8859-1
--ny_NO.88591: ny_NO.ISO8859-1
--ny_NO.ISO_8859-1: ny_NO.ISO8859-1
--ny_NO.iso885915: ny_NO.ISO8859-15
--no@nynorsk: ny_NO.ISO8859-1
-+ny: nn_NO.ISO8859-1
-+ny_NO: nn_NO.ISO8859-1
-+ny_NO.88591: nn_NO.ISO8859-1
-+ny_NO.ISO-8859-1: nn_NO.ISO8859-1
-+ny_NO.ISO_8859-1: nn_NO.ISO8859-1
-+ny_NO.iso885915: nn_NO.ISO8859-15
-+ny_NO.ISO-8859-15: nn_NO.ISO8859-15
-+ny_NO.ISO_8859-15: nn_NO.ISO8859-15
-+no@nynorsk: nn_NO.ISO8859-1
- nynorsk: nn_NO.ISO8859-1
- oc: oc_FR.ISO8859-1
- oc_FR: oc_FR.ISO8859-1
- oc_FR.iso88591: oc_FR.ISO8859-1
- oc_FR.ISO-8859-1: oc_FR.ISO8859-1
-+oc_FR.ISO_8859-1: oc_FR.ISO8859-1
- oc_FR.iso885915: oc_FR.ISO8859-15
- oc_FR.ISO-8859-15: oc_FR.ISO8859-15
-+oc_FR.ISO_8859-15: oc_FR.ISO8859-15
-+oc_FR.iso885915@euro: oc_FR.ISO8859-15
-+oc_FR.ISO-8859-15@euro: oc_FR.ISO8859-15
-+oc_FR.ISO_8859-15@euro: oc_FR.ISO8859-15
- oc_FR@euro: oc_FR.ISO8859-15
-+om: om_ET.UTF-8
-+om_ET: om_ET.UTF-8
-+om_ET.utf8: om_ET.UTF-8
-+om_KE: om_KE.ISO8859-1
-+om_KE.iso88591: om_KE.ISO8859-1
-+om_KE.ISO-8859-1: om_KE.ISO8859-1
-+om_KE.ISO_8859-1: om_KE.ISO8859-1
-+om_KE.utf8: om_KE.UTF-8
-+or: or_IN.UTF-8
-+or_IN: or_IN.UTF-8
-+or_IN.utf8: or_IN.UTF-8
-+pa: pa_IN.UTF-8
-+pa_IN: pa_IN.UTF-8
- pa_IN.utf8: pa_IN.UTF-8
- pa_IN.UTF-8: pa_IN.UTF-8
-+pap: pap_AN.ISO8859-1
-+pap_AN: pap_AN.ISO8859-1
-+pap_AN.iso88591: pap_AN.ISO8859-1
-+pap_AN.ISO-8859-1: pap_AN.ISO8859-1
-+pap_AN.ISO_8859-1: pap_AN.ISO8859-1
-+pap_AN.iso885915@euro: pap_AN.ISO8859-15
-+pap_AN.ISO-8859-15@euro: pap_AN.ISO8859-15
-+pap_AN.ISO_8859-15@euro: pap_AN.ISO8859-15
-+pap_AN.utf8: pap_AN.UTF-8
- pd: pd_US.ISO8859-1
- pd_DE: pd_DE.ISO8859-1
- pd_US: pd_US.ISO8859-1
-@@ -839,17 +1195,23 @@
- pd_US.iso88591: pd_US.ISO8859-1
- pd_DE.iso885915: pd_DE.ISO8859-15
- pd_US.iso885915: pd_US.ISO8859-15
--ph: ph_PH.ISO8859-1
--ph_PH: ph_PH.ISO8859-1
--ph_PH.iso88591: ph_PH.ISO8859-1
-+ph: fil_PH.ISO8859-1
-+ph_PH: fil_PH.ISO8859-1
-+ph_PH.iso88591: fil_PH.ISO8859-1
-+ph_PH.ISO8859-1 fil_PH.ISO8859-1
- pl: pl_PL.ISO8859-2
- pl_PL: pl_PL.ISO8859-2
- pl_PL.iso88592: pl_PL.ISO8859-2
- pl_PL.ISO-8859-2: pl_PL.ISO8859-2
-+pl_PL.ISO_8859-2: pl_PL.ISO8859-2
-+pl_PL.iso885916: pl_PL.ISO8859-16
-+pl_PL.ISO-8859-16: pl_PL.ISO8859-16
-+pl_PL.ISO_8859-16: pl_PL.ISO8859-16
- pl_PL.utf8: pl_PL.UTF-8
--pp: pp_AN.ISO8859-1
--pp_AN: pp_AN.ISO8859-1
--pp_AN.iso88591: pp_AN.ISO8859-1
-+pp: pap_AN.ISO8859-1
-+pp_AN: pap_AN.ISO8859-1
-+pp_AN.iso88591: pap_AN.ISO8859-1
-+pp_AN.ISO8859-1 pap_AN.ISO8859-1
- pt: pt_PT.ISO8859-1
- pt_BR: pt_BR.ISO8859-1
- pt_BR.88591: pt_BR.ISO8859-1
-@@ -857,7 +1219,6 @@
- pt_BR.iso88591: pt_BR.ISO8859-1
- pt_BR.ISO-8859-1: pt_BR.ISO8859-1
- pt_BR.ISO_8859-1: pt_BR.ISO8859-1
--pt_BR.iso885915: pt_BR.ISO8859-15
- pt_BR.utf8: pt_BR.UTF-8
- pt_PT: pt_PT.ISO8859-1
- pt_PT.88591: pt_PT.ISO8859-1
-@@ -866,6 +1227,9 @@
- pt_PT.ISO-8859-1: pt_PT.ISO8859-1
- pt_PT.ISO_8859-1: pt_PT.ISO8859-1
- pt_PT.iso885915: pt_PT.ISO8859-15
-+pt_PT.iso885915@euro: pt_PT.ISO8859-15
-+pt_PT.ISO-8859-15@euro: pt_PT.ISO8859-15
-+pt_PT.ISO_8859-15@euro: pt_PT.ISO8859-15
- pt_PT.ISO-8859-15: pt_PT.ISO8859-15
- pt_PT.ISO-8859-15@euro: pt_PT.ISO8859-15
- pt_PT@euro: pt_PT.ISO8859-15
-@@ -875,16 +1239,22 @@
- ro_RO: ro_RO.ISO8859-2
- ro_RO.iso88592: ro_RO.ISO8859-2
- ro_RO.ISO-8859-2: ro_RO.ISO8859-2
-+ro_RO.ISO_8859-2: ro_RO.ISO8859-2
-+ro_RO.iso885916: ro_RO.ISO8859-16
-+ro_RO.ISO-8859-16: ro_RO.ISO8859-16
-+ro_RO.ISO_8859-16: ro_RO.ISO8859-16
- ro_RO.utf8: ro_RO.UTF-8
- ru: ru_RU.ISO8859-5
- ru_RU: ru_RU.ISO8859-5
- ru_RU.iso88595: ru_RU.ISO8859-5
- ru_RU.ISO-8859-5: ru_RU.ISO8859-5
-+ru_RU.ISO_8859-5: ru_RU.ISO8859-5
- ru_RU.koi8r: ru_RU.KOI8-R
- ru_RU.cp1251: ru_RU.CP1251
- ru_RU.microsoftcp1251: ru_RU.CP1251
- ru_RU.microsoft-cp1251: ru_RU.CP1251
- ru_RU.MICROSOFT-CP1251: ru_RU.CP1251
-+ru_RU.utf8: ru_RU.UTF-8
- #if defined(INCLUDE_ru_SU)
- XCOMM ru_SU is redundant now
- ru_SU: ru_RU.KOI8-R
-@@ -902,51 +1272,124 @@
- rw_RW.iso8859-1: rw_RW.ISO8859-1
- rw_RW.ISO-8859-1: rw_RW.ISO8859-1
- rw_RW.utf8: rw_RW.UTF-8
-+ru_UA.utf8: ru_UA.UTF-8
-+rw: rw_RW.ISO8859-1
-+rw_RW: rw_RW.ISO8859-1
-+rw_RW.iso88591: rw_RW.ISO8859-1
-+rw_RW.ISO-8859-1: rw_RW.ISO8859-1
-+rw_RW.ISO_8859-1: rw_RW.ISO8859-1
-+rw_RW.utf8: rw_RW.UTF-8
- se_NO: se_NO.UTF-8
- se_NO.utf8: se_NO.UTF-8
--sh: sh_YU.ISO8859-2
--sh_HR.iso88592: sh_HR.ISO8859-2
--sh_SP: sh_YU.ISO8859-2
--sh_YU: sh_YU.ISO8859-2
--sh_YU.utf8: sh_YU.UTF-8
-+sh: sr_CS.ISO8859-2
-+sh_HR.iso88592: hr_HR.ISO8859-2
-+sh_SP: sr_CS.ISO8859-2
-+sh_YU: sr_CS.ISO8859-2
-+sh_YU.utf8: sh_CS.UTF-8
-+si: si_LK.UTF-8
-+si_LK: si_LK.UTF-8
-+si_LK.utf8: si_LK.UTF-8
-+sid: sid_ET.UTF-8
-+sid_ET: sid_ET.UTF-8
-+sid_ET.utf8: sid_ET.UTF-8
- si: si_LK.UTF-8
- si_LK: si_LK.UTF-8
- sk: sk_SK.ISO8859-2
- sk_SK: sk_SK.ISO8859-2
- sk_SK.iso88592: sk_SK.ISO8859-2
-+sk_SK.ISO_8859-2: sk_SK.ISO8859-2
- sk_SK.ISO-8859-2: sk_SK.ISO8859-2
- sk_SK.utf8: sk_SK.UTF-8
- sl: sl_SI.ISO8859-2
- sl_SI: sl_SI.ISO8859-2
- sl_SI.iso88592: sl_SI.ISO8859-2
- sl_SI.ISO-8859-2: sl_SI.ISO8859-2
-+sl_SI.ISO_8859-2: sl_SI.ISO8859-2
-+sl_SI.iso885916: sl_SI.ISO8859-16
-+sl_SI.ISO-8859-16: sl_SI.ISO8859-16
-+sl_SI.ISO_8859-16: sl_SI.ISO8859-16
- sl_SI.utf8: sl_SI.UTF-8
--sp: sp_YU.ISO8859-5
--sp_YU: sp_YU.ISO8859-5
--sq: sq_AL.ISO8859-2
--sq_AL: sq_AL.ISO8859-2
-+so_DJ: so_DJ.ISO8859-1
-+so_DJ.iso88591: so_DJ.ISO8859-1
-+so_DJ.ISO-8859-1: so_DJ.ISO8859-1
-+so_DJ.ISO_8859-1: so_DJ.ISO8859-1
-+so_DJ.utf8: so_DJ.UTF-8
-+so_ET: so_ET.UTF-8
-+so_ET.utf8: so_ET.UTF-8
-+so_KE: so_KE.ISO8859-1
-+so_KE.iso88591: so_KE.ISO8859-1
-+so_KE.ISO-8859-1: so_KE.ISO8859-1
-+so_KE.ISO_8859-1: so_KE.ISO8859-1
-+so_KE.utf8: so_KE.UTF-8
-+so_SO: so_SO.ISO8859-1
-+so_SO.iso88591: so_SO.ISO8859-1
-+so_SO.ISO-8859-1: so_SO.ISO8859-1
-+so_SO.ISO_8859-1: so_SO.ISO8859-1
-+so_SO.utf8: so_SO.UTF-8
-+sp: sr_CS.ISO8859-5
-+sp_YU: sr_CS.ISO8859-5
-+sq: sq_AL.ISO8859-1
-+sq_AL: sq_AL.ISO8859-1
-+sq_AL.iso88591: sq_AL.ISO8859-1
-+sq_AL.ISO-8859-1: sq_AL.ISO8859-1
-+sq_AL.ISO_8859-1: sq_AL.ISO8859-1
- sq_AL.iso88592: sq_AL.ISO8859-2
- sq_AL.ISO-8859-2: sq_AL.ISO8859-2
-+sq_AL.ISO_8859-2: sq_AL.ISO8859-2
- sq_AL.utf8: sq_AL.UTF-8
--sr_SP: sr_SP.ISO8859-2
-+sr_SP: sr_CS.ISO8859-2
- sr: sr_YU.ISO8859-5
--sr_YU: sr_YU.ISO8859-5
--sr_YU.iso88592: sr_YU.ISO8859-2
--sr_YU.ISO-8859-2: sr_YU.ISO8859-2
--sr_YU.iso88595: sr_YU.ISO8859-5
--sr_YU.ISO-8859-5: sr_YU.ISO8859-5
--sr@cyrillic: sr_YU.ISO8859-5
--sr_YU@cyrillic: sr_YU.ISO8859-5
--sr_YU.iso88595@cyrillic: sr_YU.ISO8859-5
--sr_YU.ISO-8859-5@cyrillic: sr_YU.ISO8859-5
--sr_YU.ISO8859-5@cyrillic: sr_YU.ISO8859-5
--sr_YU.cp1251@cyrillic: sr_YU.CP1251
--sr_YU.CP1251@cyrillic: sr_YU.CP1251
--sr_YU.microsoftcp1251@cyrillic: sr_YU.CP1251
--sr_YU.microsoft-cp1251@cyrillic: sr_YU.CP1251
--sr_YU.MICROSOFT-CP1251@cyrillic: sr_YU.CP1251
--sr_YU.utf8: sr_YU.UTF-8
--sr_YU.UTF-8@cyrillic: sr_YU.UTF-8
-+sr_CS: sr_CS.ISO8859-5
-+sr_CS.iso88592: sr_CS.ISO8859-2
-+sr_CS.iso88592@Latn: sr_CS.ISO8859-2
-+sr_CS.ISO-8859-2@Latn: sr_CS.ISO8859-2
-+sr_CS.ISO_8859-2@Latn: sr_CS.ISO8859-2
-+sr@Latn: sr_CS.ISO8859-2
-+sr_CS@Latn: sr_CS.ISO8859-2
-+sr_CS.iso88595: sr_CS.ISO8859-5
-+sr_CS.ISO-8859-5: sr_CS.ISO8859-5
-+sr_CS.ISO_8859-5: sr_CS.ISO8859-5
-+sr@ije: sr_CS.ISO8859-5
-+sr_CS@ije: sr_CS.ISO8859-5
-+sr_CS.iso88595@ije: sr_CS.ISO8859-5
-+sr_CS.ISO-8859-5@ije: sr_CS.ISO8859-5
-+sr_CS.ISO_8859-5@ije: sr_CS.ISO8859-5
-+sr_CS.utf8: sr_CS.UTF-8
-+sr_YU: sr_CS.ISO8859-5
-+sr_YU.iso88592: sr_CS.ISO8859-2
-+sr_YU.ISO-8859-2: sr_CS.ISO8859-2
-+sr_YU.ISO_8859-2: sr_CS.ISO8859-2
-+sr_YU.iso88595: sr_CS.ISO8859-5
-+sr_YU.ISO-8859-5: sr_CS.ISO8859-5
-+sr_YU.ISO_8859-5: sr_CS.ISO8859-5
-+sr@cyrillic: sr_CS.ISO8859-5
-+sr_YU@cyrillic: sr_CS.ISO8859-5
-+sr_YU.iso88595@cyrillic: sr_CS.ISO8859-5
-+sr_YU.ISO-8859-5@cyrillic: sr_CS.ISO8859-5
-+sr_YU.ISO_8859-5@cyrillic: sr_CS.ISO8859-5
-+sr_YU.ISO8859-5@cyrillic: sr_CS.ISO8859-5
-+sr_YU.cp1251@cyrillic: sr_CS.CP1251
-+sr_YU.CP1251@cyrillic: sr_CS.CP1251
-+sr_YU.microsoftcp1251@cyrillic: sr_CS.CP1251
-+sr_YU.microsoft-cp1251@cyrillic: sr_CS.CP1251
-+sr_YU.MICROSOFT-CP1251@cyrillic: sr_CS.CP1251
-+sr_YU.utf8: sr_CS.UTF-8
-+sr_YU.UTF-8@cyrillic: sr_CS.UTF-8
-+ss: ss_ZA.ISO8859-1
-+ss_ZA: ss_ZA.ISO8859-1
-+ss_ZA.iso88591: ss_ZA.ISO8859-1
-+ss_ZA.ISO-8859-1: ss_ZA.ISO8859-1
-+ss_ZA.ISO_8859-1: ss_ZA.ISO8859-1
-+ss_ZA.utf8: ss_ZA.UTF-8
-+st: st_ZA.ISO8859-1
-+st_ZA: st_ZA.ISO8859-1
-+st_ZA.iso88591: st_ZA.ISO8859-1
-+st_ZA.ISO-8859-1: st_ZA.ISO8859-1
-+st_ZA.ISO_8859-1: st_ZA.ISO8859-1
-+st_ZA.utf8: st_ZA.UTF-8
-+sv_FI.iso885915@euro: sv_FI.ISO8859-15
-+sv_FI.ISO-8859-15@euro: sv_FI.ISO8859-15
-+sv_FI.ISO_8859-15@euro: sv_FI.ISO8859-15
- ss: ss_ZA.ISO8859-1
- ss_ZA: ss_ZA.ISO8859-1
- ss_ZA.iso88591: ss_ZA.ISO8859-1
-@@ -975,20 +1418,40 @@
- sv_SE.ISO-8859-15: sv_SE.ISO8859-15
- sv_SE@euro: sv_SE.ISO8859-15
- sv_SE.utf8: sv_SE.UTF-8
--ta: ta_IN.TSCII-0
--ta_IN: ta_IN.TSCII-0
-+ta: ta_IN.UTF-8
-+ta_IN: ta_IN.UTF-8
- ta_IN.tscii: ta_IN.TSCII-0
- ta_IN.tscii0: ta_IN.TSCII-0
--tg: tg_TJ.KOI8-C
--tg_TJ: tg_TJ.KOI8-C
--tg_TJ.koi8c: tg_TJ.KOI8-C
-+ta_IN.utf8: ta_IN.UTF-8
-+te: te_IN.UTF-8
-+te_IN: te_IN.UTF-8
-+te_IN.utf8: te_IN.UTF-8
-+tg: tg_TJ.KOI8-T
-+tg_TJ: tg_TJ.KOI8-T
-+tg_TJ.koi8c: tg_TJ.KOI8-K
-+tg_TJ.koi8k: tg_TJ.KOI8-K
-+tg_TJ.koi8t: tg_TJ.KOI8-T
-+tg_TJ.utf8: tg_TJ.UTF-8
- th: th_TH.ISO8859-11
- th_TH: th_TH.ISO8859-11
-+th_TH.iso885911: th_TH.ISO8859-11
- th_TH.ISO-8859-11: th_TH.ISO8859-11
-+th_TH.ISO_8859-11: th_TH.ISO8859-11
- th_TH.tis620: th_TH.TIS620
- th_TH.TIS-620: th_TH.TIS620
- th_TH.TACTIS: th_TH.TIS620
- th_TH.utf8: th_TH.UTF-8
-+ti: ti_ER.UTF-8
-+ti_ER: ti_ER.UTF-8
-+ti_ER.utf8: ti_ER.UTF-8
-+ti_ET: ti_ET.UTF-8
-+ti_ET.utf8: ti_ET.UTF-8
-+tig: tig_ER.UTF-8
-+tig_ER: tig_ER.UTF-8
-+tig_ER.utf8: tig_ER.UTF-8
-+tk: tk_TM.UTF-8
-+tk_TM: tk_TM.UTF-8
-+tk_TM.utf8: tk_TM.UTF-8
- tl: tl_PH.ISO8859-1
- tl_PH: tl_PH.ISO8859-1
- tl_PH.iso88591: tl_PH.ISO8859-1
-@@ -997,13 +1460,34 @@
- tn_ZA: tn_ZA.ISO8859-15
- tn_ZA.iso8859-15: tn_ZA.ISO8859-15
- tn_ZA.utf8: tn_ZA.UTF-8
-+tl_PH.ISO-8859-1: tl_PH.ISO8859-1
-+tl_PH.ISO_8859-1: tl_PH.ISO8859-1
-+tl_PH.utf8: tl_PH.UTF-8
-+tn: tn_ZA.ISO8859-10
-+tn_ZA: tn_ZA.ISO8859-10
-+tn_ZA.iso885910: tn_ZA.ISO8859-10
-+tn_ZA.ISO-8859-10: tn_ZA.ISO8859-10
-+tn_ZA.ISO_8859-10: tn_ZA.ISO8859-10
-+tn_ZA.utf8: tn_ZA.UTF-8
- tr: tr_TR.ISO8859-9
-+tr_CY: tr_CY.ISO8859-9
-+tr_CY.iso88599: tr_CY.ISO8859-9
-+tr_CY.ISO-8859-9: tr_CY.ISO8859-9
-+tr_CY.ISO_8859-9: tr_CY.ISO8859-9
-+tr_CY.utf8: tr_CY.UTF-8
- tr_TR: tr_TR.ISO8859-9
- TR_TR: tr_TR.ISO8859-9
- tr_TR.iso88599: tr_TR.ISO8859-9
- tr_TR.ISO-8859-9: tr_TR.ISO8859-9
-+tr_TR.ISO_8859-9: tr_TR.ISO8859-9
- tr_TR.utf8: tr_TR.UTF-8
- TR_TR.utf8: tr_TR.UTF-8
-+ts: ts_ZA.ISO8859-1
-+ts_ZA: ts_ZA.ISO8859-1
-+ts_ZA.iso88591: ts_ZA.ISO8859-1
-+ts_ZA.ISO-8859-1: ts_ZA.ISO8859-1
-+ts_ZA.ISO_8859-1: ts_ZA.ISO8859-1
-+ts_ZA.utf8: ts_ZA.UTF-8
- ts: ts_ZA.ISO8859-1
- ts_ZA: ts_ZA.ISO8859-1
- ts_ZA.iso88591: ts_ZA.ISO8859-1
-@@ -1011,10 +1495,14 @@
- tt: tt_RU.TATAR-CYR
- tt_RU: tt_RU.TATAR-CYR
- tt_RU.tatarcyr: tt_RU.TATAR-CYR
--tt_RU.koi8c: tt_RU.KOI8-C
-+tt_RU.koi8c: tt_RU.KOI8-K
-+tt_RU.koi8k: tt_RU.KOI8-K
-+tt_RU.utf8: tt_RU.UTF-8
- uk: uk_UA.KOI8-U
- uk_UA: uk_UA.KOI8-U
- uk_UA.iso88595: uk_UA.ISO8859-5
-+uk_UA.ISO-8859-5: uk_UA.ISO8859-5
-+uk_UA.ISO_8859-5: uk_UA.ISO8859-5
- uk_UA.koi8u: uk_UA.KOI8-U
- uk_UA.cp1251: uk_UA.CP1251
- uk_UA.microsoftcp1251: uk_UA.CP1251
-@@ -1027,8 +1515,24 @@
- ur_PK.microsoftcp1256: ur_PK.CP1256
- ur_PK.microsoft-cp1256: ur_PK.CP1256
- ur_PK.MICROSOFT-CP1256: ur_PK.CP1256
-+ur_PK.utf8: ur_PK.UTF-8
- uz: uz_UZ.UTF-8
- uz_UZ: uz_UZ.UTF-8
-+uz_UZ.iso88591: uz_UZ.ISO8859-1
-+uz_UZ.ISO-8859-1: uz_UZ.ISO8859-1
-+uz_UZ.ISO_8859-1: uz_UZ.ISO8859-1
-+uz_UZ.utf8: uz_UZ.UTF-8
-+uz@Latn: uz_UZ.ISO8859-1
-+uz_UZ@Latn: uz_UZ.ISO8859-1
-+uz@cyrillic: uz_UZ.UTF-8
-+uz_UZ@cyrillic: uz_UZ.UTF-8
-+uz_UZ.utf8@cyrillic: uz_UZ.UTF-8
-+ve: ve_ZA.UTF-8
-+ve_ZA: ve_ZA.UTF-8
-+ve_ZA.utf-8: ve_ZA.UTF-8
-+ven: ve_ZA.UTF-8
-+ven_ZA: ve_ZA.UTF-8
-+ven_ZA.utf-8: ve_ZA.UTF-8
- uz_UZ.ISO-8859-1: uz_UZ.ISO8859-1
- uz_UZ@cyrillic: uz_UZ.UTF-8
- uz_UZ.UTF-8@cyrillic: uz_UZ.UTF-8
-@@ -1041,6 +1545,7 @@
- VI_VN: vi_VN.TCVN
- vi_VN.tcvn: vi_VN.TCVN
- vi_VN.tcvn5712: vi_VN.TCVN
-+vi_VN.utf8: vi_VN.UTF-8
- vi_VN.viscii: vi_VN.VISCII
- vi_VN.viscii111: vi_VN.VISCII
- vi_VN.utf8: vi_VN.UTF-8
-@@ -1049,13 +1554,20 @@
- wa_BE: wa_BE.ISO8859-1
- wa_BE.iso88591: wa_BE.ISO8859-1
- wa_BE.ISO-8859-1: wa_BE.ISO8859-1
-+wa_BE.ISO_8859-1: wa_BE.ISO8859-1
- wa_BE.iso885915: wa_BE.ISO8859-15
- wa_BE.ISO-8859-15: wa_BE.ISO8859-15
-+wa_BE.ISO_8859-15: wa_BE.ISO8859-15
-+wa_BE.iso885915@euro: wa_BE.ISO8859-15
- wa_BE.ISO-8859-15@euro: wa_BE.ISO8859-15
-+wa_BE.ISO_8859-15@euro: wa_BE.ISO8859-15
- wa_BE@euro: wa_BE.ISO8859-15
-+wa_BE.utf8: wa_BE.UTF-8
- xh: xh_ZA.ISO8859-1
- xh_ZA: xh_ZA.ISO8859-1
- xh_ZA.iso88591: xh_ZA.ISO8859-1
-+xh_ZA.ISO-8859-1: xh_ZA.ISO8859-1
-+xh_ZA.ISO_8859-1: xh_ZA.ISO8859-1
- xh_ZA.utf8: xh_ZA.UTF-8
- yi: yi_US.CP1255
- yi_US: yi_US.CP1255
-@@ -1063,6 +1575,7 @@
- yi_US.microsoftcp1255: yi_US.CP1255
- yi_US.microsoft-cp1255: yi_US.CP1255
- yi_US.MICROSOFT-CP1255: yi_US.CP1255
-+yi_US.utf8: yi_US.UTF-8
- zh_CN: zh_CN.gb2312
- zh_CN.Big5: zh_TW.big5
- zh_CN.EUC: zh_CN.eucCN
-@@ -1074,8 +1587,10 @@
- zh_CN.utf8: zh_CN.UTF-8
- ZH_CN.UTF-8: zh_CN.UTF-8
- zh_HK: zh_HK.big5hkscs
-+zh_HK.big5-hkscs: zh_HK.big5hkscs
- zh_HK.Big5hkscs: zh_HK.big5hkscs
- zh_HK.Big5-hkscs: zh_HK.big5hkscs
-+zh_HK.Big5-HKSCS: zh_HK.big5hkscs
- zh_HK.Big5_hkscs: zh_HK.big5hkscs
- zh_HK.Big5HKSCS: zh_HK.big5hkscs
- zh_HK.BIG5-HKSCS: zh_HK.big5hkscs
-@@ -1083,6 +1598,10 @@
- zh_HK.Big5: zh_HK.big5
- zh_HK.utf8: zh_HK.UTF-8
- ZH_HK.UTF-8: zh_HK.UTF-8
-+zh_SG: zh_SG.gb2312
-+zh_SG.GB2312: zh_SG.gb2312
-+zh_SG.GBK: zh_SG.gbk
-+zh_SG.utf8: zh_SG.UTF-8
- ZH_SG.UTF-8: zh_SG.UTF-8
- zh_TW: zh_TW.big5
- zh_TW.Big5: zh_TW.big5
-@@ -1090,6 +1609,12 @@
- Zh_TW.big5: zh_TW.big5
- zh_TW.EUC: zh_TW.eucTW
- zh_TW.EUC-TW: zh_TW.eucTW
-+zu: zu_ZA.ISO8859-1
-+zu_ZA: zu_ZA.ISO8859-1
-+zu_ZA.iso88591: zu_ZA.ISO8859-1
-+zu_ZA.ISO-8859-1: zu_ZA.ISO8859-1
-+zu_ZA.ISO_8859-1: zu_ZA.ISO8859-1
-+zu_ZA.utf8: zu_ZA.UTF-8
- zh_TW.utf8: zh_TW.UTF-8
- ZH_TW.UTF-8: zh_TW.UTF-8
- zu: zu_ZA.ISO8859-1
---- X11-6.9.0/xc/nls/compose.dir.orig 2005-09-30 09:52:46.000000000 +0200
-+++ X11-6.9.0/xc/nls/compose.dir 2006-03-21 11:42:28.559062000 +0100
-@@ -7,8 +7,11 @@
- XCOMM $XFree86: xc/nls/compose.dir,v 1.24 2003/08/06 14:04:00 eich Exp $
- XCOMM
- iso8859-1/Compose: C
-+iso8859-1/Compose: aa_DJ.ISO8859-1
- iso8859-1/Compose: af_ZA.ISO8859-1
-+iso8859-15/Compose: an_ES.ISO8859-15
- iso8859-6/Compose: ar_AA.ISO8859-6
-+iso8859-6/Compose: ar_AE.ISO8859-6
- iso8859-6/Compose: ar_BH.ISO8859-6
- iso8859-6/Compose: ar_DZ.ISO8859-6
- iso8859-6/Compose: ar_EG.ISO8859-6
-@@ -21,17 +24,20 @@
- iso8859-6/Compose: ar_OM.ISO8859-6
- iso8859-6/Compose: ar_QA.ISO8859-6
- iso8859-6/Compose: ar_SA.ISO8859-6
-+iso8859-6/Compose: ar_SD.ISO8859-6
-+iso8859-6/Compose: ar_SY.ISO8859-6
- iso8859-6/Compose: ar_TN.ISO8859-6
- iso8859-6/Compose: ar_YE.ISO8859-6
- iso8859-9e/Compose: az_AZ.ISO8859-9E
--koi8-c/Compose: a3_AZ.KOI8-C
--microsoft-cp1251/Compose: be_BY.CP1251
-+koi8-c/Compose: az_AZ.KOI8-K
-+XCOMM microsoft-cp1251/Compose: be_BY.CP1251
- iso8859-5/Compose: bg_BG.ISO8859-5
--microsoft-cp1251/Compose: bg_BG.CP1251
-+XCOMM microsoft-cp1251/Compose: bg_BG.CP1251
- iso8859-1/Compose: br_FR.ISO8859-1
- iso8859-14/Compose: br_FR.ISO8859-14
- iso8859-15/Compose: br_FR.ISO8859-15
- iso8859-2/Compose: bs_BA.ISO8859-2
-+iso8859-2/Compose: bs_BA.ISO8859-2
- iso8859-1/Compose: ca_ES.ISO8859-1
- iso8859-15/Compose: ca_ES.ISO8859-15
- iso8859-2/Compose: cs_CZ.ISO8859-2
-@@ -42,6 +48,8 @@
- iso8859-15/Compose: da_DK.ISO8859-15
- iso8859-1/Compose: de_AT.ISO8859-1
- iso8859-15/Compose: de_AT.ISO8859-15
-+iso8859-1/Compose: de_BE.ISO8859-1
-+iso8859-15/Compose: de_BE.ISO8859-15
- iso8859-1/Compose: de_CH.ISO8859-1
- iso8859-15/Compose: de_CH.ISO8859-15
- iso8859-1/Compose: de_DE.ISO8859-1
-@@ -50,23 +58,30 @@
- iso8859-15/Compose: de_LI.ISO8859-15
- iso8859-1/Compose: de_LU.ISO8859-1
- iso8859-15/Compose: de_LU.ISO8859-15
-+iso8859-7/Compose: el_CY.ISO8859-7
- iso8859-7/Compose: el_GR.ISO8859-7
- iso8859-1/Compose: en_AU.ISO8859-1
-+iso8859-1/Compose: en_BE.ISO8859-1
-+iso8859-15/Compose: en_BE.ISO8859-15
-+iso8859-1/Compose: en_BW.ISO8859-1
- iso8859-1/Compose: en_BZ.ISO8859-1
- iso8859-1/Compose: en_CA.ISO8859-1
-+iso8859-1/Compose: en_DK.ISO8859-1
- iso8859-1/Compose: en_GB.ISO8859-1
- iso8859-15/Compose: en_GB.ISO8859-15
-+iso8859-1/Compose: en_HK.ISO8859-1
- iso8859-1/Compose: en_IE.ISO8859-1
- iso8859-15/Compose: en_IE.ISO8859-15
- iso8859-1/Compose: en_JM.ISO8859-1
- iso8859-1/Compose: en_NZ.ISO8859-1
-+iso8859-1/Compose: en_PH.ISO8859-1
-+iso8859-1/Compose: en_SG.ISO8859-1
- iso8859-1/Compose: en_TT.ISO8859-1
--iso8859-1/Compose: en_UK.ISO8859-1
--iso8859-15/Compose: en_UK.ISO8859-15
- iso8859-1/Compose: en_US.ISO8859-1
- iso8859-15/Compose: en_US.ISO8859-15
- iso8859-1/Compose: en_ZA.ISO8859-1
- iso8859-15/Compose: en_ZA.ISO8859-15
-+iso8859-1/Compose: en_ZW.ISO8859-1
- iso8859-3/Compose: eo_XX.ISO8859-3
- iso8859-1/Compose: es_AR.ISO8859-1
- iso8859-1/Compose: es_BO.ISO8859-1
-@@ -86,6 +101,7 @@
- iso8859-1/Compose: es_PR.ISO8859-1
- iso8859-1/Compose: es_PY.ISO8859-1
- iso8859-1/Compose: es_SV.ISO8859-1
-+iso8859-1/Compose: es_US.ISO8859-1
- iso8859-1/Compose: es_UY.ISO8859-1
- iso8859-1/Compose: es_VE.ISO8859-1
- iso8859-1/Compose: et_EE.ISO8859-1
-@@ -97,6 +113,7 @@
- isiri-3342/Compose: fa_IR.ISIRI-3342
- iso8859-1/Compose: fi_FI.ISO8859-1
- iso8859-15/Compose: fi_FI.ISO8859-15
-+iso8859-1/Compose: fil_PH.ISO8859-1
- iso8859-1/Compose: fo_FO.ISO8859-1
- iso8859-15/Compose: fo_FO.ISO8859-15
- iso8859-1/Compose: fr_BE.ISO8859-1
-@@ -121,9 +138,10 @@
- iso8859-14/Compose: gv_GB.ISO8859-14
- iso8859-15/Compose: gv_GB.ISO8859-15
- iso8859-8/Compose: he_IL.ISO8859-8
--microsoft-cp1255/Compose: he_IL.CP1255
-+XCOMM microsoft-cp1255/Compose: he_IL.CP1255
- iscii-dev/Compose: hi_IN.ISCII-DEV
- iso8859-2/Compose: hr_HR.ISO8859-2
-+iso8859-2/Compose: hsb_DE.ISO8859-2
- iso8859-2/Compose: hu_HU.ISO8859-2
- armscii-8/Compose: hy_AM.ARMSCII-8
- iso8859-1/Compose: id_ID.ISO8859-1
-@@ -139,65 +157,73 @@
- ja.JIS/Compose: ja_JP.JIS7
- georgian-academy/Compose: ka_GE.GEORGIAN-ACADEMY
- georgian-ps/Compose: ka_GE.GEORGIAN-PS
-+XCOMM pt-154/Compose: kk_KZ.PT154
- iso8859-1/Compose: kl_GL.ISO8859-1
- iso8859-15/Compose: kl_GL.ISO8859-15
-+ko/Compose: ko_KR.eucKR
- iso8859-1/Compose: kw_GB.ISO8859-1
- iso8859-14/Compose: kw_GB.ISO8859-14
- iso8859-15/Compose: kw_GB.ISO8859-15
--ko/Compose: ko_KR.eucKR
-+iso8859-10/Compose: lg_UG.ISO8859-10
-+iso8859-1/Compose: li_BE.ISO8859-1
-+iso8859-15/Compose: li_BE.ISO8859-15
-+iso8859-1/Compose: li_NL.ISO8859-1
-+iso8859-15/Compose: li_NL.ISO8859-15
- ibm-cp1133/Compose: lo_LA.IBM-CP1133
- mulelao-1/Compose: lo_LA.MULELAO-1
--iso8859-1/Compose: lt_LN.ISO8859-1
- iso8859-4/Compose: lt_LT.ISO8859-4
- iso8859-13/Compose: lt_LT.ISO8859-13
- iso8859-4/Compose: lv_LV.ISO8859-4
- iso8859-13/Compose: lv_LV.ISO8859-13
--iso8859-13/Compose: mi_NZ.ISO8859-13
-+iso8859-1/Compose: mi_NZ.ISO8859-1
- iso8859-5/Compose: mk_MK.ISO8859-5
--XCOMM mk_MK.UTF-8/Compose: mk_MK.UTF-8
--microsoft-cp1251/Compose: mk_MK.CP1251
-+XCOMM microsoft-cp1251/Compose: mk_MK.CP1251
- iso8859-1/Compose: ms_MY.ISO8859-1
- iso8859-3/Compose: mt_MT.ISO8859-3
-+iso8859-1/Compose: nb_NO.ISO8859-1
-+iso8859-15/Compose: nb_NO.ISO8859-15
-+iso8859-1/Compose: nds_DE.ISO8859-1
-+iso8859-15/Compose: nds_DE.ISO8859-15
- iso8859-1/Compose: nl_BE.ISO8859-1
- iso8859-15/Compose: nl_BE.ISO8859-15
- iso8859-1/Compose: nl_NL.ISO8859-1
- iso8859-15/Compose: nl_NL.ISO8859-15
--iso8859-1/Compose: no_NO.ISO8859-1
--iso8859-15/Compose: no_NO.ISO8859-15
--iso8859-1/Compose: nb_NO.ISO8859-1
--iso8859-15/Compose: nb_NO.ISO8859-15
- iso8859-1/Compose: nn_NO.ISO8859-1
- iso8859-15/Compose: nn_NO.ISO8859-15
- iso8859-1/Compose: nr_ZA.ISO8859-1
--iso8859-15/Compose: nso_ZA.ISO8859-15
--iso8859-1/Compose: ny_NO.ISO8859-1
--iso8859-15/Compose: ny_NO.ISO8859-15
-+iso8859-10/Compose: nso_ZA.ISO8859-10
- iso8859-1/Compose: oc_FR.ISO8859-1
- iso8859-15/Compose: oc_FR.ISO8859-15
-+iso8859-1/Compose: om_KE.ISO8859-1
-+iso8859-1/Compose: pap_AN.ISO8859-1
-+iso8859-15/Compose: pap_AN.ISO8859-15
- iso8859-1/Compose: pd_DE.ISO8859-1
- iso8859-1/Compose: pd_US.ISO8859-1
--iso8859-1/Compose: ph_PH.ISO8859-1
- iso8859-2/Compose: pl_PL.ISO8859-2
--iso8859-1/Compose: pp_AN.ISO8859-1
-+iso8859-16/Compose: pl_PL.ISO8859-16
- iso8859-1/Compose: pt_BR.ISO8859-1
- iso8859-15/Compose: pt_BR.ISO8859-15
- iso8859-1/Compose: pt_PT.ISO8859-1
- iso8859-15/Compose: pt_PT.ISO8859-15
- iso8859-2/Compose: ro_RO.ISO8859-2
-+iso8859-16/Compose: ro_RO.ISO8859-16
- koi8-r/Compose: ru_RU.KOI8-R
- iso8859-5/Compose: ru_RU.ISO8859-5
--microsoft-cp1251/Compose: ru_RU.CP1251
-+XCOMM microsoft-cp1251/Compose: ru_RU.CP1251
- koi8-u/Compose: ru_UA.KOI8-U
-+XCOMM microsoft-cp1251/Compose: ru_UA.CP1251
- iso8859-1/Compose: rw_RW.ISO8859-1
--iso8859-2/Compose: sh_YU.ISO8859-2
- iso8859-2/Compose: sk_SK.ISO8859-2
- iso8859-2/Compose: sl_CS.ISO8859-2
- iso8859-2/Compose: sl_SI.ISO8859-2
--iso8859-5/Compose: sp_YU.ISO8859-5
-+iso8859-16/Compose: sl_SI.ISO8859-16
-+iso8859-1/Compose: so_DJ.ISO8859-1
-+iso8859-1/Compose: so_KE.ISO8859-1
-+iso8859-1/Compose: so_SO.ISO8859-1
- iso8859-2/Compose: sq_AL.ISO8859-2
--iso8859-2/Compose: sr_SP.ISO8859-2
--iso8859-2/Compose: sr_YU.ISO8859-2
--iso8859-5/Compose: sr_YU.ISO8859-5
-+iso8859-2/Compose: sr_CS.ISO8859-2
-+iso8859-5/Compose: sr_CS.ISO8859-5
-+XCOMM microsoft-cp1251/Compose: sr_CS.CP1251
- iso8859-1/Compose: ss_ZA.ISO8859-1
- iso8859-1/Compose: st_ZA.ISO8859-1
- iso8859-1/Compose: sv_FI.ISO8859-1
-@@ -205,39 +231,52 @@
- iso8859-1/Compose: sv_SE.ISO8859-1
- iso8859-15/Compose: sv_SE.ISO8859-15
- tscii-0/Compose: ta_IN.TSCII-0
--koi8-c/Compose: tg_TJ.KOI8-C
-+koi8-c/Compose: tg_TJ.KOI8-K
-+XCOMM koi8-t/Compose: tg_TJ.KOI8-T
- iso8859-1/Compose: tl_PH.ISO8859-1
--iso8859-15/Compose: tn_ZA.ISO8859-15
-+iso8859-10/Compose: tn_ZA.ISO8859-10
-+iso8859-9/Compose: tr_CY.ISO8859-9
- iso8859-9/Compose: tr_TR.ISO8859-9
- iso8859-1/Compose: ts_ZA.ISO8859-1
- tatar-cyr/Compose: tt_RU.TATAR-CYR
--koi8-c/Compose: tt_RU.KOI8-C
-+koi8-c/Compose: tt_RU.KOI8-K
- koi8-u/Compose: uk_UA.KOI8-U
--microsoft-cp1256/Compose: ur_PK.CP1256
-+iso8859-5/Compose: uk_UA.ISO8859-5
-+XCOMM microsoft-cp1251/Compose: uk_UA.CP1251
-+XCOMM microsoft-cp1256/Compose: ur_PK.CP1256
-+iso8859-1/Compose: uz_UZ.ISO8859-1
- vi_VN.viscii/Compose: vi_VN.VISCII
- vi_VN.tcvn/Compose: vi_VN.TCVN
- iso8859-1/Compose: wa_BE.ISO8859-1
-+iso8859-15/Compose: wa_BE.ISO8859-15
- iso8859-1/Compose: xh_ZA.ISO8859-1
--microsoft-cp1255/Compose: yi_US.CP1256
-+XCOMM microsoft-cp1255/Compose: yi_US.CP1256
- zh_CN/Compose: zh_CN.eucCN
--zh_CN/Compose: zh_CN.GB2312
--zh_CN.gbk/Compose: zh_CN.GBK
--zh_CN.gb18030/Compose: zh_CN.GB18030
-+zh_CN/Compose: zh_CN.gb2312
-+zh_CN.gbk/Compose: zh_CN.gbk
-+zh_CN.gb18030/Compose: zh_CN.gb18030
-+zh_CN/Compose: zh_SG.gb2312
- zh_HK.big5/Compose: zh_HK.big5
- zh_HK.big5/Compose: zh_HK.Big5
- zh_HK.big5hkscs/Compose: zh_HK.big5hkscs
- zh_HK.big5hkscs/Compose: zh_HK.Big5HKSCS
- zh_TW.big5/Compose: zh_TW.big5
--zh_TW.big5/Compose: zh_TW.Big5
- zh_TW/Compose: zh_TW.eucTW
- iso8859-1/Compose: zu_ZA.ISO8859-1
- XCOMM
- XCOMM
-+en_US.UTF-8/Compose: aa_DJ.UTF-8
-+en_US.UTF-8/Compose: aa_ER.UTF-8
-+en_US.UTF-8/Compose: aa_ET.UTF-8
- en_US.UTF-8/Compose: af_ZA.UTF-8
-+en_US.UTF-8/Compose: am_ET.UTF-8
-+en_US.UTF-8/Compose: an_ES.UTF-8
- en_US.UTF-8/Compose: ar_AA.UTF-8
-+en_US.UTF-8/Compose: ar_AE.UTF-8
- en_US.UTF-8/Compose: ar_BH.UTF-8
- en_US.UTF-8/Compose: ar_DZ.UTF-8
- en_US.UTF-8/Compose: ar_EG.UTF-8
-+en_US.UTF-8/Compose: ar_IN.UTF-8
- en_US.UTF-8/Compose: ar_IQ.UTF-8
- en_US.UTF-8/Compose: ar_JO.UTF-8
- en_US.UTF-8/Compose: ar_KW.UTF-8
-@@ -247,19 +286,23 @@
- en_US.UTF-8/Compose: ar_OM.UTF-8
- en_US.UTF-8/Compose: ar_QA.UTF-8
- en_US.UTF-8/Compose: ar_SA.UTF-8
-+en_US.UTF-8/Compose: ar_SD.UTF-8
-+en_US.UTF-8/Compose: ar_SY.UTF-8
- en_US.UTF-8/Compose: ar_TN.UTF-8
- en_US.UTF-8/Compose: ar_YE.UTF-8
- en_US.UTF-8/Compose: bs_BA.UTF-8
- en_US.UTF-8/Compose: az_AZ.UTF-8
--en_US.UTF-8/Compose: a3_AZ.UTF-8
- en_US.UTF-8/Compose: be_BY.UTF-8
- en_US.UTF-8/Compose: bg_BG.UTF-8
-+en_US.UTF-8/Compose: bn_BD.UTF-8
- en_US.UTF-8/Compose: bn_IN.UTF-8
- en_US.UTF-8/Compose: br_FR.UTF-8
-+en_US.UTF-8/Compose: bs_BA.UTF-8
-+en_US.UTF-8/Compose: byn_ER.UTF-8
- en_US.UTF-8/Compose: ca_ES.UTF-8
- en_US.UTF-8/Compose: cs_CZ.UTF-8
-+en_US.UTF-8/Compose: csb_PL.UTF-8
- en_US.UTF-8/Compose: cy_GB.UTF-8
--en_US.UTF-8/Compose: cz_CZ.UTF-8
- en_US.UTF-8/Compose: da_DK.UTF-8
- en_US.UTF-8/Compose: de_AT.UTF-8
- en_US.UTF-8/Compose: de_BE.UTF-8
-@@ -267,18 +310,26 @@
- en_US.UTF-8/Compose: de_DE.UTF-8
- en_US.UTF-8/Compose: de_LI.UTF-8
- en_US.UTF-8/Compose: de_LU.UTF-8
-+el_GR.UTF-8/Compose: el_CY.UTF-8
- el_GR.UTF-8/Compose: el_GR.UTF-8
- en_US.UTF-8/Compose: en_AU.UTF-8
-+en_US.UTF-8/Compose: en_BE.UTF-8
-+en_US.UTF-8/Compose: en_BW.UTF-8
- en_US.UTF-8/Compose: en_BZ.UTF-8
- en_US.UTF-8/Compose: en_CA.UTF-8
-+en_US.UTF-8/Compose: en_DK.UTF-8
- en_US.UTF-8/Compose: en_GB.UTF-8
-+en_US.UTF-8/Compose: en_HK.UTF-8
- en_US.UTF-8/Compose: en_IE.UTF-8
-+en_US.UTF-8/Compose: en_IN.UTF-8
- en_US.UTF-8/Compose: en_JM.UTF-8
- en_US.UTF-8/Compose: en_NZ.UTF-8
-+en_US.UTF-8/Compose: en_PH.UTF-8
-+en_US.UTF-8/Compose: en_SG.UTF-8
- en_US.UTF-8/Compose: en_TT.UTF-8
--en_US.UTF-8/Compose: en_UK.UTF-8
- en_US.UTF-8/Compose: en_US.UTF-8
- en_US.UTF-8/Compose: en_ZA.UTF-8
-+en_US.UTF-8/Compose: en_ZW.UTF-8
- en_US.UTF-8/Compose: eo_XX.UTF-8
- en_US.UTF-8/Compose: es_AR.UTF-8
- en_US.UTF-8/Compose: es_BO.UTF-8
-@@ -297,12 +348,14 @@
- en_US.UTF-8/Compose: es_PR.UTF-8
- en_US.UTF-8/Compose: es_PY.UTF-8
- en_US.UTF-8/Compose: es_SV.UTF-8
-+en_US.UTF-8/Compose: es_US.UTF-8
- en_US.UTF-8/Compose: es_UY.UTF-8
- en_US.UTF-8/Compose: es_VE.UTF-8
- en_US.UTF-8/Compose: et_EE.UTF-8
- en_US.UTF-8/Compose: eu_ES.UTF-8
- en_US.UTF-8/Compose: fa_IR.UTF-8
- en_US.UTF-8/Compose: fi_FI.UTF-8
-+en_US.UTF-8/Compose: fil_PH.UTF-8
- en_US.UTF-8/Compose: fo_FO.UTF-8
- en_US.UTF-8/Compose: fr_BE.UTF-8
- en_US.UTF-8/Compose: fr_CA.UTF-8
-@@ -311,12 +364,15 @@
- en_US.UTF-8/Compose: fr_LU.UTF-8
- en_US.UTF-8/Compose: ga_IE.UTF-8
- en_US.UTF-8/Compose: gd_GB.UTF-8
-+en_US.UTF-8/Compose: gez_ER.UTF-8
- en_US.UTF-8/Compose: gl_ES.UTF-8
- en_US.UTF-8/Compose: gu_IN.UTF-8
-+en_US.UTF-8/Compose: gu_IN.UTF-8
- en_US.UTF-8/Compose: gv_GB.UTF-8
- en_US.UTF-8/Compose: he_IL.UTF-8
- en_US.UTF-8/Compose: hi_IN.UTF-8
- en_US.UTF-8/Compose: hr_HR.UTF-8
-+en_US.UTF-8/Compose: hsb_DE.UTF-8
- en_US.UTF-8/Compose: hu_HU.UTF-8
- en_US.UTF-8/Compose: hy_AM.UTF-8
- en_US.UTF-8/Compose: id_ID.UTF-8
-@@ -326,30 +382,42 @@
- en_US.UTF-8/Compose: iu_CA.UTF-8
- en_US.UTF-8/Compose: ja_JP.UTF-8
- en_US.UTF-8/Compose: ka_GE.UTF-8
-+en_US.UTF-8/Compose: kk_KZ.UTF-8
- en_US.UTF-8/Compose: kl_GL.UTF-8
-+en_US.UTF-8/Compose: kn_IN.UTF-8
- en_US.UTF-8/Compose: ko_KR.UTF-8
- en_US.UTF-8/Compose: kw_GB.UTF-8
- en_US.UTF-8/Compose: ky_KG.UTF-8
-+en_US.UTF-8/Compose: lg_UG.UTF-8
-+en_US.UTF-8/Compose: li_BE.UTF-8
-+en_US.UTF-8/Compose: li_NL.UTF-8
- en_US.UTF-8/Compose: lo_LA.UTF-8
- en_US.UTF-8/Compose: lt_LT.UTF-8
- en_US.UTF-8/Compose: lv_LV.UTF-8
- en_US.UTF-8/Compose: mi_NZ.UTF-8
- en_US.UTF-8/Compose: mk_MK.UTF-8
-+en_US.UTF-8/Compose: ml_IN.UTF-8
-+en_US.UTF-8/Compose: mn_MN.UTF-8
-+en_US.UTF-8/Compose: mr_IN.UTF-8
- en_US.UTF-8/Compose: ms_MY.UTF-8
-+en_US.UTF-8/Compose: mt_MT.UTF-8
-+en_US.UTF-8/Compose: nb_NO.UTF-8
-+en_US.UTF-8/Compose: nds_DE.UTF-8
-+en_US.UTF-8/Compose: ne_NP.UTF-8
- en_US.UTF-8/Compose: nl_BE.UTF-8
- en_US.UTF-8/Compose: nl_NL.UTF-8
--en_US.UTF-8/Compose: no_NO.UTF-8
--en_US.UTF-8/Compose: nb_NO.UTF-8
-+en_US.UTF-8/Compose: nn_NO.UTF-8
- en_US.UTF-8/Compose: nr_ZA.UTF-8
- en_US.UTF-8/Compose: nso_ZA.UTF-8
--en_US.UTF-8/Compose: ny_NO.UTF-8
- en_US.UTF-8/Compose: oc_FR.UTF-8
-+en_US.UTF-8/Compose: om_ET.UTF-8
-+en_US.UTF-8/Compose: om_KE.UTF-8
-+en_US.UTF-8/Compose: or_IN.UTF-8
- en_US.UTF-8/Compose: pa_IN.UTF-8
-+en_US.UTF-8/Compose: pap_AN.UTF-8
- en_US.UTF-8/Compose: pd_DE.UTF-8
- en_US.UTF-8/Compose: pd_US.UTF-8
--en_US.UTF-8/Compose: ph_PH.UTF-8
- en_US.UTF-8/Compose: pl_PL.UTF-8
--en_US.UTF-8/Compose: pp_AN.UTF-8
- pt_BR.UTF-8/Compose: pt_BR.UTF-8
- en_US.UTF-8/Compose: pt_PT.UTF-8
- en_US.UTF-8/Compose: ro_RO.UTF-8
-@@ -357,19 +425,35 @@
- en_US.UTF-8/Compose: ru_UA.UTF-8
- en_US.UTF-8/Compose: rw_RW.UTF-8
- en_US.UTF-8/Compose: si_LK.UTF-8
-+en_US.UTF-8/Compose: rw_RW.UTF-8
-+en_US.UTF-8/Compose: se_NO.UTF-8
-+en_US.UTF-8/Compose: si_LK.UTF-8
-+en_US.UTF-8/Compose: sid_ET.UTF-8
- en_US.UTF-8/Compose: sk_SK.UTF-8
- en_US.UTF-8/Compose: sl_SI.UTF-8
-+en_US.UTF-8/Compose: so_DJ.UTF-8
-+en_US.UTF-8/Compose: so_ET.UTF-8
-+en_US.UTF-8/Compose: so_KE.UTF-8
-+en_US.UTF-8/Compose: so_SO.UTF-8
- en_US.UTF-8/Compose: sq_AL.UTF-8
--en_US.UTF-8/Compose: sr_YU.UTF-8
-+en_US.UTF-8/Compose: sr_CS.UTF-8
-+en_US.UTF-8/Compose: ss_ZA.UTF-8
-+en_US.UTF-8/Compose: st_ZA.UTF-8
- en_US.UTF-8/Compose: ss_ZA.UTF-8
- en_US.UTF-8/Compose: st_ZA.UTF-8
- en_US.UTF-8/Compose: sv_FI.UTF-8
- en_US.UTF-8/Compose: sv_SE.UTF-8
- en_US.UTF-8/Compose: ta_IN.UTF-8
-+en_US.UTF-8/Compose: te_IN.UTF-8
- en_US.UTF-8/Compose: tg_TJ.UTF-8
- en_US.UTF-8/Compose: th_TH.UTF-8
-+en_US.UTF-8/Compose: ti_ER.UTF-8
-+en_US.UTF-8/Compose: ti_ET.UTF-8
-+en_US.UTF-8/Compose: tig_ER.UTF-8
-+en_US.UTF-8/Compose: tk_TM.UTF-8
- en_US.UTF-8/Compose: tl_PH.UTF-8
- en_US.UTF-8/Compose: tn_ZA.UTF-8
-+en_US.UTF-8/Compose: tr_CY.UTF-8
- en_US.UTF-8/Compose: tr_TR.UTF-8
- en_US.UTF-8/Compose: ts_ZA.UTF-8
- en_US.UTF-8/Compose: tt_RU.UTF-8
-@@ -377,9 +461,12 @@
- en_US.UTF-8/Compose: ur_PK.UTF-8
- en_US.UTF-8/Compose: uz_UZ.UTF-8
- en_US.UTF-8/Compose: ve_ZA.UTF-8
-+en_US.UTF-8/Compose: ve_ZA.UTF-8
- en_US.UTF-8/Compose: vi_VN.UTF-8
- en_US.UTF-8/Compose: wa_BE.UTF-8
-+en_US.UTF-8/Compose: xh_ZA.UTF-8
- en_US.UTF-8/Compose: yi_US.UTF-8
-+en_US.UTF-8/Compose: zu_ZA.UTF-8
- en_US.UTF-8/Compose: xh_ZA.UTF-8
- en_US.UTF-8/Compose: zh_TW.UTF-8
- en_US.UTF-8/Compose: zu_ZA.UTF-8
---- X11-6.8.1/xc/nls/XLC_LOCALE/Imakefile~ 2004-11-23 13:42:45.000000000 +0100
-+++ X11-6.8.1/xc/nls/XLC_LOCALE/Imakefile 2004-11-23 13:42:45.000000000 +0100
-@@ -55,6 +55,7 @@
- LTarget(iso8859-13)
- LTarget(iso8859-14)
- LTarget(iso8859-15)
-+LTarget(iso8859-16)
- LTarget(iso8859-9e)
- LTarget(ja)
- LTarget(ja.JIS)
---- X11-6.8.1/xc/nls/XI18N_OBJS/Imakefile~ 2004-11-23 13:42:29.000000000 +0100
-+++ X11-6.8.1/xc/nls/XI18N_OBJS/Imakefile 2004-11-23 13:42:29.000000000 +0100
-@@ -43,6 +43,7 @@
- XI18NTarget(iso8859-13)
- XI18NTarget(iso8859-14)
- XI18NTarget(iso8859-15)
-+XI18NTarget(iso8859-16)
- XI18NTarget(iso8859-9e)
- XI18NTarget(ja)
- XI18NTarget(ja.JIS)
---- X11-6.8.1/xc/nls/Compose/Imakefile~ 2004-11-23 13:42:14.000000000 +0100
-+++ X11-6.8.1/xc/nls/Compose/Imakefile 2004-11-23 13:42:14.000000000 +0100
-@@ -47,6 +47,7 @@
- ComposeTarget(iso8859-13)
- ComposeTarget(iso8859-14)
- ComposeTarget(iso8859-15)
-+ComposeTarget(iso8859-16)
- ComposeTarget(iso8859-9e)
- ComposeTarget(ja)
- ComposeTarget(ja.JIS)
---- X11-6.8.1/xc/nls/Compose/koi8-t.orig 1970-01-01 01:00:00.000000000 +0100
-+++ X11-6.8.1/xc/nls/Compose/koi8-t 2004-11-23 22:57:41.000000000 +0100
-@@ -0,0 +1,72 @@
-+#
-+# koi8-t Compose Sequence
-+#
-+# Sequence Definition
-+#
-+
-+# <Multi_key> Means <Compose>
-+# Special Character
-+<Multi_key> <plus> <plus> : "#" numbersign
-+<Multi_key> <apostrophe> <space> : "'" apostrophe
-+<Multi_key> <space> <apostrophe> : "'" apostrophe
-+<Multi_key> <A> <T> : "@" at
-+<Multi_key> <parenleft> <parenleft> : "[" bracketleft
-+<Multi_key> <slash> <slash> : "\\" backslash
-+<Multi_key> <slash> <less> : "\\" backslash
-+<Multi_key> <less> <slash> : "\\" backslash
-+<Multi_key> <parenright> <parenright> : "]" bracketright
-+<Multi_key> <asciicircum> <space> : "^" asciicircum
-+<Multi_key> <space> <asciicircum> : "^" asciicircum
-+<Multi_key> <greater> <space> : "^" asciicircum
-+<Multi_key> <space> <greater> : "^" asciicircum
-+<Multi_key> <grave> <space> : "`" grave
-+<Multi_key> <space> <grave> : "`" grave
-+<Multi_key> <parenleft> <minus> : "{" braceleft
-+<Multi_key> <minus> <parenleft> : "{" braceleft
-+<Multi_key> <slash> <asciicircum> : "|" bar
-+<Multi_key> <asciicircum> <slash> : "|" bar
-+<Multi_key> <V> <L> : "|" bar
-+<Multi_key> <L> <V> : "|" bar
-+<Multi_key> <v> <l> : "|" bar
-+<Multi_key> <l> <v> : "|" bar
-+<Multi_key> <parenright> <minus> : "}" braceright
-+<Multi_key> <minus> <parenright> : "}" braceright
-+<Multi_key> <asciitilde> <space> : "~" asciitilde
-+<Multi_key> <space> <asciitilde> : "~" asciitilde
-+<Multi_key> <minus> <space> : "~" asciitilde
-+<Multi_key> <space> <minus> : "~" asciitilde
-+
-+<Multi_key> <space> <space> : "\240" nobreakspace
-+
-+<Multi_key> <Cyrillic_ka> <comma> : "\200" Cyrillic_ka_descender
-+<Multi_key> <Cyrillic_ghe> <minus> : "\201" Cyrillic_ghe_bar
-+<Multi_key> <Cyrillic_GHE> <minus> : "\203" Cyrillic_GHE_bar
-+<Multi_key> <Cyrillic_ha> <comma> : "\212" Cyrillic_ha_descender
-+<Multi_key> <Cyrillic_HA> <comma> : "\214" Cyrillic_HA_descender
-+<Multi_key> <Cyrillic_che> <comma> : "\215" Cyrillic_che_descender
-+<Multi_key> <Cyrillic_CHE> <comma> : "\216" Cyrillic_CHE_descender
-+<Multi_key> <Cyrillic_KA> <comma> : "\220" Cyrillic_KA_descender
-+<Multi_key> <Cyrillic_u> <minus> : "\241" Cyrillic_u_macron
-+<Multi_key> <Cyrillic_U> <minus> : "\242" Cyrillic_U_macron
-+<Multi_key> <Cyrillic_shorti> <Cyrillic_o> : "\243" Cyrillic_io
-+<Multi_key> <Cyrillic_je> <Cyrillic_o> : "\243" Cyrillic_io
-+<Multi_key> <Cyrillic_ie> <colon> : "\243" Cyrillic_io
-+<Multi_key> <Cyrillic_i> <minus> : "\245" Cyrillic_i_macron
-+<Multi_key> <Cyrillic_SHORTI> <Cyrillic_O> : "\263" Cyrillic_IO
-+<Multi_key> <Cyrillic_JE> <Cyrillic_O> : "\263" Cyrillic_IO
-+<Multi_key> <Cyrillic_IE> <colon> : "\263" Cyrillic_IO
-+<Multi_key> <Cyrillic_I> <minus> : "\265" Cyrillic_I_macron
-+<Multi_key> <Cyrillic_shorti> <Cyrillic_u> : "\300" Cyrillic_yu
-+<Multi_key> <Cyrillic_je> <Cyrillic_u> : "\300" Cyrillic_yu
-+<Multi_key> <Cyrillic_te> <Cyrillic_es> : "\303" Cyrillic_tse
-+<Multi_key> <Cyrillic_shorti> <Cyrillic_a> : "\321" Cyrillic_ya
-+<Multi_key> <Cyrillic_je> <Cyrillic_a> : "\321" Cyrillic_ya
-+<Multi_key> <Cyrillic_sha> <comma> : "\335" Cyrillic_shcha
-+<Multi_key> <Cyrillic_SHORTI> <Cyrillic_U> : "\340" Cyrillic_YU
-+<Multi_key> <Cyrillic_JE> <Cyrillic_U> : "\340" Cyrillic_YU
-+<Multi_key> <Cyrillic_TE> <Cyrillic_ES> : "\343" Cyrillic_TSE
-+<Multi_key> <Cyrillic_SHORTI> <Cyrillic_A> : "\361" Cyrillic_YA
-+<Multi_key> <Cyrillic_JE> <Cyrillic_A> : "\361" Cyrillic_YA
-+<Multi_key> <Cyrillic_SHA> <comma> : "\375" Cyrillic_SHCHA
-+
-+# End of Sequence Definition
---- X11-6.8.1/xc/nls/XI18N_OBJS/koi8-t.orig 1970-01-01 01:00:00.000000000 +0100
-+++ X11-6.8.1/xc/nls/XI18N_OBJS/koi8-t 2004-11-23 22:57:37.000000000 +0100
-@@ -0,0 +1,7 @@
-+# CATEGORY(XLC|XIM|OM) SHARED_LIBRARY_NAME FUNCTION_NAME
-+#
-+# XI18N objects table for koi8-t locale
-+#
-+XLC common/xlcDef _XlcDefaultLoader # XLC_open
-+XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister
-+XOM common/xomGeneric _XomGenericOpenOM # XOM_open
---- X11-6.8.1/xc/nls/XLC_LOCALE/koi8-t.orig 1970-01-01 01:00:00.000000000 +0100
-+++ X11-6.8.1/xc/nls/XLC_LOCALE/koi8-t 2004-11-23 22:57:33.000000000 +0100
-@@ -0,0 +1,70 @@
-+# XLocale Database Sample for koi8-t.
-+#
-+
-+#
-+# XLC_FONTSET category
-+#
-+XLC_FONTSET
-+# fs0 class (7 bit ASCII)
-+fs0 {
-+ charset {
-+ name ISO8859-1:GL
-+ }
-+ font {
-+ primary KOI8-T:GL
-+ substitute ISO8859-1:GL
-+ }
-+}
-+# fs1 class
-+fs1 {
-+ charset KOI8-T:GR
-+ font KOI8-T:GR
-+}
-+END XLC_FONTSET
-+
-+#
-+# XLC_CHARSET_DEFINE category
-+#
-+XLC_CHARSET_DEFINE
-+csd0 {
-+ charset_name KOI8-T
-+ side GR
-+ length 1
-+ string_encoding False
-+ sequence \x1b%/1
-+}
-+END XLC_CHARSET_DEFINE
-+
-+#
-+# XLC_XLOCALE category
-+#
-+XLC_XLOCALE
-+
-+encoding_name KOI8-T
-+mb_cur_max 1
-+state_depend_encoding False
-+
-+wc_encoding_mask \x30000000
-+wc_shift_bits 7
-+
-+use_stdc_env True
-+
-+
-+# cs0 class
-+cs0 {
-+ side GL:Default
-+ length 1
-+ wc_encoding \x00000000
-+ ct_encoding KOI8-T:GL; ISO8859-1:GL
-+}
-+
-+
-+# cs1 class
-+cs1 {
-+ side GR:Default
-+ length 1
-+ wc_encoding \x30000000
-+ ct_encoding KOI8-T:GR
-+}
-+
-+END XLC_XLOCALE
+++ /dev/null
-diff -Naur xc.orig/programs/Xserver/hw/xfree86/drivers/i810/common.h xc/programs/Xserver/hw/xfree86/drivers/i810/common.h
---- xc.orig/programs/Xserver/hw/xfree86/drivers/i810/common.h 2006-01-19 03:39:29.000000000 -0800
-+++ xc/programs/Xserver/hw/xfree86/drivers/i810/common.h 2006-01-19 03:46:54.000000000 -0800
-@@ -322,6 +322,11 @@
- #define PCI_CHIP_I945_G_BRIDGE 0x2770
- #endif
-
-+#ifndef PCI_CHIP_I945_GM
-+#define PCI_CHIP_I945_GM 0x27A2
-+#define PCI_CHIP_I945_GM_BRIDGE 0x27A0
-+#endif
-+
- #define IS_I810(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I810 || \
- pI810->PciInfo->chipType == PCI_CHIP_I810_DC100 || \
- pI810->PciInfo->chipType == PCI_CHIP_I810_E)
-@@ -335,8 +340,10 @@
- #define IS_I915G(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I915_G || pI810->PciInfo->chipType == PCI_CHIP_E7221_G)
- #define IS_I915GM(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I915_GM)
- #define IS_I945G(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I945_G)
-+#define IS_I945GM(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I945_GM)
-+#define IS_I9XX(pI810) (IS_I915G(pI810) || IS_I915GM(pI810) || IS_I945G(pI810) || IS_I945GM(pI810))
-
--#define IS_MOBILE(pI810) (IS_I830(pI810) || IS_I85X(pI810) || IS_I915GM(pI810))
-+#define IS_MOBILE(pI810) (IS_I830(pI810) || IS_I85X(pI810) || IS_I915GM(pI810) || IS_I945GM(pI810))
-
- #define GTT_PAGE_SIZE KB(4)
- #define ROUND_TO(x, y) (((x) + (y) - 1) / (y) * (y))
-diff -Naur xc.orig/programs/Xserver/hw/xfree86/drivers/i810/i810.man xc/programs/Xserver/hw/xfree86/drivers/i810/i810.man
---- xc.orig/programs/Xserver/hw/xfree86/drivers/i810/i810.man 2006-01-19 03:39:29.000000000 -0800
-+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i810.man 2006-01-19 03:56:24.000000000 -0800
-@@ -25,7 +25,7 @@
- .SH SUPPORTED HARDWARE
- .B i810
- supports the i810, i810-DC100, i810e, i815, 830M, 845G, 852GM, 855GM,
--865G, 915G and 915GM chipsets.
-+865G, 915G, 915GM, 945G and 945GM chipsets.
-
- .SH CONFIGURATION DETAILS
- Please refer to __xconfigfile__(__filemansuffix__) for general configuration
-@@ -210,5 +210,5 @@
- Jeff Hartmann, Mark Vojkovich, Alan Hourihane, H. J. Lu. 830M and 845G
- support reworked for XFree86 4.3 by David Dawes and Keith Whitwell.
- 852GM, 855GM, and 865G support added by David Dawes and Keith Whitwell.
--915G and 915GM support added by Alan Hourihane and Keith Whitwell.
-+915G, 915GM, 945G and 945GM support added by Alan Hourihane and Keith Whitwell.
- Dual Head, Clone and lid status support added by Alan Hourihane.
-diff -Naur xc.orig/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c
---- xc.orig/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c 2006-01-19 03:39:29.000000000 -0800
-+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c 2006-01-19 03:46:54.000000000 -0800
-@@ -136,6 +136,7 @@
- {PCI_CHIP_E7221_G, "E7221 (i915)"},
- {PCI_CHIP_I915_GM, "915GM"},
- {PCI_CHIP_I945_G, "945G"},
-+ {PCI_CHIP_I945_GM, "945GM"},
- {-1, NULL}
- };
-
-@@ -154,6 +155,7 @@
- {PCI_CHIP_E7221_G, PCI_CHIP_E7221_G, RES_SHARED_VGA},
- {PCI_CHIP_I915_GM, PCI_CHIP_I915_GM, RES_SHARED_VGA},
- {PCI_CHIP_I945_G, PCI_CHIP_I945_G, RES_SHARED_VGA},
-+ {PCI_CHIP_I945_GM, PCI_CHIP_I945_GM, RES_SHARED_VGA},
- {-1, -1, RES_UNDEFINED }
- };
-
-@@ -569,6 +571,7 @@
- case PCI_CHIP_E7221_G:
- case PCI_CHIP_I915_GM:
- case PCI_CHIP_I945_G:
-+ case PCI_CHIP_I945_GM:
- xf86SetEntitySharable(usedChips[i]);
-
- /* Allocate an entity private if necessary */
-diff -Naur xc.orig/programs/Xserver/hw/xfree86/drivers/i810/i830_cursor.c xc/programs/Xserver/hw/xfree86/drivers/i810/i830_cursor.c
---- xc.orig/programs/Xserver/hw/xfree86/drivers/i810/i830_cursor.c 2006-01-19 03:39:29.000000000 -0800
-+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i830_cursor.c 2006-01-19 03:46:54.000000000 -0800
-@@ -86,7 +86,7 @@
-
- DPRINTF(PFX, "I830InitHWCursor\n");
- /* Initialise the HW cursor registers, leaving the cursor hidden. */
-- if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830)) {
-+ if (IS_MOBILE(pI830) || IS_I9XX(pI830)) {
- temp = INREG(CURSOR_A_CONTROL);
- temp &= ~(CURSOR_MODE | MCURSOR_GAMMA_ENABLE | MCURSOR_MEM_TYPE_LOCAL |
- MCURSOR_PIPE_SELECT);
-@@ -308,7 +308,7 @@
- }
-
- /* have to upload the base for the new position */
-- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
-+ if (IS_I9XX(pI830)) {
- if (pI830->CursorIsARGB)
- OUTREG(CURSOR_A_BASE, pI830->CursorMemARGB->Physical);
- else
-@@ -339,7 +339,7 @@
- pI830->CursorMemARGB->Physical, pI830->CursorMemARGB->Start);
-
- pI830->cursorOn = TRUE;
-- if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830)) {
-+ if (IS_MOBILE(pI830) || IS_I9XX(pI830)) {
- temp = INREG(CURSOR_A_CONTROL);
- temp &= ~(CURSOR_MODE | MCURSOR_PIPE_SELECT);
- if (pI830->CursorIsARGB)
-@@ -387,7 +387,7 @@
- DPRINTF(PFX, "I830HideCursor\n");
-
- pI830->cursorOn = FALSE;
-- if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830)) {
-+ if (IS_MOBILE(pI830) || IS_I9XX(pI830)) {
- temp = INREG(CURSOR_A_CONTROL);
- temp &= ~CURSOR_MODE;
- temp |= CURSOR_MODE_DISABLE;
-diff -Naur xc.orig/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c
---- xc.orig/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c 2006-01-19 03:39:29.000000000 -0800
-+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c 2006-01-19 03:46:54.000000000 -0800
-@@ -146,6 +146,9 @@
- *
- * 30/2005 Alan Hourihane
- * - Add Intel(R) 945G support.
-+ *
-+ * 01/2006 Alan Hourihane & Charles Johnson
-+ * - Add Intel(R) 945GM support.
- */
-
- #ifdef HAVE_CONFIG_H
-@@ -196,6 +199,7 @@
- {PCI_CHIP_E7221_G, "E7221 (i915)"},
- {PCI_CHIP_I915_GM, "915GM"},
- {PCI_CHIP_I945_G, "945G"},
-+ {PCI_CHIP_I945_GM, "945GM"},
- {-1, NULL}
- };
-
-@@ -208,6 +212,7 @@
- {PCI_CHIP_E7221_G, PCI_CHIP_E7221_G, RES_SHARED_VGA},
- {PCI_CHIP_I915_GM, PCI_CHIP_I915_GM, RES_SHARED_VGA},
- {PCI_CHIP_I945_G, PCI_CHIP_I945_G, RES_SHARED_VGA},
-+ {PCI_CHIP_I945_GM, PCI_CHIP_I945_GM, RES_SHARED_VGA},
- {-1, -1, RES_UNDEFINED}
- };
-
-@@ -1323,7 +1328,7 @@
- * The GTT varying according the the FbMapSize and the popup is 4KB */
- range = (pI830->FbMapSize / (1024*1024)) + 4;
-
-- if (IS_I85X(pI830) || IS_I865G(pI830) || IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
-+ if (IS_I85X(pI830) || IS_I865G(pI830) || IS_I9XX(pI830)) {
- switch (gmch_ctrl & I830_GMCH_GMS_MASK) {
- case I855_GMCH_GMS_STOLEN_1M:
- memsize = MB(1) - KB(range);
-@@ -1341,11 +1346,11 @@
- memsize = MB(32) - KB(range);
- break;
- case I915G_GMCH_GMS_STOLEN_48M:
-- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))
-+ if (IS_I9XX(pI830))
- memsize = MB(48) - KB(range);
- break;
- case I915G_GMCH_GMS_STOLEN_64M:
-- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))
-+ if (IS_I9XX(pI830))
- memsize = MB(64) - KB(range);
- break;
- }
-@@ -2090,6 +2095,9 @@
- case PCI_CHIP_I945_G:
- chipname = "945G";
- break;
-+ case PCI_CHIP_I945_GM:
-+ chipname = "945GM";
-+ break;
- default:
- chipname = "unknown chipset";
- break;
-@@ -2127,7 +2135,7 @@
- pI830->LinearAddr = pI830->pEnt->device->MemBase;
- from = X_CONFIG;
- } else {
-- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
-+ if (IS_I9XX(pI830)) {
- pI830->LinearAddr = pI830->PciInfo->memBase[2] & 0xF0000000;
- from = X_PROBED;
- } else if (pI830->PciInfo->memBase[1] != 0) {
-@@ -2149,7 +2157,7 @@
- pI830->MMIOAddr = pI830->pEnt->device->IOBase;
- from = X_CONFIG;
- } else {
-- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
-+ if (IS_I9XX(pI830)) {
- pI830->MMIOAddr = pI830->PciInfo->memBase[0] & 0xFFF80000;
- from = X_PROBED;
- } else if (pI830->PciInfo->memBase[1]) {
-@@ -2194,7 +2202,7 @@
- pI830->FbMapSize = 0x4000000; /* 64MB - has this been tested ?? */
- }
- } else {
-- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
-+ if (IS_I9XX(pI830)) {
- if (pI830->PciInfo->memBase[2] & 0x08000000)
- pI830->FbMapSize = 0x8000000; /* 128MB aperture */
- else
-@@ -2227,7 +2235,7 @@
- if (pI830->PciInfo->chipType == PCI_CHIP_E7221_G)
- pI830->availablePipes = 1;
- else
-- if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830))
-+ if (IS_MOBILE(pI830) || IS_I9XX(pI830))
- pI830->availablePipes = 2;
- else
- pI830->availablePipes = 1;
-@@ -2872,7 +2880,7 @@
- }
-
- /* Check if the HW cursor needs physical address. */
-- if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830))
-+ if (IS_MOBILE(pI830) || IS_I9XX(pI830))
- pI830->CursorNeedsPhysical = TRUE;
- else
- pI830->CursorNeedsPhysical = FALSE;
-diff -Naur xc.orig/programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c xc/programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c
---- xc.orig/programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c 2006-01-19 03:39:29.000000000 -0800
-+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c 2006-01-19 03:46:54.000000000 -0800
-@@ -1239,7 +1239,7 @@
-
- i830Reg->Fence[nr] = 0;
-
-- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))
-+ if (IS_I9XX(pI830))
- fence_mask = ~I915G_FENCE_START_MASK;
- else
- fence_mask = ~I830_FENCE_START_MASK;
-@@ -1247,7 +1247,7 @@
- if (start & fence_mask) {
- xf86DrvMsg(X_WARNING, pScrn->scrnIndex,
- "SetFence: %d: start (0x%08x) is not %s aligned\n",
-- nr, start, (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) ? "1MB" : "512k");
-+ nr, start, (IS_I9XX(pI830)) ? "1MB" : "512k");
- return;
- }
-
-@@ -1267,7 +1267,7 @@
-
- val = (start | FENCE_X_MAJOR | FENCE_VALID);
-
-- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
-+ if (IS_I9XX(pI830)) {
- switch (size) {
- case MB(1):
- val |= I915G_FENCE_SIZE_1M;
-@@ -1328,7 +1328,7 @@
- }
- }
-
-- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))
-+ if (IS_I9XX(pI830))
- fence_pitch = pitch / 512;
- else
- fence_pitch = pitch / 128;
-diff -Naur xc.orig/programs/Xserver/hw/xfree86/drivers/i810/i830_video.c xc/programs/Xserver/hw/xfree86/drivers/i810/i830_video.c
---- xc.orig/programs/Xserver/hw/xfree86/drivers/i810/i830_video.c 2006-01-19 03:39:29.000000000 -0800
-+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i830_video.c 2006-01-19 03:46:54.000000000 -0800
-@@ -617,7 +617,7 @@
- adapt->nAttributes = NUM_ATTRIBUTES;
- if (pI830->Clone)
- adapt->nAttributes += CLONE_ATTRIBUTES;
-- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))
-+ if (IS_I9XX(pI830))
- adapt->nAttributes += GAMMA_ATTRIBUTES; /* has gamma */
- adapt->pAttributes = xnfalloc(sizeof(XF86AttributeRec) * adapt->nAttributes);
- /* Now copy the attributes */
-@@ -628,7 +628,7 @@
- memcpy((char*)att, (char*)CloneAttributes, sizeof(XF86AttributeRec) * CLONE_ATTRIBUTES);
- att+=CLONE_ATTRIBUTES;
- }
-- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
-+ if (IS_I9XX(pI830)) {
- memcpy((char*)att, (char*)GammaAttributes, sizeof(XF86AttributeRec) * GAMMA_ATTRIBUTES);
- att+=GAMMA_ATTRIBUTES;
- }
-@@ -688,7 +688,7 @@
- if (pI830->Clone)
- xvPipe = MAKE_ATOM("XV_PIPE");
-
-- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
-+ if (IS_I9XX(pI830)) {
- xvGamma0 = MAKE_ATOM("XV_GAMMA0");
- xvGamma1 = MAKE_ATOM("XV_GAMMA1");
- xvGamma2 = MAKE_ATOM("XV_GAMMA2");
-@@ -806,7 +806,7 @@
- overlay->OCONFIG |= OVERLAY_PIPE_B;
- if (pPriv->overlayOK)
- OVERLAY_UPDATE;
-- } else if (attribute == xvGamma0 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+ } else if (attribute == xvGamma0 && (IS_I9XX(pI830))) {
- /* Avoid video anomalies, so set gamma registers when overlay is off */
- /* We also clamp the values if they are outside the ranges */
- if (!*pI830->overlayOn) {
-@@ -815,35 +815,35 @@
- pPriv->gamma1 = pPriv->gamma0 + 0x7d;
- } else
- return BadRequest;
-- } else if (attribute == xvGamma1 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+ } else if (attribute == xvGamma1 && (IS_I9XX(pI830))) {
- if (!*pI830->overlayOn) {
- pPriv->gamma1 = value;
- if (pPriv->gamma1 - pPriv->gamma0 > 0x7d)
- pPriv->gamma0 = pPriv->gamma1 - 0x7d;
- } else
- return BadRequest;
-- } else if (attribute == xvGamma2 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+ } else if (attribute == xvGamma2 && (IS_I9XX(pI830))) {
- if (!*pI830->overlayOn) {
- pPriv->gamma2 = value;
- if (pPriv->gamma3 - pPriv->gamma2 > 0x7d)
- pPriv->gamma3 = pPriv->gamma2 + 0x7d;
- } else
- return BadRequest;
-- } else if (attribute == xvGamma3 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+ } else if (attribute == xvGamma3 && (IS_I9XX(pI830))) {
- if (!*pI830->overlayOn) {
- pPriv->gamma3 = value;
- if (pPriv->gamma3 - pPriv->gamma2 > 0x7d)
- pPriv->gamma2 = pPriv->gamma3 - 0x7d;
- } else
- return BadRequest;
-- } else if (attribute == xvGamma4 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+ } else if (attribute == xvGamma4 && (IS_I9XX(pI830))) {
- if (!*pI830->overlayOn) {
- pPriv->gamma4 = value;
- if (pPriv->gamma5 - pPriv->gamma4 > 0x7d)
- pPriv->gamma5 = pPriv->gamma4 + 0x7d;
- } else
- return BadRequest;
-- } else if (attribute == xvGamma5 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+ } else if (attribute == xvGamma5 && (IS_I9XX(pI830))) {
- if (!*pI830->overlayOn) {
- pPriv->gamma5 = value;
- if (pPriv->gamma5 - pPriv->gamma4 > 0x7d)
-@@ -875,7 +875,7 @@
- attribute == xvGamma2 ||
- attribute == xvGamma3 ||
- attribute == xvGamma4 ||
-- attribute == xvGamma5) && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+ attribute == xvGamma5) && (IS_I9XX(pI830))) {
- I830UpdateGamma(pScrn);
- }
-
-@@ -895,17 +895,17 @@
- *value = pPriv->contrast;
- } else if (pI830->Clone && attribute == xvPipe) {
- *value = pPriv->pipe;
-- } else if (attribute == xvGamma0 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+ } else if (attribute == xvGamma0 && (IS_I9XX(pI830))) {
- *value = pPriv->gamma0;
-- } else if (attribute == xvGamma1 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+ } else if (attribute == xvGamma1 && (IS_I9XX(pI830))) {
- *value = pPriv->gamma1;
-- } else if (attribute == xvGamma2 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+ } else if (attribute == xvGamma2 && (IS_I9XX(pI830))) {
- *value = pPriv->gamma2;
-- } else if (attribute == xvGamma3 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+ } else if (attribute == xvGamma3 && (IS_I9XX(pI830))) {
- *value = pPriv->gamma3;
-- } else if (attribute == xvGamma4 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+ } else if (attribute == xvGamma4 && (IS_I9XX(pI830))) {
- *value = pPriv->gamma4;
-- } else if (attribute == xvGamma5 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+ } else if (attribute == xvGamma5 && (IS_I9XX(pI830))) {
- *value = pPriv->gamma5;
- } else if (attribute == xvColorKey) {
- *value = pPriv->colorKey;
+++ /dev/null
---- xc/programs/Xserver/hw/xfree86/drivers/i810/i810.h.orig 2004-06-22 16:28:46.000000000 +0200
-+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i810.h 2004-11-25 14:00:55.000000000 +0100
-@@ -76,6 +76,11 @@
- #define I810_MAX_SUBPICTURES 2
- #define I810_TOTAL_SURFACES 9
-
-+/* tony: i810 Framebuffer Driver - IOCTL's */
-+#define I810FB_IOC_AREYOUTHERE 0x46FF
-+#define I810FB_IOC_RELEASEGART 0x46FA
-+#define I810FB_IOC_CLAIMGART 0x46F9
-+
- /* Globals */
-
- typedef struct _I810Rec *I810Ptr;
-@@ -146,6 +151,8 @@
- long BackOffset;
- int cpp;
- int MaxClock;
-+ int FbDescriptor;
-+ int FbGartClaimed;
-
- unsigned int bufferOffset; /* for I810SelectBuffer */
- Bool DoneFrontAlloc;
-@@ -218,6 +225,7 @@
- I810RegRec ModeReg;
-
- XAAInfoRecPtr AccelInfoRec;
-+ int AccelValid;
- xf86CursorInfoPtr CursorInfoRec;
- CloseScreenProcPtr CloseScreen;
- ScreenBlockHandlerProcPtr BlockHandler;
---- xc/programs/Xserver/hw/xfree86/drivers/i810/i810_accel.c.orig 2004-07-30 22:30:52.000000000 +0200
-+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i810_accel.c 2004-11-25 14:01:22.000000000 +0100
-@@ -89,6 +89,7 @@
- pI810->AccelInfoRec = infoPtr = XAACreateInfoRec();
- if (!infoPtr)
- return FALSE;
-+ pI810->AccelValid = 1;
-
- pI810->bufferOffset = 0;
- infoPtr->Flags = LINEAR_FRAMEBUFFER | OFFSCREEN_PIXMAPS;
-@@ -193,6 +194,9 @@
- int last_head = 0;
- int first = 0;
-
-+ if (!pI810->AccelValid)
-+ return 0;
-+
- /* If your system hasn't moved the head pointer in 2 seconds, I'm going to
- * call it crashed.
- */
---- xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c.orig 2004-08-25 02:30:41.000000000 +0200
-+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c 2004-11-25 14:03:53.000000000 +0100
-@@ -668,6 +668,7 @@
- rgb defaultWeight = { 0, 0, 0 };
- int mem;
- Bool enable;
-+ char filename[16];
-
- if (pScrn->numEntities != 1)
- return FALSE;
-@@ -678,6 +679,36 @@
-
- pI810 = I810PTR(pScrn);
-
-+ /* tony: try to open fb, then query if fb can release GART,
-+ finally, ask fb to release GART */
-+ pI810->FbGartClaimed = 0;
-+ i = 0;
-+ while (i < 8) {
-+ sprintf(filename, "/dev/fb%d", i);
-+ if (-1 != (pI810->FbDescriptor = open(filename, O_RDONLY, 0))) {
-+ if (!ioctl(pI810->FbDescriptor, I810FB_IOC_AREYOUTHERE, 0))
-+ break;
-+ else {
-+ close(pI810->FbDescriptor);
-+ pI810->FbDescriptor = 0;
-+ }
-+ }
-+ else {
-+ pI810->FbDescriptor = 0;
-+ }
-+ ++i;
-+ }
-+ if (pI810->FbDescriptor && !pI810->FbGartClaimed) {
-+ if (ioctl(pI810->FbDescriptor, I810FB_IOC_CLAIMGART, 0)) {
-+ close(pI810->FbDescriptor);
-+ pI810->FbDescriptor = 0;
-+ return FALSE;
-+ }
-+ pI810->FbGartClaimed = 1;
-+ }
-+ /* tony: end */
-+
-+
- pI810->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
- if (pI810->pEnt->location.type != BUS_PCI)
- return FALSE;
-@@ -2379,13 +2410,18 @@
- {
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-
--#ifdef XF86DRI
- I810Ptr pI810 = I810PTR(pScrn);
--#endif
-
- if (I810_DEBUG & DEBUG_VERBOSE_DRI)
- ErrorF("\n\nENTER VT\n");
-
-+ /* tony: claim GART from fb */
-+ if (pI810->FbDescriptor && !pI810->FbGartClaimed) {
-+ if (ioctl(pI810->FbDescriptor, I810FB_IOC_CLAIMGART, 0))
-+ return FALSE;
-+ pI810->FbGartClaimed = 1;
-+ }
-+
- if (!I810BindGARTMemory(pScrn)) {
- return FALSE;
- }
-@@ -2404,6 +2440,10 @@
- if (!I810ModeInit(pScrn, pScrn->currentMode))
- return FALSE;
- I810AdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
-+
-+ if (pI810->AccelInfoRec != NULL)
-+ pI810->AccelValid = 1;
-+
- return TRUE;
- }
-
-@@ -2430,6 +2470,7 @@
- I810RefreshRing(pScrn);
- I810Sync(pScrn);
- pI810->AccelInfoRec->NeedToSync = FALSE;
-+ pI810->AccelValid = 0;
- }
- I810Restore(pScrn);
-
-@@ -2440,6 +2481,13 @@
- return;
- #endif
-
-+ /* tony: give back GART to fb */
-+ if (pI810->FbDescriptor && pI810->FbGartClaimed) {
-+ if (ioctl(pI810->FbDescriptor, I810FB_IOC_RELEASEGART, 0))
-+ return;
-+ pI810->FbGartClaimed = 0;
-+ }
-+
- vgaHWLock(hwp);
- }
-
-@@ -2509,6 +2557,17 @@
-
- pScrn->vtSema = FALSE;
- pScreen->CloseScreen = pI810->CloseScreen;
-+
-+ /* tony: give back GART to fb, close the fb device */
-+ if (pI810->FbDescriptor && pI810->FbGartClaimed) {
-+ if (ioctl(pI810->FbDescriptor, I810FB_IOC_RELEASEGART, 0))
-+ return FALSE;
-+ pI810->FbGartClaimed = 0;
-+ }
-+ if (pI810->FbDescriptor) {
-+ close(pI810->FbDescriptor);
-+ pI810->FbDescriptor = 0;
-+ }
- return (*pScreen->CloseScreen) (scrnIndex, pScreen);
- }
-
+++ /dev/null
-diff -u -r1.18 xf86pciBus.c
---- X11-6.9.0/xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c 25 Mar 2006 19:52:03 -0000 1.18
-+++ X11-6.9.0/xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c 26 Apr 2006 04:14:04 -0000
-@@ -1774,7 +1774,16 @@
- PciBus->brfunc = pcrp->funcnum;
-
- PciBus->subclass = sub_class;
-- PciBus->interface = pcrp->pci_prog_if;
-+
-+ /* The Intel bridges don't report as transparent
-+ but guess what they are - from Linux kernel - airlied */
-+ if ((pcrp->pci_vendor == PCI_VENDOR_INTEL) &&
-+ ((pcrp->pci_device & 0xff00) == 0x2400)) {
-+ xf86MsgVerb(X_INFO, 3, "Intel Bridge workaround enabled\n");
-+ PciBus->interface = PCI_IF_BRIDGE_PCI_SUBTRACTIVE;
-+ } else {
-+ PciBus->interface = pcrp->pci_prog_if;
-+ }
-
- if (pBusInfo && pBusInfo->funcs->pciControlBridge)
- PciBus->brcontrol =
-Index: os-support/shared/stdResource.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/os-support/shared/stdResource.c,v
-retrieving revision 1.4
-diff -u -r1.4 stdResource.c
---- X11-6.9.0/xc/programs/Xserver/hw/xfree86/os-support/shared/stdResource.c 25 Mar 2006 19:52:04 -0000 1.4
-+++ X11-6.9.0/xc/programs/Xserver/hw/xfree86/os-support/shared/stdResource.c 26 Apr 2006 04:14:04 -0000
-@@ -150,10 +150,11 @@
- ret = xf86AddResToList(ret, &range, -1);
- RANGE(range, 0xfee00000, 0xfeefffff, ResExcMemBlock | ResBios);
- ret = xf86AddResToList(ret, &range, -1);
--#endif
-+ /* airlied - remove BIOS range it shouldn't be here
-+ this should use E820 - or THE OS */
- RANGE(range, 0xffe00000, 0xffffffff, ResExcMemBlock | ResBios);
- ret = xf86AddResToList(ret, &range, -1);
--
-+#endif
- /*
- * Fallback would be to claim well known ports in the 0x0 - 0x3ff range
- * along with their sparse I/O aliases, but that's too imprecise. Instead
+++ /dev/null
-diff -ur X11-6.9.0.org/xc/extras/drm/linux/drm_memory_debug.h X11-6.9.0/xc/extras/drm/linux/drm_memory_debug.h
---- X11-6.9.0.org/xc/extras/drm/linux/drm_memory_debug.h 2005-06-15 20:31:47.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux/drm_memory_debug.h 2005-12-22 11:43:11.110963000 +0100
-@@ -31,7 +31,7 @@
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
--#include <linux/config.h>
-+
- #include "drmP.h"
-
- typedef struct drm_mem_stats {
-diff -ur X11-6.9.0.org/xc/extras/drm/linux/drm_memory.h X11-6.9.0/xc/extras/drm/linux/drm_memory.h
---- X11-6.9.0.org/xc/extras/drm/linux/drm_memory.h 2005-06-15 20:31:47.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux/drm_memory.h 2005-12-22 11:43:11.150963000 +0100
-@@ -33,7 +33,7 @@
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
--#include <linux/config.h>
-+
- #include <linux/highmem.h>
- #include "drmP.h"
-
-diff -ur X11-6.9.0.org/xc/extras/drm/linux/drmP.h X11-6.9.0/xc/extras/drm/linux/drmP.h
---- X11-6.9.0.org/xc/extras/drm/linux/drmP.h 2005-10-18 04:49:47.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux/drmP.h 2005-12-22 11:43:11.140963000 +0100
-@@ -42,7 +42,7 @@
- * can build the DRM (part of PI DRI). 4/21/2000 S + B */
- #include <asm/current.h>
- #endif /* __alpha__ */
--#include <linux/config.h>
-+
- #include <linux/module.h>
- #include <linux/kernel.h>
- #include <linux/miscdevice.h>
-diff -ur X11-6.9.0.org/xc/extras/drm/linux/drm_scatter.h X11-6.9.0/xc/extras/drm/linux/drm_scatter.h
---- X11-6.9.0.org/xc/extras/drm/linux/drm_scatter.h 2005-06-15 20:31:48.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux/drm_scatter.h 2005-12-22 11:43:11.130963000 +0100
-@@ -31,7 +31,7 @@
- * DEALINGS IN THE SOFTWARE.
- */
-
--#include <linux/config.h>
-+
- #include <linux/vmalloc.h>
- #include "drmP.h"
-
-diff -ur X11-6.9.0.org/xc/extras/drm/linux/ffb_drv.c X11-6.9.0/xc/extras/drm/linux/ffb_drv.c
---- X11-6.9.0.org/xc/extras/drm/linux/ffb_drv.c 2005-06-15 20:31:49.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux/ffb_drv.c 2005-12-22 11:43:11.190963000 +0100
-@@ -4,7 +4,7 @@
- * Copyright (C) 2000 David S. Miller (davem@redhat.com)
- */
-
--#include <linux/config.h>
-+
- #include "ffb.h"
- #include "drmP.h"
-
-diff -ur X11-6.9.0.org/xc/extras/drm/linux/i810_drv.c X11-6.9.0/xc/extras/drm/linux/i810_drv.c
---- X11-6.9.0.org/xc/extras/drm/linux/i810_drv.c 2005-06-15 20:31:49.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux/i810_drv.c 2005-12-22 11:43:11.120963000 +0100
-@@ -30,7 +30,7 @@
- * Gareth Hughes <gareth@valinux.com>
- */
-
--#include <linux/config.h>
-+
- #include "i810.h"
- #include "drmP.h"
- #include "drm.h"
-diff -ur X11-6.9.0.org/xc/extras/drm/linux/i830_drv.c X11-6.9.0/xc/extras/drm/linux/i830_drv.c
---- X11-6.9.0.org/xc/extras/drm/linux/i830_drv.c 2005-06-15 20:31:50.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux/i830_drv.c 2005-12-22 11:43:11.150963000 +0100
-@@ -32,7 +32,7 @@
- * Keith Whitwell <keith@tungstengraphics.com>
- */
-
--#include <linux/config.h>
-+
- #include "i830.h"
- #include "drmP.h"
- #include "drm.h"
-diff -ur X11-6.9.0.org/xc/extras/drm/linux/mach64_drv.c X11-6.9.0/xc/extras/drm/linux/mach64_drv.c
---- X11-6.9.0.org/xc/extras/drm/linux/mach64_drv.c 2005-06-15 20:31:47.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux/mach64_drv.c 2005-12-22 11:43:11.170963000 +0100
-@@ -27,7 +27,7 @@
- * Leif Delgass <ldelgass@retinalburn.net>
- */
-
--#include <linux/config.h>
-+
- #include "mach64.h"
- #include "drmP.h"
- #include "drm.h"
-diff -ur X11-6.9.0.org/xc/extras/drm/linux/mga_drv.c X11-6.9.0/xc/extras/drm/linux/mga_drv.c
---- X11-6.9.0.org/xc/extras/drm/linux/mga_drv.c 2005-06-15 20:31:47.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux/mga_drv.c 2005-12-22 11:43:11.210963000 +0100
-@@ -29,7 +29,7 @@
- * Gareth Hughes <gareth@valinux.com>
- */
-
--#include <linux/config.h>
-+
- #include "mga.h"
- #include "drmP.h"
- #include "drm.h"
-diff -ur X11-6.9.0.org/xc/extras/drm/linux/r128_drv.c X11-6.9.0/xc/extras/drm/linux/r128_drv.c
---- X11-6.9.0.org/xc/extras/drm/linux/r128_drv.c 2005-06-15 20:31:49.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux/r128_drv.c 2005-12-22 11:43:11.170963000 +0100
-@@ -29,7 +29,7 @@
- * Gareth Hughes <gareth@valinux.com>
- */
-
--#include <linux/config.h>
-+
- #include "r128.h"
- #include "drmP.h"
- #include "drm.h"
-diff -ur X11-6.9.0.org/xc/extras/drm/linux/radeon_drv.c X11-6.9.0/xc/extras/drm/linux/radeon_drv.c
---- X11-6.9.0.org/xc/extras/drm/linux/radeon_drv.c 2005-06-15 20:31:48.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux/radeon_drv.c 2005-12-22 11:43:11.210963000 +0100
-@@ -30,7 +30,7 @@
- */
-
-
--#include <linux/config.h>
-+
- #include "radeon.h"
- #include "drmP.h"
- #include "drm.h"
-diff -ur X11-6.9.0.org/xc/extras/drm/linux/savage_drv.c X11-6.9.0/xc/extras/drm/linux/savage_drv.c
---- X11-6.9.0.org/xc/extras/drm/linux/savage_drv.c 2005-06-15 20:31:49.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux/savage_drv.c 2005-12-22 11:43:11.160963000 +0100
-@@ -22,7 +22,7 @@
- * DEALINGS IN THE SOFTWARE.
- */
-
--#include <linux/config.h>
-+
- #include "savage.h"
- #include "drmP.h"
- #include "savage_drm.h"
-diff -ur X11-6.9.0.org/xc/extras/drm/linux/sis_drv.c X11-6.9.0/xc/extras/drm/linux/sis_drv.c
---- X11-6.9.0.org/xc/extras/drm/linux/sis_drv.c 2005-06-15 20:31:48.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux/sis_drv.c 2005-12-22 11:43:11.240963000 +0100
-@@ -25,7 +25,7 @@
- *
- */
-
--#include <linux/config.h>
-+
- #include "sis.h"
- #include "drmP.h"
- #include "sis_drm.h"
-diff -ur X11-6.9.0.org/xc/extras/drm/linux/tdfx_drv.c X11-6.9.0/xc/extras/drm/linux/tdfx_drv.c
---- X11-6.9.0.org/xc/extras/drm/linux/tdfx_drv.c 2005-06-15 20:31:47.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux/tdfx_drv.c 2005-12-22 11:43:11.220963000 +0100
-@@ -30,7 +30,7 @@
- * Gareth Hughes <gareth@valinux.com>
- */
-
--#include <linux/config.h>
-+
- #include "tdfx.h"
- #include "drmP.h"
-
-diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/drm_memory.c X11-6.9.0/xc/extras/drm/linux-core/drm_memory.c
---- X11-6.9.0.org/xc/extras/drm/linux-core/drm_memory.c 2005-11-30 23:59:11.000000000 +0100
-+++ X11-6.9.0/xc/extras/drm/linux-core/drm_memory.c 2005-12-22 11:43:10.970963000 +0100
-@@ -33,7 +33,7 @@
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
--#include <linux/config.h>
-+
- #include <linux/highmem.h>
- #include "drmP.h"
-
-diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/drm_memory_debug.c X11-6.9.0/xc/extras/drm/linux-core/drm_memory_debug.c
---- X11-6.9.0.org/xc/extras/drm/linux-core/drm_memory_debug.c 2005-11-30 23:59:11.000000000 +0100
-+++ X11-6.9.0/xc/extras/drm/linux-core/drm_memory_debug.c 2005-12-22 11:43:10.840963000 +0100
-@@ -31,7 +31,7 @@
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
--#include <linux/config.h>
-+
- #include "drmP.h"
-
- #ifdef DEBUG_MEMORY
-diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/drm_memory_debug.h X11-6.9.0/xc/extras/drm/linux-core/drm_memory_debug.h
---- X11-6.9.0.org/xc/extras/drm/linux-core/drm_memory_debug.h 2005-10-18 04:24:08.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux-core/drm_memory_debug.h 2005-12-22 11:43:10.890963000 +0100
-@@ -31,7 +31,7 @@
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
--#include <linux/config.h>
-+
- #include "drmP.h"
-
- typedef struct drm_mem_stats {
-diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/drm_memory.h X11-6.9.0/xc/extras/drm/linux-core/drm_memory.h
---- X11-6.9.0.org/xc/extras/drm/linux-core/drm_memory.h 2005-10-18 04:24:08.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux-core/drm_memory.h 2005-12-22 11:43:10.930963000 +0100
-@@ -33,7 +33,7 @@
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
--#include <linux/config.h>
-+
- #include <linux/highmem.h>
- #include <linux/vmalloc.h>
- #include "drmP.h"
-diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/drmP.h X11-6.9.0/xc/extras/drm/linux-core/drmP.h
---- X11-6.9.0.org/xc/extras/drm/linux-core/drmP.h 2005-11-30 23:59:10.000000000 +0100
-+++ X11-6.9.0/xc/extras/drm/linux-core/drmP.h 2005-12-22 11:43:10.930963000 +0100
-@@ -41,7 +41,7 @@
- * can build the DRM (part of PI DRI). 4/21/2000 S + B */
- #include <asm/current.h>
- #endif /* __alpha__ */
--#include <linux/config.h>
-+
- #include <linux/module.h>
- #include <linux/kernel.h>
- #include <linux/miscdevice.h>
-diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/drm_scatter.c X11-6.9.0/xc/extras/drm/linux-core/drm_scatter.c
---- X11-6.9.0.org/xc/extras/drm/linux-core/drm_scatter.c 2005-10-18 04:24:09.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux-core/drm_scatter.c 2005-12-22 11:43:11.000963000 +0100
-@@ -31,7 +31,7 @@
- * DEALINGS IN THE SOFTWARE.
- */
-
--#include <linux/config.h>
-+
- #include <linux/vmalloc.h>
-
- #include "drmP.h"
-diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/drm_sysfs.c X11-6.9.0/xc/extras/drm/linux-core/drm_sysfs.c
---- X11-6.9.0.org/xc/extras/drm/linux-core/drm_sysfs.c 2005-10-18 04:24:09.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux-core/drm_sysfs.c 2005-12-22 11:43:10.870963000 +0100
-@@ -11,7 +11,7 @@
- *
- */
-
--#include <linux/config.h>
-+
- #include <linux/device.h>
- #include <linux/kdev_t.h>
- #include <linux/err.h>
-diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/ffb_drv.c X11-6.9.0/xc/extras/drm/linux-core/ffb_drv.c
---- X11-6.9.0.org/xc/extras/drm/linux-core/ffb_drv.c 2005-10-18 04:24:09.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux-core/ffb_drv.c 2005-12-22 11:43:10.980963000 +0100
-@@ -4,7 +4,7 @@
- * Copyright (C) 2000 David S. Miller (davem@redhat.com)
- */
-
--#include <linux/config.h>
-+
- #include <linux/sched.h>
- #include <linux/smp_lock.h>
- #include <asm/shmparam.h>
-diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/i810_drv.c X11-6.9.0/xc/extras/drm/linux-core/i810_drv.c
---- X11-6.9.0.org/xc/extras/drm/linux-core/i810_drv.c 2005-10-18 04:24:09.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux-core/i810_drv.c 2005-12-22 11:43:10.900963000 +0100
-@@ -30,7 +30,7 @@
- * Gareth Hughes <gareth@valinux.com>
- */
-
--#include <linux/config.h>
-+
- #include "drmP.h"
- #include "drm.h"
- #include "i810_drm.h"
-diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/i830_drv.c X11-6.9.0/xc/extras/drm/linux-core/i830_drv.c
---- X11-6.9.0.org/xc/extras/drm/linux-core/i830_drv.c 2005-10-18 04:24:10.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux-core/i830_drv.c 2005-12-22 11:43:10.950963000 +0100
-@@ -32,7 +32,7 @@
- * Keith Whitwell <keith@tungstengraphics.com>
- */
-
--#include <linux/config.h>
-+
-
- #include "drmP.h"
- #include "drm.h"
-diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/imagine_drv.c X11-6.9.0/xc/extras/drm/linux-core/imagine_drv.c
---- X11-6.9.0.org/xc/extras/drm/linux-core/imagine_drv.c 2005-10-18 04:24:10.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux-core/imagine_drv.c 2005-12-22 11:43:10.960963000 +0100
-@@ -22,7 +22,7 @@
-
- /* derived from tdfx_drv.c */
-
--#include <linux/config.h>
-+
- #include "drmP.h"
- #include "imagine_drv.h"
-
-diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/mach64_drv.c X11-6.9.0/xc/extras/drm/linux-core/mach64_drv.c
---- X11-6.9.0.org/xc/extras/drm/linux-core/mach64_drv.c 2005-10-18 04:24:10.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux-core/mach64_drv.c 2005-12-22 11:43:10.970963000 +0100
-@@ -27,7 +27,7 @@
- * Leif Delgass <ldelgass@retinalburn.net>
- */
-
--#include <linux/config.h>
-+
- #include "drmP.h"
- #include "drm.h"
- #include "mach64_drm.h"
-diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/mga_drv.c X11-6.9.0/xc/extras/drm/linux-core/mga_drv.c
---- X11-6.9.0.org/xc/extras/drm/linux-core/mga_drv.c 2005-10-18 04:24:10.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux-core/mga_drv.c 2005-12-22 11:43:11.000963000 +0100
-@@ -29,7 +29,7 @@
- * Gareth Hughes <gareth@valinux.com>
- */
-
--#include <linux/config.h>
-+
- #include "drmP.h"
- #include "drm.h"
- #include "mga_drm.h"
-diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/nv_drv.c X11-6.9.0/xc/extras/drm/linux-core/nv_drv.c
---- X11-6.9.0.org/xc/extras/drm/linux-core/nv_drv.c 2005-10-18 04:24:10.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux-core/nv_drv.c 2005-12-22 11:43:10.910963000 +0100
-@@ -32,7 +32,7 @@
- * Lars Knoll <lars@trolltech.com>
- */
-
--#include <linux/config.h>
-+
- #include "drmP.h"
- #include "nv_drv.h"
-
-diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/r128_drv.c X11-6.9.0/xc/extras/drm/linux-core/r128_drv.c
---- X11-6.9.0.org/xc/extras/drm/linux-core/r128_drv.c 2005-10-18 04:24:10.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux-core/r128_drv.c 2005-12-22 11:43:10.960963000 +0100
-@@ -29,7 +29,7 @@
- * Gareth Hughes <gareth@valinux.com>
- */
-
--#include <linux/config.h>
-+
- #include "drmP.h"
- #include "drm.h"
- #include "r128_drm.h"
-diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/radeon_drv.c X11-6.9.0/xc/extras/drm/linux-core/radeon_drv.c
---- X11-6.9.0.org/xc/extras/drm/linux-core/radeon_drv.c 2005-10-18 04:24:10.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux-core/radeon_drv.c 2005-12-22 11:43:10.980963000 +0100
-@@ -29,7 +29,7 @@
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
--#include <linux/config.h>
-+
- #include "drmP.h"
- #include "drm.h"
- #include "radeon_drm.h"
-diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/savage_drv.c X11-6.9.0/xc/extras/drm/linux-core/savage_drv.c
---- X11-6.9.0.org/xc/extras/drm/linux-core/savage_drv.c 2005-10-18 04:24:10.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux-core/savage_drv.c 2005-12-22 11:43:10.950963000 +0100
-@@ -23,7 +23,7 @@
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
--#include <linux/config.h>
-+
- #include "drmP.h"
- #include "savage_drm.h"
- #include "savage_drv.h"
-diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/sis_drv.c X11-6.9.0/xc/extras/drm/linux-core/sis_drv.c
---- X11-6.9.0.org/xc/extras/drm/linux-core/sis_drv.c 2005-10-18 04:24:10.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux-core/sis_drv.c 2005-12-22 11:43:11.020963000 +0100
-@@ -25,7 +25,7 @@
- *
- */
-
--#include <linux/config.h>
-+
- #include "drmP.h"
- #include "sis_drm.h"
- #include "sis_drv.h"
-diff -ur X11-6.9.0.org/xc/extras/drm/linux-core/tdfx_drv.c X11-6.9.0/xc/extras/drm/linux-core/tdfx_drv.c
---- X11-6.9.0.org/xc/extras/drm/linux-core/tdfx_drv.c 2005-10-18 04:24:10.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/linux-core/tdfx_drv.c 2005-12-22 11:43:11.010963000 +0100
-@@ -30,7 +30,7 @@
- * Gareth Hughes <gareth@valinux.com>
- */
-
--#include <linux/config.h>
-+
- #include "drmP.h"
- #include "tdfx_drv.h"
-
-diff -ur X11-6.9.0.org/xc/extras/drm/shared/drm.h X11-6.9.0/xc/extras/drm/shared/drm.h
---- X11-6.9.0.org/xc/extras/drm/shared/drm.h 2005-07-27 02:15:46.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/shared/drm.h 2005-12-22 11:43:11.400963000 +0100
-@@ -64,7 +64,7 @@
-
- #if defined(__linux__)
- #if defined(__KERNEL__)
--#include <linux/config.h>
-+
- #endif
- #include <asm/ioctl.h> /* For _IO* macros */
- #define DRM_IOCTL_NR(n) _IOC_NR(n)
-diff -ur X11-6.9.0.org/xc/extras/drm/shared/via_drv.c X11-6.9.0/xc/extras/drm/shared/via_drv.c
---- X11-6.9.0.org/xc/extras/drm/shared/via_drv.c 2005-06-15 20:31:59.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/shared/via_drv.c 2005-12-22 11:43:11.350963000 +0100
-@@ -22,7 +22,7 @@
- * DEALINGS IN THE SOFTWARE.
- */
-
--#include <linux/config.h>
-+
- #include "via.h"
- #include "drmP.h"
- #include "via_drm.h"
-diff -ur X11-6.9.0.org/xc/extras/drm/shared-core/drm.h X11-6.9.0/xc/extras/drm/shared-core/drm.h
---- X11-6.9.0.org/xc/extras/drm/shared-core/drm.h 2005-10-18 04:24:10.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/shared-core/drm.h 2005-12-22 11:43:10.740963000 +0100
-@@ -70,7 +70,7 @@
-
- #if defined(__linux__)
- #if defined(__KERNEL__)
--#include <linux/config.h>
-+
- #endif
- #include <asm/ioctl.h> /* For _IO* macros */
- #define DRM_IOCTL_NR(n) _IOC_NR(n)
-diff -ur X11-6.9.0.org/xc/extras/drm/shared-core/via_drv.c X11-6.9.0/xc/extras/drm/shared-core/via_drv.c
---- X11-6.9.0.org/xc/extras/drm/shared-core/via_drv.c 2005-10-18 04:24:15.000000000 +0200
-+++ X11-6.9.0/xc/extras/drm/shared-core/via_drv.c 2005-12-22 11:43:10.710963000 +0100
-@@ -22,7 +22,7 @@
- * DEALINGS IN THE SOFTWARE.
- */
-
--#include <linux/config.h>
-+
- #include "drmP.h"
- #include "via_drm.h"
- #include "via_drv.h"
-diff -ur X11-6.9.0.org/xc/programs/Xserver/hw/xfree86/drivers/sis/init301.h X11-6.9.0/xc/programs/Xserver/hw/xfree86/drivers/sis/init301.h
---- X11-6.9.0.org/xc/programs/Xserver/hw/xfree86/drivers/sis/init301.h 2005-09-18 01:07:17.000000000 +0200
-+++ X11-6.9.0/xc/programs/Xserver/hw/xfree86/drivers/sis/init301.h 2005-12-22 11:43:11.410963000 +0100
-@@ -67,7 +67,7 @@
- #ifdef SIS_CP
- #undef SIS_CP
- #endif
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/types.h>
- #include <asm/io.h>
-diff -ur X11-6.9.0.org/xc/programs/Xserver/hw/xfree86/drivers/sis/init.h X11-6.9.0/xc/programs/Xserver/hw/xfree86/drivers/sis/init.h
---- X11-6.9.0.org/xc/programs/Xserver/hw/xfree86/drivers/sis/init.h 2005-09-07 21:44:14.000000000 +0200
-+++ X11-6.9.0/xc/programs/Xserver/hw/xfree86/drivers/sis/init.h 2005-12-22 11:43:11.440963000 +0100
-@@ -73,7 +73,7 @@
- #ifdef SIS_CP
- #undef SIS_CP
- #endif
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/types.h>
- #include <asm/io.h>
-diff -ur X11-6.9.0.org/xc/programs/Xserver/hw/xfree86/drivers/sis/osdef.h X11-6.9.0/xc/programs/Xserver/hw/xfree86/drivers/sis/osdef.h
---- X11-6.9.0.org/xc/programs/Xserver/hw/xfree86/drivers/sis/osdef.h 2005-07-04 12:57:08.000000000 +0200
-+++ X11-6.9.0/xc/programs/Xserver/hw/xfree86/drivers/sis/osdef.h 2005-12-22 11:43:11.450963000 +0100
-@@ -90,7 +90,7 @@
- /**********************************************************************/
-
- #ifdef SIS_LINUX_KERNEL
--#include <linux/config.h>
-+
- #include <linux/version.h>
-
- #ifdef CONFIG_FB_SIS_300
+++ /dev/null
---- xc/Makefile.makefile-fastbuild 2003-02-26 04:21:31.000000000 -0500
-+++ xc/Makefile 2003-04-06 11:40:20.000000000 -0400
-@@ -83,9 +83,9 @@
- $(MAKE) $(MFLAGS) Makefile.boot
- $(MAKE_CMD) $(MFLAGS) VerifyOS
- $(MAKE_CMD) $(MFLAGS) Makefiles
-- $(MAKE_CMD) $(MFLAGS) BOOTSTRAPSUBDIRS= clean
-+ if [ -z "$(FAST)" ]; then $(MAKE_CMD) $(MFLAGS) BOOTSTRAPSUBDIRS= clean; fi
- $(MAKE_CMD) $(MFLAGS) includes
-- $(MAKE_CMD) $(MFLAGS) depend
-+ if [ -z "$(FAST)" ]; then $(MAKE_CMD) $(MFLAGS) depend; fi
- $(MAKE_CMD) $(MFLAGS) $(WORLDOPTS) World
- @echo ""
- @date
+++ /dev/null
---- xc.orig/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c 2004-08-08 14:22:29.000000000 +0200
-+++ xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c 2004-08-08 15:13:17.170055096 +0200
-@@ -982,6 +982,7 @@
- DRIInfoPtr pDRIInfo;
- MGADRIPtr pMGADRI;
- MGADRIServerPrivatePtr pMGADRIServer;
-+ CARD32 pciCommand;
-
- switch(pMga->Chipset) {
- case PCI_CHIP_MGAG550:
-@@ -1257,6 +1258,11 @@
- }
- xf86DrvMsg( pScrn->scrnIndex, X_INFO, "[dri] visual configs initialized\n" );
-
-+ /* Enable bus mastering in PCI config space */
-+ pciCommand = pciReadLong(pMga->PciTag, PCI_CMD_STAT_REG);
-+ pciWriteLong(pMga->PciTag, PCI_CMD_STAT_REG,
-+ pciCommand | PCI_CMD_MASTER_ENABLE);
-+
- return TRUE;
- }
-
+++ /dev/null
---- xc.orig/programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c 2004-08-08 14:22:25.000000000 +0200
-+++ xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c 2004-08-08 15:12:28.362474976 +0200
-@@ -1031,6 +1031,13 @@
- memcpy(nPtr->Options, NEOOptions, sizeof(NEOOptions));
- }
-
-+ /* Neomagic 256XL+ needs hardware-cursor disabled by default <hdeller@redhat.com> */
-+ if (nPtr->NeoChipset == NM2380) { /* Neomagic 256XL+ */
-+ nPtr->swCursor = TRUE;
-+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
-+ "Neomagic 256XL+ (NM2380) - default to software cursor\n");
-+ }
-+
- xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, nPtr->Options);
-
- xf86GetOptValBool(nPtr->Options, OPTION_NOLINEAR_MODE,&nPtr->noLinear);
+++ /dev/null
---- xc/config/cf/xorgsite.def~ 2005-01-13 23:21:05.000000000 +0100
-+++ xc/config/cf/xorgsite.def 2005-01-13 23:29:39.000000000 +0100
-@@ -132,8 +132,8 @@
- * work for your architechture. The old driver will be removed in the
- * next release.
- *
--#define UseDeprecatedKeyboardDriver YES
- */
-+#define UseDeprecatedKeyboardDriver YES
-
- /*
- * There are three parameters that determine where and how the Matrox HAL
+++ /dev/null
-In file included from linuxPci.c:211:
-pci.h:454: error: parse error before "pci_power_t"
-pci.h:454: warning: type defaults to `int' in declaration of `pci_power_t'
-pci.h:454: warning: data definition has no type or storage class
-
---- X11-6.8.2/xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c.orig 2004-12-15 05:48:20.000000000 +0000
-+++ X11-6.8.2/xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c 2005-04-01 11:20:25.678791042 +0000
-@@ -45,6 +45,7 @@
- * SOFTWARE.
- */
-
-+#include <linux/pci.h>
- #include <stdio.h>
- #include "compiler.h"
- #include "xf86.h"
-@@ -208,8 +209,6 @@
- * master aborts are avoided during PCI scans).
- */
-
--#include <linux/pci.h>
--
- #ifndef PCIIOC_BASE /* Ioctls for /proc/bus/pci/X/Y nodes. */
- #define PCIIOC_BASE ('P' << 24 | 'C' << 16 | 'I' << 8)
-
+++ /dev/null
---- xc.orig/config/cf/Library.tmpl 2004-08-08 14:23:13.000000000 +0200
-+++ xc/config/cf/Library.tmpl 2004-08-08 15:10:06.794996504 +0200
-@@ -214,9 +214,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 _NormalObjCplusplusCompile(options) NormalLibObjCplusplusCompile(options $(PICFLAGS))
- # define _NormalCleanDir() $(_NULLCMD_)
- # endif
- #endif
-@@ -229,8 +229,8 @@
- # define _SharedObjCompile(options) NormalSharedLibObjCompile(options)
- # define _SharedObjCplusplusCompile(options) NormalSharedLibObjCplusplusCompile(options)
- #else
--# define _SharedObjCompile(options) NormalLibObjCompile(options)
--# define _SharedObjCplusplusCompile(options) NormalLibObjCplusplusCompile(options)
-+# define _SharedObjCompile(options) NormalLibObjCompile(options $(PICFLAGS))
-+# define _SharedObjCplusplusCompile(options) NormalLibObjCplusplusCompile(options $(PICFLAGS))
- #endif
- #endif
-
---- xc.org/programs/Xserver/hw/xfree86/parser/Imakefile.org 2006-01-01 20:23:00.400963000 +0100
-+++ xc/programs/Xserver/hw/xfree86/parser/Imakefile 2006-01-01 20:49:54.830963000 +0100
-@@ -45,7 +45,7 @@
-
- #include <Library.tmpl>
-
--SpecialCObjectRule(scan,NullParameter,$(CONFIG_DEFINES) $(MODULEDEFINES) $(EXT_DEFINES))
-+SpecialCObjectRule(scan,NullParameter,$(CONFIG_DEFINES) $(MODULEDEFINES) $(PICFLAGS) $(EXT_DEFINES))
-
- NormalProgramTarget(cpconfig,cpconfig.o $(OBJS),NullParameter,$(LOCAL_LIBRARIES),NullParameter)
-
+++ /dev/null
---- xc.orig/programs/Xserver/hw/xfree86/drivers/ati/r128.h 2004-08-08 14:22:29.000000000 +0200
-+++ xc/programs/Xserver/hw/xfree86/drivers/ati/r128.h 2004-08-08 15:11:32.996891824 +0200
-@@ -314,6 +314,8 @@
- unsigned char *AGP; /* Map */
- int agpMode;
-
-+ CARD32 pciCommand;
-+
- Bool CCEInUse; /* CCE is currently active */
- int CCEMode; /* CCE mode that server/clients use */
- int CCEFifoSize; /* Size of the CCE command FIFO */
---- xc.orig/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c 2004-08-08 14:22:29.000000000 +0200
-+++ xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c 2004-08-08 15:11:32.999891368 +0200
-@@ -440,6 +440,9 @@
- int flags;
- unsigned long agpBase;
-
-+ /* Save the old PCI command reg */
-+ info->pciCommand = pciReadLong(info->PciTag, PCI_CMD_STAT_REG);
-+
- if (drmAgpAcquire(info->drmFD) < 0) {
- xf86DrvMsg(pScreen->myNum, X_WARNING, "[agp] AGP not available\n");
- return FALSE;
-@@ -623,6 +626,11 @@
-
- OUTREG(R128_PCI_GART_PAGE, 1); /* Ensure AGP GART is used (for now) */
-
-+ /* Enable bus mastering in PCI config
-+ space */
-+ pciWriteLong(info->PciTag, PCI_CMD_STAT_REG,
-+ info->pciCommand | PCI_CMD_MASTER_ENABLE);
-+
- return TRUE;
- }
-
-@@ -1333,6 +1341,9 @@
- drmAgpFree(info->drmFD, info->agpMemHandle);
- info->agpMemHandle = DRM_AGP_NO_HANDLE;
- drmAgpRelease(info->drmFD);
-+
-+ /* Restore PCI command register */
-+ pciWriteLong(info->PciTag, PCI_CMD_STAT_REG, info->pciCommand);
- }
- if (info->pciMemHandle) {
- drmScatterGatherFree(info->drmFD, info->pciMemHandle);
+++ /dev/null
-diff -urN X11-6.9.0/xc/config/cf/xfree86.cf.orig X11-6.9.0/xc/config/cf/xfree86.cf
---- X11-6.9.0/xc/config/cf/xfree86.cf.orig 2005-10-03 18:08:44.000000000 +0200
-+++ X11-6.9.0/xc/config/cf/xfree86.cf 2005-12-27 21:28:39.000000000 +0100
-@@ -398,7 +398,7 @@
- # endif
-
- # ifndef DriDrivers
--# define DriDrivers gamma i810 i830 mga r128 radeon r200 \
-+# define DriDrivers gamma i810 i830 mga r128 radeon r200 r300 \
- sis tdfx DevelDRIDrivers
- # endif
- #endif
-@@ -490,7 +490,7 @@
-
- # define DevelDRIDrivers /**/
-
--# define DriDrivers gamma i810 mga r128 radeon r200 \
-+# define DriDrivers gamma i810 mga r128 radeon r200 r300 \
- TdfxDriDriver DevelDRIDrivers
- #endif /*AMD64Arcitecture*/
-
-@@ -873,7 +873,7 @@
- vga XF86OSCardDrivers XF86ExtraCardDrivers
- # endif
- # ifndef DriDrivers
--# define DriDrivers gamma tdfx mga r128 radeon r200 /*sis*/
-+# define DriDrivers gamma tdfx mga r128 radeon r200 r300 /*sis*/
- # endif
- #endif
-
-@@ -969,7 +969,7 @@
- XF86OSCardDrivers XF86ExtraCardDrivers
- # endif
- # ifndef DriDrivers
--# define DriDrivers gamma tdfx mga r128 radeon r200
-+# define DriDrivers gamma tdfx mga r128 radeon r200 r300
- # endif
- #endif
-
-@@ -1066,7 +1066,7 @@
- # define TdfxDriDriver /**/
- # endif
- # ifndef DriDrivers
--# define DriDrivers gamma tdfx mga r128 radeon r200
-+# define DriDrivers gamma tdfx mga r128 radeon r200 r300
- # endif
- #endif
-
-@@ -1443,7 +1443,7 @@
- # define DriDrivers radeon
- # endif
- # if GlxBuiltInR200
--# define DriDrivers r200
-+# define DriDrivers r200 r300
- # endif
- # if GlxBuiltInSIS
- # define DriDrivers sis
-diff -urN X11-6.9.0/xc/config/cf/xorg.cf.orig X11-6.9.0/xc/config/cf/xorg.cf
---- X11-6.9.0/xc/config/cf/xorg.cf.orig 2005-12-27 23:20:10.000000000 +0100
-+++ X11-6.9.0/xc/config/cf/xorg.cf 2005-12-27 23:19:52.000000000 +0100
-@@ -425,7 +425,7 @@
- /* SiS is 64-bit unclean as of this writing. */
- # define i386DRIDrivers /**/
- # endif
--# define DriDrivers i386DRIDrivers mga r128 radeon r200 tdfx
-+# define DriDrivers i386DRIDrivers mga r128 radeon r200 r300 tdfx
- # endif
- #endif /* i386Architecture || ia64Architecture */
-
-@@ -462,7 +462,7 @@
-
- /* SiS is 64-bit unclean as of this writing. */
- # ifndef DriDrivers
--# define DriDrivers i915 mga r128 radeon r200 tdfx
-+# define DriDrivers i915 mga r128 radeon r200 r300 tdfx
- # endif
- #endif /*AMD64Arcitecture*/
-
-@@ -603,7 +603,7 @@
- * SiS is 64-bit unclean as of this writing.
- */
- # ifndef DriDrivers
--# define DriDrivers tdfx mga r128 radeon r200
-+# define DriDrivers tdfx mga r128 radeon r200 r300
- # endif
- #endif /* AlphaArchitecture */
-
-@@ -637,7 +637,7 @@
- # endif
- /* The tdfx driver needs Glide, which is not available for PPC. */
- # ifndef DriDrivers
--# define DriDrivers mga r128 radeon r200
-+# define DriDrivers mga r128 radeon r200 r300
- # endif
- #endif /* PpcArchitecture || Mc68020Architecture */
-
-@@ -666,7 +666,7 @@
- XF86OSCardDrivers XF86ExtraCardDrivers
- # endif
- # ifndef DriDrivers
--# define DriDrivers mga r128 radeon r200
-+# define DriDrivers mga r128 radeon r200 r300
- # endif
- #endif
-
-@@ -985,7 +985,7 @@
- # define DriDrivers radeon
- # endif
- # if GlxBuiltInR200
--# define DriDrivers r200
-+# define DriDrivers r200 r300
- # endif
- # if GlxBuiltInSIS
- # define DriDrivers sis
---- X/xc/lib/GL/mesa/drivers/dri/r300/Imakefile.mesa- 2005-11-15 01:09:43.000000000 +0100
-+++ X/xc/lib/GL/mesa/drivers/dri/r300/Imakefile 2005-11-15 01:09:43.000000000 +0100
-@@ -0,0 +1,76 @@
-+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/r300/Imakefile,v 1.9 3002/02/23 00:45:50 dawes Exp $
-+
-+#include <Threads.tmpl>
-+
-+#if GlxUseBuiltInDRIDriver
-+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
-+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
-+#define DoExtraLib SharedLibGlx
-+#define DoDebugLib DebugLibGlx
-+#define DoProfileLib ProfileLibGlx
-+#else
-+#define DoNormalLib SharedLibGlxWithoutPIC
-+#define DoSharedLib !SharedLibGlxWithoutPIC
-+#define DoExtrasLib NO
-+#define DoDebugLib NO
-+#define DoProfileLib NO
-+#endif
-+
-+#define MesaDrvCommonBuildDir ../common/
-+#include "../common/Imakefile.inc"
-+#include "../../../array_cache/Imakefile.inc"
-+#include "../../../main/Imakefile.inc"
-+#include "../../../math/Imakefile.inc"
-+#include "../../../shader/Imakefile.inc"
-+#include "../../../shader/grammar/Imakefile.inc"
-+#include "../../../shader/slang/Imakefile.inc"
-+#include "../../../shader/slang/library/Imakefile.inc"
-+#include "../../../swrast/Imakefile.inc"
-+#include "../../../swrast_setup/Imakefile.inc"
-+#include "../../../tnl/Imakefile.inc"
-+#include "../../../tnl_dd/Imakefile.inc"
-+#include "../../../Imakefile.inc"
-+#if defined(i386Architecture) && MesaUseX86Asm
-+#include "../../../x86/Imakefile.inc"
-+#endif
-+#ifdef SparcArchitecture
-+#include "../../../sparc/Imakefile.inc"
-+#endif
-+#define NeedToLinkMesaSrc
-+#include "Imakefile.inc"
-+
-+ DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES)
-+ INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES)
-+
-+ DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \
-+ $(GLXLIBSRC)/dri/drm/xf86drmHash.o \
-+ $(GLXLIBSRC)/dri/drm/xf86drmRandom.o \
-+ $(GLXLIBSRC)/dri/drm/xf86drmSL.o
-+
-+ SRCS = $(R300SRCS)
-+ OBJS = $(DRMOBJS) $(COREMESAOBJS) \
-+ $(MESA_ASM_OBJS) $(COMMONOBJS) $(R300OBJS)
-+
-+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) $(EXPATLIB)
-+
-+#include <Library.tmpl>
-+
-+LibraryObjectRule()
-+
-+SubdirLibraryRule($(R300OBJS))
-+NormalLintTarget($(SRCS))
-+
-+#if !GlxUseBuiltInDRIDriver
-+LIBNAME = r300_dri.so
-+SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS))
-+InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri)
-+
-+#ifdef GlxSoProf
-+SOPROF_LIBNAME = _r300_dri_p
-+NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE $(OBJS),$(OBJS))
-+InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri)
-+#endif
-+#endif
-+
-+DependTarget()
-+
---- X/xc/lib/GL/mesa/drivers/dri/r300/Imakefile.inc.mesa- 2005-11-15 01:09:43.000000000 +0100
-+++ X/xc/lib/GL/mesa/drivers/dri/r300/Imakefile.inc 2005-11-15 01:42:48.000000000 +0100
-@@ -0,0 +1,188 @@
-+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/r300/Imakefile.inc,v 1.2 3001/05/02 15:06:04 dawes Exp $
-+
-+#ifndef MesaDrvSrcDir
-+#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri
-+#endif
-+
-+MESADRVSRCDIR = MesaDrvSrcDir
-+
-+#ifndef MesaDrvR300BuildDir
-+#define MesaDrvR300BuildDir /**/
-+#endif
-+MESADRVR300BUILDDIR = MesaDrvR300BuildDir
-+
-+#if Malloc0ReturnsNull
-+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-+#endif
-+
-+#if BuildXF86DRI
-+ DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=ByteOrder -DUSE_NEW_INTERFACE -DIN_DRI_DRIVER -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R300
-+ DRI_INCLUDES = -I$(GLXLIBSRC)/dri \
-+ -I$(XINCLUDESRC) \
-+ -I$(GLXLIBSRC)/glx \
-+ -I$(GLXLIBSRC)/include \
-+ -I$(SERVERSRC)/GL/dri \
-+ -I$(XF86COMSRC) \
-+ -I$(XF86OSSRC) \
-+ -I$(DRMSRCDIR)/shared-core \
-+ -I$(XF86DRIVERSRC)/ati \
-+ -I$(GLXLIBSRC)/dri/drm
-+#endif
-+
-+MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
-+ -I$(MESASRCDIR)/src/mesa/main \
-+ -I$(MESASRCDIR)/src/mesa/glapi \
-+ -I$(MESASRCDIR)/src/mesa/shader \
-+ -I$(MESASRCDIR)/include \
-+ -I$(MESADRVSRCDIR)/common \
-+ -I$(MESADRVSRCDIR)/r300 \
-+ -I$(MESADRVSRCDIR)/radeon \
-+ -I$(MESADRVSRCDIR)/radeon/server
-+ X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC)
-+
-+ R300SRCS = $(MESADRVR300BUILDDIR)r300_cmdbuf.c \
-+ $(MESADRVR300BUILDDIR)r300_context.c \
-+ $(MESADRVR300BUILDDIR)r300_fragprog.c \
-+ /* broken? $(MESADRVR300BUILDDIR)r300_fragprog_swz.c */ \
-+ $(MESADRVR300BUILDDIR)r300_ioctl.c \
-+ $(MESADRVR300BUILDDIR)r300_maos.c \
-+ $(MESADRVR300BUILDDIR)r300_render.c \
-+ $(MESADRVR300BUILDDIR)r300_shader.c \
-+ $(MESADRVR300BUILDDIR)r300_state.c \
-+ $(MESADRVR300BUILDDIR)r300_tex.c \
-+ $(MESADRVR300BUILDDIR)r300_texmem.c \
-+ $(MESADRVR300BUILDDIR)r300_texprog.c \
-+ $(MESADRVR300BUILDDIR)r300_texstate.c \
-+ $(MESADRVR300BUILDDIR)r300_vertexprog.c \
-+ $(MESADRVR300BUILDDIR)radeon_context.c \
-+ $(MESADRVR300BUILDDIR)radeon_ioctl.c \
-+ $(MESADRVR300BUILDDIR)radeon_lock.c \
-+ $(MESADRVR300BUILDDIR)radeon_span.c \
-+ $(MESADRVR300BUILDDIR)radeon_screen.c \
-+ $(MESADRVR300BUILDDIR)radeon_state.c
-+
-+ R300OBJS = $(MESADRVR300BUILDDIR)r300_cmdbuf.o \
-+ $(MESADRVR300BUILDDIR)r300_context.o \
-+ $(MESADRVR300BUILDDIR)r300_fragprog.o \
-+ /* broken? $(MESADRVR300BUILDDIR)r300_fragprog_swz.o */ \
-+ $(MESADRVR300BUILDDIR)r300_ioctl.o \
-+ $(MESADRVR300BUILDDIR)r300_maos.o \
-+ $(MESADRVR300BUILDDIR)r300_render.o \
-+ $(MESADRVR300BUILDDIR)r300_shader.o \
-+ $(MESADRVR300BUILDDIR)r300_state.o \
-+ $(MESADRVR300BUILDDIR)r300_tex.o \
-+ $(MESADRVR300BUILDDIR)r300_texmem.o \
-+ $(MESADRVR300BUILDDIR)r300_texprog.o \
-+ $(MESADRVR300BUILDDIR)r300_texstate.o \
-+ $(MESADRVR300BUILDDIR)r300_vertexprog.o \
-+ $(MESADRVR300BUILDDIR)radeon_context.o \
-+ $(MESADRVR300BUILDDIR)radeon_ioctl.o \
-+ $(MESADRVR300BUILDDIR)radeon_lock.o \
-+ $(MESADRVR300BUILDDIR)radeon_span.o \
-+ $(MESADRVR300BUILDDIR)radeon_screen.o \
-+ $(MESADRVR300BUILDDIR)radeon_state.o
-+
-+ R300UOBJS = $(MESADRVR300BUILDDIR)unshared/r300_cmdbuf.o \
-+ $(MESADRVR300BUILDDIR)unshared/r300_context.o \
-+ $(MESADRVR300BUILDDIR)unshared/r300_fragprog.o \
-+ /* broken? $(MESADRVR300BUILDDIR)unshared/r300_fragprog_swz.o */ \
-+ $(MESADRVR300BUILDDIR)unshared/r300_ioctl.o \
-+ $(MESADRVR300BUILDDIR)unshared/r300_maos.o \
-+ $(MESADRVR300BUILDDIR)unshared/r300_render.o \
-+ $(MESADRVR300BUILDDIR)unshared/r300_shader.o \
-+ $(MESADRVR300BUILDDIR)unshared/r300_state.o \
-+ $(MESADRVR300BUILDDIR)unshared/r300_tex.o \
-+ $(MESADRVR300BUILDDIR)unshared/r300_texmem.o \
-+ $(MESADRVR300BUILDDIR)unshared/r300_texprog.o \
-+ $(MESADRVR300BUILDDIR)unshared/r300_texstate.o \
-+ $(MESADRVR300BUILDDIR)unshared/r300_vertexprog.o \
-+ $(MESADRVR300BUILDDIR)unshared/radeon_context.o \
-+ $(MESADRVR300BUILDDIR)unshared/radeon_ioctl.o \
-+ $(MESADRVR300BUILDDIR)unshared/radeon_lock.o \
-+ $(MESADRVR300BUILDDIR)unshared/radeon_span.o \
-+ $(MESADRVR300BUILDDIR)unshared/radeon_screen.o \
-+ $(MESADRVR300BUILDDIR)unshared/radeon_state.o
-+
-+ R300DOBJS = $(MESADRVR300BUILDDIR)debugger/r300_cmdbuf.o \
-+ $(MESADRVR300BUILDDIR)debugger/r300_context.o \
-+ $(MESADRVR300BUILDDIR)debugger/r300_fragprog.o \
-+ /* broken? $(MESADRVR300BUILDDIR)debugger/r300_fragprog_swz.o */ \
-+ $(MESADRVR300BUILDDIR)debugger/r300_ioctl.o \
-+ $(MESADRVR300BUILDDIR)debugger/r300_maos.o \
-+ $(MESADRVR300BUILDDIR)debugger/r300_render.o \
-+ $(MESADRVR300BUILDDIR)debugger/r300_shader.o \
-+ $(MESADRVR300BUILDDIR)debugger/r300_state.o \
-+ $(MESADRVR300BUILDDIR)debugger/r300_tex.o \
-+ $(MESADRVR300BUILDDIR)debugger/r300_texmem.o \
-+ $(MESADRVR300BUILDDIR)debugger/r300_texprog.o \
-+ $(MESADRVR300BUILDDIR)debugger/r300_texstate.o \
-+ $(MESADRVR300BUILDDIR)debugger/r300_vertexprog.o \
-+ $(MESADRVR300BUILDDIR)debugger/radeon_context.o \
-+ $(MESADRVR300BUILDDIR)debugger/radeon_ioctl.o \
-+ $(MESADRVR300BUILDDIR)debugger/radeon_lock.o \
-+ $(MESADRVR300BUILDDIR)debugger/radeon_span.o \
-+ $(MESADRVR300BUILDDIR)debugger/radeon_screen.o \
-+ $(MESADRVR300BUILDDIR)debugger/radeon_state.o
-+
-+ R300POBJS = $(MESADRVR300BUILDDIR)profiled/r300_cmdbuf.o \
-+ $(MESADRVR300BUILDDIR)profiled/r300_context.o \
-+ $(MESADRVR300BUILDDIR)profiled/r300_fragprog.o \
-+ /* broken? $(MESADRVR300BUILDDIR)profiled/r300_fragprog_swz.o */ \
-+ $(MESADRVR300BUILDDIR)profiled/r300_ioctl.o \
-+ $(MESADRVR300BUILDDIR)profiled/r300_maos.o \
-+ $(MESADRVR300BUILDDIR)profiled/r300_render.o \
-+ $(MESADRVR300BUILDDIR)profiled/r300_shader.o \
-+ $(MESADRVR300BUILDDIR)profiled/r300_state.o \
-+ $(MESADRVR300BUILDDIR)profiled/r300_tex.o \
-+ $(MESADRVR300BUILDDIR)profiled/r300_texmem.o \
-+ $(MESADRVR300BUILDDIR)profiled/r300_texprog.o \
-+ $(MESADRVR300BUILDDIR)profiled/r300_texstate.o \
-+ $(MESADRVR300BUILDDIR)profiled/r300_vertexprog.o \
-+ $(MESADRVR300BUILDDIR)profiled/radeon_context.o \
-+ $(MESADRVR300BUILDDIR)profiled/radeon_ioctl.o \
-+ $(MESADRVR300BUILDDIR)profiled/radeon_lock.o \
-+ $(MESADRVR300BUILDDIR)profiled/radeon_span.o \
-+ $(MESADRVR300BUILDDIR)profiled/radeon_screen.o \
-+ $(MESADRVR300BUILDDIR)profiled/radeon_state.o
-+
-+#ifdef NeedToLinkMesaSrc
-+LinkSourceFile(r300_context.c, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(r300_context.h, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(r300_cmdbuf.c, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(r300_cmdbuf.h, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(r300_emit.h, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(r300_fixed_pipelines.h, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(r300_ioctl.c, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(r300_ioctl.h, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(r300_maos.c, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(r300_maos.h, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(r300_program.h, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(r300_render.c, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(r300_reg.h, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(r300_fragprog.c, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(r300_fragprog.h, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(r300_fragprog_swz.c, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(r300_shader.c, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(r300_state.c, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(r300_state.h, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(r300_tex.c, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(r300_tex.h, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(r300_texmem.c, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(r300_texprog.c, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(r300_texstate.c, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(r300_vertexprog.c, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(radeon_context.c, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(radeon_context.h, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(radeon_ioctl.c, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(radeon_ioctl.h, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(radeon_lock.c, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(radeon_lock.h, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(radeon_screen.c, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(radeon_screen.h, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(radeon_span.c, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(radeon_span.h, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(radeon_state.c, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(radeon_state.h, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(pixel_shader.h, $(MESADRVSRCDIR)/r300)
-+LinkSourceFile(vertex_shader.h, $(MESADRVSRCDIR)/r300)
-+#endif
+++ /dev/null
---- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c.ati-radeon-dynamic-clocks-fix 2005-04-14 14:07:38.000000000 -0400
-+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-04-14 14:10:50.000000000 -0400
-@@ -4512,7 +4512,7 @@
-
- RADEONSave(pScrn);
-
-- if ((!info->IsSecondary) && info->IsMobility) {
-+ if ((!info->IsSecondary)) {
- if (xf86ReturnOptValBool(info->Options, OPTION_DYNAMIC_CLOCKS, FALSE)) {
- RADEONSetDynamicClock(pScrn, 1);
- } else {
-@@ -7808,6 +7808,34 @@
- CARD32 tmp;
- switch(mode) {
- case 0: /* Turn everything OFF (ForceON to everything)*/
-+#if 1
-+ /* some chips seem to have problems with the method of
-+ * forcing everything on as per below; thus we revert to the old
-+ * forceON behavior
-+ */
-+ if (info->HasCRTC2) {
-+ tmp = INPLL(pScrn, RADEON_SCLK_CNTL);
-+ OUTPLL(RADEON_SCLK_CNTL, ((tmp & ~RADEON_DYN_STOP_LAT_MASK) |
-+ RADEON_CP_MAX_DYN_STOP_LAT |
-+ RADEON_SCLK_FORCEON_MASK));
-+
-+ if (info->ChipFamily == CHIP_FAMILY_RV200) {
-+ tmp = INPLL(pScrn, RADEON_SCLK_MORE_CNTL);
-+ OUTPLL(RADEON_SCLK_MORE_CNTL, tmp | RADEON_SCLK_MORE_FORCEON);
-+ }
-+
-+ }
-+
-+ tmp = INPLL(pScrn, RADEON_MCLK_CNTL);
-+ OUTPLL(RADEON_MCLK_CNTL, (tmp |
-+ RADEON_FORCEON_MCLKA |
-+ RADEON_FORCEON_MCLKB |
-+ RADEON_FORCEON_YCLKA |
-+ RADEON_FORCEON_YCLKB |
-+ RADEON_FORCEON_MC |
-+ RADEON_FORCEON_AIC));
-+
-+#else
- if ( !info->HasCRTC2 ) {
- tmp = INPLL(pScrn, RADEON_SCLK_CNTL);
- tmp |= (RADEON_SCLK_FORCE_CP | RADEON_SCLK_FORCE_HDP |
-@@ -7945,6 +7973,7 @@
- RADEON_PIXCLK_DAC_ALWAYS_ONb);
- OUTPLL(RADEON_VCLK_ECP_CNTL, tmp);
- }
-+#endif
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Dynamic Clock Scaling Disabled\n");
- break;
- case 1:
+++ /dev/null
---- X11-6.8.1/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c.orig 2004-10-24 12:16:24.000000000 +0200
-+++ X11-6.8.1/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2004-10-24 12:17:41.000000000 +0200
-@@ -7158,6 +7158,8 @@
- } else
- if (!RADEONModeInit(pScrn, pScrn->currentMode)) return FALSE;
-
-+ RADEONSetFBLocation (pScrn);
-+
- #ifdef XF86DRI
- if (info->directRenderingEnabled) {
- /* get the Radeon back into shape after resume */
+++ /dev/null
---- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c.radeon-set-fb-location-fdo2698-2079 2005-04-11 23:43:02.000000000 -0400
-+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-04-12 00:33:34.000000000 -0400
-@@ -7179,7 +7179,6 @@
- RADEONDoAdjustFrame(pScrn, x, y, FALSE);
- }
-
-- RADEONSetFBLocation (pScrn);
- #ifdef XF86DRI
- if (info->CPStarted) DRIUnlock(pScrn->pScreen);
- #endif
---- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c.org 2005-02-12 01:09:23.399039632 +0100
-+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-02-12 01:11:08.746024456 +0100
-@@ -7145,8 +7145,6 @@
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
- RADEONInfoPtr info = RADEONPTR(pScrn);
-
-- RADEONSetFBLocation (pScrn);
--
- #ifdef XF86DRI
- if (info->CPStarted) DRILock(pScrn->pScreen, 0);
- #endif
+++ /dev/null
-diff -ur X11-6.8.1/xc/extras/Mesa/src/mesa/sparc/clip.S X11-modified/xc/extras/Mesa/src/mesa/sparc/clip.S
---- X11-6.8.1/xc/extras/Mesa/src/mesa/sparc/clip.S 2005-02-04 01:21:38 +0000
-+++ X11-modified/xc/extras/Mesa/src/mesa/sparc/clip.S 2005-02-02 22:29:00 +0000
-@@ -25,7 +25,7 @@
- #define VEC_SIZE_3 7
- #define VEC_SIZE_4 15
-
--#ifdef SVR4
-+#if defined(SVR4) || (defined(__sparc__) && defined(__arch64__)
- /* Solaris requires this for 64-bit. */
- .register %g2, #scratch
- .register %g3, #scratch
-diff -ur X11-6.8.1/xc/extras/Mesa/src/mesa/sparc/glapi_sparc.S X11-modified/xc/extras/Mesa/src/mesa/sparc/glapi_sparc.S
---- X11-6.8.1/xc/extras/Mesa/src/mesa/sparc/glapi_sparc.S 2005-02-04 01:21:39 +0000
-+++ X11-modified/xc/extras/Mesa/src/mesa/sparc/glapi_sparc.S 2005-02-02 22:25:31 +0000
-@@ -17,6 +17,12 @@
- .data
- .align 64
-
-+#if defined(SVR4) || (defined(__sparc__) && defined(__arch64__))
-+ /* Solaris requires this for 64-bit. */
-+ .register %g2, #scratch
-+ .register %g3, #scratch
-+#endif
-+
- .globl _mesa_sparc_glapi_begin
- .type _mesa_sparc_glapi_begin,#function
- _mesa_sparc_glapi_begin:
-diff -ur X11-6.8.1/xc/extras/Mesa/src/mesa/sparc/norm.S X11-modified/xc/extras/Mesa/src/mesa/sparc/norm.S
---- X11-6.8.1/xc/extras/Mesa/src/mesa/sparc/norm.S 2005-02-04 01:21:39 +0000
-+++ X11-modified/xc/extras/Mesa/src/mesa/sparc/norm.S 2005-02-02 22:29:24 +0000
-@@ -2,7 +2,7 @@
-
- #include "sparc_matrix.h"
-
--#ifdef SVR4
-+#if defined(SVR4) || (defined(__sparc__) && defined(__arch64__))
- /* Solaris requires this for 64-bit. */
- .register %g2, #scratch
- .register %g3, #scratch
-diff -ur X11-6.8.1/xc/extras/Mesa/src/mesa/sparc/xform.S X11-modified/xc/extras/Mesa/src/mesa/sparc/xform.S
---- X11-6.8.1/xc/extras/Mesa/src/mesa/sparc/xform.S 2004-06-16 09:19:25 +0000
-+++ X11-modified/xc/extras/Mesa/src/mesa/sparc/xform.S 2005-02-02 22:27:14 +0000
-@@ -18,7 +18,7 @@
-
- #include "sparc_matrix.h"
-
--#ifdef SVR4
-+#if defined(SVR4) || (defined(__sparc__) && defined(__arch64__))
- /* Solaris requires this for 64-bit. */
- .register %g2, #scratch
- .register %g3, #scratch
+++ /dev/null
-diff -ur X11-6.8.1/xc/include/Xmd.h X11-modified/xc/include/Xmd.h
---- X11-6.8.1/xc/include/Xmd.h 2005-02-05 16:37:53 +0000
-+++ X11-modified/xc/include/Xmd.h 2005-02-05 16:13:30 +0000
-@@ -58,6 +58,11 @@
- #ifdef CRAY
- #define WORD64 /* 64-bit architecture */
- #endif
-+
-+#if defined(__sparc__) && defined(__arch64__)
-+#define __sparc64__
-+#endif
-+
- #if defined (_LP64) || \
- defined(__alpha) || defined(__alpha__) || \
- defined(__ia64__) || defined(ia64) || \
+++ /dev/null
---- X11-6.9.0/xc/config/cf/xfree86.cf.fix 2006-01-29 19:26:27.691443000 +0100
-+++ X11-6.9.0/xc/config/cf/xfree86.cf 2006-01-29 19:30:51.181443000 +0100
-@@ -399,7 +399,7 @@
-
- # ifndef DriDrivers
- # define DriDrivers gamma i810 i830 mga r128 radeon r200 r300 \
-- sis tdfx DevelDRIDrivers
-+ sis tdfx unichrome DevelDRIDrivers
- # endif
- #endif
-
---- X11-6.9.0/xc/config/cf/xorg.cf.fix 2006-01-29 19:39:55.301443000 +0100
-+++ X11-6.9.0/xc/config/cf/xorg.cf 2006-01-29 19:43:27.541443000 +0100
-@@ -425,7 +425,7 @@
- /* SiS is 64-bit unclean as of this writing. */
- # define i386DRIDrivers /**/
- # endif
--# define DriDrivers i386DRIDrivers mga r128 radeon r200 r300 tdfx
-+# define DriDrivers i386DRIDrivers mga r128 radeon r200 r300 tdfx unichrome
- # endif
- #endif /* i386Architecture || ia64Architecture */
-
+++ /dev/null
---- xc.orig/programs/xdm/config/Imakefile 2004-08-08 14:22:57.000000000 +0200
-+++ xc/programs/xdm/config/Imakefile 2004-08-08 15:04:29.403287840 +0200
-@@ -10,13 +10,7 @@
-
- all:: Xservers.ws xdm-config Xservers Xresources
-
--#if (defined(i386Architecture) || defined(AMD64Architecture)) && (defined(KNetBSDArchitecture) || defined(KOpenBSDArchitecture))
--DEFAULTVT=vt05
--#endif
--
--#if defined(LinuxDistribution) && (LinuxDistribution == LinuxDebian)
--DEFAULTVT=vt7
--#endif
-+DEFAULTVT=vt9
-
- #ifndef XdmPixmap
- # define XdmPixmap XVendorStdFilePrefix.xpm
-@@ -42,7 +42,11 @@
- #endif
-
- CppFileTarget(Xservers.ws,Xserv.ws.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT) -DSHELL_CMD=$(SHELL_CMD),NullParameter)
-+#ifdef LinuxArchitecture
-+CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DLINUX=1 -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DXDMVARDIR=$(XDMVARDIR) -DCHOOSERPATH="$(BINDIR)/chooser",NullParameter)
-+#else
- CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH) $(XPM_DEFINES),NullParameter)
-+#endif
- CppFileTarget(Xresources,Xres.cpp,$(XPM_DEFINES),NullParameter)
- CppFileTarget(Xsession,Xsession.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT) -DSHELL_CMD=$(SHELL_CMD),NullParameter)
-
---- xc.orig/programs/xdm/config/Xres.cpp 2004-08-08 14:31:29.000000000 +0200
-+++ xc/programs/xdm/config/Xres.cpp 2004-08-08 15:03:33.539780384 +0200
-@@ -41,9 +41,7 @@
- XHASHendif
- #endif /* XPM */
- XHASHifdef COLOR
--#ifndef XPM
--xlogin*greetColor: CadetBlue
--#else
-+#ifdef XPM
- xlogin*borderWidth: 1
- xlogin*frameWidth: 5
- xlogin*innerFramesWidth: 2
-@@ -52,6 +50,8 @@
- xlogin*background: grey
- !xlogin*foreground: darkgreen
- xlogin*greetColor: Blue3
-+#else
-+login*greetColor: CadetBlue
- #endif /* XPM */
- xlogin*failColor: red
- *Foreground: black
---- xc.orig/programs/xdm/Imakefile 2004-08-08 14:22:57.000000000 +0200
-+++ xc/programs/xdm/Imakefile 2004-08-08 15:03:33.517783728 +0200
-@@ -289,9 +289,9 @@
- '-DDEF_SYSTEM_SHELL="$(BOURNE_SHELL)"' \
- '-DDEF_FAILSAFE_CLIENT="$(BINDIR)/xterm"' \
- '-DDEF_XDM_CONFIG="$(XDMDIR)/xdm-config"' \
-- '-DDEF_CHOOSER="$(CHOOSERPATH)"' \
-- '-DDEF_AUTH_DIR="$(XDMDIR)"' \
-- '-DDEF_GREETER_LIB="$(XDMDIR)/libXdmGreet.so"'
-+ '-DDEF_CHOOSER="$(BINDIR)/chooser"' \
-+ '-DDEF_AUTH_DIR="$(XDMVARDIR)"' \
-+ '-DDEF_GREETER_LIB="$(USRLIBDIR)/libXdmGreet.so"'
-
- ComplexProgramTarget_1(xdm,$(LOCAL_LIBRARIES),NullParameter)
- #ifdef LinkConfDirectory
-@@ -316,7 +316,7 @@
- #if BuildChooser
- SpecialCObjectRule(chooser, $(ICONFIGFILES), $(SOCK_DEFINES) $(LIFREQ_FLAGS))
- NormalProgramTarget(chooser,$(OBJS3),$(DEPLIBS3),$(LIBS3),NullParameter)
--InstallProgram(chooser,$(XDMDIR))
-+InstallProgram(chooser,$(BINDIR))
- InstallAppDefaults(Chooser)
- #endif
- #if BuildBoth
+++ /dev/null
---- xc.orig/programs/xdm/xdmcp.c 2004-08-08 14:22:57.000000000 +0200
-+++ xc/programs/xdm/xdmcp.c 2004-08-08 15:00:03.061777904 +0200
-@@ -1316,7 +1316,7 @@
- XdmcpHeader header;
- ARRAY8 status;
-
-- sprintf (buf, "Session %ld failed for display %.100s: %.100s",
-+ snprintf (buf, sizeof(buf), "Session %ld failed for display %.100s: %.100s",
- (long) sessionID, name, reason);
- Debug ("Send failed %ld %s\n", (long) sessionID, buf);
- status.length = strlen (buf);
+++ /dev/null
-diff -urN xc.orig/programs/xfs/difs/charinfo.c xc/programs/xfs/difs/charinfo.c
---- xc.orig/programs/xfs/difs/charinfo.c 2004-08-08 14:23:00.000000000 +0200
-+++ xc/programs/xfs/difs/charinfo.c 2004-08-08 14:42:16.342943816 +0200
-@@ -499,6 +499,8 @@
- #define LSBBitLeft(b,c) ((b) >> (c))
- #define LSBBitRight(b,c) ((b) << (c))
-
-+ if (srcp) {
-+
- if (dst_off == src_off)
- {
- if (srcbpr == dstbpr && src_left_bytes == dst_left_bytes)
-@@ -580,6 +582,7 @@
- srcp += src_extra;
- }
- }
-+ }
- /* skip the amount we just filled in */
- gd += l->length;
- }
-diff -urN xc.orig/programs/xfs/difs/fonts.c xc/programs/xfs/difs/fonts.c
---- xc.orig/programs/xfs/difs/fonts.c 2004-08-08 14:23:00.000000000 +0200
-+++ xc/programs/xfs/difs/fonts.c 2004-08-08 14:41:58.277690152 +0200
-@@ -114,6 +114,113 @@
- }
-
- /*
-+ * xf86GetPathElem --
-+ * Extract a single element from the font path string starting at
-+ * pnt. The font path element will be returned, and pnt will be
-+ * updated to point to the start of the next element, or set to
-+ * NULL if there are no more.
-+ */
-+char *
-+xf86GetPathElem(pnt)
-+ char **pnt;
-+{
-+ char *p1;
-+
-+ p1 = *pnt;
-+ *pnt = index(*pnt, ',');
-+ if (*pnt != NULL) {
-+ **pnt = '\0';
-+ *pnt += 1;
-+ }
-+ return(p1);
-+}
-+
-+/*
-+ * xf86ValidateFontPath --
-+ * Validates the user-specified font path. Each element that
-+ * begins with a '/' is checked to make sure the directory exists.
-+ * If the directory exists, the existence of a file named 'fonts.dir'
-+ * is checked. If either check fails, an error is printed and the
-+ * element is removed from the font path.
-+ */
-+#define DIR_FILE "/fonts.dir"
-+#define CHECK_TYPE(mode, type) ((S_IFMT & (mode)) == (type))
-+static char *
-+xf86ValidateFontPath(path)
-+ char *path;
-+{
-+ char *tmp_path, *out_pnt, *path_elem, *next, *p1, *dir_elem;
-+ struct stat stat_buf;
-+ int flag;
-+ int dirlen;
-+
-+ tmp_path = (char *)calloc(1,strlen(path)+1);
-+ out_pnt = tmp_path;
-+ path_elem = NULL;
-+ next = path;
-+ while (next != NULL) {
-+ path_elem = xf86GetPathElem(&next);
-+#ifndef __EMX__
-+ if (*path_elem == '/') {
-+ dir_elem = (char *)calloc(1, strlen(path_elem) + 1);
-+ if ((p1 = strchr(path_elem, ':')) != 0)
-+#else
-+ /* OS/2 must prepend X11ROOT */
-+ if (*path_elem == '/') {
-+ path_elem = (char*)__XOS2RedirRoot(path_elem);
-+ dir_elem = (char*)calloc(1, strlen(path_elem) + 1);
-+ if (p1 = strchr(path_elem+2, ':'))
-+#endif
-+ dirlen = p1 - path_elem;
-+ else
-+ dirlen = strlen(path_elem);
-+ strncpy(dir_elem, path_elem, dirlen);
-+ dir_elem[dirlen] = '\0';
-+ flag = stat(dir_elem, &stat_buf);
-+ if (flag == 0)
-+ if (!CHECK_TYPE(stat_buf.st_mode, S_IFDIR))
-+ flag = -1;
-+ if (flag != 0) {
-+ printf("warning!\n");
-+ ErrorF("Warning: The directory \"%s\" does not exist.\n", dir_elem);
-+ ErrorF(" Entry deleted from font path.\n");
-+ continue;
-+ }
-+ else {
-+ p1 = (char *)malloc(strlen(dir_elem)+strlen(DIR_FILE)+1);
-+ strcpy(p1, dir_elem);
-+ strcat(p1, DIR_FILE);
-+ flag = stat(p1, &stat_buf);
-+ if (flag == 0)
-+ if (!CHECK_TYPE(stat_buf.st_mode, S_IFREG))
-+ flag = -1;
-+#ifndef __EMX__
-+ free(p1);
-+#endif
-+ if (flag != 0) {
-+ ErrorF("Warning: 'fonts.dir' not found (or not valid) in \"%s\".\n",
-+ dir_elem);
-+ ErrorF(" Entry deleted from font path.\n");
-+ ErrorF(" (Run 'mkfontdir' on \"%s\").\n", dir_elem);
-+ continue;
-+ }
-+ }
-+ free(dir_elem);
-+ }
-+
-+ /*
-+ * Either an OK directory, or a font server name. So add it to
-+ * the path.
-+ */
-+ if (out_pnt != tmp_path)
-+ *out_pnt++ = ',';
-+ strcat(out_pnt, path_elem);
-+ out_pnt += strlen(path_elem);
-+ }
-+ return(tmp_path);
-+}
-+
-+/*
- * note that the font wakeup queue is not refcounted. this is because
- * an fpe needs to be added when it's inited, and removed when it's finally
- * freed, in order to handle any data that isn't requested, like FS events.
-@@ -754,8 +861,12 @@
- *end,
- *p;
- int err;
-+ char *fixedpath;
-+
-+ fixedpath = xf86ValidateFontPath(str);
-
-- len = strlen(str) + 1;
-+ len = strlen(fixedpath) + 1;
-+ str = fixedpath;
- paths = p = (char *) ALLOCATE_LOCAL(len);
- npaths = 0;
-
-@@ -775,6 +886,7 @@
-
- err = set_font_path_elements(npaths, paths, badpath);
-
-+ free(fixedpath);
- DEALLOCATE_LOCAL(paths);
-
- return err;
-diff -urN xc.orig/programs/xfs/difs/main.c xc/programs/xfs/difs/main.c
---- xc.orig/programs/xfs/difs/main.c 2004-08-08 14:23:00.000000000 +0200
-+++ xc/programs/xfs/difs/main.c 2004-08-08 14:42:22.082071336 +0200
-@@ -63,6 +63,7 @@
- #include "dispatch.h"
- #include "extentst.h"
- #include "difs.h"
-+#include "debug.h"
-
- char *ConnectionInfo;
- int ConnInfoLen;
-@@ -78,6 +79,7 @@
- static Bool create_connection_block(void);
-
- char *configfilename;
-+int debug_level;
- extern Bool drone_server;
-
- extern OldListenRec *OldListen;
-@@ -89,6 +91,7 @@
- int i, oldumask;
-
- argcGlobal = argc;
-+ debug_level = 0;
- argvGlobal = argv;
-
- configfilename = DEFAULT_CONFIG_FILE;
-diff -urN xc.orig/programs/xfs/include/debug.h xc/programs/xfs/include/debug.h
---- xc.orig/programs/xfs/include/debug.h 1970-01-01 01:00:00.000000000 +0100
-+++ xc/programs/xfs/include/debug.h 2004-08-08 14:42:22.082071336 +0200
-@@ -0,0 +1 @@
-+/* debug.h */
-\ Brak znaku nowej linii na koñcu pliku
-diff -urN xc.orig/programs/xfs/os/utils.c xc/programs/xfs/os/utils.c
---- xc.orig/programs/xfs/os/utils.c 2004-08-08 14:23:00.000000000 +0200
-+++ xc/programs/xfs/os/utils.c 2004-08-08 14:42:22.084071032 +0200
-@@ -93,6 +93,7 @@
- #include <stdlib.h>
-
- extern char *configfilename;
-+extern int debug_level;
- 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 */
-@@ -219,7 +220,7 @@
- static void
- usage(void)
- {
-- 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);
- }
-@@ -333,6 +334,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 = TRUE;
- } else if (!strcmp(argv[i], "-daemon")) {
+++ /dev/null
---- XFree86-4.2.99.901/xc/programs/xman/vendor.h.orig Sun Mar 17 01:50:17 2002
-+++ XFree86-4.2.99.901/xc/programs/xman/vendor.h Sun Mar 17 01:54:57 2002
-@@ -77,7 +77,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__) || 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"
+++ /dev/null
---- xc.orig/programs/xman/Imakefile 2004-08-08 14:22:59.000000000 +0200
-+++ xc/programs/xman/Imakefile 2004-08-08 15:01:51.815244864 +0200
-@@ -26,7 +26,7 @@
- # if defined(LinuxDistribution) && (LinuxDistribution == LinuxRedHat)
- MANCONF = -DMANCONF=\"/etc/man.config\"
- # else
-- MANCONF = -DMANCONF=\"/etc/man.conf\"
-+ MANCONF = -DMANCONF=\"/etc/man.config\"
- # endif
- #elif defined(OpenBSDArchitecture) || defined(NetBSDArchitecture) || \
- defined(DarwinArchitecture)
---- xc.orig/programs/xman/xman.man 2004-08-08 14:22:59.000000000 +0200
-+++ xc/programs/xman/xman.man 2004-08-08 15:01:51.820244104 +0200
-@@ -93,8 +93,8 @@
- .SH "BSD AND LINUX SYSTEMS"
- .PP
- In newer BSD and Linux systems, \fIXman\fP will search for a file named
--\fI/etc/man.conf\fP which will contain the list of directories containing
--manual pages. See \fIman.conf\fP(5) for a complete description of the file
-+\fI/etc/man.config\fP which will contain the list of directories containing
-+manual pages. See \fIman.config\fP(5) for a complete description of the file
- format.
- .SH "THE MANDESC FILE"
- .PP
+++ /dev/null
---- xc/programs/xterm/Imakefile.orig 2004-09-13 18:37:31.277489528 +0200
-+++ xc/programs/xterm/Imakefile 2004-09-13 18:40:21.011686008 +0200
-@@ -25,6 +25,9 @@
- UTMPLIB = -lutempter
- #endif
-
-+#define UseUtempter
-+
-+COLORS_256 = -DOPT_256_COLORS=1
- /*
- * setgid mode works for systems that do not require setuid to open pty.
- */
-@@ -158,7 +161,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. -I/usr/include/ncurses $(XRFINCLUDES)
-+ INCLUDES = -I. -I/usr/include/ncurses $(XRFINCLUDES) $(COLORS_256)
-
- #ifdef OS2Architecture
- MAINSRC = os2main.c
-
+++ /dev/null
---- xc.orig/programs/xterm/Imakefile 2004-08-08 14:31:29.000000000 +0200
-+++ xc/programs/xterm/Imakefile 2004-08-08 14:47:26.823743560 +0200
-@@ -18,6 +18,8 @@
- /* Define UTF8support to compile-in support for UTF-8 */
- #define UTF8support
-
-+#define UseUtempter
-+
- #if defined(UseUtempter)
- #undef InstallXtermSetUID /* imake sets this */
- #define InstallXtermSetUID NO
-
+++ /dev/null
-Index: lib/font/Type1/afm.c
-===================================================================
-RCS file: /cvs/xorg/xc/lib/font/Type1/afm.c,v
-retrieving revision 1.5
-diff -u -u -r1.5 afm.c
---- lib/font/Type1/afm.c 9 Jul 2005 23:30:06 -0000 1.5
-+++ lib/font/Type1/afm.c 12 Sep 2006 07:49:46 -0000
-@@ -29,6 +29,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
-+#include <limits.h>
- #else
- #include "Xmd.h" /* For INT32 declaration */
- #include "Xdefs.h" /* For Bool */
-@@ -118,6 +119,11 @@
-
- fi->nChars = atoi(p);
-
-+ if (fi->nChars < 0 || fi->nChars > INT_MAX / sizeof(Metrics)) {
-+ xfree(afmbuf);
-+ xfree(fi);
-+ return(1);
-+ }
- fi->metrics = (Metrics *)xalloc(fi->nChars *
- sizeof(Metrics));
- if (fi->metrics == NULL) {
-Index: lib/font/Type1/scanfont.c
-===================================================================
-RCS file: /cvs/xorg/xc/lib/font/Type1/scanfont.c,v
-retrieving revision 1.5
-diff -u -u -r1.5 scanfont.c
---- lib/font/Type1/scanfont.c 9 Jul 2005 23:30:06 -0000 1.5
-+++ lib/font/Type1/scanfont.c 12 Sep 2006 07:49:46 -0000
-@@ -57,6 +57,7 @@
-
- #ifndef FONTMODULE
- #include <string.h>
-+#include <limits.h>
- #else
- #include "Xdefs.h" /* Bool declaration */
- #include "Xmd.h" /* INT32 declaration */
-@@ -654,6 +655,7 @@
- arrayP->data.valueP = tokenStartP;
-
- /* allocate FDArray */
-+ /* No integer overflow since arrayP->len is unsigned short */
- FDArrayP = (psfont *)vm_alloc(arrayP->len*(sizeof(psfont)));
- if (!(FDArrayP)) return(SCAN_OUT_OF_MEMORY);
-
-@@ -850,7 +852,8 @@
- }
- return(SCAN_OK);
- }
--
-+ if (N > INT_MAX / sizeof(psobj))
-+ return (SCAN_ERROR);
- arrayP = (psobj *)vm_alloc(N*sizeof(psobj));
- if (!(arrayP) ) return(SCAN_OUT_OF_MEMORY);
- FontP->Subrs.len = N;
-@@ -911,7 +914,7 @@
- }
- else return(rc); /* if next token was not an Int */
- }
-- if (N<=0) return(SCAN_ERROR);
-+ if (N<=0 || N > INT_MAX / sizeof(psdict)) return(SCAN_ERROR);
- /* save number of entries in the dictionary */
-
- dictP = (psdict *)vm_alloc((N+1)*sizeof(psdict));
-@@ -1719,6 +1722,10 @@
- if (tokenType == TOKEN_INTEGER)
- rangecnt = tokenValue.integer;
-
-+ if (rangecnt < 0 || rangecnt > INT_MAX / sizeof(spacerangecode)) {
-+ rc = SCAN_ERROR;
-+ break;
-+ }
- /* ==> tokenLength, tokenTooLong, tokenType, and */
- /* tokenValue are now set */
-
-Index: lib/font/Type1/util.c
-===================================================================
-RCS file: /cvs/xorg/xc/lib/font/Type1/util.c,v
-retrieving revision 1.5
-diff -u -u -r1.5 util.c
---- lib/font/Type1/util.c 9 Jul 2005 23:30:07 -0000 1.5
-+++ lib/font/Type1/util.c 12 Sep 2006 07:49:46 -0000
-@@ -104,7 +104,7 @@
- bytes = (bytes + 7) & ~7;
-
- /* Allocate the space, if it is available */
-- if (bytes <= vm_free) {
-+ if (bytes > 0 && bytes <= vm_free) {
- answer = vm_next;
- vm_free -= bytes;
- vm_next += bytes;
+++ /dev/null
-Index: dbe/dbe.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/dbe/dbe.c,v
-retrieving revision 1.5
-diff -u -u -r1.5 dbe.c
---- xc/programs/Xserver/dbe/dbe.c 3 Jul 2005 07:01:17 -0000 1.5
-+++ xc/programs/Xserver/dbe/dbe.c 9 Jan 2007 12:45:54 -0000
-@@ -55,6 +55,10 @@
- #include "xf86_ansic.h"
- #endif
-
-+#if !defined(UINT32_MAX)
-+#define UINT32_MAX 0xffffffffU
-+#endif
-+
- /* GLOBALS */
-
- /* Per-screen initialization functions [init'ed by DbeRegisterFunction()] */
-@@ -733,11 +737,14 @@
- return(Success);
- }
-
-+ if (nStuff > UINT32_MAX / sizeof(DbeSwapInfoRec))
-+ return BadAlloc;
-+
- /* Get to the swap info appended to the end of the request. */
- dbeSwapInfo = (xDbeSwapInfo *)&stuff[1];
-
- /* Allocate array to record swap information. */
-- swapInfo = (DbeSwapInfoPtr)ALLOCATE_LOCAL(nStuff * sizeof(DbeSwapInfoRec));
-+ swapInfo = (DbeSwapInfoPtr)Xalloc(nStuff * sizeof(DbeSwapInfoRec));
- if (swapInfo == NULL)
- {
- return(BadAlloc);
-@@ -752,14 +759,14 @@
- if (!(pWin = SecurityLookupWindow(dbeSwapInfo[i].window, client,
- SecurityWriteAccess)))
- {
-- DEALLOCATE_LOCAL(swapInfo);
-+ Xfree(swapInfo);
- return(BadWindow);
- }
-
- /* Each window must be double-buffered - BadMatch. */
- if (DBE_WINDOW_PRIV(pWin) == NULL)
- {
-- DEALLOCATE_LOCAL(swapInfo);
-+ Xfree(swapInfo);
- return(BadMatch);
- }
-
-@@ -768,7 +775,7 @@
- {
- if (dbeSwapInfo[i].window == dbeSwapInfo[j].window)
- {
-- DEALLOCATE_LOCAL(swapInfo);
-+ Xfree(swapInfo);
- return(BadMatch);
- }
- }
-@@ -779,7 +786,7 @@
- (dbeSwapInfo[i].swapAction != XdbeUntouched ) &&
- (dbeSwapInfo[i].swapAction != XdbeCopied ))
- {
-- DEALLOCATE_LOCAL(swapInfo);
-+ Xfree(swapInfo);
- return(BadValue);
- }
-
-@@ -809,12 +816,12 @@
- error = (*pDbeScreenPriv->SwapBuffers)(client, &nStuff, swapInfo);
- if (error != Success)
- {
-- DEALLOCATE_LOCAL(swapInfo);
-+ Xfree(swapInfo);
- return(error);
- }
- }
-
-- DEALLOCATE_LOCAL(swapInfo);
-+ Xfree(swapInfo);
- return(Success);
-
- } /* ProcDbeSwapBuffers() */
-@@ -898,10 +905,12 @@
-
- REQUEST_AT_LEAST_SIZE(xDbeGetVisualInfoReq);
-
-+ if (stuff->n > UINT32_MAX / sizeof(DrawablePtr))
-+ return BadAlloc;
- /* Make sure any specified drawables are valid. */
- if (stuff->n != 0)
- {
-- if (!(pDrawables = (DrawablePtr *)ALLOCATE_LOCAL(stuff->n *
-+ if (!(pDrawables = (DrawablePtr *)Xalloc(stuff->n *
- sizeof(DrawablePtr))))
- {
- return(BadAlloc);
-@@ -914,7 +923,7 @@
- if (!(pDrawables[i] = (DrawablePtr)SecurityLookupDrawable(
- drawables[i], client, SecurityReadAccess)))
- {
-- DEALLOCATE_LOCAL(pDrawables);
-+ Xfree(pDrawables);
- return(BadDrawable);
- }
- }
-@@ -926,7 +935,7 @@
- {
- if (pDrawables)
- {
-- DEALLOCATE_LOCAL(pDrawables);
-+ Xfree(pDrawables);
- }
-
- return(BadAlloc);
-@@ -953,7 +962,7 @@
- /* Free pDrawables if we needed to allocate it above. */
- if (pDrawables)
- {
-- DEALLOCATE_LOCAL(pDrawables);
-+ Xfree(pDrawables);
- }
-
- return(BadAlloc);
-@@ -1034,7 +1043,7 @@
-
- if (pDrawables)
- {
-- DEALLOCATE_LOCAL(pDrawables);
-+ Xfree(pDrawables);
- }
-
- return(client->noClientException);
-Index: render/render.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/render/render.c,v
-retrieving revision 1.12
-diff -u -u -r1.12 render.c
---- xc/programs/Xserver/render/render.c 28 Aug 2005 19:47:39 -0000 1.12
-+++ xc/programs/Xserver/render/render.c 9 Jan 2007 12:45:55 -0000
-@@ -52,6 +52,10 @@
- #include "xf86_ansic.h"
- #endif
-
-+#if !defined(UINT32_MAX)
-+#define UINT32_MAX 0xffffffffU
-+#endif
-+
- static int ProcRenderQueryVersion (ClientPtr pClient);
- static int ProcRenderQueryPictFormats (ClientPtr pClient);
- static int ProcRenderQueryPictIndexValues (ClientPtr pClient);
-@@ -1108,11 +1112,14 @@
- }
-
- nglyphs = stuff->nglyphs;
-+ if (nglyphs > UINT32_MAX / sizeof(GlyphNewRec))
-+ return BadAlloc;
-+
- if (nglyphs <= NLOCALGLYPH)
- glyphsBase = glyphsLocal;
- else
- {
-- glyphsBase = (GlyphNewPtr) ALLOCATE_LOCAL (nglyphs * sizeof (GlyphNewRec));
-+ glyphsBase = (GlyphNewPtr) Xalloc (nglyphs * sizeof (GlyphNewRec));
- if (!glyphsBase)
- return BadAlloc;
- }
-@@ -1169,7 +1176,7 @@
- }
-
- if (glyphsBase != glyphsLocal)
-- DEALLOCATE_LOCAL (glyphsBase);
-+ Xfree (glyphsBase);
- return client->noClientException;
- bail:
- while (glyphs != glyphsBase)
-@@ -1178,7 +1185,7 @@
- xfree (glyphs->glyph);
- }
- if (glyphsBase != glyphsLocal)
-- DEALLOCATE_LOCAL (glyphsBase);
-+ Xfree (glyphsBase);
- return err;
- }
-
+++ /dev/null
---- programs/Xserver/hw/xfree86/common/xf86Init.c.orig 2006-03-17 23:30:10.000000000 +0200
-+++ programs/Xserver/hw/xfree86/common/xf86Init.c 2006-03-17 23:29:35.000000000 +0200
-@@ -1376,7 +1376,7 @@
- }
-
- /* First the options that are only allowed for root */
-- if (getuid() == 0 || geteuid != 0)
-+ if (getuid() == 0 || geteuid() != 0)
- {
- if (!strcmp(argv[i], "-modulepath"))
- {
-@@ -1679,7 +1679,7 @@
- }
- if (!strcmp(argv[i], "-configure"))
- {
-- if (getuid() != 0 && geteuid == 0) {
-+ if (getuid() != 0 && geteuid() == 0) {
- ErrorF("The '-configure' option can only be used by root.\n");
- exit(1);
- }
+++ /dev/null
-Index: programs/Xserver/render/mitri.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/render/mitri.c,v
-retrieving revision 1.5
-diff -u -r1.5 mitri.c
---- programs/Xserver/render/mitri.c 3 Jul 2005 07:02:08 -0000 1.5
-+++ programs/Xserver/render/mitri.c 30 Apr 2006 20:19:57 -0000
-@@ -145,7 +145,7 @@
- if (npoint < 3)
- return;
- ntri = npoint - 2;
-- tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle));
-+ tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle));
- if (!tris)
- return;
- for (tri = tris; npoint >= 3; npoint--, points++, tri++)
-@@ -177,7 +177,7 @@
- if (npoint < 3)
- return;
- ntri = npoint - 2;
-- tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle));
-+ tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle));
- if (!tris)
- return;
- first = points++;
+++ /dev/null
---- xc/programs/Xserver/hw/xfree86/common/xf86Init.c 14 Dec 2005 20:12:00 -0000 1.29
-+++ xc/programs/Xserver/hw/xfree86/common/xf86Init.c 5 Jun 2006 10:35:19 -0000
-@@ -1905,7 +1905,11 @@
- FatalError("xf86RunVtInit: fork failed (%s)\n", strerror(errno));
- break;
- case 0: /* child */
-- setuid(getuid());
-+ if (setuid(getuid()) == -1) {
-+ xf86Msg(X_ERROR, "xf86RunVtInit: setuid failed (%s)\n",
-+ strerror(errno));
-+ exit(255);
-+ }
- /* set stdin, stdout to the consoleFd */
- for (i = 0; i < 2; i++) {
- if (xf86Info.consoleFd != i) {
---- xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c 3 Jul 2005 08:53:48 -0000 1.9
-+++ xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c 5 Jun 2006 10:35:19 -0000
-@@ -1270,7 +1270,10 @@
- #ifndef SELF_CONTAINED_WRAPPER
- xf86DisableIO();
- #endif
-- setuid(getuid());
-+ if (setuid(getuid()) == -1) {
-+ ErrorF("xf86Execl: setuid() failed: %s\n", strerror(errno));
-+ exit(255);
-+ }
- #if !defined(SELF_CONTAINED_WRAPPER)
- /* set stdin, stdout to the consoleFD, and leave stderr alone */
- for (i = 0; i < 2; i++)
---- xc/programs/Xserver/hw/xfree86/parser/write.c 3 Jul 2005 07:01:37 -0000 1.3
-+++ xc/programs/Xserver/hw/xfree86/parser/write.c 5 Jun 2006 10:35:19 -0000
-@@ -170,7 +170,10 @@
- strerror(errno));
- return 0;
- case 0: /* child */
-- setuid(getuid());
-+ if (setuid(getuid() == -1)
-+ FatalError("xf86writeConfigFile(): "
-+ "setuid failed(%s)\n",
-+ strerror(errno));
- ret = doWriteConfigFile(filename, cptr);
- exit(ret);
- break;
---- xc/programs/Xserver/os/utils.c 8 Nov 2005 06:33:30 -0000 1.21
-+++ xc/programs/Xserver/os/utils.c 5 Jun 2006 10:35:20 -0000
-@@ -1718,8 +1718,10 @@
- case -1: /* error */
- p = -1;
- case 0: /* child */
-- setgid(getgid());
-- setuid(getuid());
-+ if (setgid(getgid()) == -1)
-+ _exit(127);
-+ if (setuid(getuid()) == -1)
-+ _exit(127);
- execl("/bin/sh", "sh", "-c", command, (char *)NULL);
- _exit(127);
- default: /* parent */
-@@ -1770,8 +1772,10 @@
- xfree(cur);
- return NULL;
- case 0: /* child */
-- setgid(getgid());
-- setuid(getuid());
-+ if (setgid(getgid()) == -1)
-+ _exit(127);
-+ if (setuid(getuid()) == -1)
-+ _exit(127);
- if (*type == 'r') {
- if (pdes[1] != 1) {
- /* stdout */
-@@ -1845,8 +1849,10 @@
- xfree(cur);
- return NULL;
- case 0: /* child */
-- setgid(getgid());
-- setuid(getuid());
-+ if (setgid(getgid()) == -1)
-+ _exit(127);
-+ if (setuid(getuid()) == -1)
-+ _exit(127);
- if (*type == 'r') {
- if (pdes[1] != 1) {
- /* stdout */
---- xc/programs/xdm/session.c 8 Nov 2005 06:33:31 -0000 1.3
-+++ xc/programs/xdm/session.c 5 Jun 2006 10:35:21 -0000
-@@ -488,8 +488,14 @@
- else
- ResetServer (d);
- if (removeAuth) {
-- setgid (verify.gid);
-- setuid (verify.uid);
-+ if (setgid (verify.gid) == -1) {
-+ LogError( "SessionExit: setgid: %s\n", strerror(errno));
-+ exit(status);
-+ }
-+ if (setuid (verify.uid) == -1) {
-+ LogError( "SessionExit: setuid: %s\n", strerror(errno));
-+ exit(status);
-+ }
- RemoveUserAuthorization (d, &verify);
- #ifdef K5AUTH
- /* do like "kdestroy" program */
---- xc/programs/xdm/xdmshell.c 14 Jul 2005 22:58:25 -0000 1.3
-+++ xc/programs/xdm/xdmshell.c 5 Jun 2006 10:35:21 -0000
-@@ -183,7 +183,11 @@
- #endif
-
- /* make xdm run in a non-setuid environment */
-- setuid (geteuid());
-+ if (setuid (geteuid()) == -1) {
-+ fprintf(stderr, "%s: cannot setuid (error %d, %s)\r\n",
-+ ProgramName, errno, strerror(errno));
-+ exit(1);
-+ }
-
- /*
- * exec /usr/bin/X11/xdm -nodaemon -udpPort 0
---- xc/programs/xf86dga/dga.c 23 Apr 2004 19:54:47 -0000 1.2
-+++ xc/programs/xf86dga/dga.c 5 Jun 2006 10:35:21 -0000
-@@ -16,6 +16,7 @@
- #include <X11/Xmd.h>
- #include <X11/extensions/xf86dga.h>
- #include <ctype.h>
-+#include <errno.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <signal.h>
-@@ -141,7 +142,10 @@
-
- #ifndef __UNIXOS2__
- /* Give up root privs */
-- setuid(getuid());
-+ if (setuid(getuid()) == -1) {
-+ fprintf(stderr, "Unable to change uid: %s\n", strerror(errno));
-+ exit(2);
-+ }
- #endif
-
- XF86DGASetViewPort(dis, DefaultScreen(dis), 0, 0);
---- xc/programs/xinit/xinit.c 4 Oct 2005 01:27:34 -0000 1.4
-+++ xc/programs/xinit/xinit.c 5 Jun 2006 10:35:21 -0000
-@@ -692,7 +692,10 @@
- startClient(char *client[])
- {
- if ((clientpid = vfork()) == 0) {
-- setuid(getuid());
-+ if (setuid(getuid()) == -1) {
-+ Error("cannot change uid: %s\n", strerror(errno));
-+ _exit(ERR_EXIT);
-+ }
- setpgrp(0, getpid());
- environ = newenviron;
- #ifdef __UNIXOS2__
---- xc/programs/xload/xload.c 23 Apr 2004 19:54:57 -0000 1.2
-+++ xc/programs/xload/xload.c 5 Jun 2006 10:35:21 -0000
-@@ -34,7 +34,7 @@
- * xload - display system load average in a window
- */
-
--
-+#include <errno.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-@@ -162,8 +162,17 @@
- /* For security reasons, we reset our uid/gid after doing the necessary
- system initialization and before calling any X routines. */
- InitLoadPoint();
-- setgid(getgid()); /* reset gid first while still (maybe) root */
-- setuid(getuid());
-+ /* reset gid first while still (maybe) root */
-+ if (setgid(getgid()) == -1) {
-+ fprintf(stderr, "%s: setgid failed: %s\n",
-+ ProgramName, strerror(errno));
-+ exit(1);
-+ }
-+ if (setuid(getuid()) == -1) {
-+ fprintf(stderr, "%s: setuid failed: %s\n",
-+ ProgramName, strerror(errno));
-+ exit(1);
-+ }
-
- XtSetLanguageProc(NULL, (XtLanguageProc) NULL, NULL);
-
---- xc/programs/xterm/main.c 14 Dec 2005 23:28:27 -0000 1.8
-+++ xc/programs/xterm/main.c 5 Jun 2006 10:35:22 -0000
-@@ -1592,8 +1592,10 @@
- Window winToEmbedInto = None;
-
- #ifdef DISABLE_SETUID
-- seteuid(getuid());
-- setuid(getuid());
-+ if (seteuid(getuid()) == -1)
-+ exit(2);
-+ if (setuid(getuid()) == -1)
-+ exit(2);
- #endif
-
- ProgramName = argv[0];
-@@ -1619,8 +1621,16 @@
-
- #if defined(USE_UTMP_SETGID)
- get_pty(NULL, NULL);
-- seteuid(getuid());
-- setuid(getuid());
-+ if (seteuid(getuid()) == -1) {
-+ fprintf(stderr,
-+ "%s: unable to change back euid\n", ProgramName);
-+ exit(1);
-+ }
-+ if (setuid(getuid()) == -1) {
-+ fprintf(stderr,
-+ "%s: unable to change back uid\n", ProgramName);
-+ exit(1);
-+ }
- #define get_pty(pty, from) really_get_pty(pty, from)
- #endif
-
---- xc/programs/xterm/misc.c 14 Dec 2005 23:28:27 -0000 1.6
-+++ xc/programs/xterm/misc.c 5 Jun 2006 10:35:22 -0000
-@@ -1094,8 +1094,10 @@
- pid = fork();
- switch (pid) {
- case 0: /* child */
-- setgid(gid);
-- setuid(uid);
-+ if (setgid(gid) == -1)
-+ _exit(ERROR_SETUID);
-+ if (setuid(uid) == -1)
-+ _exit(ERROR_SETUID);
- fd = open(pathname,
- O_WRONLY | O_CREAT | (append ? O_APPEND : O_EXCL),
- mode);
-@@ -1262,8 +1264,10 @@
- signal(SIGCHLD, SIG_DFL);
-
- /* (this is redundant) */
-- setgid(screen->gid);
-- setuid(screen->uid);
-+ if (setgid(screen->gid) == -1)
-+ exit(ERROR_SETUID);
-+ if (setuid(screen->uid) == -1)
-+ exit(ERROR_SETUID);
-
- execl(shell, shell, "-c", &screen->logfile[1], (void *) 0);
-
---- xc/programs/xterm/print.c 5 Aug 2005 16:13:04 -0000 1.5
-+++ xc/programs/xterm/print.c 5 Jun 2006 10:35:22 -0000
-@@ -387,9 +387,11 @@
- dup2(fileno(stderr), 2);
- close(fileno(stderr));
- }
--
-- setgid(screen->gid); /* don't want privileges! */
-- setuid(screen->uid);
-+ /* don't want privileges! */
-+ if (setgid(screen->gid) == -1)
-+ exit(2);
-+ if (setuid(screen->uid) == -1)
-+ exit(2);
-
- Printer = popen(screen->printer_command, "w");
- input = fdopen(my_pipe[0], "r");
+++ /dev/null
-#
-# Dual-head dual-user patch for xorg-x11 (or multi-head multi-user, if you
-# prefer that). Based on the work of Miguel Freitas and others.
-# Look at http://cambuca.ldhs.cetuc.puc-rio.br/multiuser/ for detailed
-# information on how to use this.
-#
-# Modified for xorg-x11-6.8.1 by Jan "Yenya" Kasprzak <kas@fi.muni.cz>
-#
-# KNOWN BUGS:
-# - Keyboard LED support is still buggy and unfinished.
-# - on my setup it destroys font on the text console or something like that.
-# I have no time to investigate this and I don't use text console on this
-# box (except for booting).
-diff -uNr xorg-x11-6.8.1-rhbuild/xc/programs/Xserver/hw/xfree86/common/xf86Config.c xorg-x11-6.8.1/xc/programs/Xserver/hw/xfree86/common/xf86Config.c
---- xorg-x11-6.8.1-rhbuild/xc/programs/Xserver/hw/xfree86/common/xf86Config.c 2004-08-16 22:17:51.000000000 +0200
-+++ xorg-x11-6.8.1/xc/programs/Xserver/hw/xfree86/common/xf86Config.c 2004-11-19 21:49:47.000000000 +0100
-@@ -1195,6 +1195,16 @@
- return FALSE;
- }
- #endif
-+ } else if (xf86NameCmp(s, "usbev") == 0) {
-+ xf86Info.kbdProc = xf86KbdProc;
-+ xf86Info.kbdEvents = xf86USBKbdEvents;
-+ xf86Msg(X_CONFIG, "Keyboard: Protocol: usbev\n");
-+ s = xf86SetStrOption(inputp->commonOptions, "Device", "/dev/input/event0");
-+ xf86Info.kbdFd = open(s, O_RDWR | O_NONBLOCK | O_EXCL);
-+ if (xf86Info.kbdFd == -1) {
-+ xf86ConfigError("Keyboard device: cannot open \"%s\"", s);
-+ return FALSE;
-+ }
- } else {
- xf86ConfigError("\"%s\" is not a valid keyboard protocol name", s);
- xfree(s);
-diff -uNr xorg-x11-6.8.1-rhbuild/xc/programs/Xserver/hw/xfree86/common/xf86Globals.c xorg-x11-6.8.1/xc/programs/Xserver/hw/xfree86/common/xf86Globals.c
---- xorg-x11-6.8.1-rhbuild/xc/programs/Xserver/hw/xfree86/common/xf86Globals.c 2004-07-06 16:37:47.000000000 +0200
-+++ xorg-x11-6.8.1/xc/programs/Xserver/hw/xfree86/common/xf86Globals.c 2004-11-19 21:49:47.000000000 +0100
-@@ -245,3 +245,6 @@
- * only to be used when using dlopen() modules for debugging purposes.
- */
- #endif
-+
-+Bool xf86NoVTSwitches = FALSE;
-+Bool xf86NoPCIAccessDisable = FALSE;
-diff -uNr xorg-x11-6.8.1-rhbuild/xc/programs/Xserver/hw/xfree86/common/xf86Init.c xorg-x11-6.8.1/xc/programs/Xserver/hw/xfree86/common/xf86Init.c
---- xorg-x11-6.8.1-rhbuild/xc/programs/Xserver/hw/xfree86/common/xf86Init.c 2004-11-18 22:19:31.000000000 +0100
-+++ xorg-x11-6.8.1/xc/programs/Xserver/hw/xfree86/common/xf86Init.c 2004-11-19 21:49:47.000000000 +0100
-@@ -1429,6 +1429,28 @@
- xf86ProbeOnly = TRUE;
- return 1;
- }
-+ if (!strcmp(argv[i],"-delay"))
-+ {
-+ int delay;
-+
-+ if (!argv[i + 1] || (delay = atoi(argv[i + 1])) <= 0) {
-+ sleep(10);
-+ return 1;
-+ } else {
-+ sleep((unsigned) delay);
-+ return 2;
-+ }
-+ }
-+ if (!strcmp(argv[i],"-novtswitches"))
-+ {
-+ xf86NoVTSwitches = TRUE;
-+ return 1;
-+ }
-+ if (!strcmp(argv[i],"-nopciaccessdisable"))
-+ {
-+ xf86NoPCIAccessDisable = TRUE;
-+ return 1;
-+ }
- if (!strcmp(argv[i],"-flipPixels"))
- {
- xf86FlipPixels = TRUE;
-diff -uNr xorg-x11-6.8.1-rhbuild/xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c xorg-x11-6.8.1/xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c
---- xorg-x11-6.8.1-rhbuild/xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c 2004-11-18 22:19:29.000000000 +0100
-+++ xorg-x11-6.8.1/xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c 2004-11-19 21:49:47.000000000 +0100
-@@ -606,6 +606,9 @@
- static void
- pciIoAccessDisable(void* arg)
- {
-+ if (xf86NoPCIAccessDisable)
-+ return;
-+
- #ifdef DEBUG
- ErrorF("pciIoAccessDisable: 0x%05lx\n", *(PCITAG *)arg);
- #endif
-@@ -628,6 +631,9 @@
- static void
- pciIo_MemAccessDisable(void* arg)
- {
-+ if (xf86NoPCIAccessDisable)
-+ return;
-+
- #ifdef DEBUG
- ErrorF("pciIo_MemAccessDisable: 0x%05lx\n", *(PCITAG *)arg);
- #endif
-@@ -650,6 +656,9 @@
- static void
- pciMemAccessDisable(void* arg)
- {
-+ if (xf86NoPCIAccessDisable)
-+ return;
-+
- #ifdef DEBUG
- ErrorF("pciMemAccessDisable: 0x%05lx\n", *(PCITAG *)arg);
- #endif
-diff -uNr xorg-x11-6.8.1-rhbuild/xc/programs/Xserver/hw/xfree86/common/xf86Priv.h xorg-x11-6.8.1/xc/programs/Xserver/hw/xfree86/common/xf86Priv.h
---- xorg-x11-6.8.1-rhbuild/xc/programs/Xserver/hw/xfree86/common/xf86Priv.h 2004-01-29 09:08:26.000000000 +0100
-+++ xorg-x11-6.8.1/xc/programs/Xserver/hw/xfree86/common/xf86Priv.h 2004-11-19 21:49:47.000000000 +0100
-@@ -115,6 +115,9 @@
-
- extern RootWinPropPtr *xf86RegisteredPropertiesTable;
-
-+extern Bool xf86NoVTSwitches;
-+extern Bool xf86NoPCIAccessDisable;
-+
- #ifndef DEFAULT_VERBOSE
- #define DEFAULT_VERBOSE 0
- #endif
-diff -uNr xorg-x11-6.8.1-rhbuild/xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h xorg-x11-6.8.1/xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h
---- xorg-x11-6.8.1-rhbuild/xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h 2004-01-29 09:08:26.000000000 +0100
-+++ xorg-x11-6.8.1/xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h 2004-11-19 21:49:47.000000000 +0100
-@@ -82,6 +82,7 @@
- int bell_pitch;
- int bell_duration;
- Bool autoRepeat;
-+ int ledsave;
- unsigned long leds;
- unsigned long xleds;
- char * vtinit;
-diff -uNr xorg-x11-6.8.1-rhbuild/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c xorg-x11-6.8.1/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c
---- xorg-x11-6.8.1-rhbuild/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c 2004-04-23 21:54:08.000000000 +0200
-+++ xorg-x11-6.8.1/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c 2004-11-19 21:49:47.000000000 +0100
-@@ -121,22 +121,35 @@
- FatalError(
- "xf86OpenConsole: Cannot open /dev/tty0 (%s)\n",
- strerror(errno));
-- if ((ioctl(fd, VT_OPENQRY, &xf86Info.vtno) < 0) ||
-- (xf86Info.vtno == -1)) {
-- FatalError("xf86OpenConsole: Cannot find a free VT\n");
-+
-+ if (xf86NoVTSwitches) {
-+ if (ioctl(fd, VT_GETSTATE, &vts) == 0)
-+ {
-+ xf86Info.vtno = vts.v_active;
-+ } else {
-+ FatalError("xf86OpenConsole: Cannot find the current VT\n");
-+ }
-+ } else {
-+ if ((ioctl(fd, VT_OPENQRY, &xf86Info.vtno) < 0) ||
-+ (xf86Info.vtno == -1)) {
-+ FatalError("xf86OpenConsole: Cannot find a free VT\n");
-+ }
- }
-+
- close(fd);
- }
-
- #ifdef USE_DEV_FB
-- fb_dev_name=getenv("FRAMEBUFFER");
-- if (!fb_dev_name)
-- fb_dev_name="/dev/fb0current";
-- if ((fbfd = open(fb_dev_name, O_RDONLY)) < 0)
-- FatalError("xf86OpenConsole: Cannot open %s (%s)\n",
-- fb_dev_name, strerror(errno));
-- if (ioctl(fbfd, FBIOGET_VSCREENINFO, &var))
-- FatalError("xf86OpenConsole: Unable to get screen info\n");
-+ if (!xf86NoVTSwitches) {
-+ fb_dev_name=getenv("FRAMEBUFFER");
-+ if (!fb_dev_name)
-+ fb_dev_name="/dev/fb0current";
-+ if ((fbfd = open(fb_dev_name, O_RDONLY)) < 0)
-+ FatalError("xf86OpenConsole: Cannot open %s (%s)\n",
-+ fb_dev_name, strerror(errno));
-+ if (ioctl(fbfd, FBIOGET_VSCREENINFO, &var))
-+ FatalError("xf86OpenConsole: Unable to get screen info\n");
-+ }
- #endif
- xf86Msg(from, "using VT number %d\n\n", xf86Info.vtno);
-
-@@ -167,8 +180,12 @@
- "xf86OpenConsole: Could not save ownership of VT\n");
- }
-
-- /* change ownership of the vt */
-- chown(vtname, getuid(), getgid());
-+ /* humm, not a good idea if we don't really use this vt, chowning it would
-+ probably mess with the first XFree instance. Right? i don't know! */
-+ if (!xf86NoVTSwitches) {
-+ /* change ownership of the vt */
-+ chown(vtname, getuid(), getgid());
-+ }
-
- /*
- * the current VT device we're running on is not "console", we want
-@@ -213,37 +230,42 @@
- {
- xf86Msg(X_WARNING, "xf86OpenConsole: VT_WAITACTIVE failed\n");
- }
-- SYSCALL(result = ioctl(xf86Info.consoleFd, VT_GETMODE, &VT));
-- if (result < 0)
-- {
-- FatalError("xf86OpenConsole: VT_GETMODE failed\n");
-- }
-
-- signal(SIGUSR1, xf86VTRequest);
-+ if (xf86NoVTSwitches) {
-+ close(xf86Info.consoleFd);
-+ } else {
-+ SYSCALL(result = ioctl(xf86Info.consoleFd, VT_GETMODE, &VT));
-+ if (result < 0)
-+ {
-+ FatalError("xf86OpenConsole: VT_GETMODE failed\n");
-+ }
-
-- VT.mode = VT_PROCESS;
-- VT.relsig = SIGUSR1;
-- VT.acqsig = SIGUSR1;
-- if (ioctl(xf86Info.consoleFd, VT_SETMODE, &VT) < 0)
-- {
-- FatalError("xf86OpenConsole: VT_SETMODE VT_PROCESS failed\n");
-- }
-- if (ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS) < 0)
-- {
-- FatalError("xf86OpenConsole: KDSETMODE KD_GRAPHICS failed\n");
-- }
-+ signal(SIGUSR1, xf86VTRequest);
-+
-+ VT.mode = VT_PROCESS;
-+ VT.relsig = SIGUSR1;
-+ VT.acqsig = SIGUSR1;
-+ if (ioctl(xf86Info.consoleFd, VT_SETMODE, &VT) < 0)
-+ {
-+ FatalError("xf86OpenConsole: VT_SETMODE VT_PROCESS failed\n");
-+ }
-+ if (ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS) < 0)
-+ {
-+ FatalError("xf86OpenConsole: KDSETMODE KD_GRAPHICS failed\n");
-+ }
-
-- /* we really should have a InitOSInputDevices() function instead
-- * of Init?$#*&Device(). So I just place it here */
--
-+ /* we really should have a InitOSInputDevices() function instead
-+ * of Init?$#*&Device(). So I just place it here */
-+
- #ifdef USE_DEV_FB
-- /* copy info to new console */
-- var.yoffset=0;
-- var.xoffset=0;
-- if (ioctl(fbfd, FBIOPUT_VSCREENINFO, &var))
-- FatalError("Unable to set screen info\n");
-- close(fbfd);
-+ /* copy info to new console */
-+ var.yoffset=0;
-+ var.xoffset=0;
-+ if (ioctl(fbfd, FBIOPUT_VSCREENINFO, &var))
-+ FatalError("Unable to set screen info\n");
-+ close(fbfd);
- #endif
-+ }
- }
- else
- {
-@@ -251,16 +273,18 @@
- /*
- * now get the VT
- */
-- SYSCALL(result = ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno));
-- if (result != 0)
-- {
-- xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed\n");
-- }
-- SYSCALL(result =
-- ioctl(xf86Info.consoleFd, VT_WAITACTIVE, xf86Info.vtno));
-- if (result != 0)
-- {
-- xf86Msg(X_WARNING, "xf86OpenConsole: VT_WAITACTIVE failed\n");
-+ if (!xf86NoVTSwitches) {
-+ SYSCALL(result = ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno));
-+ if (result != 0)
-+ {
-+ xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed\n");
-+ }
-+ SYSCALL(result =
-+ ioctl(xf86Info.consoleFd, VT_WAITACTIVE, xf86Info.vtno));
-+ if (result != 0)
-+ {
-+ xf86Msg(X_WARNING, "xf86OpenConsole: VT_WAITACTIVE failed\n");
-+ }
- }
- }
- return;
-@@ -275,22 +299,23 @@
- ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno);
- ioctl(xf86Info.consoleFd, VT_WAITACTIVE, 0);
- #endif
-- ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT); /* Back to text mode ... */
-- if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) != -1)
-- {
-- VT.mode = VT_AUTO;
-- ioctl(xf86Info.consoleFd, VT_SETMODE, &VT); /* set dflt vt handling */
-- }
-- /*
-- * Perform a switch back to the active VT when we were started
-- */
-- if (activeVT >= 0)
-- {
-- ioctl(xf86Info.consoleFd, VT_ACTIVATE, activeVT);
-- activeVT = -1;
-+ if (!xf86NoVTSwitches) {
-+ ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT); /* Back to text mode ... */
-+ if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) != -1)
-+ {
-+ VT.mode = VT_AUTO;
-+ ioctl(xf86Info.consoleFd, VT_SETMODE, &VT); /* set dflt vt handling */
-+ }
-+ /*
-+ * Perform a switch back to the active VT when we were started
-+ */
-+ if (activeVT >= 0)
-+ {
-+ ioctl(xf86Info.consoleFd, VT_ACTIVATE, activeVT);
-+ activeVT = -1;
-+ }
-+ close(xf86Info.consoleFd); /* make the vt-manager happy */
- }
-- close(xf86Info.consoleFd); /* make the vt-manager happy */
--
- restoreVtPerms(); /* restore the permissions */
-
- return;
-diff -uNr xorg-x11-6.8.1-rhbuild/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c xorg-x11-6.8.1/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
---- xorg-x11-6.8.1-rhbuild/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2004-04-23 21:54:08.000000000 +0200
-+++ xorg-x11-6.8.1/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2004-11-19 21:49:47.000000000 +0100
-@@ -33,12 +33,19 @@
- #include "xf86.h"
- #include "xf86Priv.h"
- #include "xf86_OSlib.h"
-+#include <linux/input.h>
-+#include <linux/kd.h>
-
- #define KBC_TIMEOUT 250 /* Timeout in ms for sending to keyboard controller */
-
- void
- xf86SoundKbdBell(int loudness, int pitch, int duration)
- {
-+ /* i guess it should be safe to beep even on a diferent keyboard (?) */
-+ /* the beep will be on the system speaker anyway... */
-+ if (xf86Info.kbdEvents == xf86USBKbdEvents)
-+ return;
-+
- if (loudness && pitch)
- {
- ioctl(xf86Info.consoleFd, KDMKTONE,
-@@ -51,7 +58,35 @@
- void
- xf86SetKbdLeds(int leds)
- {
-- ioctl(xf86Info.consoleFd, KDSETLED, leds);
-+ struct s_output_event {
-+ struct timeval time;
-+ unsigned short type;
-+ unsigned short code;
-+ unsigned int value;
-+ } output_event;
-+
-+ fprintf(stderr, "xf86SetKbdLeds(0x%x) called\n", leds);
-+ if (xf86Info.kbdEvents != xf86USBKbdEvents) {
-+ ioctl(xf86Info.consoleFd, KDSETLED, leds);
-+ return;
-+ }
-+
-+ output_event.type = EV_LED;
-+ output_event.code = LED_NUML;
-+ output_event.value = (leds&(LED_NUM)) ? 1 : 0;
-+ write( xf86Info.kbdFd, (char *)&output_event, sizeof(output_event));
-+
-+ output_event.type = EV_LED;
-+ output_event.code = LED_CAPSL;
-+ output_event.value = (leds&(LED_CAP)) ? 1 : 0;
-+ write( xf86Info.kbdFd, (char *)&output_event, sizeof(output_event));
-+
-+ output_event.type = EV_LED;
-+ output_event.code = LED_SCROLLL;
-+ output_event.value = (leds&(LED_SCR)) ? 1 : 0;
-+ write( xf86Info.kbdFd, (char *)&output_event, sizeof(output_event));
-+
-+ xf86Info.ledsave = leds;
- }
-
- int
-@@ -59,7 +94,13 @@
- {
- int leds = 0;
-
-- ioctl(xf86Info.consoleFd, KDGETLED, &leds);
-+ if (xf86Info.kbdEvents == xf86USBKbdEvents) {
-+ leds = xf86Info.ledsave;
-+ } else {
-+ ioctl(xf86Info.consoleFd, KDGETLED, &leds);
-+ }
-+
-+ fprintf(stderr, "xf86GetKbdLeds called, returing 0x%x\n", leds);
- return(leds);
- }
-
-@@ -173,6 +214,10 @@
- if (xf86Info.kbdDelay >= 0)
- delay = xf86Info.kbdDelay;
-
-+ /* FIXME: just returning so we don't mess with any other keyboards... */
-+ if (xf86Info.kbdEvents == xf86USBKbdEvents)
-+ return;
-+
- if(KDKBDREP_ioctl_ok(rate, delay)) /* m68k? */
- return;
-
-@@ -223,14 +268,24 @@
- void
- xf86KbdInit()
- {
-- ioctl (xf86Info.consoleFd, KDGKBMODE, &kbdtrans);
-- tcgetattr (xf86Info.consoleFd, &kbdtty);
-+ if (xf86Info.kbdEvents == xf86USBKbdEvents) {
-+ int data;
-+ data=1;
-+ if (ioctl(xf86Info.kbdFd, EVIOCGRAB, &data) == 0)
-+ printf("exclusive access granted");
-+ } else {
-+ ioctl (xf86Info.consoleFd, KDGKBMODE, &kbdtrans);
-+ tcgetattr (xf86Info.consoleFd, &kbdtty);
-+ }
- }
-
- int
- xf86KbdOn()
- {
- struct termios nTty;
-+
-+ if (xf86Info.kbdEvents == xf86USBKbdEvents)
-+ return(xf86Info.kbdFd);
-
- #ifdef __powerpc__
- if (xf86Info.kbdCustomKeycodes)
-@@ -255,6 +310,9 @@
- int
- xf86KbdOff()
- {
-+ if (xf86Info.kbdEvents == xf86USBKbdEvents)
-+ return(xf86Info.kbdFd);
-+
- ioctl(xf86Info.consoleFd, KDSKBMODE, kbdtrans);
- tcsetattr(xf86Info.consoleFd, TCSANOW, &kbdtty);
- return(xf86Info.consoleFd);
-diff -uNr xorg-x11-6.8.1-rhbuild/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c xorg-x11-6.8.1/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c
---- xorg-x11-6.8.1-rhbuild/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2004-04-23 21:54:08.000000000 +0200
-+++ xorg-x11-6.8.1/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2004-11-19 21:49:47.000000000 +0100
-@@ -22,11 +22,13 @@
- #include "xf86OSKbd.h"
- #include "atKeynames.h"
- #include "lnx_kbd.h"
-+#include <linux/input.h>
-
- #define KBC_TIMEOUT 250 /* Timeout in ms for sending to keyboard controller */
-
- static KbdProtocolRec protocols[] = {
- {"standard", PROT_STD },
-+ {"usbev", PROT_USB },
- { NULL, PROT_UNKNOWN_KBD }
- };
-
-@@ -76,6 +78,45 @@
- ioctl(pInfo->fd, KDSETLED, real_leds);
- }
-
-+static void
-+SetUSBKbdLeds(InputInfoPtr pInfo, int leds)
-+{
-+ struct s_output_event {
-+ struct timeval time;
-+ unsigned short type;
-+ unsigned short code;
-+ unsigned int value;
-+ } output_event;
-+ int real_leds = 0;
-+ fprintf(stderr, "SetUSBKbdLeds called with leds=0x%x\n", leds);
-+ fprintf(stderr, "CAP=0x%x, NUM=0x%x, SCR=0x%x\n", LED_CAP, LED_NUM, LED_SCR);
-+#ifdef LED_CAP
-+ if (leds & XLED1) real_leds |= LED_CAP;
-+ if (leds & XLED2) real_leds |= LED_NUM;
-+ if (leds & XLED3) real_leds |= LED_SCR;
-+#ifdef LED_COMP
-+ if (leds & XLED4) real_leds |= LED_COMP;
-+#else
-+ if (leds & XLED4) real_leds |= LED_SCR;
-+#endif
-+#endif
-+ output_event.type = EV_LED;
-+ output_event.code = LED_NUML;
-+ output_event.value = (leds&(LED_NUM)) ? 1 : 0;
-+ write(pInfo->fd, (char *)&output_event, sizeof(output_event));
-+
-+ output_event.type = EV_LED;
-+ output_event.code = LED_CAPSL;
-+ output_event.value = (leds&(LED_CAP)) ? 1 : 0;
-+ write(pInfo->fd, (char *)&output_event, sizeof(output_event));
-+
-+ output_event.type = EV_LED;
-+ output_event.code = LED_SCROLLL;
-+ output_event.value = (leds&(LED_SCR)) ? 1 : 0;
-+ write(pInfo->fd, (char *)&output_event, sizeof(output_event));
-+
-+ xf86Info.ledsave = leds;
-+}
- static int
- GetKbdLeds(InputInfoPtr pInfo)
- {
-@@ -87,6 +128,7 @@
- if (real_leds & LED_NUM) leds |= XLED2;
- if (real_leds & LED_SCR) leds |= XLED3;
-
-+ fprintf(stderr, "GetKbdLeds called, returing 0x%x\n", leds);
- return(leds);
- }
-
-@@ -442,6 +484,62 @@
- }
- }
-
-+static unsigned short x86_keycodes[256] =
-+ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-+ 80, 81, 82, 83, 43, 85, 86, 87, 88,115,119,120,121,375,123, 90,
-+ 284,285,309,311,312, 91,327,328,329,331,333,335,336,337,338,339,
-+ 367,294,293,286,350, 92,334,512,116,377,109,111,373,347,348,349,
-+ 360, 93, 94, 95, 98,376,100,101,357,316,354,304,289,102,351,355,
-+ 103,104,105,275,281,272,306,106,274,107,288,364,358,363,362,361,
-+ 291,108,381,290,287,292,279,305,280, 99,112,257,258,113,270,114,
-+ 118,117,125,374,379,259,260,261,262,263,264,265,266,267,268,269,
-+ 271,273,276,277,278,282,283,295,296,297,299,300,301,302,303,307,
-+ 308,310,313,314,315,317,318,319,320,321,322,323,324,325,326,330,
-+ 332,340,341,342,343,344,345,346,356,359,365,368,369,370,371,372 };
-+
-+static void handle_scancode(InputInfoPtr pInfo, int code, int down)
-+{
-+ KbdDevPtr pKbd = (KbdDevPtr) pInfo->private;
-+ pKbd->PostEvent(pInfo, code & 0x7f, down);
-+}
-+
-+
-+static void
-+usbReadInput(InputInfoPtr pInfo)
-+{
-+ struct input_event {
-+ struct timeval time;
-+ unsigned short type;
-+ unsigned short code;
-+ unsigned int value;
-+ } ev;
-+
-+ int nBytes;
-+ if ((nBytes = read( pInfo->fd, (char *)&ev, sizeof(ev))) > 0) {
-+ if (ev.type == EV_KEY) {
-+ unsigned int keycode = ev.code;
-+
-+ if (keycode > 255 || !x86_keycodes[keycode])
-+ return;
-+
-+ if (keycode == KEY_PAUSE) {
-+ handle_scancode(pInfo, 0xe1, 1);
-+ handle_scancode(pInfo, 0x1d, ev.value);
-+ handle_scancode(pInfo, 0x45, ev.value);
-+ return;
-+ }
-+ if (x86_keycodes[keycode] & 0x100)
-+ handle_scancode(pInfo, 0xe0, 1);
-+
-+ handle_scancode(pInfo, x86_keycodes[keycode] & 0x7f, ev.value);
-+ }
-+ }
-+}
-+
- static Bool
- OpenKeyboard(InputInfoPtr pInfo)
- {
-@@ -449,6 +547,7 @@
- int i;
- KbdProtocolId prot = PROT_UNKNOWN_KBD;
- char *s;
-+ int flag = O_RDONLY;
-
- s = xf86SetStrOption(pInfo->options, "Protocol", NULL);
- for (i = 0; protocols[i].name; i++) {
-@@ -461,6 +560,12 @@
- switch (prot) {
- case PROT_STD:
- pInfo->read_input = stdReadInput;
-+ pKbd->SetLeds = SetKbdLeds;
-+ break;
-+ case PROT_USB:
-+ pInfo->read_input = usbReadInput;
-+ pKbd->SetLeds = SetUSBKbdLeds;
-+ flag = O_RDWR;
- break;
- default:
- xf86Msg(X_ERROR,"\"%s\" is not a valid keyboard protocol name\n", s);
-@@ -476,7 +581,7 @@
- pInfo->fd = xf86Info.consoleFd;
- pKbd->isConsole = TRUE;
- } else {
-- pInfo->fd = open(s, O_RDONLY | O_NONBLOCK | O_EXCL);
-+ pInfo->fd = open(s, flag | O_NONBLOCK | O_EXCL);
- if (pInfo->fd == -1) {
- xf86Msg(X_ERROR, "%s: cannot open \"%s\"\n", pInfo->name, s);
- xfree(s);
-@@ -501,7 +606,6 @@
- pKbd->KbdOn = KbdOn;
- pKbd->KbdOff = KbdOff;
- pKbd->Bell = SoundBell;
-- pKbd->SetLeds = SetKbdLeds;
- pKbd->GetLeds = GetKbdLeds;
- pKbd->SetKbdRepeat = SetKbdRepeat;
- pKbd->KbdGetMapping = KbdGetMapping;
-diff -uNr xorg-x11-6.8.1-rhbuild/xc/programs/Xserver/hw/xfree86/os-support/shared/std_kbdEv.c xorg-x11-6.8.1/xc/programs/Xserver/hw/xfree86/os-support/shared/std_kbdEv.c
---- xorg-x11-6.8.1-rhbuild/xc/programs/Xserver/hw/xfree86/os-support/shared/std_kbdEv.c 2004-04-23 21:54:12.000000000 +0200
-+++ xorg-x11-6.8.1/xc/programs/Xserver/hw/xfree86/os-support/shared/std_kbdEv.c 2004-11-19 21:49:47.000000000 +0100
-@@ -25,10 +25,53 @@
- */
- /* $XConsortium: std_kbdEv.c /main/4 1996/03/11 10:47:33 kaleb $ */
-
-+/* 2001/01/14 Miguel Freitas <miguel@cetuc.puc-rio.br>
-+ *
-+ * USB Keyboard to PC-AT Keyboard HACK
-+ *
-+ * Included routines from Linux Kernel to handle usb keyboard events.
-+ * I don't know if there are any license issues here. Any code written
-+ * by me in this file is under the terms of the GNU General Public
-+ * License as described below.
-+ *
-+*/
-+
-+/*
-+ * $Id$
-+ *
-+ * Copyright (c) 1999-2000 Vojtech Pavlik
-+ *
-+ * Input driver to keyboard driver binding.
-+ *
-+ * Sponsored by SuSE
-+ */
-+
-+/*
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ * Should you need to contact me, the author, you can do so either by
-+ * e-mail - mail your message to <vojtech@suse.cz>, or by paper mail:
-+ * Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic
-+ */
-+
-+
- #include "X.h"
- #include "xf86.h"
- #include "xf86Priv.h"
- #include "xf86_OSlib.h"
-+#include <linux/input.h>
-
- void
- xf86KbdEvents()
-@@ -44,3 +87,68 @@
- }
- }
-
-+static unsigned short x86_keycodes[256] =
-+ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-+ 80, 81, 82, 83, 43, 85, 86, 87, 88,115,119,120,121,375,123, 90,
-+ 284,285,309,298,312, 91,327,328,329,331,333,335,336,337,338,339,
-+ 367,294,293,286,350, 92,334,512,116,377,109,111,373,347,348,349,
-+ 360, 93, 94, 95, 98,376,100,101,357,316,354,304,289,102,351,355,
-+ 103,104,105,275,281,272,306,106,274,107,288,364,358,363,362,361,
-+ 291,108,381,290,287,292,279,305,280, 99,112,257,258,113,270,114,
-+ 118,117,125,374,379,259,260,261,262,263,264,265,266,267,268,269,
-+ 271,273,276,277,278,282,283,295,296,297,299,300,301,302,303,307,
-+ 308,310,313,314,315,317,318,319,320,321,322,323,324,325,326,330,
-+ 332,340,341,342,343,344,345,346,356,359,365,368,369,370,371,372 };
-+
-+static void handle_scancode(unsigned char scancode, int down)
-+{
-+ char up_flag = down ? 0 : 0200;
-+
-+ xf86PostKbdEvent(scancode | up_flag);
-+}
-+
-+static int emulate_raw(unsigned int keycode, int down)
-+{
-+ if (keycode > 255 || !x86_keycodes[keycode])
-+ return -1;
-+
-+ if (keycode == KEY_PAUSE) {
-+ handle_scancode(0xe1, 1);
-+ handle_scancode(0x1d, down);
-+ handle_scancode(0x45, down);
-+ return 0;
-+ }
-+
-+ if (x86_keycodes[keycode] & 0x100)
-+ handle_scancode(0xe0, 1);
-+
-+ handle_scancode(x86_keycodes[keycode] & 0x7f, down);
-+
-+ if (keycode == KEY_SYSRQ) {
-+ handle_scancode(0xe0, 1);
-+ handle_scancode(0x37, down);
-+ }
-+
-+ return 0;
-+}
-+
-+void
-+xf86USBKbdEvents()
-+{
-+ struct input_event {
-+ struct timeval time;
-+ unsigned short type;
-+ unsigned short code;
-+ unsigned int value;
-+ } ev;
-+
-+ int nBytes;
-+
-+ while ((nBytes = read(xf86Info.kbdFd, (char *)&ev, sizeof(ev))) > 0)
-+ if (ev.type == EV_KEY)
-+ emulate_raw(ev.code, ev.value);
-+}
-diff -uNr xorg-x11-6.8.1-rhbuild/xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_usl.c xorg-x11-6.8.1/xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_usl.c
---- xorg-x11-6.8.1-rhbuild/xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_usl.c 2004-04-23 21:54:12.000000000 +0200
-+++ xorg-x11-6.8.1/xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_usl.c 2004-11-19 21:49:47.000000000 +0100
-@@ -41,6 +41,9 @@
- void
- xf86VTRequest(int sig)
- {
-+ if (xf86NoVTSwitches)
-+ return;
-+
- signal(sig, (void(*)(int))xf86VTRequest);
- xf86Info.vtRequestsPending = TRUE;
- return;
-@@ -49,12 +52,15 @@
- Bool
- xf86VTSwitchPending()
- {
-- return(xf86Info.vtRequestsPending ? TRUE : FALSE);
-+ return(!xf86NoVTSwitches && xf86Info.vtRequestsPending ? TRUE : FALSE);
- }
-
- Bool
- xf86VTSwitchAway()
- {
-+ if (xf86NoVTSwitches)
-+ return FALSE;
-+
- xf86Info.vtRequestsPending = FALSE;
- if (ioctl(xf86Info.consoleFd, VT_RELDISP, 1) < 0)
- {
-@@ -69,6 +75,9 @@
- Bool
- xf86VTSwitchTo()
- {
-+ if (xf86NoVTSwitches)
-+ return TRUE;
-+
- xf86Info.vtRequestsPending = FALSE;
- if (ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ) < 0)
- {
-diff -uNr xorg-x11-6.8.1-rhbuild/xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h xorg-x11-6.8.1/xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h
---- xorg-x11-6.8.1-rhbuild/xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h 2004-04-23 21:54:07.000000000 +0200
-+++ xorg-x11-6.8.1/xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h 2004-11-19 21:49:47.000000000 +0100
-@@ -229,6 +229,7 @@
- extern int xf86KbdOn(void);
- extern int xf86KbdOff(void);
- extern void xf86KbdEvents(void);
-+extern void xf86USBKbdEvents(void);
- #ifdef XQUEUE
- extern int xf86XqueKbdProc(DeviceIntPtr, int);
- extern void xf86XqueEvents(void);
+++ /dev/null
-http://glen.alkohol.ee/xkb/
---- us 2004-09-10 00:26:13.000000000 +0300
-+++ us.patched 2006-01-23 10:23:54.000000000 +0200
-@@ -120,3 +120,10 @@
-
- include "level3(ralt_switch_multikey)"
- };
-+
-+partial alphanumeric_keys
-+xkb_symbols "ee" {
-+ name[Group1]="US/Estonia";
-+
-+ include "pc/us_ee"
-+};
---- /dev/null 2006-01-13 00:14:27.000000000 +0200
-+++ us_ee 2006-01-23 10:22:25.000000000 +0200
-@@ -0,0 +1,63 @@
-+// $XFree86$
-+
-+// Based on pc/us_intl keyboard map.
-+// Elan Ruusamäe <glen@delfi.ee>
-+//
-+// $Log$
-+// Revision 1.9 2006/01/23 08:22:25 glen
-+// - updated to X11 6.9.0
-+// - set group name to country name
-+//
-+// Revision 1.8 2005/10/11 06:35:55 glen
-+// - add vim encoding
-+//
-+// Revision 1.7 2005/05/20 11:33:45 glen
-+// - unified tabs
-+//
-+// Revision 1.6 2004/09/15 22:21:19 glen
-+// - added sterling
-+//
-+// Revision 1.5 2004/09/15 22:11:01 glen
-+// - more cosmetics
-+//
-+// Revision 1.4 2004/09/15 22:10:35 glen
-+// - cosmetics
-+//
-+// Revision 1.3 2004/09/15 22:10:16 glen
-+// - import old changelog
-+//
-+// Revision 1.2 2004/09/15 22:09:05 glen
-+// - added euro & cent
-+//
-+// Revision 1.1: 2004/09/15 21:15:45 glen
-+// - added
-+//
-+
-+partial default alphanumeric_keys
-+xkb_symbols "basic" {
-+
-+ include "pc/us"
-+ name[Group1]="US/Estonia";
-+
-+ key <AD11> { [ bracketleft, braceleft, udiaeresis, Udiaeresis ] };
-+ key <AD12> { [ bracketright, braceright, otilde, Otilde ] };
-+ key <AC10> { [ semicolon, colon, odiaeresis, Odiaeresis ] };
-+ key <AC11> { [ quoteright, quotedbl, adiaeresis, Adiaeresis ] };
-+
-+ // ¨ and ¨
-+ key <AC02> { [ s, S, scaron, Scaron ] };
-+ // ´ and ¸
-+ key <AB01> { [ z, Z, zcaron, Zcaron ] };
-+
-+ // euro
-+ key <AD03> { [ e, E, EuroSign, EuroSign ] };
-+
-+ // cent
-+ key <AB03> { [ c, C, cent, cent ] };
-+
-+ key <AE03> { [ 3, numbersign, sterling, sterling ] };
-+
-+ include "level3(ralt_switch)"
-+};
-+
-+// vim:ts=8:sw=8:encoding=iso8859-15
---- Imakefile~ 2005-10-09 21:05:42.000000000 +0300
-+++ Imakefile 2005-12-24 17:09:12.000000000 +0200
-@@ -20,7 +20,7 @@
- ro ru \
- se si sk srp sy \
- th tj tr \
-- ua us uz \
-+ ua us us_ee uz \
- vn
-
- all::
projects / packages / X11.git / commitdiff