diff options
Diffstat (limited to 'python3/python-3.3.0-ssl.patch.1')
-rw-r--r-- | python3/python-3.3.0-ssl.patch.1 | 162 |
1 files changed, 0 insertions, 162 deletions
diff --git a/python3/python-3.3.0-ssl.patch.1 b/python3/python-3.3.0-ssl.patch.1 index d5777dfc3252..b85fe076fff8 100644 --- a/python3/python-3.3.0-ssl.patch.1 +++ b/python3/python-3.3.0-ssl.patch.1 @@ -24,168 +24,6 @@ diff -ru python3.old_/Modules/Setup.dist python3/Modules/Setup.dist # 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 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc32" -+ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -56,7 +56,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib" - /> - <Tool - Name="VCALinkTool" -@@ -104,7 +104,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc64" -+ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -118,7 +118,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib" - /> - <Tool - Name="VCALinkTool" -@@ -166,7 +166,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc32" -+ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -180,7 +180,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib" - /> - <Tool - Name="VCALinkTool" -@@ -229,7 +229,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc64" -+ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -243,7 +243,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib" - /> - <Tool - Name="VCALinkTool" -@@ -291,7 +291,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc32" -+ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -305,7 +305,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib" - /> - <Tool - Name="VCALinkTool" -@@ -354,7 +354,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc64" -+ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -368,7 +368,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib" - TargetMachine="17" - /> - <Tool -@@ -417,7 +417,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc32" -+ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -431,7 +431,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib" - /> - <Tool - Name="VCALinkTool" -@@ -480,7 +480,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc64" -+ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -494,7 +494,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib" - TargetMachine="17" - /> - <Tool diff -ru python3.old_/PCbuild/pcbuild.sln python3/PCbuild/pcbuild.sln --- python3.old_/PCbuild/pcbuild.sln 2012-09-29 10:00:48.000000000 +0200 +++ python3/PCbuild/pcbuild.sln 2012-11-13 14:50:39.220142472 +0100 |