python/Python-ssl.patch

   1 --- misc/Python-2.6.1/PCbuild/build_ssl.py      2009-11-02 08:24:35.140625000 +0000
   2 +++ misc/build/Python-2.6.1/PCbuild/build_ssl.py        2009-11-02 08:25:11.750000000 +0000
   3 @@ -255,4 +255,4 @@
   4      sys.exit(rc)
   5
   6  if __name__=='__main__':
   7 -    main()
   8 +    sys.exit(0)
   9 --- misc/Python-2.6.1/PCbuild/_ssl.vcproj      2009-11-02 08:24:35.140625000 +0000
  10 +++ misc/build/Python-2.6.1/PCbuild/_ssl.vcproj      2009-11-02 08:24:35.140625000 +0000
  11 @@ -43,7 +43,7 @@
  12                         />
  13                         <Tool
  14                                 Name="VCCLCompilerTool"
  15 -                               AdditionalIncludeDirectories="$(opensslDir)\inc32"
  16 +                               AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
  17                         />
  18                         <Tool
  19                                 Name="VCManagedResourceCompilerTool"
  20 @@ -57,7 +57,7 @@
  21                         />
  22                         <Tool
  23                                 Name="VCLinkerTool"
  24 -                               AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
  25 +                               AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
  26                         />
  27                         <Tool
  28                                 Name="VCALinkTool"
  29 @@ -106,7 +106,7 @@
  30                         />
  31                         <Tool
  32                                 Name="VCCLCompilerTool"
  33 -                               AdditionalIncludeDirectories="$(opensslDir)\inc64"
  34 +                               AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
  35                         />
  36                         <Tool
  37                                 Name="VCManagedResourceCompilerTool"
  38 @@ -120,7 +120,7 @@
  39                         />
  40                         <Tool
  41                                 Name="VCLinkerTool"
  42 -                               AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
  43 +                               AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
  44                         />
  45                         <Tool
  46                                 Name="VCALinkTool"
  47 @@ -169,7 +169,7 @@
  48                         />
  49                         <Tool
  50                                 Name="VCCLCompilerTool"
  51 -                               AdditionalIncludeDirectories="$(opensslDir)\inc32"
  52 +                               AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
  53                         />
  54                         <Tool
  55                                 Name="VCManagedResourceCompilerTool"
  56 @@ -183,7 +183,7 @@
  57                         />
  58                         <Tool
  59                                 Name="VCLinkerTool"
  60 -                               AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
  61 +                               AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
  62                         />
  63                         <Tool
  64                                 Name="VCALinkTool"
  65 @@ -233,7 +233,7 @@
  66                         />
  67                         <Tool
  68                                 Name="VCCLCompilerTool"
  69 -                               AdditionalIncludeDirectories="$(opensslDir)\inc64"
  70 +                               AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
  71                         />
  72                         <Tool
  73                                 Name="VCManagedResourceCompilerTool"
  74 @@ -247,7 +247,7 @@
  75                         />
  76                         <Tool
  77                                 Name="VCLinkerTool"
  78 -                               AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
  79 +                               AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
  80                         />
  81                         <Tool
  82                                 Name="VCALinkTool"
  83 @@ -296,7 +296,7 @@
  84                         />
  85                         <Tool
  86                                 Name="VCCLCompilerTool"
  87 -                               AdditionalIncludeDirectories="$(opensslDir)\inc32"
  88 +                               AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
  89                         />
  90                         <Tool
  91                                 Name="VCManagedResourceCompilerTool"
  92 @@ -310,7 +310,7 @@
  93                         />
  94                         <Tool
  95                                 Name="VCLinkerTool"
  96 -                               AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
  97 +                               AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
  98                         />
  99                         <Tool
 100                                 Name="VCALinkTool"
 101 @@ -360,7 +360,7 @@
 102                         />
 103                         <Tool
 104                                 Name="VCCLCompilerTool"
 105 -                               AdditionalIncludeDirectories="$(opensslDir)\inc64"
 106 +                               AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
 107                         />
 108                         <Tool
 109                                 Name="VCManagedResourceCompilerTool"
 110 @@ -374,7 +374,7 @@
 111                         />
 112                         <Tool
 113                                 Name="VCLinkerTool"
 114 -                               AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
 115 +                               AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
 116                                 TargetMachine="17"
 117                         />
 118                         <Tool
 119 @@ -424,7 +424,7 @@
 120                         />
 121                         <Tool
 122                                 Name="VCCLCompilerTool"
 123 -                               AdditionalIncludeDirectories="$(opensslDir)\inc32"
 124 +                               AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
 125                         />
 126                         <Tool
 127                                 Name="VCManagedResourceCompilerTool"
 128 @@ -438,7 +438,7 @@
 129                         />
 130                         <Tool
 131                                 Name="VCLinkerTool"
 132 -                               AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
 133 +                               AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
 134                         />
 135                         <Tool
 136                                 Name="VCALinkTool"
 137 @@ -488,7 +488,7 @@
 138                         />
 139                         <Tool
 140                                 Name="VCCLCompilerTool"
 141 -                               AdditionalIncludeDirectories="$(opensslDir)\inc64"
 142 +                               AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
 143                         />
 144                         <Tool
 145                                 Name="VCManagedResourceCompilerTool"
 146 @@ -502,7 +502,7 @@
 147                         />
 148                         <Tool
 149                                 Name="VCLinkerTool"
 150 -                               AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
 151 +                               AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
 152                                 TargetMachine="17"
 153                         />
 154                         <Tool
 155 --- misc/Python-2.6.1/setup.py  2009-11-02 10:12:43.000000000 +0000
 156 +++ misc/build/Python-2.6.1/setup.py    2009-11-02 10:18:19.000000000 +0000
 157 @@ -612,7 +612,15 @@
 158          exts.append( Extension('_socket', ['socketmodule.c'],
 159                                 depends = ['socketmodule.h']) )
 160          # Detect SSL support for the socket module (via _ssl)
 161 +        UPDMINOR = os.environ.get('UPDMINOREXT')
 162 +        ooosslinc = os.environ.get('SOLARVERSION') + '/' + \
 163 +            os.environ.get('INPATH') + '/' + \
 164 +            'inc'
 165 +        if UPDMINOR != None:
 166 +            ooosslinc = ooosslinc + UPDMINOR
 167 +        ooosslinc = ooosslinc + '/external/'
 168          search_for_ssl_incs_in = [
 169 +                              ooosslinc,
 170                                '/usr/local/ssl/include',
 171                                '/usr/contrib/ssl/include/'
 172                               ]
 173 @@ -624,8 +632,15 @@
 174                                 ['/usr/kerberos/include'])
 175              if krb5_h:
 176                  ssl_incs += krb5_h
 177 +        ooossllib = os.environ.get('SOLARVER') + '/' + \
 178 +            os.environ.get('INPATH') + '/' + \
 179 +            'lib'
 180 +        if UPDMINOR != None:
 181 +            ooosslinc = ooosslinc + UPDMINOR
 182 +        ooosslinc = ooosslinc + '/'
 183          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
 184 -                                     ['/usr/local/ssl/lib',
 185 +                                     [ooossllib,
 186 +                                      '/usr/local/ssl/lib',
 187                                        '/usr/contrib/ssl/lib/'
 188                                       ] )
 189
 190 --- misc/Python-2.6.1/Modules/Setup.dist        2009-12-17 15:16:50.000000000 +0000
 191 +++ misc/build/Python-2.6.1/Modules/Setup.dist  2009-12-17 15:17:49.000000000 +0000
 192 @@ -248,14 +248,14 @@
 193  # Message-Digest Algorithm, described in RFC 1321.  The necessary files
 194  # md5.c and md5.h are included here.
 195
 196 -#_md5 md5module.c md5.c
 197 +_md5 md5module.c md5.c
 198
 199
 200  # The _sha module implements the SHA checksum algorithms.
 201  # (NIST's Secure Hash Algorithms.)
 202 -#_sha shamodule.c
 203 -#_sha256 sha256module.c
 204 -#_sha512 sha512module.c
 205 +_sha shamodule.c
 206 +_sha256 sha256module.c
 207 +_sha512 sha512module.c
 208
 209
 210  # SGI IRIX specific modules -- off by default.