|
 |
ad10f4 |
diff -Naur tpm2-pkcs11-1.3.2/ea5f1c078aff7fb09fb5fc78403d4f8c868c4ea6.patch tpm2-pkcs11-1.3.2a/ea5f1c078aff7fb09fb5fc78403d4f8c868c4ea6.patch
|
|
|
ad10f4 |
--- tpm2-pkcs11-1.3.2/ea5f1c078aff7fb09fb5fc78403d4f8c868c4ea6.patch 1969-12-31 16:00:00.000000000 -0800
|
|
|
ad10f4 |
+++ tpm2-pkcs11-1.3.2a/ea5f1c078aff7fb09fb5fc78403d4f8c868c4ea6.patch 2021-03-23 15:26:46.043878215 -0700
|
|
|
ad10f4 |
@@ -0,0 +1,43 @@
|
|
|
ad10f4 |
+From ea5f1c078aff7fb09fb5fc78403d4f8c868c4ea6 Mon Sep 17 00:00:00 2001
|
|
|
ad10f4 |
+From: William Roberts <william.c.roberts@intel.com>
|
|
|
ad10f4 |
+Date: Mon, 30 Dec 2019 14:10:14 -0600
|
|
|
ad10f4 |
+Subject: [PATCH] tpm2_ptool: require python3.7 for db upgrade
|
|
|
ad10f4 |
+
|
|
|
ad10f4 |
+SQLite3 bindings for python don't have the backup API implemented until
|
|
|
ad10f4 |
+Python 3.7. Make this the new minimum requirement for tpm2_ptool so
|
|
|
ad10f4 |
+we can use this feature.
|
|
|
ad10f4 |
+
|
|
|
ad10f4 |
+Signed-off-by: William Roberts <william.c.roberts@intel.com>
|
|
|
ad10f4 |
+---
|
|
|
ad10f4 |
+ tools/setup.py | 1 +
|
|
|
ad10f4 |
+ tools/tpm2_pkcs11/__init__.py | 6 +++---
|
|
|
ad10f4 |
+ 2 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
ad10f4 |
+
|
|
|
ad10f4 |
+diff --git a/tools/setup.py b/tools/setup.py
|
|
|
ad10f4 |
+index 494f9edd..4490dc61 100644
|
|
|
ad10f4 |
+--- a/tools/setup.py
|
|
|
ad10f4 |
++++ b/tools/setup.py
|
|
|
ad10f4 |
+@@ -9,6 +9,7 @@
|
|
|
ad10f4 |
+
|
|
|
ad10f4 |
+ setup(
|
|
|
ad10f4 |
+ name='tpm2-pkcs11-tools',
|
|
|
ad10f4 |
++ python_requires='>=3.7',
|
|
|
ad10f4 |
+ long_description=long_description,
|
|
|
ad10f4 |
+ long_description_content_type='text/markdown',
|
|
|
ad10f4 |
+ version='1.33.7',
|
|
|
ad10f4 |
+diff --git a/tools/tpm2_pkcs11/__init__.py b/tools/tpm2_pkcs11/__init__.py
|
|
|
ad10f4 |
+index ed83ef52..1ed8b3af 100644
|
|
|
ad10f4 |
+--- a/tools/tpm2_pkcs11/__init__.py
|
|
|
ad10f4 |
++++ b/tools/tpm2_pkcs11/__init__.py
|
|
|
ad10f4 |
+@@ -2,6 +2,6 @@
|
|
|
ad10f4 |
+
|
|
|
ad10f4 |
+ import sys
|
|
|
ad10f4 |
+
|
|
|
ad10f4 |
+-# Sunset python < 3 support
|
|
|
ad10f4 |
+-if sys.version_info[0] < 3:
|
|
|
ad10f4 |
+- sys.exit("Python 3 or a more recent version is required.")
|
|
|
ad10f4 |
+\ No newline at end of file
|
|
|
ad10f4 |
++# Requires python 3.7 or greater
|
|
|
ad10f4 |
++if (sys.version_info[0], sys.version_info[1]) < (3, 7):
|
|
|
ad10f4 |
++ sys.exit("Python 3.7 or a more recent version is required.")
|
|
|
ad10f4 |
+\ No newline at end of file
|
|
|
ad10f4 |
diff -Naur tpm2-pkcs11-1.3.2/tools/setup.py tpm2-pkcs11-1.3.2a/tools/setup.py
|
|
|
ad10f4 |
--- tpm2-pkcs11-1.3.2/tools/setup.py 2020-08-10 07:31:22.000000000 -0700
|
|
|
ad10f4 |
+++ tpm2-pkcs11-1.3.2a/tools/setup.py 2021-03-23 15:27:01.160008742 -0700
|
|
|
ad10f4 |
@@ -9,7 +9,6 @@
|
|
|
ad10f4 |
|
|
|
ad10f4 |
setup(
|
|
|
ad10f4 |
name='tpm2-pkcs11-tools',
|
|
|
ad10f4 |
- python_requires='>=3.7',
|
|
|
ad10f4 |
long_description=long_description,
|
|
|
ad10f4 |
long_description_content_type='text/markdown',
|
|
|
ad10f4 |
version='1.33.7',
|
|
|
ad10f4 |
diff -Naur tpm2-pkcs11-1.3.2/tools/tpm2_pkcs11/__init__.py tpm2-pkcs11-1.3.2a/tools/tpm2_pkcs11/__init__.py
|
|
|
ad10f4 |
--- tpm2-pkcs11-1.3.2/tools/tpm2_pkcs11/__init__.py 2020-08-09 06:46:13.000000000 -0700
|
|
|
ad10f4 |
+++ tpm2-pkcs11-1.3.2a/tools/tpm2_pkcs11/__init__.py 2021-03-23 15:27:01.161008751 -0700
|
|
|
ad10f4 |
@@ -2,6 +2,6 @@
|
|
|
ad10f4 |
|
|
|
ad10f4 |
import sys
|
|
|
ad10f4 |
|
|
|
ad10f4 |
-# Requires python 3.7 or greater
|
|
|
ad10f4 |
-if (sys.version_info[0], sys.version_info[1]) < (3, 7):
|
|
|
ad10f4 |
- sys.exit("Python 3.7 or a more recent version is required.")
|
|
|
ad10f4 |
\ No newline at end of file
|
|
|
ad10f4 |
+# Sunset python < 3 support
|
|
|
ad10f4 |
+if sys.version_info[0] < 3:
|
|
|
ad10f4 |
+ sys.exit("Python 3 or a more recent version is required.")
|
|
|
ad10f4 |
\ No newline at end of file
|
|
|
ad10f4 |
|