Index: lang/python27/Makefile =================================================================== --- lang/python27/Makefile +++ lang/python27/Makefile @@ -2,7 +2,6 @@ PORTNAME= python27 PORTVERSION= ${PYTHON_PORTVERSION} -PORTREVISION= 3 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} DISTNAME= Python-${PORTVERSION} Index: lang/python27/Makefile.version =================================================================== --- lang/python27/Makefile.version +++ lang/python27/Makefile.version @@ -1,4 +1,4 @@ # Mk/Uses/python.mk includes this file, don't remove it! # $FreeBSD$ -PYTHON_PORTVERSION= 2.7.11 +PYTHON_PORTVERSION= 2.7.12 Index: lang/python27/distinfo =================================================================== --- lang/python27/distinfo +++ lang/python27/distinfo @@ -1,2 +1,3 @@ -SHA256 (python/Python-2.7.11.tar.xz) = 962b4c45af50124ea61f11a30deb4342fc0bc21126790fa1d7f6c79809413f46 -SIZE (python/Python-2.7.11.tar.xz) = 12277476 +TIMESTAMP = 1467034332 +SHA256 (python/Python-2.7.12.tar.xz) = d7837121dd5652a05fef807c361909d255d173280c4e1a4ded94d73d80a1f978 +SIZE (python/Python-2.7.12.tar.xz) = 12390820 Index: lang/python27/files/patch-Modules_zipimport.c =================================================================== --- lang/python27/files/patch-Modules_zipimport.c +++ /dev/null @@ -1,17 +0,0 @@ - -Bug: http://bugs.python.org/issue26171 - ---- Modules/zipimport.c.orig 2015-12-05 19:47:16 UTC -+++ Modules/zipimport.c -@@ -895,6 +895,11 @@ get_data(char *archive, PyObject *toc_en - PyMarshal_ReadShortFromFile(fp); /* local header size */ - file_offset += l; /* Start of file data */ - -+ if (data_size > LONG_MAX - 1) { -+ fclose(fp); -+ PyErr_NoMemory(); -+ return NULL; -+ } - raw_data = PyString_FromStringAndSize((char *)NULL, compress == 0 ? - data_size : data_size + 1); - if (raw_data == NULL) { Index: lang/python27/pkg-plist =================================================================== --- lang/python27/pkg-plist +++ lang/python27/pkg-plist @@ -1436,8 +1436,8 @@ lib/python2.7/ensurepip/__main__.py lib/python2.7/ensurepip/__main__.pyc lib/python2.7/ensurepip/__main__.pyo -lib/python2.7/ensurepip/_bundled/pip-7.1.2-py2.py3-none-any.whl -lib/python2.7/ensurepip/_bundled/setuptools-18.2-py2.py3-none-any.whl +lib/python2.7/ensurepip/_bundled/pip-8.1.1-py2.py3-none-any.whl +lib/python2.7/ensurepip/_bundled/setuptools-20.10.1-py2.py3-none-any.whl lib/python2.7/ensurepip/_uninstall.py lib/python2.7/ensurepip/_uninstall.pyc lib/python2.7/ensurepip/_uninstall.pyo @@ -1729,12 +1729,18 @@ lib/python2.7/idlelib/idle_test/test_delegator.py lib/python2.7/idlelib/idle_test/test_delegator.pyo lib/python2.7/idlelib/idle_test/test_delegator.pyc +lib/python2.7/idlelib/idle_test/test_editmenu.py +lib/python2.7/idlelib/idle_test/test_editmenu.pyc +lib/python2.7/idlelib/idle_test/test_editmenu.pyo lib/python2.7/idlelib/idle_test/test_formatparagraph.py lib/python2.7/idlelib/idle_test/test_formatparagraph.pyo lib/python2.7/idlelib/idle_test/test_formatparagraph.pyc lib/python2.7/idlelib/idle_test/test_grep.py lib/python2.7/idlelib/idle_test/test_grep.pyo lib/python2.7/idlelib/idle_test/test_grep.pyc +lib/python2.7/idlelib/idle_test/test_helpabout.py +lib/python2.7/idlelib/idle_test/test_helpabout.pyc +lib/python2.7/idlelib/idle_test/test_helpabout.pyo lib/python2.7/idlelib/idle_test/test_hyperparser.py lib/python2.7/idlelib/idle_test/test_hyperparser.pyo lib/python2.7/idlelib/idle_test/test_hyperparser.pyc @@ -2723,13 +2729,12 @@ lib/python2.7/test/badsyntax_future8.py lib/python2.7/test/badsyntax_future9.py lib/python2.7/test/badsyntax_nocaret.py -lib/python2.7/test/buffer_tests.py -lib/python2.7/test/buffer_tests.pyo -lib/python2.7/test/buffer_tests.pyc +lib/python2.7/test/capath/0e4015b9.0 lib/python2.7/test/capath/4e1295a3.0 lib/python2.7/test/capath/5ed36f99.0 lib/python2.7/test/capath/6e88d7b8.0 lib/python2.7/test/capath/99d0fa06.0 +lib/python2.7/test/capath/ce7b8643.0 lib/python2.7/test/cfgparser.1 lib/python2.7/test/check_soundcard.vbs lib/python2.7/test/cmath_testcases.txt @@ -2766,8 +2771,8 @@ lib/python2.7/test/cjkencodings/shift_jis.txt lib/python2.7/test/cjkencodings/shift_jisx0213-utf8.txt lib/python2.7/test/cjkencodings/shift_jisx0213.txt -lib/python2.7/test/data/README lib/python2.7/test/nokia.pem +lib/python2.7/test/data/README lib/python2.7/test/decimaltestdata/abs.decTest lib/python2.7/test/decimaltestdata/add.decTest lib/python2.7/test/decimaltestdata/and.decTest @@ -2929,7 +2934,6 @@ lib/python2.7/test/gdb_sample.pyo lib/python2.7/test/gdb_sample.pyc lib/python2.7/test/greyrgb.uue -lib/python2.7/test/https_svn_python_org_root.pem lib/python2.7/test/ieee754.txt lib/python2.7/test/imghdrdata/python.bmp lib/python2.7/test/imghdrdata/python.gif @@ -3252,9 +3256,6 @@ lib/python2.7/test/test_codeop.py lib/python2.7/test/test_codeop.pyo lib/python2.7/test/test_codeop.pyc -lib/python2.7/test/test_coding.py -lib/python2.7/test/test_coding.pyo -lib/python2.7/test/test_coding.pyc lib/python2.7/test/test_coercion.py lib/python2.7/test/test_coercion.pyo lib/python2.7/test/test_coercion.pyc @@ -3770,6 +3771,9 @@ lib/python2.7/test/test_optparse.py lib/python2.7/test/test_optparse.pyo lib/python2.7/test/test_optparse.pyc +lib/python2.7/test/test_ordered_dict.py +lib/python2.7/test/test_ordered_dict.pyc +lib/python2.7/test/test_ordered_dict.pyo lib/python2.7/test/test_os.py lib/python2.7/test/test_os.pyo lib/python2.7/test/test_os.pyc @@ -3788,15 +3792,9 @@ lib/python2.7/test/test_pep247.py lib/python2.7/test/test_pep247.pyo lib/python2.7/test/test_pep247.pyc -lib/python2.7/test/test_pep263.py -lib/python2.7/test/test_pep263.pyo -lib/python2.7/test/test_pep263.pyc lib/python2.7/test/test_pep277.py lib/python2.7/test/test_pep277.pyo lib/python2.7/test/test_pep277.pyc -lib/python2.7/test/test_pep292.py -lib/python2.7/test/test_pep292.pyo -lib/python2.7/test/test_pep292.pyc lib/python2.7/test/test_pep352.py lib/python2.7/test/test_pep352.pyo lib/python2.7/test/test_pep352.pyc @@ -3980,6 +3978,9 @@ lib/python2.7/test/test_sort.py lib/python2.7/test/test_sort.pyo lib/python2.7/test/test_sort.pyc +lib/python2.7/test/test_source_encoding.py +lib/python2.7/test/test_source_encoding.pyc +lib/python2.7/test/test_source_encoding.pyo lib/python2.7/test/test_spwd.py lib/python2.7/test/test_spwd.pyo lib/python2.7/test/test_spwd.pyc @@ -4306,6 +4307,9 @@ lib/python2.7/test/win_console_handler.py lib/python2.7/test/win_console_handler.pyo lib/python2.7/test/win_console_handler.pyc +lib/python2.7/test/test_turtle.py +lib/python2.7/test/test_turtle.pyc +lib/python2.7/test/test_turtle.pyo lib/python2.7/textwrap.py lib/python2.7/textwrap.pyo lib/python2.7/textwrap.pyc