--- a/components/python/python34/Makefile Tue Jan 05 13:35:29 2016 -0800
+++ b/components/python/python34/Makefile Tue Dec 22 07:57:25 2015 -0800
@@ -26,17 +26,17 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= Python
-COMPONENT_VERSION= 3.4.3
+COMPONENT_VERSION= 3.4.4
COMPONENT_PROJECT_URL= http://python.org/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz
COMPONENT_ARCHIVE_HASH= \
- sha256:b5b3963533768d5fc325a4d7a6bd6f666726002d696f1d399ec06b043ea996b8
+ sha256:a797d3820155ec6cb654a652b9acfb11792d4e7d568eef1f9199009e042b6ba2
COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)ftp/python/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_SIG_URL= $(COMPONENT_ARCHIVE_URL).asc
COMPONENT_BUGDB= utility/python
-TPNO= 21686
+TPNO= 26194
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
@@ -114,7 +114,6 @@
CONFIGURE_OPTIONS += --without-ensurepip
CONFIGURE_OPTIONS += --enable-ipv6
CONFIGURE_OPTIONS += --bindir=/usr/bin
-CONFIGURE_OPTIONS += "ac_cv_func_getentropy=no"
CONFIGURE_OPTIONS += CPPFLAGS="$(CPPFLAGS)"
CONFIGURE_OPTIONS += LDFLAGS="$(LDFLAGS)"
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
--- a/components/python/python34/patches/00-dtrace.patch Tue Jan 05 13:35:29 2016 -0800
+++ b/components/python/python34/patches/00-dtrace.patch Tue Dec 22 07:57:25 2015 -0800
@@ -1013,7 +1013,7 @@
+
--- Python-3.4.3/Lib/test/test_sys.py.~1~ 2015-02-25 03:27:45.000000000 -0800
+++ Python-3.4.3/Lib/test/test_sys.py 2015-02-25 07:32:22.294936251 -0800
-@@ -761,6 +761,7 @@
+@@ -762,6 +762,7 @@
self.assertEqual(sys.getsizeof(True, -1), size('') + self.longdigit)
def test_objecttypes(self):
@@ -1021,7 +1021,7 @@
# check all types defined in Objects/
size = test.support.calcobjsize
vsize = test.support.calcvobjsize
-@@ -786,13 +787,17 @@
+@@ -790,13 +791,17 @@
return inner
check(get_cell().__closure__[0], size('P'))
# code
@@ -1145,7 +1145,7 @@
############################################################################
# Header files
-@@ -1535,6 +1587,11 @@
+@@ -1534,6 +1586,11 @@
find build -name '*.py[co]' -exec rm -f {} ';' || true
-rm -f pybuilddir.txt
-rm -f Lib/lib2to3/*Grammar*.pickle
@@ -1157,7 +1157,7 @@
-rm -f Modules/_testembed Modules/_freeze_importlib
profile-removal:
-@@ -1566,6 +1623,11 @@
+@@ -1565,6 +1622,11 @@
-o -name '*.orig' -o -name '*.rej' \
-o -name '*.bak' ')' \
-exec rm -f {} ';'
@@ -1754,7 +1754,7 @@
THREADOBJ
LDLAST
USE_THREAD_MODULE
-@@ -814,6 +819,7 @@
+@@ -815,6 +820,7 @@
with_tsc
with_pymalloc
with_valgrind
@@ -1762,7 +1762,7 @@
with_fpectl
with_libm
with_libc
-@@ -1500,6 +1506,7 @@
+@@ -1501,6 +1507,7 @@
--with(out)-tsc enable/disable timestamp counter profile
--with(out)-pymalloc disable/enable specialized mallocs
--with-valgrind Enable Valgrind support
@@ -1770,7 +1770,7 @@
--with-fpectl enable SIGFPE catching
--with-libm=STRING math library
--with-libc=STRING C library
-@@ -10460,6 +10467,174 @@
+@@ -10468,6 +10475,174 @@
OPT="-DDYNAMIC_ANNOTATIONS_ENABLED=1 $OPT"
fi
@@ -1947,7 +1947,7 @@
DLINCLDIR=.
--- Python-3.4.3/configure.ac.~1~ 2015-02-25 03:27:46.000000000 -0800
+++ Python-3.4.3/configure.ac 2015-02-25 07:45:54.186719967 -0800
-@@ -2877,6 +2877,62 @@
+@@ -2884,6 +2884,62 @@
OPT="-DDYNAMIC_ANNOTATIONS_ENABLED=1 $OPT"
fi
--- a/components/python/python34/patches/01-bits.patch Tue Jan 05 13:35:29 2016 -0800
+++ b/components/python/python34/patches/01-bits.patch Tue Dec 22 07:57:25 2015 -0800
@@ -13,7 +13,7 @@
AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/)
-@@ -2114,12 +2114,6 @@
+@@ -2121,12 +2121,6 @@
if test -z "$CCSHARED"
then
case $ac_sys_system/$ac_sys_release in
--- a/components/python/python34/patches/05-studio-profile.patch Tue Jan 05 13:35:29 2016 -0800
+++ b/components/python/python34/patches/05-studio-profile.patch Tue Dec 22 07:57:25 2015 -0800
@@ -66,7 +66,7 @@
# Build static library
# avoid long command lines, same as LIBRARY_OBJS
-@@ -1595,7 +1600,7 @@
+@@ -1594,7 +1599,7 @@
-rm -f Modules/_testembed Modules/_freeze_importlib
profile-removal:
--- a/components/python/python34/patches/07-ucred.patch Tue Jan 05 13:35:29 2016 -0800
+++ b/components/python/python34/patches/07-ucred.patch Tue Dec 22 07:57:25 2015 -0800
@@ -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
-@@ -1512,6 +1512,13 @@
+@@ -1513,6 +1513,13 @@
# Stefan Krah's _decimal module
exts.append(self._decimal_ext())
--- a/components/python/python34/patches/08-dlpi.patch Tue Jan 05 13:35:29 2016 -0800
+++ b/components/python/python34/patches/08-dlpi.patch Tue Dec 22 07:57:25 2015 -0800
@@ -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
-@@ -1519,6 +1519,12 @@
+@@ -1520,6 +1520,12 @@
exts.append( Extension('ucred', ['ucred.c'],
libraries = ['tsol']) )
--- a/components/python/python34/patches/10-rbac.patch Tue Jan 05 13:35:29 2016 -0800
+++ b/components/python/python34/patches/10-rbac.patch Tue Dec 22 07:57:25 2015 -0800
@@ -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
-@@ -1525,6 +1525,22 @@
+@@ -1526,6 +1526,22 @@
exts.append( Extension('dlpi', ['dlpimodule.c'],
libraries = ['dlpi']) )
--- a/components/python/python34/patches/11-closerange.patch Tue Jan 05 13:35:29 2016 -0800
+++ b/components/python/python34/patches/11-closerange.patch Tue Dec 22 07:57:25 2015 -0800
@@ -3,7 +3,7 @@
--- Python-3.4.3/Modules/posixmodule.c.~1~ 2015-02-25 03:27:46.000000000 -0800
+++ Python-3.4.3/Modules/posixmodule.c 2015-02-25 08:22:50.773678769 -0800
-@@ -7809,16 +7809,34 @@
+@@ -7830,16 +7830,34 @@
"closerange(fd_low, fd_high)\n\n\
Closes all file descriptors in [fd_low, fd_high), ignoring errors.");
--- a/components/python/python34/patches/14-ossaudiodev.patch Tue Jan 05 13:35:29 2016 -0800
+++ b/components/python/python34/patches/14-ossaudiodev.patch Tue Dec 22 07:57:25 2015 -0800
@@ -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
-@@ -1596,7 +1596,7 @@
+@@ -1597,7 +1597,7 @@
# End multiprocessing
# Platform-specific libraries
--- a/components/python/python34/patches/19-SOABI.patch Tue Jan 05 13:35:29 2016 -0800
+++ b/components/python/python34/patches/19-SOABI.patch Tue Dec 22 07:57:25 2015 -0800
@@ -3,7 +3,7 @@
--- Python-3.4.3/configure.ac.~3~ 2015-02-25 08:26:17.783623099 -0800
+++ Python-3.4.3/configure.ac 2015-02-25 08:26:17.981864039 -0800
-@@ -4146,7 +4146,7 @@
+@@ -4153,7 +4153,7 @@
AC_SUBST(EXT_SUFFIX)
case $ac_sys_system in
--- a/components/python/python34/patches/20-disable-sslv3.patch Tue Jan 05 13:35:29 2016 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-This patch comes from in-house. It has not yet been submitted upstream,
-but submission is planned.
-
---- Python-3.4.3/Modules/_ssl.c.~1~ 2015-02-25 03:27:45.000000000 -0800
-+++ Python-3.4.3/Modules/_ssl.c 2015-02-25 08:51:04.532103249 -0800
-@@ -2061,6 +2061,8 @@
- options = SSL_OP_ALL & ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS;
- if (proto_version != PY_SSL_VERSION_SSL2)
- options |= SSL_OP_NO_SSLv2;
-+ if (proto_version != PY_SSL_VERSION_SSL3)
-+ options |= SSL_OP_NO_SSLv3;
- SSL_CTX_set_options(self->ctx, options);
-
- #ifndef OPENSSL_NO_ECDH
---- Python-3.4.3/Lib/test/test_ssl.py.~1~ 2015-02-25 03:27:45.000000000 -0800
-+++ Python-3.4.3/Lib/test/test_ssl.py 2015-02-25 08:50:21.079031281 -0800
-@@ -675,10 +675,7 @@
- @skip_if_broken_ubuntu_ssl
- def test_options(self):
- ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
-- # OP_ALL | OP_NO_SSLv2 is the default value
-- self.assertEqual(ssl.OP_ALL | ssl.OP_NO_SSLv2,
-- ctx.options)
-- ctx.options |= ssl.OP_NO_SSLv3
-+ # OP_ALL | OP_NO_SSLv2 | OP_NO_SSLv3 is the default value
- self.assertEqual(ssl.OP_ALL | ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3,
- ctx.options)
- if can_clear_options():
-@@ -2171,17 +2168,17 @@
- " SSL2 client to SSL23 server test unexpectedly failed:\n %s\n"
- % str(x))
- if hasattr(ssl, 'PROTOCOL_SSLv3'):
-- try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, True)
-+ try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, False)
- try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True)
- try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, True)
-
- if hasattr(ssl, 'PROTOCOL_SSLv3'):
-- try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, True, ssl.CERT_OPTIONAL)
-+ try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, False, ssl.CERT_OPTIONAL)
- try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True, ssl.CERT_OPTIONAL)
- try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, True, ssl.CERT_OPTIONAL)
-
- if hasattr(ssl, 'PROTOCOL_SSLv3'):
-- try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, True, ssl.CERT_REQUIRED)
-+ try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, False, ssl.CERT_REQUIRED)
- try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True, ssl.CERT_REQUIRED)
- try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, True, ssl.CERT_REQUIRED)
-
-@@ -2213,7 +2210,8 @@
- try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_TLSv1, False)
- if no_sslv2_implies_sslv3_hello():
- # No SSLv2 => client will use an SSLv3 hello on recent OpenSSLs
-- try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv23, True,
-+ # until we disabled SSLv3 for Poodle
-+ try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv23, False,
- client_options=ssl.OP_NO_SSLv2)
-
- @skip_if_broken_ubuntu_ssl
--- a/components/python/python34/patches/22-disable-test_gdb.patch Tue Jan 05 13:35:29 2016 -0800
+++ b/components/python/python34/patches/22-disable-test_gdb.patch Tue Dec 22 07:57:25 2015 -0800
@@ -2,12 +2,12 @@
from the version history why these lines were dropped in version 3. The
patch has not yet been submitted upstream, but submission is planned.
---- Python-3.4.2/Lib/test/test_gdb.py.~1~ 2014-10-08 01:18:13.000000000 -0700
-+++ Python-3.4.2/Lib/test/test_gdb.py 2015-02-06 16:00:58.802170301 -0800
-@@ -34,6 +34,8 @@
- if gdb_major_version < 7:
- raise unittest.SkipTest("gdb versions before 7.0 didn't support python embedding"
- " Saw:\n" + gdb_version.decode('ascii', 'replace'))
+--- Python-3.4.4rc1/Lib/test/test_gdb.py.~1~ 2015-12-09 08:10:27.280590637 -0800
++++ Python-3.4.4rc1/Lib/test/test_gdb.py 2015-12-09 08:12:41.389980386 -0800
+@@ -49,6 +49,8 @@
+ "embedding. Saw %s.%s:\n%s"
+ % (gdb_major_version, gdb_minor_version,
+ gdb_version))
+if sys.platform.startswith("sunos"):
+ raise unittest.SkipTest("test doesn't work very well on Solaris")
--- a/components/python/python34/patches/23-doctest.patch Tue Jan 05 13:35:29 2016 -0800
+++ b/components/python/python34/patches/23-doctest.patch Tue Dec 22 07:57:25 2015 -0800
@@ -1,11 +1,11 @@
This patch was developed in-house and has been submitted upstream:
http://bugs.python.org/issue23584
---- Python-3.4.3/Lib/test/test_doctest.py.~1~ 2015-02-25 09:03:45.000000000 -0800
-+++ Python-3.4.3/Lib/test/test_doctest.py 2015-03-04 08:26:35.762756585 -0800
+--- Python-3.4.4rc1/Lib/test/test_doctest.py.~1~ 2015-12-06 15:54:36.000000000 -0800
++++ Python-3.4.4rc1/Lib/test/test_doctest.py 2015-12-09 08:13:21.741427836 -0800
@@ -2627,7 +2627,7 @@
- >>> with open(fn, 'w') as f:
- ... f.write('Test:\r\n\r\n >>> x = 1 + 1\r\n\r\nDone.\r\n')
+ >>> with open(fn, 'wb') as f:
+ ... f.write(b'Test:\r\n\r\n >>> x = 1 + 1\r\n\r\nDone.\r\n')
35
- >>> doctest.testfile(fn, False)
+ >>> doctest.testfile(fn, False, verbose=False)
@@ -13,8 +13,8 @@
>>> os.remove(fn)
@@ -2637,7 +2637,7 @@
- >>> with open(fn, 'w') as f:
- ... f.write('Test:\n\n >>> x = 1 + 1\n\nDone.\n')
+ >>> with open(fn, 'wb') as f:
+ ... f.write(b'Test:\n\n >>> x = 1 + 1\n\nDone.\n')
30
- >>> doctest.testfile(fn, False)
+ >>> doctest.testfile(fn, False, verbose=False)
--- a/components/python/python34/patches/26-test_mmap.patch Tue Jan 05 13:35:29 2016 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-This patch has been submitted upstream, and accepted; it should no longer be
-needed with the next Python version upgrade:
-
-http://bugs.python.org/issue25004
-
---- Python-3.4.3/Lib/test/test_mmap.py.~1~ 2015-08-28 12:40:08.000000000 -0700
-+++ Python-3.4.3/Lib/test/test_mmap.py 2015-09-04 14:51:47.034993552 -0700
-@@ -727,7 +727,10 @@
- f.write(tail)
- f.flush()
- except (OSError, OverflowError):
-- f.close()
-+ try:
-+ f.close()
-+ except (OSError, OverflowError):
-+ pass
- raise unittest.SkipTest("filesystem does not have largefile support")
- return f
-
--- a/components/python/python34/python-34.p5m Tue Jan 05 13:35:29 2016 -0800
+++ b/components/python/python34/python-34.p5m Tue Dec 22 07:57:25 2015 -0800
@@ -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-6.0.8-py2.py3-none-any.whl
-file path=usr/lib/python3.4/ensurepip/_bundled/setuptools-12.0.5-py2.py3-none-any.whl
+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/_uninstall.py
file path=usr/lib/python3.4/enum.py
file path=usr/lib/python3.4/filecmp.py
@@ -998,6 +998,7 @@
file path=usr/lib/python3.4/plat-sunos5/regen
file path=usr/lib/python3.4/platform.py pkg.depend.bypass-generate=.*/MacOS.* \
pkg.depend.bypass-generate=.*/_gestalt.* \
+ pkg.depend.bypass-generate=.*/_winreg.* \
pkg.depend.bypass-generate=.*/java/__init__.py \
pkg.depend.bypass-generate=.*/lang.* \
pkg.depend.bypass-generate=.*/vms_lib.* \
@@ -1292,7 +1293,7 @@
file path=usr/lib/python3.4/test/decimaltestdata/tointegral.decTest
file path=usr/lib/python3.4/test/decimaltestdata/tointegralx.decTest
file path=usr/lib/python3.4/test/decimaltestdata/xor.decTest
-file path=usr/lib/python3.4/test/dh512.pem
+file path=usr/lib/python3.4/test/dh1024.pem
file path=usr/lib/python3.4/test/dis_module.py
file path=usr/lib/python3.4/test/dlpitest.py
file path=usr/lib/python3.4/test/doctest_aliases.py