From 19ba67f033b1ef9afbe87c7508126b56be8341ae Mon Sep 17 00:00:00 2001 From: chendongqi Date: Wed, 20 Nov 2019 17:41:38 +0800 Subject: [PATCH] CentOS 8: Upgrade tpm2-tools to version 3.1.1 (1)Release Version Upgrade (2)Matching code changes with el7 to el8 Story: 2006729 Task: 37666 Depends-On: https://review.opendev.org/#/c/696481/ Depends-On: https://review.opendev.org/#/c/696050/ Change-Id: I397bb3127579d2402175391be6eb2cbb3de28c17 Signed-off-by: Dongqi Chen --- security/tpm2-tools/PKG-INFO | 2 +- security/tpm2-tools/centos/build_srpm.data | 2 +- ...01-Update-package-versioning-for-TIS-format.patch | 12 ++++++------ .../meta_patches/disable-socket-mode-TCTI.patch | 9 +++++---- security/tpm2-tools/centos/srpm_path | 2 +- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/security/tpm2-tools/PKG-INFO b/security/tpm2-tools/PKG-INFO index db0aa9d08..73a919681 100644 --- a/security/tpm2-tools/PKG-INFO +++ b/security/tpm2-tools/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: tpm2-tools -Version: 3.0.1 +Version: 3.1.1 Summary: A TPM2.0 testing tool build upon TPM2.0-TSS Home-page: Author: diff --git a/security/tpm2-tools/centos/build_srpm.data b/security/tpm2-tools/centos/build_srpm.data index 13364eb8b..1642fd95b 100644 --- a/security/tpm2-tools/centos/build_srpm.data +++ b/security/tpm2-tools/centos/build_srpm.data @@ -1,2 +1,2 @@ #COPY_LIST="tpm2-tools/*" -TIS_PATCH_VER=0 +TIS_PATCH_VER=1 diff --git a/security/tpm2-tools/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/security/tpm2-tools/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index b8f1f68ac..43e961407 100644 --- a/security/tpm2-tools/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/security/tpm2-tools/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -1,9 +1,9 @@ From 63375de22771a9384eb9c4a90abc8ee2143a7721 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Mon, 2 Oct 2017 17:30:57 -0400 -Subject: [PATCH] WRS: 0001-Update-package-versioning-for-TIS-format.patch - +Subject: [PATCH] 0001-Update-package-versioning-for-TIS-format.patch +Signed-off-by: Dongqi Chen --- SPECS/tpm2-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -14,12 +14,12 @@ index 935580d..12aa6a0 100644 +++ b/SPECS/tpm2-tools.spec @@ -1,6 +1,6 @@ Name: tpm2-tools - Version: 3.0.4 --Release: 2%{?dist} -+Release: 2.el7%{?_tis_dist}.%{tis_patch_ver} + Version: 3.1.1 +-Release: 4%{?dist} ++Release: 4.el8%{?_tis_dist}.%{tis_patch_ver} Summary: A TPM2.0 testing tool build upon TPM2.0-TSS License: BSD -- -2.7.4 +1.8.3.1 diff --git a/security/tpm2-tools/centos/meta_patches/disable-socket-mode-TCTI.patch b/security/tpm2-tools/centos/meta_patches/disable-socket-mode-TCTI.patch index 26949b7fe..cf9d5d5f1 100644 --- a/security/tpm2-tools/centos/meta_patches/disable-socket-mode-TCTI.patch +++ b/security/tpm2-tools/centos/meta_patches/disable-socket-mode-TCTI.patch @@ -1,8 +1,9 @@ From e54d19f53dcd78d0aaceb30d1fb89eebefc1c066 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Mon, 2 Oct 2017 17:30:56 -0400 -Subject: [PATCH 1/2] WRS: disable-socket-mode-TCTI.patch +Subject: [PATCH 1/2] disable-socket-mode-TCTI.patch +Signed-off-by: Dongqi Chen --- SPECS/tpm2-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -11,8 +12,8 @@ diff --git a/SPECS/tpm2-tools.spec b/SPECS/tpm2-tools.spec index 308ecfa..935580d 100644 --- a/SPECS/tpm2-tools.spec +++ b/SPECS/tpm2-tools.spec -@@ -43,7 +43,7 @@ tpm2-tools is a batch of testing tools for tpm2.0. It is based on tpm2-tss. - ./bootstrap +@@ -35,7 +35,7 @@ tpm2-tools is a batch of testing tools for tpm2.0. It is based on tpm2-tss. + %autosetup -p1 -n %{name}-%{version} %build -%configure --prefix=/usr --disable-static --disable-silent-rules @@ -21,5 +22,5 @@ index 308ecfa..935580d 100644 %install -- -2.7.4 +1.8.3.1 diff --git a/security/tpm2-tools/centos/srpm_path b/security/tpm2-tools/centos/srpm_path index a145dab60..ecaf78e3f 100644 --- a/security/tpm2-tools/centos/srpm_path +++ b/security/tpm2-tools/centos/srpm_path @@ -1 +1 @@ -mirror:Source/tpm2-tools-3.0.4-2.el7.src.rpm +mirror:Source/tpm2-tools-3.1.1-4.el8.src.rpm