Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package pyenv for openSUSE:Factory checked
in at 2022-12-15 19:25:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pyenv (Old)
and /work/SRC/openSUSE:Factory/.pyenv.new.1835 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pyenv"
Thu Dec 15 19:25:52 2022 rev:19 rq:1043119 version:2.3.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/pyenv/pyenv.changes 2022-12-04
14:59:14.472576826 +0100
+++ /work/SRC/openSUSE:Factory/.pyenv.new.1835/pyenv.changes 2022-12-15
19:26:18.332431933 +0100
@@ -1,0 +2,10 @@
+Wed Dec 14 14:35:37 UTC 2022 - Thomas Schraitle <thomas.schrai...@suse.com> -
2.3.8
+
+- Update to 2.3.8
+ - Export detected shell environment in pyenv-init by @ianchen-tw in #2540
+ - Add CPython 3.12.0a3 by @saaketp in #2545
+ - Add CPython 3.11.1 by @anton-petrov in #2549
+ - Add CPython 3.10.9 by @rudisimo in #2544
+ - Add 3.7.16, 3.8.16, 3.9.16 by @chadac in #2550
+
+-------------------------------------------------------------------
Old:
----
pyenv-2.3.7.tar.gz
New:
----
pyenv-2.3.8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pyenv.spec ++++++
--- /var/tmp/diff_new_pack.TuK3Pi/_old 2022-12-15 19:26:18.800434595 +0100
+++ /var/tmp/diff_new_pack.TuK3Pi/_new 2022-12-15 19:26:18.804434618 +0100
@@ -19,7 +19,7 @@
%define pyenv_dir %{_libexecdir}/pyenv
#
Name: pyenv
-Version: 2.3.7
+Version: 2.3.8
Release: 0
Summary: Python Version Management
License: MIT
++++++ pyenv-2.3.7.tar.gz -> pyenv-2.3.8.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pyenv-2.3.7/CHANGELOG.md new/pyenv-2.3.8/CHANGELOG.md
--- old/pyenv-2.3.7/CHANGELOG.md 2022-12-01 08:16:53.000000000 +0100
+++ new/pyenv-2.3.8/CHANGELOG.md 2022-12-08 08:07:26.000000000 +0100
@@ -1,4 +1,12 @@
-## Version History
+# Version History
+
+## Release 2.3.8
+
+* Export detected shell environment in pyenv-init by @ianchen-tw in
https://github.com/pyenv/pyenv/pull/2540
+* Add CPython 3.12.0a3 by @saaketp in https://github.com/pyenv/pyenv/pull/2545
+* Add CPython 3.11.1 by @anton-petrov in
https://github.com/pyenv/pyenv/pull/2549
+* Add CPython 3.10.9 by @rudisimo in https://github.com/pyenv/pyenv/pull/2544
+* Add 3.7.16, 3.8.16, 3.9.16 by @chadac in
https://github.com/pyenv/pyenv/pull/2550
## Release 2.3.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pyenv-2.3.7/libexec/pyenv---version
new/pyenv-2.3.8/libexec/pyenv---version
--- old/pyenv-2.3.7/libexec/pyenv---version 2022-12-01 08:16:53.000000000
+0100
+++ new/pyenv-2.3.8/libexec/pyenv---version 2022-12-08 08:07:26.000000000
+0100
@@ -12,7 +12,7 @@
set -e
[ -n "$PYENV_DEBUG" ] && set -x
-version="2.3.7"
+version="2.3.8"
git_revision=""
if cd "${BASH_SOURCE%/*}" 2>/dev/null && git remote -v 2>/dev/null | grep -q
pyenv; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pyenv-2.3.7/libexec/pyenv-init
new/pyenv-2.3.8/libexec/pyenv-init
--- old/pyenv-2.3.7/libexec/pyenv-init 2022-12-01 08:16:53.000000000 +0100
+++ new/pyenv-2.3.8/libexec/pyenv-init 2022-12-08 08:07:26.000000000 +0100
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
# Summary: Configure the shell environment for pyenv
-# Usage: eval "$(pyenv init [-|--path] [--no-push-path] [--no-rehash]
[<shell>])"
+# Usage: eval "$(pyenv init [-|--path] [--no-push-path] [--detect-shell]
[--no-rehash] [<shell>])"
set -e
[ -n "$PYENV_DEBUG" ] && set -x
@@ -11,6 +11,7 @@
echo --path
echo --no-push-path
echo --no-rehash
+ echo --detect-shell
echo bash
echo fish
echo ksh
@@ -33,6 +34,11 @@
shift
fi
+ if [ "$args" = "--detect-shell" ]; then
+ mode="detect-shell"
+ shift
+ fi
+
if [ "$args" = "--no-push-path" ]; then
no_push_path=1
shift
@@ -76,12 +82,17 @@
print_shell_function
exit 0
;;
+ "detect-shell")
+ detect_profile
+ print_detect_shell
+ exit 0
+ ;;
esac
# should never get here
exit 2
}
-function help_() {
+function detect_profile() {
case "$shell" in
bash )
if [ -e '~/.bash_profile' ]; then
@@ -105,7 +116,16 @@
rc='your shell'\''s interactive startup file'
;;
esac
+}
+function print_detect_shell() {
+ echo "PYENV_SHELL_DETECT=$shell"
+ echo "PYENV_PROFILE_DETECT=$profile"
+ echo "PYENV_RC_DETECT=$rc"
+}
+
+function help_() {
+ detect_profile
{
case "$shell" in
fish )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pyenv-2.3.7/plugins/python-build/share/python-build/3.10.9
new/pyenv-2.3.8/plugins/python-build/share/python-build/3.10.9
--- old/pyenv-2.3.7/plugins/python-build/share/python-build/3.10.9
1970-01-01 01:00:00.000000000 +0100
+++ new/pyenv-2.3.8/plugins/python-build/share/python-build/3.10.9
2022-12-08 08:07:26.000000000 +0100
@@ -0,0 +1,9 @@
+prefer_openssl11
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
+install_package "openssl-1.1.1o"
"https://www.openssl.org/source/openssl-1.1.1o.tar.gz#9384a2b0570dd80358841464677115df785edb941c71211f75076d72fe6b438f";
mac_openssl --if has_broken_mac_openssl
+install_package "readline-8.1"
"https://ftpmirror.gnu.org/readline/readline-8.1.tar.gz#f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02";
mac_readline --if has_broken_mac_readline
+if has_tar_xz_support; then
+ install_package "Python-3.10.9"
"https://www.python.org/ftp/python/3.10.9/Python-3.10.9.tar.xz#5ae03e308260164baba39921fdb4dbf8e6d03d8235a939d4582b33f0b5e46a83";
standard verify_py310 copy_python_gdb ensurepip
+else
+ install_package "Python-3.10.9"
"https://www.python.org/ftp/python/3.10.9/Python-3.10.9.tgz#4ccd7e46c8898f4c7862910a1703aa0e63525913a519abb2f55e26220a914d88";
standard verify_py310 copy_python_gdb ensurepip
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pyenv-2.3.7/plugins/python-build/share/python-build/3.11.1
new/pyenv-2.3.8/plugins/python-build/share/python-build/3.11.1
--- old/pyenv-2.3.7/plugins/python-build/share/python-build/3.11.1
1970-01-01 01:00:00.000000000 +0100
+++ new/pyenv-2.3.8/plugins/python-build/share/python-build/3.11.1
2022-12-08 08:07:26.000000000 +0100
@@ -0,0 +1,10 @@
+prefer_openssl11
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
+export PYTHON_BUILD_TCLTK_USE_PKGCONFIG=1
+install_package "openssl-1.1.1s"
"https://www.openssl.org/source/openssl-1.1.1s.tar.gz#c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa";
mac_openssl --if has_broken_mac_openssl
+install_package "readline-8.2"
"https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35";
mac_readline --if has_broken_mac_readline
+if has_tar_xz_support; then
+ install_package "Python-3.11.1"
"https://www.python.org/ftp/python/3.11.1/Python-3.11.1.tar.xz#85879192f2cffd56cb16c092905949ebf3e5e394b7f764723529637901dfb58f";
standard verify_py311 copy_python_gdb ensurepip
+else
+ install_package "Python-3.11.1"
"https://www.python.org/ftp/python/3.11.1/Python-3.11.1.tgz#baed518e26b337d4d8105679caf68c5c32630d702614fc174e98cb95c46bdfa4";
standard verify_py311 copy_python_gdb ensurepip
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pyenv-2.3.7/plugins/python-build/share/python-build/3.12.0a2
new/pyenv-2.3.8/plugins/python-build/share/python-build/3.12.0a2
--- old/pyenv-2.3.7/plugins/python-build/share/python-build/3.12.0a2
2022-12-01 08:16:53.000000000 +0100
+++ new/pyenv-2.3.8/plugins/python-build/share/python-build/3.12.0a2
1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-prefer_openssl11
-export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
-install_package "openssl-1.1.1s"
"https://www.openssl.org/source/openssl-1.1.1s.tar.gz#c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa";
mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.2"
"https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35";
mac_readline --if has_broken_mac_readline
-if has_tar_xz_support; then
- install_package "Python-3.12.0a2"
"https://www.python.org/ftp/python/3.12.0/Python-3.12.0a2.tar.xz#1eafc1384e532cac6432632a77350ef504a114c4235c1f6f2a85f817f5b1926a";
standard verify_py312 copy_python_gdb ensurepip
-else
- install_package "Python-3.12.0a2"
"https://www.python.org/ftp/python/3.12.0/Python-3.12.0a2.tgz#81fa3468cada25f5ac8868230a847999495464f8ab67df1df3e8e8e280df0b2b";
standard verify_py312 copy_python_gdb ensurepip
-fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pyenv-2.3.7/plugins/python-build/share/python-build/3.12.0a3
new/pyenv-2.3.8/plugins/python-build/share/python-build/3.12.0a3
--- old/pyenv-2.3.7/plugins/python-build/share/python-build/3.12.0a3
1970-01-01 01:00:00.000000000 +0100
+++ new/pyenv-2.3.8/plugins/python-build/share/python-build/3.12.0a3
2022-12-08 08:07:26.000000000 +0100
@@ -0,0 +1,9 @@
+prefer_openssl11
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
+install_package "openssl-1.1.1s"
"https://www.openssl.org/source/openssl-1.1.1s.tar.gz#c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa";
mac_openssl --if has_broken_mac_openssl
+install_package "readline-8.2"
"https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35";
mac_readline --if has_broken_mac_readline
+if has_tar_xz_support; then
+ install_package "Python-3.12.0a3"
"https://www.python.org/ftp/python/3.12.0/Python-3.12.0a3.tar.xz#1b64b3075e0a9241974e580e09b09c9117a1c4e2be698039201ef1d8a73453d1";
standard verify_py312 copy_python_gdb ensurepip
+else
+ install_package "Python-3.12.0a3"
"https://www.python.org/ftp/python/3.12.0/Python-3.12.0a3.tgz#fd414e6b6520171f5cefc5cba1067265187a322417f7bdec8d024db7fc8fbe96";
standard verify_py312 copy_python_gdb ensurepip
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pyenv-2.3.7/plugins/python-build/share/python-build/3.7.16
new/pyenv-2.3.8/plugins/python-build/share/python-build/3.7.16
--- old/pyenv-2.3.7/plugins/python-build/share/python-build/3.7.16
1970-01-01 01:00:00.000000000 +0100
+++ new/pyenv-2.3.8/plugins/python-build/share/python-build/3.7.16
2022-12-08 08:07:26.000000000 +0100
@@ -0,0 +1,9 @@
+prefer_openssl11
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
+install_package "openssl-1.1.1q"
"https://www.openssl.org/source/openssl-1.1.1q.tar.gz#d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca";
mac_openssl --if has_broken_mac_openssl
+install_package "readline-8.1"
"https://ftpmirror.gnu.org/readline/readline-8.1.tar.gz#f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02";
mac_readline --if has_broken_mac_readline
+if has_tar_xz_support; then
+ install_package "Python-3.7.16"
"https://www.python.org/ftp/python/3.7.16/Python-3.7.16.tar.xz#8338f0c2222d847e904c955369155dc1beeeed806e8d5ef04b00ef4787238bfd";
standard verify_py37 copy_python_gdb ensurepip
+else
+ install_package "Python-3.7.16"
"https://www.python.org/ftp/python/3.7.16/Python-3.7.16.tgz#0cf2da07fa464636755215415909e22eb1d058817af4824bc15af8390d05fb38";
standard verify_py37 copy_python_gdb ensurepip
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pyenv-2.3.7/plugins/python-build/share/python-build/3.8.16
new/pyenv-2.3.8/plugins/python-build/share/python-build/3.8.16
--- old/pyenv-2.3.7/plugins/python-build/share/python-build/3.8.16
1970-01-01 01:00:00.000000000 +0100
+++ new/pyenv-2.3.8/plugins/python-build/share/python-build/3.8.16
2022-12-08 08:07:26.000000000 +0100
@@ -0,0 +1,9 @@
+prefer_openssl11
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
+install_package "openssl-1.1.1q"
"https://www.openssl.org/source/openssl-1.1.1q.tar.gz#d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca";
mac_openssl --if has_broken_mac_openssl
+install_package "readline-8.1"
"https://ftpmirror.gnu.org/readline/readline-8.1.tar.gz#f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02";
mac_readline --if has_broken_mac_readline
+if has_tar_xz_support; then
+ install_package "Python-3.8.16"
"https://www.python.org/ftp/python/3.8.16/Python-3.8.16.tar.xz#d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562";
standard verify_py38 copy_python_gdb ensurepip
+else
+ install_package "Python-3.8.16"
"https://www.python.org/ftp/python/3.8.16/Python-3.8.16.tgz#71ca9d935637ed2feb59e90a368361dc91eca472a90acb1d344a2e8178ccaf10";
standard verify_py38 copy_python_gdb ensurepip
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pyenv-2.3.7/plugins/python-build/share/python-build/3.9.16
new/pyenv-2.3.8/plugins/python-build/share/python-build/3.9.16
--- old/pyenv-2.3.7/plugins/python-build/share/python-build/3.9.16
1970-01-01 01:00:00.000000000 +0100
+++ new/pyenv-2.3.8/plugins/python-build/share/python-build/3.9.16
2022-12-08 08:07:26.000000000 +0100
@@ -0,0 +1,9 @@
+prefer_openssl11
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
+install_package "openssl-1.1.1q"
"https://www.openssl.org/source/openssl-1.1.1q.tar.gz#d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca";
mac_openssl --if has_broken_mac_openssl
+install_package "readline-8.1"
"https://ftpmirror.gnu.org/readline/readline-8.1.tar.gz#f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02";
mac_readline --if has_broken_mac_readline
+if has_tar_xz_support; then
+ install_package "Python-3.9.16"
"https://www.python.org/ftp/python/3.9.16/Python-3.9.16.tar.xz#22dddc099246dd2760665561e8adb7394ea0cc43a72684c6480f9380f7786439";
standard verify_py39 copy_python_gdb ensurepip
+else
+ install_package "Python-3.9.16"
"https://www.python.org/ftp/python/3.9.16/Python-3.9.16.tgz#1ad539e9dbd2b42df714b69726e0693bc6b9d2d2c8e91c2e43204026605140c5";
standard verify_py39 copy_python_gdb ensurepip
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pyenv-2.3.7/plugins/python-build/share/python-build/patches/3.7.16/Python-3.7.16/0001-Port-ctypes-and-system-libffi-patches-for-arm64-macO.patch
new/pyenv-2.3.8/plugins/python-build/share/python-build/patches/3.7.16/Python-3.7.16/0001-Port-ctypes-and-system-libffi-patches-for-arm64-macO.patch
---
old/pyenv-2.3.7/plugins/python-build/share/python-build/patches/3.7.16/Python-3.7.16/0001-Port-ctypes-and-system-libffi-patches-for-arm64-macO.patch
1970-01-01 01:00:00.000000000 +0100
+++
new/pyenv-2.3.8/plugins/python-build/share/python-build/patches/3.7.16/Python-3.7.16/0001-Port-ctypes-and-system-libffi-patches-for-arm64-macO.patch
2022-12-08 08:07:26.000000000 +0100
@@ -0,0 +1,310 @@
+From: Christian Hammond <christ...@beanbaginc.com>
+Date: Wed, 15 Dec 2021 23:12:36 -0800
+Subject: Port ctypes and system libffi patches for arm64/macOS 10.15+ to
Python 3.7.12
+
+This ports the following ctypes and libffi pyenv patches for Python
+2.7.18 to Python 3.7.12:
+
+* `0004-Use-system-libffi-for-Mac-OS-10.15-and-up.patch`
+* `0005-ctypes-use-the-correct-ABI-for-variadic-functions.patch`
+* `0006-ctypes-probe-libffi-for-ffi_closure_alloc-and-ffi_pr.patch`
+
+These patches enable use of system libffi (fixing a broken `ctypes`
+module on arm64 targets) and enable calling variadic functions on arm64.
+They've been combined from patches port from Homebrew to pyenv by Takumi
+Sueda, updated to work on the Python 3.7.12 codebase.
+
+The Homebrew patches are themselves backports of changes in Python 3.9
+and 3.10. That patch can be found at:
+
+https://github.com/Homebrew/formula-patches/blob/master/python/3.8.7.patch
+
+diff --git a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst
+index 715d595b24..7743144978 100644
+--- a/Doc/library/ctypes.rst
++++ b/Doc/library/ctypes.rst
+@@ -1551,6 +1551,13 @@ They are instances of a private class:
+ value usable as argument (integer, string, ctypes instance). This
allows
+ defining adapters that can adapt custom objects as function parameters.
+
++ .. attribute:: variadic
++
++ Assign a boolean to specify that the function takes a variable number of
++ arguments. This does not matter on most platforms, but for Apple arm64
++ platforms variadic functions have a different calling convention than
++ normal functions.
++
+ .. attribute:: errcheck
+
+ Assign a Python function or another callable to this attribute. The
+diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
+index 4ebd82d3e0..7b73c190b6 100644
+--- a/Lib/test/test_unicode.py
++++ b/Lib/test/test_unicode.py
+@@ -2458,11 +2458,14 @@ class CAPITest(unittest.TestCase):
+ def test_from_format(self):
+ support.import_module('ctypes')
+ from ctypes import (
++ c_char_p,
+ pythonapi, py_object, sizeof,
+ c_int, c_long, c_longlong, c_ssize_t,
+ c_uint, c_ulong, c_ulonglong, c_size_t, c_void_p)
+ name = "PyUnicode_FromFormat"
+ _PyUnicode_FromFormat = getattr(pythonapi, name)
++ _PyUnicode_FromFormat.argtypes = (c_char_p,)
++ _PyUnicode_FromFormat.variadic = True
+ _PyUnicode_FromFormat.restype = py_object
+
+ def PyUnicode_FromFormat(format, *args):
+diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
+index dd0c61fd8a..79137e1dc7 100644
+--- a/Modules/_ctypes/_ctypes.c
++++ b/Modules/_ctypes/_ctypes.c
+@@ -3174,6 +3174,34 @@ PyCFuncPtr_get_restype(PyCFuncPtrObject *self, void
*Py_UNUSED(ignored))
+ }
+ }
+
++static int
++PyCFuncPtr_set_variadic(PyCFuncPtrObject *self, PyObject *ob)
++{
++ StgDictObject *dict = PyObject_stgdict((PyObject *)self);
++ assert(dict);
++ int r = PyObject_IsTrue(ob);
++ if (r == 1) {
++ dict->flags |= FUNCFLAG_VARIADIC;
++ return 0;
++ } else if (r == 0) {
++ dict->flags &= ~FUNCFLAG_VARIADIC;
++ return 0;
++ } else {
++ return -1;
++ }
++}
++
++static PyObject *
++PyCFuncPtr_get_variadic(PyCFuncPtrObject *self)
++{
++ StgDictObject *dict = PyObject_stgdict((PyObject *)self);
++ assert(dict); /* Cannot be NULL for PyCFuncPtrObject instances */
++ if (dict->flags & FUNCFLAG_VARIADIC)
++ Py_RETURN_TRUE;
++ else
++ Py_RETURN_FALSE;
++}
++
+ static int
+ PyCFuncPtr_set_argtypes(PyCFuncPtrObject *self, PyObject *ob, void
*Py_UNUSED(ignored))
+ {
+@@ -3219,6 +3247,8 @@ static PyGetSetDef PyCFuncPtr_getsets[] = {
+ { "argtypes", (getter)PyCFuncPtr_get_argtypes,
+ (setter)PyCFuncPtr_set_argtypes,
+ "specify the argument types", NULL },
++ { "variadic", (getter)PyCFuncPtr_get_variadic,
(setter)PyCFuncPtr_set_variadic,
++ "specify if function takes variable number of arguments", NULL },
+ { NULL, NULL }
+ };
+
+@@ -5632,6 +5662,7 @@ PyInit__ctypes(void)
+ PyModule_AddObject(m, "FUNCFLAG_USE_ERRNO",
PyLong_FromLong(FUNCFLAG_USE_ERRNO));
+ PyModule_AddObject(m, "FUNCFLAG_USE_LASTERROR",
PyLong_FromLong(FUNCFLAG_USE_LASTERROR));
+ PyModule_AddObject(m, "FUNCFLAG_PYTHONAPI",
PyLong_FromLong(FUNCFLAG_PYTHONAPI));
++ PyModule_AddObject(m, "FUNCFLAG_VARIADIC",
PyLong_FromLong(FUNCFLAG_VARIADIC));
+ PyModule_AddStringConstant(m, "__version__", "1.1.0");
+
+ PyModule_AddObject(m, "_memmove_addr", PyLong_FromVoidPtr(memmove));
+diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
+index 9cbf9801ad..e7fe11176b 100644
+--- a/Modules/_ctypes/callproc.c
++++ b/Modules/_ctypes/callproc.c
+@@ -754,7 +756,8 @@ static int _call_function_pointer(int flags,
+ ffi_type **atypes,
+ ffi_type *restype,
+ void *resmem,
+- int argcount)
++ int argcount,
++ int argtypecount)
+ {
+ PyThreadState *_save = NULL; /* For Py_BLOCK_THREADS and
Py_UNBLOCK_THREADS */
+ PyObject *error_object = NULL;
+@@ -780,15 +783,39 @@ static int _call_function_pointer(int flags,
+ if ((flags & FUNCFLAG_CDECL) == 0)
+ cc = FFI_STDCALL;
+ #endif
+- if (FFI_OK != ffi_prep_cif(&cif,
+- cc,
+- argcount,
+- restype,
+- atypes)) {
+- PyErr_SetString(PyExc_RuntimeError,
+- "ffi_prep_cif failed");
+- return -1;
++
++#if HAVE_FFI_PREP_CIF_VAR
++ /* Everyone SHOULD set f.variadic=True on variadic function pointers, but
++ * lots of existing code will not. If there's at least one arg and more
++ * args are passed than are defined in the prototype, then it must be a
++ * variadic function. */
++ if ((flags & FUNCFLAG_VARIADIC) ||
++ (argtypecount != 0 && argcount > argtypecount))
++ {
++ if (FFI_OK != ffi_prep_cif_var(&cif,
++ cc,
++ argtypecount,
++ argcount,
++ restype,
++ atypes)) {
++ PyErr_SetString(PyExc_RuntimeError,
++ "ffi_prep_cif_var failed");
++ return -1;
++ }
++ } else {
++#endif
++ if (FFI_OK != ffi_prep_cif(&cif,
++ cc,
++ argcount,
++ restype,
++ atypes)) {
++ PyErr_SetString(PyExc_RuntimeError,
++ "ffi_prep_cif failed");
++ return -1;
++ }
++#if HAVE_FFI_PREP_CIF_VAR
+ }
++#endif
+
+ if (flags & (FUNCFLAG_USE_ERRNO | FUNCFLAG_USE_LASTERROR)) {
+ error_object = _ctypes_get_errobj(&space);
+@@ -1187,9 +1214,8 @@ PyObject *_ctypes_callproc(PPROC pProc,
+
+ if (-1 == _call_function_pointer(flags, pProc, avalues, atypes,
+ rtype, resbuf,
+- Py_SAFE_DOWNCAST(argcount,
+- Py_ssize_t,
+- int)))
++ Py_SAFE_DOWNCAST(argcount, Py_ssize_t,
int),
++ Py_SAFE_DOWNCAST(argtype_count,
Py_ssize_t, int)))
+ goto cleanup;
+
+ #ifdef WORDS_BIGENDIAN
+diff --git a/Modules/_ctypes/ctypes.h b/Modules/_ctypes/ctypes.h
+index e58f85233c..e45975f6ad 100644
+--- a/Modules/_ctypes/ctypes.h
++++ b/Modules/_ctypes/ctypes.h
+@@ -285,6 +285,7 @@ PyObject *_ctypes_callproc(PPROC pProc,
+ #define FUNCFLAG_PYTHONAPI 0x4
+ #define FUNCFLAG_USE_ERRNO 0x8
+ #define FUNCFLAG_USE_LASTERROR 0x10
++#define FUNCFLAG_VARIADIC 0x20
+
+ #define TYPEFLAG_ISPOINTER 0x100
+ #define TYPEFLAG_HASPOINTER 0x200
+diff --git a/setup.py b/setup.py
+index bf90600eaa..48ff120e9a 100644
+--- a/setup.py
++++ b/setup.py
+@@ -142,6 +142,13 @@ def macosx_sdk_root():
+
+ return MACOS_SDK_ROOT
+
++def is_macosx_at_least(vers):
++ if host_platform == 'darwin':
++ dep_target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
++ if dep_target:
++ return tuple(map(int, str(dep_target).split('.'))) >= vers
++ return False
++
+ def is_macosx_sdk_path(path):
+ """
+ Returns True if 'path' can be located in an OSX SDK
+@@ -150,6 +157,13 @@ def is_macosx_sdk_path(path):
+ or path.startswith('/System/')
+ or path.startswith('/Library/') )
+
++def grep_headers_for(function, headers):
++ for header in headers:
++ with open(header, 'r') as f:
++ if function in f.read():
++ return True
++ return False
++
+ def find_file(filename, std_dirs, paths):
+ """Searches for the directory where a given file is located,
+ and returns a possibly-empty list of additional directories, or None
+@@ -1972,7 +1986,11 @@ class PyBuildExt(build_ext):
+ return True
+
+ def detect_ctypes(self, inc_dirs, lib_dirs):
+- self.use_system_libffi = False
++ if not sysconfig.get_config_var("LIBFFI_INCLUDEDIR") and
is_macosx_at_least((10,15)):
++ self.use_system_libffi = True
++ else:
++ self.use_system_libffi = '--with-system-ffi' in
sysconfig.get_config_var("CONFIG_ARGS")
++
+ include_dirs = []
+ extra_compile_args = []
+ extra_link_args = []
+@@ -2018,30 +2036,47 @@ class PyBuildExt(build_ext):
+ libraries=['m'])
+ self.extensions.extend([ext, ext_test])
+
++ ffi_inc = sysconfig.get_config_var("LIBFFI_INCLUDEDIR")
++ ffi_lib = None
++
+ if host_platform == 'darwin':
+- if '--with-system-ffi' not in
sysconfig.get_config_var("CONFIG_ARGS"):
++ if not self.use_system_libffi:
+ return
+- # OS X 10.5 comes with libffi.dylib; the include files are
+- # in /usr/include/ffi
+- inc_dirs.append('/usr/include/ffi')
+-
+- ffi_inc = [sysconfig.get_config_var("LIBFFI_INCLUDEDIR")]
+- if not ffi_inc or ffi_inc[0] == '':
+- ffi_inc = find_file('ffi.h', [], inc_dirs)
+- if ffi_inc is not None:
+- ffi_h = ffi_inc[0] + '/ffi.h'
++ ffi_in_sdk = os.path.join(macosx_sdk_root(), "usr/include/ffi")
++ if os.path.exists(ffi_in_sdk):
++ ffi_inc = ffi_in_sdk
++ ffi_lib = 'ffi'
++ else:
++ # OS X 10.5 comes with libffi.dylib; the include files are
++ # in /usr/include/ffi
++ inc_dirs.append('/usr/include/ffi')
++
++ if not ffi_inc:
++ found = find_file('ffi.h', [], inc_dirs)
++ if found:
++ ffi_inc = found[0]
++ if ffi_inc:
++ ffi_h = ffi_inc + '/ffi.h'
+ if not os.path.exists(ffi_h):
+ ffi_inc = None
+ print('Header file {} does not exist'.format(ffi_h))
+- ffi_lib = None
+- if ffi_inc is not None:
+- for lib_name in ('ffi', 'ffi_pic'):
++
++ if ffi_lib is None and ffi_inc:
++ for lib_name in ('ffi_convenience', 'ffi_pic', 'ffi'):
+ if (self.compiler.find_library_file(lib_dirs, lib_name)):
+ ffi_lib = lib_name
+ break
+
+ if ffi_inc and ffi_lib:
+- ext.include_dirs.extend(ffi_inc)
++ ffi_headers = glob(os.path.join(ffi_inc, '*.h'))
++ if grep_headers_for('ffi_closure_alloc', ffi_headers):
++ try:
++ sources.remove('_ctypes/malloc_closure.c')
++ except ValueError:
++ pass
++ if grep_headers_for('ffi_prep_cif_var', ffi_headers):
++ ext.extra_compile_args.append("-DHAVE_FFI_PREP_CIF_VAR=1")
++ ext.include_dirs.append(ffi_inc)
+ ext.libraries.append(ffi_lib)
+ self.use_system_libffi = True
+
+--
+2.30.1 (Apple Git-130)
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pyenv-2.3.7/plugins/python-build/share/python-build/patches/3.7.16/Python-3.7.16/0002-bpo-41100-fix-_decimal-for-arm64-Mac-OS-GH-21228.patch
new/pyenv-2.3.8/plugins/python-build/share/python-build/patches/3.7.16/Python-3.7.16/0002-bpo-41100-fix-_decimal-for-arm64-Mac-OS-GH-21228.patch
---
old/pyenv-2.3.7/plugins/python-build/share/python-build/patches/3.7.16/Python-3.7.16/0002-bpo-41100-fix-_decimal-for-arm64-Mac-OS-GH-21228.patch
1970-01-01 01:00:00.000000000 +0100
+++
new/pyenv-2.3.8/plugins/python-build/share/python-build/patches/3.7.16/Python-3.7.16/0002-bpo-41100-fix-_decimal-for-arm64-Mac-OS-GH-21228.patch
2022-12-08 08:07:26.000000000 +0100
@@ -0,0 +1,37 @@
+From f2595c038ed7bfd182d9d05d83786106ebd02ca0 Mon Sep 17 00:00:00 2001
+From: Lawrence D'Anna <64555057+lawrence-danna-ap...@users.noreply.github.com>
+Date: Tue, 30 Jun 2020 02:15:46 -0700
+Subject: [PATCH] bpo-41100: fix _decimal for arm64 Mac OS (GH-21228)
+
+Patch by Lawrence Danna.
+---
+ .../Core and Builtins/2020-06-30-04-44-29.bpo-41100.PJwA6F.rst | 1 +
+ Modules/_decimal/libmpdec/mpdecimal.h | 3 +++
+ 2 files changed, 4 insertions(+)
+ create mode 100644 Misc/NEWS.d/next/Core and
Builtins/2020-06-30-04-44-29.bpo-41100.PJwA6F.rst
+
+diff --git a/Misc/NEWS.d/next/Core and
Builtins/2020-06-30-04-44-29.bpo-41100.PJwA6F.rst b/Misc/NEWS.d/next/Core and
Builtins/2020-06-30-04-44-29.bpo-41100.PJwA6F.rst
+new file mode 100644
+index 0000000000..d6176d69f0
+--- /dev/null
++++ b/Misc/NEWS.d/next/Core and
Builtins/2020-06-30-04-44-29.bpo-41100.PJwA6F.rst
+@@ -0,0 +1 @@
++add arm64 to the allowable Mac OS arches in mpdecimal.h
+\ No newline at end of file
+diff --git a/Modules/_decimal/libmpdec/mpdecimal.h
b/Modules/_decimal/libmpdec/mpdecimal.h
+index a67dd9bc12..3e9c8185c3 100644
+--- a/Modules/_decimal/libmpdec/mpdecimal.h
++++ b/Modules/_decimal/libmpdec/mpdecimal.h
+@@ -135,6 +135,9 @@ const char *mpd_version(void);
+ #elif defined(__x86_64__)
+ #define CONFIG_64
+ #define ASM
++ #elif defined(__arm64__)
++ #define CONFIG_64
++ #define ANSI
+ #else
+ #error "unknown architecture for universal build."
+ #endif
+--
+2.37.3
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pyenv-2.3.7/plugins/python-build/share/python-build/patches/3.7.16/Python-3.7.16/0003-bpo-42351-Avoid-error-when-opening-header-with-non-U.patch
new/pyenv-2.3.8/plugins/python-build/share/python-build/patches/3.7.16/Python-3.7.16/0003-bpo-42351-Avoid-error-when-opening-header-with-non-U.patch
---
old/pyenv-2.3.7/plugins/python-build/share/python-build/patches/3.7.16/Python-3.7.16/0003-bpo-42351-Avoid-error-when-opening-header-with-non-U.patch
1970-01-01 01:00:00.000000000 +0100
+++
new/pyenv-2.3.8/plugins/python-build/share/python-build/patches/3.7.16/Python-3.7.16/0003-bpo-42351-Avoid-error-when-opening-header-with-non-U.patch
2022-12-08 08:07:26.000000000 +0100
@@ -0,0 +1,30 @@
+From 245427d207ee88a4ba26a66c3de350bcbcc036f2 Mon Sep 17 00:00:00 2001
+From: Ronald Oussoren <ronaldousso...@mac.com>
+Date: Sat, 14 Nov 2020 16:07:47 +0100
+Subject: [PATCH] bpo-42351: Avoid error when opening header with non-UTF8
+ encoding (GH-23279)
+
+grep_headers_for() would error out when a header contained
+text that cannot be interpreted as UTF-8.
+
+cherry-picked from 7a27c7ed4b by Pedro Fonini <fon...@ip.tv>
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index f211989aac..467362813d 100644
+--- a/setup.py
++++ b/setup.py
+@@ -159,7 +159,7 @@ def is_macosx_sdk_path(path):
+
+ def grep_headers_for(function, headers):
+ for header in headers:
+- with open(header, 'r') as f:
++ with open(header, 'r', errors='surrogateescape') as f:
+ if function in f.read():
+ return True
+ return False
+--
+2.34.1
+
