diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2012-04-11 12:52:17 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2012-04-11 12:52:17 +0000 |
| commit | 19425757a8e3a76d2ae6c145867d1e970ffba860 (patch) | |
| tree | a450e84c87cac977f45b0e9b0e732685bb0d9ce0 /lang/python26 | |
| parent | b1791a5113acfe8c8336d8f91f761289865ef562 (diff) | |
| download | ports-19425757a8e3a76d2ae6c145867d1e970ffba860.tar.gz ports-19425757a8e3a76d2ae6c145867d1e970ffba860.zip | |
Notes
Diffstat (limited to 'lang/python26')
| -rw-r--r-- | lang/python26/Makefile | 3 | ||||
| -rw-r--r-- | lang/python26/distinfo | 4 | ||||
| -rw-r--r-- | lang/python26/files/patch-CVE-2012-0845 | 14 | ||||
| -rw-r--r-- | lang/python26/pkg-plist | 4 |
4 files changed, 5 insertions, 20 deletions
diff --git a/lang/python26/Makefile b/lang/python26/Makefile index 5b5ad11f5af9..848d9bddf172 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -6,8 +6,7 @@ # PORTNAME= python26 -PORTVERSION= 2.6.7 -PORTREVISION= 3 +PORTVERSION= 2.6.8 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} diff --git a/lang/python26/distinfo b/lang/python26/distinfo index cf0fb61390bb..bd2548b4586f 100644 --- a/lang/python26/distinfo +++ b/lang/python26/distinfo @@ -1,2 +1,2 @@ -SHA256 (python/Python-2.6.7.tgz) = a8093eace4cfd3e06b05f0deb5d765e3c6cec65908048640a8cadd7a948b3826 -SIZE (python/Python-2.6.7.tgz) = 13322372 +SHA256 (python/Python-2.6.8.tgz) = 5bf02a75ffa2fcaa5a3cabb8201998519b045541975622316888ea468d9512f7 +SIZE (python/Python-2.6.8.tgz) = 13282574 diff --git a/lang/python26/files/patch-CVE-2012-0845 b/lang/python26/files/patch-CVE-2012-0845 deleted file mode 100644 index a205a7de0ea5..000000000000 --- a/lang/python26/files/patch-CVE-2012-0845 +++ /dev/null @@ -1,14 +0,0 @@ ---- Lib/SimpleXMLRPCServer.py.orig 2011-06-11 19:46:23.000000000 +0400 -+++ Lib/SimpleXMLRPCServer.py 2012-02-15 12:50:23.000000000 +0400 -@@ -486,7 +486,10 @@ - L = [] - while size_remaining: - chunk_size = min(size_remaining, max_chunk_size) -- L.append(self.rfile.read(chunk_size)) -+ chunk = self.rfile.read(chunk_size) -+ if not chunk: -+ break -+ L.append(chunk) - size_remaining -= len(L[-1]) - data = ''.join(L) - diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist index 1010fb68d6c1..52a6f8b49ec1 100644 --- a/lang/python26/pkg-plist +++ b/lang/python26/pkg-plist @@ -697,9 +697,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.7.final.0.pickle +%%PYTHON_LIBDIR%%/lib2to3/Grammar2.6.8.final.0.pickle %%PYTHON_LIBDIR%%/lib2to3/PatternGrammar.txt -%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar2.6.7.final.0.pickle +%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar2.6.8.final.0.pickle %%PYTHON_LIBDIR%%/lib2to3/__init__.py %%PYTHON_LIBDIR%%/lib2to3/fixer_base.py %%PYTHON_LIBDIR%%/lib2to3/fixer_util.py |