[Python-checkins] r43184 - in python/trunk: PCbuild/_ssl.mak PCbuild/readme.txt Tools/buildbot/external.bat

[martin.v.loewis]

Author: martin.v.loewis
Date: Tue Mar 21 13:08:39 2006
New Revision: 43184

Modified:
   python/trunk/PCbuild/_ssl.mak
   python/trunk/PCbuild/readme.txt
   python/trunk/Tools/buildbot/external.bat
Log:
Update to OpenSSL 0.9.8a

Modified: python/trunk/PCbuild/_ssl.mak
==============================================================================
--- python/trunk/PCbuild/_ssl.mak	(original)
+++ python/trunk/PCbuild/_ssl.mak	Tue Mar 21 13:08:39 2006
@@ -12,7 +12,7 @@
 !ENDIF
 
 INCLUDES=-I ../Include -I ../PC -I $(SSL_DIR)/inc32
-LIBS=gdi32.lib wsock32.lib /libpath:$(SSL_LIB_DIR) libeay32.lib ssleay32.lib
+LIBS=gdi32.lib wsock32.lib user32.lib advapi32.lib /libpath:$(SSL_LIB_DIR) libeay32.lib ssleay32.lib
 
 SOURCE=../Modules/_ssl.c $(SSL_LIB_DIR)/libeay32.lib $(SSL_LIB_DIR)/ssleay32.lib
 

Modified: python/trunk/PCbuild/readme.txt
==============================================================================
--- python/trunk/PCbuild/readme.txt	(original)
+++ python/trunk/PCbuild/readme.txt	Tue Mar 21 13:08:39 2006
@@ -227,19 +227,11 @@
 _ssl
     Python wrapper for the secure sockets library.
 
-    Get the latest source code for OpenSSL from
-        http://www.openssl.org
+    Get the source code through
 
-    You (probably) don't want the "engine" code.  For example, get
-        openssl-0.9.7d.tar.gz
-    not
-        openssl-engine-0.9.7d.tar.gz
-
-    (see #1233049 for using 0.9.8).
-    Unpack into the "dist" directory, retaining the folder name from
-    the archive - for example, the latest stable OpenSSL will install as
-        dist/openssl-0.9.7d
+    svn export http://svn.python.org/projects/external/openssl-0.9.8a
 
+    Alternatively, get the latest version from http://www.openssl.org.
     You can (theoretically) use any version of OpenSSL you like - the
     build process will automatically select the latest version.
 

Modified: python/trunk/Tools/buildbot/external.bat
==============================================================================
--- python/trunk/Tools/buildbot/external.bat	(original)
+++ python/trunk/Tools/buildbot/external.bat	Tue Mar 21 13:08:39 2006
@@ -12,3 +12,6 @@
 if not exist db-4.4.20\build_win32\debug\libdb44sd.lib (
    devenv db-4.4.20\build_win32\Berkeley_DB.sln /build Debug /project db_static
 )
+
+ at rem OpenSSL
+if not exist openssl-0.9.8a svn export http://svn.python.org/projects/external/openssl-0.9.8a