kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add patch from: https://hg.python.org/cpython/rev/eddcb6671a48 to fix build

Browse source 
with LibreSSL and stop our OpenBSD bulk builds from being murdered. Defuzz
patches.
This commit is contained in:
rodent 2015-04-24 03:01:35 +00:00
parent 968e0ea0c0
commit b62fc57072
34 changed files with 313 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
lang/python27/distinfo
View file

@ -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

15
lang/python27/patches/patch-Doc_library_ssl.rst Normal file
View file

@ -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

4
lang/python27/patches/patch-Include_pyerrors.h
View file

@ -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);

4
lang/python27/patches/patch-Include_pyport.h
View file

@ -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.

4
lang/python27/patches/patch-Lib_distutils_unixccompiler.py
View file

@ -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"

6
lang/python27/patches/patch-Lib_dumbdb.py
View file

@ -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
"""

4
lang/python27/patches/patch-Lib_multiprocessing_process.py
View file

@ -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

26
lang/python27/patches/patch-Lib_socket.py Normal file
View file

@ -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

20
lang/python27/patches/patch-Lib_ssl.py Normal file
View file

@ -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):

6
lang/python27/patches/patch-Lib_test_test__dumbdbm.py
View file

@ -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()

18
lang/python27/patches/patch-Lib_test_test__ssl.py Normal file
View file

@ -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):

42
lang/python27/patches/patch-Modules___ssl.c Normal file
View file

@ -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},

4
lang/python27/patches/patch-Modules_getaddrinfo.c
View file

@ -1,6 +1,6 @@
$NetBSD: patch-Modules_getaddrinfo.c,v 1.1 2014/07/17 15:26:49 ryoon Exp $
$NetBSD: patch-Modules_getaddrinfo.c,v 1.2 2015/04/24 03:01:36 rodent Exp $
--- Modules/getaddrinfo.c.orig 2014-06-30 02:05:43.000000000 +0000
--- Modules/getaddrinfo.c.orig 2014-12-10 15:59:55.000000000 +0000
+++ Modules/getaddrinfo.c
@@ -66,6 +66,15 @@
#define YES 1

4
lang/python27/patches/patch-Modules_getpath.c
View file

@ -1,8 +1,8 @@
$NetBSD: patch-Modules_getpath.c,v 1.2 2014/11/02 13:31:11 spz Exp $
$NetBSD: patch-Modules_getpath.c,v 1.3 2015/04/24 03:01:36 rodent Exp $
* from cygport 2.7.3-getpath-exe-extension.patch
--- Modules/getpath.c.orig 2014-06-30 02:05:43.000000000 +0000
--- Modules/getpath.c.orig 2014-12-10 15:59:55.000000000 +0000
+++ Modules/getpath.c
@@ -451,6 +451,28 @@ calculate_path(void)
if (isxfile(progpath))

4
lang/python27/patches/patch-Modules_mmapmodule.c
View file

@ -1,6 +1,6 @@
$NetBSD: patch-Modules_mmapmodule.c,v 1.1 2014/07/17 15:26:49 ryoon Exp $
$NetBSD: patch-Modules_mmapmodule.c,v 1.2 2015/04/24 03:01:36 rodent Exp $
--- Modules/mmapmodule.c.orig 2014-06-30 02:05:43.000000000 +0000
--- Modules/mmapmodule.c.orig 2014-12-10 15:59:55.000000000 +0000
+++ Modules/mmapmodule.c
@@ -23,7 +23,7 @@

4
lang/python27/patches/patch-Modules_posixmodule.c
View file

@ -1,6 +1,6 @@
$NetBSD: patch-Modules_posixmodule.c,v 1.1 2014/07/17 15:26:49 ryoon Exp $
$NetBSD: patch-Modules_posixmodule.c,v 1.2 2015/04/24 03:01:36 rodent Exp $
--- Modules/posixmodule.c.orig 2014-06-30 02:05:43.000000000 +0000
--- Modules/posixmodule.c.orig 2014-12-10 15:59:55.000000000 +0000
+++ Modules/posixmodule.c
@@ -317,6 +317,10 @@ extern int lstat(const char *, struct st
#define PARSE_PID "i"

6
lang/python27/patches/patch-Modules_socketmodule.c
View file

@ -1,8 +1,8 @@
$NetBSD: patch-Modules_socketmodule.c,v 1.4 2014/07/17 15:26:49 ryoon Exp $
$NetBSD: patch-Modules_socketmodule.c,v 1.5 2015/04/24 03:01:36 rodent Exp $
--- Modules/socketmodule.c.orig 2014-06-30 02:05:43.000000000 +0000
--- Modules/socketmodule.c.orig 2014-12-10 15:59:55.000000000 +0000
+++ Modules/socketmodule.c
@@ -244,7 +244,7 @@ shutdown(how) -- shut down traffic in on
@@ -248,7 +248,7 @@ shutdown(how) -- shut down traffic in on
/* Irix 6.5 fails to define this variable at all. This is needed
for both GCC and SGI's compiler. I'd say that the SGI headers
are just busted. Same thing for Solaris. */

4
lang/python27/patches/patch-aa
View file

@ -1,6 +1,6 @@
$NetBSD: patch-aa,v 1.1.1.1 2011/02/22 08:52:01 obache Exp $
$NetBSD: patch-aa,v 1.2 2015/04/24 03:01:36 rodent Exp $
--- Include/py_curses.h.orig 2010-03-25 00:54:54.000000000 +0000
--- Include/py_curses.h.orig 2014-12-10 15:59:32.000000000 +0000
+++ Include/py_curses.h
@@ -44,6 +44,21 @@
#endif

4
lang/python27/patches/patch-ab
View file

@ -1,6 +1,6 @@
$NetBSD: patch-ab,v 1.3 2014/11/02 13:31:11 spz Exp $
$NetBSD: patch-ab,v 1.4 2015/04/24 03:01:36 rodent Exp $
--- Lib/distutils/command/build_ext.py.orig 2014-06-30 02:05:25.000000000 +0000
--- Lib/distutils/command/build_ext.py.orig 2014-12-10 15:59:34.000000000 +0000
+++ Lib/distutils/command/build_ext.py
@@ -511,8 +511,19 @@ class build_ext (Command):
# that go into the mix.

4
lang/python27/patches/patch-ad
View file

@ -1,8 +1,8 @@
$NetBSD: patch-ad,v 1.2 2014/11/02 13:31:11 spz Exp $
$NetBSD: patch-ad,v 1.3 2015/04/24 03:01:36 rodent Exp $
Add ability to parse unsigned integers as externalized by NetBSD proplib(3).
--- Lib/plistlib.py.orig 2014-06-30 02:05:30.000000000 +0000
--- Lib/plistlib.py.orig 2014-12-10 15:59:39.000000000 +0000
+++ Lib/plistlib.py
@@ -463,7 +463,7 @@ class PlistParser:
def end_false(self):

4
lang/python27/patches/patch-ae
View file

@ -1,9 +1,9 @@
$NetBSD: patch-ae,v 1.2 2014/11/02 13:31:11 spz Exp $
$NetBSD: patch-ae,v 1.3 2015/04/24 03:01:36 rodent Exp $
XXXbjs: I use amd64, and audioop is broken on 64-bit platforms.
Thus, this needs to be tested.
--- Modules/sunaudiodev.c.orig 2014-06-30 02:05:44.000000000 +0000
--- Modules/sunaudiodev.c.orig 2014-12-10 15:59:55.000000000 +0000
+++ Modules/sunaudiodev.c
@@ -224,7 +224,11 @@ sad_ibufcount(sadobject *self)
{

4
lang/python27/patches/patch-ah
View file

@ -1,6 +1,6 @@
$NetBSD: patch-ah,v 1.3 2014/11/02 13:31:11 spz Exp $
$NetBSD: patch-ah,v 1.4 2015/04/24 03:01:36 rodent Exp $
--- Modules/_cursesmodule.c.orig 2014-06-30 02:05:41.000000000 +0000
--- Modules/_cursesmodule.c.orig 2014-12-10 15:59:53.000000000 +0000
+++ Modules/_cursesmodule.c
@@ -322,17 +322,9 @@ Window_NoArg2TupleReturnFunction(getpary

74
lang/python27/patches/patch-al
View file

@ -1,4 +1,4 @@
$NetBSD: patch-al,v 1.15 2014/07/26 06:19:38 adam Exp $
$NetBSD: patch-al,v 1.16 2015/04/24 03:01:36 rodent Exp $
- recognize MirBSD, Interix
- remove special-case library version hack for FreeBSD
@ -6,9 +6,9 @@ $NetBSD: patch-al,v 1.15 2014/07/26 06:19:38 adam Exp $
- honor pkgsrc LDFLAGS
- other stuff not previously commented (XXX)
--- configure.orig 2014-06-30 02:05:48.000000000 +0000
--- configure.orig 2014-12-10 16:00:00.000000000 +0000
+++ configure
@@ -3252,7 +3252,7 @@ case $ac_sys_system/$ac_sys_release in
@@ -3260,7 +3260,7 @@ case $ac_sys_system/$ac_sys_release in
# Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
# In addition, Stefan Krah confirms that issue #1244610 exists through
# OpenBSD 4.6, but is fixed in 4.7.
@ -17,7 +17,7 @@ $NetBSD: patch-al,v 1.15 2014/07/26 06:19:38 adam Exp $
define_xopen_source=no
# OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is
# also defined. This can be overridden by defining _BSD_SOURCE
@@ -5351,15 +5351,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
@@ -5359,15 +5359,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
@ -34,7 +34,7 @@ $NetBSD: patch-al,v 1.15 2014/07/26 06:19:38 adam Exp $
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
hp*|HP*)
@@ -5393,6 +5388,11 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
@@ -5401,6 +5396,11 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
LDLIBRARY='libpython$(VERSION).so'
RUNSHARED=LIBPATH=`pwd`${LIBPATH:+:${LIBPATH}}
;;
@ -46,7 +46,7 @@ $NetBSD: patch-al,v 1.15 2014/07/26 06:19:38 adam Exp $
esac
else # shared is disabled
@@ -6050,8 +6050,7 @@ $as_echo "$CC" >&6; }
@@ -6058,8 +6058,7 @@ $as_echo "$CC" >&6; }
cur_target_minor=`sw_vers -productVersion | \
sed 's/\([0-9]*\)\.\([0-9]*\).*/\2/'`
cur_target="${cur_target_major}.${cur_target_minor}"
@ -56,7 +56,7 @@ $NetBSD: patch-al,v 1.15 2014/07/26 06:19:38 adam Exp $
then
cur_target=10.3
if test ${enable_universalsdk}; then
@@ -8209,9 +8208,9 @@ then
@@ -8217,9 +8216,9 @@ then
LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else
# No framework, use the Python app as bundle-loader
@ -69,7 +69,7 @@ $NetBSD: patch-al,v 1.15 2014/07/26 06:19:38 adam Exp $
fi ;;
Darwin/*)
# Use -undefined dynamic_lookup whenever possible (10.3 and later).
@@ -8234,9 +8233,9 @@ then
@@ -8242,9 +8241,9 @@ then
LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else
# No framework, use the Python app as bundle-loader
@ -82,7 +82,7 @@ $NetBSD: patch-al,v 1.15 2014/07/26 06:19:38 adam Exp $
fi
else
# building for OS X 10.3 and later
@@ -8250,7 +8249,7 @@ then
@@ -8258,7 +8257,7 @@ then
;;
Linux*|GNU*|QNX*)
LDSHARED='$(CC) -shared'
@ -91,7 +91,7 @@ $NetBSD: patch-al,v 1.15 2014/07/26 06:19:38 adam Exp $
BSD/OS*/4*)
LDSHARED="gcc -shared"
LDCXXSHARED="g++ -shared";;
@@ -8278,6 +8277,9 @@ then
@@ -8286,6 +8285,9 @@ then
;;
esac
fi;;
@ -101,7 +101,7 @@ $NetBSD: patch-al,v 1.15 2014/07/26 06:19:38 adam Exp $
NetBSD*|DragonFly*)
LDSHARED='$(CC) -shared'
LDCXXSHARED='$(CXX) -shared';;
@@ -8324,7 +8326,8 @@ then
@@ -8332,7 +8334,8 @@ then
fi;;
Linux*|GNU*) CCSHARED="-fPIC";;
BSD/OS*/4*) CCSHARED="-fpic";;
@ -111,7 +111,7 @@ $NetBSD: patch-al,v 1.15 2014/07/26 06:19:38 adam Exp $
OpenUNIX*|UnixWare*)
if test "$GCC" = "yes"
then CCSHARED="-fPIC"
@@ -8376,11 +8379,12 @@ then
@@ -8384,11 +8387,12 @@ then
OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
@ -125,7 +125,55 @@ $NetBSD: patch-al,v 1.15 2014/07/26 06:19:38 adam Exp $
SunOS/5*) case $CC in
*gcc*)
if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
@@ -10370,6 +10374,10 @@ int
@@ -8541,6 +8545,47 @@ _ACEOF
fi
# Dynamic linking for HP-UX
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RAND_egd in -lcrypto" >&5
+$as_echo_n "checking for RAND_egd in -lcrypto... " >&6; }
+if ${ac_cv_lib_crypto_RAND_egd+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcrypto $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char RAND_egd ();
+int
+main ()
+{
+return RAND_egd ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_crypto_RAND_egd=yes
+else
+ ac_cv_lib_crypto_RAND_egd=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RAND_egd" >&5
+$as_echo "$ac_cv_lib_crypto_RAND_egd" >&6; }
+if test "x$ac_cv_lib_crypto_RAND_egd" = xyes; then :
+
+$as_echo "#define HAVE_RAND_EGD 1" >>confdefs.h
+
+fi
# only check for sem_init if thread support is requested
if test "$with_threads" = "yes" -o -z "$with_threads"; then
@@ -10378,6 +10423,10 @@ int
main ()
{
int x=kqueue()

24
lang/python27/patches/patch-am
View file

@ -1,4 +1,4 @@
$NetBSD: patch-am,v 1.18 2014/11/02 13:31:11 spz Exp $
$NetBSD: patch-am,v 1.19 2015/04/24 03:01:36 rodent Exp $
Disabled modules for normal build:
bsddb
@ -23,7 +23,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
cygwin 2.7.3-no-libm.patch
--- setup.py.orig 2014-06-30 02:05:48.000000000 +0000
--- setup.py.orig 2014-12-10 16:00:01.000000000 +0000
+++ setup.py
@@ -33,7 +33,7 @@ host_platform = get_platform()
COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
@ -34,7 +34,7 @@ cygwin 2.7.3-no-libm.patch
def add_dir_to_list(dirlist, dir):
"""Add the directory 'dir' to the list 'dirlist' (at the front) if
@@ -436,10 +436,15 @@ class PyBuildExt(build_ext):
@@ -438,10 +438,15 @@ class PyBuildExt(build_ext):
os.unlink(tmpfile)
def detect_modules(self):
@ -54,7 +54,7 @@ cygwin 2.7.3-no-libm.patch
if cross_compiling:
self.add_gcc_paths()
self.add_multiarch_paths()
@@ -551,7 +556,7 @@ class PyBuildExt(build_ext):
@@ -553,7 +558,7 @@ class PyBuildExt(build_ext):
# Check for MacOS X, which doesn't need libm.a at all
math_libs = ['m']
@ -63,7 +63,7 @@ cygwin 2.7.3-no-libm.patch
math_libs = []
# XXX Omitted modules: gl, pure, dl, SGI-specific modules
@@ -787,11 +792,10 @@ class PyBuildExt(build_ext):
@@ -789,11 +794,10 @@ class PyBuildExt(build_ext):
libraries=math_libs) )
# Detect SSL support for the socket module (via _ssl)
search_for_ssl_incs_in = [
@ -78,7 +78,7 @@ cygwin 2.7.3-no-libm.patch
)
if ssl_incs is not None:
krb5_h = find_file('krb5.h', inc_dirs,
@@ -799,9 +803,7 @@ class PyBuildExt(build_ext):
@@ -801,9 +805,7 @@ class PyBuildExt(build_ext):
if krb5_h:
ssl_incs += krb5_h
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
@ -89,7 +89,7 @@ cygwin 2.7.3-no-libm.patch
if (ssl_incs is not None and
ssl_libs is not None):
@@ -820,7 +822,7 @@ class PyBuildExt(build_ext):
@@ -822,7 +824,7 @@ class PyBuildExt(build_ext):
# look for the openssl version header on the compiler search path.
opensslv_h = find_file('openssl/opensslv.h', [],
@ -98,7 +98,7 @@ cygwin 2.7.3-no-libm.patch
if opensslv_h:
name = os.path.join(opensslv_h[0], 'openssl/opensslv.h')
if host_platform == 'darwin' and is_macosx_sdk_path(name):
@@ -920,175 +922,6 @@ class PyBuildExt(build_ext):
@@ -922,175 +924,6 @@ class PyBuildExt(build_ext):
else:
raise ValueError("unknown major BerkeleyDB version", major)
@ -274,7 +274,7 @@ cygwin 2.7.3-no-libm.patch
# The sqlite interface
sqlite_setup_debug = False # verbose debug prints from this script?
@@ -1205,35 +1038,39 @@ class PyBuildExt(build_ext):
@@ -1207,35 +1040,39 @@ class PyBuildExt(build_ext):
# we do not build this one. Otherwise this build will pick up
# the more recent berkeleydb's db.h file first in the include path
# when attempting to compile and it will fail.
@ -338,7 +338,7 @@ cygwin 2.7.3-no-libm.patch
config_args = [arg.strip("'")
for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
dbm_args = [arg for arg in config_args
@@ -1245,7 +1082,7 @@ class PyBuildExt(build_ext):
@@ -1247,7 +1084,7 @@ class PyBuildExt(build_ext):
dbmext = None
for cand in dbm_order:
if cand == "ndbm":
@ -347,7 +347,7 @@ cygwin 2.7.3-no-libm.patch
# Some systems have -lndbm, others have -lgdbm_compat,
# others don't have either
if self.compiler.find_library_file(lib_dirs,
@@ -1289,18 +1126,14 @@ class PyBuildExt(build_ext):
@@ -1291,18 +1128,14 @@ class PyBuildExt(build_ext):
libraries = gdbm_libs)
break
elif cand == "bdb":
@ -374,7 +374,7 @@ cygwin 2.7.3-no-libm.patch
if dbmext is not None:
exts.append(dbmext)
else:
@@ -2228,9 +2061,9 @@ def main():
@@ -2230,9 +2063,9 @@ def main():
ext_modules=[Extension('_struct', ['_struct.c'])],
# Scripts to install

4
lang/python27/patches/patch-an
View file

@ -1,6 +1,6 @@
$NetBSD: patch-an,v 1.2 2014/11/02 13:31:11 spz Exp $
$NetBSD: patch-an,v 1.3 2015/04/24 03:01:36 rodent Exp $
--- Modules/makesetup.orig 2014-06-30 02:05:43.000000000 +0000
--- Modules/makesetup.orig 2014-12-10 15:59:55.000000000 +0000
+++ Modules/makesetup
@@ -164,6 +164,7 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' |
-rpath) libs="$libs $arg"; skip=libs;;

4
lang/python27/patches/patch-ao
View file

@ -1,6 +1,6 @@
$NetBSD: patch-ao,v 1.5 2014/11/02 13:31:11 spz Exp $
$NetBSD: patch-ao,v 1.6 2015/04/24 03:01:36 rodent Exp $
--- Lib/distutils/util.py.orig 2014-06-30 02:05:26.000000000 +0000
--- Lib/distutils/util.py.orig 2014-12-10 15:59:35.000000000 +0000
+++ Lib/distutils/util.py
@@ -101,6 +101,8 @@ def get_platform ():
osname, release, machine = _osx_support.get_platform_osx(

8
lang/python27/patches/patch-au
View file

@ -1,12 +1,12 @@
$NetBSD: patch-au,v 1.7 2014/11/02 13:31:11 spz Exp $
$NetBSD: patch-au,v 1.8 2015/04/24 03:01:36 rodent Exp $
Fix for unpriviliged build.
http://hg.python.org/cpython/rev/a0f43f4481e0
--- Makefile.pre.in.orig 2014-06-30 02:05:39.000000000 +0000
--- Makefile.pre.in.orig 2014-12-10 15:59:50.000000000 +0000
+++ Makefile.pre.in
@@ -499,7 +499,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py
@@ -512,7 +512,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py
SRC_GDB_HOOKS=$(srcdir)/Tools/gdb/libpython.py
$(BUILDPYTHON)-gdb.py: $(SRC_GDB_HOOKS)
@ -15,7 +15,7 @@ http://hg.python.org/cpython/rev/a0f43f4481e0
# This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
# minimal framework (not including the Lib directory and such) in the current
@@ -890,7 +890,8 @@ altbininstall: $(BUILDPYTHON)
@@ -922,7 +922,8 @@ altbininstall: $(BUILDPYTHON)
(cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) $(LDLIBRARY)) \
fi \
fi; \

4
lang/python27/patches/patch-av
View file

@ -1,9 +1,9 @@
$NetBSD: patch-av,v 1.2 2014/11/02 13:31:11 spz Exp $
$NetBSD: patch-av,v 1.3 2015/04/24 03:01:36 rodent Exp $
Add a knob (enviroment variable) for disabling installation of egg metadata
in extensions until we have infrastructure in place for dealing w/ it.
--- Lib/distutils/command/install.py.orig 2014-06-30 02:05:25.000000000 +0000
--- Lib/distutils/command/install.py.orig 2014-12-10 15:59:34.000000000 +0000
+++ Lib/distutils/command/install.py
@@ -666,7 +666,8 @@ class install (Command):
('install_headers', has_headers),

4
lang/python27/patches/patch-aw
View file

@ -1,6 +1,6 @@
$NetBSD: patch-aw,v 1.2 2014/11/02 13:31:11 spz Exp $
$NetBSD: patch-aw,v 1.3 2015/04/24 03:01:36 rodent Exp $
--- Modules/nismodule.c.orig 2014-06-30 02:05:43.000000000 +0000
--- Modules/nismodule.c.orig 2014-12-10 15:59:55.000000000 +0000
+++ Modules/nismodule.c
@@ -89,7 +89,7 @@ nis_mapname (char *map, int *pfix)
return map;

6
lang/python27/patches/patch-ax
View file

@ -1,10 +1,10 @@
$NetBSD: patch-ax,v 1.5 2014/11/02 13:31:11 spz Exp $
$NetBSD: patch-ax,v 1.6 2015/04/24 03:01:36 rodent Exp $
chop "-RELEASE" or "-DEVELOPMENT" from release for DragonFly.
--- Lib/sysconfig.py.orig 2014-06-30 02:05:31.000000000 +0000
--- Lib/sysconfig.py.orig 2014-12-10 15:59:40.000000000 +0000
+++ Lib/sysconfig.py
@@ -603,6 +603,8 @@ def get_platform():
@@ -607,6 +607,8 @@ def get_platform():
osname, release, machine = _osx_support.get_platform_osx(
get_config_vars(),
osname, release, machine)

4
lang/python27/patches/patch-az
View file

@ -1,6 +1,6 @@
$NetBSD: patch-az,v 1.4 2014/11/02 13:31:11 spz Exp $
$NetBSD: patch-az,v 1.5 2015/04/24 03:01:36 rodent Exp $
--- Modules/selectmodule.c.orig 2014-06-30 02:05:43.000000000 +0000
--- Modules/selectmodule.c.orig 2014-12-10 15:59:55.000000000 +0000
+++ Modules/selectmodule.c
@@ -1906,7 +1906,9 @@ initselect(void)
PyModule_AddIntConstant(m, "KQ_FILTER_NETDEV", EVFILT_NETDEV);

16
lang/python27/patches/patch-configure.ac Normal file
View file

@ -0,0 +1,16 @@
$NetBSD: patch-configure.ac,v 1.1 2015/04/24 03:01:36 rodent Exp $
Fix build with LibreSSL.
--- configure.ac.orig 2014-12-10 16:00:00.000000000 +0000
+++ configure.ac
@@ -2221,6 +2221,9 @@ AC_MSG_RESULT($SHLIBS)
# checks for libraries
AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/Solaris and SYSV
AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX
+AC_CHECK_LIB(crypto, RAND_egd,
+ AC_DEFINE(HAVE_RAND_EGD, 1,
+ [Define if the libcrypto has RAND_egd]))
# only check for sem_init if thread support is requested
if test "$with_threads" = "yes" -o -z "$with_threads"; then

18
lang/python27/patches/patch-pyconfig.h.in
View file

@ -1,8 +1,20 @@
$NetBSD: patch-pyconfig.h.in,v 1.3 2014/11/02 13:31:11 spz Exp $
$NetBSD: patch-pyconfig.h.in,v 1.4 2015/04/24 03:01:36 rodent Exp $
--- pyconfig.h.in.orig 2014-06-30 02:05:48.000000000 +0000
Fix build with LibreSSL.
--- pyconfig.h.in.orig 2014-12-10 16:00:01.000000000 +0000
+++ pyconfig.h.in
@@ -1200,7 +1200,9 @@
@@ -544,6 +544,9 @@
/* Define to 1 if you have the `putenv' function. */
#undef HAVE_PUTENV
+/* Define if the libcrypto has RAND_egd */
+#undef HAVE_RAND_EGD
+
/* Define to 1 if you have the `readlink' function. */
#undef HAVE_READLINK
@@ -1200,7 +1203,9 @@
#undef _UINT64_T
/* Define to the level of X/Open that your system supports */

4
lang/python27/patches/patch-xa
View file

@ -1,6 +1,6 @@
$NetBSD: patch-xa,v 1.2 2014/11/02 13:31:11 spz Exp $
$NetBSD: patch-xa,v 1.3 2015/04/24 03:01:36 rodent Exp $
--- Python/thread_pthread.h.orig 2014-06-30 02:05:47.000000000 +0000
--- Python/thread_pthread.h.orig 2014-12-10 15:59:59.000000000 +0000
+++ Python/thread_pthread.h
@@ -46,6 +46,9 @@
we need to add 0 to make it work there as well. */