Recorded rollback of revisions 84902 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

Misc/NEWS

@@ -334,8 +334,6 @@ Build
 
 - Issue #1633863: Don't ignore $CC under AIX.
 
-- Issue #9552: Avoid unnecessary rebuild of OpenSSL. (Windows)
-
 - Issue #9810: Compile bzip2 source files in python's project file
   directly. It used to be built with bzip2's makefile.
 

PC/VC6/build_ssl.py

@@ -173,12 +173,12 @@ def main():
             #    os.system("perl util\mk1mf.pl debug "+configure+" >"+makefile)
 
             fix_makefile(makefile)
-            shutil.copy2(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
-            shutil.copy2(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
+            shutil.copy(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
+            shutil.copy(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
 
         # Now run make.
-        shutil.copy2(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
-        shutil.copy2(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
+        shutil.copy(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
+        shutil.copy(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
 
         #makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile)
         makeCommand = "nmake /nologo -f \"%s\"" % makefile

PC/VS8.0/build_ssl.py

@@ -220,8 +220,8 @@ def main():
             if arch == "amd64":
                 create_makefile64(makefile, m32)
             fix_makefile(makefile)
-            shutil.copy2(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
-            shutil.copy2(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
+            shutil.copy(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
+            shutil.copy(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
 
         # Now run make.
         if arch == "amd64":
@@ -230,8 +230,8 @@ def main():
                 print("ml64 assembler has failed.")
                 sys.exit(rc)
 
-        shutil.copy2(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
-        shutil.copy2(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
+        shutil.copy(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
+        shutil.copy(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
 
         #makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile)
         makeCommand = "nmake /nologo -f \"%s\"" % makefile

PCbuild/build_ssl.py

@@ -226,8 +226,8 @@ def main():
             if arch == "amd64":
                 create_makefile64(makefile, m32)
             fix_makefile(makefile)
-            shutil.copy2(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
-            shutil.copy2(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
+            shutil.copy(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
+            shutil.copy(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
 
         # Now run make.
         if arch == "amd64":
@@ -236,8 +236,8 @@ def main():
                 print("ml64 assembler has failed.")
                 sys.exit(rc)
 
-        shutil.copy2(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
-        shutil.copy2(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
+        shutil.copy(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
+        shutil.copy(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
 
         #makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile)
         makeCommand = "nmake /nologo -f \"%s\"" % makefile