diff options
Diffstat (limited to 'python/Python-ssl.patch')
-rw-r--r-- | python/Python-ssl.patch | 205 |
1 files changed, 0 insertions, 205 deletions
diff --git a/python/Python-ssl.patch b/python/Python-ssl.patch deleted file mode 100644 index e60fafab8f3e..000000000000 --- a/python/Python-ssl.patch +++ /dev/null @@ -1,205 +0,0 @@ ---- misc/Python-2.6.1/PCbuild/build_ssl.py 2009-11-02 08:24:35.140625000 +0000 -+++ misc/build/Python-2.6.1/PCbuild/build_ssl.py 2009-11-02 08:25:11.750000000 +0000 -@@ -255,4 +255,4 @@ - sys.exit(rc) - - if __name__=='__main__': -- main() -+ sys.exit(0) ---- misc/Python-2.6.1/PCbuild/_ssl.vcproj 2009-11-02 08:24:35.140625000 +0000 -+++ misc/build/Python-2.6.1/PCbuild/_ssl.vcproj 2009-11-02 08:24:35.140625000 +0000 -@@ -43,7 +43,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc32" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -57,7 +57,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib" - /> - <Tool - Name="VCALinkTool" -@@ -106,7 +106,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc64" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -120,7 +120,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib" - /> - <Tool - Name="VCALinkTool" -@@ -169,7 +169,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc32" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -183,7 +183,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib" - /> - <Tool - Name="VCALinkTool" -@@ -233,7 +233,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc64" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -247,7 +247,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib" - /> - <Tool - Name="VCALinkTool" -@@ -296,7 +296,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc32" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -310,7 +310,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib" - /> - <Tool - Name="VCALinkTool" -@@ -360,7 +360,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc64" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -374,7 +374,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib" - TargetMachine="17" - /> - <Tool -@@ -424,7 +424,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc32" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -438,7 +438,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib" - /> - <Tool - Name="VCALinkTool" -@@ -488,7 +488,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc64" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -502,7 +502,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib" - TargetMachine="17" - /> - <Tool ---- misc/Python-2.6.1/setup.py 2009-11-02 10:12:43.000000000 +0000 -+++ misc/build/Python-2.6.1/setup.py 2009-11-02 10:18:19.000000000 +0000 -@@ -612,7 +612,12 @@ - exts.append( Extension('_socket', ['socketmodule.c'], - depends = ['socketmodule.h']) ) - # Detect SSL support for the socket module (via _ssl) -+ ooosslinc = os.environ.get('SOLARVERSION') + '/' + \ -+ os.environ.get('INPATH') + '/' + \ -+ 'inc' -+ ooosslinc = ooosslinc + '/external/' - search_for_ssl_incs_in = [ -+ ooosslinc, - '/usr/local/ssl/include', - '/usr/contrib/ssl/include/' - ] -@@ -624,8 +632,13 @@ - ['/usr/kerberos/include']) - if krb5_h: - ssl_incs += krb5_h -+ ooossllib = os.environ.get('SOLARVER') + '/' + \ -+ os.environ.get('INPATH') + '/' + \ -+ 'lib' -+ ooosslinc = ooosslinc + '/' - ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, -- ['/usr/local/ssl/lib', -+ [ooossllib, -+ '/usr/local/ssl/lib', - '/usr/contrib/ssl/lib/' - ] ) - ---- misc/Python-2.6.1/Modules/Setup.dist 2009-12-17 15:16:50.000000000 +0000 -+++ misc/build/Python-2.6.1/Modules/Setup.dist 2009-12-17 15:17:49.000000000 +0000 -@@ -248,14 +248,14 @@ - # Message-Digest Algorithm, described in RFC 1321. The necessary files - # md5.c and md5.h are included here. - --#_md5 md5module.c md5.c -+_md5 md5module.c md5.c - - - # The _sha module implements the SHA checksum algorithms. - # (NIST's Secure Hash Algorithms.) --#_sha shamodule.c --#_sha256 sha256module.c --#_sha512 sha512module.c -+_sha shamodule.c -+_sha256 sha256module.c -+_sha512 sha512module.c - - - # SGI IRIX specific modules -- off by default. |