Replay changeset 70238:03e488b5c009 from fubar branch. Original commit

message:

Reconcile with the 2.6svn branch.  The 2.6.7 release will be made from
Subversion, but there were differences, so this brings them in sync.  These
changes should *not* propagate to any newer versions.

2 files changed, 17 insertions, 8 deletions

diff --git a/Misc/NEWS b/Misc/NEWS
index b5be9f2..980de3c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -4,10 +4,10 @@ Python News
 
 (editors: check NEWS.help for information about editing NEWS using ReST.)
 
-What's New in Python 2.6.7?
-===========================
+What's New in Python 2.6.7 rc 1?
+================================
 
-*Release date: XXXX-XX-XX*
+*Release date: 2011-05-06*
 
 *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.*
@@ -19,11 +19,20 @@ Core and Builtins
 Library
 -------
 
-- Issue #11442: Add a charset parameter to the Content-type in SimpleHTTPServer
-  to avoid XSS attacks.
+- Issue #9129: smtpd.py is vulnerable to DoS attacks deriving from missing
+  error handling when accepting a new connection.
+
+
+What's New in Python 2.6.6?
+===========================
+
+*Release date: 2010-08-24*
 
-- Issue #11662: Make urllib and urllib2 ignore redirections if the
-  scheme is not HTTP, HTTPS or FTP (CVE-2011-1521).
+Core and Builtins
+-----------------
+
+Library
+-------
 
 
 What's New in Python 2.6.6 rc 2?
diff --git a/Misc/RPM/python-2.6.spec b/Misc/RPM/python-2.6.spec
index be88719..d5873b4 100644
--- a/Misc/RPM/python-2.6.spec
+++ b/Misc/RPM/python-2.6.spec
@@ -39,7 +39,7 @@
 
 %define name python
 #--start constants--
-%define version 2.6.6
+%define version 2.6.7rc1
 %define libver 2.6
 #--end constants--
 %define release 1pydotorg