23858079 Upgrade Python 3.4 line to 3.4.5
authorJohn Beck <John.Beck@Oracle.COM>
Thu, 21 Jul 2016 12:52:12 -0700
changeset 6446 b54de573b4e9
parent 6445 0edecb568b2e
child 6447 56a2f066191a
23858079 Upgrade Python 3.4 line to 3.4.5
components/python/python34/Makefile
components/python/python34/patches/07-ucred.patch
components/python/python34/patches/08-dlpi.patch
components/python/python34/patches/10-rbac.patch
components/python/python34/patches/14-ossaudiodev.patch
components/python/python34/patches/28-zipimport.patch
components/python/python34/patches/29-smtplib.patch
components/python/python34/python-34.p5m
--- a/components/python/python34/Makefile	Thu Jul 21 12:51:35 2016 -0700
+++ b/components/python/python34/Makefile	Thu Jul 21 12:52:12 2016 -0700
@@ -25,17 +25,17 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		Python
-COMPONENT_VERSION=	3.4.4
+COMPONENT_VERSION=	3.4.5
 COMPONENT_PROJECT_URL=	http://python.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:a797d3820155ec6cb654a652b9acfb11792d4e7d568eef1f9199009e042b6ba2
+    sha256:ee64b1c8a47461009abf25252332d29a4e587cb4f0c1c96aa793a3732e9d898a
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)ftp/python/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 COMPONENT_SIG_URL=	$(COMPONENT_ARCHIVE_URL).asc
 COMPONENT_BUGDB=	utility/python
 
-TPNO=			26194
+TPNO=			29998
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
--- a/components/python/python34/patches/07-ucred.patch	Thu Jul 21 12:51:35 2016 -0700
+++ b/components/python/python34/patches/07-ucred.patch	Thu Jul 21 12:52:12 2016 -0700
@@ -412,7 +412,7 @@
 +}
 --- Python-3.4.3/setup.py.~3~	2015-02-25 08:14:54.409345225 -0800
 +++ Python-3.4.3/setup.py	2015-02-25 08:14:54.469040486 -0800
[email protected]@ -1513,6 +1513,13 @@
[email protected]@ -1515,6 +1515,13 @@
          # Stefan Krah's _decimal module
          exts.append(self._decimal_ext())
  
--- a/components/python/python34/patches/08-dlpi.patch	Thu Jul 21 12:51:35 2016 -0700
+++ b/components/python/python34/patches/08-dlpi.patch	Thu Jul 21 12:52:12 2016 -0700
@@ -1225,7 +1225,7 @@
 +}
 --- Python-3.4.3/setup.py.~4~	2015-02-25 08:17:06.183641123 -0800
 +++ Python-3.4.3/setup.py	2015-02-25 08:17:06.196157035 -0800
[email protected]@ -1520,6 +1520,12 @@
[email protected]@ -1522,6 +1522,12 @@
              exts.append( Extension('ucred', ['ucred.c'],
                                     libraries = ['tsol']) )
  
--- a/components/python/python34/patches/10-rbac.patch	Thu Jul 21 12:51:35 2016 -0700
+++ b/components/python/python34/patches/10-rbac.patch	Thu Jul 21 12:52:12 2016 -0700
@@ -1285,7 +1285,7 @@
 +};
 --- Python-3.4.3/setup.py.~5~	2015-02-25 08:21:26.778968857 -0800
 +++ Python-3.4.3/setup.py	2015-02-25 08:21:26.801861210 -0800
[email protected]@ -1526,6 +1526,22 @@
[email protected]@ -1528,6 +1528,22 @@
              exts.append( Extension('dlpi', ['dlpimodule.c'],
                                     libraries = ['dlpi']) )
  
--- a/components/python/python34/patches/14-ossaudiodev.patch	Thu Jul 21 12:51:35 2016 -0700
+++ b/components/python/python34/patches/14-ossaudiodev.patch	Thu Jul 21 12:52:12 2016 -0700
@@ -4,7 +4,7 @@
 
 --- Python-3.4.3/setup.py.~6~	2015-02-25 08:25:07.739704118 -0800
 +++ Python-3.4.3/setup.py	2015-02-25 08:25:07.807400186 -0800
[email protected]@ -1597,7 +1597,7 @@
[email protected]@ -1599,7 +1599,7 @@
          # End multiprocessing
  
          # Platform-specific libraries
--- a/components/python/python34/patches/28-zipimport.patch	Thu Jul 21 12:51:35 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-This patch comes from upstream:
-
-https://bugs.python.org/issue26171
-
---- a/Modules/zipimport.c
-+++ b/Modules/zipimport.c
[email protected]@ -1111,6 +1111,11 @@ get_data(PyObject *archive, PyObject *to
-     }
-     file_offset += l;           /* Start of file data */
- 
-+    if (data_size > LONG_MAX - 1) {
-+        fclose(fp);
-+        PyErr_NoMemory();
-+        return NULL;
-+    }
-     bytes_size = compress == 0 ? data_size : data_size + 1;
-     if (bytes_size == 0)
-         bytes_size++;
--- a/components/python/python34/patches/29-smtplib.patch	Thu Jul 21 12:51:35 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-This patch comes from upstream:
-
-https://hg.python.org/cpython/rev/d590114c2394
-
---- a/Lib/smtplib.py	Sun Nov 08 01:03:52 2015 -0500
-+++ b/Lib/smtplib.py	Sat Jun 11 13:18:56 2016 -0700
[email protected]@ -695,6 +695,11 @@
-             self.ehlo_resp = None
-             self.esmtp_features = {}
-             self.does_esmtp = 0
-+        else:
-+            # RFC 3207:
-+            # 501 Syntax error (no parameters allowed)
-+            # 454 TLS not available due to temporary reason
-+            raise SMTPResponseException(resp, reply)
-         return (resp, reply)
- 
-     def sendmail(self, from_addr, to_addrs, msg, mail_options=[],
--- a/components/python/python34/python-34.p5m	Thu Jul 21 12:51:35 2016 -0700
+++ b/components/python/python34/python-34.p5m	Thu Jul 21 12:52:12 2016 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 # bootstrap: pkgdepend doesn't like python 3.4 yet:
@@ -588,8 +588,8 @@
 file path=usr/lib/python3.4/encodings/zlib_codec.py
 file path=usr/lib/python3.4/ensurepip/__init__.py
 file path=usr/lib/python3.4/ensurepip/__main__.py
-file path=usr/lib/python3.4/ensurepip/_bundled/pip-7.1.2-py2.py3-none-any.whl
-file path=usr/lib/python3.4/ensurepip/_bundled/setuptools-18.2-py2.py3-none-any.whl
+file path=usr/lib/python3.4/ensurepip/_bundled/pip-8.1.1-py2.py3-none-any.whl
+file path=usr/lib/python3.4/ensurepip/_bundled/setuptools-20.10.1-py2.py3-none-any.whl
 file path=usr/lib/python3.4/ensurepip/_uninstall.py
 file path=usr/lib/python3.4/enum.py
 file path=usr/lib/python3.4/filecmp.py
@@ -1107,10 +1107,12 @@
 file path=usr/lib/python3.4/test/badsyntax_pep3120.py pkg.tmp.autopyc=false
 file path=usr/lib/python3.4/test/buffer_tests.py
 file path=usr/lib/python3.4/test/bytecode_helper.py
+file path=usr/lib/python3.4/test/capath/0e4015b9.0
 file path=usr/lib/python3.4/test/capath/4e1295a3.0
 file path=usr/lib/python3.4/test/capath/5ed36f99.0
 file path=usr/lib/python3.4/test/capath/6e88d7b8.0
 file path=usr/lib/python3.4/test/capath/99d0fa06.0
+file path=usr/lib/python3.4/test/capath/ce7b8643.0
 file path=usr/lib/python3.4/test/cfgparser.1
 file path=usr/lib/python3.4/test/cfgparser.2
 file path=usr/lib/python3.4/test/cfgparser.3
@@ -1312,7 +1314,6 @@
 file path=usr/lib/python3.4/test/future_test1.py
 file path=usr/lib/python3.4/test/future_test2.py
 file path=usr/lib/python3.4/test/gdb_sample.py
-file path=usr/lib/python3.4/test/https_svn_python_org_root.pem
 file path=usr/lib/python3.4/test/ieee754.txt
 file path=usr/lib/python3.4/test/imghdrdata/python.bmp
 file path=usr/lib/python3.4/test/imghdrdata/python.gif