pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/python27 Add patch from: https://hg.python.org/cp...
details: https://anonhg.NetBSD.org/pkgsrc/rev/d64237a44281
branches: trunk
changeset: 650513:d64237a44281
user: rodent <rodent%pkgsrc.org@localhost>
date: Fri Apr 24 03:01:35 2015 +0000
description:
Add patch from: https://hg.python.org/cpython/rev/eddcb6671a48 to fix build
with LibreSSL and stop our OpenBSD bulk builds from being murdered. Defuzz
patches.
diffstat:
lang/python27/distinfo | 62 ++++++-----
lang/python27/patches/patch-Doc_library_ssl.rst | 15 ++
lang/python27/patches/patch-Include_pyerrors.h | 4 +-
lang/python27/patches/patch-Include_pyport.h | 4 +-
lang/python27/patches/patch-Lib_distutils_unixccompiler.py | 4 +-
lang/python27/patches/patch-Lib_dumbdb.py | 6 +-
lang/python27/patches/patch-Lib_multiprocessing_process.py | 4 +-
lang/python27/patches/patch-Lib_socket.py | 26 ++++
lang/python27/patches/patch-Lib_ssl.py | 20 +++
lang/python27/patches/patch-Lib_test_test__dumbdbm.py | 6 +-
lang/python27/patches/patch-Lib_test_test__ssl.py | 18 +++
lang/python27/patches/patch-Modules___ssl.c | 42 +++++++
lang/python27/patches/patch-Modules_getaddrinfo.c | 4 +-
lang/python27/patches/patch-Modules_getpath.c | 4 +-
lang/python27/patches/patch-Modules_mmapmodule.c | 4 +-
lang/python27/patches/patch-Modules_posixmodule.c | 4 +-
lang/python27/patches/patch-Modules_socketmodule.c | 6 +-
lang/python27/patches/patch-aa | 4 +-
lang/python27/patches/patch-ab | 4 +-
lang/python27/patches/patch-ad | 4 +-
lang/python27/patches/patch-ae | 4 +-
lang/python27/patches/patch-ah | 4 +-
lang/python27/patches/patch-al | 74 +++++++++++--
lang/python27/patches/patch-am | 24 ++--
lang/python27/patches/patch-an | 4 +-
lang/python27/patches/patch-ao | 4 +-
lang/python27/patches/patch-au | 8 +-
lang/python27/patches/patch-av | 4 +-
lang/python27/patches/patch-aw | 4 +-
lang/python27/patches/patch-ax | 6 +-
lang/python27/patches/patch-az | 4 +-
lang/python27/patches/patch-configure.ac | 16 +++
lang/python27/patches/patch-pyconfig.h.in | 18 ++-
lang/python27/patches/patch-xa | 4 +-
34 files changed, 313 insertions(+), 110 deletions(-)
diffs (truncated from 862 to 300 lines):
diff -r eb6c808a7094 -r d64237a44281 lang/python27/distinfo
--- a/lang/python27/distinfo Thu Apr 23 18:28:57 2015 +0000
+++ b/lang/python27/distinfo Fri Apr 24 03:01:35 2015 +0000
@@ -1,32 +1,38 @@
-$NetBSD: distinfo,v 1.49 2015/03/03 17:19:58 snj Exp $
+$NetBSD: distinfo,v 1.50 2015/04/24 03:01:35 rodent Exp $
SHA1 (Python-2.7.9.tar.xz) = 3172f6e957713c2d9fca462cc16068222fd1b9d3
RMD160 (Python-2.7.9.tar.xz) = 2b047c3b56987b473c3ca957ad87f5582c37d6f6
Size (Python-2.7.9.tar.xz) = 12164712 bytes
-SHA1 (patch-Include_pyerrors.h) = 3eba043c83b1d1df4918524f7b53047a6ed372ae
-SHA1 (patch-Include_pyport.h) = 971c7c548b92595712d0d70a0917a0ccc83b6c7e
-SHA1 (patch-Lib_distutils_unixccompiler.py) = 39b967dc2ae648143d5841f22602a21063b4d5ea
-SHA1 (patch-Lib_dumbdb.py) = b4b154f511c8852e2f869653eccd7d9a1c21e734
-SHA1 (patch-Lib_multiprocessing_process.py) = b47ad4cbeddbcfb4342c08c84d0d515a793815d4
-SHA1 (patch-Lib_test_test__dumbdbm.py) = f59f0d8bbf910bac369528129b564597a77379ba
-SHA1 (patch-Modules_getaddrinfo.c) = 696c58c4c4bbb710fb1508d7d88864d0b08cfc79
-SHA1 (patch-Modules_getpath.c) = aa8a54717a85f831e3ceaad19d96c43bc38aef10
-SHA1 (patch-Modules_mmapmodule.c) = 87ea76e6d8263045c1ca794ff5c75ed631a74b6d
-SHA1 (patch-Modules_posixmodule.c) = b8960592611499202bb5ff8521d619e0637177b6
-SHA1 (patch-Modules_socketmodule.c) = 960ce4af2a142c471c707de446f2d390044bbc13
-SHA1 (patch-aa) = 990e4025bb6a37715e1f5df1831499f0ab08acfa
-SHA1 (patch-ab) = 6a38874aaaccc878541554546835ccbf6136bbd5
-SHA1 (patch-ad) = 061aefac15fe3834271770f0fd225e12f84d961a
-SHA1 (patch-ae) = 7fadf9e2f5fe7ad42e14f9cf9ef92e92a3a40787
-SHA1 (patch-ah) = 0648597f53bef7832af589378104a4d43290714a
-SHA1 (patch-al) = 4bd68f7995f5b76c3d62f370f31568930055c76f
-SHA1 (patch-am) = 5e287cddd574e86e1ef07e6e862e72aacaa70b93
-SHA1 (patch-an) = f1179125d2042e44b864488864144cae057171cb
-SHA1 (patch-ao) = ad4377682b01a4965c84ac46e398ec5e841ee0f5
-SHA1 (patch-au) = 98c925a32b2067055d9082a24b8a8b8b1069eb90
-SHA1 (patch-av) = 3cd52c97afe7b3331559e75b1d69c886014c1d8e
-SHA1 (patch-aw) = ff445b01cd4979d26baf27aabb291a803c4a2ec2
-SHA1 (patch-ax) = 63948a78cbd4dd5438cd0fc1ce8a23e6ec13626c
-SHA1 (patch-az) = e373cb7e80650b3cc9f491864ab2c2ddfd4c8395
-SHA1 (patch-pyconfig.h.in) = 11aae6980d82ec577088dc4e13f5e3b5180360e6
-SHA1 (patch-xa) = e996624c1d4aa978f853dab31a096b8587fed7a2
+SHA1 (patch-Doc_library_ssl.rst) = f8fe95057675486bf9dbac30bad442e79ea75136
+SHA1 (patch-Include_pyerrors.h) = 0d2cd52d18cc719b895fa32ed7e11c6cb15bae54
+SHA1 (patch-Include_pyport.h) = f3e4ddbc954425a65301465410911222ca471320
+SHA1 (patch-Lib_distutils_unixccompiler.py) = def4142633b8f6b75e905b5c57be1d5c19b42d33
+SHA1 (patch-Lib_dumbdb.py) = 56c15b68bafbdbcc009a9210019607293559dd32
+SHA1 (patch-Lib_multiprocessing_process.py) = 15699bd8ec822bf54a0631102e00e0a34f882803
+SHA1 (patch-Lib_socket.py) = d22b4f0721124313f031e03c36149c90dc39f714
+SHA1 (patch-Lib_ssl.py) = 33d5fde22614a4cba75159ea1c7aff92169dbfba
+SHA1 (patch-Lib_test_test__dumbdbm.py) = ec743572b23e5a7cebd2556a13bbd7d5692e639d
+SHA1 (patch-Lib_test_test__ssl.py) = 1c423632b2fe66dee0ee35e10cdc4704dba0d185
+SHA1 (patch-Modules___ssl.c) = ba5800d57cbfb1ca29dbfaf2d57ba196669f2684
+SHA1 (patch-Modules_getaddrinfo.c) = aa699d257f1bc98b9a3183a21324053e134409d1
+SHA1 (patch-Modules_getpath.c) = 9bb2c040895ad6bbe4d0b5807803723b5437d47b
+SHA1 (patch-Modules_mmapmodule.c) = 3f401b59883af3232b6c77a76a08e5feffa77044
+SHA1 (patch-Modules_posixmodule.c) = 5105d380cd49bf49b8adbd9aa5ffb245195728ed
+SHA1 (patch-Modules_socketmodule.c) = 16848d90947b3de1f921a0813fa5c317f76961d4
+SHA1 (patch-aa) = d9626c1648d7ff2a7da7352665bcb05f4ab0412a
+SHA1 (patch-ab) = ea4feba4e93dbcff07050c82a00d591bb650e934
+SHA1 (patch-ad) = 96ae702995d434e2d7ec0ac62e37427a90b61d13
+SHA1 (patch-ae) = d836d77854a2b3d79fa34a06a8e2493bf0a503e6
+SHA1 (patch-ah) = 90b19239d8a7c8abc3bbc05d49408a2c5da6174d
+SHA1 (patch-al) = d605a47a8aaac7b928af88d22429ce9e557f271b
+SHA1 (patch-am) = a7697dda83b151fdd30d460bdcf5ab3cc057c92b
+SHA1 (patch-an) = 9aad78714c4fe1a21cf66a6627d97d164ecea196
+SHA1 (patch-ao) = 5bcfad96f8e490351160f1a7c1f4ece7706a33fa
+SHA1 (patch-au) = dcfac01d19dd3fc1eaa3b59a440f5c393c373f9e
+SHA1 (patch-av) = e6aef090b444b455fe351308d251e670329b7dc3
+SHA1 (patch-aw) = d07129531ec1427669092c504c12247206408c2d
+SHA1 (patch-ax) = 8a7a0e5cbfec279a05945dffafea1b1131a76f0e
+SHA1 (patch-az) = 01e113b0bd251978b555caaaa60b79c372edebce
+SHA1 (patch-configure.ac) = 88daa10dc8cdfd490c911ad9f2143f4ec6a82e12
+SHA1 (patch-pyconfig.h.in) = a52a02cbc7ce7c988e0169a92e58342762e7ce0a
+SHA1 (patch-xa) = 517cfefc2f2e13631d22bad28c327513cdf17c10
diff -r eb6c808a7094 -r d64237a44281 lang/python27/patches/patch-Doc_library_ssl.rst
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/python27/patches/patch-Doc_library_ssl.rst Fri Apr 24 03:01:35 2015 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-Doc_library_ssl.rst,v 1.1 2015/04/24 03:01:36 rodent Exp $
+
+Fix build with LibreSSL.
+
+--- Doc/library/ssl.rst.orig 2014-12-10 15:59:29.000000000 +0000
++++ Doc/library/ssl.rst
+@@ -300,6 +300,8 @@ Random generation
+ See http://egd.sourceforge.net/ or http://prngd.sourceforge.net/ for sources
+ of entropy-gathering daemons.
+
++ Availability: not available with LibreSSL.
++
+ .. function:: RAND_add(bytes, entropy)
+
+ Mixes the given *bytes* into the SSL pseudo-random number generator. The
diff -r eb6c808a7094 -r d64237a44281 lang/python27/patches/patch-Include_pyerrors.h
--- a/lang/python27/patches/patch-Include_pyerrors.h Thu Apr 23 18:28:57 2015 +0000
+++ b/lang/python27/patches/patch-Include_pyerrors.h Fri Apr 24 03:01:35 2015 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-Include_pyerrors.h,v 1.1 2013/04/17 13:21:05 obache Exp $
+$NetBSD: patch-Include_pyerrors.h,v 1.2 2015/04/24 03:01:36 rodent Exp $
* from cygport 2.6.5-export-PySignal_SetWakeupFd.patch
---- Include/pyerrors.h.orig 2013-04-06 14:02:25.000000000 +0000
+--- Include/pyerrors.h.orig 2014-12-10 15:59:32.000000000 +0000
+++ Include/pyerrors.h
@@ -231,7 +231,7 @@ PyAPI_FUNC(int) PyErr_CheckSignals(void)
PyAPI_FUNC(void) PyErr_SetInterrupt(void);
diff -r eb6c808a7094 -r d64237a44281 lang/python27/patches/patch-Include_pyport.h
--- a/lang/python27/patches/patch-Include_pyport.h Thu Apr 23 18:28:57 2015 +0000
+++ b/lang/python27/patches/patch-Include_pyport.h Fri Apr 24 03:01:35 2015 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-Include_pyport.h,v 1.2 2014/07/02 09:53:16 adam Exp $
+$NetBSD: patch-Include_pyport.h,v 1.3 2015/04/24 03:01:36 rodent Exp $
SunOS defines gethostname in <unistd.h>
http://bugs.python.org/issue19561
---- Include/pyport.h.orig 2014-05-31 18:58:38.000000000 +0000
+--- Include/pyport.h.orig 2014-12-10 15:59:32.000000000 +0000
+++ Include/pyport.h
@@ -640,11 +640,6 @@ Please be conservative with adding new o
in platform-specific #ifdefs.
diff -r eb6c808a7094 -r d64237a44281 lang/python27/patches/patch-Lib_distutils_unixccompiler.py
--- a/lang/python27/patches/patch-Lib_distutils_unixccompiler.py Thu Apr 23 18:28:57 2015 +0000
+++ b/lang/python27/patches/patch-Lib_distutils_unixccompiler.py Fri Apr 24 03:01:35 2015 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-Lib_distutils_unixccompiler.py,v 1.2 2013/09/10 14:22:30 joerg Exp $
+$NetBSD: patch-Lib_distutils_unixccompiler.py,v 1.3 2015/04/24 03:01:36 rodent Exp $
* from cygport 2.7.3-dylib.patch
---- Lib/distutils/unixccompiler.py.orig 2013-05-12 03:32:42.000000000 +0000
+--- Lib/distutils/unixccompiler.py.orig 2014-12-10 15:59:34.000000000 +0000
+++ Lib/distutils/unixccompiler.py
@@ -82,6 +82,7 @@ class UnixCCompiler(CCompiler):
static_lib_format = shared_lib_format = dylib_lib_format = "lib%s%s"
diff -r eb6c808a7094 -r d64237a44281 lang/python27/patches/patch-Lib_dumbdb.py
--- a/lang/python27/patches/patch-Lib_dumbdb.py Thu Apr 23 18:28:57 2015 +0000
+++ b/lang/python27/patches/patch-Lib_dumbdb.py Fri Apr 24 03:01:35 2015 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-Lib_dumbdb.py,v 1.1 2015/03/03 17:19:58 snj Exp $
+$NetBSD: patch-Lib_dumbdb.py,v 1.2 2015/04/24 03:01:36 rodent Exp $
http://bugs.python.org/issue22885
---- Lib/dumbdbm.py.orig 2015-03-03 09:05:52.000000000 -0800
-+++ Lib/dumbdbm.py 2015-03-03 09:10:02.000000000 -0800
+--- Lib/dumbdbm.py.orig 2014-12-10 15:59:35.000000000 +0000
++++ Lib/dumbdbm.py
@@ -21,6 +21,7 @@ is read when the database is opened, and
"""
diff -r eb6c808a7094 -r d64237a44281 lang/python27/patches/patch-Lib_multiprocessing_process.py
--- a/lang/python27/patches/patch-Lib_multiprocessing_process.py Thu Apr 23 18:28:57 2015 +0000
+++ b/lang/python27/patches/patch-Lib_multiprocessing_process.py Fri Apr 24 03:01:35 2015 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-Lib_multiprocessing_process.py,v 1.1 2014/07/17 15:26:49 ryoon Exp $
+$NetBSD: patch-Lib_multiprocessing_process.py,v 1.2 2015/04/24 03:01:36 rodent Exp $
---- Lib/multiprocessing/process.py.orig 2014-06-30 02:05:29.000000000 +0000
+--- Lib/multiprocessing/process.py.orig 2014-12-10 15:59:39.000000000 +0000
+++ Lib/multiprocessing/process.py
@@ -306,7 +306,15 @@ class _MainProcess(Process):
self._popen = None
diff -r eb6c808a7094 -r d64237a44281 lang/python27/patches/patch-Lib_socket.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/python27/patches/patch-Lib_socket.py Fri Apr 24 03:01:35 2015 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-Lib_socket.py,v 1.1 2015/04/24 03:01:36 rodent Exp $
+
+Fix build with LibreSSL.
+
+--- Lib/socket.py.orig 2014-12-10 15:59:40.000000000 +0000
++++ Lib/socket.py
+@@ -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, \
+@@ -78,6 +77,11 @@ else:
+ SSL_ERROR_WANT_CONNECT, \
+ SSL_ERROR_EOF, \
+ SSL_ERROR_INVALID_ERROR_CODE
++ try:
++ from _ssl import RAND_egd
++ except ImportError:
++ # LibreSSL does not provide RAND_egd
++ pass
+
+ import os, sys, warnings
+
diff -r eb6c808a7094 -r d64237a44281 lang/python27/patches/patch-Lib_ssl.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/python27/patches/patch-Lib_ssl.py Fri Apr 24 03:01:35 2015 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-Lib_ssl.py,v 1.1 2015/04/24 03:01:36 rodent Exp $
+
+Fix build with LibreSSL.
+
+--- Lib/ssl.py.orig 2014-12-10 15:59:40.000000000 +0000
++++ Lib/ssl.py
+@@ -106,7 +106,12 @@ from _ssl import CERT_NONE, CERT_OPTIONA
+ 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
++try:
++ from _ssl import RAND_egd
++except ImportError:
++ # LibreSSL does not provide RAND_egd
++ pass
+
+ def _import_symbols(prefix):
+ for n in dir(_ssl):
diff -r eb6c808a7094 -r d64237a44281 lang/python27/patches/patch-Lib_test_test__dumbdbm.py
--- a/lang/python27/patches/patch-Lib_test_test__dumbdbm.py Thu Apr 23 18:28:57 2015 +0000
+++ b/lang/python27/patches/patch-Lib_test_test__dumbdbm.py Fri Apr 24 03:01:35 2015 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-Lib_test_test__dumbdbm.py,v 1.1 2015/03/03 17:19:58 snj Exp $
+$NetBSD: patch-Lib_test_test__dumbdbm.py,v 1.2 2015/04/24 03:01:36 rodent Exp $
http://bugs.python.org/issue22885
---- Lib/test/test_dumbdbm.py.orig 2015-03-03 09:05:53.000000000 -0800
-+++ Lib/test/test_dumbdbm.py 2015-03-03 09:10:02.000000000 -0800
+--- Lib/test/test_dumbdbm.py.orig 2014-12-10 15:59:43.000000000 +0000
++++ Lib/test/test_dumbdbm.py
@@ -160,6 +160,14 @@ class DumbDBMTestCase(unittest.TestCase)
self.assertEqual(expected, got)
f.close()
diff -r eb6c808a7094 -r d64237a44281 lang/python27/patches/patch-Lib_test_test__ssl.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/python27/patches/patch-Lib_test_test__ssl.py Fri Apr 24 03:01:35 2015 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-Lib_test_test__ssl.py,v 1.3 2015/04/24 03:01:36 rodent Exp $
+
+Fix build with LibreSSL.
+
+--- Lib/test/test_ssl.py.orig 2014-12-10 15:59:47.000000000 +0000
++++ Lib/test/test_ssl.py
+@@ -169,8 +169,9 @@ 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)
++ if hasattr(ssl, 'RAND_egd'):
++ 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):
diff -r eb6c808a7094 -r d64237a44281 lang/python27/patches/patch-Modules___ssl.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/python27/patches/patch-Modules___ssl.c Fri Apr 24 03:01:35 2015 +0000
@@ -0,0 +1,42 @@
+$NetBSD: patch-Modules___ssl.c,v 1.5 2015/04/24 03:01:36 rodent Exp $
+
+Fix build with LibreSSL.
+
+--- Modules/_ssl.c.orig 2014-12-10 15:59:53.000000000 +0000
++++ Modules/_ssl.c
+@@ -3301,6 +3301,11 @@ Returns 1 if the OpenSSL PRNG has been s
+ It is necessary to seed the PRNG with RAND_add() on some platforms before\n\
+ using the ssl() function.");
+
++#endif /* HAVE_OPENSSL_RAND */
++
++
++#ifdef HAVE_RAND_EGD
++
+ static PyObject *
+ PySSL_RAND_egd(PyObject *self, PyObject *arg)
+ {
+@@ -3327,7 +3332,7 @@ Queries the entropy gather daemon (EGD)
+ 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 */
++#endif /* HAVE_RAND_EGD */
+
+
+ PyDoc_STRVAR(PySSL_get_default_verify_paths_doc,
+@@ -3720,10 +3725,12 @@ static PyMethodDef PySSL_methods[] = {
+ #ifdef HAVE_OPENSSL_RAND
+ {"RAND_add", PySSL_RAND_add, METH_VARARGS,
+ PySSL_RAND_add_doc},
++{"RAND_status", (PyCFunction)PySSL_RAND_status, METH_NOARGS,
++ PySSL_RAND_status_doc},
++#endif
++#ifdef HAVE_RAND_EGD
+ {"RAND_egd", PySSL_RAND_egd, METH_VARARGS,
+ PySSL_RAND_egd_doc},
+- {"RAND_status", (PyCFunction)PySSL_RAND_status, METH_NOARGS,
+- PySSL_RAND_status_doc},
+ #endif
+ {"get_default_verify_paths", (PyCFunction)PySSL_get_default_verify_paths,
+ METH_NOARGS, PySSL_get_default_verify_paths_doc},
diff -r eb6c808a7094 -r d64237a44281 lang/python27/patches/patch-Modules_getaddrinfo.c
--- a/lang/python27/patches/patch-Modules_getaddrinfo.c Thu Apr 23 18:28:57 2015 +0000
Home |
Main Index |
Thread Index |
Old Index