bump to 3.1.5rc2

diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 9fc6e97691d3df3876df17541ec139449425e4ef..ac162ab1afe230799e6c57d0b6c58fe43923003f 100644 (file)
--- 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
index 0e427624b80e09591f31446c0b4331c7a2ed6b1a..6ab16625707a280302b613a1d40b205cdea08bfc 100644 (file)
--- a/Lib/distutils/__init__.py
+++ b/Lib/distutils/__init__.py
@@ -15,5 +15,5 @@ __revision__ = "$Id$"
 # 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
index 049da68871c9eae8186ba896fd1a43141fb077a7..09d42d408f09760e76302eaf03be40edeafbb486 100644 (file)
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1 +1 @@
-IDLE_VERSION = "3.1.5rc1"
+IDLE_VERSION = "3.1.5rc2"

diff --git a/Misc/NEWS b/Misc/NEWS
index 07b981c66a57659bb3e1bf96e5f3b21ffe59c3e0..935b0672c541e3f4b0e0d1bfb7aa17b3693c74c1 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -18,6 +18,11 @@ Core and Builtins
 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
index c89c1da8a501938b45ecab9ff36b84b0c4b30ae7..235da2dfe038c5c411c416b825c8ddcb9eaf8425 100644 (file)
--- 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