diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-03-15 18:57:27 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-03-15 18:57:27 (GMT) |
| commit | ba98788bc545232a0e1b9458179253cf120176f6 (patch) | |
| tree | c51180f1ade157142291bf77cad2515ec4c282a2 | |
| parent | 273cd1812a7c8646b52aa3afee1c5db5a0e539d6 (diff) | |
| download | cpython-ba98788bc545232a0e1b9458179253cf120176f6.zip cpython-ba98788bc545232a0e1b9458179253cf120176f6.tar.gz cpython-ba98788bc545232a0e1b9458179253cf120176f6.tar.bz2 | |
bump to 3.1.5rc2
| -rw-r--r-- | Include/patchlevel.h | 4 | ||||
| -rw-r--r-- | Lib/distutils/__init__.py | 2 | ||||
| -rw-r--r-- | Lib/idlelib/idlever.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 5 | ||||
| -rw-r--r-- | 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 9fc6e97..ac162ab 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 0e42762..6ab1662 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 049da68..09d42d4 100644 --- a/Lib/idlelib/idlever.py +++ b/Lib/idlelib/idlever.py @@ -1 +1 @@ -IDLE_VERSION = "3.1.5rc1" +IDLE_VERSION = "3.1.5rc2" @@ -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 c89c1da..235da2d 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 |