tpm2-tools: upgrade 4.1.1 -> 4.1.3

* License-Update: BSD -> BSD-3-Clause
* Add a patch to switch to python3 in test scripts

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>

3 files changed, 122 insertions, 17 deletions

diff --git a/meta-tpm2/recipes-tpm/tpm2-tools/files/0001-tests-switch-to-python3.patch b/meta-tpm2/recipes-tpm/tpm2-tools/files/0001-tests-switch-to-python3.patch
new file mode 100644
index 0000000..cf2a25d
--- /dev/null
+++ b/meta-tpm2/recipes-tpm/tpm2-tools/files/0001-tests-switch-to-python3.patch
@@ -0,0 +1,106 @@
+From 46280adf87a6f2b66a89c9445cc45f7595a09ea1 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <yi.zhao@windriver.com>
+Date: Wed, 22 Jul 2020 13:45:44 +0800
+Subject: [PATCH] tests: switch to python3
+
+The python2 is EOL and in some distributions (e.g. CentOS 8/RHEL 8),
+there is no python symbolic link by default.
+See: https://developers.redhat.com/blog/2018/11/14/python-in-rhel-8/
+
+Update the scripts to switch to python3.
+
+Upstream-Status: Pending
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ test/integration/helpers.sh                | 12 +++---------
+ test/integration/tests/activecredential.sh |  4 +---
+ test/integration/tests/getcap.sh           |  4 +---
+ test/integration/tests/print.sh            |  4 +---
+ 4 files changed, 6 insertions(+), 18 deletions(-)
+
+diff --git a/test/integration/helpers.sh b/test/integration/helpers.sh
+index 10dfc67..f6ee0e3 100644
+--- a/test/integration/helpers.sh
++++ b/test/integration/helpers.sh
+@@ -4,9 +4,7 @@ set -E
+ 
+ function filter_algs_by() {
+ 
+-python << pyscript
+-from __future__ import print_function
+-
++python3 << pyscript
+ import sys
+ import yaml
+ 
+@@ -71,9 +69,7 @@ hash_alg_supported() {
+ # as the first argument loads as a YAML file.
+ #
+ function yaml_verify() {
+-python << pyscript
+-from __future__ import print_function
+-
++python3 << pyscript
+ import sys
+ import yaml
+ 
+@@ -97,9 +93,7 @@ function yaml_get_kv() {
+         third_arg=$3
+     fi
+ 
+-python << pyscript
+-from __future__ import print_function
+-
++python3 << pyscript
+ import sys
+ import yaml
+ 
+diff --git a/test/integration/tests/activecredential.sh b/test/integration/tests/activecredential.sh
+index 8adf6c1..027a42f 100755
+--- a/test/integration/tests/activecredential.sh
++++ b/test/integration/tests/activecredential.sh
+@@ -28,9 +28,7 @@ tpm2_createak -C 0x81010009 -c ak.ctx -G rsa -g sha256 -s rsassa -u ak.pub \
+ -n ak.name -p akpass> ak.out
+ 
+ # Capture the yaml output and verify that its the same as the name output
+-loaded_key_name_yaml=`python << pyscript
+-from __future__ import print_function
+-
++loaded_key_name_yaml=`python3 << pyscript
+ import yaml
+ 
+ with open('ak.out', 'r') as f:
+diff --git a/test/integration/tests/getcap.sh b/test/integration/tests/getcap.sh
+index 92726a9..cde38ab 100755
+--- a/test/integration/tests/getcap.sh
++++ b/test/integration/tests/getcap.sh
+@@ -15,9 +15,7 @@ trap cleanup EXIT
+ 
+ function yaml_to_list() {
+ 
+-python << pyscript
+-from __future__ import print_function
+-
++python3 << pyscript
+ import sys
+ import yaml
+ 
+diff --git a/test/integration/tests/print.sh b/test/integration/tests/print.sh
+index 44ec1f1..d7c2e93 100755
+--- a/test/integration/tests/print.sh
++++ b/test/integration/tests/print.sh
+@@ -41,9 +41,7 @@ tpm2_quote -Q -c $ak_ctx -l "sha256:0,2,4,9,10,11,12,17" -q "0f8beb45ac" \
+ tpm2_print -t TPMS_ATTEST $quote_file > $print_file
+ 
+ # Check printed yaml
+-python << pyscript
+-from __future__ import print_function
+-
++python3 << pyscript
+ import sys
+ import re
+ import yaml
+-- 
+2.17.1
+
diff --git a/meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools_4.1.1.bb b/meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools_4.1.1.bb
deleted file mode 100644
index e90dcfe..0000000
--- a/meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools_4.1.1.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SUMMARY = "Tools for TPM2."
-DESCRIPTION = "tpm2-tools"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=0eb1216e46938bd723098d93a23c3bcc"
-SECTION = "tpm"
-
-DEPENDS = "tpm2-abrmd tpm2-tss openssl curl autoconf-archive"
-
-SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "701ae9e8c8cbdd37d89c8ad774f55395"
-SRC_URI[sha256sum] = "40b9263d8b949bd2bc03a3cd60fa242e27116727467f9bbdd0b5f2539a25a7b1"
-SRC_URI[sha1sum] = "d097d321237983435f05c974533ad90e6f20acef"
-SRC_URI[sha384sum] = "396547f400e4f5626d7741d77ec543f312d94e6697899f4c36260d15fab3f4f971ad2c0487e6eaa2d60256f3cf68f85f"
-SRC_URI[sha512sum] = "25952cf947f0acd16b1a8dbd3ac8573bce85ff970a7e24c290c4f9cd29418e77a3e48ac82c932fbd250887a9303ab301ff92db594c2fffaba47b873382444d26"
-
-inherit autotools pkgconfig bash-completion
diff --git a/meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools_4.1.3.bb b/meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools_4.1.3.bb
new file mode 100644
index 0000000..8748a47
--- /dev/null
+++ b/meta-tpm2/recipes-tpm/tpm2-tools/tpm2-tools_4.1.3.bb
@@ -0,0 +1,16 @@
+SUMMARY = "Tools for TPM2."
+DESCRIPTION = "tpm2-tools"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=0eb1216e46938bd723098d93a23c3bcc"
+SECTION = "tpm"
+
+DEPENDS = "tpm2-abrmd tpm2-tss openssl curl autoconf-archive"
+
+SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz \
+           file://0001-tests-switch-to-python3.patch \
+          "
+
+SRC_URI[md5sum] = "48e0f58232b6a86fe4d007acf12af283"
+SRC_URI[sha256sum] = "bb5d3310620e75468fe33dbd530bd73dd648c70ec707b4579c74d9f63fc82704"
+
+inherit autotools pkgconfig bash-completion