Hi,
Here's an update to the latest PyPy.
Last year I pushed changes upstream to detect RAND_egd() at build time,
so many SSL-related patches have been removed.
Stuart has kindly hosted the new bootstrap. Thanks.
OK?
Index: Makefile
===================================================================
RCS file: /home/edd/cvsync/ports/lang/pypy/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile 3 Dec 2015 21:24:30 -0000 1.18
+++ Makefile 17 Jan 2016 11:55:59 -0000
@@ -5,19 +5,19 @@ ONLY_FOR_ARCHS = amd64
COMMENT = fast implementation of the Python language
# To update PyPy to a new version:
-# * Bump ${V} but set ${BOOTSTRAP_V} to the old ${V}
+# * Bump ${V} but set ${BOOTSTRAP_V} to the old ${V} (keeping
+# any bootstrap version suffix intact, e.g. "-1")
# * FLAVOR=no_bootstrap make makesum
# * FLAVOR=no_bootstrap make plist (fix anything along the way)
# * FLAVOR=no_bootstrap make package
# * Set BOOTSTRAP_V back to ${V} in the port Makefile
# * make bootstrap && make makesum (note, FLAVOR no longer set)
# * Try the build using the bootstrap
-V = 2.6.0
-BOOTSTRAP_V = ${V}-1
+V = 4.0.1
+BOOTSTRAP_V = ${V}
DISTNAME = pypy-${V}-src
PKGNAME = pypy-${V}
BOOTSTRAP-amd64 = pypy-bootstrap-amd64-${BOOTSTRAP_V}.tar.xz
-REVISION = 0
CATEGORIES = lang
Index: distinfo
===================================================================
RCS file: /home/edd/cvsync/ports/lang/pypy/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 30 Oct 2015 16:27:06 -0000 1.11
+++ distinfo 17 Jan 2016 11:58:49 -0000
@@ -1,4 +1,4 @@
-SHA256 (pypy/pypy-2.6.0-src.tar.bz2) =
m/NT8i0l6XqFptN2ZhmWYFXt6h6hsiGERdaDqK0Dmdk=
-SHA256 (pypy/pypy-bootstrap-amd64-2.6.0-1.tar.xz) =
7ZyVCCmdyj7JJ6lBBiXTh1hccf50UwBFxCXXvuHCZxc=
-SIZE (pypy/pypy-2.6.0-src.tar.bz2) = 16858400
-SIZE (pypy/pypy-bootstrap-amd64-2.6.0-1.tar.xz) = 21672292
+SHA256 (pypy/pypy-4.0.1-src.tar.bz2) =
KfWqa6F7NP2YDoUXLf60CG/cNzrTkrH+/yZ30tiuojw=
+SHA256 (pypy/pypy-bootstrap-amd64-4.0.1.tar.xz) =
dbtTJAYsolcvrtgkc0Co0x80oxq11T3nOYxtEMHC7zI=
+SIZE (pypy/pypy-4.0.1-src.tar.bz2) = 17172844
+SIZE (pypy/pypy-bootstrap-amd64-4.0.1.tar.xz) = 22438956
Index: patches/patch-lib-python_2_7_socket_py
===================================================================
RCS file: patches/patch-lib-python_2_7_socket_py
diff -N patches/patch-lib-python_2_7_socket_py
--- patches/patch-lib-python_2_7_socket_py 24 Apr 2014 21:44:07 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-lib-python_2_7_socket_py,v 1.1 2014/04/24 21:44:07 sthen Exp $
---- lib-python/2.7/socket.py.orig Thu Apr 24 16:23:04 2014
-+++ lib-python/2.7/socket.py Thu Apr 24 16:23:36 2014
-@@ -65,7 +65,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-python_2_7_ssl_py
===================================================================
RCS file: patches/patch-lib-python_2_7_ssl_py
diff -N patches/patch-lib-python_2_7_ssl_py
--- patches/patch-lib-python_2_7_ssl_py 5 Apr 2015 11:15:08 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-lib-python_2_7_ssl_py,v 1.2 2015/04/05 11:15:08 edd Exp $
---- lib-python/2.7/ssl.py.orig Thu Apr 2 19:27:20 2015
-+++ lib-python/2.7/ssl.py Thu Apr 2 19:27:45 2015
-@@ -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-pypy_module__ssl___init___py
===================================================================
RCS file: patches/patch-pypy_module__ssl___init___py
diff -N patches/patch-pypy_module__ssl___init___py
--- patches/patch-pypy_module__ssl___init___py 5 Apr 2015 11:15:08 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-pypy_module__ssl___init___py,v 1.2 2015/04/05 11:15:08 edd Exp
$
---- pypy/module/_ssl/__init__.py.orig Mon Mar 23 16:17:54 2015
-+++ pypy/module/_ssl/__init__.py Thu Apr 2 19:25:50 2015
-@@ -44,7 +44,6 @@ class Module(MixedModule):
- if HAVE_OPENSSL_RAND:
- Module.interpleveldefs['RAND_add'] = "interp_ssl.RAND_add"
- Module.interpleveldefs['RAND_status'] = "interp_ssl.RAND_status"
-- Module.interpleveldefs['RAND_egd'] = "interp_ssl.RAND_egd"
-
- for name, value in ssl_data.ALERT_DESCRIPTION_CODES.items():
- Module.interpleveldefs[name] = "space.wrap(%r)" % value
Index: patches/patch-pypy_module__ssl_interp_ssl_py
===================================================================
RCS file: patches/patch-pypy_module__ssl_interp_ssl_py
diff -N patches/patch-pypy_module__ssl_interp_ssl_py
--- patches/patch-pypy_module__ssl_interp_ssl_py 27 Aug 2015 14:21:32
-0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-pypy_module__ssl_interp_ssl_py,v 1.4 2015/08/27 14:21:32 edd
Exp $
---- pypy/module/_ssl/interp_ssl.py.orig Sun May 31 08:19:51 2015
-+++ pypy/module/_ssl/interp_ssl.py Mon Jun 8 10:40:07 2015
-@@ -209,14 +209,7 @@ if HAVE_OPENSSL_RAND:
- Queries the entropy gather daemon (EGD) on socket path. Returns
number
- of bytes read. Raises socket.sslerror if connection to EGD fails or
- if it does provide enough data to seed PRNG."""
-- with rffi.scoped_str2charp(path) as socket_path:
-- bytes = libssl_RAND_egd(socket_path)
-- if bytes == -1:
-- raise ssl_error(space,
-- "EGD connection failed or EGD did not return "
-- "enough data to seed the PRNG")
-- return space.wrap(bytes)
--
-+ raise ssl_error(space, "EGD disabled")
-
- class _SSLSocket(W_Root):
- @staticmethod
Index: patches/patch-rpython_rlib_ropenssl_py
===================================================================
RCS file: patches/patch-rpython_rlib_ropenssl_py
diff -N patches/patch-rpython_rlib_ropenssl_py
--- patches/patch-rpython_rlib_ropenssl_py 27 Aug 2015 14:21:32 -0000
1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-rpython_rlib_ropenssl_py,v 1.5 2015/08/27 14:21:32 edd Exp $
---- rpython/rlib/ropenssl.py.orig Sun May 31 08:19:51 2015
-+++ rpython/rlib/ropenssl.py Mon Jun 8 10:40:07 2015
-@@ -29,7 +29,8 @@ includes += [
- 'openssl/rand.h',
- 'openssl/evp.h',
- 'openssl/ossl_typ.h',
-- 'openssl/x509v3.h']
-+ 'openssl/x509v3.h',
-+ 'openssl/comp.h']
-
- eci = ExternalCompilationInfo(
- libraries = libraries,
-@@ -284,7 +285,6 @@ ssl_external('CRYPTO_set_id_callback',
- if HAVE_OPENSSL_RAND:
- ssl_external('RAND_add', [rffi.CCHARP, rffi.INT, rffi.DOUBLE],
lltype.Void)
- ssl_external('RAND_status', [], rffi.INT)
-- ssl_external('RAND_egd', [rffi.CCHARP], rffi.INT)
- ssl_external('SSL_CTX_new', [SSL_METHOD], SSL_CTX)
- ssl_external('SSL_get_SSL_CTX', [SSL], SSL_CTX)
- ssl_external('SSL_set_SSL_CTX', [SSL, SSL_CTX], SSL_CTX)
Index: pkg/PLIST
===================================================================
RCS file: /home/edd/cvsync/ports/lang/pypy/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 27 Aug 2015 14:21:32 -0000 1.8
+++ pkg/PLIST 17 Jan 2016 18:51:42 -0000
@@ -861,8 +861,8 @@ pypy/lib-python/2.7/ensurepip/__init__.p
pypy/lib-python/2.7/ensurepip/__main__.py
pypy/lib-python/2.7/ensurepip/__main__.pyc
pypy/lib-python/2.7/ensurepip/_bundled/
-pypy/lib-python/2.7/ensurepip/_bundled/pip-1.5.6-py2.py3-none-any.whl
-pypy/lib-python/2.7/ensurepip/_bundled/setuptools-7.0-py2.py3-none-any.whl
+pypy/lib-python/2.7/ensurepip/_bundled/pip-6.1.1-py2.py3-none-any.whl
+pypy/lib-python/2.7/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl
pypy/lib-python/2.7/ensurepip/_uninstall.py
pypy/lib-python/2.7/ensurepip/_uninstall.pyc
pypy/lib-python/2.7/filecmp.py
@@ -1062,6 +1062,7 @@ pypy/lib-python/2.7/idlelib/idle_test/te
pypy/lib-python/2.7/idlelib/idle_test/test_grep.py
pypy/lib-python/2.7/idlelib/idle_test/test_hyperparser.py
pypy/lib-python/2.7/idlelib/idle_test/test_idlehistory.py
+pypy/lib-python/2.7/idlelib/idle_test/test_io.py
pypy/lib-python/2.7/idlelib/idle_test/test_parenmatch.py
pypy/lib-python/2.7/idlelib/idle_test/test_pathbrowser.py
pypy/lib-python/2.7/idlelib/idle_test/test_rstrip.py
@@ -1083,7 +1084,6 @@ pypy/lib-python/2.7/idlelib/run.py
pypy/lib-python/2.7/idlelib/run.pyc
pypy/lib-python/2.7/idlelib/tabbedpages.py
pypy/lib-python/2.7/idlelib/tabbedpages.pyc
-pypy/lib-python/2.7/idlelib/testcode.py
pypy/lib-python/2.7/idlelib/textView.py
pypy/lib-python/2.7/idlelib/textView.pyc
pypy/lib-python/2.7/ihooks.py
@@ -2356,7 +2356,7 @@ pypy/lib-python/2.7/test/decimaltestdata
pypy/lib-python/2.7/test/decimaltestdata/tointegral.decTest
pypy/lib-python/2.7/test/decimaltestdata/tointegralx.decTest
pypy/lib-python/2.7/test/decimaltestdata/xor.decTest
-pypy/lib-python/2.7/test/dh512.pem
+pypy/lib-python/2.7/test/dh1024.pem
pypy/lib-python/2.7/test/doctest_aliases.py
pypy/lib-python/2.7/test/double_const.py
pypy/lib-python/2.7/test/empty.vbs
@@ -2789,6 +2789,7 @@ pypy/lib-python/2.7/test/test_threading.
pypy/lib-python/2.7/test/test_threading_local.py
pypy/lib-python/2.7/test/test_threadsignals.py
pypy/lib-python/2.7/test/test_time.py
+pypy/lib-python/2.7/test/test_timeit.py
pypy/lib-python/2.7/test/test_timeout.py
pypy/lib-python/2.7/test/test_tk.py
pypy/lib-python/2.7/test/test_tokenize.py
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
