Python 3.6.2 is the second maintenance release of Python 3.6, which was initially released in 2016-12 to great interest. With the release of 3.6.2, we are now providing the second set of bugfixes and documentation updates to 3.6. Detailed information about the changes made in 3.6.2 can be found in its change log.

6 files changed, 45 insertions, 47 deletions

diff --git a/lang/python36/Makefile b/lang/python36/Makefile
index c7abf5e1403..3219110a770 100644
--- a/lang/python36/Makefile
+++ b/lang/python36/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2017/05/30 14:08:26 maya Exp $
+# $NetBSD: Makefile,v 1.9 2017/07/18 13:43:39 adam Exp $
 
 .include "dist.mk"
 
 PKGNAME=	python36-${PY_DISTVERSION}
 CATEGORIES=	lang python
-PKGREVISION=	2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.python.org/
diff --git a/lang/python36/PLIST b/lang/python36/PLIST
index de883409c59..4a91462da8d 100644
--- a/lang/python36/PLIST
+++ b/lang/python36/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2017/05/23 10:53:56 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.6 2017/07/18 13:43:39 adam Exp $
 bin/2to3-${PY_VER_SUFFIX}
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
@@ -2473,7 +2473,6 @@ lib/python${PY_VER_SUFFIX}/telnetlib.pyo
 lib/python${PY_VER_SUFFIX}/tempfile.py
 lib/python${PY_VER_SUFFIX}/tempfile.pyc
 lib/python${PY_VER_SUFFIX}/tempfile.pyo
-lib/python${PY_VER_SUFFIX}/test/185test.db
 lib/python${PY_VER_SUFFIX}/test/Sine-1000Hz-300ms.aif
 lib/python${PY_VER_SUFFIX}/test/__init__.py
 lib/python${PY_VER_SUFFIX}/test/__init__.pyc
diff --git a/lang/python36/dist.mk b/lang/python36/dist.mk
index 32cd36806ee..917935ae3f0 100644
--- a/lang/python36/dist.mk
+++ b/lang/python36/dist.mk
@@ -1,6 +1,6 @@
-# $NetBSD: dist.mk,v 1.2 2017/03/30 11:42:58 adam Exp $
+# $NetBSD: dist.mk,v 1.3 2017/07/18 13:43:39 adam Exp $
 
-PY_DISTVERSION=	3.6.1
+PY_DISTVERSION=	3.6.2
 DISTNAME=	Python-${PY_DISTVERSION}
 EXTRACT_SUFX=	.tar.xz
 DISTINFO_FILE=	${.CURDIR}/../../lang/python36/distinfo
diff --git a/lang/python36/distinfo b/lang/python36/distinfo
index 039a44a93c6..ad1c397f815 100644
--- a/lang/python36/distinfo
+++ b/lang/python36/distinfo
@@ -1,21 +1,21 @@
-$NetBSD: distinfo,v 1.12 2017/05/30 13:57:16 wiz Exp $
+$NetBSD: distinfo,v 1.13 2017/07/18 13:43:39 adam Exp $
 
-SHA1 (Python-3.6.1.tar.xz) = 91d880a2a9fcfc6753cbfa132bf47a47e17e7b16
-RMD160 (Python-3.6.1.tar.xz) = 77e70ec6a07b9c17a99ac1df503f12f3a4c49fce
-SHA512 (Python-3.6.1.tar.xz) = 8605fb7019386fec227d4b06d06f00ae500a8a89df289bfe6141bb56196c75483a60cc0ee553930742b31cefce68add5ccf226e0f27b7b915f5026d597e1ac29
-Size (Python-3.6.1.tar.xz) = 16872064 bytes
+SHA1 (Python-3.6.2.tar.xz) = 4f92a045de9231b93dfbed50c66bb12cf03ac59a
+RMD160 (Python-3.6.2.tar.xz) = 243d052f3e54426d77d41b33d01adba598dc4d65
+SHA512 (Python-3.6.2.tar.xz) = a8270a09a9e9b39f69ece6cdade2fa964665d2107b5acbad4453f1b921107b329c697c137185928fb4a576fc0f2ae2a98dbf26a8b7ea17219e990ddbc216db8b
+Size (Python-3.6.2.tar.xz) = 16907204 bytes
 SHA1 (patch-Include_py__curses.h) = 14359f8d0527eff08073c0aea60dfe8961d9255d
 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) = cb93d2cbb9e395a92d144ec45ede91bea744dca9
+SHA1 (patch-Makefile.pre.in) = 7d3724319c8d5a116364af0b85c1af2726bbc593
 SHA1 (patch-Modules___cursesmodule.c) = 2ab2779e0418a4529987641c254686ba05d28593
 SHA1 (patch-Modules_makesetup) = a06786eebffadecedba5e3a50a9785fb47613567
 SHA1 (patch-Modules_nismodule.c) = 1bafe9b06359586d027a77011b103877590d947d
 SHA1 (patch-Modules_socketmodule.c) = 706d8a925610e1c55af907accbe53c1e8102530d
 SHA1 (patch-Modules_socketmodule.h) = 13a3290eb72078067060d3e71b7baa08f3eb591c
 SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
-SHA1 (patch-configure) = 4ff8db02b5919f2e297e91411aa64806f2fca3c1
+SHA1 (patch-configure) = d999d63bd437500a3a8f176fcd5aa3c48ded836e
 SHA1 (patch-pyconfig.h.in) = 58e2c03489f9b6e4d88f144d8c09773f92eacd61
 SHA1 (patch-setup.py) = 1e14b84fc5cb21b3fa61755bf574021ba9b2ab81
diff --git a/lang/python36/patches/patch-Makefile.pre.in b/lang/python36/patches/patch-Makefile.pre.in
index 032eabc25b7..9acf9fd4554 100644
--- a/lang/python36/patches/patch-Makefile.pre.in
+++ b/lang/python36/patches/patch-Makefile.pre.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile.pre.in,v 1.2 2017/05/23 10:53:56 jperkin Exp $
+$NetBSD: patch-Makefile.pre.in,v 1.3 2017/07/18 13:43:40 adam Exp $
 
 Use only one optimisation level; needed for PLIST and setuptools compatibility.
 
 Simplify _sysconfigdata to include only platform name.
 
---- Makefile.pre.in.orig	2017-03-21 06:32:38.000000000 +0000
+--- Makefile.pre.in.orig	2017-07-08 03:33:27.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
@@ -15,7 +15,7 @@ Simplify _sysconfigdata to include only platform name.
  NO_AS_NEEDED=	@NO_AS_NEEDED@
  LDLAST=		@LDLAST@
  SGI_ABI=	@SGI_ABI@
-@@ -463,7 +463,7 @@ LIBRARY_OBJS=	\
+@@ -431,7 +431,7 @@ LIBRARY_OBJS=	\
  # On some systems, object files that reference DTrace probes need to be modified
  # in-place by dtrace(1).
  DTRACE_DEPS = \
@@ -24,18 +24,18 @@ Simplify _sysconfigdata to include only platform name.
  # XXX: should gcmodule, etc. be here, too?
  
  #########################################################################
-@@ -871,7 +871,6 @@ Objects/setobject.o: $(srcdir)/Objects/s
- $(OPCODETARGETS_H): $(OPCODETARGETGEN_FILES)
- 	$(PYTHON_FOR_GEN) $(OPCODETARGETGEN) $(OPCODETARGETS_H)
+@@ -867,7 +867,6 @@ regen-opcode-targets:
+ 	$(PYTHON_FOR_REGEN) $(srcdir)/Python/makeopcodetargets.py \
+ 		$(srcdir)/Python/opcode_targets.h
  
--Python/ceval.o: $(OPCODETARGETS_H) $(srcdir)/Python/ceval_gil.h
+-Python/ceval.o: $(srcdir)/Python/opcode_targets.h $(srcdir)/Python/ceval_gil.h
  
- Python/frozen.o: Python/importlib.h Python/importlib_external.h
+ Python/frozen.o: $(srcdir)/Python/importlib.h $(srcdir)/Python/importlib_external.h
  
-@@ -879,13 +878,13 @@ Python/frozen.o: Python/importlib.h Pyth
- # follow our naming conventions. dtrace(1) uses the output filename to generate
+@@ -876,13 +875,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
 -	$(DTRACE) $(DFLAGS) -o $@ -h -s $<
 +	$(DTRACE) $(DFLAGS) -o $@ -h -s $(srcdir)/Include/pydtrace.d
  	: sed in-place edit with POSIX-only tools
@@ -47,8 +47,8 @@ Simplify _sysconfigdata to include only platform name.
 +	$(DTRACE) $(DFLAGS) -o $@ -G -s $(srcdir)/Include/pydtrace.d $(DTRACE_DEPS)
  
  Objects/typeobject.o: Objects/typeslots.inc
- Objects/typeslots.inc: $(srcdir)/Include/typeslots.h $(srcdir)/Objects/typeslots.py
-@@ -1126,7 +1125,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORK
+ 
+@@ -1129,7 +1128,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORK
  		if test -n "$(PY3LIBRARY)"; then \
  			$(INSTALL_SHARED) $(PY3LIBRARY) $(DESTDIR)$(LIBDIR)/$(PY3LIBRARY); \
  		fi; \
@@ -58,7 +58,7 @@ Simplify _sysconfigdata to include only platform name.
  	fi
  	if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \
  		rm -f $(DESTDIR)$(BINDIR)python$(VERSION)-32$(EXE); \
-@@ -1301,7 +1301,7 @@ libinstall:	build_all $(srcdir)/Modules/
+@@ -1304,7 +1304,7 @@ libinstall:	build_all $(srcdir)/Modules/
  			esac; \
  		done; \
  	done
@@ -67,7 +67,7 @@ Simplify _sysconfigdata to include only platform name.
  		$(DESTDIR)$(LIBDEST); \
  	$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
  	if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \
-@@ -1319,11 +1319,6 @@ libinstall:	build_all $(srcdir)/Modules/
+@@ -1322,11 +1322,6 @@ libinstall:	build_all $(srcdir)/Modules/
  		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
  		$(DESTDIR)$(LIBDEST)
  	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
@@ -79,7 +79,7 @@ Simplify _sysconfigdata to include only platform name.
  		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
  		-d $(LIBDEST)/site-packages -f \
  		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
-@@ -1332,10 +1327,6 @@ libinstall:	build_all $(srcdir)/Modules/
+@@ -1335,10 +1330,6 @@ libinstall:	build_all $(srcdir)/Modules/
  		-d $(LIBDEST)/site-packages -f \
  		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
  	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
@@ -90,7 +90,7 @@ Simplify _sysconfigdata to include only platform name.
  		$(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
-@@ -1436,7 +1427,7 @@ sharedinstall: sharedmods
+@@ -1439,7 +1430,7 @@ sharedinstall: sharedmods
  		--install-scripts=$(BINDIR) \
  		--install-platlib=$(DESTSHARED) \
  		--root=$(DESTDIR)/
diff --git a/lang/python36/patches/patch-configure b/lang/python36/patches/patch-configure
index a15b3d31e87..ed588adb38a 100644
--- a/lang/python36/patches/patch-configure
+++ b/lang/python36/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.9 2017/05/30 13:57:16 wiz Exp $
+$NetBSD: patch-configure,v 1.10 2017/07/18 13:43:40 adam Exp $
 
 Simplify _sysconfigdata to include only platform name.
 
@@ -13,18 +13,18 @@ Use gnu99 instead of c99 to avoid "alloca() undefined" problems on macppc.
 
 detect netcan/can.h on NetBSD
 
---- configure.orig	2017-03-21 07:32:38.000000000 +0100
-+++ configure	2017-05-30 12:34:22.173986489 +0200
-@@ -2928,7 +2928,7 @@
+--- configure.orig	2017-07-08 03:33:27.000000000 +0000
++++ configure
+@@ -2925,7 +2925,7 @@ $as_echo_n "checking for python interpre
  	fi
          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $interp" >&5
  $as_echo "$interp" >&6; }
 -	PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$interp
 +	PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(MACHDEP) '$interp
      fi
-     # Used to comment out stuff for rebuilding generated files
-     GENERATED_COMMENT='#'
-@@ -3324,7 +3324,7 @@
+ elif test "$cross_compiling" = maybe; then
+     as_fn_error $? "Cross compiling required --host=HOST-TUPLE and --build=ARCH" "$LINENO" 5
+@@ -3317,7 +3317,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.
@@ -33,7 +33,7 @@ detect netcan/can.h on NetBSD
      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
-@@ -5969,7 +5969,7 @@
+@@ -5962,7 +5962,7 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
  	      PY3LIBRARY=libpython3.so
  	  fi
            ;;
@@ -42,7 +42,7 @@ detect netcan/can.h on NetBSD
  	  LDLIBRARY='libpython$(LDVERSION).so'
  	  BLDLIBRARY='-L. -lpython$(LDVERSION)'
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
-@@ -6897,7 +6897,7 @@
+@@ -6937,7 +6937,7 @@ UNIVERSAL_ARCH_FLAGS=
  # tweak BASECFLAGS based on compiler and platform
  case $GCC in
  yes)
@@ -51,7 +51,7 @@ detect netcan/can.h on NetBSD
  
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wextra" >&5
  $as_echo_n "checking for -Wextra... " >&6; }
-@@ -8072,7 +8072,7 @@
+@@ -8112,7 +8112,7 @@ done
  
  
  # On Linux, can.h and can/raw.h require sys/socket.h
@@ -60,7 +60,7 @@ detect netcan/can.h on NetBSD
  do :
    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
-@@ -9188,8 +9188,8 @@
+@@ -9228,8 +9228,8 @@ then
  			LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
  		else
  			# No framework, use the Python app as bundle-loader
@@ -71,7 +71,7 @@ detect netcan/can.h on NetBSD
  			LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
  		fi ;;
  	Darwin/*)
-@@ -9213,9 +9213,9 @@
+@@ -9253,9 +9253,9 @@ then
  				LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
  			else
  				# No framework, use the Python app as bundle-loader
@@ -84,7 +84,7 @@ detect netcan/can.h on NetBSD
  			fi
  		else
  			# building for OS X 10.3 and later
-@@ -9254,6 +9254,9 @@
+@@ -9294,6 +9294,9 @@ then
  				   ;;
  				esac
  		fi;;
@@ -94,7 +94,7 @@ detect netcan/can.h on NetBSD
  	NetBSD*|DragonFly*)
  		LDSHARED='$(CC) -shared'
  		LDCXXSHARED='$(CXX) -shared';;
-@@ -9298,7 +9301,7 @@
+@@ -9338,7 +9341,7 @@ then
  	Linux-android*) ;;
  	Linux*|GNU*) CCSHARED="-fPIC";;
  	BSD/OS*/4*) CCSHARED="-fpic";;
@@ -103,7 +103,7 @@ detect netcan/can.h on NetBSD
  	OpenUNIX*|UnixWare*)
  		if test "$GCC" = "yes"
  		then CCSHARED="-fPIC"
-@@ -9348,7 +9351,7 @@
+@@ -9388,7 +9391,7 @@ then
  	OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
  	SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
  	ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
@@ -112,7 +112,7 @@ detect netcan/can.h on NetBSD
  		if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
  		then
  			LINKFORSHARED="-Wl,--export-dynamic"
-@@ -11122,7 +11125,7 @@
+@@ -11165,7 +11168,7 @@ if ${ac_cv_dtrace_link+:} false; then :
    $as_echo_n "(cached) " >&6
  else
                ac_cv_dtrace_link=no
@@ -121,7 +121,7 @@ detect netcan/can.h on NetBSD
              "$DTRACE" -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \
                  ac_cv_dtrace_link=yes
  
-@@ -14949,8 +14952,6 @@
+@@ -14992,8 +14995,6 @@ $as_echo "$SOABI" >&6; }
  
  
  case $ac_sys_system in
@@ -130,7 +130,7 @@ detect netcan/can.h on NetBSD
      *)
  	EXT_SUFFIX=${SHLIB_SUFFIX};;
  esac
-@@ -14962,11 +14963,7 @@
+@@ -15005,11 +15006,7 @@ LDVERSION='$(VERSION)$(ABIFLAGS)'
  $as_echo "$LDVERSION" >&6; }