Pullup ticket #5090 - requested by sevan

lang/python27: security fix

Revisions pulled up:
- lang/python27/Makefile                                        1.61
- lang/python27/PLIST.common                                    1.15
- lang/python27/dist.mk                                         1.12
- lang/python27/distinfo                                        1.55
- lang/python27/patches/patch-Lib_distutils_unixccompiler.py    1.4

---
   Module Name:    pkgsrc
   Committed By:   adam
   Date:           Sat Jul  2 15:05:43 UTC 2016

   Modified Files:
           pkgsrc/lang/python27: Makefile PLIST.common dist.mk distinfo
           pkgsrc/lang/python27/patches: patch-Lib_distutils_unixccompiler.py

   Log Message:
   Changes 2.7.2:

   Core and Builtins
   -----------------
   - Issue 20041: Fixed TypeError when frame.f_trace is set to None.
     Patch by Xavier de Gaye.

   - Issue 25702: A --with-lto configure option has been added that will
     enable link time optimizations at build time during a make profile-opt.
     Some compilers and toolchains are known to not produce stable code when
     using LTO, be sure to test things thoroughly before relying on it.
     It can provide a few % speed up over profile-opt alone.

   - Issue 26168: Fixed possible refleaks in failing Py_BuildValue() with the "N"
     format unit.

   - Issue 27039: Fixed bytearray.remove() for values greater than 127.  Patch by
     Joe Jevnik.

   - Issue 4806: Avoid masking the original TypeError exception when using star
     (*) unpacking and the exception was raised from a generator.  Based on
     patch by Hagen Fu:rstenau.

   - Issue 26659: Make the builtin slice type support cycle collection.

   - Issue 26718: super.__init__ no longer leaks memory if called multiple times.
     NOTE: A direct call of super.__init__ is not endorsed!

   - Issue 13410: Fixed a bug in PyUnicode_Format where it failed to properly
     ignore errors from a __int__() method.

   - Issue 26494: Fixed crash on iterating exhausting iterators.
     Affected classes are generic sequence iterators, iterators of bytearray,
     list, tuple, set, frozenset, dict, OrderedDict and corresponding views.

   - Issue 26581: If coding cookie is specified multiple times on a line in
     Python source code file, only the first one is taken to account.

   - Issue 22836: Ensure exception reports from PyErr_Display() and
     PyErr_WriteUnraisable() are sensible even when formatting them produces
     secondary errors.  This affects the reports produced by
     sys.__excepthook__() and when __del__() raises an exception.

   - Issue 22847: Improve method cache efficiency.

   - Issue 25843: When compiling code, don't merge constants if they are equal
     but have a different types. For example, ``f1, f2 = lambda: 1, lambda: 1.0``
     is now correctly compiled to two different functions: ``f1()`` returns ``1``
     (``int``) and ``f2()`` returns ``1.0`` (``int``), even if ``1`` and ``1.0``
     are equal.

   - Issue 22995: [UPDATE] Remove the one of the pickleability tests in
     _PyObject_GetState() due to regressions observed in Cython-based projects.

   - Issue 25961: Disallowed null characters in the type name.

   - Issue 22995: Instances of extension types with a state that aren't
     subclasses of list or dict and haven't implemented any pickle-related
     methods (__reduce__, __reduce_ex__, __getnewargs__, __getnewargs_ex__,
     or __getstate__), can no longer be pickled.  Including memoryview.

   - Issue 20440: Massive replacing unsafe attribute setting code with special
     macro Py_SETREF.

   - Issue 25421: __sizeof__ methods of builtin types now use dynamic basic size.
     This allows sys.getsize() to work correctly with their subclasses with
     __slots__ defined.

   - Issue 19543: Added Py3k warning for decoding unicode.

   - Issue 24097: Fixed crash in object.__reduce__() if slot name is freed inside
     __getattr__.

   - Issue 24731: Fixed crash on converting objects with special methods
     __str__, __trunc__, and __float__ returning instances of subclasses of
     str, long, and float to subclasses of str, long, and float correspondingly.

   - Issue 26478: Fix semantic bugs when using binary operators with dictionary
     views and tuples.

   - Issue 26171: Fix possible integer overflow and heap corruption in
     zipimporter.get_data().

   Library
   -------
   - Issue 26556: Update expat to 2.1.1, fixes CVE-2015-1283.

   - Fix TLS stripping vulnerability in smptlib, CVE-2016-0772.  Reported by Team
     Oststrom

   - Issue 7356: ctypes.util: Make parsing of ldconfig output independent of the
     locale.

   - Issue 25738: Stop BaseHTTPServer.BaseHTTPRequestHandler.send_error() from
     sending a message body for 205 Reset Content.  Also, don't send the
     Content-Type header field in responses that don't have a body.  Based on
     patch by Susumu Koshiba.

   - Issue 21313: Fix the "platform" module to tolerate when sys.version
     contains truncated build information.

   - Issue 27211: Fix possible memory corruption in io.IOBase.readline().

   - Issue 27114: Fix SSLContext._load_windows_store_certs fails with
     PermissionError

   - Issue 14132: Fix urllib.request redirect handling when the target only has
     a query string.  Fix by Ja'n Janech.

   - Removed the requirements for the ctypes and modulefinder modules to be
     compatible with earlier Python versions.

   - Issue 22274: In the subprocess module, allow stderr to be redirected to
     stdout even when stdout is not redirected.  Patch by Akira Li.

   - Issue 12045: Avoid duplicate execution of command in ctypes.util._get_soname().
     Patch by Sijin Joseph.

   - Issue 26960: Backported 16270 from Python 3 to Python 2, to prevent urllib
     from hanging when retrieving certain FTP files.

   - Issue 25745: Fixed leaking a userptr in curses panel destructor.

   - Issue 17765: weakref.ref() no longer silently ignores keyword arguments.
     Patch by Georg Brandl.

   - Issue 26873: xmlrpclib now raises ResponseError on unsupported type tags
     instead of silently return incorrect result.

   - Issue 24114: Fix an uninitialized variable in `ctypes.util`.

     The bug only occurs on SunOS when the ctypes implementation searches
     for the `crle` program.  Patch by Xiang Zhang.  Tested on SunOS by
     Kees Bos.

   - Issue 26864: In urllib, change the proxy bypass host checking against
     no_proxy to be case-insensitive, and to not match unrelated host names that
     happen to have a bypassed hostname as a suffix.  Patch by Xiang Zhang.

   - Issue 26804: urllib will prefer lower_case proxy environment variables over
     UPPER_CASE or Mixed_Case ones. Patch contributed by Hans-Peter Jansen.

   - Issue 26837: assertSequenceEqual() now correctly outputs non-stringified
     differing items.  This affects assertListEqual() and assertTupleEqual().

   - Issue 26822: itemgetter, attrgetter and methodcaller objects no longer
     silently ignore keyword arguments.

   - Issue 26657: Fix directory traversal vulnerability with SimpleHTTPServer
     on Windows.  This fixes a regression that was introduced in 2.7.7.  Based
     on patch by Philipp Hagemeister.

   - Issue 19377: Add .svg to mimetypes.types_map.

   - Issue 13952: Add .csv to mimetypes.types_map.  Patch by Geoff Wilson.

   - Issue 16329: Add .webm to mimetypes.types_map.  Patch by Giampaolo Rodola'.

   - Issue 23735: Handle terminal resizing with Readline 6.3+ by installing our
     own SIGWINCH handler.  Patch by Eric Price.

   - Issue 26644: Raise ValueError rather than SystemError when a negative
     length is passed to SSLSocket.recv() or read().

   - Issue 23804: Fix SSL recv(0) and read(0) methods to return zero bytes
     instead of up to 1024.

   - Issue 24266: Ctrl+C during Readline history search now cancels the search
     mode when compiled with Readline 7.

   - Issue 23857: Implement PEP 493, adding a Python-2-only ssl module API and
     environment variable to configure the default handling of SSL/TLS certificates
     for HTTPS connections.

   - Issue 26313: ssl.py _load_windows_store_certs fails if windows cert store
     is empty. Patch by Baji.

   - Issue 26513: Fixes platform module detection of Windows Server

   - Issue 23718: Fixed parsing time in week 0 before Jan 1.  Original patch by
     Tama's Bence Gedai.

   - Issue 26177: Fixed the keys() method for Canvas and Scrollbar widgets.

   - Issue 15068: Got rid of excessive buffering in the fileinput module.
     The bufsize parameter is no longer used.

   - Issue 2202: Fix UnboundLocalError in
     AbstractDigestAuthHandler.get_algorithm_impls.  Initial patch by Mathieu Dupuy.

   - Issue 26475: Fixed debugging output for regular expressions with the (?x)
     flag.

   - Issue 26385: Remove the file if the internal fdopen() call in
     NamedTemporaryFile() fails.  Based on patch by Silent Ghost.

   - Issue 26309: In the "socketserver" module, shut down the request (closing
     the connected socket) when verify_request() returns false.  Based on patch
     by Aviv Palivoda.

   - Issue 25939: On Windows open the cert store readonly in ssl.enum_certificates.

   - Issue 24303: Fix random EEXIST upon multiprocessing semaphores creation with
     Linux PID namespaces enabled.

   - Issue 25698: Importing module if the stack is too deep no longer replaces
     imported module with the empty one.

   - Issue 12923: Reset FancyURLopener's redirect counter even if there is an
     exception.  Based on patches by Brian Brazil and Daniel Rocco.

   - Issue 25945: Fixed a crash when unpickle the functools.partial object with
     wrong state.  Fixed a leak in failed functools.partial constructor.
     "args" and "keywords" attributes of functools.partial have now always types
     tuple and dict correspondingly.

   - Issue 19883: Fixed possible integer overflows in zipimport.

   - Issue 26147: xmlrpclib now works with unicode not encodable with used
     non-UTF-8 encoding.

   - Issue 16620: Fixed AttributeError in msilib.Directory.glob().

   - Issue 21847: Fixed xmlrpclib on Unicode-disabled builds.

   - Issue 6500: Fixed infinite recursion in urllib2.Request.__getattr__().

   - Issue 26083: Workaround a subprocess bug that raises an incorrect
     "ValueError: insecure string pickle" exception instead of the actual
     exception on some platforms such as Mac OS X when an exception raised
     in the forked child process prior to the exec() was large enough that
     it overflowed the internal errpipe_read pipe buffer.

   - Issue 24103: Fixed possible use after free in ElementTree.iterparse().

   - Issue 20954: _args_from_interpreter_flags used by multiprocessing and some
     tests no longer behaves incorrectly in the presence of the PYTHONHASHSEED
     environment variable.

   - Issue 14285: When executing a package with the "python -m package" option,
     and package initialization raises ImportError, a proper traceback is now
     reported.

   - Issue 6478: _strptime's regexp cache now is reset after changing timezone
     with time.tzset().

   - Issue 25718: Fixed copying object with state with boolean value is false.

   - Issue 25742: :func:`locale.setlocale` now accepts a Unicode string for
     its second parameter.

   - Issue 10131: Fixed deep copying of minidom documents.  Based on patch
     by Marian Ganisin.

   - Issue 25725: Fixed a reference leak in cPickle.loads() when unpickling
     invalid data including tuple instructions.

   - Issue 25663: In the Readline completer, avoid listing duplicate global
     names, and search the global namespace before searching builtins.

   - Issue 25688: Fixed file leak in ElementTree.iterparse() raising an error.

   - Issue 23914: Fixed SystemError raised by CPickle unpickler on broken data.

   - Issue 25924: Avoid unnecessary serialization of getaddrinfo(3) calls on
     OS X versions 10.5 or higher.  Original patch by A. Jesse Jiryu Davis.

   - Issue 26406: Avoid unnecessary serialization of getaddrinfo(3) calls on
     current versions of OpenBSD and NetBSD.  Patch by A. Jesse Jiryu Davis.

   IDLE
   ----
   - Issue 5124: Paste with text selected now replaces the selection on X11.
     This matches how paste works on Windows, Mac, most modern Linux apps,
     and ttk widgets.  Original patch by Serhiy Storchaka.

   - Issue 24759: Make clear in idlelib.idle_test.__init__ that the directory
     is a private implementation of test.test_idle and tool for maintainers.

   - Issue 26673: When tk reports font size as 0, change to size 10.
     Such fonts on Linux prevented the configuration dialog from opening.

   - Issue 27044: Add ConfigDialog.remove_var_callbacks to stop memory leaks.

   - In the 'IDLE-console differences' section of the IDLE doc, clarify
     how running with IDLE affects sys.modules and the standard streams.

   - Issue 25507: fix incorrect change in IOBinding that prevented printing.
     Change also prevented saving shell window with non-ascii characters.
     Augment IOBinding htest to include all major IOBinding functions.

   - Issue 25905: Revert unwanted conversion of ' to ? RIGHT SINGLE QUOTATION
     MARK in README.txt and open this and NEWS.txt with 'ascii'.
     Re-encode CREDITS.txt to utf-8 and open it with 'utf-8'.

   - Issue 26417: Prevent spurious errors and incorrect defaults when
     installing IDLE 2.7 on OS X: default configuration settings are
     no longer installed from OS X specific copies.

   Documentation
   -------------
   - Issue 26736: Used HTTPS for external links in the documentation if possible.

   - Issue 6953: Rework the Readline module documentation to group related
     functions together, and add more details such as what underlying Readline
     functions and variables are accessed.

   - Issue 26014: Guide users to the newer packaging documentation as was done
     for Python 3.x.  In particular, the top-level 2.7 documentation page now
     links to the newer installer and distributions pages rather than the
     legacy install and Distutils pages; these are still linked to in the
     library/distutils doc page.

   Tests
   -----
   - Issue 21916: Added tests for the turtle module.  Patch by ingrid,
     Gregory Loyse and Jelle Zijlstra.

   - Issue 25940: Changed test_ssl to use self-signed.pythontest.net.  This
     avoids relying on svn.python.org, which recently changed root certificate.

   - Issue 25616: Tests for OrderedDict are extracted from test_collections
     into separate file test_ordered_dict.

   Build
   -----
   - Issue 22359: Avoid incorrect recursive $(MAKE), and disable the rules for
     running pgen when cross-compiling.  The pgen output is normally saved with
     the source code anyway, and is still regenerated when doing a native build.
     Patch by Jonas Wagner and Xavier de Gaye.

   - Issue 19450: Update Windows builds to use SQLite 3.8.11.0.

   - Issue 27229: Fix the cross-compiling pgen rule for in-tree builds.  Patch
     by Xavier de Gaye.

   - Issue 17603: Avoid error about nonexistant fileblocks.o file by using a
     lower-level check for st_blocks in struct stat.

   - Issue 26465: Update Windows builds to use OpenSSL 1.0.2g.

   - Issue 24421: Compile Modules/_math.c once, before building extensions.
     Previously it could fail to compile properly if the math and cmath builds
     were concurrent.

   - Issue 25824: Fixes sys.winver to not include any architecture suffix.

   - Issue 25348: Added ``--pgo`` and ``--pgo-job`` arguments to
     ``PCbuild\build.bat`` for building with Profile-Guided Optimization.  The
     old ``PCbuild\build_pgo.bat`` script is now deprecated, and simply calls
     ``PCbuild\build.bat --pgo %*``.

   - Issue 25827: Add support for building with ICC to ``configure``, including
     a new ``--with-icc`` flag.

   - Issue 25696: Fix installation of Python on UNIX with make -j9.

   - Issue 26930: Update OS X 10.5+ 32-bit-only installer to build
     and link with OpenSSL 1.0.2h.

   - Issue 26268: Update Windows builds to use OpenSSL 1.0.2f.

   - Issue 25136: Support Apple Xcode 7's new textual SDK stub libraries.

   Tools/Demos
   -----------
   - Issue 26799: Fix python-gdb.py: don't get C types once when the Python code
     is loaded, but get C types on demand. The C types can change if
     python-gdb.py is loaded before the Python executable. Patch written by Thomas
     Ilsche.

   C API
   -----
   - Issue 26476: Fixed compilation error when use PyErr_BadInternalCall() in C++.
     Patch by Jeroen Demeyer.

   Misc
   ----
   - Issue 17500, and https://github.com/python/pythondotorg/issues/945: Remove
     unused and outdated icons.

5 files changed, 34 insertions, 31 deletions

diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index d9e1c0c8ce0..49568933573 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.60 2016/05/26 04:07:32 dholland Exp $
+# $NetBSD: Makefile,v 1.60.2.1 2016/09/06 19:04:27 bsiegert Exp $
 
 .include "dist.mk"
 
 PKGNAME=	python27-${PY_DISTVERSION}
-PKGREVISION=	2
 CATEGORIES=	lang python
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/lang/python27/PLIST.common b/lang/python27/PLIST.common
index 5fb2ceb8757..472d166c561 100644
--- a/lang/python27/PLIST.common
+++ b/lang/python27/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.14 2015/12/06 18:22:35 adam Exp $
+@comment $NetBSD: PLIST.common,v 1.14.6.1 2016/09/06 19:04:27 bsiegert Exp $
 bin/2to3-${PY_VER_SUFFIX}
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
@@ -1437,8 +1437,8 @@ lib/python${PY_VER_SUFFIX}/ensurepip/__init__.pyo
 lib/python${PY_VER_SUFFIX}/ensurepip/__main__.py
 lib/python${PY_VER_SUFFIX}/ensurepip/__main__.pyc
 lib/python${PY_VER_SUFFIX}/ensurepip/__main__.pyo
-lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/pip-7.1.2-py2.py3-none-any.whl
-lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/setuptools-18.2-py2.py3-none-any.whl
+lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/pip-8.1.1-py2.py3-none-any.whl
+lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/setuptools-20.10.1-py2.py3-none-any.whl
 lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.py
 lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.pyc
 lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.pyo
@@ -1730,12 +1730,18 @@ lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_configdialog.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_delegator.py
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_delegator.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_delegator.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_editmenu.py
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_editmenu.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_editmenu.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_formatparagraph.py
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_formatparagraph.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_formatparagraph.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_grep.py
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_grep.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_grep.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_helpabout.py
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_helpabout.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_helpabout.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_hyperparser.py
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_hyperparser.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_hyperparser.pyo
@@ -2715,13 +2721,12 @@ lib/python${PY_VER_SUFFIX}/test/badsyntax_future7.py
 lib/python${PY_VER_SUFFIX}/test/badsyntax_future8.py
 lib/python${PY_VER_SUFFIX}/test/badsyntax_future9.py
 lib/python${PY_VER_SUFFIX}/test/badsyntax_nocaret.py
-lib/python${PY_VER_SUFFIX}/test/buffer_tests.py
-lib/python${PY_VER_SUFFIX}/test/buffer_tests.pyc
-lib/python${PY_VER_SUFFIX}/test/buffer_tests.pyo
+lib/python${PY_VER_SUFFIX}/test/capath/0e4015b9.0
 lib/python${PY_VER_SUFFIX}/test/capath/4e1295a3.0
 lib/python${PY_VER_SUFFIX}/test/capath/5ed36f99.0
 lib/python${PY_VER_SUFFIX}/test/capath/6e88d7b8.0
 lib/python${PY_VER_SUFFIX}/test/capath/99d0fa06.0
+lib/python${PY_VER_SUFFIX}/test/capath/ce7b8643.0
 lib/python${PY_VER_SUFFIX}/test/cfgparser.1
 lib/python${PY_VER_SUFFIX}/test/check_soundcard.vbs
 lib/python${PY_VER_SUFFIX}/test/cjkencodings/big5-utf8.txt
@@ -2920,7 +2925,6 @@ lib/python${PY_VER_SUFFIX}/test/gdb_sample.py
 lib/python${PY_VER_SUFFIX}/test/gdb_sample.pyc
 lib/python${PY_VER_SUFFIX}/test/gdb_sample.pyo
 lib/python${PY_VER_SUFFIX}/test/greyrgb.uue
-lib/python${PY_VER_SUFFIX}/test/https_svn_python_org_root.pem
 lib/python${PY_VER_SUFFIX}/test/ieee754.txt
 lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.bmp
 lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.gif
@@ -3244,9 +3248,6 @@ lib/python${PY_VER_SUFFIX}/test/test_codecs.pyo
 lib/python${PY_VER_SUFFIX}/test/test_codeop.py
 lib/python${PY_VER_SUFFIX}/test/test_codeop.pyc
 lib/python${PY_VER_SUFFIX}/test/test_codeop.pyo
-lib/python${PY_VER_SUFFIX}/test/test_coding.py
-lib/python${PY_VER_SUFFIX}/test/test_coding.pyc
-lib/python${PY_VER_SUFFIX}/test/test_coding.pyo
 lib/python${PY_VER_SUFFIX}/test/test_coercion.py
 lib/python${PY_VER_SUFFIX}/test/test_coercion.pyc
 lib/python${PY_VER_SUFFIX}/test/test_coercion.pyo
@@ -3762,6 +3763,9 @@ lib/python${PY_VER_SUFFIX}/test/test_operator.pyo
 lib/python${PY_VER_SUFFIX}/test/test_optparse.py
 lib/python${PY_VER_SUFFIX}/test/test_optparse.pyc
 lib/python${PY_VER_SUFFIX}/test/test_optparse.pyo
+lib/python${PY_VER_SUFFIX}/test/test_ordered_dict.py
+lib/python${PY_VER_SUFFIX}/test/test_ordered_dict.pyc
+lib/python${PY_VER_SUFFIX}/test/test_ordered_dict.pyo
 lib/python${PY_VER_SUFFIX}/test/test_os.py
 lib/python${PY_VER_SUFFIX}/test/test_os.pyc
 lib/python${PY_VER_SUFFIX}/test/test_os.pyo
@@ -3780,15 +3784,9 @@ lib/python${PY_VER_SUFFIX}/test/test_peepholer.pyo
 lib/python${PY_VER_SUFFIX}/test/test_pep247.py
 lib/python${PY_VER_SUFFIX}/test/test_pep247.pyc
 lib/python${PY_VER_SUFFIX}/test/test_pep247.pyo
-lib/python${PY_VER_SUFFIX}/test/test_pep263.py
-lib/python${PY_VER_SUFFIX}/test/test_pep263.pyc
-lib/python${PY_VER_SUFFIX}/test/test_pep263.pyo
 lib/python${PY_VER_SUFFIX}/test/test_pep277.py
 lib/python${PY_VER_SUFFIX}/test/test_pep277.pyc
 lib/python${PY_VER_SUFFIX}/test/test_pep277.pyo
-lib/python${PY_VER_SUFFIX}/test/test_pep292.py
-lib/python${PY_VER_SUFFIX}/test/test_pep292.pyc
-lib/python${PY_VER_SUFFIX}/test/test_pep292.pyo
 lib/python${PY_VER_SUFFIX}/test/test_pep352.py
 lib/python${PY_VER_SUFFIX}/test/test_pep352.pyc
 lib/python${PY_VER_SUFFIX}/test/test_pep352.pyo
@@ -3972,6 +3970,9 @@ lib/python${PY_VER_SUFFIX}/test/test_softspace.pyo
 lib/python${PY_VER_SUFFIX}/test/test_sort.py
 lib/python${PY_VER_SUFFIX}/test/test_sort.pyc
 lib/python${PY_VER_SUFFIX}/test/test_sort.pyo
+lib/python${PY_VER_SUFFIX}/test/test_source_encoding.py
+lib/python${PY_VER_SUFFIX}/test/test_source_encoding.pyc
+lib/python${PY_VER_SUFFIX}/test/test_source_encoding.pyo
 lib/python${PY_VER_SUFFIX}/test/test_spwd.py
 lib/python${PY_VER_SUFFIX}/test/test_spwd.pyc
 lib/python${PY_VER_SUFFIX}/test/test_spwd.pyo
@@ -4119,6 +4120,9 @@ lib/python${PY_VER_SUFFIX}/test/test_ttk_textonly.pyo
 lib/python${PY_VER_SUFFIX}/test/test_tuple.py
 lib/python${PY_VER_SUFFIX}/test/test_tuple.pyc
 lib/python${PY_VER_SUFFIX}/test/test_tuple.pyo
+lib/python${PY_VER_SUFFIX}/test/test_turtle.py
+lib/python${PY_VER_SUFFIX}/test/test_turtle.pyc
+lib/python${PY_VER_SUFFIX}/test/test_turtle.pyo
 lib/python${PY_VER_SUFFIX}/test/test_typechecks.py
 lib/python${PY_VER_SUFFIX}/test/test_typechecks.pyc
 lib/python${PY_VER_SUFFIX}/test/test_typechecks.pyo
diff --git a/lang/python27/dist.mk b/lang/python27/dist.mk
index f341c1b59ce..9b66f474fc3 100644
--- a/lang/python27/dist.mk
+++ b/lang/python27/dist.mk
@@ -1,6 +1,6 @@
-# $NetBSD: dist.mk,v 1.11 2015/12/06 18:22:35 adam Exp $
+# $NetBSD: dist.mk,v 1.11.6.1 2016/09/06 19:04:27 bsiegert Exp $
 
-PY_DISTVERSION=	2.7.11
+PY_DISTVERSION=	2.7.12
 DISTNAME=	Python-${PY_DISTVERSION}
 EXTRACT_SUFX=	.tar.xz
 DISTINFO_FILE=	${.CURDIR}/../../lang/python27/distinfo
diff --git a/lang/python27/distinfo b/lang/python27/distinfo
index f7d462c6c66..3744538ea06 100644
--- a/lang/python27/distinfo
+++ b/lang/python27/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.54 2016/02/06 11:25:09 tron Exp $
+$NetBSD: distinfo,v 1.54.4.1 2016/09/06 19:04:27 bsiegert Exp $
 
-SHA1 (Python-2.7.11.tar.xz) = c3b8bbe3f084c4d4ea13ffb03d75a5e22f9756ff
-RMD160 (Python-2.7.11.tar.xz) = 215c72b1d81e878a675984783ed8df041ee7539c
-SHA512 (Python-2.7.11.tar.xz) = 72166763a2fe6aab45ecf378f55a1efc7322d1742c4638bae84f4ed4b9fb4c01f2a0293733c64426ae2c70df24d95ff2b1e2a4f3c2715de00d8f320d4d939ea0
-Size (Python-2.7.11.tar.xz) = 12277476 bytes
+SHA1 (Python-2.7.12.tar.xz) = 05360b8ade117b35e266b2004a7f1f11250c6dcd
+RMD160 (Python-2.7.12.tar.xz) = c330f6ac08ed67f307de0e726a288bab16c832d5
+SHA512 (Python-2.7.12.tar.xz) = 6ddbbce47cc49597433d98ca05c2f62f07ed1070807b645602a8e9e9b996adc6fa66fa20a33cd7d23d4e7e925e25071d7301d288149fbe4e8c5f06d5438dda1f
+Size (Python-2.7.12.tar.xz) = 12390820 bytes
 SHA1 (patch-Include_pyerrors.h) = 0d2cd52d18cc719b895fa32ed7e11c6cb15bae54
 SHA1 (patch-Include_pyport.h) = f3e4ddbc954425a65301465410911222ca471320
-SHA1 (patch-Lib_distutils_unixccompiler.py) = def4142633b8f6b75e905b5c57be1d5c19b42d33
+SHA1 (patch-Lib_distutils_unixccompiler.py) = db16c9aca2f29730945f28247b88b18828739bbb
 SHA1 (patch-Lib_multiprocessing_process.py) = 15699bd8ec822bf54a0631102e00e0a34f882803
 SHA1 (patch-Modules__ssl.c) = 6e68f88ad205106691900f091a897ffe0a4c363c
 SHA1 (patch-Modules_getaddrinfo.c) = aa699d257f1bc98b9a3183a21324053e134409d1
diff --git a/lang/python27/patches/patch-Lib_distutils_unixccompiler.py b/lang/python27/patches/patch-Lib_distutils_unixccompiler.py
index 61eaabaf92d..166256e5e7c 100644
--- a/lang/python27/patches/patch-Lib_distutils_unixccompiler.py
+++ b/lang/python27/patches/patch-Lib_distutils_unixccompiler.py
@@ -1,18 +1,18 @@
-$NetBSD: patch-Lib_distutils_unixccompiler.py,v 1.3 2015/04/24 03:01:36 rodent Exp $
+$NetBSD: patch-Lib_distutils_unixccompiler.py,v 1.3.10.1 2016/09/06 19:04:27 bsiegert Exp $
 
 * from cygport 2.7.3-dylib.patch
 
---- Lib/distutils/unixccompiler.py.orig	2014-12-10 15:59:34.000000000 +0000
+--- Lib/distutils/unixccompiler.py.orig	2016-06-25 21:49:30.000000000 +0000
 +++ Lib/distutils/unixccompiler.py
-@@ -82,6 +82,7 @@ class UnixCCompiler(CCompiler):
-     static_lib_format = shared_lib_format = dylib_lib_format = "lib%s%s"
+@@ -84,6 +84,7 @@ class UnixCCompiler(CCompiler):
+     xcode_stub_lib_format = dylib_lib_format
      if sys.platform == "cygwin":
          exe_extension = ".exe"
 +        dylib_lib_extension = ".dll.a"
  
      def preprocess(self, source,
                     output_file=None, macros=None, include_dirs=None,
-@@ -234,10 +235,8 @@ class UnixCCompiler(CCompiler):
+@@ -236,10 +237,8 @@ class UnixCCompiler(CCompiler):
              return ["+s", "-L" + dir]
          elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
              return ["-rpath", dir]