- Update to python 2.5.4 and python 2.6.1

Reviewed by:	perky | lwhsu
Tested with:	exp-run via pav

32 files changed, 75 insertions, 948 deletions

diff --git a/Mk/bsd.python.mk b/Mk/bsd.python.mk
index 6878a2988dcb..1d12df59ffe3 100644
--- a/Mk/bsd.python.mk
+++ b/Mk/bsd.python.mk
@@ -383,17 +383,17 @@ PYTHON_VER=			3.0
 
 # Python-2.6
 .elif ${PYTHON_VERSION} == "python2.6"
-PYTHON_PORTVERSION?=2.6
+PYTHON_PORTVERSION?=2.6.1
 PYTHON_PORTSDIR=	${PORTSDIR}/lang/python26
-PYTHON_REL=			260
+PYTHON_REL=			261
 PYTHON_SUFFIX=		26
 PYTHON_VER=			2.6
 
 # Python-2.5
 .elif ${PYTHON_VERSION} == "python2.5"
-PYTHON_PORTVERSION?=2.5.2
+PYTHON_PORTVERSION?=2.5.4
 PYTHON_PORTSDIR=	${PORTSDIR}/lang/python25
-PYTHON_REL=			252
+PYTHON_REL=			254
 PYTHON_SUFFIX=		25
 PYTHON_VER=			2.5
 
diff --git a/lang/python-doc-html/distinfo b/lang/python-doc-html/distinfo
index a899816eb8f4..526b34612d06 100644
--- a/lang/python-doc-html/distinfo
+++ b/lang/python-doc-html/distinfo
@@ -20,6 +20,7 @@ MD5 (python/html-2.4.4.tar.bz2) = 21259033b5663533ed64b4592c6925e2
 MD5 (python/html-2.4.tar.bz2) = 10cca09fcdf1b5ad269bc9edb652d76f
 MD5 (python/html-2.5.1.tar.bz2) = 74e14b4713a1a43adebdcfe0191c20c8
 MD5 (python/html-2.5.2.tar.bz2) = b264d979f7b3e4c0243bec3a039a6464
+MD5 (python/html-2.5.4.tar.bz2) = b4041ec1faf9b6070aad451eeb5ab487
 MD5 (python/html-2.5.tar.bz2) = 3badfa2d460f52b7f9face12abdb2e91
 MD5 (python/pdf-a4-2.0.1.tar.bz2) = fec4b5bcc4161bc82d1a4564fe71409a
 MD5 (python/pdf-a4-2.0.tar.bz2) = f11c5347eed19ffd012fddf1faa9ab22
@@ -42,6 +43,7 @@ MD5 (python/pdf-a4-2.4.4.tar.bz2) = 2b43ac2c9948af26af61c792397bc3fb
 MD5 (python/pdf-a4-2.4.tar.bz2) = 8f6b0a891dbff04f3b6ab07d9f8f6df6
 MD5 (python/pdf-a4-2.5.1.tar.bz2) = ade64ff41d24983ad2ea837525f5399a
 MD5 (python/pdf-a4-2.5.2.tar.bz2) = 1c8bfb593b251a8543488e5c6e339aeb
+MD5 (python/pdf-a4-2.5.4.tar.bz2) = 1693b22aa19e25e0fff8799ac5753f71
 MD5 (python/pdf-a4-2.5.tar.bz2) = 9cc4e5a2992fb7be2373c3e03c765536
 MD5 (python/pdf-letter-2.0.1.tar.bz2) = c31282a516b5b49b83cb7df3d3f23cb7
 MD5 (python/pdf-letter-2.0.tar.bz2) = a0ae00f0e995ad912714ce15ff0ff401
@@ -65,6 +67,7 @@ MD5 (python/pdf-letter-2.4.tar.bz2) = 46e9741fa8d42c813d02f2d7c3342c55
 MD5 (python/pdf-letter-2.5.1.tar.bz2) = bb77cbbf217dfe93fcbecd7256be33a3
 MD5 (python/pdf-letter-2.5.2.tar.bz2) = 7781a2ad470e45c1ad24294a8fe9d8c5
 MD5 (python/pdf-letter-2.5.tar.bz2) = e58eef4dcf9384ef7ee105068f7bc26e
+MD5 (python/pdf-letter-2.5.4.tar.bz2) = 5934d687fbb950a3f0a25b2c2b4fbb33
 MD5 (python/postscript-a4-2.0.1.tar.bz2) = ef7b98c07ed7da1e91f2963c38a03b5c
 MD5 (python/postscript-a4-2.0.tar.bz2) = f9c6d47319cd2bb87df678e9fa429d72
 MD5 (python/postscript-a4-2.1.1.tar.bz2) = bf4b7b5fd221c763744015869eee0a1f
@@ -86,6 +89,7 @@ MD5 (python/postscript-a4-2.4.4.tar.bz2) = 8680d3d6043a0dd3d6683e2fb727c2ab
 MD5 (python/postscript-a4-2.4.tar.bz2) = 261da37a6faf721846e27e44f3c12f62
 MD5 (python/postscript-a4-2.5.1.tar.bz2) = a3385edf8ca8749959caea9d653bb5e7
 MD5 (python/postscript-a4-2.5.2.tar.bz2) = af74a3dadb9f85cbb34abf8f11d632b1
+MD5 (python/postscript-a4-2.5.4.tar.bz2) = 60ebddd507acbfb52470c36bcca7d3d6
 MD5 (python/postscript-a4-2.5.tar.bz2) = 831964fa3d53b3afe973995d7fcc05b2
 MD5 (python/postscript-letter-2.0.1.tar.bz2) = 13365181bab30ca27c9d7b69c60e0f03
 MD5 (python/postscript-letter-2.0.tar.bz2) = 103f3f67b1f4b47aae90fe68bedbd5f7
@@ -108,6 +112,7 @@ MD5 (python/postscript-letter-2.4.4.tar.bz2) = 3daa1afbaff58db82b22b45efc528ccd
 MD5 (python/postscript-letter-2.4.tar.bz2) = a54ca46c53f0ed8e2f47e94286c7a419
 MD5 (python/postscript-letter-2.5.1.tar.bz2) = c72bd8f549745e75bfdb00b40eb05285
 MD5 (python/postscript-letter-2.5.2.tar.bz2) = 45a86e5aa093d91ab1e8c0757a1ca7d1
+MD5 (python/postscript-letter-2.5.4.tar.bz2) = 77ebec508a9c5eedd75956b060aba2dd
 MD5 (python/postscript-letter-2.5.tar.bz2) = 9f5aaba82f37fce8435c2bcc9886e2bf
 MD5 (python260/python-docs-html.tar.bz2) = cfcd4b9b00ba1e7496b5d823692370a4
 MD5 (python260/python-docs-pdf-a4.tar.bz2) = d5e1fd4e178887d2b42a619da15bfcbd
@@ -134,6 +139,7 @@ SHA256 (python/html-2.4.4.tar.bz2) = 6b1a6f1be187b1d0cab69ab7c8c436409468232d376
 SHA256 (python/html-2.4.tar.bz2) = 667d51b683549e708e271573e825d09e6db6a0d4bd97d31ddcad23b52cf1ee36
 SHA256 (python/html-2.5.1.tar.bz2) = 359e820e3af09dc90adddd4b27e18da9664120610cac486681fbb3c8f8240b9c
 SHA256 (python/html-2.5.2.tar.bz2) = b9a8980298b0f62d729c62471acf470f8ba3ea32e7b186a78294e0a7bfe7777a
+SHA256 (python/html-2.5.4.tar.bz2) = b73eaeaf0400e64d9bb223cfb0d09a935e8044f0ba485e5bc549b003e6df8325
 SHA256 (python/html-2.5.tar.bz2) = 52a473258528bec3617da8cfd9188e8b7b2833ade61d705058ee5b0adef64a5b
 SHA256 (python/pdf-a4-2.0.1.tar.bz2) = a938337ae963e3b4bfe667380a67dbf50cc4d07701dfcb6fbf33a996f7d79c0e
 SHA256 (python/pdf-a4-2.0.tar.bz2) = 829f90149931b8f198378f2dc9df2a3e2bcd02f6a8a67a05add9bf1c5f7079a2
@@ -157,6 +163,7 @@ SHA256 (python/pdf-a4-2.4.tar.bz2) = 40d7fb2618d3a88cbe353fd9ce7ce04b30fc76c85da
 SHA256 (python/pdf-a4-2.5.1.tar.bz2) = caddfc8988d837cdd58e519da5f8b0c29263e85554f6108d9fde1677612dcd22
 SHA256 (python/pdf-a4-2.5.2.tar.bz2) = 4df6cc7b6eb49aa4f6121e932cc1b98625f9fd9a1782a1d7ca86cd662d491908
 SHA256 (python/pdf-a4-2.5.tar.bz2) = ac591b0d29276de9bf98c4d1240ac57c5ec55bb5e8bbf62b2888343a8eb1b111
+SHA256 (python/pdf-a4-2.5.4.tar.bz2) = e37d6b97fead271a281859a16c9c0b83994f491b7ef3c71f1a09db703e2f7c17
 SHA256 (python/pdf-letter-2.0.1.tar.bz2) = e29269a80b77fe8b65d759620dba3445bb67597ede477f6e5904062456a4baed
 SHA256 (python/pdf-letter-2.0.tar.bz2) = 278a6b52c7b970fe54eb47bc5bb2dd56ef86225aa5d0dcdc43c65a335c7e426e
 SHA256 (python/pdf-letter-2.1.1.tar.bz2) = 81222730e52a2ee0ff0606a4b56f03ef81a6906ce1839966f89679475e77dcf2
@@ -178,6 +185,7 @@ SHA256 (python/pdf-letter-2.4.4.tar.bz2) = 8ee0df31d5090b2c0a895854ec0700c49cc50
 SHA256 (python/pdf-letter-2.4.tar.bz2) = e87c19834c20d8adb0b9ac90810d6c3d405e47bc075241fe17d19790c19de3aa
 SHA256 (python/pdf-letter-2.5.1.tar.bz2) = 34cedf5ec3ca21b8e105adad07429e7c6dee49c4c17e7d1466655980b88ee906
 SHA256 (python/pdf-letter-2.5.2.tar.bz2) = b967e640390888cc5563f22446de640a6d0a8f4dffa4210ae94f935c6784b5b8
+SHA256 (python/pdf-letter-2.5.4.tar.bz2) = a5e5737d658ddcd7545da9695fd5e2ab7c8819041ebe31992bf1d1f4f0d44ee0
 SHA256 (python/pdf-letter-2.5.tar.bz2) = d7be3abd1ad5efc62ca0d7ace9165605e6f955b819d33082c73306871f3d8576
 SHA256 (python/postscript-a4-2.0.1.tar.bz2) = 9a02e5812d81a9af10f159c463a55c36b2dea77808a5410859a33109dbea7da7
 SHA256 (python/postscript-a4-2.0.tar.bz2) = 2d721139e00d745ffc373dbabd99c310d45945a043ccfff9abd38edcbcc7fd34
@@ -200,6 +208,7 @@ SHA256 (python/postscript-a4-2.4.4.tar.bz2) = ec1a4c256f733e0b5917bb5c951b042f39
 SHA256 (python/postscript-a4-2.4.tar.bz2) = 4530dee0c06486d6c13f19dbf05b8d01e7bb47faaf9855c44916d2e9e992e50f
 SHA256 (python/postscript-a4-2.5.1.tar.bz2) = b00cad86c2da60c05866a23c60f071988ead370b416211c06d50f66b303a7787
 SHA256 (python/postscript-a4-2.5.2.tar.bz2) = 32d8287f5cc4a936c7f95e9edef654320a229b4ebebea852c2401c5638950913
+SHA256 (python/postscript-a4-2.5.4.tar.bz2) = 89a1033e7f6794d7a26da3d8abab9b2a6dc0b7435f75e8755c0dd91b0eb1e877
 SHA256 (python/postscript-a4-2.5.tar.bz2) = 6654fbce933aa2e47b94c5faf75e69036510a10f0e0fbd35108361a130103ab8
 SHA256 (python/postscript-letter-2.0.1.tar.bz2) = 871bc7ed57b6dfb9b2f844fe6150204399dda73ebcafc47df4bbeb75b81fb9be
 SHA256 (python/postscript-letter-2.0.tar.bz2) = a5d46c151f2a299a208edb13ce362b4dd0f49af7e53beabe01167dcf97914c60
@@ -222,6 +231,7 @@ SHA256 (python/postscript-letter-2.4.4.tar.bz2) = 3f93c91d217ac8d90d4873dd0a62c4
 SHA256 (python/postscript-letter-2.4.tar.bz2) = d9e89330107bb77e29e9e938b71b8f1ec1ac7e73021c1d284a8def95acb5c7f3
 SHA256 (python/postscript-letter-2.5.1.tar.bz2) = 10f4f80dd2f3ca0844f62faa2eaba3aac02690382abbe9996f43b49c6c4e601f
 SHA256 (python/postscript-letter-2.5.2.tar.bz2) = 00c96f06647904c5920ca6ff62f616732a05de1a216b5bed4bb99b1c8f59d6bd
+SHA256 (python/postscript-letter-2.5.4.tar.bz2) = 415b1c7d3b3ca03f7526b8436c0710b56c5c108278508d3270c6162941d8866f
 SHA256 (python/postscript-letter-2.5.tar.bz2) = c2be9ac9cca88cebb2f48b4cc467f6d46a10997b2ad651c2047bf7cccf2ff656
 SHA256 (python260/python-docs-html.tar.bz2) = e9c39e51fc19c6ec367f41cd47c0831bc1e4f4c6d615dccfd37337cd7843ae0a
 SHA256 (python260/python-docs-pdf-a4.tar.bz2) = efddc99e33933c6ca898551db9252592fd0a3f18904f53a5b0c0d41d4de393a4
@@ -248,6 +258,7 @@ SIZE (python/html-2.4.4.tar.bz2) = 1398442
 SIZE (python/html-2.4.tar.bz2) = 1390125
 SIZE (python/html-2.5.1.tar.bz2) = 1626532
 SIZE (python/html-2.5.2.tar.bz2) = 1627893
+SIZE (python/html-2.5.4.tar.bz2) = 1619772
 SIZE (python/html-2.5.tar.bz2) = 1562256
 SIZE (python/pdf-a4-2.0.1.tar.bz2) = 2297342
 SIZE (python/pdf-a4-2.0.tar.bz2) = 2254712
@@ -292,6 +303,7 @@ SIZE (python/pdf-letter-2.4.4.tar.bz2) = 5368031
 SIZE (python/pdf-letter-2.4.tar.bz2) = 4226357
 SIZE (python/pdf-letter-2.5.1.tar.bz2) = 5604432
 SIZE (python/pdf-letter-2.5.2.tar.bz2) = 5469414
+SIZE (python/pdf-letter-2.5.4.tar.bz2) = 5469863
 SIZE (python/pdf-letter-2.5.tar.bz2) = 5547378
 SIZE (python/postscript-a4-2.0.1.tar.bz2) = 994104
 SIZE (python/postscript-a4-2.0.tar.bz2) = 977851
@@ -315,6 +327,7 @@ SIZE (python/postscript-a4-2.4.tar.bz2) = 1699997
 SIZE (python/postscript-a4-2.5.1.tar.bz2) = 1845800
 SIZE (python/postscript-a4-2.5.2.tar.bz2) = 1846237
 SIZE (python/postscript-a4-2.5.tar.bz2) = 1816570
+SIZE (python/postscript-a4-2.5.4.tar.bz2) = 1839783
 SIZE (python/postscript-letter-2.0.1.tar.bz2) = 941017
 SIZE (python/postscript-letter-2.0.tar.bz2) = 923261
 SIZE (python/postscript-letter-2.1.1.tar.bz2) = 1001707
@@ -336,6 +349,7 @@ SIZE (python/postscript-letter-2.4.4.tar.bz2) = 1695892
 SIZE (python/postscript-letter-2.4.tar.bz2) = 1693474
 SIZE (python/postscript-letter-2.5.1.tar.bz2) = 1839274
 SIZE (python/postscript-letter-2.5.2.tar.bz2) = 1839992
+SIZE (python/postscript-letter-2.5.4.tar.bz2) = 1835077
 SIZE (python/postscript-letter-2.5.tar.bz2) = 1813655
 SIZE (python260/python-docs-html.tar.bz2) = 3445776
 SIZE (python260/python-docs-pdf-a4.tar.bz2) = 8804548
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index fa6cd7bd7061..e1eb669a81f8 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	python25
-PORTVERSION=	2.5.2
-PORTREVISION=	3
+PORTVERSION=	2.5.4
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -86,7 +85,7 @@ CONFIGURE_ARGS+=	--enable-unicode=ucs4
 .endif
 
 .if defined(WITHOUT_PYMALLOC)
-CONFIGURE_ARGS+=        --without-pymalloc
+CONFIGURE_ARGS+=	--without-pymalloc
 .endif
 
 .if ${ARCH} == i386
@@ -95,12 +94,12 @@ PLIST_SUB+=	X86_ONLY=""
 PLIST_SUB+=	X86_ONLY="@comment "
 .endif
 .if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 || ${ARCH} == alpha
-PLIST_SUB+=     32BIT_ONLY="@comment "
+PLIST_SUB+=	32BIT_ONLY="@comment "
 .else
-PLIST_SUB+=     32BIT_ONLY=""
+PLIST_SUB+=	32BIT_ONLY=""
 .endif
 .if ${ARCH} == sparc64
-CFLAGS+=        -DPYTHON_DEFAULT_RECURSION_LIMIT=900
+CFLAGS+=	-DPYTHON_DEFAULT_RECURSION_LIMIT=900
 .endif
 
 .if !exists(/usr/bin/ypcat) # the world with NO_NIS
@@ -110,13 +109,13 @@ PLIST_SUB+=	NO_NIS=""
 .endif
 
 .if !defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+= --enable-ipv6
+CONFIGURE_ARGS+=	--enable-ipv6
 .else
-CONFIGURE_ARGS+= --disable-ipv6
+CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
 .if defined(WITH_FPECTL)
-CONFIGURE_ARGS+= --with-fpectl
+CONFIGURE_ARGS+=	--with-fpectl
 .endif
 
 pre-patch:
diff --git a/lang/python25/distinfo b/lang/python25/distinfo
index 855d2a1ab8b5..72e9696230a6 100644
--- a/lang/python25/distinfo
+++ b/lang/python25/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/Python-2.5.2.tgz) = 3f7ca8aa86c6bd275426d63b46e07992
-SHA256 (python/Python-2.5.2.tgz) = 834afe8a88adaf623b05ac5dd6700dd5bb5d0d5553fc74ad529359a3496e4ae3
-SIZE (python/Python-2.5.2.tgz) = 11583114
+MD5 (python/Python-2.5.4.tgz) = ad47b23778f64edadaaa8b5534986eed
+SHA256 (python/Python-2.5.4.tgz) = 3d3b205611ee503a38a9433d5645a571668420bb219242c7f51af85f05664da6
+SIZE (python/Python-2.5.4.tgz) = 11604497
diff --git a/lang/python25/files/patch-Lib-test-test_zlib.py b/lang/python25/files/patch-Lib-test-test_zlib.py
index 425572d2574d..e69de29bb2d1 100644
--- a/lang/python25/files/patch-Lib-test-test_zlib.py
+++ b/lang/python25/files/patch-Lib-test-test_zlib.py
@@ -1,14 +0,0 @@
---- Lib/test/test_zlib.py	2008/04/08 23:47:30	62234
-+++ Lib/test/test_zlib.py	2008/04/09 00:25:17	62235
-@@ -83,6 +83,11 @@
-         # verify failure on building decompress object with bad params
-         self.assertRaises(ValueError, zlib.decompressobj, 0)
- 
-+    def test_decompressobj_badflush(self):
-+        # verify failure on calling decompressobj.flush with bad params
-+        self.assertRaises(ValueError, zlib.decompressobj().flush, 0)
-+        self.assertRaises(ValueError, zlib.decompressobj().flush, -1)
-+
- 
- 
- class CompressTestCase(unittest.TestCase):
diff --git a/lang/python25/files/patch-Modules-zlibmodule.c b/lang/python25/files/patch-Modules-zlibmodule.c
index 7875a40ada7c..e69de29bb2d1 100644
--- a/lang/python25/files/patch-Modules-zlibmodule.c
+++ b/lang/python25/files/patch-Modules-zlibmodule.c
@@ -1,13 +0,0 @@
---- Modules/zlibmodule.c.orig	2008-04-25 01:47:26.000000000 +0200
-+++ Modules/zlibmodule.c	2008-04-25 01:48:17.000000000 +0200
-@@ -774,6 +774,10 @@
- 
-     if (!PyArg_ParseTuple(args, "|i:flush", &length))
- 	return NULL;
-+    if (length <= 0) {
-+	PyErr_SetString(PyExc_ValueError, "length must be greater than zero");
-+	return NULL;
-+	}
-     if (!(retval = PyString_FromStringAndSize(NULL, length)))
- 	return NULL;
- 
diff --git a/lang/python25/files/patch-lib-test_test_bigmem.py b/lang/python25/files/patch-lib-test_test_bigmem.py
index 5ec5935a046f..e69de29bb2d1 100644
--- a/lang/python25/files/patch-lib-test_test_bigmem.py
+++ b/lang/python25/files/patch-lib-test_test_bigmem.py
@@ -1,163 +0,0 @@
---- Lib/test/test_bigmem.py.orig	2007-11-30 21:53:17.000000000 +0000
-+++ Lib/test/test_bigmem.py	2008-08-30 10:16:13.000000000 +0100
-@@ -1,5 +1,5 @@
- from test import test_support
--from test.test_support import bigmemtest, _1G, _2G
-+from test.test_support import bigmemtest, _1G, _2G, _4G, precisionbigmemtest
- 
- import unittest
- import operator
-@@ -54,6 +54,22 @@
-         self.assertEquals(s[lpadsize:-rpadsize], SUBSTR)
-         self.assertEquals(s.strip(), SUBSTR.strip())
- 
-+    @precisionbigmemtest(size=_2G - 1, memuse=1)
-+    def test_center_unicode(self, size):
-+        SUBSTR = u' abc def ghi'
-+        try:
-+            s = SUBSTR.center(size)
-+        except OverflowError:
-+            pass # acceptable on 32-bit
-+        else:
-+            self.assertEquals(len(s), size)
-+            lpadsize = rpadsize = (len(s) - len(SUBSTR)) // 2
-+            if len(s) % 2:
-+                lpadsize += 1
-+            self.assertEquals(s[lpadsize:-rpadsize], SUBSTR)
-+            self.assertEquals(s.strip(), SUBSTR.strip())
-+            del s
-+
-     @bigmemtest(minsize=_2G, memuse=2)
-     def test_count(self, size):
-         SUBSTR = ' abc def ghi'
-@@ -70,10 +86,44 @@
-         s = '.' * size
-         self.assertEquals(len(s.decode('utf-8')), size)
- 
-+    def basic_encode_test(self, size, enc, c=u'.', expectedsize=None):
-+        if expectedsize is None:
-+            expectedsize = size
-+
-+        s = c * size
-+        self.assertEquals(len(s.encode(enc)), expectedsize)
-+
-     @bigmemtest(minsize=_2G + 2, memuse=3)
-     def test_encode(self, size):
--        s = u'.' * size
--        self.assertEquals(len(s.encode('utf-8')), size)
-+        return self.basic_encode_test(size, 'utf-8')
-+
-+    @precisionbigmemtest(size=_4G / 6 + 2, memuse=2)
-+    def test_encode_raw_unicode_escape(self, size):
-+        try:
-+            return self.basic_encode_test(size, 'raw_unicode_escape')
-+        except MemoryError:
-+            pass # acceptable on 32-bit
-+
-+    @precisionbigmemtest(size=_4G / 5 + 70, memuse=3)
-+    def test_encode_utf7(self, size):
-+        try:
-+            return self.basic_encode_test(size, 'utf7')
-+        except MemoryError:
-+            pass # acceptable on 32-bit
-+
-+    @precisionbigmemtest(size=_2G-1, memuse=2)
-+    def test_decodeascii(self, size):
-+        return self.basic_encode_test(size, 'ascii', c='A')
-+
-+    @precisionbigmemtest(size=_4G / 5, memuse=6+2)
-+    def test_unicode_repr_oflw(self, size):
-+        try:
-+            s = u"\uAAAA"*size
-+            r = repr(s)
-+        except MemoryError:
-+            pass # acceptable on 32-bit
-+        else:
-+            self.failUnless(s == eval(r))
- 
-     @bigmemtest(minsize=_2G, memuse=2)
-     def test_endswith(self, size):
-@@ -459,6 +509,11 @@
-         self.assertEquals(s.count('\\'), size)
-         self.assertEquals(s.count('0'), size * 2)
- 
-+    @bigmemtest(minsize=2**32 / 5, memuse=6+2)
-+    def test_unicode_repr(self, size):
-+        s = u"\uAAAA" * size
-+        self.failUnless(len(repr(s)) > size)
-+
-     # This test is meaningful even with size < 2G, as long as the
-     # doubled string is > 2G (but it tests more if both are > 2G :)
-     @bigmemtest(minsize=_1G + 2, memuse=3)
-@@ -642,6 +697,35 @@
-     def test_repeat_large(self, size):
-         return self.basic_test_repeat(size)
- 
-+    @bigmemtest(minsize=_1G - 1, memuse=12)
-+    def test_repeat_large_2(self, size):
-+        return self.basic_test_repeat(size)
-+
-+    @precisionbigmemtest(size=_1G - 1, memuse=9)
-+    def test_from_2G_generator(self, size):
-+        try:
-+            t = tuple(xrange(size))
-+        except MemoryError:
-+            pass # acceptable on 32-bit
-+        else:
-+            count = 0
-+            for item in t:
-+                self.assertEquals(item, count)
-+                count += 1
-+            self.assertEquals(count, size)
-+
-+    @precisionbigmemtest(size=_1G - 25, memuse=9)
-+    def test_from_almost_2G_generator(self, size):
-+        try:
-+            t = tuple(xrange(size))
-+            count = 0
-+            for item in t:
-+                self.assertEquals(item, count)
-+                count += 1
-+            self.assertEquals(count, size)
-+        except MemoryError:
-+            pass # acceptable, expected on 32-bit
-+
-     # Like test_concat, split in two.
-     def basic_test_repr(self, size):
-         t = (0,) * size
-@@ -957,8 +1041,34 @@
-         self.assertEquals(l[:10], [1] * 10)
-         self.assertEquals(l[-10:], [5] * 10)
- 
-+class BufferTest(unittest.TestCase):
-+
-+    @precisionbigmemtest(size=_1G, memuse=4)
-+    def test_repeat(self, size):
-+        try:
-+            b = buffer("AAAA")*size
-+        except MemoryError:
-+            pass # acceptable on 32-bit
-+        else:
-+            count = 0
-+            for c in b:
-+                self.assertEquals(c, 'A')
-+                count += 1
-+            self.assertEquals(count, size*4)
-+
- def test_main():
--    test_support.run_unittest(StrTest, TupleTest, ListTest)
-+    test_support.run_unittest(StrTest, TupleTest, ListTest, BufferTest)
-+
-+# Expected failures (crashers)
-+# del StrTest.test_center_unicode
-+del StrTest.test_decodeascii
-+# del StrTest.test_encode_utf32
-+# del StrTest.test_encode_utf7
-+# del StrTest.test_encode_raw_unicode_escape
-+#
-+# del TupleTest.test_from_2G_generator
-+#
-+# del BufferTest.test_repeat
- 
- if __name__ == '__main__':
-     if len(sys.argv) > 1:
diff --git a/lang/python25/files/patch-lib-test_test_hashlib.py b/lang/python25/files/patch-lib-test_test_hashlib.py
index 15ede2b17e8c..e69de29bb2d1 100644
--- a/lang/python25/files/patch-lib-test_test_hashlib.py
+++ b/lang/python25/files/patch-lib-test_test_hashlib.py
@@ -1,41 +0,0 @@
---- Lib/test/test_hashlib.py.orig	2005-08-21 19:45:59.000000000 +0100
-+++ Lib/test/test_hashlib.py	2008-08-30 10:43:27.000000000 +0100
-@@ -9,7 +9,7 @@
- import hashlib
- import unittest
- from test import test_support
--
-+from test.test_support import _4G, precisionbigmemtest
- 
- def hexstr(s):
-     import string
-@@ -55,7 +55,6 @@
-             m2.update(aas + bees + cees)
-             self.assertEqual(m1.digest(), m2.digest())
- 
--
-     def check(self, name, data, digest):
-         # test the direct constructors
-         computed = getattr(hashlib, name)(data).hexdigest()
-@@ -75,6 +74,21 @@
-         self.check('md5', 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789',
-                    'd174ab98d277d9f5a5611c2c9f419d9f')
- 
-+    @precisionbigmemtest(size=_4G + 5, memuse=1)
-+    def test_case_md5_huge(self, size):
-+        if size == _4G + 5:
-+            try:
-+                self.check('md5', 'A'*size, 'c9af2dff37468ce5dfee8f2cfc0a9c6d')
-+            except OverflowError:
-+                pass # 32-bit arch
-+
-+    @precisionbigmemtest(size=_4G - 1, memuse=1)
-+    def test_case_md5_uintmax(self, size):
-+        if size == _4G - 1:
-+            try:
-+                self.check('md5', 'A'*size, '28138d306ff1b8281f1a9067e1a1a2b3')
-+            except OverflowError:
-+                pass # 32-bit arch
- 
-     # use the three examples from Federal Information Processing Standards
-     # Publication 180-1, Secure Hash Standard,  1995 April 17
diff --git a/lang/python25/files/patch-lib-test_test_strop.py b/lang/python25/files/patch-lib-test_test_strop.py
index f0e40166957a..e69de29bb2d1 100644
--- a/lang/python25/files/patch-lib-test_test_strop.py
+++ b/lang/python25/files/patch-lib-test_test_strop.py
@@ -1,28 +0,0 @@
---- Lib/test/test_strop.py.orig	2002-07-31 00:27:12.000000000 +0100
-+++ Lib/test/test_strop.py	2008-08-30 10:16:13.000000000 +0100
-@@ -115,6 +115,25 @@
-         strop.uppercase
-         strop.whitespace
- 
-+    @test_support.precisionbigmemtest(size=test_support._2G - 1, memuse=5)
-+    def test_stropjoin_huge_list(self, size):
-+        a = "A" * size
-+        try:
-+            r = strop.join([a, a], a)
-+        except OverflowError:
-+            pass
-+        else:
-+            self.assertEquals(len(r), len(a) * 3)
-+
-+    @test_support.precisionbigmemtest(size=test_support._2G - 1, memuse=1)
-+    def test_stropjoin_huge_tup(self, size):
-+        a = "A" * size
-+        try:
-+            r = strop.join((a, a), a)
-+        except OverflowError:
-+            pass # acceptable on 32-bit
-+        else:
-+            self.assertEquals(len(r), len(a) * 3)
- 
- transtable = '\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037 !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`xyzdefghijklmnopqrstuvwxyz{|}~\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377'
- 
diff --git a/lang/python25/files/patch-lib-test_test_support.py b/lang/python25/files/patch-lib-test_test_support.py
index b11933bc7eed..e69de29bb2d1 100644
--- a/lang/python25/files/patch-lib-test_test_support.py
+++ b/lang/python25/files/patch-lib-test_test_support.py
@@ -1,62 +0,0 @@
---- Lib/test/test_support.py.orig	2008-01-27 01:24:44.000000000 +0000
-+++ Lib/test/test_support.py	2008-08-30 10:16:13.000000000 +0100
-@@ -33,6 +33,7 @@
- use_resources = None     # Flag set to [] by regrtest.py
- max_memuse = 0           # Disable bigmem tests (they will still be run with
-                          # small sizes, to make sure they work.)
-+real_max_memuse = 0
- 
- # _original_stdout is meant to hold stdout at the time regrtest began.
- # This may be "the real" stdout, or IDLE's emulation of stdout, or whatever.
-@@ -323,6 +324,7 @@
- _1M = 1024*1024
- _1G = 1024 * _1M
- _2G = 2 * _1G
-+_4G = 4 * _1G
- 
- # Hack to get at the maximum value an internal index can take.
- class _Dummy:
-@@ -333,6 +335,7 @@
- def set_memlimit(limit):
-     import re
-     global max_memuse
-+    global real_max_memuse
-     sizes = {
-         'k': 1024,
-         'm': _1M,
-@@ -344,6 +347,7 @@
-     if m is None:
-         raise ValueError('Invalid memory limit %r' % (limit,))
-     memlimit = int(float(m.group(1)) * sizes[m.group(3).lower()])
-+    real_max_memuse = memlimit
-     if memlimit > MAX_Py_ssize_t:
-         memlimit = MAX_Py_ssize_t
-     if memlimit < _2G - 1:
-@@ -389,6 +393,27 @@
-         return wrapper
-     return decorator
- 
-+def precisionbigmemtest(size, memuse, overhead=5*_1M):
-+    def decorator(f):
-+        def wrapper(self):
-+            if not real_max_memuse:
-+                maxsize = 5147
-+            else:
-+                maxsize = size
-+
-+                if real_max_memuse and real_max_memuse < maxsize * memuse:
-+                    if verbose:
-+                        sys.stderr.write("Skipping %s because of memory "
-+                                         "constraint\n" % (f.__name__,))
-+                    return
-+
-+            return f(self, maxsize)
-+        wrapper.size = size
-+        wrapper.memuse = memuse
-+        wrapper.overhead = overhead
-+        return wrapper
-+    return decorator
-+
- def bigaddrspacetest(f):
-     """Decorator for tests that fill the address space."""
-     def wrapper(self):
diff --git a/lang/python25/files/patch-lib_seq_tests.py b/lang/python25/files/patch-lib_seq_tests.py
index 9be35ae82517..e69de29bb2d1 100644
--- a/lang/python25/files/patch-lib_seq_tests.py
+++ b/lang/python25/files/patch-lib_seq_tests.py
@@ -1,21 +0,0 @@
---- Lib/test/seq_tests.py.orig	2007-11-12 20:04:41.000000000 +0000
-+++ Lib/test/seq_tests.py	2008-08-30 10:16:13.000000000 +0100
-@@ -307,11 +307,13 @@
-             self.assertEqual(id(s), id(s*1))
- 
-     def test_bigrepeat(self):
--        x = self.type2test([0])
--        x *= 2**16
--        self.assertRaises(MemoryError, x.__mul__, 2**16)
--        if hasattr(x, '__imul__'):
--            self.assertRaises(MemoryError, x.__imul__, 2**16)
-+        import sys
-+        if sys.maxint <= 2147483647:
-+            x = self.type2test([0])
-+            x *= 2**16
-+            self.assertRaises(MemoryError, x.__mul__, 2**16)
-+            if hasattr(x, '__imul__'):
-+                self.assertRaises(MemoryError, x.__imul__, 2**16)
- 
-     def test_subscript(self):
-         a = self.type2test([10, 11])
diff --git a/lang/python25/files/patch-modules_almodule.c b/lang/python25/files/patch-modules_almodule.c
index 8e3b9b11380d..e69de29bb2d1 100644
--- a/lang/python25/files/patch-modules_almodule.c
+++ b/lang/python25/files/patch-modules_almodule.c
@@ -1,14 +0,0 @@
---- Modules/almodule.c.orig	2006-09-25 07:53:42.000000000 +0100
-+++ Modules/almodule.c	2008-08-30 10:39:43.000000000 +0100
-@@ -1633,9 +1633,11 @@
- 	if (nvals < 0)
- 		goto cleanup;
- 	if (nvals > setsize) {
-+		ALvalue *old_return_set = return_set;
- 		setsize = nvals;
- 		PyMem_RESIZE(return_set, ALvalue, setsize);
- 		if (return_set == NULL) {
-+			return_set = old_return_set;
- 			PyErr_NoMemory();
- 			goto cleanup;
- 		}
diff --git a/lang/python25/files/patch-modules_arraymodule.c b/lang/python25/files/patch-modules_arraymodule.c
index 738ee48f1485..e69de29bb2d1 100644
--- a/lang/python25/files/patch-modules_arraymodule.c
+++ b/lang/python25/files/patch-modules_arraymodule.c
@@ -1,33 +0,0 @@
---- Modules/arraymodule.c.orig	2008-02-15 19:11:46.000000000 +0000
-+++ Modules/arraymodule.c	2008-08-30 10:39:43.000000000 +0100
-@@ -816,6 +816,7 @@
- array_do_extend(arrayobject *self, PyObject *bb)
- {
- 	Py_ssize_t size;
-+	char *old_item;
- 
- 	if (!array_Check(bb))
- 		return array_iter_extend(self, bb);
-@@ -831,10 +832,11 @@
- 			return -1;
- 	}
- 	size = self->ob_size + b->ob_size;
-+	old_item = self->ob_item;
-         PyMem_RESIZE(self->ob_item, char, size*self->ob_descr->itemsize);
-         if (self->ob_item == NULL) {
--                PyObject_Del(self);
--                PyErr_NoMemory();
-+		self->ob_item = old_item;
-+		PyErr_NoMemory();
- 		return -1;
-         }
- 	memcpy(self->ob_item + self->ob_size*self->ob_descr->itemsize,
-@@ -886,7 +888,7 @@
- 			if (size > PY_SSIZE_T_MAX / n) {
- 				return PyErr_NoMemory();
- 			}
--			PyMem_Resize(items, char, n * size);
-+			PyMem_RESIZE(items, char, n * size);
- 			if (items == NULL)
- 				return PyErr_NoMemory();
- 			p = items;
diff --git a/lang/python25/files/patch-modules_gcmodule.c b/lang/python25/files/patch-modules_gcmodule.c
index 59253930e9c3..e69de29bb2d1 100644
--- a/lang/python25/files/patch-modules_gcmodule.c
+++ b/lang/python25/files/patch-modules_gcmodule.c
@@ -1,58 +0,0 @@
---- Include/pymem.h.orig	2008-02-14 11:26:18.000000000 +0000
-+++ Include/pymem.h	2008-08-30 10:39:43.000000000 +0100
-@@ -67,8 +67,12 @@
-    for malloc(0), which would be treated as an error. Some platforms
-    would return a pointer with no memory behind it, which would break
-    pymalloc. To solve these problems, allocate an extra byte. */
--#define PyMem_MALLOC(n)         malloc((n) ? (n) : 1)
--#define PyMem_REALLOC(p, n)     realloc((p), (n) ? (n) : 1)
-+/* Returns NULL to indicate error if a negative size or size larger than
-+   Py_ssize_t can represent is supplied.  Helps prevents security holes. */
-+#define PyMem_MALLOC(n)		(((n) < 0 || (n) > PY_SSIZE_T_MAX) ? NULL \
-+				: malloc((n) ? (n) : 1))
-+#define PyMem_REALLOC(p, n)	(((n) < 0 || (n) > PY_SSIZE_T_MAX) ? NULL \
-+				: realloc((p), (n) ? (n) : 1))
- #define PyMem_FREE		free
- 
- #endif	/* PYMALLOC_DEBUG */
-@@ -77,24 +81,31 @@
-  * Type-oriented memory interface
-  * ==============================
-  *
-- * These are carried along for historical reasons.  There's rarely a good
-- * reason to use them anymore (you can just as easily do the multiply and
-- * cast yourself).
-+ * Allocate memory for n objects of the given type.  Returns a new pointer
-+ * or NULL if the request was too large or memory allocation failed.  Use
-+ * these macros rather than doing the multiplication yourself so that proper
-+ * overflow checking is always done.
-  */
- 
- #define PyMem_New(type, n) \
--  ( assert((n) <= PY_SIZE_MAX / sizeof(type)) , \
-+  ( ((n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
- 	( (type *) PyMem_Malloc((n) * sizeof(type)) ) )
- #define PyMem_NEW(type, n) \
--  ( assert((n) <= PY_SIZE_MAX / sizeof(type)) , \
-+  ( ((n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
- 	( (type *) PyMem_MALLOC((n) * sizeof(type)) ) )
- 
-+/*
-+ * The value of (p) is always clobbered by this macro regardless of success.
-+ * The caller MUST check if (p) is NULL afterwards and deal with the memory
-+ * error if so.  This means the original value of (p) MUST be saved for the
-+ * caller's memory error handler to not lose track of it.
-+ */
- #define PyMem_Resize(p, type, n) \
--  ( assert((n) <= PY_SIZE_MAX / sizeof(type)) , \
--	( (p) = (type *) PyMem_Realloc((p), (n) * sizeof(type)) ) )
-+  ( (p) = ((n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
-+	(type *) PyMem_Realloc((p), (n) * sizeof(type)) )
- #define PyMem_RESIZE(p, type, n) \
--  ( assert((n) <= PY_SIZE_MAX / sizeof(type)) , \
--	( (p) = (type *) PyMem_REALLOC((p), (n) * sizeof(type)) ) )
-+  ( (p) = ((n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
-+	(type *) PyMem_REALLOC((p), (n) * sizeof(type)) )
- 
- /* PyMem{Del,DEL} are left over from ancient days, and shouldn't be used
-  * anymore.  They're just confusing aliases for PyMem_{Free,FREE} now.
diff --git a/lang/python25/files/patch-modules_hashopenssl.c b/lang/python25/files/patch-modules_hashopenssl.c
index 1f0cd56a244a..e69de29bb2d1 100644
--- a/lang/python25/files/patch-modules_hashopenssl.c
+++ b/lang/python25/files/patch-modules_hashopenssl.c
@@ -1,104 +0,0 @@
---- Modules/_hashopenssl.c.orig	2006-05-29 22:04:52.000000000 +0100
-+++ Modules/_hashopenssl.c	2008-08-30 10:43:27.000000000 +0100
-@@ -19,6 +19,8 @@
- /* EVP is the preferred interface to hashing in OpenSSL */
- #include <openssl/evp.h>
- 
-+#define MUNCH_SIZE INT_MAX
-+
- 
- #ifndef HASH_OBJ_CONSTRUCTOR
- #define HASH_OBJ_CONSTRUCTOR 0
-@@ -164,9 +166,18 @@
-     if (!PyArg_ParseTuple(args, "s#:update", &cp, &len))
-         return NULL;
- 
-+    if (len > 0 && len <= MUNCH_SIZE) {
-     EVP_DigestUpdate(&self->ctx, cp, Py_SAFE_DOWNCAST(len, Py_ssize_t,
-                                                       unsigned int));
--
-+    } else {
-+        Py_ssize_t offset = 0;
-+        while (len) {
-+            unsigned int process = len > MUNCH_SIZE ? MUNCH_SIZE : len;
-+            EVP_DigestUpdate(&self->ctx, cp + offset, process);
-+            len -= process;
-+            offset += process;
-+        }
-+    }
-     Py_INCREF(Py_None);
-     return Py_None;
- }
-@@ -255,9 +266,20 @@
-     self->name = name_obj;
-     Py_INCREF(self->name);
- 
--    if (cp && len)
-+    if (cp && len) {
-+        if (len > 0 && len <= MUNCH_SIZE) {
-         EVP_DigestUpdate(&self->ctx, cp, Py_SAFE_DOWNCAST(len, Py_ssize_t,
-                                                           unsigned int));
-+        } else {
-+            Py_ssize_t offset = 0;
-+            while (len) {
-+                unsigned int process = len > MUNCH_SIZE ? MUNCH_SIZE : len;
-+                EVP_DigestUpdate(&self->ctx, cp + offset, process);
-+                len -= process;
-+                offset += process;
-+            }
-+        }
-+    }
- 
-     return 0;
- }
-@@ -328,7 +350,7 @@
- static PyObject *
- EVPnew(PyObject *name_obj,
-        const EVP_MD *digest, const EVP_MD_CTX *initial_ctx,
--       const unsigned char *cp, unsigned int len)
-+       const unsigned char *cp, Py_ssize_t len)
- {
-     EVPobject *self;
- 
-@@ -346,8 +368,20 @@
-         EVP_DigestInit(&self->ctx, digest);
-     }
- 
--    if (cp && len)
--        EVP_DigestUpdate(&self->ctx, cp, len);
-+    if (cp && len) {
-+        if (len > 0 && len <= MUNCH_SIZE) {
-+            EVP_DigestUpdate(&self->ctx, cp, Py_SAFE_DOWNCAST(len, Py_ssize_t,
-+                                                              unsigned int));
-+        } else {
-+            Py_ssize_t offset = 0;
-+            while (len) {
-+                unsigned int process = len > MUNCH_SIZE ? MUNCH_SIZE : len;
-+                EVP_DigestUpdate(&self->ctx, cp + offset, process);
-+                len -= process;
-+                offset += process;
-+            }
-+        }
-+    }
- 
-     return (PyObject *)self;
- }
-@@ -384,8 +418,7 @@
- 
-     digest = EVP_get_digestbyname(name);
- 
--    return EVPnew(name_obj, digest, NULL, cp, Py_SAFE_DOWNCAST(len, Py_ssize_t,
--                                                               unsigned int));
-+    return EVPnew(name_obj, digest, NULL, cp, len);
- }
- 
- /*
-@@ -410,7 +443,7 @@
-                 CONST_ ## NAME ## _name_obj, \
-                 NULL, \
-                 CONST_new_ ## NAME ## _ctx_p, \
--                cp, Py_SAFE_DOWNCAST(len, Py_ssize_t, unsigned int)); \
-+                cp, len); \
-     }
- 
- /* a PyMethodDef structure for the constructor */
diff --git a/lang/python25/files/patch-modules_mmapmodule.c b/lang/python25/files/patch-modules_mmapmodule.c
index 60f3d71ff349..e69de29bb2d1 100644
--- a/lang/python25/files/patch-modules_mmapmodule.c
+++ b/lang/python25/files/patch-modules_mmapmodule.c
@@ -1,11 +0,0 @@
---- Modules/mmapmodule.c.orig	2006-08-22 14:57:07.000000000 +0100
-+++ Modules/mmapmodule.c	2008-08-30 10:16:13.000000000 +0100
-@@ -223,7 +223,7 @@
- 		return(NULL);
- 
- 	/* silently 'adjust' out-of-range requests */
--	if ((self->pos + num_bytes) > self->size) {
-+	if (num_bytes > self->size - self->pos) {
- 		num_bytes -= (self->pos+num_bytes) - self->size;
- 	}
- 	result = Py_BuildValue("s#", self->data+self->pos, num_bytes);
diff --git a/lang/python25/files/patch-modules_selectmodule.c b/lang/python25/files/patch-modules_selectmodule.c
index 446241f05a97..e69de29bb2d1 100644
--- a/lang/python25/files/patch-modules_selectmodule.c
+++ b/lang/python25/files/patch-modules_selectmodule.c
@@ -1,16 +0,0 @@
---- Modules/selectmodule.c.orig	2006-07-10 02:18:57.000000000 +0100
-+++ Modules/selectmodule.c	2008-08-30 10:39:43.000000000 +0100
-@@ -349,10 +349,12 @@
- {
- 	Py_ssize_t i, pos;
- 	PyObject *key, *value;
-+        struct pollfd *old_ufds = self->ufds;
- 
- 	self->ufd_len = PyDict_Size(self->dict);
--	PyMem_Resize(self->ufds, struct pollfd, self->ufd_len);
-+	PyMem_RESIZE(self->ufds, struct pollfd, self->ufd_len);
- 	if (self->ufds == NULL) {
-+                self->ufds = old_ufds;
- 		PyErr_NoMemory();
- 		return 0;
- 	}
diff --git a/lang/python25/files/patch-modules_stropmodule.c b/lang/python25/files/patch-modules_stropmodule.c
index d7f42ce18871..e69de29bb2d1 100644
--- a/lang/python25/files/patch-modules_stropmodule.c
+++ b/lang/python25/files/patch-modules_stropmodule.c
@@ -1,31 +0,0 @@
---- Modules/stropmodule.c.orig	2008-02-14 11:26:18.000000000 +0000
-+++ Modules/stropmodule.c	2008-08-30 10:16:13.000000000 +0100
-@@ -216,6 +216,13 @@
- 				return NULL;
- 			}
- 			slen = PyString_GET_SIZE(item);
-+			if (slen > PY_SSIZE_T_MAX - reslen ||
-+			    seplen > PY_SSIZE_T_MAX - reslen - seplen) {
-+				PyErr_SetString(PyExc_OverflowError,
-+						"input too long");
-+				Py_DECREF(res);
-+				return NULL;
-+			}
- 			while (reslen + slen + seplen >= sz) {
- 				if (_PyString_Resize(&res, sz * 2) < 0)
- 					return NULL;
-@@ -253,6 +260,14 @@
- 			return NULL;
- 		}
- 		slen = PyString_GET_SIZE(item);
-+		if (slen > PY_SSIZE_T_MAX - reslen ||
-+		    seplen > PY_SSIZE_T_MAX - reslen - seplen) {
-+			PyErr_SetString(PyExc_OverflowError,
-+					"input too long");
-+			Py_DECREF(res);
-+			Py_XDECREF(item);
-+			return NULL;
-+		}
- 		while (reslen + slen + seplen >= sz) {
- 			if (_PyString_Resize(&res, sz * 2) < 0) {
- 				Py_DECREF(item);
diff --git a/lang/python25/files/patch-objects_bufferobject.c b/lang/python25/files/patch-objects_bufferobject.c
index 16e99568ad9a..e69de29bb2d1 100644
--- a/lang/python25/files/patch-objects_bufferobject.c
+++ b/lang/python25/files/patch-objects_bufferobject.c
@@ -1,13 +0,0 @@
---- Objects/bufferobject.c.orig	2008-02-14 11:26:18.000000000 +0000
-+++ Objects/bufferobject.c	2008-08-30 10:16:13.000000000 +0100
-@@ -427,6 +427,10 @@
- 		count = 0;
- 	if (!get_buf(self, &ptr, &size, ANY_BUFFER))
- 		return NULL;
-+	if (count > PY_SSIZE_T_MAX / size) {
-+		PyErr_SetString(PyExc_MemoryError, "result too large");
-+		return NULL;
-+	}
- 	ob = PyString_FromStringAndSize(NULL, size * count);
- 	if ( ob == NULL )
- 		return NULL;
diff --git a/lang/python25/files/patch-objects_longobject.c b/lang/python25/files/patch-objects_longobject.c
index 1221db9fed0a..e69de29bb2d1 100644
--- a/lang/python25/files/patch-objects_longobject.c
+++ b/lang/python25/files/patch-objects_longobject.c
@@ -1,11 +0,0 @@
---- Objects/longobject.c.orig	2007-05-07 19:30:48.000000000 +0100
-+++ Objects/longobject.c	2008-08-30 10:16:13.000000000 +0100
-@@ -70,6 +70,8 @@
- 		PyErr_NoMemory();
- 		return NULL;
- 	}
-+	/* XXX(nnorwitz): This can overflow --
-+	   PyObject_NEW_VAR /  _PyObject_VAR_SIZE need to detect overflow */
- 	return PyObject_NEW_VAR(PyLongObject, &PyLong_Type, size);
- }
- 
diff --git a/lang/python25/files/patch-objects_obmalloc.c b/lang/python25/files/patch-objects_obmalloc.c
index 27050596fbfc..e69de29bb2d1 100644
--- a/lang/python25/files/patch-objects_obmalloc.c
+++ b/lang/python25/files/patch-objects_obmalloc.c
@@ -1,34 +0,0 @@
---- Objects/obmalloc.c.orig	2008-02-14 11:26:18.000000000 +0000
-+++ Objects/obmalloc.c	2008-08-30 10:39:43.000000000 +0100
-@@ -727,6 +727,15 @@
- 	uint size;
- 
- 	/*
-+	 * Limit ourselves to PY_SSIZE_T_MAX bytes to prevent security holes.
-+	 * Most python internals blindly use a signed Py_ssize_t to track
-+	 * things without checking for overflows or negatives.
-+	 * As size_t is unsigned, checking for nbytes < 0 is not required.
-+	 */
-+	if (nbytes > PY_SSIZE_T_MAX)
-+		return NULL;
-+
-+	/*
- 	 * This implicitly redirects malloc(0).
- 	 */
- 	if ((nbytes - 1) < SMALL_REQUEST_THRESHOLD) {
-@@ -1130,6 +1139,15 @@
- 	if (p == NULL)
- 		return PyObject_Malloc(nbytes);
- 
-+	/*
-+	 * Limit ourselves to PY_SSIZE_T_MAX bytes to prevent security holes.
-+	 * Most python internals blindly use a signed Py_ssize_t to track
-+	 * things without checking for overflows or negatives.
-+	 * As size_t is unsigned, checking for nbytes < 0 is not required.
-+	 */
-+	if (nbytes > PY_SSIZE_T_MAX)
-+		return NULL;
-+
- 	pool = POOL_ADDR(p);
- 	if (Py_ADDRESS_IN_RANGE(p, pool)) {
- 		/* We're in charge of this block */
diff --git a/lang/python25/files/patch-objects_stringobject.c b/lang/python25/files/patch-objects_stringobject.c
index af55c78a4928..e69de29bb2d1 100644
--- a/lang/python25/files/patch-objects_stringobject.c
+++ b/lang/python25/files/patch-objects_stringobject.c
@@ -1,49 +0,0 @@
---- Objects/stringobject.c.orig	2007-11-07 01:19:49.000000000 +0000
-+++ Objects/stringobject.c	2008-08-30 10:16:13.000000000 +0100
-@@ -71,6 +71,11 @@
- 		return (PyObject *)op;
- 	}
- 
-+	if (size > PY_SSIZE_T_MAX - sizeof(PyStringObject)) {
-+		PyErr_SetString(PyExc_OverflowError, "string is too large");
-+		return NULL;
-+	}
-+
- 	/* Inline PyObject_NewVar */
- 	op = (PyStringObject *)PyObject_MALLOC(sizeof(PyStringObject) + size);
- 	if (op == NULL)
-@@ -106,7 +111,7 @@
- 
- 	assert(str != NULL);
- 	size = strlen(str);
--	if (size > PY_SSIZE_T_MAX) {
-+	if (size > PY_SSIZE_T_MAX - sizeof(PyStringObject)) {
- 		PyErr_SetString(PyExc_OverflowError,
- 			"string is too long for a Python string");
- 		return NULL;
-@@ -967,14 +972,24 @@
- 		Py_INCREF(a);
- 		return (PyObject *)a;
- 	}
-+	/* Check that string sizes are not negative, to prevent an
-+	   overflow in cases where we are passed incorrectly-created
-+	   strings with negative lengths (due to a bug in other code).
-+	*/
- 	size = a->ob_size + b->ob_size;
--	if (size < 0) {
-+	if (a->ob_size < 0 || b->ob_size < 0 ||
-+	    a->ob_size > PY_SSIZE_T_MAX - b->ob_size) {
- 		PyErr_SetString(PyExc_OverflowError,
- 				"strings are too large to concat");
- 		return NULL;
- 	}
- 	  
- 	/* Inline PyObject_NewVar */
-+	if (size > PY_SSIZE_T_MAX - sizeof(PyStringObject)) {
-+		PyErr_SetString(PyExc_OverflowError,
-+				"strings are too large to concat");
-+		return NULL;
-+	}
- 	op = (PyStringObject *)PyObject_MALLOC(sizeof(PyStringObject) + size);
- 	if (op == NULL)
- 		return PyErr_NoMemory();
diff --git a/lang/python25/files/patch-objects_tupleobject.c b/lang/python25/files/patch-objects_tupleobject.c
index eb133b6e002c..e69de29bb2d1 100644
--- a/lang/python25/files/patch-objects_tupleobject.c
+++ b/lang/python25/files/patch-objects_tupleobject.c
@@ -1,17 +0,0 @@
---- Objects/tupleobject.c.orig	2006-08-12 18:03:09.000000000 +0100
-+++ Objects/tupleobject.c	2008-08-30 10:16:13.000000000 +0100
-@@ -60,11 +60,12 @@
- 		Py_ssize_t nbytes = size * sizeof(PyObject *);
- 		/* Check for overflow */
- 		if (nbytes / sizeof(PyObject *) != (size_t)size ||
--		    (nbytes += sizeof(PyTupleObject) - sizeof(PyObject *))
--		    <= 0)
-+		    (nbytes > PY_SSIZE_T_MAX - sizeof(PyTupleObject) - sizeof(PyObject *)))
- 		{
- 			return PyErr_NoMemory();
- 		}
-+		nbytes += sizeof(PyTupleObject) - sizeof(PyObject *);
-+
- 		op = PyObject_GC_NewVar(PyTupleObject, &PyTuple_Type, size);
- 		if (op == NULL)
- 			return NULL;
diff --git a/lang/python25/files/patch-objects_unicodeobject.c b/lang/python25/files/patch-objects_unicodeobject.c
index 85e88caae0e3..e69de29bb2d1 100644
--- a/lang/python25/files/patch-objects_unicodeobject.c
+++ b/lang/python25/files/patch-objects_unicodeobject.c
@@ -1,115 +0,0 @@
---- Objects/unicodeobject.c.orig	2007-11-02 22:46:38.000000000 +0000
-+++ Objects/unicodeobject.c	2008-08-30 10:16:13.000000000 +0100
-@@ -239,6 +239,11 @@
-         return unicode_empty;
-     }
- 
-+    /* Ensure we won't overflow the size. */
-+    if (length > ((PY_SSIZE_T_MAX / sizeof(Py_UNICODE)) - 1)) {
-+        return (PyUnicodeObject *)PyErr_NoMemory();
-+    }
-+
-     /* Unicode freelist & memory allocation */
-     if (unicode_freelist) {
-         unicode = unicode_freelist;
-@@ -1091,6 +1096,9 @@
-     char * out;
-     char * start;
- 
-+    if (cbAllocated / 5 != size)
-+        return PyErr_NoMemory();
-+
-     if (size == 0)
- 		return PyString_FromStringAndSize(NULL, 0);
- 
-@@ -1689,8 +1697,9 @@
- {
-     PyObject *v;
-     unsigned char *p;
-+    Py_ssize_t nsize, bytesize;
- #ifdef Py_UNICODE_WIDE
--    int i, pairs;
-+    Py_ssize_t i, pairs;
- #else
-     const int pairs = 0;
- #endif
-@@ -1713,8 +1722,15 @@
- 	if (s[i] >= 0x10000)
- 	    pairs++;
- #endif
--    v = PyString_FromStringAndSize(NULL,
--		  2 * (size + pairs + (byteorder == 0)));
-+    /* 2 * (size + pairs + (byteorder == 0)) */
-+    if (size > PY_SSIZE_T_MAX ||
-+	size > PY_SSIZE_T_MAX - pairs - (byteorder == 0))
-+	return PyErr_NoMemory();
-+    nsize = (size + pairs + (byteorder == 0));
-+    bytesize = nsize * 2;
-+    if (bytesize / 2 != nsize)
-+	return PyErr_NoMemory();
-+    v = PyString_FromStringAndSize(NULL, bytesize);
-     if (v == NULL)
-         return NULL;
- 
-@@ -2042,6 +2058,11 @@
-     char *p;
- 
-     static const char *hexdigit = "0123456789abcdef";
-+#ifdef Py_UNICODE_WIDE
-+    const Py_ssize_t expandsize = 10;
-+#else
-+    const Py_ssize_t expandsize = 6;
-+#endif
- 
-     /* Initial allocation is based on the longest-possible unichr
-        escape.
-@@ -2057,13 +2078,12 @@
-        escape.
-     */
- 
-+    if (size > (PY_SSIZE_T_MAX - 2 - 1) / expandsize)
-+	return PyErr_NoMemory();
-+
-     repr = PyString_FromStringAndSize(NULL,
-         2
--#ifdef Py_UNICODE_WIDE
--        + 10*size
--#else
--        + 6*size
--#endif
-+        + expandsize*size
-         + 1);
-     if (repr == NULL)
-         return NULL;
-@@ -2304,12 +2324,16 @@
-     char *q;
- 
-     static const char *hexdigit = "0123456789abcdef";
--
- #ifdef Py_UNICODE_WIDE
--    repr = PyString_FromStringAndSize(NULL, 10 * size);
-+    const Py_ssize_t expandsize = 10;
- #else
--    repr = PyString_FromStringAndSize(NULL, 6 * size);
-+    const Py_ssize_t expandsize = 6;
- #endif
-+
-+    if (size > PY_SSIZE_T_MAX / expandsize)
-+	return PyErr_NoMemory();
-+
-+    repr = PyString_FromStringAndSize(NULL, expandsize * size);
-     if (repr == NULL)
-         return NULL;
-     if (size == 0)
-@@ -4719,6 +4743,11 @@
-         return self;
-     }
- 
-+    if (left > PY_SSIZE_T_MAX - self->length ||
-+	right > PY_SSIZE_T_MAX - (left + self->length)) {
-+        PyErr_SetString(PyExc_OverflowError, "padded string is too long");
-+        return NULL;
-+    }
-     u = _PyUnicode_New(left + self->length + right);
-     if (u) {
-         if (left)
diff --git a/lang/python25/files/patch-python_mysnprintf.c b/lang/python25/files/patch-python_mysnprintf.c
index 276dd21a1b31..e69de29bb2d1 100644
--- a/lang/python25/files/patch-python_mysnprintf.c
+++ b/lang/python25/files/patch-python_mysnprintf.c
@@ -1,55 +0,0 @@
---- Python/mysnprintf.c.orig	2001-12-21 16:32:15.000000000 +0000
-+++ Python/mysnprintf.c	2008-08-30 10:46:31.000000000 +0100
-@@ -54,18 +54,28 @@
- PyOS_vsnprintf(char *str, size_t size, const char  *format, va_list va)
- {
- 	int len;  /* # bytes written, excluding \0 */
--#ifndef HAVE_SNPRINTF
-+#ifdef HAVE_SNPRINTF
-+#define _PyOS_vsnprintf_EXTRA_SPACE 1
-+#else
-+#define _PyOS_vsnprintf_EXTRA_SPACE 512
- 	char *buffer;
- #endif
- 	assert(str != NULL);
- 	assert(size > 0);
- 	assert(format != NULL);
-+	/* We take a size_t as input but return an int.  Sanity check
-+	 * our input so that it won't cause an overflow in the
-+         * vsnprintf return value or the buffer malloc size.  */
-+	if (size > INT_MAX - _PyOS_vsnprintf_EXTRA_SPACE) {
-+		len = -666;
-+		goto Done;
-+	}
- 
- #ifdef HAVE_SNPRINTF
- 	len = vsnprintf(str, size, format, va);
- #else
- 	/* Emulate it. */
--	buffer = PyMem_MALLOC(size + 512);
-+	buffer = PyMem_MALLOC(size + _PyOS_vsnprintf_EXTRA_SPACE);
- 	if (buffer == NULL) {
- 		len = -666;
- 		goto Done;
-@@ -75,7 +85,7 @@
- 	if (len < 0)
- 		/* ignore the error */;
- 
--	else if ((size_t)len >= size + 512)
-+	else if ((size_t)len >= size + _PyOS_vsnprintf_EXTRA_SPACE)
- 		Py_FatalError("Buffer overflow in PyOS_snprintf/PyOS_vsnprintf");
- 
- 	else {
-@@ -86,8 +96,10 @@
- 		str[to_copy] = '\0';
- 	}
- 	PyMem_FREE(buffer);
--Done:
- #endif
--	str[size-1] = '\0';
-+Done:
-+	if (size > 0)
-+		str[size-1] = '\0';
- 	return len;
-+#undef _PyOS_vsnprintf_EXTRA_SPACE
- }
diff --git a/lang/python25/pkg-plist b/lang/python25/pkg-plist
index 5459479d7606..b6481d3ee84b 100644
--- a/lang/python25/pkg-plist
+++ b/lang/python25/pkg-plist
@@ -1017,7 +1017,6 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/output/test_pty
 %%PYTHON_LIBDIR%%/test/output/test_pyexpat
 %%PYTHON_LIBDIR%%/test/output/test_regex
-%%PYTHON_LIBDIR%%/test/output/test_resource
 %%PYTHON_LIBDIR%%/test/output/test_rgbimg
 %%PYTHON_LIBDIR%%/test/output/test_scope
 %%PYTHON_LIBDIR%%/test/output/test_signal
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index 90e72cfdafd0..1b4ebca281aa 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	python26
-PORTVERSION=	2.6
+PORTVERSION=	2.6.1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -83,11 +83,11 @@ CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
 .endif # !defined(WITHOUT_THREADS)
 
 .if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2)
-CONFIGURE_ARGS+=	--enable-unicode=ucs4
+CONFIGURE_ARGS-=	--enable-unicode=ucs4
 .endif
 
 .if defined(WITHOUT_PYMALLOC)
-CONFIGURE_ARGS+=        --without-pymalloc
+CONFIGURE_ARGS+=	--without-pymalloc
 .endif
 
 .if ${ARCH} == i386
@@ -96,12 +96,12 @@ PLIST_SUB+=	X86_ONLY=""
 PLIST_SUB+=	X86_ONLY="@comment "
 .endif
 .if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 || ${ARCH} == alpha
-PLIST_SUB+=     32BIT_ONLY="@comment "
+PLIST_SUB+=	32BIT_ONLY="@comment "
 .else
-PLIST_SUB+=     32BIT_ONLY=""
+PLIST_SUB+=	32BIT_ONLY=""
 .endif
 .if ${ARCH} == sparc64
-CFLAGS+=        -DPYTHON_DEFAULT_RECURSION_LIMIT=900
+CFLAGS+=	-DPYTHON_DEFAULT_RECURSION_LIMIT=900
 .endif
 
 .if !exists(/usr/bin/ypcat) # the world with NO_NIS
@@ -111,13 +111,13 @@ PLIST_SUB+=	NO_NIS=""
 .endif
 
 .if !defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+= --enable-ipv6
+CONFIGURE_ARGS+=	--enable-ipv6
 .else
-CONFIGURE_ARGS+= --disable-ipv6
+CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
 .if defined(WITH_FPECTL)
-CONFIGURE_ARGS+= --with-fpectl
+CONFIGURE_ARGS+=	--with-fpectl
 .endif
 
 pre-patch:
diff --git a/lang/python26/distinfo b/lang/python26/distinfo
index c6556fb0d8f8..9873696d2db4 100644
--- a/lang/python26/distinfo
+++ b/lang/python26/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/Python-2.6.tgz) = d16d29a77db2cd3af882a591f431a403
-SHA256 (python/Python-2.6.tgz) = 7c2f21a968a737a59ed0729f4b1dc154dc3aa183c20be96055186fe43c6742d0
-SIZE (python/Python-2.6.tgz) = 13023860
+MD5 (python/Python-2.6.1.tgz) = 52b3d421f42bacfdcaf55f56c0ff9be4
+SHA256 (python/Python-2.6.1.tgz) = fb65e93678e1327e3e8559cc56e1e00ed8c07162b21287a3502677892c5c515c
+SIZE (python/Python-2.6.1.tgz) = 13046455
diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist
index ca708124af99..d671d39276de 100644
--- a/lang/python26/pkg-plist
+++ b/lang/python26/pkg-plist
@@ -685,9 +685,9 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/json/tool.py
 %%PYTHON_LIBDIR%%/keyword.py
 %%PYTHON_LIBDIR%%/lib2to3/Grammar.txt
-%%PYTHON_LIBDIR%%/lib2to3/Grammar2.6.0.final.0.pickle
+%%PYTHON_LIBDIR%%/lib2to3/Grammar2.6.1.final.0.pickle
 %%PYTHON_LIBDIR%%/lib2to3/PatternGrammar.txt
-%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar2.6.0.final.0.pickle
+%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar2.6.1.final.0.pickle
 %%PYTHON_LIBDIR%%/lib2to3/__init__.py
 %%PYTHON_LIBDIR%%/lib2to3/fixer_base.py
 %%PYTHON_LIBDIR%%/lib2to3/fixer_util.py
@@ -699,6 +699,12 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_dict.py
 %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_except.py
 %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_exec.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_getcwdu.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_set_literal.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_getcwdu.pyc
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_set_literal.pyc
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_getcwdu.pyo
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_set_literal.pyo
 %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_execfile.py
 %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_filter.py
 %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_funcattrs.py
@@ -995,6 +1001,9 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/cjkencodings_test.py
 %%PYTHON_LIBDIR%%/test/cmath_testcases.txt
 %%PYTHON_LIBDIR%%/test/curses_tests.py
+%%PYTHON_LIBDIR%%/test/test_future5.py
+%%PYTHON_LIBDIR%%/test/test_future5.pyc
+%%PYTHON_LIBDIR%%/test/test_future5.pyo
 %%PYTHON_LIBDIR%%/test/decimaltestdata/abs.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/add.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/and.decTest
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 90e72cfdafd0..1b4ebca281aa 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	python26
-PORTVERSION=	2.6
+PORTVERSION=	2.6.1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -83,11 +83,11 @@ CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
 .endif # !defined(WITHOUT_THREADS)
 
 .if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2)
-CONFIGURE_ARGS+=	--enable-unicode=ucs4
+CONFIGURE_ARGS-=	--enable-unicode=ucs4
 .endif
 
 .if defined(WITHOUT_PYMALLOC)
-CONFIGURE_ARGS+=        --without-pymalloc
+CONFIGURE_ARGS+=	--without-pymalloc
 .endif
 
 .if ${ARCH} == i386
@@ -96,12 +96,12 @@ PLIST_SUB+=	X86_ONLY=""
 PLIST_SUB+=	X86_ONLY="@comment "
 .endif
 .if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 || ${ARCH} == alpha
-PLIST_SUB+=     32BIT_ONLY="@comment "
+PLIST_SUB+=	32BIT_ONLY="@comment "
 .else
-PLIST_SUB+=     32BIT_ONLY=""
+PLIST_SUB+=	32BIT_ONLY=""
 .endif
 .if ${ARCH} == sparc64
-CFLAGS+=        -DPYTHON_DEFAULT_RECURSION_LIMIT=900
+CFLAGS+=	-DPYTHON_DEFAULT_RECURSION_LIMIT=900
 .endif
 
 .if !exists(/usr/bin/ypcat) # the world with NO_NIS
@@ -111,13 +111,13 @@ PLIST_SUB+=	NO_NIS=""
 .endif
 
 .if !defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+= --enable-ipv6
+CONFIGURE_ARGS+=	--enable-ipv6
 .else
-CONFIGURE_ARGS+= --disable-ipv6
+CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
 .if defined(WITH_FPECTL)
-CONFIGURE_ARGS+= --with-fpectl
+CONFIGURE_ARGS+=	--with-fpectl
 .endif
 
 pre-patch:
diff --git a/lang/python27/distinfo b/lang/python27/distinfo
index c6556fb0d8f8..9873696d2db4 100644
--- a/lang/python27/distinfo
+++ b/lang/python27/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/Python-2.6.tgz) = d16d29a77db2cd3af882a591f431a403
-SHA256 (python/Python-2.6.tgz) = 7c2f21a968a737a59ed0729f4b1dc154dc3aa183c20be96055186fe43c6742d0
-SIZE (python/Python-2.6.tgz) = 13023860
+MD5 (python/Python-2.6.1.tgz) = 52b3d421f42bacfdcaf55f56c0ff9be4
+SHA256 (python/Python-2.6.1.tgz) = fb65e93678e1327e3e8559cc56e1e00ed8c07162b21287a3502677892c5c515c
+SIZE (python/Python-2.6.1.tgz) = 13046455
diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist
index ca708124af99..d671d39276de 100644
--- a/lang/python27/pkg-plist
+++ b/lang/python27/pkg-plist
@@ -685,9 +685,9 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/json/tool.py
 %%PYTHON_LIBDIR%%/keyword.py
 %%PYTHON_LIBDIR%%/lib2to3/Grammar.txt
-%%PYTHON_LIBDIR%%/lib2to3/Grammar2.6.0.final.0.pickle
+%%PYTHON_LIBDIR%%/lib2to3/Grammar2.6.1.final.0.pickle
 %%PYTHON_LIBDIR%%/lib2to3/PatternGrammar.txt
-%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar2.6.0.final.0.pickle
+%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar2.6.1.final.0.pickle
 %%PYTHON_LIBDIR%%/lib2to3/__init__.py
 %%PYTHON_LIBDIR%%/lib2to3/fixer_base.py
 %%PYTHON_LIBDIR%%/lib2to3/fixer_util.py
@@ -699,6 +699,12 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_dict.py
 %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_except.py
 %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_exec.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_getcwdu.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_set_literal.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_getcwdu.pyc
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_set_literal.pyc
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_getcwdu.pyo
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_set_literal.pyo
 %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_execfile.py
 %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_filter.py
 %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_funcattrs.py
@@ -995,6 +1001,9 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/cjkencodings_test.py
 %%PYTHON_LIBDIR%%/test/cmath_testcases.txt
 %%PYTHON_LIBDIR%%/test/curses_tests.py
+%%PYTHON_LIBDIR%%/test/test_future5.py
+%%PYTHON_LIBDIR%%/test/test_future5.pyc
+%%PYTHON_LIBDIR%%/test/test_future5.pyo
 %%PYTHON_LIBDIR%%/test/decimaltestdata/abs.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/add.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/and.decTest