SOURCES: XFree86-PLD.patch, XFree86-Xwrapper.patch, XFree86-xman.p...

shadzik shadzik at pld-linux.org
Sun Jun 11 19:28:26 CEST 2006 

Author: shadzik                      Date: Sun Jun 11 17:28:26 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- XFree86-4.6.0

---- Files affected:
SOURCES:
   XFree86-PLD.patch (1.21 -> 1.22) , XFree86-Xwrapper.patch (1.7 -> 1.8) , XFree86-xman.patch (1.5 -> 1.6) , XFree86-HasXdmAuth.patch (1.1 -> 1.2) , XFree86-xdm-fixes.patch (1.9 -> 1.10) , XFree86-XTerm.ad.patch (1.15 -> 1.16) , XFree86-alpha_GLX_align_fix.patch (1.2 -> 1.3) , XFree86-xman-manpaths.patch (1.2 -> 1.3) , XFree86-GLcore-strip-a-workaround.patch (1.3 -> 1.4) , XFree86-disable_glide.patch (1.4 -> 1.5) , XFree86-pkgconfig.patch (1.2 -> 1.3) , XFree86-xterm-256colors.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/XFree86-PLD.patch
diff -u SOURCES/XFree86-PLD.patch:1.21 SOURCES/XFree86-PLD.patch:1.22
--- SOURCES/XFree86-PLD.patch:1.21	Mon Jul  4 14:16:11 2005
+++ SOURCES/XFree86-PLD.patch	Sun Jun 11 19:28:21 2006
@@ -1,19 +1,17 @@
-diff -Nru xc.orig/Makefile xc/Makefile
---- xc.orig/Makefile	2003-11-02 05:38:01.000000000 +0100
-+++ xc/Makefile	2003-12-23 12:09:12.071230112 +0100
-@@ -8,7 +8,7 @@
+--- xc/Makefile	2006-06-11 00:28:00.305505872 +0200
++++ xc/Makefile-new	2006-06-11 00:31:06.181248464 +0200
+@@ -3,7 +3,7 @@
+ # Luna users will need to either run make as "make MAKE=make"
  # or add "MAKE = make" to this file.
  
- RELEASE = "Release 6.6"
 -SHELL = /bin/sh
 +SHELL = /bin/sh -e
  RM = rm -f
  MV = mv
  WORLDOPTS =
-diff -Nru xc.orig/config/cf/Imake.cf xc/config/cf/Imake.cf
---- xc.orig/config/cf/Imake.cf	2003-12-19 05:40:33.000000000 +0100
-+++ xc/config/cf/Imake.cf	2003-12-23 12:09:11.983243488 +0100
-@@ -784,6 +784,10 @@
+--- xc/config/cf/Imake.cf.orig	2006-01-09 15:56:12.000000000 +0100
++++ xc/config/cf/Imake.cf	2006-06-11 00:28:00.321503440 +0200
+@@ -800,6 +800,10 @@
  #   define s390Architecture
  #  undef __s390__
  # endif /* s390 */
@@ -24,10 +22,9 @@
  # ifdef __alpha
  #  define AlphaArchitecture
  #  undef __alpha
-diff -Nru xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
---- xc.orig/config/cf/Imake.tmpl	2003-11-21 06:55:02.000000000 +0100
-+++ xc/config/cf/Imake.tmpl	2003-12-23 12:09:11.992242120 +0100
-@@ -261,7 +261,7 @@
+--- xc/config/cf/Imake.tmpl.orig	2006-04-03 01:12:46.000000000 +0200
++++ xc/config/cf/Imake.tmpl	2006-06-11 00:28:00.323503136 +0200
+@@ -308,7 +308,7 @@
  
  #ifndef BuildHtmlManPages
  #ifdef RmanCmd
@@ -36,7 +33,7 @@
  #else
  #define BuildHtmlManPages NO
  #endif
-@@ -854,11 +854,7 @@
+@@ -904,11 +904,7 @@
  #define LintlibDir $(USRLIBDIR)/lint
  #endif
  #ifndef SystemManDirectory
@@ -48,7 +45,7 @@
  #endif
  #ifndef ManDirectoryRoot
  #ifdef ProjectRoot
-@@ -998,7 +994,7 @@
+@@ -1055,7 +1051,7 @@
  #define NoRConst NO /* YES if const for structs of funcs is bad */
  #endif
  #ifndef InstPgmFlags
@@ -57,7 +54,7 @@
  #endif
  #ifndef InstBinFlags
  #define InstBinFlags -m 0755
-@@ -1140,7 +1136,7 @@
+@@ -1212,7 +1208,7 @@
  #define CppCmd /LibDirName/cpp
  #endif
  #ifndef RawCppCmd
@@ -66,10 +63,9 @@
  #endif
  #ifndef CppNoLineInfoOption
  #define CppNoLineInfoOption /**/
-diff -Nru xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
---- xc.orig/config/cf/X11.tmpl	2003-12-19 05:41:17.000000000 +0100
-+++ xc/config/cf/X11.tmpl	2003-12-23 12:09:12.042234520 +0100
-@@ -1262,8 +1262,12 @@
+--- xc/config/cf/X11.tmpl.orig	2006-04-18 17:57:25.000000000 +0200
++++ xc/config/cf/X11.tmpl	2006-06-11 00:28:00.327502528 +0200
+@@ -1649,8 +1649,12 @@
  # define UsbMouseSupport NO
  #endif
  
@@ -83,7 +79,7 @@
  #endif
  
  /* X-TrueType settings */
-@@ -1389,7 +1393,7 @@
+@@ -1783,7 +1787,7 @@
  #define ConfigDir $(LIBDIR)/config
  #endif
  #ifndef DocDir
@@ -92,7 +88,7 @@
  #endif
  #ifndef DocHtmlDir
  #define DocHtmlDir $(DOCDIR)/html
-@@ -1401,31 +1405,31 @@
+@@ -1795,31 +1799,31 @@
  #define DocPdfDir $(DOCDIR)/PDF
  #endif
  #ifndef FontDir
@@ -131,7 +127,7 @@
  #endif
  #ifndef NlsDir
  #define NlsDir $(LIBDIR)/nls
-@@ -1434,23 +1438,20 @@
+@@ -1828,23 +1832,20 @@
  #define XLocaleDir $(LIBDIR)/locale
  #endif
  #ifndef LbxproxyDir
@@ -158,7 +154,7 @@
  #ifndef InstallSecurityConfig
  #define InstallSecurityConfig YES	/* Install sample security policy */
  #endif
-@@ -1482,10 +1483,10 @@
+@@ -1876,10 +1877,10 @@
  #define OsNameDefines /* as nothing */
  #endif
  #ifndef DefaultUserPath			/* for xdm */
@@ -171,7 +167,7 @@
  #endif
  #ifndef DefaultSystemShell		/* for xdm to set in SHELL */
  #define DefaultSystemShell BourneShell
-@@ -1614,7 +1615,7 @@
+@@ -2014,7 +2015,7 @@
  
       HTMLINDEXCMD = HtmlIndexCmd
  
@@ -180,7 +176,7 @@
          CLIENTSRC = $(TOP)/clients
            DEMOSRC = $(TOP)/demos
         XDOCMACROS = $(DOCUTILSRC)/macros.t
-@@ -1628,7 +1629,7 @@
+@@ -2028,7 +2029,7 @@
          SERVERSRC = $(XTOP)/programs/Xserver
         CONTRIBSRC = ContribDir
     UNSUPPORTEDSRC = UnsupportedDir
@@ -189,10 +185,9 @@
             RGBSRC = $(XTOP)/programs/rgb
        BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
       MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
-diff -Nru xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
---- xc.orig/config/cf/linux.cf	2003-12-19 05:41:59.000000000 +0100
-+++ xc/config/cf/linux.cf	2003-12-23 12:09:12.008239688 +0100
-@@ -333,7 +333,7 @@
+--- xc/config/cf/linux.cf.orig	2006-04-03 01:12:46.000000000 +0200
++++ xc/config/cf/linux.cf	2006-06-11 00:28:00.329502224 +0200
+@@ -335,7 +335,7 @@
   */
  #if BuildXF86DRI
  # if defined(i386Architecture)
@@ -201,7 +196,7 @@
  # endif
  #endif
  
-@@ -720,7 +720,7 @@
+@@ -749,7 +749,7 @@
  
  #define HasVarRun		YES
  #ifndef VarDbDirectory
@@ -210,10 +205,9 @@
  #endif
  
  #ifndef XF86OSCardDrivers
-diff -Nru xc.orig/config/cf/site.def xc/config/cf/site.def
---- xc.orig/config/cf/site.def	2002-02-27 01:51:12.000000000 +0100
-+++ xc/config/cf/site.def	2003-12-23 12:09:12.014238776 +0100
-@@ -119,10 +119,14 @@
+--- xc/config/cf/site.def.orig	2006-01-09 15:56:13.000000000 +0100
++++ xc/config/cf/site.def	2006-06-11 00:28:00.330502072 +0200
+@@ -104,10 +104,14 @@
  #define HasSentinel	YES
  */
  
@@ -231,10 +225,9 @@
  
  
  /* You do NOT need SetUID if you only run the server under xdm */
-diff -Nru xc.orig/config/cf/xf86site.def xc/config/cf/xf86site.def
---- xc.orig/config/cf/xf86site.def	2003-09-10 13:00:03.000000000 +0200
-+++ xc/config/cf/xf86site.def	2003-12-23 12:09:12.050233304 +0100
-@@ -260,8 +260,8 @@
+--- xc/config/cf/xf86site.def.orig	2006-04-08 20:33:00.000000000 +0200
++++ xc/config/cf/xf86site.def	2006-06-11 00:28:00.335501312 +0200
+@@ -257,8 +257,8 @@
  /*
   * To not build/install the Cyrillic fonts, uncomment the following
   *
@@ -244,7 +237,7 @@
  
  /*
   * To not install the local font directory, uncomment the following
-@@ -307,27 +307,26 @@
+@@ -304,27 +304,26 @@
   * HasGlide2 to YES and set the Glide2IncDir variable. 
   * HasGlide2 is per default NO.
   *
@@ -276,7 +269,7 @@
  
  
  /*
-@@ -429,8 +428,8 @@
+@@ -426,8 +425,8 @@
   * Some Linux releases don't have a libtermcap.  In this case you may need
   * to uncomment the following
   *
@@ -286,7 +279,7 @@
  
  /*
   * Build a server that dynamically loads the modules by setting
-@@ -605,8 +604,8 @@
+@@ -602,8 +601,8 @@
   * To forceably build static libraries in addition to shared libraries,
   * uncomment this.
   *
@@ -296,10 +289,9 @@
  
  /*
   * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
-diff -Nru xc.orig/config/cf/xfree86.cf xc/config/cf/xfree86.cf
---- xc.orig/config/cf/xfree86.cf	2003-11-21 06:55:07.000000000 +0100
-+++ xc/config/cf/xfree86.cf	2003-12-23 12:09:12.055232544 +0100
-@@ -128,7 +128,7 @@
+--- xc/config/cf/xfree86.cf.orig	2006-04-26 02:28:16.000000000 +0200
++++ xc/config/cf/xfree86.cf	2006-06-11 00:28:00.337501008 +0200
+@@ -148,7 +148,7 @@
  #define XConfigFile		XF86Config
  #endif
  #ifndef XConfigDir
@@ -308,7 +300,7 @@
  #endif
  #ifndef XLogFile
  #define XLogFile		XFree86
-@@ -760,7 +760,7 @@
+@@ -788,7 +788,7 @@
  
  # ifndef XF86CardDrivers
  #  define XF86CardDrivers	mga glint nv s3 s3virge sis savage \
@@ -317,10 +309,9 @@
  				DevelDrivers newport \
  				XF86OSCardDrivers XF86ExtraCardDrivers
  # endif
-diff -Nru xc.orig/config/imake/imake.c xc/config/imake/imake.c
---- xc.orig/config/imake/imake.c	2003-04-10 13:00:03.000000000 +0200
-+++ xc/config/imake/imake.c	2003-12-23 12:09:12.060231784 +0100
-@@ -1057,6 +1057,7 @@
+--- xc/config/imake/imake.c.orig	2006-01-09 15:56:14.000000000 +0100
++++ xc/config/imake/imake.c	2006-06-11 00:28:00.339500704 +0200
+@@ -1056,6 +1056,7 @@
    static char* suse = "/etc/SuSE-release";
    static char* redhat = "/etc/redhat-release";
    static char* debian = "/etc/debian_version";
@@ -328,7 +319,7 @@
  
    fprintf (inFile, "%s\n", "#define LinuxUnknown    0");
    fprintf (inFile, "%s\n", "#define LinuxSuSE       1");
-@@ -1071,6 +1072,7 @@
+@@ -1070,6 +1071,7 @@
    fprintf (inFile, "%s\n", "#define LinuxTurbo      10");
    fprintf (inFile, "%s\n", "#define LinuxWare       11");
    fprintf (inFile, "%s\n", "#define LinuxYggdrasil  12");
@@ -336,7 +327,7 @@
  
  #ifdef CROSSCOMPILE
    if (CrossCompiling) {
-@@ -1097,6 +1099,11 @@
+@@ -1096,6 +1098,11 @@
       * at the content of /etc/debian_version */
      return;
    }
@@ -348,10 +339,9 @@
    /* what's the definitive way to tell what any particular distribution is? */
  
    fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
-diff -Nru xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile
---- xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile	2003-12-19 05:48:39.000000000 +0100
-+++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile	2003-12-23 12:09:12.000000000 +0100
-@@ -107,7 +107,7 @@
+--- xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig	2006-03-11 18:36:50.000000000 +0100
++++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile	2006-06-11 00:28:00.340500552 +0200
+@@ -108,7 +108,7 @@
  
  #if HasNCurses
  CURSESLIB = NCursesLibName
@@ -360,10 +350,10 @@
  #endif
  
  XF86CONFIGFILE = XConfigFile
-diff -Nru xc.orig/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
---- xc.orig/programs/xdm/config/Xres.cpp	2003-11-21 07:01:06.000000000 +0100
-+++ xc/programs/xdm/config/Xres.cpp	2003-12-23 12:09:12.000000000 +0100
-@@ -71,9 +71,9 @@
+--- xc/programs/xdm/config/Xres.cpp.orig	2006-01-09 16:01:06.000000000 +0100
++++ xc/programs/xdm/config/Xres.cpp	2006-06-11 00:28:00.341500400 +0200
+@@ -65,10 +65,10 @@
+ #endif /* XPM */
  XHASHendif
  #ifdef XPM
 -XHASHif PLANES >= 8
@@ -376,10 +366,9 @@
  XHASHendif
  xlogin*useShape: true
  xlogin*logoPadding: 10
-diff -Nru xc.orig/programs/xdm/resource.c xc/programs/xdm/resource.c
---- xc.orig/programs/xdm/resource.c	2003-09-25 13:06:32.000000000 +0200
-+++ xc/programs/xdm/resource.c	2003-12-23 12:09:12.000000000 +0100
-@@ -84,31 +84,31 @@
+--- xc/programs/xdm/resource.c.orig	2006-01-09 16:01:04.000000000 +0100
++++ xc/programs/xdm/resource.c	2006-06-11 00:28:00.342500248 +0200
+@@ -83,31 +83,31 @@
   */
  #ifndef __EMX__
  #ifndef DEF_SERVER_LINE 
@@ -419,7 +408,7 @@
  #endif
  #ifndef DEF_AUTH_NAME
  #ifdef HASXDMAUTH
-@@ -118,7 +118,7 @@
+@@ -117,7 +117,7 @@
  #endif
  #endif
  #ifndef DEF_AUTH_DIR
@@ -428,10 +417,9 @@
  #endif
  #ifndef DEF_USER_AUTH_DIR
  #define DEF_USER_AUTH_DIR	"/tmp"
-diff -Nru xc.orig/programs/xinit/Imakefile xc/programs/xinit/Imakefile
---- xc.orig/programs/xinit/Imakefile	2003-11-21 07:01:12.000000000 +0100
-+++ xc/programs/xinit/Imakefile	2003-12-23 12:09:12.000000000 +0100
-@@ -46,11 +46,12 @@
+--- xc/programs/xinit/Imakefile.orig	2006-03-06 17:06:23.000000000 +0100
++++ xc/programs/xinit/Imakefile	2006-06-11 00:28:00.342500248 +0200
+@@ -41,11 +41,12 @@
  #endif
  InstallManPage(startx,$(MANDIR))
  
@@ -449,11 +437,10 @@
  
  LinkConfDirectory(xinit,.,xinit,.)
  
-diff -Nru xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile
---- xc.orig/programs/xterm/Imakefile	2003-12-19 05:51:51.000000000 +0100
-+++ xc/programs/xterm/Imakefile	2003-12-23 12:11:05.000000000 +0100
-@@ -36,6 +36,10 @@
- #define XkbClientLibs /**/
+--- xc/programs/xterm/Imakefile.orig	2006-04-10 02:34:36.000000000 +0200
++++ xc/programs/xterm/Imakefile	2006-06-11 00:48:09.508679048 +0200
+@@ -94,6 +94,10 @@
+ # endif
  #endif
  
 +#if InstallXtermSetUID
@@ -463,19 +450,10 @@
  #ifndef SpecialCObjectRule
  #define SpecialCObjectRule(module,ignore,defines) \
  module.o: ; $(CC) -c defines $(CFLAGS) module.c
-@@ -57,6 +61,8 @@
-          PTYLIB = -lpucc
- #endif
- 
-+         PTYLIB = -lutil
-+
- #if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || \
-     (defined(LinuxArchitecture) && \
-      (LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1))
-@@ -116,7 +122,7 @@
+@@ -179,7 +183,7 @@
      XKB_DEFINES = XkbClientDefines
     PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
-         DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF)
+         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)
  

================================================================
Index: SOURCES/XFree86-Xwrapper.patch
diff -u SOURCES/XFree86-Xwrapper.patch:1.7 SOURCES/XFree86-Xwrapper.patch:1.8
--- SOURCES/XFree86-Xwrapper.patch:1.7	Tue Dec 31 18:51:54 2002
+++ SOURCES/XFree86-Xwrapper.patch	Sun Jun 11 19:28:21 2006
@@ -110,14 +110,6 @@
 diff -urN xc.orig/programs/Xserver/os/Imakefile xc/programs/Xserver/os/Imakefile
 --- xc.orig/programs/Xserver/os/Imakefile	Mon Dec 30 15:53:58 2002
 +++ xc/programs/Xserver/os/Imakefile	Mon Dec 30 17:31:52 2002
-@@ -120,6 +120,7 @@
-        INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
- 		  -I$(SERVERSRC)/Xext -I$(FONTINCSRC) -I$(SERVERSRC)/render \
- 		  -I$(TOP)/lib/Xau -I../lbx Krb5Includes
-+  EXTRA_DEFINES = -DUSE_PAM
-  DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) \
- 		  $(TRANS_INCLUDES) $(CONNECTION_FLAGS) DependDefines
-        LINTLIBS = ../dix/llib-ldix.ln
 @@ -166,6 +167,14 @@
  SpecialCObjectRule(oscolor,$(ICONFIGFILES),$(DBM_DEFINES))
  #endif
@@ -476,3 +468,4 @@
  #else
  	    (**argv != '/' && **argv != '\\' && **argv != '.' &&
  	     !(isalpha(**argv) && (*argv)[1]==':'))) {
+

================================================================
Index: SOURCES/XFree86-xman.patch
diff -u SOURCES/XFree86-xman.patch:1.5 SOURCES/XFree86-xman.patch:1.6
--- SOURCES/XFree86-xman.patch:1.5	Tue Dec 31 18:51:54 2002
+++ SOURCES/XFree86-xman.patch	Sun Jun 11 19:28:21 2006
@@ -10,17 +10,3 @@
  # endif
  #elif defined(OpenBSDArchitecture) || defined(NetBSDArchitecture) || \
      defined(DarwinArchitecture)
-diff -urN xc.orig/programs/xman/xman.man xc/programs/xman/xman.man
---- xc.orig/programs/xman/xman.man	Mon Dec 30 15:54:14 2002
-+++ xc/programs/xman/xman.man	Mon Dec 30 18:12:17 2002
-@@ -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

================================================================
Index: SOURCES/XFree86-HasXdmAuth.patch
diff -u SOURCES/XFree86-HasXdmAuth.patch:1.1 SOURCES/XFree86-HasXdmAuth.patch:1.2
--- SOURCES/XFree86-HasXdmAuth.patch:1.1	Thu Nov  9 15:35:39 2000
+++ SOURCES/XFree86-HasXdmAuth.patch	Sun Jun 11 19:28:21 2006
@@ -1,416 +1,12 @@
---- XFree86-4.0.1/xc/config/cf/xf86site.def~	Wed Nov  8 18:24:28 2000
-+++ XFree86-4.0.1/xc/config/cf/xf86site.def	Wed Nov  8 18:37:12 2000
-@@ -555,8 +555,8 @@
+--- xc/config/cf/xf86site.def.orig	2006-06-11 02:28:39.436990608 +0200
++++ xc/config/cf/xf86site.def	2006-06-11 02:34:18.669419440 +0200
+@@ -579,8 +579,8 @@
  /*
-  * If you want XDMAUTH support (if you have Wraphelp.c), uncomment this.
+  * If you want to disable XDMAUTH support, uncomment this.
   *
--#define HasXdmAuth		YES
+-#define HasXdmAuth		NO
   */
 +#define HasXdmAuth		YES
  
  /*
   * If you have Linux DECnet support, and want to build XFree86 with support
---- /dev/null	Tue May 27 20:49:58 1997
-+++ XFree86-4.0.1/xc/lib/Xdmcp/Wraphelp.c	Sat Feb 26 02:04:11 2000
-@@ -0,0 +1,401 @@
-+/*
-+ * This program implements the
-+ * Proposed Federal Information Processing
-+ *  Data Encryption Standard.
-+ * See Federal Register, March 17, 1975 (40FR12134)
-+ */
-+
-+/*
-+ * Initial permutation,
-+ */
-+static	char	IP[] = {
-+	58,50,42,34,26,18,10, 2,
-+	60,52,44,36,28,20,12, 4,
-+	62,54,46,38,30,22,14, 6,
-+	64,56,48,40,32,24,16, 8,
-+	57,49,41,33,25,17, 9, 1,
-+	59,51,43,35,27,19,11, 3,
-+	61,53,45,37,29,21,13, 5,
-+	63,55,47,39,31,23,15, 7,
-+};
-+
-+/*
-+ * Final permutation, FP = IP^(-1)
-+ */
-+static	char	FP[] = {
-+	40, 8,48,16,56,24,64,32,
-+	39, 7,47,15,55,23,63,31,
-+	38, 6,46,14,54,22,62,30,
-+	37, 5,45,13,53,21,61,29,
-+	36, 4,44,12,52,20,60,28,
-+	35, 3,43,11,51,19,59,27,
-+	34, 2,42,10,50,18,58,26,
-+	33, 1,41, 9,49,17,57,25,
-+};
-+
-+/*
-+ * Permuted-choice 1 from the key bits
-+ * to yield C and D.
-+ * Note that bits 8,16... are left out:
-+ * They are intended for a parity check.
-+ */
-+static	char	PC1_C[] = {
-+	57,49,41,33,25,17, 9,
-+	 1,58,50,42,34,26,18,
-+	10, 2,59,51,43,35,27,
-+	19,11, 3,60,52,44,36,
-+};
-+
-+static	char	PC1_D[] = {
-+	63,55,47,39,31,23,15,
-+	 7,62,54,46,38,30,22,
-+	14, 6,61,53,45,37,29,
-+	21,13, 5,28,20,12, 4,
-+};
-+
-+/*
-+ * Sequence of shifts used for the key schedule.
-+*/
-+static	char	shifts[] = {
-+	1,1,2,2,2,2,2,2,1,2,2,2,2,2,2,1,
-+};
-+
-+/*
-+ * Permuted-choice 2, to pick out the bits from
-+ * the CD array that generate the key schedule.
-+ */
-+static	char	PC2_C[] = {
-+	14,17,11,24, 1, 5,
-+	 3,28,15, 6,21,10,
-+	23,19,12, 4,26, 8,
-+	16, 7,27,20,13, 2,
-+};
-+
-+static	char	PC2_D[] = {
-+	41,52,31,37,47,55,
-+	30,40,51,45,33,48,
-+	44,49,39,56,34,53,
-+	46,42,50,36,29,32,
-+};
-+
-+/*
-+ * The C and D arrays used to calculate the key schedule.
-+ */
-+
-+static	char	C[28];
-+static	char	D[28];
-+
-+/*
-+ * The key schedule.
-+ * Generated from the key.
-+ */
-+static	char	KS[16][48];
-+
-+/*
-+ * The E bit-selection table.
-+ */
-+static	char	E[48];
-+static	char	e[] = {
-+	32, 1, 2, 3, 4, 5,
-+	 4, 5, 6, 7, 8, 9,
-+	 8, 9,10,11,12,13,
-+	12,13,14,15,16,17,
-+	16,17,18,19,20,21,
-+	20,21,22,23,24,25,
-+	24,25,26,27,28,29,
-+	28,29,30,31,32, 1,
-+};
-+
-+/*
-+ * Set up the key schedule from the key.
-+ */
-+
-+static
-+setkey(key)
-+char *key;
-+{
-+	int	i, j, k;
-+	int	t;
-+	char	*ptr;
-+
-+	/*
-+	 * First, generate C and D by permuting
-+	 * the key.  The low order bit of each
-+	 * 8-bit char is not used, so C and D are only 28
-+	 * bits apiece.
-+	 */
-+	for (i=0; i<28; i++) {
-+		C[i] = key[PC1_C[i]-1];
-+		D[i] = key[PC1_D[i]-1];
-+	}
-+	/*
-+	 * To generate Ki, rotate C and D according
-+	 * to schedule and pick up a permutation
-+	 * using PC2.
-+	 */
-+	for (i=0; i<16; i++) {
-+		/*
-+		 * rotate.
-+		 */
-+		for (k=0; k<shifts[i]; k++) {
-+			t = C[0];
-+			ptr = C;
-+			for (j=0; j<28-1; j++)
-+			{
-+				*ptr = ptr[1];
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/XFree86-PLD.patch?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/SOURCES/XFree86-Xwrapper.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SOURCES/XFree86-xman.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SOURCES/XFree86-HasXdmAuth.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/XFree86-xdm-fixes.patch?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SOURCES/XFree86-XTerm.ad.patch?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/SOURCES/XFree86-alpha_GLX_align_fix.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SOURCES/XFree86-xman-manpaths.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SOURCES/XFree86-GLcore-strip-a-workaround.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SOURCES/XFree86-disable_glide.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SOURCES/XFree86-pkgconfig.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SOURCES/XFree86-xterm-256colors.patch?r1=1.2&r2=1.3&f=u

More information about the pld-cvs-commit mailing list