gpgme: updated footprint

5 files changed, 446 insertions, 76 deletions

diff --git a/gpgme/.footprint b/gpgme/.footprint
index 7eeac235a..77242440a 100644
--- a/gpgme/.footprint
+++ b/gpgme/.footprint
@@ -67,78 +67,78 @@ lrwxrwxrwx	root/root	usr/lib/libgpgmepp.so.6 -> libgpgmepp.so.6.13.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/gpgme-glib.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/gpgme.pc
-drwxr-xr-x	root/root	usr/lib/python3.9/
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg-1.16.0-py3.9.egg-info
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/gpg/
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/__init__.py
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/gpg/__pycache__/
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/__pycache__/__init__.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/__pycache__/callbacks.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/__pycache__/core.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/__pycache__/errors.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/__pycache__/gpgme.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/__pycache__/results.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/__pycache__/util.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/__pycache__/version.cpython-39.pyc
--rwxr-xr-x	root/root	usr/lib/python3.9/site-packages/gpg/_gpgme.cpython-39-x86_64-linux-gnu.so
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/callbacks.py
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/gpg/constants/
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/__init__.py
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/gpg/constants/__pycache__/
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/__pycache__/__init__.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/__pycache__/create.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/__pycache__/event.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/__pycache__/import_type.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/__pycache__/keysign.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/__pycache__/md.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/__pycache__/pk.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/__pycache__/protocol.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/__pycache__/sigsum.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/__pycache__/status.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/__pycache__/validity.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/create.py
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/gpg/constants/data/
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/data/__init__.py
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/gpg/constants/data/__pycache__/
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/data/__pycache__/__init__.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/data/__pycache__/encoding.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/data/encoding.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/event.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/import_type.py
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/gpg/constants/keylist/
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/keylist/__init__.py
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/gpg/constants/keylist/__pycache__/
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/keylist/__pycache__/__init__.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/keylist/__pycache__/mode.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/keylist/mode.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/keysign.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/md.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/pk.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/protocol.py
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/gpg/constants/sig/
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/sig/__init__.py
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/gpg/constants/sig/__pycache__/
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/sig/__pycache__/__init__.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/sig/__pycache__/mode.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/sig/__pycache__/notation.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/sig/mode.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/sig/notation.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/sigsum.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/status.py
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/gpg/constants/tofu/
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/tofu/__init__.py
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/gpg/constants/tofu/__pycache__/
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/tofu/__pycache__/__init__.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/tofu/__pycache__/policy.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/tofu/policy.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/constants/validity.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/core.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/errors.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/gpgme.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/results.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/util.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/gpg/version.py
+drwxr-xr-x	root/root	usr/lib/python3.10/
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg-1.16.0-py3.10.egg-info
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/gpg/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/__init__.py
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/gpg/__pycache__/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/__pycache__/__init__.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/__pycache__/callbacks.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/__pycache__/core.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/__pycache__/errors.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/__pycache__/gpgme.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/__pycache__/results.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/__pycache__/util.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/__pycache__/version.cpython-310.pyc
+-rwxr-xr-x	root/root	usr/lib/python3.10/site-packages/gpg/_gpgme.cpython-310-x86_64-linux-gnu.so
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/callbacks.py
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/gpg/constants/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/__init__.py
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/gpg/constants/__pycache__/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/__pycache__/__init__.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/__pycache__/create.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/__pycache__/event.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/__pycache__/import_type.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/__pycache__/keysign.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/__pycache__/md.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/__pycache__/pk.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/__pycache__/protocol.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/__pycache__/sigsum.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/__pycache__/status.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/__pycache__/validity.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/create.py
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/gpg/constants/data/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/data/__init__.py
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/gpg/constants/data/__pycache__/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/data/__pycache__/__init__.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/data/__pycache__/encoding.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/data/encoding.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/event.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/import_type.py
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/gpg/constants/keylist/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/keylist/__init__.py
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/gpg/constants/keylist/__pycache__/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/keylist/__pycache__/__init__.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/keylist/__pycache__/mode.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/keylist/mode.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/keysign.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/md.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/pk.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/protocol.py
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/gpg/constants/sig/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/sig/__init__.py
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/gpg/constants/sig/__pycache__/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/sig/__pycache__/__init__.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/sig/__pycache__/mode.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/sig/__pycache__/notation.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/sig/mode.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/sig/notation.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/sigsum.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/status.py
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/gpg/constants/tofu/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/tofu/__init__.py
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/gpg/constants/tofu/__pycache__/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/tofu/__pycache__/__init__.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/tofu/__pycache__/policy.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/tofu/policy.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/constants/validity.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/core.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/errors.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/gpgme.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/results.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/util.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/gpg/version.py
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/aclocal/
 -rw-r--r--	root/root	usr/share/aclocal/gpgme.m4
diff --git a/gpgme/.signature b/gpgme/.signature
index 67ee0a13c..e5f7405d5 100644
--- a/gpgme/.signature
+++ b/gpgme/.signature
@@ -1,5 +1,7 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF36KtbzIguWNNFgzZ0aqKmC4n0+iaawIpASurbOMFDX/PaiKFzpqHqN0vDW/AwYo/nystlHwqA34r6UgWNoAQIwY=
-SHA256 (Pkgfile) = 82125bea172f618c8533bd6c59f34820d298cbf7c7fac2f6a8a517d5895a02c7
-SHA256 (.footprint) = e0606c4b40ae658a7623b078478dc4190902bbcb53bcd3f0ebd992c1471c18e3
+RWSagIOpLGJF32jJGhkw43gacuGI2CIoruWhg+7hYApFwmF38YxfZusFAns62OATOyMgS5+NW8DgMO/aMGPRfLZr6uX0xHXX7QY=
+SHA256 (Pkgfile) = dff485cab1f68e9ad49f618797c5dd5fb387f9d94fe35b4a1c6d050f5abcb2a4
+SHA256 (.footprint) = 19e8b903793610162449e5a940387c1f57247c3472c01b35166f85614c16c74d
 SHA256 (gpgme-1.16.0.tar.bz2) = 6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0
+SHA256 (python310.patch) = 5de2f6bcb6b30642d0cbc3fbd86803c9460d732f44a526f44cedee8bb78d291a
+SHA256 (closefrom.patch) = 0af565de5b3e1f9edf385b2f87b5074726f8345a05abe5d904a35c5ce4dc2781
diff --git a/gpgme/Pkgfile b/gpgme/Pkgfile
index 96ef5c560..648b5dfb1 100644
--- a/gpgme/Pkgfile
+++ b/gpgme/Pkgfile
@@ -6,11 +6,15 @@
 name=gpgme
 version=1.16.0
 release=1
-source=(https://www.gnupg.org/ftp/gcrypt/$name/$name-$version.tar.bz2)
+source=(https://www.gnupg.org/ftp/gcrypt/$name/$name-$version.tar.bz2
+	python310.patch closefrom.patch)
 
 build() {
 	cd $name-$version
 
+	patch -Np1 -i $SRC/python310.patch
+	patch -Np1 -i $SRC/closefrom.patch
+
 	export PYTHON='/usr/bin/python3'
 	./configure \
 		--prefix=/usr \
diff --git a/gpgme/closefrom.patch b/gpgme/closefrom.patch
new file mode 100644
index 000000000..8b12c1785
--- /dev/null
+++ b/gpgme/closefrom.patch
@@ -0,0 +1,32 @@
+From 4b64774b6d13ffa4f59dddf947a97d61bcfa2f2e Mon Sep 17 00:00:00 2001
+From: Jiri Kucera <sanczes@gmail.com>
+Date: Sun, 25 Jul 2021 11:35:54 +0200
+Subject: [PATCH] core: Support closefrom also for glibc.
+
+* src/posix-io.c (_gpgme_io_spawn): Use glibc's closefrom.
+--
+
+Since 2.34, glibc introduces closefrom (the implementation
+follows *BSD standard).
+
+Signed-off-by: Werner Koch <wk@gnupg.org>
+---
+ src/posix-io.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/posix-io.c b/src/posix-io.c
+index e712ef28..2a3a81fc 100644
+--- a/src/posix-io.c
++++ b/src/posix-io.c
+@@ -570,7 +570,7 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags,
+               if (fd_list[i].fd > fd)
+                 fd = fd_list[i].fd;
+             fd++;
+-#if defined(__sun) || defined(__FreeBSD__)
++#if defined(__sun) || defined(__FreeBSD__) || defined(__GLIBC__)
+             closefrom (fd);
+             max_fds = fd;
+ #else /*!__sun */
+-- 
+2.11.0
+
diff --git a/gpgme/python310.patch b/gpgme/python310.patch
new file mode 100644
index 000000000..b8e0923bd
--- /dev/null
+++ b/gpgme/python310.patch
@@ -0,0 +1,332 @@
+diff -upr gpgme-1.16.0.orig/configure gpgme-1.16.0/configure
+--- gpgme-1.16.0.orig/configure	2021-06-24 20:10:50.000000000 +0300
++++ gpgme-1.16.0/configure	2021-12-01 00:12:24.383952330 +0200
+@@ -19625,7 +19625,7 @@ $as_echo_n "checking for $am_display_PYT
+ if ${am_cv_python_version+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
++  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
+ $as_echo "$am_cv_python_version" >&6; }
+@@ -19666,7 +19666,7 @@ else:
+ # <https://github.com/pypa/virtualenv/issues/118>
+ try:
+     from platform import python_implementation
+-    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
++    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
+         can_use_sysconfig = 0
+ except ImportError:
+     pass"
+@@ -19875,7 +19875,7 @@ variable to configure. See \`\`configure
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
+ $as_echo_n "checking for the distutils Python package... " >&6; }
+ 	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+-	if test -z "$ac_distutils_result"; then
++	if test $? -eq 0; then
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	else
+@@ -19933,7 +19933,7 @@ EOD`
+ 				ac_python_version=$PYTHON_VERSION
+ 			else
+ 				ac_python_version=`$PYTHON -c "import sys; \
+-					print (sys.version[:3])"`
++					print (sys.version[:4])"`
+ 			fi
+ 		fi
+ 
+@@ -20255,7 +20255,7 @@ $as_echo_n "checking for $am_display_PYT
+ if ${am_cv_python_version+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
++  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
+ $as_echo "$am_cv_python_version" >&6; }
+@@ -20296,7 +20296,7 @@ else:
+ # <https://github.com/pypa/virtualenv/issues/118>
+ try:
+     from platform import python_implementation
+-    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
++    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
+         can_use_sysconfig = 0
+ except ImportError:
+     pass"
+@@ -20505,7 +20505,7 @@ variable to configure. See \`\`configure
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
+ $as_echo_n "checking for the distutils Python package... " >&6; }
+ 	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+-	if test -z "$ac_distutils_result"; then
++	if test $? -eq 0; then
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	else
+@@ -20563,7 +20563,7 @@ EOD`
+ 				ac_python_version=$PYTHON_VERSION
+ 			else
+ 				ac_python_version=`$PYTHON -c "import sys; \
+-					print (sys.version[:3])"`
++					print (sys.version[:4])"`
+ 			fi
+ 		fi
+ 
+@@ -20885,7 +20885,7 @@ $as_echo_n "checking for $am_display_PYT
+ if ${am_cv_python_version+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
++  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
+ $as_echo "$am_cv_python_version" >&6; }
+@@ -20926,7 +20926,7 @@ else:
+ # <https://github.com/pypa/virtualenv/issues/118>
+ try:
+     from platform import python_implementation
+-    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
++    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
+         can_use_sysconfig = 0
+ except ImportError:
+     pass"
+@@ -21135,7 +21135,7 @@ variable to configure. See \`\`configure
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
+ $as_echo_n "checking for the distutils Python package... " >&6; }
+ 	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+-	if test -z "$ac_distutils_result"; then
++	if test $? -eq 0; then
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	else
+@@ -21193,7 +21193,7 @@ EOD`
+ 				ac_python_version=$PYTHON_VERSION
+ 			else
+ 				ac_python_version=`$PYTHON -c "import sys; \
+-					print (sys.version[:3])"`
++					print (sys.version[:4])"`
+ 			fi
+ 		fi
+ 
+@@ -21515,7 +21515,7 @@ $as_echo_n "checking for $am_display_PYT
+ if ${am_cv_python_version+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
++  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
+ $as_echo "$am_cv_python_version" >&6; }
+@@ -21556,7 +21556,7 @@ else:
+ # <https://github.com/pypa/virtualenv/issues/118>
+ try:
+     from platform import python_implementation
+-    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
++    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
+         can_use_sysconfig = 0
+ except ImportError:
+     pass"
+@@ -21765,7 +21765,7 @@ variable to configure. See \`\`configure
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
+ $as_echo_n "checking for the distutils Python package... " >&6; }
+ 	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+-	if test -z "$ac_distutils_result"; then
++	if test $? -eq 0; then
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	else
+@@ -21823,7 +21823,7 @@ EOD`
+ 				ac_python_version=$PYTHON_VERSION
+ 			else
+ 				ac_python_version=`$PYTHON -c "import sys; \
+-					print (sys.version[:3])"`
++					print (sys.version[:4])"`
+ 			fi
+ 		fi
+ 
+@@ -22145,7 +22145,7 @@ $as_echo_n "checking for $am_display_PYT
+ if ${am_cv_python_version+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
++  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
+ $as_echo "$am_cv_python_version" >&6; }
+@@ -22186,7 +22186,7 @@ else:
+ # <https://github.com/pypa/virtualenv/issues/118>
+ try:
+     from platform import python_implementation
+-    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
++    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
+         can_use_sysconfig = 0
+ except ImportError:
+     pass"
+@@ -22395,7 +22395,7 @@ variable to configure. See \`\`configure
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
+ $as_echo_n "checking for the distutils Python package... " >&6; }
+ 	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+-	if test -z "$ac_distutils_result"; then
++	if test $? -eq 0; then
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	else
+@@ -22453,7 +22453,7 @@ EOD`
+ 				ac_python_version=$PYTHON_VERSION
+ 			else
+ 				ac_python_version=`$PYTHON -c "import sys; \
+-					print (sys.version[:3])"`
++					print (sys.version[:4])"`
+ 			fi
+ 		fi
+ 
+@@ -22775,7 +22775,7 @@ $as_echo_n "checking for $am_display_PYT
+ if ${am_cv_python_version+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
++  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
+ $as_echo "$am_cv_python_version" >&6; }
+@@ -22816,7 +22816,7 @@ else:
+ # <https://github.com/pypa/virtualenv/issues/118>
+ try:
+     from platform import python_implementation
+-    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
++    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
+         can_use_sysconfig = 0
+ except ImportError:
+     pass"
+@@ -23025,7 +23025,7 @@ variable to configure. See \`\`configure
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
+ $as_echo_n "checking for the distutils Python package... " >&6; }
+ 	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+-	if test -z "$ac_distutils_result"; then
++	if test $? -eq 0; then
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	else
+@@ -23083,7 +23083,7 @@ EOD`
+ 				ac_python_version=$PYTHON_VERSION
+ 			else
+ 				ac_python_version=`$PYTHON -c "import sys; \
+-					print (sys.version[:3])"`
++					print (sys.version[:4])"`
+ 			fi
+ 		fi
+ 
+@@ -23291,13 +23291,13 @@ $as_echo "$as_me: WARNING:
+ 
+         if test -n "$PYTHON"; then
+       # If the user set $PYTHON, use it and don't search something else.
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.9" >&5
+-$as_echo_n "checking whether $PYTHON version is >= 3.9... " >&6; }
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.10" >&5
++$as_echo_n "checking whether $PYTHON version is >= 3.10... " >&6; }
+       prog="import sys
+ # split strings by '.' and convert to numeric.  Append some zeros
+ # because we need at least 4 digits for the hex conversion.
+ # map returns an iterator in Python 3.0 and a list in 2.x
+-minver = list(map(int, '3.9'.split('.'))) + [0, 0, 0]
++minver = list(map(int, '3.10'.split('.'))) + [0, 0, 0]
+ minverhex = 0
+ # xrange is not present in Python 3.0 and range returns an iterator
+ for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
+@@ -23318,19 +23318,19 @@ fi
+     else
+       # Otherwise, try each interpreter until we find one that satisfies
+       # VERSION.
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.9" >&5
+-$as_echo_n "checking for a Python interpreter with version >= 3.9... " >&6; }
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.10" >&5
++$as_echo_n "checking for a Python interpreter with version >= 3.10... " >&6; }
+ if ${am_cv_pathless_PYTHON+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+-	for am_cv_pathless_PYTHON           in python3.9 none; do
++	for am_cv_pathless_PYTHON           in python3.10 none; do
+ 	  test "$am_cv_pathless_PYTHON" = none && break
+ 	  prog="import sys
+ # split strings by '.' and convert to numeric.  Append some zeros
+ # because we need at least 4 digits for the hex conversion.
+ # map returns an iterator in Python 3.0 and a list in 2.x
+-minver = list(map(int, '3.9'.split('.'))) + [0, 0, 0]
++minver = list(map(int, '3.10'.split('.'))) + [0, 0, 0]
+ minverhex = 0
+ # xrange is not present in Python 3.0 and range returns an iterator
+ for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
+@@ -23405,7 +23405,7 @@ $as_echo_n "checking for $am_display_PYT
+ if ${am_cv_python_version+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
++  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
+ $as_echo "$am_cv_python_version" >&6; }
+@@ -23446,7 +23446,7 @@ else:
+ # <https://github.com/pypa/virtualenv/issues/118>
+ try:
+     from platform import python_implementation
+-    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
++    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
+         can_use_sysconfig = 0
+ except ImportError:
+     pass"
+@@ -23655,7 +23655,7 @@ variable to configure. See \`\`configure
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
+ $as_echo_n "checking for the distutils Python package... " >&6; }
+ 	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+-	if test -z "$ac_distutils_result"; then
++	if test $? -eq 0; then
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	else
+@@ -23713,7 +23713,7 @@ EOD`
+ 				ac_python_version=$PYTHON_VERSION
+ 			else
+ 				ac_python_version=`$PYTHON -c "import sys; \
+-					print (sys.version[:3])"`
++					print (sys.version[:4])"`
+ 			fi
+ 		fi
+ 
+@@ -24035,7 +24035,7 @@ $as_echo_n "checking for $am_display_PYT
+ if ${am_cv_python_version+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
++  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
+ $as_echo "$am_cv_python_version" >&6; }
+@@ -24076,7 +24076,7 @@ else:
+ # <https://github.com/pypa/virtualenv/issues/118>
+ try:
+     from platform import python_implementation
+-    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
++    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
+         can_use_sysconfig = 0
+ except ImportError:
+     pass"
+@@ -24285,7 +24285,7 @@ variable to configure. See \`\`configure
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
+ $as_echo_n "checking for the distutils Python package... " >&6; }
+ 	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+-	if test -z "$ac_distutils_result"; then
++	if test $? -eq 0; then
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	else
+@@ -24343,7 +24343,7 @@ EOD`
+ 				ac_python_version=$PYTHON_VERSION
+ 			else
+ 				ac_python_version=`$PYTHON -c "import sys; \
+-					print (sys.version[:3])"`
++					print (sys.version[:4])"`
+ 			fi
+ 		fi
+