summaryrefslogtreecommitdiff
path: root/lang/python27
diff options
context:
space:
mode:
Diffstat (limited to 'lang/python27')
-rw-r--r--lang/python27/Makefile3
-rw-r--r--lang/python27/PLIST.common17
-rw-r--r--lang/python27/dist.mk4
-rw-r--r--lang/python27/distinfo20
-rw-r--r--lang/python27/patches/patch-Doc_library_ssl.rst15
-rw-r--r--lang/python27/patches/patch-Lib_dumbdb.py23
-rw-r--r--lang/python27/patches/patch-Lib_socket.py26
-rw-r--r--lang/python27/patches/patch-Lib_ssl.py20
-rw-r--r--lang/python27/patches/patch-Lib_test_test__dumbdbm.py21
-rw-r--r--lang/python27/patches/patch-Lib_test_test__ssl.py18
-rw-r--r--lang/python27/patches/patch-Modules___ssl.c42
-rw-r--r--lang/python27/patches/patch-al74
-rw-r--r--lang/python27/patches/patch-configure.ac16
-rw-r--r--lang/python27/patches/patch-pyconfig.h.in16
14 files changed, 35 insertions, 280 deletions
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index e8a41bc8f07..af4a759955b 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2015/03/03 17:19:58 snj Exp $
+# $NetBSD: Makefile,v 1.49 2015/05/24 07:44:07 adam Exp $
.include "dist.mk"
PKGNAME= python27-${PY_DISTVERSION}
-PKGREVISION= 1
CATEGORIES= lang python
MAINTAINER= pkgsrc-users@NetBSD.org
diff --git a/lang/python27/PLIST.common b/lang/python27/PLIST.common
index 1a12be7a4b1..6454616e09c 100644
--- a/lang/python27/PLIST.common
+++ b/lang/python27/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.12 2014/12/16 08:45:12 chopps Exp $
+@comment $NetBSD: PLIST.common,v 1.13 2015/05/24 07:44:07 adam Exp $
bin/2to3-${PY_VER_SUFFIX}
bin/pydoc${PY_VER_SUFFIX}
bin/python${PY_VER_SUFFIX}
@@ -1437,8 +1437,8 @@ lib/python${PY_VER_SUFFIX}/ensurepip/__init__.pyo
lib/python${PY_VER_SUFFIX}/ensurepip/__main__.py
lib/python${PY_VER_SUFFIX}/ensurepip/__main__.pyc
lib/python${PY_VER_SUFFIX}/ensurepip/__main__.pyo
-lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/pip-1.5.6-py2.py3-none-any.whl
-lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/setuptools-7.0-py2.py3-none-any.whl
+lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/pip-6.1.1-py2.py3-none-any.whl
+lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl
lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.py
lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.pyc
lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.pyo
@@ -1738,6 +1738,9 @@ lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_hyperparser.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_idlehistory.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_idlehistory.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_idlehistory.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_io.py
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_io.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_io.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_parenmatch.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_parenmatch.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_parenmatch.pyo
@@ -1783,9 +1786,6 @@ lib/python${PY_VER_SUFFIX}/idlelib/run.pyo
lib/python${PY_VER_SUFFIX}/idlelib/tabbedpages.py
lib/python${PY_VER_SUFFIX}/idlelib/tabbedpages.pyc
lib/python${PY_VER_SUFFIX}/idlelib/tabbedpages.pyo
-lib/python${PY_VER_SUFFIX}/idlelib/testcode.py
-lib/python${PY_VER_SUFFIX}/idlelib/testcode.pyc
-lib/python${PY_VER_SUFFIX}/idlelib/testcode.pyo
lib/python${PY_VER_SUFFIX}/idlelib/textView.py
lib/python${PY_VER_SUFFIX}/idlelib/textView.pyc
lib/python${PY_VER_SUFFIX}/idlelib/textView.pyo
@@ -2898,7 +2898,7 @@ lib/python${PY_VER_SUFFIX}/test/decimaltestdata/testall.decTest
lib/python${PY_VER_SUFFIX}/test/decimaltestdata/tointegral.decTest
lib/python${PY_VER_SUFFIX}/test/decimaltestdata/tointegralx.decTest
lib/python${PY_VER_SUFFIX}/test/decimaltestdata/xor.decTest
-lib/python${PY_VER_SUFFIX}/test/dh512.pem
+lib/python${PY_VER_SUFFIX}/test/dh1024.pem
lib/python${PY_VER_SUFFIX}/test/doctest_aliases.py
lib/python${PY_VER_SUFFIX}/test/doctest_aliases.pyc
lib/python${PY_VER_SUFFIX}/test/doctest_aliases.pyo
@@ -4082,6 +4082,9 @@ lib/python${PY_VER_SUFFIX}/test/test_threadsignals.pyo
lib/python${PY_VER_SUFFIX}/test/test_time.py
lib/python${PY_VER_SUFFIX}/test/test_time.pyc
lib/python${PY_VER_SUFFIX}/test/test_time.pyo
+lib/python${PY_VER_SUFFIX}/test/test_timeit.py
+lib/python${PY_VER_SUFFIX}/test/test_timeit.pyc
+lib/python${PY_VER_SUFFIX}/test/test_timeit.pyo
lib/python${PY_VER_SUFFIX}/test/test_timeout.py
lib/python${PY_VER_SUFFIX}/test/test_timeout.pyc
lib/python${PY_VER_SUFFIX}/test/test_timeout.pyo
diff --git a/lang/python27/dist.mk b/lang/python27/dist.mk
index de135319592..f38b71d2c02 100644
--- a/lang/python27/dist.mk
+++ b/lang/python27/dist.mk
@@ -1,6 +1,6 @@
-# $NetBSD: dist.mk,v 1.9 2014/12/16 07:07:32 chopps Exp $
+# $NetBSD: dist.mk,v 1.10 2015/05/24 07:44:07 adam Exp $
-PY_DISTVERSION= 2.7.9
+PY_DISTVERSION= 2.7.10
DISTNAME= Python-${PY_DISTVERSION}
EXTRACT_SUFX= .tar.xz
DISTINFO_FILE= ${.CURDIR}/../../lang/python27/distinfo
diff --git a/lang/python27/distinfo b/lang/python27/distinfo
index 0aa2106c776..9608ae7a430 100644
--- a/lang/python27/distinfo
+++ b/lang/python27/distinfo
@@ -1,19 +1,12 @@
-$NetBSD: distinfo,v 1.50 2015/04/24 03:01:35 rodent Exp $
+$NetBSD: distinfo,v 1.51 2015/05/24 07:44:07 adam 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-Doc_library_ssl.rst) = f8fe95057675486bf9dbac30bad442e79ea75136
+SHA1 (Python-2.7.10.tar.xz) = ee5a50c5562e7448f037d35fdedc18d95c748b9e
+RMD160 (Python-2.7.10.tar.xz) = eb003de9bb52fc2c6a2d2e3dcb816ba0c56751d0
+Size (Python-2.7.10.tar.xz) = 12250696 bytes
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
@@ -24,7 +17,7 @@ SHA1 (patch-ab) = ea4feba4e93dbcff07050c82a00d591bb650e934
SHA1 (patch-ad) = 96ae702995d434e2d7ec0ac62e37427a90b61d13
SHA1 (patch-ae) = d836d77854a2b3d79fa34a06a8e2493bf0a503e6
SHA1 (patch-ah) = 90b19239d8a7c8abc3bbc05d49408a2c5da6174d
-SHA1 (patch-al) = d605a47a8aaac7b928af88d22429ce9e557f271b
+SHA1 (patch-al) = 541936b79f281db06761f4fa6a65a04e852b02b4
SHA1 (patch-am) = a7697dda83b151fdd30d460bdcf5ab3cc057c92b
SHA1 (patch-an) = 9aad78714c4fe1a21cf66a6627d97d164ecea196
SHA1 (patch-ao) = 5bcfad96f8e490351160f1a7c1f4ece7706a33fa
@@ -33,6 +26,5 @@ 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-pyconfig.h.in) = a0143ecdc2a3fb10220d0e3ee94fb9779a45e9e1
SHA1 (patch-xa) = 517cfefc2f2e13631d22bad28c327513cdf17c10
diff --git a/lang/python27/patches/patch-Doc_library_ssl.rst b/lang/python27/patches/patch-Doc_library_ssl.rst
deleted file mode 100644
index c6fc98f1cf0..00000000000
--- a/lang/python27/patches/patch-Doc_library_ssl.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-$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 --git a/lang/python27/patches/patch-Lib_dumbdb.py b/lang/python27/patches/patch-Lib_dumbdb.py
deleted file mode 100644
index dff5bb5fe0f..00000000000
--- a/lang/python27/patches/patch-Lib_dumbdb.py
+++ /dev/null
@@ -1,23 +0,0 @@
-$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 2014-12-10 15:59:35.000000000 +0000
-+++ Lib/dumbdbm.py
-@@ -21,6 +21,7 @@ is read when the database is opened, and
-
- """
-
-+import ast as _ast
- import os as _os
- import __builtin__
- import UserDict
-@@ -85,7 +86,7 @@ class _Database(UserDict.DictMixin):
- with f:
- for line in f:
- line = line.rstrip()
-- key, pos_and_siz_pair = eval(line)
-+ key, pos_and_siz_pair = _ast.literal_eval(line)
- self._index[key] = pos_and_siz_pair
-
- # Write the index dict to the directory file. The original directory
diff --git a/lang/python27/patches/patch-Lib_socket.py b/lang/python27/patches/patch-Lib_socket.py
deleted file mode 100644
index e5848848d25..00000000000
--- a/lang/python27/patches/patch-Lib_socket.py
+++ /dev/null
@@ -1,26 +0,0 @@
-$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 --git a/lang/python27/patches/patch-Lib_ssl.py b/lang/python27/patches/patch-Lib_ssl.py
deleted file mode 100644
index 5cad7fe9991..00000000000
--- a/lang/python27/patches/patch-Lib_ssl.py
+++ /dev/null
@@ -1,20 +0,0 @@
-$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 --git a/lang/python27/patches/patch-Lib_test_test__dumbdbm.py b/lang/python27/patches/patch-Lib_test_test__dumbdbm.py
deleted file mode 100644
index 7cfa0c7d63a..00000000000
--- a/lang/python27/patches/patch-Lib_test_test__dumbdbm.py
+++ /dev/null
@@ -1,21 +0,0 @@
-$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 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()
-
-+ def test_eval(self):
-+ with open(_fname + '.dir', 'w') as stream:
-+ stream.write("str(__import__('sys').stdout.write('Hacked!')), 0\n")
-+ with test_support.captured_stdout() as stdout:
-+ with self.assertRaises(ValueError):
-+ dumbdbm.open(_fname).close()
-+ self.assertEqual(stdout.getvalue(), '')
-+
- def tearDown(self):
- _delete_files()
-
diff --git a/lang/python27/patches/patch-Lib_test_test__ssl.py b/lang/python27/patches/patch-Lib_test_test__ssl.py
deleted file mode 100644
index c83de9c12d5..00000000000
--- a/lang/python27/patches/patch-Lib_test_test__ssl.py
+++ /dev/null
@@ -1,18 +0,0 @@
-$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 --git a/lang/python27/patches/patch-Modules___ssl.c b/lang/python27/patches/patch-Modules___ssl.c
deleted file mode 100644
index 2361120fc51..00000000000
--- a/lang/python27/patches/patch-Modules___ssl.c
+++ /dev/null
@@ -1,42 +0,0 @@
-$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 --git a/lang/python27/patches/patch-al b/lang/python27/patches/patch-al
index 3e75125a1dc..1890baec215 100644
--- a/lang/python27/patches/patch-al
+++ b/lang/python27/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.16 2015/04/24 03:01:36 rodent Exp $
+$NetBSD: patch-al,v 1.17 2015/05/24 07:44:07 adam Exp $
- recognize MirBSD, Interix
- remove special-case library version hack for FreeBSD
@@ -6,9 +6,9 @@ $NetBSD: patch-al,v 1.16 2015/04/24 03:01:36 rodent Exp $
- honor pkgsrc LDFLAGS
- other stuff not previously commented (XXX)
---- configure.orig 2014-12-10 16:00:00.000000000 +0000
+--- configure.orig 2015-05-23 16:09:25.000000000 +0000
+++ configure
-@@ -3260,7 +3260,7 @@ case $ac_sys_system/$ac_sys_release in
+@@ -3271,7 +3271,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.16 2015/04/24 03:01:36 rodent 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
-@@ -5359,15 +5359,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
+@@ -5373,15 +5373,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.16 2015/04/24 03:01:36 rodent Exp $
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
hp*|HP*)
-@@ -5401,6 +5396,11 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
+@@ -5415,6 +5410,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.16 2015/04/24 03:01:36 rodent Exp $
esac
else # shared is disabled
-@@ -6058,8 +6058,7 @@ $as_echo "$CC" >&6; }
+@@ -6072,8 +6072,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.16 2015/04/24 03:01:36 rodent Exp $
then
cur_target=10.3
if test ${enable_universalsdk}; then
-@@ -8217,9 +8216,9 @@ then
+@@ -8231,9 +8230,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.16 2015/04/24 03:01:36 rodent Exp $
fi ;;
Darwin/*)
# Use -undefined dynamic_lookup whenever possible (10.3 and later).
-@@ -8242,9 +8241,9 @@ then
+@@ -8256,9 +8255,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.16 2015/04/24 03:01:36 rodent Exp $
fi
else
# building for OS X 10.3 and later
-@@ -8258,7 +8257,7 @@ then
+@@ -8272,7 +8271,7 @@ then
;;
Linux*|GNU*|QNX*)
LDSHARED='$(CC) -shared'
@@ -91,7 +91,7 @@ $NetBSD: patch-al,v 1.16 2015/04/24 03:01:36 rodent Exp $
BSD/OS*/4*)
LDSHARED="gcc -shared"
LDCXXSHARED="g++ -shared";;
-@@ -8286,6 +8285,9 @@ then
+@@ -8300,6 +8299,9 @@ then
;;
esac
fi;;
@@ -101,7 +101,7 @@ $NetBSD: patch-al,v 1.16 2015/04/24 03:01:36 rodent Exp $
NetBSD*|DragonFly*)
LDSHARED='$(CC) -shared'
LDCXXSHARED='$(CXX) -shared';;
-@@ -8332,7 +8334,8 @@ then
+@@ -8346,7 +8348,8 @@ then
fi;;
Linux*|GNU*) CCSHARED="-fPIC";;
BSD/OS*/4*) CCSHARED="-fpic";;
@@ -111,7 +111,7 @@ $NetBSD: patch-al,v 1.16 2015/04/24 03:01:36 rodent Exp $
OpenUNIX*|UnixWare*)
if test "$GCC" = "yes"
then CCSHARED="-fPIC"
-@@ -8384,11 +8387,12 @@ then
+@@ -8398,11 +8401,12 @@ then
OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
@@ -125,55 +125,7 @@ $NetBSD: patch-al,v 1.16 2015/04/24 03:01:36 rodent Exp $
SunOS/5*) case $CC in
*gcc*)
if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
-@@ -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
+@@ -10457,6 +10461,10 @@ int
main ()
{
int x=kqueue()
diff --git a/lang/python27/patches/patch-configure.ac b/lang/python27/patches/patch-configure.ac
deleted file mode 100644
index 8876ba46862..00000000000
--- a/lang/python27/patches/patch-configure.ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$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
diff --git a/lang/python27/patches/patch-pyconfig.h.in b/lang/python27/patches/patch-pyconfig.h.in
index de304553790..473e1df2bd8 100644
--- a/lang/python27/patches/patch-pyconfig.h.in
+++ b/lang/python27/patches/patch-pyconfig.h.in
@@ -1,20 +1,10 @@
-$NetBSD: patch-pyconfig.h.in,v 1.4 2015/04/24 03:01:36 rodent Exp $
+$NetBSD: patch-pyconfig.h.in,v 1.5 2015/05/24 07:44:07 adam Exp $
Fix build with LibreSSL.
---- pyconfig.h.in.orig 2014-12-10 16:00:01.000000000 +0000
+--- pyconfig.h.in.orig 2015-05-23 16:09:25.000000000 +0000
+++ pyconfig.h.in
-@@ -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 @@
+@@ -1206,7 +1209,9 @@
#undef _UINT64_T
/* Define to the level of X/Open that your system supports */
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-23 01:28:38 +0000