- Update to 3.5.3

PR:		216336
Submitted by:	wen@(myself)
Exp-run:	antoine@

4 files changed, 8 insertions, 87 deletions

diff --git a/lang/python35/files/patch-Include__pyport.h b/lang/python35/files/patch-Include__pyport.h
deleted file mode 100644
index b0d54e32a47c..000000000000
--- a/lang/python35/files/patch-Include__pyport.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- Include/pyport.h.orig	2015-12-07 02:39:07.000000000 +0100
-+++ Include/pyport.h	2016-04-03 19:31:36.801717000 +0200
-@@ -677,7 +677,9 @@
- 
- #ifdef __FreeBSD__
- #include <osreldate.h>
--#if __FreeBSD_version > 500039
-+#if (__FreeBSD_version >= 500040 && __FreeBSD_version < 602113) || \
-+    (__FreeBSD_version >= 700000 && __FreeBSD_version < 700054) || \
-+    (__FreeBSD_version >= 800000 && __FreeBSD_version < 800001)
- # define _PY_PORT_CTYPE_UTF8_ISSUE
- #endif
- #endif
diff --git a/lang/python35/files/patch-Lib__distutils__unixccompiler.py b/lang/python35/files/patch-Lib__distutils__unixccompiler.py
deleted file mode 100644
index 3012c52a85cd..000000000000
--- a/lang/python35/files/patch-Lib__distutils__unixccompiler.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# Description: Some python extensions can't be compiled with clang 3.4
-# Issue ID: http://bugs.python.org/issue20767
-# Submitted by: antoine
-
---- ./Lib/distutils/unixccompiler.py.orig	2014-03-09 15:25:15.921204441 +1100
-+++ ./Lib/distutils/unixccompiler.py	2014-03-09 15:25:50.643809649 +1100
-@@ -225,6 +225,8 @@
-         if sys.platform[:6] == "darwin":
-             # MacOSX's linker doesn't understand the -R flag at all
-             return "-L" + dir
-+        elif sys.platform[:7] == "freebsd":
-+            return "-Wl,-rpath=" + dir
-         elif sys.platform[:5] == "hp-ux":
-             if self._is_gcc(compiler):
-                 return ["-Wl,+s", "-L" + dir]
diff --git a/lang/python35/files/patch-Makefile.pre.in b/lang/python35/files/patch-Makefile.pre.in
index 6c7580621f26..653f389204c0 100644
--- a/lang/python35/files/patch-Makefile.pre.in
+++ b/lang/python35/files/patch-Makefile.pre.in
@@ -6,9 +6,9 @@
 # Submitted by: antoine@ (r358029)
 # TODO: Upstream
 
---- Makefile.pre.in.orig	2015-09-08 00:49:41 UTC
-+++ Makefile.pre.in
-@@ -70,23 +70,20 @@ MAKESETUP=      $(srcdir)/Modules/makese
+--- Makefile.pre.in.orig	2017-01-21 18:48:21.942822000 +0800
++++ Makefile.pre.in	2017-01-21 18:55:44.342228000 +0800
+@@ -76,23 +76,20 @@
  OPT=		@OPT@
  BASECFLAGS=	@BASECFLAGS@
  BASECPPFLAGS=	@BASECPPFLAGS@
@@ -28,14 +28,14 @@
  # 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
--PY_CPPFLAGS=	$(BASECPPFLAGS) -I. -IInclude -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS)
+-PY_CPPFLAGS=	$(BASECPPFLAGS) -I. -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS)
 -PY_LDFLAGS=	$(CONFIGURE_LDFLAGS) $(LDFLAGS)
-+PY_CPPFLAGS=	$(BASECPPFLAGS) -I. -IInclude -I$(srcdir)/Include $(CPPFLAGS)
++PY_CPPFLAGS=	$(BASECPPFLAGS) -I. -I$(srcdir)/Include $(CPPFLAGS)
 +PY_LDFLAGS=	$(LDFLAGS)
  NO_AS_NEEDED=	@NO_AS_NEEDED@
  LDLAST=		@LDLAST@
  SGI_ABI=	@SGI_ABI@
-@@ -1100,12 +1097,6 @@ bininstall: altbininstall
+@@ -1130,12 +1127,6 @@
  	else true; \
  	fi
  	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python3$(EXE))
@@ -48,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
-@@ -1381,6 +1372,12 @@ libainstall:	all python-config
+@@ -1412,6 +1403,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
@@ -58,6 +58,6 @@
 +		rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \
 +		(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc); \
 +	fi
- 	@if [ -s Programs/python.exp -a \
+ 	@if [ -s Modules/python.exp -a \
  		"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
  		echo; echo "Installing support files for building shared extension modules on AIX:"; \
diff --git a/lang/python35/files/patch-issue24557 b/lang/python35/files/patch-issue24557
deleted file mode 100644
index ebcfd839a62b..000000000000
--- a/lang/python35/files/patch-issue24557
+++ /dev/null
@@ -1,51 +0,0 @@
-http://bugs.python.org/issue24557
-https://hg.python.org/cpython/rev/fe168c2b5e95
-
-assume egd unless OPENSSL_NO_EGD is defined-remove configure check
-
---- Modules/_ssl.c.orig	2015-12-07 01:39:10 UTC
-+++ Modules/_ssl.c
-@@ -3916,7 +3916,7 @@ _ssl_RAND_status_impl(PyModuleDef *modul
-     return PyLong_FromLong(RAND_status());
- }
- 
--#ifdef HAVE_RAND_EGD
-+#ifndef OPENSSL_NO_EGD
- /*[clinic input]
- _ssl.RAND_egd
-     path: object(converter="PyUnicode_FSConverter")
-@@ -3942,7 +3942,7 @@ _ssl_RAND_egd_impl(PyModuleDef *module, 
-     }
-     return PyLong_FromLong(bytes);
- }
--#endif /* HAVE_RAND_EGD */
-+#endif /* OPENSSL_NO_EGD */
- 
- 
- 
---- Modules/clinic/_ssl.c.h.orig	2015-12-07 01:39:10 UTC
-+++ Modules/clinic/_ssl.c.h
-@@ -893,7 +893,7 @@ _ssl_RAND_status(PyModuleDef *module, PyObject *Py_UNUSED(ignored))
-     return _ssl_RAND_status_impl(module);
- }
- 
--#if defined(HAVE_RAND_EGD)
-+#if !defined(OPENSSL_NO_EGD)
- 
- PyDoc_STRVAR(_ssl_RAND_egd__doc__,
- "RAND_egd($module, path, /)\n"
-@@ -924,7 +924,7 @@ _ssl_RAND_egd(PyModuleDef *module, PyObject *arg)
-     return return_value;
- }
- 
--#endif /* defined(HAVE_RAND_EGD) */
-+#endif /* !defined(OPENSSL_NO_EGD) */
- 
- PyDoc_STRVAR(_ssl_get_default_verify_paths__doc__,
- "get_default_verify_paths($module, /)\n"
-@@ -1102,4 +1102,4 @@ _ssl_enum_crls(PyModuleDef *module, PyObject *args, PyObject *kwargs)
- #ifndef _SSL_ENUM_CRLS_METHODDEF
-     #define _SSL_ENUM_CRLS_METHODDEF
- #endif /* !defined(_SSL_ENUM_CRLS_METHODDEF) */
--/*[clinic end generated code: output=a14999cb565a69a2 input=a9049054013a1b77]*/
-+/*[clinic end generated code: output=abe795f14cb63b6a input=a9049054013a1b77]*/