From ba98788bc545232a0e1b9458179253cf120176f6 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 15 Mar 2012 13:57:27 -0500
Subject: [PATCH] bump to 3.1.5rc2

---
 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
index 9fc6e97691d..ac162ab1afe 100644
--- 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 0e427624b80..6ab16625707 100644
--- 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 049da68871c..09d42d408f0 100644
--- 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 07b981c66a5..935b0672c54 100644
--- 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 c89c1da8a50..235da2dfe03 100644
--- 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