merge default into branch

5 files changed, 24 insertions, 11 deletions

diff --git a/lib_pypy/_curses_build.py b/lib_pypy/_curses_build.py
index 8c96a1bed9..7045d06c00 100644
--- a/lib_pypy/_curses_build.py
+++ b/lib_pypy/_curses_build.py
@@ -62,6 +62,8 @@ ffi.set_source("_curses_cffi", """
 #define NCURSES_OPAQUE 0
 #endif
 
+/* explicitly opt into this, rather than relying on _XOPEN_SOURCE */
+#define NCURSES_WIDECHAR 1
 
 /* ncurses 6 change behaviour  and makes all pointers opaque, 
   lets define backward compatibility. It doesn't harm 
diff --git a/lib_pypy/cffi.egg-info/PKG-INFO b/lib_pypy/cffi.egg-info/PKG-INFO
index ed0ddf9035..c7893a983f 100644
--- a/lib_pypy/cffi.egg-info/PKG-INFO
+++ b/lib_pypy/cffi.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: cffi
-Version: 1.14.2
+Version: 1.14.3
 Summary: Foreign Function Interface for Python calling C code.
 Home-page: http://cffi.readthedocs.org
 Author: Armin Rigo, Maciej Fijalkowski
diff --git a/lib_pypy/cffi/__init__.py b/lib_pypy/cffi/__init__.py
index acf959c0f0..264afa162a 100644
--- a/lib_pypy/cffi/__init__.py
+++ b/lib_pypy/cffi/__init__.py
@@ -5,8 +5,8 @@ from .api import FFI
 from .error import CDefError, FFIError, VerificationError, VerificationMissing
 from .error import PkgConfigError
 
-__version__ = "1.14.2"
-__version_info__ = (1, 14, 2)
+__version__ = "1.14.3"
+__version_info__ = (1, 14, 3)
 
 # The verifier module file names are based on the CRC32 of a string that
 # contains the following version number.  It may be older than __version__
diff --git a/lib_pypy/cffi/_embedding.h b/lib_pypy/cffi/_embedding.h
index 207d68308b..fdce222862 100644
--- a/lib_pypy/cffi/_embedding.h
+++ b/lib_pypy/cffi/_embedding.h
@@ -224,7 +224,7 @@ static int _cffi_initialize_python(void)
 
         if (f != NULL && f != Py_None) {
             PyFile_WriteString("\nFrom: " _CFFI_MODULE_NAME
-                               "\ncompiled with cffi version: 1.14.2"
+                               "\ncompiled with cffi version: 1.14.3"
                                "\n_cffi_backend module: ", f);
             modules = PyImport_GetModuleDict();
             mod = PyDict_GetItemString(modules, "_cffi_backend");
@@ -331,15 +331,20 @@ static int _cffi_carefully_make_gil(void)
     /* call Py_InitializeEx() */
     if (!Py_IsInitialized()) {
         _cffi_py_initialize();
+#if PY_VERSION_HEX < 0x03070000
         PyEval_InitThreads();
+#endif
         PyEval_SaveThread();  /* release the GIL */
         /* the returned tstate must be the one that has been stored into the
            autoTLSkey by _PyGILState_Init() called from Py_Initialize(). */
     }
     else {
+#if PY_VERSION_HEX < 0x03070000
+        /* PyEval_InitThreads() is always a no-op from CPython 3.7 */
         PyGILState_STATE state = PyGILState_Ensure();
         PyEval_InitThreads();
         PyGILState_Release(state);
+#endif
     }
 
 #ifdef WITH_THREAD
diff --git a/lib_pypy/pypy_tools/build_cffi_imports.py b/lib_pypy/pypy_tools/build_cffi_imports.py
index eb03709282..12e791d695 100644
--- a/lib_pypy/pypy_tools/build_cffi_imports.py
+++ b/lib_pypy/pypy_tools/build_cffi_imports.py
@@ -45,23 +45,26 @@ configure_args = ['./configure',
             '--enable-silent-rules',
             '--disable-dependency-tracking',
         ]
+# please note the deliberate use of a mirror site: we can't use HTTPS
+# without an _ssl module, but the OpenSSL download site redirect HTTP
+# to HTTPS
 cffi_dependencies = {
-    'lzma': ('https://tukaani.org/xz/xz-5.2.3.tar.gz',
-             '71928b357d0a09a12a4b4c5fafca8c31c19b0e7d3b8ebb19622e96f26dbf28cb',
+    'lzma': ('http://distfiles.macports.org/xz/xz-5.2.5.tar.bz2',
+             '5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df',
              [configure_args,
               ['make', '-s', '-j', str(multiprocessing.cpu_count())],
               ['make', 'install', 'DESTDIR={}/'.format(deps_destdir)],
              ]),
-    '_ssl': ('https://www.openssl.org/source/openssl-1.1.1f.tar.gz',
+    '_ssl': ('http://distfiles.macports.org/openssl/openssl-1.1.1f.tar.gz',
              '186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35',
              [['./config', '--prefix=/usr', 'no-shared'],
               ['make', '-s', '-j', str(multiprocessing.cpu_count())],
               ['make', 'install', 'DESTDIR={}/'.format(deps_destdir)],
              ]),
     # this does not compile on the buildbot, linker is missing '_history_list'
-    'broken_on_macos_gdbm': ('http://ftp.gnu.org/gnu/gdbm/gdbm-1.18.1.tar.gz',
+    'gdbm': ('http://distfiles.macports.org/gdbm/gdbm-1.18.1.tar.gz',
               '86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f745b91dc',
-              [configure_args,
+              [configure_args + ['--without-readline'],
               ['make', '-s', '-j', str(multiprocessing.cpu_count())],
               ['make', 'install', 'DESTDIR={}/'.format(deps_destdir)],
              ]),
@@ -127,8 +130,11 @@ def _build_dependency(name, patches=[]):
     print('unpacking archive', archive, file=sys.stderr)
     _unpack_tarfile(archive, deps_destdir)
 
-    sources = os.path.join(deps_destdir, os.path.basename(archive)[:-7])
-    
+    sources = os.path.join(
+        deps_destdir,
+        os.path.basename(archive).rsplit('.', 2)[0],
+    )
+
     # apply any patches
     if patches:
         for patch in patches: