Hi,
this is the diff to update python from 2.7.9 to 2.7.10.
More information here:
https://hg.python.org/cpython/raw-file/15c95b7d81dc/Misc/NEWS
Ok?
Cheers,
Remi.
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/python/2.7/Makefile,v
retrieving revision 1.38
diff -u -p -u -p -r1.38 Makefile
--- Makefile 1 Feb 2015 12:52:53 -0000 1.38
+++ Makefile 26 May 2015 14:49:17 -0000
@@ -6,8 +6,7 @@
# Python itself.
VERSION = 2.7
-PATCHLEVEL = .9
-REVISION = 0
+PATCHLEVEL = .10
SHARED_LIBS = python2.7 0.0
VERSION_SPEC = >=2.7,<2.8
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/python/2.7/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo 14 Dec 2014 08:32:55 -0000 1.9
+++ distinfo 26 May 2015 14:49:17 -0000
@@ -1,2 +1,2 @@
-SHA256 (Python-2.7.9.tgz) = yLujPmasMgHavcVW8Op8/mrBGUbsMtNXxMb5sBjBLFs=
-SIZE (Python-2.7.9.tgz) = 16657930
+SHA256 (Python-2.7.10.tgz) = 7ajObuwD50mRq7U4QXDnxl/NdSLkCbjoPX5jcq3Q8So=
+SIZE (Python-2.7.10.tgz) = 16768806
Index: patches/patch-Lib_socket_py
===================================================================
RCS file: patches/patch-Lib_socket_py
diff -N patches/patch-Lib_socket_py
--- patches/patch-Lib_socket_py 19 Apr 2014 14:17:47 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-Lib_socket_py,v 1.1 2014/04/19 14:17:47 espie Exp $
---- Lib/socket.py.orig Sat Apr 19 16:07:48 2014
-+++ Lib/socket.py Sat Apr 19 16:07:54 2014
-@@ -67,7 +67,6 @@ else:
- from _ssl import SSLError as sslerror
- from _ssl import \
- RAND_add, \
-- RAND_egd, \
- RAND_status, \
- SSL_ERROR_ZERO_RETURN, \
- SSL_ERROR_WANT_READ, \
Index: patches/patch-Lib_ssl_py
===================================================================
RCS file: patches/patch-Lib_ssl_py
diff -N patches/patch-Lib_ssl_py
--- patches/patch-Lib_ssl_py 14 Dec 2014 08:32:55 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Lib_ssl_py,v 1.2 2014/12/14 08:32:55 rpointel Exp $
---- Lib/ssl.py.orig Wed Dec 10 16:59:40 2014
-+++ Lib/ssl.py Sat Dec 13 12:15:08 2014
-@@ -106,7 +106,7 @@ from _ssl import CERT_NONE, CERT_OPTIONAL, CERT_REQUIR
- from _ssl import (VERIFY_DEFAULT, VERIFY_CRL_CHECK_LEAF, VERIFY_CRL_CHECK_CHAIN,
- VERIFY_X509_STRICT)
- from _ssl import txt2obj as _txt2obj, nid2obj as _nid2obj
--from _ssl import RAND_status, RAND_egd, RAND_add
-+from _ssl import RAND_status, RAND_add
-
- def _import_symbols(prefix):
- for n in dir(_ssl):
Index: patches/patch-Lib_test_test_file2k_py
===================================================================
RCS file: patches/patch-Lib_test_test_file2k_py
diff -N patches/patch-Lib_test_test_file2k_py
--- patches/patch-Lib_test_test_file2k_py 14 Dec 2014 08:32:55 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,47 +0,0 @@
-$OpenBSD: patch-Lib_test_test_file2k_py,v 1.2 2014/12/14 08:32:55 rpointel Exp $
-
-No /dev/full on OpenBSD (http://bugs.python.org/issue21934).
-
---- Lib/test/test_file2k.py.orig Wed Dec 10 16:59:44 2014
-+++ Lib/test/test_file2k.py Sat Dec 13 12:13:40 2014
-@@ -4,6 +4,7 @@ import unittest
- import itertools
- import select
- import signal
-+import stat
- import subprocess
- import time
- from array import array
-@@ -424,17 +425,21 @@ class OtherFileTests(unittest.TestCase):
-
- @unittest.skipUnless(os.name == 'posix', 'test requires a posix system.')
- def test_write_full(self):
-- # Issue #17976
-- try:
-- f = open('/dev/full', 'w', 1)
-- except IOError:
-- self.skipTest("requires '/dev/full'")
-- try:
-- with self.assertRaises(IOError):
-- f.write('hello')
-- f.write('\n')
-- finally:
-- f.close()
-+ # OpenBSD does not have a /dev/full character device.
-+ if os.path.exists('/dev/full'):
-+ if stat.S_ISCHR(os.stat('/dev/full').st_mode):
-+ # Issue #17976
-+ f = open('/dev/full', 'w', 1)
-+ try:
-+ with self.assertRaises(IOError):
-+ f.write('hello')
-+ f.write('\n')
-+ finally:
-+ f.close()
-+ else:
-+ self.skipTest("'/dev/full' must be a character device")
-+ else:
-+ self.skipTest("requires '/dev/full'")
-
- @unittest.skipUnless(sys.maxsize > 2**31, "requires 64-bit system")
- @test_support.precisionbigmemtest(2**31, 2.5, dry_run=False)
Index: patches/patch-Lib_test_test_socket_py
===================================================================
RCS file: patches/patch-Lib_test_test_socket_py
diff -N patches/patch-Lib_test_test_socket_py
--- patches/patch-Lib_test_test_socket_py 14 Dec 2014 08:32:55 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-Lib_test_test_socket_py,v 1.5 2014/12/14 08:32:55 rpointel Exp $
-security fix: http://bugs.python.org/issue20246
-
---- Lib/test/test_socket.py.orig Wed Dec 10 16:59:47 2014
-+++ Lib/test/test_socket.py Sat Dec 13 12:13:40 2014
-@@ -1694,6 +1694,16 @@ class BufferIOTest(SocketConnectedTest):
-
- _testRecvFromIntoEmptyBuffer = _testRecvFromIntoArray
-
-+ def testRecvFromIntoSmallBuffer(self):
-+ # See issue #20246.
-+ buf = bytearray(8)
-+ self.assertRaises(ValueError, self.cli_conn.recvfrom_into, buf, 1024)
-+
-+ def _testRecvFromIntoSmallBuffer(self):
-+ with test_support.check_py3k_warnings():
-+ buf = buffer(MSG)
-+ self.serv_conn.send(buf)
-+
-
- TIPC_STYPE = 2000
- TIPC_LOWER = 200
Index: patches/patch-Lib_test_test_ssl_py
===================================================================
RCS file: patches/patch-Lib_test_test_ssl_py
diff -N patches/patch-Lib_test_test_ssl_py
--- patches/patch-Lib_test_test_ssl_py 14 Dec 2014 08:32:55 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-Lib_test_test_ssl_py,v 1.2 2014/12/14 08:32:55 rpointel Exp $
-
-No RAND_egd on OpenBSD.
-
---- Lib/test/test_ssl.py.orig Wed Dec 10 16:59:47 2014
-+++ Lib/test/test_ssl.py Sat Dec 13 12:13:40 2014
-@@ -169,8 +169,6 @@ class BasicSocketTests(unittest.TestCase):
- sys.stdout.write("\n RAND_status is %d (%s)\n"
- % (v, (v and "sufficient randomness") or
- "insufficient randomness"))
-- self.assertRaises(TypeError, ssl.RAND_egd, 1)
-- self.assertRaises(TypeError, ssl.RAND_egd, 'foo', 1)
- ssl.RAND_add("this is a random string", 75.0)
-
- def test_parse_cert(self):
Index: patches/patch-Modules__ssl_c
===================================================================
RCS file: patches/patch-Modules__ssl_c
diff -N patches/patch-Modules__ssl_c
--- patches/patch-Modules__ssl_c 14 Dec 2014 08:32:55 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,45 +0,0 @@
-$OpenBSD: patch-Modules__ssl_c,v 1.3 2014/12/14 08:32:55 rpointel Exp $
---- Modules/_ssl.c.orig Wed Dec 10 16:59:53 2014
-+++ Modules/_ssl.c Sat Dec 13 12:16:17 2014
-@@ -3301,32 +3301,6 @@ Returns 1 if the OpenSSL PRNG has been seeded with eno
- It is necessary to seed the PRNG with RAND_add() on some platforms before\n\
- using the ssl() function.");
-
--static PyObject *
--PySSL_RAND_egd(PyObject *self, PyObject *arg)
--{
-- int bytes;
--
-- if (!PyString_Check(arg))
-- return PyErr_Format(PyExc_TypeError,
-- "RAND_egd() expected string, found %s",
-- Py_TYPE(arg)->tp_name);
-- bytes = RAND_egd(PyString_AS_STRING(arg));
-- if (bytes == -1) {
-- PyErr_SetString(PySSLErrorObject,
-- "EGD connection failed or EGD did not return "
-- "enough data to seed the PRNG");
-- return NULL;
-- }
-- return PyInt_FromLong(bytes);
--}
--
--PyDoc_STRVAR(PySSL_RAND_egd_doc,
--"RAND_egd(path) -> bytes\n\
--\n\
--Queries the entropy gather daemon (EGD) on the socket named by 'path'.\n\
--Returns number of bytes read. Raises SSLError if connection to EGD\n\
--fails or if it does not provide enough data to seed PRNG.");
--
- #endif /* HAVE_OPENSSL_RAND */
-
-
-@@ -3720,8 +3694,6 @@ static PyMethodDef PySSL_methods[] = {
- #ifdef HAVE_OPENSSL_RAND
- {"RAND_add", PySSL_RAND_add, METH_VARARGS,
- PySSL_RAND_add_doc},
-- {"RAND_egd", PySSL_RAND_egd, METH_VARARGS,
-- PySSL_RAND_egd_doc},
- {"RAND_status", (PyCFunction)PySSL_RAND_status, METH_NOARGS,
- PySSL_RAND_status_doc},
- #endif
Index: pkg/PLIST-idle
===================================================================
RCS file: /cvs/ports/lang/python/2.7/pkg/PLIST-idle,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST-idle
--- pkg/PLIST-idle 14 Dec 2014 08:32:55 -0000 1.4
+++ pkg/PLIST-idle 26 May 2015 14:49:17 -0000
@@ -230,6 +230,9 @@ lib/python2.7/idlelib/idle_test/test_hyp
lib/python2.7/idlelib/idle_test/test_idlehistory.py
lib/python2.7/idlelib/idle_test/test_idlehistory.pyc
lib/python2.7/idlelib/idle_test/test_idlehistory.pyo
+lib/python2.7/idlelib/idle_test/test_io.py
+lib/python2.7/idlelib/idle_test/test_io.pyc
+lib/python2.7/idlelib/idle_test/test_io.pyo
lib/python2.7/idlelib/idle_test/test_parenmatch.py
lib/python2.7/idlelib/idle_test/test_parenmatch.pyc
lib/python2.7/idlelib/idle_test/test_parenmatch.pyo
@@ -275,9 +278,6 @@ lib/python2.7/idlelib/run.pyo
lib/python2.7/idlelib/tabbedpages.py
lib/python2.7/idlelib/tabbedpages.pyc
lib/python2.7/idlelib/tabbedpages.pyo
-lib/python2.7/idlelib/testcode.py
-lib/python2.7/idlelib/testcode.pyc
-lib/python2.7/idlelib/testcode.pyo
lib/python2.7/idlelib/textView.py
lib/python2.7/idlelib/textView.pyc
lib/python2.7/idlelib/textView.pyo
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/python/2.7/pkg/PLIST-main,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 PLIST-main
--- pkg/PLIST-main 1 Feb 2015 12:52:53 -0000 1.13
+++ pkg/PLIST-main 26 May 2015 14:49:17 -0000
@@ -1374,8 +1374,8 @@ lib/python2.7/ensurepip/__main__.py
lib/python2.7/ensurepip/__main__.pyc
lib/python2.7/ensurepip/__main__.pyo
lib/python2.7/ensurepip/_bundled/
-lib/python2.7/ensurepip/_bundled/pip-1.5.6-py2.py3-none-any.whl
-lib/python2.7/ensurepip/_bundled/setuptools-7.0-py2.py3-none-any.whl
+lib/python2.7/ensurepip/_bundled/pip-6.1.1-py2.py3-none-any.whl
+lib/python2.7/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl
lib/python2.7/ensurepip/_uninstall.py
lib/python2.7/ensurepip/_uninstall.pyc
lib/python2.7/ensurepip/_uninstall.pyo
@@ -1549,7 +1549,7 @@ lib/python2.7/keyword.py
lib/python2.7/keyword.pyc
lib/python2.7/keyword.pyo
lib/python2.7/lib-dynload/
-lib/python2.7/lib-dynload/Python-2.7.9-py2.7.egg-info
+lib/python2.7/lib-dynload/Python-2.7.10-py2.7.egg-info
lib/python2.7/lib-dynload/_bisect.so
lib/python2.7/lib-dynload/_codecs_cn.so
lib/python2.7/lib-dynload/_codecs_hk.so
@@ -1612,9 +1612,9 @@ lib/python2.7/lib-dynload/unicodedata.so
lib/python2.7/lib-dynload/zlib.so
lib/python2.7/lib2to3/
lib/python2.7/lib2to3/Grammar.txt
-lib/python2.7/lib2to3/Grammar2.7.9.final.0.pickle
+lib/python2.7/lib2to3/Grammar2.7.10.final.0.pickle
lib/python2.7/lib2to3/PatternGrammar.txt
-lib/python2.7/lib2to3/PatternGrammar2.7.9.final.0.pickle
+lib/python2.7/lib2to3/PatternGrammar2.7.10.final.0.pickle
lib/python2.7/lib2to3/__init__.py
lib/python2.7/lib2to3/__init__.pyc
lib/python2.7/lib2to3/__init__.pyo
Index: pkg/PLIST-tests
===================================================================
RCS file: /cvs/ports/lang/python/2.7/pkg/PLIST-tests,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 PLIST-tests
--- pkg/PLIST-tests 14 Dec 2014 08:32:55 -0000 1.9
+++ pkg/PLIST-tests 26 May 2015 14:49:17 -0000
@@ -235,7 +235,7 @@ lib/python2.7/test/decimaltestdata/testa
lib/python2.7/test/decimaltestdata/tointegral.decTest
lib/python2.7/test/decimaltestdata/tointegralx.decTest
lib/python2.7/test/decimaltestdata/xor.decTest
-lib/python2.7/test/dh512.pem
+lib/python2.7/test/dh1024.pem
lib/python2.7/test/doctest_aliases.py
lib/python2.7/test/doctest_aliases.pyc
lib/python2.7/test/doctest_aliases.pyo
@@ -1421,6 +1421,9 @@ lib/python2.7/test/test_threadsignals.py
lib/python2.7/test/test_time.py
lib/python2.7/test/test_time.pyc
lib/python2.7/test/test_time.pyo
+lib/python2.7/test/test_timeit.py
+lib/python2.7/test/test_timeit.pyc
+lib/python2.7/test/test_timeit.pyo
lib/python2.7/test/test_timeout.py
lib/python2.7/test/test_timeout.pyc
lib/python2.7/test/test_timeout.pyo
Index: pkg/PLIST-tools
===================================================================
RCS file: /cvs/ports/lang/python/2.7/pkg/PLIST-tools,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST-tools
--- pkg/PLIST-tools 14 Dec 2014 08:32:55 -0000 1.5
+++ pkg/PLIST-tools 26 May 2015 14:49:17 -0000
@@ -179,7 +179,6 @@ lib/python2.7/Tools/scripts/fixdiv.py
lib/python2.7/Tools/scripts/fixheader.py
lib/python2.7/Tools/scripts/fixnotice.py
lib/python2.7/Tools/scripts/fixps.py
-lib/python2.7/Tools/scripts/ftpmirror.py
lib/python2.7/Tools/scripts/google.py
lib/python2.7/Tools/scripts/gprof2html.py
lib/python2.7/Tools/scripts/h2py.py
