Upgrade bzip2 to 1.0.6.

loewis · loewis · commit ecc5877f5af6 · 2012-05-14T13:52:03.000+02:00
diff --git a/PC/VC6/bz2.dsp b/PC/VC6/bz2.dsp
diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt
@@ -120,14 +120,14 @@ bz2
     Download the source from the python.org copy into the dist
     directory:
 
-    svn export http://svn.python.org/projects/external/bzip2-1.0.5
+    svn export http://svn.python.org/projects/external/bzip2-1.0.6
 
     And requires building bz2 first.
 
-    cd dist\bzip2-1.0.5
+    cd dist\bzip2-1.0.6
     nmake -f makefile.msc
 
-    All of this managed to build bzip2-1.0.5\libbz2.lib, which the Python
+    All of this managed to build bzip2-1.0.6\libbz2.lib, which the Python
     project links in.
 
 
diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops
@@ -54,7 +54,7 @@
 	/>
 	<UserMacro
 		Name="bz2Dir"
-		Value="$(externalsDir)\bzip2-1.0.5"
+		Value="$(externalsDir)\bzip2-1.0.6"
 	/>
 	<UserMacro
 		Name="opensslDir"
diff --git a/PC/VS9.0/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops
@@ -54,7 +54,7 @@
 	/>
 	<UserMacro
 		Name="bz2Dir"
-		Value="$(externalsDir)\bzip2-1.0.5"
+		Value="$(externalsDir)\bzip2-1.0.6"
 	/>
 	<UserMacro
 		Name="lzmaDir"
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
@@ -5,7 +5,7 @@
     <PythonExe>$(SolutionDir)\python.exe</PythonExe>
     <externalsDir>..\..</externalsDir>
     <sqlite3Dir>$(externalsDir)\sqlite-3.7.4</sqlite3Dir>
-    <bz2Dir>$(externalsDir)\bzip2-1.0.5</bz2Dir>
+    <bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir>
     <lzmaDir>$(externalsDir)\xz-5.0.3</lzmaDir>
     <opensslDir>$(externalsDir)\openssl-1.0.0a</opensslDir>
     <tcltkDir>$(externalsDir)\tcltk</tcltkDir>
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
@@ -121,21 +121,21 @@ _bz2
     Download the source from the python.org copy into the dist
     directory:
 
-    svn export http://svn.python.org/projects/external/bzip2-1.0.5
+    svn export http://svn.python.org/projects/external/bzip2-1.0.6
 
     ** NOTE: if you use the Tools\buildbot\external(-amd64).bat approach for
     obtaining external sources then you don't need to manually get the source
     above via subversion. **
 
     A custom pre-link step in the bz2 project settings should manage to
-    build bzip2-1.0.5\libbz2.lib by magic before bz2.pyd (or bz2_d.pyd) is
+    build bzip2-1.0.6\libbz2.lib by magic before bz2.pyd (or bz2_d.pyd) is
     linked in PCbuild\.
     However, the bz2 project is not smart enough to remove anything under
-    bzip2-1.0.5\ when you do a clean, so if you want to rebuild bzip2.lib
-    you need to clean up bzip2-1.0.5\ by hand.
+    bzip2-1.0.6\ when you do a clean, so if you want to rebuild bzip2.lib
+    you need to clean up bzip2-1.0.6\ by hand.
 
     All of this managed to build libbz2.lib in 
-    bzip2-1.0.5\$platform-$configuration\, which the Python project links in.
+    bzip2-1.0.6\$platform-$configuration\, which the Python project links in.
 _lzma
     Python wrapper for the liblzma compression library.
 
diff --git a/README b/README
@@ -15,6 +15,8 @@ Build Instructions
 
 On Unix, Linux, BSD, OSX, and Cygwin:
 
+New text
+
     ./configure
     make
     make test
diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
@@ -4,7 +4,7 @@
 cd ..
 @rem XXX: If you need to force the buildbots to start from a fresh environment, uncomment
 @rem the following, check it in, then check it out, comment it out, then check it back in.
-@rem if exist bzip2-1.0.5 rd /s/q bzip2-1.0.5
+@rem if exist bzip2-1.0.6 rd /s/q bzip2-1.0.6
 @rem if exist tcltk rd /s/q tcltk
 @rem if exist tcltk64 rd /s/q tcltk64
 @rem if exist tcl8.4.12 rd /s/q tcl8.4.12
@@ -18,9 +18,9 @@ cd ..
 @rem if exist sqlite-3.7.4 rd /s/q sqlite-3.7.4    
 
 @rem bzip
-if not exist bzip2-1.0.5 (
-   rd /s/q bzip2-1.0.3
-  svn export http://svn.python.org/projects/external/bzip2-1.0.5
+if not exist bzip2-1.0.6 (
+   rd /s/q bzip2-1.0.5
+  svn export http://svn.python.org/projects/external/bzip2-1.0.6
 )
 
 @rem Sleepycat db
