From 9476528006c06ad94210dcd8051d8539df5fa17d Mon Sep 17 00:00:00 2001 From: Sun Austin Date: Thu, 27 Sep 2018 13:35:41 +0800 Subject: [PATCH] de-fuzz tpm2-tools patches Problem: - Centos 7.5 upgraded tpm2-toolss. - Porting of tpm2-toolss patches did not resolve and 'fuzz' in the line numbers of the patches. - If tpm2-tools is built by rpm 4.11, or default version of rpm until 4.14 is compiled, a fuzzy patch results in the creating of an .orig file. - Packaging of tpm2-toolss failes due to the unexpected, and unpackaged .orig file Solution: Safest solution is to de-fuzz our tpm2-toolss patches. Story: 2003389 Task: 26755 Change-Id: I8dd8d71e2bdcd75ec6786af6bf162f3deae046a2 Signed-off-by: Sun Austin --- .../centos/meta_patches/disable-socket-mode-TCTI.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 3b5be5a34..2decd2d67 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 @@ -8,10 +8,10 @@ Subject: [PATCH 1/2] WRS: disable-socket-mode-TCTI.patch 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/tpm2-tools.spec b/SPECS/tpm2-tools.spec -index 715d2a9..c858d6f 100644 +index 308ecfa..935580d 100644 --- a/SPECS/tpm2-tools.spec +++ b/SPECS/tpm2-tools.spec -@@ -54,7 +54,7 @@ tpm2-tools is a batch of testing tools for tpm2.0. It is based on tpm2-tss. +@@ -46,7 +46,7 @@ tpm2-tools is a batch of testing tools for tpm2.0. It is based on tpm2-tss. ./bootstrap %build @@ -21,5 +21,5 @@ index 715d2a9..c858d6f 100644 %install -- -1.9.1 +2.7.4