Import of pkgsrc-2015Q2

This commit is contained in:
2015-08-30 02:56:09 -07:00
committed by Lionel Sambuc
parent 4af1cdf7a9
commit f641581404
15409 changed files with 267784 additions and 121624 deletions

View File

@@ -1,8 +1,8 @@
$NetBSD: patch-Include_pyport.h,v 1.1 2014/06/11 06:03:10 richard Exp $
$NetBSD: patch-Include_pyport.h,v 1.2 2015/04/24 03:24:32 rodent Exp $
SunOS defines gethostname in <unistd.h>
http://bugs.python.org/issue19561
--- Include/pyport.h.orig 2013-05-15 16:32:54.000000000 +0000
--- Include/pyport.h.orig 2014-10-12 07:03:52.000000000 +0000
+++ Include/pyport.h
@@ -649,11 +649,6 @@ Please be conservative with adding new o
in platform-specific #ifdefs.

View File

@@ -1,6 +1,6 @@
$NetBSD: patch-Lib_distutils_unixccompiler.py,v 1.1 2013/09/10 14:22:30 joerg Exp $
$NetBSD: patch-Lib_distutils_unixccompiler.py,v 1.2 2015/04/24 03:24:32 rodent Exp $
--- Lib/distutils/unixccompiler.py.orig 2013-05-15 16:32:54.000000000 +0000
--- Lib/distutils/unixccompiler.py.orig 2014-10-12 07:03:52.000000000 +0000
+++ Lib/distutils/unixccompiler.py
@@ -232,7 +232,7 @@ class UnixCCompiler(CCompiler):
elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":

View File

@@ -0,0 +1,20 @@
$NetBSD: patch-Lib_ssl.py,v 1.1 2015/04/24 03:24:32 rodent Exp $
Fix build with LibreSSL.
--- Lib/ssl.py.orig 2014-10-12 07:03:53.000000000 +0000
+++ Lib/ssl.py
@@ -78,7 +78,12 @@ try:
from _ssl import OP_SINGLE_ECDH_USE
except ImportError:
pass
-from _ssl import RAND_status, RAND_egd, RAND_add, RAND_bytes, RAND_pseudo_bytes
+from _ssl import RAND_status, RAND_add, RAND_bytes, RAND_pseudo_bytes
+try:
+ from _ssl import RAND_egd
+except ImportError:
+ # LibreSSL does not provide RAND_egd
+ pass
from _ssl import (
SSL_ERROR_ZERO_RETURN,
SSL_ERROR_WANT_READ,

View File

@@ -0,0 +1,18 @@
$NetBSD: patch-Lib_test_test__ssl.py,v 1.1 2015/04/24 03:24:32 rodent Exp $
Fix build with LibreSSL.
--- Lib/test/test_ssl.py.orig 2014-10-12 07:03:53.000000000 +0000
+++ Lib/test/test_ssl.py
@@ -130,8 +130,9 @@ class BasicSocketTests(unittest.TestCase
self.assertRaises(ValueError, ssl.RAND_bytes, -5)
self.assertRaises(ValueError, ssl.RAND_pseudo_bytes, -5)
- 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)
@unittest.skipUnless(os.name == 'posix', 'requires posix')

View File

@@ -0,0 +1,33 @@
$NetBSD: patch-Modules___ssl.c,v 1.1 2015/04/24 03:24:32 rodent Exp $
Fix build with LibreSSL.
--- Modules/_ssl.c.orig 2014-10-12 07:03:53.000000000 +0000
+++ Modules/_ssl.c
@@ -2559,6 +2559,7 @@ 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.");
+#ifdef HAVE_RAND_EGD
static PyObject *
PySSL_RAND_egd(PyObject *self, PyObject *args)
{
@@ -2586,6 +2587,7 @@ PyDoc_STRVAR(PySSL_RAND_egd_doc,
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_RAND_EGD */
#endif /* HAVE_OPENSSL_RAND */
@@ -2604,8 +2606,10 @@ static PyMethodDef PySSL_methods[] = {
PySSL_RAND_bytes_doc},
{"RAND_pseudo_bytes", PySSL_RAND_pseudo_bytes, METH_VARARGS,
PySSL_RAND_pseudo_bytes_doc},
+#ifdef HAVE_RAND_EGD
{"RAND_egd", PySSL_RAND_egd, METH_VARARGS,
PySSL_RAND_egd_doc},
+#endif
{"RAND_status", (PyCFunction)PySSL_RAND_status, METH_NOARGS,
PySSL_RAND_status_doc},
#endif

View File

@@ -1,9 +1,9 @@
$NetBSD: patch-aa,v 1.1 2012/12/10 03:15:49 tsarna Exp $
$NetBSD: patch-aa,v 1.2 2015/04/24 03:24:32 rodent Exp $
* On NetBSD, [n]curses.h and stdlib.h/wchar.h use different guards
against multiple definition of wchar_t and wint_t.
--- Include/py_curses.h.orig 2009-09-06 21:26:46.000000000 +0000
--- Include/py_curses.h.orig 2014-10-12 07:03:52.000000000 +0000
+++ Include/py_curses.h
@@ -44,6 +44,21 @@
#endif

View File

@@ -1,8 +1,8 @@
$NetBSD: patch-ab,v 1.1 2012/12/10 03:15:49 tsarna Exp $
$NetBSD: patch-ab,v 1.2 2015/04/24 03:24:32 rodent Exp $
--- Lib/distutils/command/build_ext.py.orig 2012-02-23 20:22:44.000000000 +0000
--- Lib/distutils/command/build_ext.py.orig 2014-10-12 07:03:52.000000000 +0000
+++ Lib/distutils/command/build_ext.py
@@ -523,8 +523,19 @@ class build_ext(Command):
@@ -532,8 +532,19 @@ class build_ext(Command):
# that go into the mix.
if ext.extra_objects:
objects.extend(ext.extra_objects)

View File

@@ -1,10 +1,10 @@
$NetBSD: patch-ah,v 1.1 2012/12/10 03:15:49 tsarna Exp $
$NetBSD: patch-ah,v 1.2 2015/04/24 03:24:32 rodent Exp $
* Ncurses will be used by devel/py-curses and devel/py-cursespanel.
--- Modules/_cursesmodule.c.orig 2012-02-23 20:22:47.000000000 +0000
--- Modules/_cursesmodule.c.orig 2014-10-12 07:03:53.000000000 +0000
+++ Modules/_cursesmodule.c
@@ -332,17 +332,9 @@ Window_NoArg2TupleReturnFunction(getpary
@@ -482,17 +482,9 @@ Window_NoArg2TupleReturnFunction(getpary
Window_OneArgNoReturnFunction(clearok, int, "i;True(1) or False(0)")
Window_OneArgNoReturnFunction(idlok, int, "i;True(1) or False(0)")
@@ -22,7 +22,7 @@ $NetBSD: patch-ah,v 1.1 2012/12/10 03:15:49 tsarna Exp $
Window_OneArgNoReturnFunction(notimeout, int, "i;True(1) or False(0)")
Window_OneArgNoReturnFunction(scrollok, int, "i;True(1) or False(0)")
Window_OneArgNoReturnFunction(winsdelln, int, "i;nlines")
@@ -901,11 +893,7 @@ PyCursesWindow_GetKey(PyCursesWindowObje
@@ -1146,11 +1138,7 @@ PyCursesWindow_GetKey(PyCursesWindowObje
return Py_BuildValue("C", rtn);
} else {
const char *knp;
@@ -34,7 +34,7 @@ $NetBSD: patch-ah,v 1.1 2012/12/10 03:15:49 tsarna Exp $
return PyUnicode_FromString((knp == NULL) ? "" : knp);
}
}
@@ -2187,7 +2175,6 @@ PyCurses_Is_Term_Resized(PyObject *self,
@@ -2580,7 +2568,6 @@ PyCurses_Is_Term_Resized(PyObject *self,
}
#endif /* HAVE_CURSES_IS_TERM_RESIZED */
@@ -42,7 +42,7 @@ $NetBSD: patch-ah,v 1.1 2012/12/10 03:15:49 tsarna Exp $
static PyObject *
PyCurses_KeyName(PyObject *self, PyObject *args)
{
@@ -2206,7 +2193,6 @@ PyCurses_KeyName(PyObject *self, PyObjec
@@ -2599,7 +2586,6 @@ PyCurses_KeyName(PyObject *self, PyObjec
return PyBytes_FromString((knp == NULL) ? "" : (char *)knp);
}
@@ -50,7 +50,7 @@ $NetBSD: patch-ah,v 1.1 2012/12/10 03:15:49 tsarna Exp $
static PyObject *
PyCurses_KillChar(PyObject *self)
@@ -2744,9 +2730,7 @@ static PyMethodDef PyCurses_methods[] =
@@ -3206,9 +3192,7 @@ static PyMethodDef PyCurses_methods[] =
#ifdef HAVE_CURSES_IS_TERM_RESIZED
{"is_term_resized", (PyCFunction)PyCurses_Is_Term_Resized, METH_VARARGS},
#endif
@@ -60,7 +60,7 @@ $NetBSD: patch-ah,v 1.1 2012/12/10 03:15:49 tsarna Exp $
{"killchar", (PyCFunction)PyCurses_KillChar, METH_NOARGS},
{"longname", (PyCFunction)PyCurses_longname, METH_NOARGS},
{"meta", (PyCFunction)PyCurses_Meta, METH_VARARGS},
@@ -2869,9 +2853,7 @@ PyInit__curses(void)
@@ -3334,9 +3318,7 @@ PyInit__curses(void)
SetDictInt("A_DIM", A_DIM);
SetDictInt("A_BOLD", A_BOLD);
SetDictInt("A_ALTCHARSET", A_ALTCHARSET);
@@ -70,7 +70,7 @@ $NetBSD: patch-ah,v 1.1 2012/12/10 03:15:49 tsarna Exp $
SetDictInt("A_PROTECT", A_PROTECT);
SetDictInt("A_CHARTEXT", A_CHARTEXT);
SetDictInt("A_COLOR", A_COLOR);
@@ -2943,7 +2925,6 @@ PyInit__curses(void)
@@ -3408,7 +3390,6 @@ PyInit__curses(void)
int key;
char *key_n;
char *key_n2;
@@ -78,7 +78,7 @@ $NetBSD: patch-ah,v 1.1 2012/12/10 03:15:49 tsarna Exp $
for (key=KEY_MIN;key < KEY_MAX; key++) {
key_n = (char *)keyname(key);
if (key_n == NULL || strcmp(key_n,"UNKNOWN KEY")==0)
@@ -2971,7 +2952,6 @@ PyInit__curses(void)
@@ -3436,7 +3417,6 @@ PyInit__curses(void)
if (key_n2 != key_n)
free(key_n2);
}

View File

@@ -1,6 +1,6 @@
$NetBSD: patch-am,v 1.9 2014/05/31 12:46:28 ryoon Exp $
$NetBSD: patch-am,v 1.10 2015/04/24 03:24:32 rodent Exp $
--- setup.py.orig 2014-03-09 08:40:35.000000000 +0000
--- setup.py.orig 2014-10-12 07:03:54.000000000 +0000
+++ setup.py
@@ -31,7 +31,8 @@ host_platform = get_platform()
COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
@@ -67,7 +67,7 @@ $NetBSD: patch-am,v 1.9 2014/05/31 12:46:28 ryoon Exp $
if opensslv_h:
name = os.path.join(opensslv_h[0], 'openssl/opensslv.h')
if host_platform == 'darwin' and is_macosx_sdk_path(name):
@@ -1138,6 +1136,30 @@ class PyBuildExt(build_ext):
@@ -1137,6 +1135,30 @@ class PyBuildExt(build_ext):
dbm_order = ['gdbm']
# The standard Unix dbm module:
if host_platform not in ['cygwin']:
@@ -98,7 +98,7 @@ $NetBSD: patch-am,v 1.9 2014/05/31 12:46:28 ryoon Exp $
config_args = [arg.strip("'")
for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
dbm_args = [arg for arg in config_args
@@ -1149,7 +1171,7 @@ class PyBuildExt(build_ext):
@@ -1148,7 +1170,7 @@ class PyBuildExt(build_ext):
dbmext = None
for cand in dbm_order:
if cand == "ndbm":
@@ -107,7 +107,7 @@ $NetBSD: patch-am,v 1.9 2014/05/31 12:46:28 ryoon Exp $
# Some systems have -lndbm, others have -lgdbm_compat,
# others don't have either
if self.compiler.find_library_file(lib_dirs,
@@ -1477,6 +1499,10 @@ class PyBuildExt(build_ext):
@@ -1476,6 +1498,10 @@ class PyBuildExt(build_ext):
macros = dict()
libraries = []
@@ -118,7 +118,7 @@ $NetBSD: patch-am,v 1.9 2014/05/31 12:46:28 ryoon Exp $
else: # Linux and other unices
macros = dict()
libraries = ['rt']
@@ -1950,10 +1976,7 @@ class PyBuildExt(build_ext):
@@ -1949,10 +1975,7 @@ class PyBuildExt(build_ext):
depends = ['_decimal/docstrings.h']
else:
srcdir = sysconfig.get_config_var('srcdir')
@@ -130,7 +130,7 @@ $NetBSD: patch-am,v 1.9 2014/05/31 12:46:28 ryoon Exp $
libraries = []
sources = [
'_decimal/_decimal.c',
@@ -2199,7 +2222,7 @@ def main():
@@ -2198,7 +2221,7 @@ def main():
# If you change the scripts installed here, you also need to
# check the PyBuildScripts command above, and change the links
# created by the bininstall target in Makefile.pre.in

View File

@@ -1,8 +1,8 @@
$NetBSD: patch-an,v 1.2 2015/01/01 21:39:45 he Exp $
$NetBSD: patch-an,v 1.3 2015/04/24 03:24:32 rodent Exp $
Recognize and pass on -pthread arg.
--- Modules/makesetup.orig 2008-06-11 05:26:20.000000000 +0000
--- Modules/makesetup.orig 2014-10-12 07:03:53.000000000 +0000
+++ Modules/makesetup
@@ -164,6 +164,7 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' |
-rpath) libs="$libs $arg"; skip=libs;;

View File

@@ -1,6 +1,6 @@
$NetBSD: patch-av,v 1.1 2012/12/10 03:15:49 tsarna Exp $
$NetBSD: patch-av,v 1.2 2015/04/24 03:24:32 rodent Exp $
--- Lib/distutils/command/install.py.orig 2012-02-23 20:22:44.000000000 +0000
--- Lib/distutils/command/install.py.orig 2014-10-12 07:03:52.000000000 +0000
+++ Lib/distutils/command/install.py
@@ -676,5 +676,6 @@ class install(Command):
('install_headers', has_headers),

View File

@@ -1,8 +1,8 @@
$NetBSD: patch-aw,v 1.2 2015/01/01 21:39:45 he Exp $
$NetBSD: patch-aw,v 1.3 2015/04/24 03:24:32 rodent Exp $
Support DragonFly.
--- Modules/nismodule.c.orig 2010-08-19 09:03:03.000000000 +0000
--- Modules/nismodule.c.orig 2014-10-12 07:03:53.000000000 +0000
+++ Modules/nismodule.c
@@ -89,7 +89,7 @@ nis_mapname (char *map, int *pfix)
return map;

View File

@@ -1,4 +1,4 @@
$NetBSD: patch-configure,v 1.2 2015/01/22 11:09:18 sevan Exp $
$NetBSD: patch-configure,v 1.3 2015/04/24 03:24:32 rodent Exp $
Add support for MirBSD and Interix.
Don't make SO-ABI-dependent shared lib names on Linux.
@@ -96,7 +96,56 @@ Don't trim the library name on FreeBSD.
SunOS/5*) case $CC in
*gcc*)
if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
@@ -13766,8 +13769,6 @@ $as_echo "$SOABI" >&6; }
@@ -8823,6 +8826,48 @@ _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
@@ -13766,8 +13811,6 @@ $as_echo "$SOABI" >&6; }
case $ac_sys_system in

View File

@@ -1,8 +1,18 @@
$NetBSD: patch-pyconfig.h.in,v 1.1 2012/12/10 03:15:49 tsarna Exp $
$NetBSD: patch-pyconfig.h.in,v 1.2 2015/04/24 03:24:32 rodent Exp $
--- pyconfig.h.in.orig 2011-06-11 17:46:28.000000000 +0200
+++ pyconfig.h.in 2011-11-29 20:17:04.328552361 +0100
@@ -1173,7 +1173,9 @@
--- pyconfig.h.in.orig 2014-10-12 07:03:54.000000000 +0000
+++ pyconfig.h.in
@@ -660,6 +660,9 @@
/* Define to 1 if you have the `pwrite' function. */
#undef HAVE_PWRITE
+/* Define if the libcrypto has RAND_egd */
+#undef HAVE_RAND_EGD
+
/* Define to 1 if you have the `readlink' function. */
#undef HAVE_READLINK
@@ -1399,7 +1402,9 @@
#undef _UINT64_T
/* Define to the level of X/Open that your system supports */

View File

@@ -1,6 +1,6 @@
$NetBSD: patch-xa,v 1.1 2013/08/09 10:54:17 drochner Exp $
$NetBSD: patch-xa,v 1.2 2015/04/24 03:24:32 rodent Exp $
--- Python/thread_pthread.h.orig 2013-05-15 16:33:00.000000000 +0000
--- Python/thread_pthread.h.orig 2014-10-12 07:03:54.000000000 +0000
+++ Python/thread_pthread.h
@@ -50,6 +50,9 @@
we need to add 0 to make it work there as well. */