Replay changeset 70248:c714e2f92f63 from fubar branch. Original commit

message:

Cross-port changes for 2.6.7rc2 from the Subversion branch.

Include/patchlevel.h

@@ -24,10 +24,10 @@
 #define PY_MINOR_VERSION	6
 #define PY_MICRO_VERSION	7
 #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      	"2.6.7rc1"
+#define PY_VERSION      	"2.6.7rc2"
 /*--end constants--*/
 
 /* Subversion Revision number of this file (not of the repository) */

Lib/distutils/__init__.py

@@ -22,5 +22,5 @@ __revision__ = "$Id$"
 #
 
 #--start constants--
-__version__ = "2.6.7rc1"
+__version__ = "2.6.7rc2"
 #--end constants--

Lib/idlelib/idlever.py

-IDLE_VERSION = "2.6.7rc1"
+IDLE_VERSION = "2.6.7rc2"

Misc/NEWS

@@ -4,6 +4,25 @@ Python News
 
 (editors: check NEWS.help for information about editing NEWS using ReST.)
 
+What's New in Python 2.6.7 rc 2?
+================================
+
+*Release date: 2011-05-20*
+
+*NOTE: Python 2.6 is in security-fix-only mode.  No non-security bug fixes are
+ allowed.  Python 2.6.7 and beyond will be source only releases.*
+
+
+Library
+-------
+
+- Issue #11662: Make urllib and urllib2 ignore redirections if the
+  scheme is not HTTP, HTTPS or FTP (CVE-2011-1521).
+
+- Issue #11442: Add a charset parameter to the Content-type in SimpleHTTPServer
+  to avoid XSS attacks.
+
+
 What's New in Python 2.6.7 rc 1?
 ================================
 

Misc/RPM/python-2.6.spec

@@ -39,7 +39,7 @@
 
 %define name python
 #--start constants--
-%define version 2.6.7rc1
+%define version 2.6.7rc2
 %define libver 2.6
 #--end constants--
 %define release 1pydotorg

README

-This is Python version 2.6.7rc1
+This is Python version 2.6.7rc2
 ===============================
 
 Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011