CVS commit: pkgsrc/lang/python36

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/lang/python36
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Tue, 19 Dec 2017 09:37:14 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Dec 19 09:37:14 UTC 2017

Modified Files:
        pkgsrc/lang/python36: Makefile PLIST dist.mk distinfo
        pkgsrc/lang/python36/patches: patch-Makefile.pre.in
            patch-Modules_socketmodule.c patch-setup.py
Removed Files:
        pkgsrc/lang/python36/patches: patch-Modules___cursesmodule.c

Log Message:
python36: updated to 3.6.4

Python 3.6.4 release candidate 1:
Core and Builtins
-----------------
- bpo-32176: co_flags.CO_NOFREE is now always set correctly by the code
  object constructor based on freevars and cellvars, rather than needing to
  be set correctly by the caller. This ensures it will be cleared
  automatically when additional cell references are injected into a modified
  code object and function.

- bpo-31949: Fixed several issues in printing tracebacks
  (PyTraceBack_Print()).

  * Setting sys.tracebacklimit to 0 or less now suppresses printing tracebacks.
  * Setting sys.tracebacklimit to None now causes using the default limit.
  * Setting sys.tracebacklimit to an integer larger than LONG_MAX now means using
    the limit LONG_MAX rather than the default limit.
  * Fixed integer overflows in the case of more than 2**31 traceback items on
    Windows.
  * Fixed output errors handling.

- bpo-30696: Fix the interactive interpreter looping endlessly when no
  memory.

- bpo-20047: Bytearray methods partition() and rpartition() now accept only
  bytes-like objects as separator, as documented.  In particular they now
  raise TypeError rather of returning a bogus result when an integer is
  passed as a separator.

- bpo-31852: Fix a segmentation fault caused by a combination of the async
  soft keyword and continuation lines.

- bpo-21720: BytesWarning no longer emitted when the *fromlist* argument of
  __import__() or the __all__ attribute of the module contain bytes
  instances.

- bpo-31825: Fixed OverflowError in the 'unicode-escape' codec and in
  codecs.escape_decode() when decode an escaped non-ascii byte.

- bpo-28603: Print the full context/cause chain of exceptions on interpreter
  exit, even if an exception in the chain is unhashable or compares equal to
  later ones. Patch by Zane Bitter.

- bpo-31786: Fix timeout rounding in the select module to round correctly
  negative timeouts between -1.0 and 0.0. The functions now block waiting
  for events as expected. Previously, the call was incorrectly non-blocking.
  Patch by Pablo Galindo.

- bpo-31642: Restored blocking "from package import module" by setting
  sys.modules["package.module"] to None.

- bpo-31626: Fixed a bug in debug memory allocator.  There was a write to
  freed memory after shrinking a memory block.

- bpo-31619: Fixed a ValueError when convert a string with large number of
  underscores to integer with binary base.

- bpo-31592: Fixed an assertion failure in Python parser in case of a bad
  unicodedata.normalize(). Patch by Oren Milman.

- bpo-31588: Raise a TypeError with a helpful error message when class
  creation fails due to a metaclass with a bad __prepare__() method.
  Patch by Oren Milman.

- bpo-31566: Fix an assertion failure in _warnings.warn() in case of a bad
  __name__ global. Patch by Oren Milman.

- bpo-31505: Fix an assertion failure in json, in case
  _json.make_encoder() received a bad encoder() argument. Patch by Oren
  Milman.

- bpo-31492: Fix assertion failures in case of failing to import from a
  module with a bad __name__ attribute, and in case of failing to access
  an attribute of such a module. Patch by Oren Milman.

- bpo-31490: Fix an assertion failure in ctypes class definition, in case
  the class has an attribute whose name is specified in _anonymous_ but
  not in _fields_. Patch by Oren Milman.

- bpo-31478: Fix an assertion failure in _random.Random.seed() in case the
  argument has a bad __abs__() method. Patch by Oren Milman.

- bpo-31315: Fix an assertion failure in imp.create_dynamic(), when
  spec.name is not a string. Patch by Oren Milman.

- bpo-31311: Fix a crash in the __setstate__() method of
  ctypes._CData, in case of a bad __dict__. Patch by Oren Milman.

- bpo-31293: Fix crashes in true division and multiplication of a timedelta
  object by a float with a bad as_integer_ratio() method. Patch by Oren
  Milman.

- bpo-31285: Fix an assertion failure in warnings.warn_explicit, when the
  return value of the received loader's get_source() has a bad splitlines()
  method. Patch by Oren Milman.

- bpo-30817: PyErr_PrintEx() clears now the ignored exception that may be
  raised by _PySys_SetObjectId(), for example when no memory.

Library
-------
- bpo-28556: Two minor fixes for typing module: allow shallow copying
  instances of generic classes, improve interaction of __init_subclass__
  with generics.

- bpo-27240: The header folding algorithm for the new email policies has
  been rewritten, which also fixes bpo-30788, bpo-31831, and bpo-32182.  In
  particular, RFC2231 folding is now done correctly.

- bpo-32186: io.FileIO.readall() and io.FileIO.read() now release the GIL
  when getting the file size. Fixed hang of all threads with inaccessible
  NFS server. Patch by Nir Soffer.

- bpo-12239: Make :meth:msilib.SummaryInformation.GetProperty return
  None when the value of property is VT_EMPTY.  Initial patch by
  Mark Mc Mahon.

- bpo-31325: Fix wrong usage of :func:collections.namedtuple in the
  :meth:RobotFileParser.parse() <urllib.robotparser.RobotFileParser.parse>
  method.

- bpo-12382: :func:msilib.OpenDatabase now raises a better exception
  message when it couldn't open or create an MSI file.  Initial patch by
  William Tisäter.

- bpo-32110: codecs.StreamReader.read(n) now returns not more than *n*
  characters/bytes for non-negative *n*. This makes it compatible with
  read() methods of other file-like objects.

- bpo-32072: Fixed issues with binary plists:

  * Fixed saving bytearrays.
  * Identical objects will be saved only once.
  * Equal references will be load as identical objects.
  * Added support for saving and loading recursive data structures.

- bpo-32034: Make asyncio.IncompleteReadError and LimitOverrunError
  pickleable.

- bpo-32015: Fixed the looping of asyncio in the case of reconnection the
  socket during waiting async read/write from/to the socket.

- bpo-32011: Restored support of loading marshal files with the TYPE_INT64
  code. These files can be produced in Python 2.7.

- bpo-31970: Reduce performance overhead of asyncio debug mode.

- bpo-9678: Fixed determining the MAC address in the uuid module:

  * Using ifconfig on NetBSD and OpenBSD.
  * Using arp on Linux, FreeBSD, NetBSD and OpenBSD.

  Based on patch by Takayuki Shimizukawa.

- bpo-30057: Fix potential missed signal in signal.signal().

- bpo-31933: Fix Blake2 params leaf_size and node_offset on big endian
  platforms. Patch by Jack O'Connor.

- bpo-31927: Fixed compilation of the socket module on NetBSD 8.  Fixed
  assertion failure or reading arbitrary data when parse a AF_BLUETOOTH
  address on NetBSD and DragonFly BSD.

- bpo-27666: Fixed stack corruption in curses.box() and curses.ungetmouse()
  when the size of types chtype or mmask_t is less than the size of C long.
  curses.box() now accepts characters as arguments.  Based on patch by Steve
  Fink.

- bpo-31897: plistlib now catches more errors when read binary plists and
  raises InvalidFileException instead of unexpected exceptions.

- bpo-25720: Fix the method for checking pad state of curses WINDOW. Patch
  by Masayuki Yamamoto.

- bpo-31893: Fixed the layout of the kqueue_event structure on OpenBSD and
  NetBSD. Fixed the comparison of the kqueue_event objects.

- bpo-31891: Fixed building the curses module on NetBSD.

- bpo-28416: Instances of pickle.Pickler subclass with the persistent_id()
  method and pickle.Unpickler subclass with the persistent_load() method no
  longer create reference cycles.

- bpo-28326: Fix multiprocessing.Process when stdout and/or stderr is closed
  or None.

- bpo-31457: If nested log adapters are used, the inner process()
  methods are no longer omitted.

- bpo-31457: The manager property on LoggerAdapter objects is now
  properly settable.

- bpo-31806: Fix timeout rounding in time.sleep(), threading.Lock.acquire()
  and socket.socket.settimeout() to round correctly negative timeouts
  between -1.0 and 0.0. The functions now block waiting for events as
  expected. Previously, the call was incorrectly non-blocking. Patch by
  Pablo Galindo.

- bpo-28603: traceback: Fix a TypeError that occurred during printing of
  exception tracebacks when either the current exception or an exception in
  its context/cause chain is unhashable. Patch by Zane Bitter.

- bpo-30058: Fixed buffer overflow in select.kqueue.control().

- bpo-31770: Prevent a crash when calling the __init__() method of a
  sqlite3.Cursor object more than once. Patch by Oren Milman.

- bpo-31672: idpattern in string.Template matched some non-ASCII
  characters. Now it uses -i regular expression local flag to avoid non-
  ASCII characters.

- bpo-31764: Prevent a crash in sqlite3.Cursor.close() in case the
  Cursor object is uninitialized. Patch by Oren Milman.

- bpo-31752: Fix possible crash in timedelta constructor called with custom
  integers.

- bpo-31701: On Windows, faulthandler.enable() now ignores MSC and COM
  exceptions.

- bpo-31728: Prevent crashes in _elementtree due to unsafe cleanup of
  Element.text and Element.tail. Patch by Oren Milman.

- bpo-31620: an empty asyncio.Queue now doesn't leak memory when queue.get
  pollers timeout

- bpo-31632: Fix method set_protocol() of class _SSLProtocolTransport in
  asyncio module. This method was previously modifying a wrong reference to
  the protocol.

- bpo-31675: Fixed memory leaks in Tkinter's methods splitlist() and split()
  when pass a string larger than 2 GiB.

- bpo-31673: Fixed typo in the name of Tkinter's method adderrorinfo().

- bpo-30806: Fix the string representation of a netrc object.

- bpo-15037: Added a workaround for getkey() in curses for ncurses 5.7 and
  earlier.

- bpo-25351: Avoid venv activate failures with undefined variables

- bpo-25532: inspect.unwrap() will now only try to unwrap an object
  sys.getrecursionlimit() times, to protect against objects which create a
  new object on every attribute access.

- bpo-30347: Stop crashes when concurrently iterate over itertools.groupby()
  iterators.

- bpo-31516: threading.current_thread() should not return a dummy thread
  at shutdown.

- bpo-31351: python -m ensurepip now exits with non-zero exit code if pip
  bootstrapping has failed.

- bpo-31482: random.seed() now works with bytes in version=1

- bpo-31334: Fix poll.poll([timeout]) in the select module for
  arbitrary negative timeouts on all OSes where it can only be a non-
  negative integer or -1. Patch by Riccardo Coccioli.

- bpo-31310: multiprocessing's semaphore tracker should be launched again if
  crashed.

- bpo-31308: Make multiprocessing's forkserver process immune to Ctrl-C and
  other user interruptions. If it crashes, restart it when necessary.

Documentation
-------------

- bpo-32105: Added asyncio.BaseEventLoop.connect_accepted_socket
  versionaddded marker.

- bpo-31537: Fix incorrect usage of get_history_length in readline
  documentation example code. Patch by Brad Smith.

- bpo-30085: The operator functions without double underscores are preferred
  for clarity. The one with underscores are only kept for back-
  compatibility.

Tests
-----

- bpo-31380: Skip test_httpservers test_undecodable_file on macOS: fails on
  APFS.

- bpo-31705: Skip test_socket.test_sha256() on Linux kernel older than 4.5.
  The test fails with ENOKEY on kernel 3.10 (on ppc64le). A fix was merged
  into the kernel 4.5.

- bpo-31174: Fix test_tools.test_unparse: DirectoryTestCase now stores the
  names sample to always test the same files. It prevents false alarms when
  hunting reference leaks.

- bpo-30695: Add the set_nomemory(start, stop) and remove_mem_hooks()
  functions to the _testcapi module.

Build
-----

- bpo-32059: detect_modules() in setup.py now also searches the
  sysroot paths when cross-compiling.

- bpo-31957: Fixes Windows SDK version detection when building for Windows.

- bpo-31609: Fixes quotes in PCbuild/clean.bat

- bpo-31934: Abort the build when building out of a not clean source tree.

- bpo-31926: Fixed Argument Clinic sometimes causing compilation errors when
  there was more than one function and/or method in a .c file with the same
  name.

- bpo-28791: Update Windows builds to use SQLite 3.21.0.

- bpo-28791: Update OS X installer to use SQLite 3.21.0.

- bpo-22140: Prevent double substitution of prefix in python-config.sh.

- bpo-31536: Avoid wholesale rebuild after make regen-all if nothing
  changed.

Windows
-------
- bpo-1102: Return None when View.Fetch() returns
  ERROR_NO_MORE_ITEMS instead of raising MSIError.
- bpo-31944: Fixes Modify button in Apps and Features dialog.

macOS
-----
- bpo-31392: Update macOS installer to use OpenSSL 1.0.2m


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/python36/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/python36/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/python36/dist.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/python36/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/python36/patches/patch-Makefile.pre.in
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/lang/python36/patches/patch-Modules___cursesmodule.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/python36/patches/patch-Modules_socketmodule.c
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/python36/patches/patch-setup.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/python36/Makefile
diff -u pkgsrc/lang/python36/Makefile:1.12 pkgsrc/lang/python36/Makefile:1.13
--- pkgsrc/lang/python36/Makefile:1.12  Wed Dec 13 12:56:10 2017
+++ pkgsrc/lang/python36/Makefile       Tue Dec 19 09:37:14 2017
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2017/12/13 12:56:10 jperkin Exp $
+# $NetBSD: Makefile,v 1.13 2017/12/19 09:37:14 adam Exp $
 
 .include "dist.mk"
 
 PKGNAME=       python36-${PY_DISTVERSION}
-PKGREVISION=   1
 CATEGORIES=    lang python
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/lang/python36/PLIST
diff -u pkgsrc/lang/python36/PLIST:1.8 pkgsrc/lang/python36/PLIST:1.9
--- pkgsrc/lang/python36/PLIST:1.8      Wed Dec 13 12:56:10 2017
+++ pkgsrc/lang/python36/PLIST  Tue Dec 19 09:37:14 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2017/12/13 12:56:10 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.9 2017/12/19 09:37:14 adam Exp $
 bin/2to3-${PY_VER_SUFFIX}
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
@@ -332,6 +332,8 @@ lib/python${PY_VER_SUFFIX}/config-${PY_V
 lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/libpython${PY_VER_SUFFIX}.a
 lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/makesetup
 lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/python-config.py
+lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/python-config.pyc
+lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/python-config.pyo
 lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/python.o
 lib/python${PY_VER_SUFFIX}/configparser.py
 lib/python${PY_VER_SUFFIX}/configparser.pyc
@@ -1456,6 +1458,9 @@ lib/python${PY_VER_SUFFIX}/idlelib/__ini
 lib/python${PY_VER_SUFFIX}/idlelib/__main__.py
 lib/python${PY_VER_SUFFIX}/idlelib/__main__.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/__main__.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/_pyclbr.py
+lib/python${PY_VER_SUFFIX}/idlelib/_pyclbr.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/_pyclbr.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/autocomplete.py
 lib/python${PY_VER_SUFFIX}/idlelib/autocomplete.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/autocomplete.pyo
@@ -1558,6 +1563,9 @@ lib/python${PY_VER_SUFFIX}/idlelib/idle_
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_autoexpand.py
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_autoexpand.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_autoexpand.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_browser.py
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_browser.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_browser.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_calltips.py
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_calltips.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_calltips.pyo
@@ -1633,6 +1641,9 @@ lib/python${PY_VER_SUFFIX}/idlelib/idle_
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_rstrip.py
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_rstrip.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_rstrip.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_run.py
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_run.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_run.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_scrolledlist.py
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_scrolledlist.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_scrolledlist.pyo
@@ -1732,9 +1743,6 @@ lib/python${PY_VER_SUFFIX}/idlelib/stack
 lib/python${PY_VER_SUFFIX}/idlelib/statusbar.py
 lib/python${PY_VER_SUFFIX}/idlelib/statusbar.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/statusbar.pyo
-lib/python${PY_VER_SUFFIX}/idlelib/tabbedpages.py
-lib/python${PY_VER_SUFFIX}/idlelib/tabbedpages.pyc
-lib/python${PY_VER_SUFFIX}/idlelib/tabbedpages.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/textview.py
 lib/python${PY_VER_SUFFIX}/idlelib/textview.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/textview.pyo
@@ -4226,6 +4234,9 @@ lib/python${PY_VER_SUFFIX}/test/test_rea
 lib/python${PY_VER_SUFFIX}/test/test_regrtest.py
 lib/python${PY_VER_SUFFIX}/test/test_regrtest.pyc
 lib/python${PY_VER_SUFFIX}/test/test_regrtest.pyo
+lib/python${PY_VER_SUFFIX}/test/test_repl.py
+lib/python${PY_VER_SUFFIX}/test/test_repl.pyc
+lib/python${PY_VER_SUFFIX}/test/test_repl.pyo
 lib/python${PY_VER_SUFFIX}/test/test_reprlib.py
 lib/python${PY_VER_SUFFIX}/test/test_reprlib.pyc
 lib/python${PY_VER_SUFFIX}/test/test_reprlib.pyo
@@ -4701,6 +4712,7 @@ lib/python${PY_VER_SUFFIX}/test/win_cons
 lib/python${PY_VER_SUFFIX}/test/win_console_handler.pyc
 lib/python${PY_VER_SUFFIX}/test/win_console_handler.pyo
 lib/python${PY_VER_SUFFIX}/test/wrongcert.pem
+lib/python${PY_VER_SUFFIX}/test/xmltestdata/expat224_utf8_bug.xml
 lib/python${PY_VER_SUFFIX}/test/xmltestdata/simple-ns.xml
 lib/python${PY_VER_SUFFIX}/test/xmltestdata/simple.xml
 lib/python${PY_VER_SUFFIX}/test/xmltestdata/test.xml

Index: pkgsrc/lang/python36/dist.mk
diff -u pkgsrc/lang/python36/dist.mk:1.4 pkgsrc/lang/python36/dist.mk:1.5
--- pkgsrc/lang/python36/dist.mk:1.4    Thu Oct  5 08:17:25 2017
+++ pkgsrc/lang/python36/dist.mk        Tue Dec 19 09:37:14 2017
@@ -1,6 +1,6 @@
-# $NetBSD: dist.mk,v 1.4 2017/10/05 08:17:25 adam Exp $
+# $NetBSD: dist.mk,v 1.5 2017/12/19 09:37:14 adam Exp $
 
-PY_DISTVERSION=        3.6.3
+PY_DISTVERSION=        3.6.4
 DISTNAME=      Python-${PY_DISTVERSION}
 EXTRACT_SUFX=  .tar.xz
 DISTINFO_FILE= ${.CURDIR}/../../lang/python36/distinfo

Index: pkgsrc/lang/python36/distinfo
diff -u pkgsrc/lang/python36/distinfo:1.16 pkgsrc/lang/python36/distinfo:1.17
--- pkgsrc/lang/python36/distinfo:1.16  Wed Dec 13 12:56:10 2017
+++ pkgsrc/lang/python36/distinfo       Tue Dec 19 09:37:14 2017
@@ -1,20 +1,19 @@
-$NetBSD: distinfo,v 1.16 2017/12/13 12:56:10 jperkin Exp $
+$NetBSD: distinfo,v 1.17 2017/12/19 09:37:14 adam Exp $
 
-SHA1 (Python-3.6.3.tar.xz) = 6c71b14bdbc4d8aa0cfd59d4b6dc356d46abfdf5
-RMD160 (Python-3.6.3.tar.xz) = b29962b7233c74149670d8b83284d4265de5e769
-SHA512 (Python-3.6.3.tar.xz) = 32f24a3adcb7880003c7ecdc5e53e838e774adda76b308961d8215e28db630b2fa2828097817924c76afa4212b2df3362eb64d4e10f37c0147f512ec5aa8662b
-Size (Python-3.6.3.tar.xz) = 16974296 bytes
+SHA1 (Python-3.6.4.tar.xz) = 36a90695cda9298a0663e667c12909246c358851
+RMD160 (Python-3.6.4.tar.xz) = 0fd34bf6748133728106b0d12c354e8b45d62d79
+SHA512 (Python-3.6.4.tar.xz) = 09ba2103ac517ac4d262f00380c9aac836a53401ce252540c17fd821a3b92e1ddf32528d00772221eb3126b12cb95b62c3ac3e852f4951e6f2eb406c88c848a2
+Size (Python-3.6.4.tar.xz) = 16992824 bytes
 SHA1 (patch-Lib_distutils_command_install.py) = 6fc6f5d918b7581fc62cd0fe55857ee932c3a341
 SHA1 (patch-Lib_distutils_sysconfig.py) = 6822eafb4dfded86d7f7353831816aeb8119e6cf
 SHA1 (patch-Lib_distutils_unixccompiler.py) = e7aa684fa186de7a01486c3d8bfa177afdd22ef9
 SHA1 (patch-Lib_sysconfig.py) = a4f009ed73ebbd9d9c4bf7e12b7981182ed8fd7c
-SHA1 (patch-Makefile.pre.in) = 043fe791e021912d116800d397570d3fc201ab26
-SHA1 (patch-Modules___cursesmodule.c) = 2ab2779e0418a4529987641c254686ba05d28593
+SHA1 (patch-Makefile.pre.in) = c91aac5b238dbfe149be63a2486b6f4c5b959280
 SHA1 (patch-Modules_makesetup) = a06786eebffadecedba5e3a50a9785fb47613567
 SHA1 (patch-Modules_nismodule.c) = 1bafe9b06359586d027a77011b103877590d947d
-SHA1 (patch-Modules_socketmodule.c) = 706d8a925610e1c55af907accbe53c1e8102530d
+SHA1 (patch-Modules_socketmodule.c) = e6bdb8990cd9b8cf0b0ff48e6ae7b664681a9924
 SHA1 (patch-Modules_socketmodule.h) = 13a3290eb72078067060d3e71b7baa08f3eb591c
 SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
 SHA1 (patch-configure) = d999d63bd437500a3a8f176fcd5aa3c48ded836e
 SHA1 (patch-pyconfig.h.in) = 58e2c03489f9b6e4d88f144d8c09773f92eacd61
-SHA1 (patch-setup.py) = 1e14b84fc5cb21b3fa61755bf574021ba9b2ab81
+SHA1 (patch-setup.py) = 95d4b411b81e18635556af6c8c4e7af6a8a2a14c

Index: pkgsrc/lang/python36/patches/patch-Makefile.pre.in
diff -u pkgsrc/lang/python36/patches/patch-Makefile.pre.in:1.4 pkgsrc/lang/python36/patches/patch-Makefile.pre.in:1.5
--- pkgsrc/lang/python36/patches/patch-Makefile.pre.in:1.4      Wed Dec 13 12:56:10 2017
+++ pkgsrc/lang/python36/patches/patch-Makefile.pre.in  Tue Dec 19 09:37:14 2017
@@ -1,10 +1,11 @@
-$NetBSD: patch-Makefile.pre.in,v 1.4 2017/12/13 12:56:10 jperkin Exp $
+$NetBSD: patch-Makefile.pre.in,v 1.5 2017/12/19 09:37:14 adam Exp $
 
 Use only one optimisation level; needed for PLIST and setuptools compatibility.
 Do not build/install libpython3.so.
 Simplify _sysconfigdata to include only platform name.
+Swap targets libinstall and libainstall, to byte-compile python-config.py.
 
---- Makefile.pre.in.orig       2017-10-03 05:52:02.000000000 +0000
+--- Makefile.pre.in.orig       2017-12-19 04:53:56.000000000 +0000
 +++ Makefile.pre.in
 @@ -96,7 +96,7 @@ PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODI
  # be able to build extension modules using the directories specified in the
@@ -24,7 +25,7 @@ Simplify _sysconfigdata to include only 
  DLLLIBRARY=   @DLLLIBRARY@
  LDLIBRARYDIR=   @LDLIBRARYDIR@
  INSTSONAME=   @INSTSONAME@
-@@ -431,7 +431,7 @@ LIBRARY_OBJS=      \
+@@ -432,7 +432,7 @@ LIBRARY_OBJS=      \
  # On some systems, object files that reference DTrace probes need to be modified
  # in-place by dtrace(1).
  DTRACE_DEPS = \
@@ -33,15 +34,15 @@ Simplify _sysconfigdata to include only 
  # XXX: should gcmodule, etc. be here, too?
  
  #########################################################################
-@@ -867,7 +867,6 @@ regen-opcode-targets:
-       $(PYTHON_FOR_REGEN) $(srcdir)/Python/makeopcodetargets.py \
-               $(srcdir)/Python/opcode_targets.h
+@@ -886,7 +886,6 @@ regen-opcode-targets:
+               $(srcdir)/Python/opcode_targets.h.new
+       $(UPDATE_FILE) $(srcdir)/Python/opcode_targets.h $(srcdir)/Python/opcode_targets.h.new
  
 -Python/ceval.o: $(srcdir)/Python/opcode_targets.h $(srcdir)/Python/ceval_gil.h
  
  Python/frozen.o: $(srcdir)/Python/importlib.h $(srcdir)/Python/importlib_external.h
  
-@@ -876,13 +875,13 @@ Python/frozen.o: $(srcdir)/Python/import
+@@ -895,13 +894,13 @@ Python/frozen.o: $(srcdir)/Python/import
  # an include guard, so we can't use a pipeline to transform its output.
  Include/pydtrace_probes.h: $(srcdir)/Include/pydtrace.d
        $(MKDIR_P) Include
@@ -57,7 +58,16 @@ Simplify _sysconfigdata to include only 
  
  Objects/typeobject.o: Objects/typeslots.inc
  
-@@ -1141,7 +1140,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORK
+@@ -1102,7 +1101,7 @@ altinstall: commoninstall
+       fi
+ 
+ commoninstall:  check-clean-src @FRAMEWORKALTINSTALLFIRST@ \
+-              altbininstall libinstall inclinstall libainstall \
++              altbininstall libainstall inclinstall libinstall \
+               sharedinstall oldsharedinstall altmaninstall \
+               @FRAMEWORKALTINSTALLLAST@
+ 
+@@ -1161,7 +1160,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORK
                if test -n "$(PY3LIBRARY)"; then \
                        $(INSTALL_SHARED) $(PY3LIBRARY) $(DESTDIR)$(LIBDIR)/$(PY3LIBRARY); \
                fi; \
@@ -67,7 +77,7 @@ Simplify _sysconfigdata to include only 
        fi
        if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \
                rm -f $(DESTDIR)$(BINDIR)python$(VERSION)-32$(EXE); \
-@@ -1318,7 +1318,7 @@ libinstall:      build_all $(srcdir)/Modules/
+@@ -1338,7 +1338,7 @@ libinstall:      build_all $(srcdir)/Modules/
                        esac; \
                done; \
        done
@@ -76,7 +86,7 @@ Simplify _sysconfigdata to include only 
                $(DESTDIR)$(LIBDEST); \
        $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
        if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \
-@@ -1336,11 +1336,6 @@ libinstall:     build_all $(srcdir)/Modules/
+@@ -1356,11 +1356,6 @@ libinstall:     build_all $(srcdir)/Modules/
                -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
                $(DESTDIR)$(LIBDEST)
        -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
@@ -88,7 +98,7 @@ Simplify _sysconfigdata to include only 
                $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
                -d $(LIBDEST)/site-packages -f \
                -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
-@@ -1349,10 +1344,6 @@ libinstall:     build_all $(srcdir)/Modules/
+@@ -1369,10 +1364,6 @@ libinstall:     build_all $(srcdir)/Modules/
                -d $(LIBDEST)/site-packages -f \
                -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
        -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
@@ -99,7 +109,7 @@ Simplify _sysconfigdata to include only 
                $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
        -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
                $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt
-@@ -1453,7 +1444,7 @@ sharedinstall: sharedmods
+@@ -1473,7 +1464,7 @@ sharedinstall: sharedmods
                --install-scripts=$(BINDIR) \
                --install-platlib=$(DESTSHARED) \
                --root=$(DESTDIR)/

Index: pkgsrc/lang/python36/patches/patch-Modules_socketmodule.c
diff -u pkgsrc/lang/python36/patches/patch-Modules_socketmodule.c:1.1 pkgsrc/lang/python36/patches/patch-Modules_socketmodule.c:1.2
--- pkgsrc/lang/python36/patches/patch-Modules_socketmodule.c:1.1       Tue May 30 13:36:39 2017
+++ pkgsrc/lang/python36/patches/patch-Modules_socketmodule.c   Tue Dec 19 09:37:14 2017
@@ -1,10 +1,10 @@
-$NetBSD: patch-Modules_socketmodule.c,v 1.1 2017/05/30 13:36:39 bouyer Exp $
+$NetBSD: patch-Modules_socketmodule.c,v 1.2 2017/12/19 09:37:14 adam Exp $
 
 Support NetBSD's socketcan implementation
 
---- Modules/socketmodule.c.orig        2017-05-30 13:31:59.096006411 +0200
-+++ Modules/socketmodule.c     2017-05-30 13:37:39.696032387 +0200
-@@ -1405,8 +1405,13 @@
+--- Modules/socketmodule.c.orig        2017-12-19 04:53:56.000000000 +0000
++++ Modules/socketmodule.c
+@@ -1375,8 +1375,13 @@ makesockaddr(SOCKET_T sockfd, struct soc
          /* need to look up interface name given index */
          if (a->can_ifindex) {
              ifr.ifr_ifindex = a->can_ifindex;
@@ -18,23 +18,23 @@ Support NetBSD's socketcan implementatio
          }
  
          return Py_BuildValue("O&h", PyUnicode_DecodeFSDefault,
-@@ -1905,12 +1910,14 @@
+@@ -1878,12 +1883,14 @@ getsockaddrarg(PySocketSockObject *s, Py
      }
- #endif
+ #endif /* HAVE_LINUX_TIPC_H */
  
--#if defined(AF_CAN) && defined(CAN_RAW) && defined(CAN_BCM)
-+#if defined(AF_CAN) && defined(CAN_RAW)
+-#if defined(AF_CAN) && defined(CAN_RAW) && defined(CAN_BCM) && defined(SIOCGIFINDEX)
++#if defined(AF_CAN) && defined(CAN_RAW) && defined(SIOCGIFINDEX)
      case AF_CAN:
          switch (s->sock_proto) {
          case CAN_RAW:
-+#ifdef CAN_BCM
++#if defined(CAN_BCM)
          /* fall-through */
          case CAN_BCM:
 +#endif
          {
              struct sockaddr_can *addr;
              PyObject *interfaceName;
-@@ -1930,7 +1937,12 @@
+@@ -1903,7 +1910,12 @@ getsockaddrarg(PySocketSockObject *s, Py
              } else if ((size_t)len < sizeof(ifr.ifr_name)) {
                  strncpy(ifr.ifr_name, PyBytes_AS_STRING(interfaceName), sizeof(ifr.ifr_name));
                  ifr.ifr_name[(sizeof(ifr.ifr_name))-1] = '\0';
@@ -48,7 +48,7 @@ Support NetBSD's socketcan implementatio
                      s->errorhandler();
                      Py_DECREF(interfaceName);
                      return 0;
-@@ -7136,6 +7148,20 @@
+@@ -7111,6 +7123,20 @@ PyInit__socket(void)
      PyModule_AddIntConstant(m, "CAN_BCM_RX_TIMEOUT", RX_TIMEOUT);
      PyModule_AddIntConstant(m, "CAN_BCM_RX_CHANGED", RX_CHANGED);
  #endif

Index: pkgsrc/lang/python36/patches/patch-setup.py
diff -u pkgsrc/lang/python36/patches/patch-setup.py:1.3 pkgsrc/lang/python36/patches/patch-setup.py:1.4
--- pkgsrc/lang/python36/patches/patch-setup.py:1.3     Thu Mar 30 11:42:58 2017
+++ pkgsrc/lang/python36/patches/patch-setup.py Tue Dec 19 09:37:14 2017
@@ -1,8 +1,8 @@
-$NetBSD: patch-setup.py,v 1.3 2017/03/30 11:42:58 adam Exp $
+$NetBSD: patch-setup.py,v 1.4 2017/12/19 09:37:14 adam Exp $
 
 Disable modules, so they can be built as separate packages.
 
---- setup.py.orig      2017-03-21 06:32:38.000000000 +0000
+--- setup.py.orig      2017-12-19 04:53:56.000000000 +0000
 +++ setup.py
 @@ -8,6 +8,7 @@ import importlib.util
  import sysconfig
@@ -22,7 +22,7 @@ Disable modules, so they can be built as
  
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (after any relative
-@@ -487,15 +489,15 @@ class PyBuildExt(build_ext):
+@@ -512,15 +514,15 @@ class PyBuildExt(build_ext):
              return ['m']
  
      def detect_modules(self):
@@ -47,7 +47,7 @@ Disable modules, so they can be built as
          self.add_multiarch_paths()
  
          # Add paths specified in the environment variables LDFLAGS and
-@@ -812,8 +814,7 @@ class PyBuildExt(build_ext):
+@@ -842,8 +844,7 @@ class PyBuildExt(build_ext):
                                 depends = ['socketmodule.h']) )
          # Detect SSL support for the socket module (via _ssl)
          search_for_ssl_incs_in = [
@@ -57,7 +57,7 @@ Disable modules, so they can be built as
                               ]
          ssl_incs = find_file('openssl/ssl.h', inc_dirs,
                               search_for_ssl_incs_in
-@@ -824,9 +825,7 @@ class PyBuildExt(build_ext):
+@@ -854,9 +855,7 @@ class PyBuildExt(build_ext):
              if krb5_h:
                  ssl_incs += krb5_h
          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
@@ -68,7 +68,7 @@ Disable modules, so they can be built as
  
          if (ssl_incs is not None and
              ssl_libs is not None):
-@@ -845,7 +844,7 @@ class PyBuildExt(build_ext):
+@@ -875,7 +874,7 @@ class PyBuildExt(build_ext):
  
          # look for the openssl version header on the compiler search path.
          opensslv_h = find_file('openssl/opensslv.h', [],
@@ -77,7 +77,7 @@ Disable modules, so they can be built as
          if opensslv_h:
              name = os.path.join(opensslv_h[0], 'openssl/opensslv.h')
              if host_platform == 'darwin' and is_macosx_sdk_path(name):
-@@ -1242,6 +1241,30 @@ class PyBuildExt(build_ext):
+@@ -1275,6 +1274,30 @@ class PyBuildExt(build_ext):
          dbm_order = ['gdbm']
          # The standard Unix dbm module:
          if host_platform not in ['cygwin']:
@@ -108,7 +108,7 @@ Disable modules, so they can be built as
              config_args = [arg.strip("'")
                             for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
              dbm_args = [arg for arg in config_args
-@@ -1253,7 +1276,7 @@ class PyBuildExt(build_ext):
+@@ -1286,7 +1309,7 @@ class PyBuildExt(build_ext):
              dbmext = None
              for cand in dbm_order:
                  if cand == "ndbm":
@@ -117,7 +117,7 @@ Disable modules, so they can be built as
                          # Some systems have -lndbm, others have -lgdbm_compat,
                          # others don't have either
                          if self.compiler.find_library_file(lib_dirs,
-@@ -2060,10 +2083,7 @@ class PyBuildExt(build_ext):
+@@ -2105,10 +2128,7 @@ class PyBuildExt(build_ext):
              depends = ['_decimal/docstrings.h']
          else:
              srcdir = sysconfig.get_config_var('srcdir')
@@ -129,7 +129,7 @@ Disable modules, so they can be built as
              libraries = self.detect_math_libs()
              sources = [
                '_decimal/_decimal.c',
-@@ -2300,7 +2320,7 @@ def main():
+@@ -2345,7 +2365,7 @@ def main():
            # If you change the scripts installed here, you also need to
            # check the PyBuildScripts command above, and change the links
            # created by the bininstall target in Makefile.pre.in

Prev by Date: CVS commit: pkgsrc/graphics/inkscape
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/graphics/inkscape
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index