From 8a6c5b2fcbf2b6d87529e91f58aa41c02d0fc990 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Sat, 17 Nov 2012 00:39:31 +0100 Subject: python3: add module for internal Python 3 build (not active yet) The module builds here on Fedora 17 and with MSVC2008. MacOS X is unfinished and probably breaks, which is why the module is disabled now. These patches from module python were dropped: Integrated upstream: - Python.mipsel-py4305.patch - Python-2.6.1-py4768.patch - Python-2.6.1-py2422.patch (modified, use --with-valgrind) - Python-2.6.1-urllib.patch - Python-2.6.1-py8067.patch Obsolete: - Python-2.6.1-svn-1.7.patch (migrated to non-toy HG now) - Python-parallel-make.patch - Python-2.6.1-nohardlink.patch (no idea why that would be needed, NFS should support hard links) - Python-2.6.1-sysbase.patch (Solaris 11 setsolar specific patch) - Python-2.6.1-cross.berkeleydb.patch (berekeleydb removal) - Python-2.6.2-bdb48.patch - Python-2.6.1-vc10.patch (upstream supports vc10) An attempt to cross compile with mingw that proved unsucessful according to dtardon; there is upstream work on this topic that is possibly already in 3.3: http://bugs.python.org/issue8067 - Python-2.6.2-cross.patch - Python-2.6.2-cross.fix-configure.patch Change-Id: Iba9a3cab955983e173e12110f93a6f381d86f9ce --- python3/python-3.3.0-ssl.patch.1 | 360 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 360 insertions(+) create mode 100644 python3/python-3.3.0-ssl.patch.1 (limited to 'python3/python-3.3.0-ssl.patch.1') diff --git a/python3/python-3.3.0-ssl.patch.1 b/python3/python-3.3.0-ssl.patch.1 new file mode 100644 index 000000000000..b7ba5b5c00e0 --- /dev/null +++ b/python3/python-3.3.0-ssl.patch.1 @@ -0,0 +1,360 @@ +Tweak SSL build to find OpenSSL in solver & not build it itself in "ssl.vcproj" etc. + +diff -ru python3.old_/Modules/Setup.dist python3/Modules/Setup.dist +--- python3.old_/Modules/Setup.dist 2012-09-29 10:00:42.000000000 +0200 ++++ python3/Modules/Setup.dist 2012-11-13 14:19:01.994158111 +0100 +@@ -236,14 +236,14 @@ + # The _md5 module implements the RSA Data Security, Inc. MD5 + # Message-Digest Algorithm, described in RFC 1321. + +-#_md5 md5module.c ++_md5 md5module.c + + + # The _sha module implements the SHA checksum algorithms. + # (NIST's Secure Hash Algorithms.) +-#_sha1 sha1module.c +-#_sha256 sha256module.c +-#_sha512 sha512module.c ++_sha1 sha1module.c ++_sha256 sha256module.c ++_sha512 sha512module.c + + + # The _tkinter module. +diff -ru python3.old_/PC/VS9.0/pcbuild.sln python3/PC/VS9.0/pcbuild.sln +--- python3.old_/PC/VS9.0/pcbuild.sln 2012-09-29 10:00:47.000000000 +0200 ++++ python3/PC/VS9.0/pcbuild.sln 2012-11-13 14:44:29.329147866 +0100 +@@ -136,11 +136,6 @@ + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} + EndProjectSection + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssl", "ssl.vcproj", "{E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}" +- ProjectSection(ProjectDependencies) = postProject +- {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} +- EndProjectSection +-EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kill_python", "kill_python.vcproj", "{6DE10744-E396-40A5-B4E2-1B69AA7C8D31}" + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", "python3dll.vcproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}" +diff -ru python3.old_/PC/VS9.0/_ssl.vcproj python3/PC/VS9.0/_ssl.vcproj +--- python3.old_/PC/VS9.0/_ssl.vcproj 2012-09-29 10:00:47.000000000 +0200 ++++ python3/PC/VS9.0/_ssl.vcproj 2012-11-13 14:27:15.874169273 +0100 +@@ -42,7 +42,7 @@ + /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +- $(opensslDir)\inc32;%(AdditionalIncludeDirectories) ++ $(SOLARVERSION)\$(INPATH)\inc\external;%(AdditionalIncludeDirectories) + + + + + + +- 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;%(AdditionalDependencies) + + + +@@ -166,26 +166,26 @@ + X64 + + +- $(opensslDir)\inc64;%(AdditionalIncludeDirectories) ++ $(SOLARVERSION)\$(INPATH)\inc\external;%(AdditionalIncludeDirectories) + + + + + + +- 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;%(AdditionalDependencies) + + + + +- $(opensslDir)\inc32;%(AdditionalIncludeDirectories) ++ $(SOLARVERSION)\$(INPATH)\inc\external;%(AdditionalIncludeDirectories) + + + + + + +- 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;%(AdditionalDependencies) + + + +@@ -193,26 +193,26 @@ + X64 + + +- $(opensslDir)\inc64;%(AdditionalIncludeDirectories) ++ $(SOLARVERSION)\$(INPATH)\inc\external;%(AdditionalIncludeDirectories) + + + + + + +- 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;%(AdditionalDependencies) + + + + +- $(opensslDir)\inc32;%(AdditionalIncludeDirectories) ++ $(SOLARVERSION)\$(INPATH)\inc\external;%(AdditionalIncludeDirectories) + + + + + + +- 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;%(AdditionalDependencies) + + + +@@ -220,27 +220,27 @@ + X64 + + +- $(opensslDir)\inc64;%(AdditionalIncludeDirectories) ++ $(SOLARVERSION)\$(INPATH)\inc\external;%(AdditionalIncludeDirectories) + + + + + + +- 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;%(AdditionalDependencies) + MachineX64 + + + + +- $(opensslDir)\inc32;%(AdditionalIncludeDirectories) ++ $(SOLARVERSION)\$(INPATH)\inc\external;%(AdditionalIncludeDirectories) + + + + + + +- 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;%(AdditionalDependencies) + + + +@@ -248,14 +248,14 @@ + X64 + + +- $(opensslDir)\inc64;%(AdditionalIncludeDirectories) ++ $(SOLARVERSION)\$(INPATH)\inc\external;%(AdditionalIncludeDirectories) + + + + + + +- 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;%(AdditionalDependencies) + MachineX64 + + +diff -ru python3.old_/setup.py python3/setup.py +--- python3.old_/setup.py 2012-09-29 10:00:50.000000000 +0200 ++++ python3/setup.py 2012-11-13 14:18:23.484158149 +0100 +@@ -757,7 +757,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/' + ] +@@ -769,8 +774,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/' + ] ) + -- cgit v1.2.3