diff options
| author | wen <wen@pkgsrc.org> | 2014-05-20 08:59:31 +0000 |
|---|---|---|
| committer | wen <wen@pkgsrc.org> | 2014-05-20 08:59:31 +0000 |
| commit | 886affe1552cdb2ec5fe0876396d3b16e3add6ff (patch) | |
| tree | bb787fb443f9b0794436b4e6c3b0ba35294795f2 /lang/python34 | |
| parent | 11b36c5d3edd352cb8b9806ad65e7185d5f2b756 (diff) | |
| download | pkgsrc-886affe1552cdb2ec5fe0876396d3b16e3add6ff.tar.gz | |
Update to 3.4.1
Remove the patch which included in upstream
Upstream changes:
Python 3.4.1
Release date: 2014-05-18
Core and Builtins
Issue #21418: Fix a crash in the builtin function super() when called without argument and without current frame (ex: embedded Python).
Issue #21425: Fix flushing of standard streams in the interactive interpreter.
Issue #21435: In rare cases, when running finalizers on objects in cyclic trash a bad pointer dereference could occur due to a subtle flaw in internal iteration logic.
Library
Issue #10744: Fix PEP 3118 format strings on ctypes objects with a nontrivial shape.
Issue #20998: Fixed re.fullmatch() of repeated single character pattern with ignore case. Original patch by Matthew Barnett.
Issue #21075: fileinput.FileInput now reads bytes from standard stream if binary mode is specified. Patch by Sam Kimbrel.
Issue #21396: Fix TextIOWrapper(..., write_through=True) to not force a flush() on the underlying binary stream. Patch by akira.
Issue #21470: Do a better job seeding the random number generator by using enough bytes to span the full state space of the Mersenne Twister.
Issue #21398: Fix an unicode error in the pydoc pager when the documentation contains characters not encodable to the stdout encoding.
Tests
Issue #17756: Fix test_code test when run from the installed location.
Issue #17752: Fix distutils tests when run from the installed location.
IDLE
Issue #18104: Add idlelib/idle_test/htest.py with a few sample tests to begin consolidating and improving human-validated tests of Idle. Change other files as needed to work with htest. Running the module as __main__ runs all tests.
Python 3.4.1rc1
Release date: 2014-05-05
Core and Builtins
Issue #21274: Define PATH_MAX for GNU/Hurd in Python/pythonrun.c.
Issue #21209: Fix sending tuples to custom generator objects with the yield from syntax.
Issue #21134: Fix segfault when str is called on an uninitialized UnicodeEncodeError, UnicodeDecodeError, or UnicodeTranslateError object.
Issue #19537: Fix PyUnicode_DATA() alignment under m68k. Patch by Andreas Schwab.
Issue #20929: Add a type cast to avoid shifting a negative number.
Issue #20731: Properly position in source code files even if they are opened in text mode. Patch by Serhiy Storchaka.
Issue #20637: Key-sharing now also works for instance dictionaries of subclasses. Patch by Peter Ingebretson.
Issue #12546: Allow x00 to be used as a fill character when using str, int, float, and complex __format__ methods.
Issue #13598: Modify string.Formatter to support auto-numbering of replacement fields. It now matches the behavior of str.format() in this regard. Patches by Phil Elson and Ramchandra Apte.
Library
Issue #21088: Bugfix for curses.window.addch() regression in 3.4.0. In porting to Argument Clinic, the first two arguments were reversed.
Issue #21469: Reduced the risk of false positives in robotparser by checking to make sure that robots.txt has been read or does not exist prior to returning True in can_fetch().
Issue #21321: itertools.islice() now releases the reference to the source iterator when the slice is exhausted. Patch by Anton Afanasyev.
Issue #9815: assertRaises now tries to clear references to local variables in the exceptions traceback.
Issue #13204: Calling sys.flags.__new__ would crash the interpreter, now it raises a TypeError.
Issue #19385: Make operations on a closed dbm.dumb database always raise the same exception.
Issue #21207: Detect when the os.urandom cached fd has been closed or replaced, and open it anew.
Issue #21291: subprocesss Popen.wait() is now thread safe so that multiple threads may be calling wait() or poll() on a Popen instance at the same time without losing the Popen.returncode value.
Issue #21127: Path objects can now be instantiated from str subclass instances (such as numpy.str_).
Issue #15002: urllib.response object to use _TemporaryFileWrapper (and _TemporaryFileCloser) facility. Provides a better way to handle file descriptor close. Patch contributed by Christian Theune.
Issue #12220: mindom now raises a custom ValueError indicating it doesnt support spaces in URIs instead of letting a split ValueError bubble up.
Issue #21239: patch.stopall() didnt work deterministically when the same name was patched more than once.
Issue #21222: Passing name keyword argument to mock.create_autospec now works.
Issue #21197: Add lib64 -> lib symlink in venvs on 64-bit non-OS X POSIX.
Issue #17498: Some SMTP servers disconnect after certain errors, violating strict RFC conformance. Instead of losing the error code when we issue the subsequent RSET, smtplib now returns the error code and defers raising the SMTPServerDisconnected error until the next command is issued.
Issue #17826: setting an iterable side_effect on a mock function created by create_autospec now works. Patch by Kushal Das.
Issue #7776: Fix Host: header and reconnection when using http.client.HTTPConnection.set_tunnel(). Patch by Nikolaus Rath.
Issue #20968: unittest.mock.MagicMock now supports division. Patch by Johannes Baiter.
Fix arbitrary memory access in JSONDecoder.raw_decode with a negative second parameter. Bug reported by Guido Vranken.
Issue #21169: getpass now handles non-ascii characters that the input stream encoding cannot encode by re-encoding using the replace error handler.
Issue #21171: Fixed undocumented filter API of the rot13 codec. Patch by Berker Peksag.
Issue #21172: isinstance check relaxed from dict to collections.Mapping.
Issue #21155: asyncio.EventLoop.create_unix_server() now raises a ValueError if path and sock are specified at the same time.
Issue #21149: Improved thread-safety in logging cleanup during interpreter shutdown. Thanks to Devin Jeanpierre for the patch.
Issue #20145: assertRaisesRegex and assertWarnsRegex now raise a TypeError if the second argument is not a string or compiled regex.
Issue #21058: Fix a leak of file descriptor in tempfile.NamedTemporaryFile(), close the file descriptor if io.open() fails
Issue #21200: Return None from pkgutil.get_loader() when __spec__ is missing.
Issue #21013: Enhance ssl.create_default_context() when used for server side sockets to provide better security by default.
Issue #20633: Replace relative import by absolute import.
Issue #20980: Stop wrapping exception when using ThreadPool.
Issue #21082: In os.makedirs, do not set the process-wide umask. Note this changes behavior of makedirs when exist_ok=True.
Issue #20990: Fix issues found by pyflakes for multiprocessing.
Issue #21015: SSL contexts will now automatically select an elliptic curve for ECDH key exchange on OpenSSL 1.0.2 and later, and otherwise default to prime256v1.
Issue #20995: Enhance default ciphers used by the ssl module to enable better security an prioritize perfect forward secrecy.
Issue #20884: Dont assume that __file__ is defined on importlib.__init__.
Issue #21499: Ignore __builtins__ in several test_importlib.test_api tests.
Issue #20879: Delay the initialization of encoding and decoding tables for base32, ascii85 and base85 codecs in the base64 module, and delay the initialization of the unquote_to_bytes() table of the urllib.parse module, to not waste memory if these modules are not used.
Issue #19157: Include the broadcast address in the usuable hosts for IPv6 in ipaddress.
Issue #11599: When an external command (e.g. compiler) fails, distutils now prints out the whole command line (instead of just the command name) if the environment variable DISTUTILS_DEBUG is set.
Issue #4931: distutils should not produce unhelpful error: None messages anymore. distutils.util.grok_environment_error is kept but doc-deprecated.
Issue #20875: Prevent possible gzip read is not defined NameError. Patch by Claudiu Popa.
Issue #11558: email.message.Message.attach now returns a more useful error message if attach is called on a message for which is_multipart is False.
Issue #20283: RE pattern methods now accept the string keyword parameters as documented. The pattern and source keyword parameters are left as deprecated aliases.
Issue #20778: Fix modulefinder to work with bytecode-only modules.
Issue #20791: copy.copy() now doesnt make a copy when the input is a bytes object. Initial patch by Peter Otten.
Issue #19748: On AIX, time.mktime() now raises an OverflowError for year outsize range [1902; 2037].
Issue #20816: Fix inspect.getcallargs() to raise correct TypeError for missing keyword-only arguments. Patch by Jeremiah Lowin.
Issue #20817: Fix inspect.getcallargs() to fail correctly if more than 3 arguments are missing. Patch by Jeremiah Lowin.
Issue #6676: Ensure a meaningful exception is raised when attempting to parse more than one XML document per pyexpat xmlparser instance. (Original patches by Hirokazu Yamamoto and Amaury Forgeot dArc, with suggested wording by David Gutteridge)
Issue #21117: Fix inspect.signature to better support functools.partial. Due to the specifics of functools.partial implementation, positional-or-keyword arguments passed as keyword arguments become keyword-only.
Issue #21209: Fix asyncio.tasks.CoroWrapper to workaround a bug in yield-from implementation in CPythons prior to 3.4.1.
asyncio: Add gi_{frame,running,code} properties to CoroWrapper (upstream issue #163).
Issue #21311: Avoid exception in _osx_support with non-standard compiler configurations. Patch by John Szakmeister.
Issue #11571: Ensure that the turtle window becomes the topmost window when launched on OS X.
Extension Modules
Issue #21276: posixmodule: Dont define USE_XATTRS on KFreeBSD and the Hurd.
Issue #21226: Set up modules properly in PyImport_ExecCodeModuleObject (and friends).
IDLE
Issue #21139: Change default paragraph width to 72, the PEP 8 recommendation.
Issue #21284: Paragraph reformat test passes after user changes reformat width.
Issue #17654: Ensure IDLE menus are customized properly on OS X for non-framework builds and for all variants of Tk.
Build
The Windows build now includes OpenSSL 1.0.1g
Issue #21285: Refactor and fix curses configure check to always search in a ncursesw directory.
Issue #15234: For BerkelyDB and Sqlite, only add the found library and include directories if they arent already being searched. This avoids an explicit runtime library dependency.
Issue #20644: OS X installer build support for documentation build changes in 3.4.1: assume externally supplied sphinx-build is available in /usr/bin.
C API
Issue #20942: PyImport_ImportFrozenModuleObject() no longer sets __file__ to match what importlib does; this affects _frozen_importlib as well as any module loaded using imp.init_frozen().
Documentation
Issue #17386: Expanded functionality of the Doc/make.bat script to make it much more comparable to Doc/Makefile.
Issue #21043: Remove the recommendation for specific CA organizations and to mention the ability to load the OS certificates.
Issue #20765: Add missing documentation for PurePath.with_name() and PurePath.with_suffix().
Issue #19407: New package installation and distribution guides based on the Python Packaging Authority tools. Existing guides have been retained as legacy links from the distutils docs, as they still contain some required reference material for tool developers that isnt recorded anywhere else.
Issue #19697: Document cases where __main__.__spec__ is None.
Tests
Issue #18604: Consolidated checks for GUI availability. All platforms now at least check whether Tk can be instantiated when the GUI resource is requested.
Issue #21275: Fix a socket test on KFreeBSD.
Issue #21223: Pass test_site/test_startup_imports when some of the extensions are built as builtins.
Issue #20635: Added tests for Tk geometry managers.
Add test case for freeze.
Issue #20743: Fix a reference leak in test_tcl.
Issue #21097: Move test_namespace_pkgs into test_importlib.
Issue #20939: Avoid various network test failures due to new redirect of http://www.python.org/ to https://www.python.org: use http://www.example.com instead.
Issue #20668: asyncio tests no longer rely on tests.txt file. (Patch by Vajrasky Kok)
Issue #21093: Prevent failures of ctypes test_macholib on OS X if a copy of libz exists in $HOME/lib or /usr/local/lib.
Tools/Demos
Add support for yield from to 2to3.
Add support for the PEP 465 matrix multiplication operator to 2to3.
Issue #16047: Fix module exception list and __file__ handling in freeze. Patch by Meador Inge.
Issue #11824: Consider ABI tags in freeze. Patch by Meador Inge.
Issue #20535: PYTHONWARNING no longer affects the run_tests.py script. Patch by Arfrever Frehtes Taifersar Arahesis.
Diffstat (limited to 'lang/python34')
| -rw-r--r-- | lang/python34/Makefile | 3 | ||||
| -rw-r--r-- | lang/python34/PLIST | 88 | ||||
| -rw-r--r-- | lang/python34/dist.mk | 4 | ||||
| -rw-r--r-- | lang/python34/distinfo | 11 | ||||
| -rw-r--r-- | lang/python34/patches/patch-Lib_os.py | 57 | ||||
| -rw-r--r-- | lang/python34/patches/patch-al | 22 |
6 files changed, 67 insertions, 118 deletions
diff --git a/lang/python34/Makefile b/lang/python34/Makefile index 5d6a80c11e8..bf06bac0e00 100644 --- a/lang/python34/Makefile +++ b/lang/python34/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2014/05/15 12:43:52 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2014/05/20 08:59:31 wen Exp $ .include "dist.mk" PKGNAME= python34-${PY_DISTVERSION} -PKGREVISION= 1 CATEGORIES= lang python MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/lang/python34/PLIST b/lang/python34/PLIST index e3a584353e8..a892e9ca96d 100644 --- a/lang/python34/PLIST +++ b/lang/python34/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2014/05/09 02:27:14 wen Exp $ +@comment $NetBSD: PLIST,v 1.2 2014/05/20 08:59:31 wen Exp $ bin/2to3-${PY_VER_SUFFIX} bin/pydoc${PY_VER_SUFFIX} bin/python${PY_VER_SUFFIX} @@ -1547,7 +1547,7 @@ lib/python${PY_VER_SUFFIX}/ensurepip/__main__.pyc lib/python${PY_VER_SUFFIX}/ensurepip/__main__.pyo lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.pyc lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.pyo -lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/pip-1.5.4-py2.py3-none-any.whl +lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/pip-1.5.6-py2.py3-none-any.whl lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/setuptools-2.1-py2.py3-none-any.whl lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.py lib/python${PY_VER_SUFFIX}/enum.py @@ -1795,6 +1795,8 @@ lib/python${PY_VER_SUFFIX}/idlelib/idle_test/README.txt lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__init__.py lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__init__.pyc lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__init__.pyo +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/htest.pyc +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/htest.pyo lib/python${PY_VER_SUFFIX}/idlelib/idle_test/mock_idle.pyc lib/python${PY_VER_SUFFIX}/idlelib/idle_test/mock_idle.pyo lib/python${PY_VER_SUFFIX}/idlelib/idle_test/mock_tk.pyc @@ -1821,6 +1823,7 @@ lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_text.pyc lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_text.pyo lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_warning.pyc lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_warning.pyo +lib/python${PY_VER_SUFFIX}/idlelib/idle_test/htest.py lib/python${PY_VER_SUFFIX}/idlelib/idle_test/mock_idle.py lib/python${PY_VER_SUFFIX}/idlelib/idle_test/mock_tk.py lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_calltips.py @@ -2417,6 +2420,8 @@ lib/python${PY_VER_SUFFIX}/test/buffer_tests.pyc lib/python${PY_VER_SUFFIX}/test/buffer_tests.pyo lib/python${PY_VER_SUFFIX}/test/bytecode_helper.pyc lib/python${PY_VER_SUFFIX}/test/bytecode_helper.pyo +lib/python${PY_VER_SUFFIX}/test/coding20731.pyc +lib/python${PY_VER_SUFFIX}/test/coding20731.pyo lib/python${PY_VER_SUFFIX}/test/curses_tests.pyc lib/python${PY_VER_SUFFIX}/test/curses_tests.pyo lib/python${PY_VER_SUFFIX}/test/datetimetester.pyc @@ -2905,8 +2910,6 @@ lib/python${PY_VER_SUFFIX}/test/test_multiprocessing_main_handling.pyc lib/python${PY_VER_SUFFIX}/test/test_multiprocessing_main_handling.pyo lib/python${PY_VER_SUFFIX}/test/test_multiprocessing_spawn.pyc lib/python${PY_VER_SUFFIX}/test/test_multiprocessing_spawn.pyo -lib/python${PY_VER_SUFFIX}/test/test_namespace_pkgs.pyc -lib/python${PY_VER_SUFFIX}/test/test_namespace_pkgs.pyo lib/python${PY_VER_SUFFIX}/test/test_netrc.pyc lib/python${PY_VER_SUFFIX}/test/test_netrc.pyo lib/python${PY_VER_SUFFIX}/test/test_nis.pyc @@ -3357,6 +3360,7 @@ lib/python${PY_VER_SUFFIX}/test/cjkencodings/shift_jis.txt lib/python${PY_VER_SUFFIX}/test/cjkencodings/shift_jisx0213-utf8.txt lib/python${PY_VER_SUFFIX}/test/cjkencodings/shift_jisx0213.txt lib/python${PY_VER_SUFFIX}/test/cmath_testcases.txt +lib/python${PY_VER_SUFFIX}/test/coding20731.py lib/python${PY_VER_SUFFIX}/test/curses_tests.py lib/python${PY_VER_SUFFIX}/test/data/README lib/python${PY_VER_SUFFIX}/test/datetimetester.py @@ -3557,40 +3561,6 @@ lib/python${PY_VER_SUFFIX}/test/mime.types lib/python${PY_VER_SUFFIX}/test/mock_socket.py lib/python${PY_VER_SUFFIX}/test/mp_fork_bomb.py lib/python${PY_VER_SUFFIX}/test/multibytecodec_support.py -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/both_portions/foo/one.pyc -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/both_portions/foo/one.pyo -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/both_portions/foo/two.pyc -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/both_portions/foo/two.pyo -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/both_portions/foo/one.py -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/both_portions/foo/two.py -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/missing_directory.zip -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/module_and_namespace_package/a_test.pyc -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/module_and_namespace_package/a_test.pyo -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/module_and_namespace_package/a_test.py -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/module_and_namespace_package/a_test/empty -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/nested_portion1.zip -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/not_a_namespace_pkg/foo/__init__.py -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/not_a_namespace_pkg/foo/__init__.pyc -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/not_a_namespace_pkg/foo/__init__.pyo -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/not_a_namespace_pkg/foo/one.pyc -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/not_a_namespace_pkg/foo/one.pyo -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/not_a_namespace_pkg/foo/one.py -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/portion1/foo/one.pyc -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/portion1/foo/one.pyo -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/portion1/foo/one.py -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/portion2/foo/two.pyc -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/portion2/foo/two.pyo -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/portion2/foo/two.py -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/project1/parent/child/one.pyc -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/project1/parent/child/one.pyo -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/project1/parent/child/one.py -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/project2/parent/child/two.pyc -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/project2/parent/child/two.pyo -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/project2/parent/child/two.py -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/project3/parent/child/three.pyc -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/project3/parent/child/three.pyo -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/project3/parent/child/three.py -lib/python${PY_VER_SUFFIX}/test/namespace_pkgs/top_level_portion1.zip lib/python${PY_VER_SUFFIX}/test/nokia.pem lib/python${PY_VER_SUFFIX}/test/nullbytecert.pem lib/python${PY_VER_SUFFIX}/test/nullcert.pem @@ -3726,7 +3696,6 @@ lib/python${PY_VER_SUFFIX}/test/test_asyncio/test_transports.py lib/python${PY_VER_SUFFIX}/test/test_asyncio/test_unix_events.py lib/python${PY_VER_SUFFIX}/test/test_asyncio/test_windows_events.py lib/python${PY_VER_SUFFIX}/test/test_asyncio/test_windows_utils.py -lib/python${PY_VER_SUFFIX}/test/test_asyncio/tests.txt lib/python${PY_VER_SUFFIX}/test/test_asyncore.py lib/python${PY_VER_SUFFIX}/test/test_atexit.py lib/python${PY_VER_SUFFIX}/test/test_audioop.py @@ -3995,6 +3964,8 @@ lib/python${PY_VER_SUFFIX}/test/test_importlib/test_api.pyc lib/python${PY_VER_SUFFIX}/test/test_importlib/test_api.pyo lib/python${PY_VER_SUFFIX}/test/test_importlib/test_locks.pyc lib/python${PY_VER_SUFFIX}/test/test_importlib/test_locks.pyo +lib/python${PY_VER_SUFFIX}/test/test_importlib/test_namespace_pkgs.pyc +lib/python${PY_VER_SUFFIX}/test/test_importlib/test_namespace_pkgs.pyo lib/python${PY_VER_SUFFIX}/test/test_importlib/test_spec.pyc lib/python${PY_VER_SUFFIX}/test/test_importlib/test_spec.pyo lib/python${PY_VER_SUFFIX}/test/test_importlib/test_util.pyc @@ -4076,6 +4047,40 @@ lib/python${PY_VER_SUFFIX}/test/test_importlib/import_/test_packages.py lib/python${PY_VER_SUFFIX}/test/test_importlib/import_/test_path.py lib/python${PY_VER_SUFFIX}/test/test_importlib/import_/test_relative_imports.py lib/python${PY_VER_SUFFIX}/test/test_importlib/import_/util.py +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/both_portions/foo/one.pyc +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/both_portions/foo/one.pyo +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/both_portions/foo/two.pyc +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/both_portions/foo/two.pyo +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/both_portions/foo/one.py +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/both_portions/foo/two.py +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/missing_directory.zip +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test.pyc +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test.pyo +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test.py +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test/empty +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/nested_portion1.zip +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/not_a_namespace_pkg/foo/__init__.py +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/not_a_namespace_pkg/foo/__init__.pyc +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/not_a_namespace_pkg/foo/__init__.pyo +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/not_a_namespace_pkg/foo/one.pyc +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/not_a_namespace_pkg/foo/one.pyo +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/not_a_namespace_pkg/foo/one.py +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/portion1/foo/one.pyc +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/portion1/foo/one.pyo +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/portion1/foo/one.py +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/portion2/foo/two.pyc +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/portion2/foo/two.pyo +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/portion2/foo/two.py +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/project1/parent/child/one.pyc +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/project1/parent/child/one.pyo +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/project1/parent/child/one.py +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/project2/parent/child/two.pyc +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/project2/parent/child/two.pyo +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/project2/parent/child/two.py +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/project3/parent/child/three.pyc +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/project3/parent/child/three.pyo +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/project3/parent/child/three.py +lib/python${PY_VER_SUFFIX}/test/test_importlib/namespace_pkgs/top_level_portion1.zip lib/python${PY_VER_SUFFIX}/test/test_importlib/regrtest.py lib/python${PY_VER_SUFFIX}/test/test_importlib/source/__init__.py lib/python${PY_VER_SUFFIX}/test/test_importlib/source/__init__.pyc @@ -4101,6 +4106,7 @@ lib/python${PY_VER_SUFFIX}/test/test_importlib/source/util.py lib/python${PY_VER_SUFFIX}/test/test_importlib/test_abc.py lib/python${PY_VER_SUFFIX}/test/test_importlib/test_api.py lib/python${PY_VER_SUFFIX}/test/test_importlib/test_locks.py +lib/python${PY_VER_SUFFIX}/test/test_importlib/test_namespace_pkgs.py lib/python${PY_VER_SUFFIX}/test/test_importlib/test_spec.py lib/python${PY_VER_SUFFIX}/test/test_importlib/test_util.py lib/python${PY_VER_SUFFIX}/test/test_importlib/test_windows.py @@ -4206,7 +4212,6 @@ lib/python${PY_VER_SUFFIX}/test/test_multiprocessing_fork.py lib/python${PY_VER_SUFFIX}/test/test_multiprocessing_forkserver.py lib/python${PY_VER_SUFFIX}/test/test_multiprocessing_main_handling.py lib/python${PY_VER_SUFFIX}/test/test_multiprocessing_spawn.py -lib/python${PY_VER_SUFFIX}/test/test_namespace_pkgs.py lib/python${PY_VER_SUFFIX}/test/test_netrc.py lib/python${PY_VER_SUFFIX}/test/test_nis.py lib/python${PY_VER_SUFFIX}/test/test_nntplib.py @@ -4477,6 +4482,8 @@ lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/__init__.pyc lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/__init__.pyo lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_font.pyc lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_font.pyo +lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_geometry_managers.pyc +lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_geometry_managers.pyo lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_loadtk.pyc lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_loadtk.pyo lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_misc.pyc @@ -4488,6 +4495,7 @@ lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_variables.pyo lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_widgets.pyc lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_widgets.pyo lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_font.py +lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_geometry_managers.py lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_loadtk.py lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_misc.py lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_text.py diff --git a/lang/python34/dist.mk b/lang/python34/dist.mk index 02628930c02..5332f659f6c 100644 --- a/lang/python34/dist.mk +++ b/lang/python34/dist.mk @@ -1,6 +1,6 @@ -# $NetBSD: dist.mk,v 1.1 2014/05/09 02:27:14 wen Exp $ +# $NetBSD: dist.mk,v 1.2 2014/05/20 08:59:31 wen Exp $ -PY_DISTVERSION= 3.4.0 +PY_DISTVERSION= 3.4.1 DISTNAME= Python-${PY_DISTVERSION} EXTRACT_SUFX= .tar.xz DISTINFO_FILE= ${.CURDIR}/../../lang/python34/distinfo diff --git a/lang/python34/distinfo b/lang/python34/distinfo index cd7be471dd5..aaac5fe91de 100644 --- a/lang/python34/distinfo +++ b/lang/python34/distinfo @@ -1,13 +1,12 @@ -$NetBSD: distinfo,v 1.7 2014/05/15 12:43:52 wiz Exp $ +$NetBSD: distinfo,v 1.8 2014/05/20 08:59:31 wen Exp $ -SHA1 (Python-3.4.0.tar.xz) = f54d7cf6af5dbd9bddbe31cf4772f39711381dbe -RMD160 (Python-3.4.0.tar.xz) = f6b4664a4333a2010f8e168e252de7c22013e4a8 -Size (Python-3.4.0.tar.xz) = 14084912 bytes +SHA1 (Python-3.4.1.tar.xz) = 143e098efe7ee7bec8a4904ec4b322f28a067a03 +RMD160 (Python-3.4.1.tar.xz) = 276fda8bd4ef515da83645ddd5f01eb0f68522a5 +Size (Python-3.4.1.tar.xz) = 14125788 bytes SHA1 (patch-Lib_distutils_unixccompiler.py) = 39cb8d1e1e3e76e2b6b5dbc1a6b5e0815300b2ce -SHA1 (patch-Lib_os.py) = 0e834a55d4c2ac70a1daaddbed439dff2de37c8e SHA1 (patch-aa) = 14359f8d0527eff08073c0aea60dfe8961d9255d SHA1 (patch-ah) = b3a1363f6d210f855f3769650e3891b0df5c531d -SHA1 (patch-al) = 0944fb5b807985723070ac44358505c3053f9997 +SHA1 (patch-al) = 9920f04aed35d66dfc9509344ad159c918510376 SHA1 (patch-am) = dbce46a877a01ecef01767cdfb0c3a2137431833 SHA1 (patch-an) = c9b571eb54fdf0b1e93524a6de6780e8c4119221 SHA1 (patch-ao) = bc7bb76ca7b3b8302dd966fad85171236c1f06e6 diff --git a/lang/python34/patches/patch-Lib_os.py b/lang/python34/patches/patch-Lib_os.py deleted file mode 100644 index fc7f684cca8..00000000000 --- a/lang/python34/patches/patch-Lib_os.py +++ /dev/null @@ -1,57 +0,0 @@ -$NetBSD: patch-Lib_os.py,v 1.1 2014/05/15 12:43:52 wiz Exp $ - -Fix for CVE-2014-2667 based on -http://hg.python.org/cpython/rev/6370d44013f7 - ---- Lib/os.py.orig 2014-03-17 02:31:29.000000000 +0000 -+++ Lib/os.py -@@ -206,23 +206,16 @@ SEEK_SET = 0 - SEEK_CUR = 1 - SEEK_END = 2 - -- --def _get_masked_mode(mode): -- mask = umask(0) -- umask(mask) -- return mode & ~mask -- - # Super directory utilities. - # (Inspired by Eric Raymond; the doc strings are mostly his) - - def makedirs(name, mode=0o777, exist_ok=False): - """makedirs(path [, mode=0o777][, exist_ok=False]) - -- Super-mkdir; create a leaf directory and all intermediate ones. -- Works like mkdir, except that any intermediate path segment (not -- just the rightmost) will be created if it does not exist. If the -- target directory with the same mode as we specified already exists, -- raises an OSError if exist_ok is False, otherwise no exception is -+ Super-mkdir; create a leaf directory and all intermediate ones. Works like -+ mkdir, except that any intermediate path segment (not just the rightmost) -+ will be created if it does not exist. If the target directory already -+ exists, raise an OSError if exist_ok is False. Otherwise no exception is - raised. This is recursive. - - """ -@@ -243,20 +236,7 @@ def makedirs(name, mode=0o777, exist_ok= - try: - mkdir(name, mode) - except OSError as e: -- dir_exists = path.isdir(name) -- expected_mode = _get_masked_mode(mode) -- if dir_exists: -- # S_ISGID is automatically copied by the OS from parent to child -- # directories on mkdir. Don't consider it being set to be a mode -- # mismatch as mkdir does not unset it when not specified in mode. -- actual_mode = st.S_IMODE(lstat(name).st_mode) & ~st.S_ISGID -- else: -- actual_mode = -1 -- if not (e.errno == errno.EEXIST and exist_ok and dir_exists and -- actual_mode == expected_mode): -- if dir_exists and actual_mode != expected_mode: -- e.strerror += ' (mode %o != expected mode %o)' % ( -- actual_mode, expected_mode) -+ if not exist_ok or e.errno != errno.EEXIST or not path.isdir(name): - raise - - def removedirs(name): diff --git a/lang/python34/patches/patch-al b/lang/python34/patches/patch-al index e8edccfd269..1d8c476d970 100644 --- a/lang/python34/patches/patch-al +++ b/lang/python34/patches/patch-al @@ -1,4 +1,4 @@ -$NetBSD: patch-al,v 1.2 2014/05/09 09:19:06 wiz Exp $ +$NetBSD: patch-al,v 1.3 2014/05/20 08:59:31 wen Exp $ MirBSD support http://bugs.python.org/issue21458 @@ -9,9 +9,9 @@ Changes for consistency across pkgsrc platforms. XXX: Not sure what the BLDSHARED changes are about. ---- configure.orig 2013-05-15 16:33:00.000000000 +0000 +--- configure.orig 2014-05-20 15:08:33.000000000 +0000 +++ configure -@@ -3332,7 +3332,7 @@ case $ac_sys_system/$ac_sys_release in +@@ -3354,7 +3354,7 @@ case $ac_sys_system/$ac_sys_release in # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish. # In addition, Stefan Krah confirms that issue #1244610 exists through # OpenBSD 4.6, but is fixed in 4.7. @@ -20,7 +20,7 @@ XXX: Not sure what the BLDSHARED changes are about. define_xopen_source=no # OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is # also defined. This can be overridden by defining _BSD_SOURCE -@@ -5594,15 +5594,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >> +@@ -5632,15 +5632,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >> PY3LIBRARY=libpython3.so fi ;; @@ -28,7 +28,7 @@ XXX: Not sure what the BLDSHARED changes are about. + Linux*|GNU*|NetBSD*|FreeBSD*|Interix*|DragonFly*|OpenBSD*|MirBSD*) LDLIBRARY='libpython$(LDVERSION).so' BLDLIBRARY='-L. -lpython$(LDVERSION)' - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} + RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} - case $ac_sys_system in - FreeBSD*) - SOVERSION=`echo $SOVERSION|cut -d "." -f 1` @@ -37,7 +37,7 @@ XXX: Not sure what the BLDSHARED changes are about. INSTSONAME="$LDLIBRARY".$SOVERSION if test "$with_pydebug" != yes then -@@ -8465,8 +8460,8 @@ then +@@ -8532,8 +8527,8 @@ then LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' else # No framework, use the Python app as bundle-loader @@ -48,7 +48,7 @@ XXX: Not sure what the BLDSHARED changes are about. LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' fi ;; Darwin/*) -@@ -8491,9 +8486,9 @@ then +@@ -8555,9 +8550,9 @@ then LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' else # No framework, use the Python app as bundle-loader @@ -61,7 +61,7 @@ XXX: Not sure what the BLDSHARED changes are about. fi fi ;; -@@ -8527,9 +8522,15 @@ then +@@ -8591,9 +8586,15 @@ then ;; esac fi;; @@ -77,7 +77,7 @@ XXX: Not sure what the BLDSHARED changes are about. OpenUNIX*|UnixWare*) if test "$GCC" = "yes" ; then LDSHARED='$(CC) -shared' -@@ -8570,7 +8571,8 @@ then +@@ -8634,7 +8635,8 @@ then fi;; Linux*|GNU*) CCSHARED="-fPIC";; BSD/OS*/4*) CCSHARED="-fpic";; @@ -87,7 +87,7 @@ XXX: Not sure what the BLDSHARED changes are about. OpenUNIX*|UnixWare*) if test "$GCC" = "yes" then CCSHARED="-fPIC" -@@ -8613,11 +8615,12 @@ then +@@ -8683,11 +8685,12 @@ then OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";; SCO_SV*) LINKFORSHARED="-Wl,-Bexport";; ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";; @@ -101,7 +101,7 @@ XXX: Not sure what the BLDSHARED changes are about. SunOS/5*) case $CC in *gcc*) if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null -@@ -13707,8 +13710,6 @@ $as_echo "$SOABI" >&6; } +@@ -13917,8 +13920,6 @@ $as_echo "$SOABI" >&6; } case $ac_sys_system in |