Commit c80e654e authored by Matti Picus's avatar Matti Picus
Browse files

merge default into release

--HG--
branch : release-pypy2.7-v7.x
Pipeline #60179 passed with stage
in 8 minutes and 31 seconds
......@@ -64,7 +64,6 @@ ffi = build_ffi_for_binding(
"bignum",
"bio",
"cmac",
"conf",
"crypto",
"ct",
"dh",
......
......@@ -45,7 +45,7 @@ FUNCTIONS = """
void ASN1_OBJECT_free(ASN1_OBJECT *);
/* ASN1 STRING */
unsigned char *ASN1_STRING_data(ASN1_STRING *);
const unsigned char *ASN1_STRING_get0_data(ASN1_STRING *);
int ASN1_STRING_set(ASN1_STRING *, const void *, int);
/* ASN1 OCTET STRING */
......
# This file is dual licensed under the terms of the Apache License, Version
# 2.0, and the BSD License. See the LICENSE file in the root of this repository
# for complete details.
from __future__ import absolute_import, division, print_function
INCLUDES = """
#include <openssl/conf.h>
"""
TYPES = """
"""
FUNCTIONS = """
void OPENSSL_config(const char *);
/* This is a macro in 1.1.0 */
void OPENSSL_no_config(void);
"""
CUSTOMIZATIONS = """
"""
......@@ -225,8 +225,6 @@ int sk_X509_CRL_push(Cryptography_STACK_OF_X509_CRL *, X509_CRL *);
X509_CRL *sk_X509_CRL_value(Cryptography_STACK_OF_X509_CRL *, int);
long X509_CRL_get_version(X509_CRL *);
ASN1_TIME *X509_CRL_get_lastUpdate(X509_CRL *);
ASN1_TIME *X509_CRL_get_nextUpdate(X509_CRL *);
X509_NAME *X509_CRL_get_issuer(X509_CRL *);
Cryptography_STACK_OF_X509_REVOKED *X509_CRL_get_REVOKED(X509_CRL *);
......
......@@ -88,6 +88,9 @@ def extra_link_args(compiler_type):
# default on Python 3.3+ but not on 2.x.
return ['/NXCOMPAT', '/DYNAMICBASE']
else:
# The PyPy buildbots install OpenSSL to /usr/local/lib
if os.path.exists("/usr/local/lib"):
return["-L/usr/local/lib"]
return []
......
......@@ -3,9 +3,9 @@ from _pypy_openssl import ffi
from _pypy_openssl import lib
def _string_from_asn1(asn1):
data = lib.ASN1_STRING_data(asn1)
data = lib.ASN1_STRING_get0_data(asn1)
length = lib.ASN1_STRING_length(asn1)
return _str_with_len(ffi.cast("char*",data), length)
return _str_with_len(ffi.cast("const char*",data), length)
def _str_with_len(char_ptr, length):
return ffi.buffer(char_ptr, length)[:]
......
......@@ -23,7 +23,6 @@ ffi = build_ffi_for_binding(
"bignum",
"bio",
"cmac",
"conf",
"crypto",
"ct",
"dh",
......
......@@ -19,9 +19,13 @@ elif sys.platform == 'win32':
libdirs = []
elif sys.platform == 'darwin':
# homebrew
homebrew = os.environ.get('HOMEBREW_PREFIX', '')
incdirs = ['/usr/local/opt/tcl-tk/include']
linklibs = ['tcl8.6', 'tk8.6']
libdirs = ['/usr/local/opt/tcl-tk/lib']
libdirs = []
if homebrew:
incdirs.append(homebrew + '/include')
libdirs.append(homebrew + '/opt/tcl-tk/lib')
else:
# On some Linux distributions, the tcl and tk libraries are
# stored in /usr/include, so we must check this case also
......
......@@ -3,7 +3,7 @@ PyPy v7.3.11: release of python 2.7, 3.8, and 3.9
=================================================
..
Changelog up to commit 46a7476ee4c3
Changelog up to commit 207858e40e63
.. note::
This is a pre-release announcement. When the release actually happens, it
......@@ -114,6 +114,9 @@ Bugfixes
- Package tkinter for macOS. Previously the portable builds did not include it
(issues 3760_, 3868_).
- Fix memory leak in certificate validation in ``_ssl`` (issue 3871_)
- Add ``__qualname__`` to some cpyext types (issue 3878_)
- Clean up some deprecated functions in OpenSSL wrapper ``_ssl``
Speedups and enhancements
~~~~~~~~~~~~~~~~~~~~~~~~~
......@@ -127,14 +130,24 @@ Python 3.8+
some security fixes, as documented in the `CPython release note`_
- Ensure that only valid values are passed from ``Py_UNICODE_*`` calls to
unicodedb lookups (issue 3870_)
- Fix ast ``lineno``, ``end_lineno``, ``end_col_number`` around decorators (issue 3876_)
- Re-apply fix for issue 3436_ since our ensurepip setuptools version is ``< 59.0``
- In ``_tkinter``, ``getboolean``, ``getint``, ``getdouble`` accepts a ``Tcl_Obj`` (bpo-23880_)
- Make builtin ``credits``, ``license()`` more like CPython
- Add docstrings to some builtin classes and methods
Python 3.9
----------
- Fix pure-python implmentation of ``functools`` (issue 3869_). see also cpython GH-100242_
- Remove ``type.__ne__``, the inherited behaviour from ``object.__ne__`` is the
correct one (issue 3879_)
- Fix invalid parsing rule for ``genexps`` as the non-singular argument in a call (issue 3873_)
.. _`using SMT solvers and fuzzing`: https://www.pypy.org/posts/2022/12/jit-bug-finding-smt-fuzzing.html
.. _`CPython release note`: https://www.python.org/downloads/release/python-3816
.. _bpo-23880: https://bugs.python.org/issue23880
.. _GH-100242: https://github.com/python/cpython/issues/100242
.. _3436: https://foss.heptapod.net/pypy/pypy/-/issues/3436
.. _3760: https://foss.heptapod.net/pypy/pypy/-/issues/3760
.. _3832: https://foss.heptapod.net/pypy/pypy/-/issues/3832
.. _3865: https://foss.heptapod.net/pypy/pypy/-/issues/3865
......@@ -142,3 +155,6 @@ Python 3.9
.. _3869: https://foss.heptapod.net/pypy/pypy/-/issues/3869
.. _3870: https://foss.heptapod.net/pypy/pypy/-/issues/3870
.. _3871: https://foss.heptapod.net/pypy/pypy/-/issues/3871
.. _3873: https://foss.heptapod.net/pypy/pypy/-/issues/3873
.. _3876: https://foss.heptapod.net/pypy/pypy/-/issues/3876
.. _3879: https://foss.heptapod.net/pypy/pypy/-/issues/3879
......@@ -1430,7 +1430,7 @@ class MyGcHooks(GcHooks):
def on_gc_collect(self, num_major_collects,
arenas_count_before, arenas_count_after,
arenas_bytes, rawmalloc_bytes_before,
rawmalloc_bytes_after):
rawmalloc_bytes_after, pinned_objects):
self.stats.collects += 1
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment