Update to version 3.4.2.

Two deleted patches were integrated upstream.

Reviewed by:	koobs in D967

4 files changed, 17 insertions, 108 deletions

diff --git a/lang/python34/files/patch-Makefile.pre.in b/lang/python34/files/patch-Makefile.pre.in
index c50727846803..40a05e389a9c 100644
--- a/lang/python34/files/patch-Makefile.pre.in
+++ b/lang/python34/files/patch-Makefile.pre.in
@@ -6,13 +6,17 @@
 # Submitted by: antoine@ (r358029)
 # TODO: Upstream
 
---- ./Makefile.pre.in.orig	2014-05-19 05:19:39.000000000 +0000
-+++ ./Makefile.pre.in	2014-06-15 12:12:17.000000000 +0000
-@@ -70,18 +70,15 @@
+--- Makefile.pre.in.orig	2014-10-08 12:18:14.000000000 +0400
++++ Makefile.pre.in	2014-10-19 12:37:14.000000000 +0400
+@@ -70,23 +70,20 @@
  OPT=		@OPT@
  BASECFLAGS=	@BASECFLAGS@
  BASECPPFLAGS=	@BASECPPFLAGS@
 -CONFIGURE_CFLAGS=	@CFLAGS@
+ # CFLAGS_NODIST is used for building the interpreter and stdlib C extensions.
+ # Use it when a compiler flag should _not_ be part of the distutils CFLAGS
+ # once Python is installed (Issue #21121).
+ CONFIGURE_CFLAGS_NODIST=@CFLAGS_NODIST@
 -CONFIGURE_CPPFLAGS=	@CPPFLAGS@
 -CONFIGURE_LDFLAGS=	@LDFLAGS@
  # Avoid assigning CFLAGS, LDFLAGS, etc. so users can use them on the
@@ -20,6 +24,7 @@
  # values.
 -PY_CFLAGS=	$(BASECFLAGS) $(OPT) $(CONFIGURE_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
 +PY_CFLAGS=	$(BASECFLAGS) $(OPT) $(CFLAGS) $(EXTRA_CFLAGS)
+ PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODIST) $(CFLAGS_NODIST)
  # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to
  # be able to build extension modules using the directories specified in the
  # environment variables
@@ -30,7 +35,7 @@
  NO_AS_NEEDED=	@NO_AS_NEEDED@
  LDLAST=		@LDLAST@
  SGI_ABI=	@SGI_ABI@
-@@ -1065,12 +1062,6 @@
+@@ -1080,12 +1077,6 @@
  	else true; \
  	fi
  	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python3$(EXE))
@@ -43,7 +48,7 @@
  	-rm -f $(DESTDIR)$(BINDIR)/python3-config
  	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python3-config)
  	-rm -f $(DESTDIR)$(LIBPC)/python3.pc
-@@ -1333,6 +1324,12 @@
+@@ -1348,6 +1339,12 @@
  	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
  	$(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py
  	$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config
diff --git a/lang/python34/files/patch-Modules-_ctypes-libffi-configure b/lang/python34/files/patch-Modules-_ctypes-libffi-configure
index 8228ccc55eb0..f366a72b288f 100644
--- a/lang/python34/files/patch-Modules-_ctypes-libffi-configure
+++ b/lang/python34/files/patch-Modules-_ctypes-libffi-configure
@@ -1,11 +1,11 @@
---- ./Modules/_ctypes/libffi/configure.orig	2013-05-15 20:32:57.000000000 +0400
-+++ ./Modules/_ctypes/libffi/configure	2013-05-18 10:56:03.000000000 +0400
-@@ -6889,7 +6889,7 @@
+--- Modules/_ctypes/libffi/configure.orig	2014-10-08 12:18:14.000000000 +0400
++++ Modules/_ctypes/libffi/configure	2014-10-19 12:39:11.000000000 +0400
+@@ -7526,7 +7526,7 @@
    rm -rf conftest*
    ;;
  
--x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+amd64-*-freebsd*|x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
++amd64-*-freebsd*|x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
  s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-   # Find out which ABI we are using.
-   echo 'int i;' > conftest.$ac_ext
+   # Find out what ABI is being produced by ac_compile, and set linker
+   # options accordingly.  Note that the listed cases only cover the
diff --git a/lang/python34/files/patch-issue21166 b/lang/python34/files/patch-issue21166
deleted file mode 100644
index 04bcd0406048..000000000000
--- a/lang/python34/files/patch-issue21166
+++ /dev/null
@@ -1,74 +0,0 @@
-# HG changeset patch
-# User Ned Deily <nad@acm.org>
-# Date 1408739569 25200
-# Node ID e52d85f2e2846453dd0503613d28cf6967f113d7
-# Parent  d99014320220951707f79d114ae33f8c5a372a87
-Issue #21166: Prevent possible segfaults and other random failures of
-python --generate-posix-vars in pybuilddir.txt build target by ensuring
-that pybuilddir.txt is always regenerated when configure is run and
-that the newly built skeleton python does not inadvertently import
-modules from previously installed instances.
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
---- Makefile.pre.in
-+++ Makefile.pre.in
-@@ -546,8 +546,18 @@ platform: $(BUILDPYTHON) pybuilddir.txt
- # Create build directory and generate the sysconfig build-time data there.
- # pybuilddir.txt contains the name of the build dir and is used for
- # sys.path fixup -- see Modules/getpath.c.
-+# Since this step runs before shared modules are built, try to avoid bootstrap
-+# problems by creating a dummy pybuildstr.txt just to allow interpreter
-+# initialization to succeed.  It will be overwritten by generate-posix-vars
-+# or removed in case of failure.
- pybuilddir.txt: $(BUILDPYTHON)
--	$(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars
-+	@echo "none" > ./pybuilddir.txt
-+	$(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars ;\
-+	if test $$? -ne 0 ; then \
-+		echo "generate-posix-vars failed" ; \
-+		rm -f ./pybuilddir.txt ; \
-+		exit 1 ; \
-+	fi
- 
- # Build the shared modules
- # Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for
-diff --git a/Misc/NEWS b/Misc/NEWS
---- Misc/NEWS
-+++ Misc/NEWS
-@@ -242,6 +242,9 @@ Build
- 
- - Issue #21811: Anticipated fixes to support OS X versions > 10.9.
- 
-+- Issue #21166: Prevent possible segfaults and other random failures of
-+  python --generate-posix-vars in pybuilddir.txt build target.
-+
- IDLE
- ----
- 
-diff --git a/configure b/configure
---- configure
-+++ configure
-@@ -2950,6 +2950,9 @@ case $host_os in *\ *) host_os=`echo "$h
- 
- 
- 
-+# pybuilddir.txt will be created by --generate-posix-vars in the Makefile
-+rm -f pybuilddir.txt
-+
- if test "$cross_compiling" = yes; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python interpreter for cross build" >&5
- $as_echo_n "checking for python interpreter for cross build... " >&6; }
-diff --git a/configure.ac b/configure.ac
---- configure.ac
-+++ configure.ac
-@@ -53,6 +53,9 @@ AC_CANONICAL_HOST
- AC_SUBST(build)
- AC_SUBST(host)
- 
-+# pybuilddir.txt will be created by --generate-posix-vars in the Makefile
-+rm -f pybuilddir.txt
-+
- if test "$cross_compiling" = yes; then
-     AC_MSG_CHECKING([for python interpreter for cross build])
-     if test -z "$PYTHON_FOR_BUILD"; then
-
diff --git a/lang/python34/files/patch-issue21704 b/lang/python34/files/patch-issue21704
deleted file mode 100644
index f072564fc15c..000000000000
--- a/lang/python34/files/patch-issue21704
+++ /dev/null
@@ -1,22 +0,0 @@
-# HG changeset patch
-# User Richard Oudkerk <shibturn@gmail.com>
-# Date 1406584862 -3600
-# Node ID f618f673920043e31d8dee20b35c3e6f3e271178
-# Parent  a1e01081e731a1214793cd4b5b4fc89fe6202357
-Issue #21704: Fix build error for _multiprocessing when semaphores
-are not available.  Patch by Arfrever Frehtes Taifersar Arahesis.
-
-diff --git a/Modules/_multiprocessing/multiprocessing.c b/Modules/_multiprocessing/multiprocessing.c
---- Modules/_multiprocessing/multiprocessing.c
-+++ Modules/_multiprocessing/multiprocessing.c
-@@ -128,7 +128,9 @@ static PyMethodDef module_methods[] = {
-     {"recv", multiprocessing_recv, METH_VARARGS, ""},
-     {"send", multiprocessing_send, METH_VARARGS, ""},
- #endif
-+#ifndef POSIX_SEMAPHORES_NOT_ENABLED
-     {"sem_unlink", _PyMp_sem_unlink, METH_VARARGS, ""},
-+#endif
-     {NULL}
- };
- 
-