From 8e351f68e40e85dc0250d841fba6156bec34e756 Mon Sep 17 00:00:00 2001
From: "Martin, Chen" <haochuan.z.chen@intel.com>
Date: Tue, 15 Jan 2019 06:49:18 +0800
Subject: [PATCH] rebase tpm2-tools patch to CentOS 7.6 version

Test:
Pass build and simplex deploy test

Depends-On: https://review.openstack.org/630593/

Story: 2004522
Task: 28440

Change-Id: If0b02774c5d133122599a003b616672a6114d700
Signed-off-by: Martin, Chen <haochuan.z.chen@intel.com>
---
 security/tpm2-tools/centos/build_srpm.data    |  2 +-
 ...te-package-versioning-for-TIS-format.patch | 22 +++++--------------
 .../disable-socket-mode-TCTI.patch            |  2 +-
 security/tpm2-tools/centos/srpm_path          |  2 +-
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/security/tpm2-tools/centos/build_srpm.data b/security/tpm2-tools/centos/build_srpm.data
index ece53b3fc..13364eb8b 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=2
+TIS_PATCH_VER=0
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 6cc12c328..b8f1f68ac 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
@@ -3,11 +3,10 @@ From: Scott Little <scott.little@windriver.com>
 Date: Mon, 2 Oct 2017 17:30:57 -0400
 Subject: [PATCH] WRS: 0001-Update-package-versioning-for-TIS-format.patch
 
-Conflicts:
-	SPECS/tpm2-tools.spec
+
 ---
- SPECS/tpm2-tools.spec | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ SPECS/tpm2-tools.spec | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/SPECS/tpm2-tools.spec b/SPECS/tpm2-tools.spec
 index 935580d..12aa6a0 100644
@@ -15,21 +14,12 @@ index 935580d..12aa6a0 100644
 +++ b/SPECS/tpm2-tools.spec
 @@ -1,6 +1,6 @@
  Name: tpm2-tools
- Version: 3.0.1
--Release: 1%{?dist}
-+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
+ Version: 3.0.4
+-Release: 2%{?dist}
++Release: 2.el7%{?_tis_dist}.%{tis_patch_ver}
  Summary: A TPM2.0 testing tool build upon TPM2.0-TSS
  
  License: BSD
-@@ -33,7 +33,7 @@ BuildRequires: pkgconfig(tcti-tabrmd)
- ExclusiveArch: %{ix86} x86_64
- 
- # tpm2-tools is heavily depending on TPM2.0-TSS project, matched tss is required
--Requires: tpm2-tss%{?_isa} >= 1.3.0-1%{?dist}
-+Requires: tpm2-tss%{?_isa} = 1.3.0-2.el7
- 
- # tpm2-tools project changed the install path for binaries and man page section
- Obsoletes: tpm2-tools <= 2.1.0-2
 -- 
 2.7.4
 
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 2decd2d67..26949b7fe 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
@@ -11,7 +11,7 @@ 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
-@@ -46,7 +46,7 @@ tpm2-tools is a batch of testing tools for tpm2.0. It is based on tpm2-tss.
+@@ -43,7 +43,7 @@ tpm2-tools is a batch of testing tools for tpm2.0. It is based on tpm2-tss.
  ./bootstrap
  
  %build
diff --git a/security/tpm2-tools/centos/srpm_path b/security/tpm2-tools/centos/srpm_path
index 506bd9824..a145dab60 100644
--- a/security/tpm2-tools/centos/srpm_path
+++ b/security/tpm2-tools/centos/srpm_path
@@ -1 +1 @@
-mirror:Source/tpm2-tools-3.0.1-1.el7.src.rpm
+mirror:Source/tpm2-tools-3.0.4-2.el7.src.rpm