[Python-checkins] cpython (3.1): bump to 3.1.5rc2

[benjamin.peterson]

http://hg.python.org/cpython/rev/9346bc8d0a51
changeset:   75706:9346bc8d0a51
branch:      3.1
parent:      75199:df3b2b5db900
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Mar 15 13:57:27 2012 -0500
summary:
  bump to 3.1.5rc2

files:
  Include/patchlevel.h      |  4 ++--
  Lib/distutils/__init__.py |  2 +-
  Lib/idlelib/idlever.py    |  2 +-
  Misc/NEWS                 |  5 +++++
  Misc/RPM/python-3.1.spec  |  2 +-
  5 files changed, 10 insertions(+), 5 deletions(-)


diff --git a/Include/patchlevel.h b/Include/patchlevel.h
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -20,10 +20,10 @@
 #define PY_MINOR_VERSION	1
 #define PY_MICRO_VERSION	5
 #define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_GAMMA
-#define PY_RELEASE_SERIAL	1
+#define PY_RELEASE_SERIAL	2
 
 /* Version as a string */
-#define PY_VERSION      	"3.1.5rc1"
+#define PY_VERSION      	"3.1.5rc2"
 /*--end constants--*/
 
 /* Subversion Revision number of this file (not of the repository). Empty
diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py
--- a/Lib/distutils/__init__.py
+++ b/Lib/distutils/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.1.5rc1"
+__version__ = "3.1.5rc2"
 #--end constants--
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1,1 +1,1 @@
-IDLE_VERSION = "3.1.5rc1"
+IDLE_VERSION = "3.1.5rc2"
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -18,6 +18,11 @@
 Library
 -------
 
+- Issue #14234: CVE-2012-0876: Randomize hashes of xml attributes in the hash
+  table internal to the pyexpat module's copy of the expat library to avoid a
+  denial of service due to hash collisions.  Patch by David Malcolm with some
+  modifications by the expat project.
+
 - Issue #14001: CVE-2012-0845: xmlrpc: Fix an endless loop in
   SimpleXMLRPCServer upon malformed POST request.
 
diff --git a/Misc/RPM/python-3.1.spec b/Misc/RPM/python-3.1.spec
--- a/Misc/RPM/python-3.1.spec
+++ b/Misc/RPM/python-3.1.spec
@@ -34,7 +34,7 @@
 
 %define name python
 #--start constants--
-%define version 3.1.5rc1
+%define version 3.1.5rc2
 %define libvers 3.1
 #--end constants--
 %define release 1pydotorg

-- 
Repository URL: http://hg.python.org/cpython