From e6d044d7f3a34d8c0640f059fd9b9f33a13efe3b Mon Sep 17 00:00:00 2001
From: Sergio Correia <scorreia@redhat.com>
Date: Wed, 24 Aug 2022 16:25:43 -0300
Subject: [PATCH] Updating for Keylime release v6.4.3

---
 .gitignore   |  1 +
 keylime.spec | 10 ++++++++--
 sources      |  2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index dcc89b6..d55016f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /v6.4.0.tar.gz
 /v6.4.1.tar.gz
 /v6.4.2.tar.gz
+/v6.4.3.tar.gz
diff --git a/keylime.spec b/keylime.spec
index 05f420d..2aa1470 100644
--- a/keylime.spec
+++ b/keylime.spec
@@ -5,7 +5,7 @@
 %global debug_package %{nil}
 
 Name:    keylime
-Version: 6.4.2
+Version: 6.4.3
 Release: %autorelease
 Summary: Open source TPM software for Bootstrapping and Maintaining Trust
 
@@ -57,7 +57,6 @@ Conflicts: keylime < 6.3.0-3
 Requires(pre): shadow-utils
 Requires: procps-ng
 Requires: tpm2-tss
-Requires: tpm2-tools
 
 %ifarch %efi
 Requires: efivar-libs
@@ -86,6 +85,9 @@ Requires: python3-packaging
 Requires: python3-requests
 Requires: python3-gpg
 Requires: python3-lark-parser
+Requires: python3-pyasn1
+Requires: python3-pyasn1-modules
+Requires: tpm2-tools
 
 %description -n python3-%{srcname}
 The python3-keylime module implements the functionality used
@@ -181,6 +183,10 @@ mkdir -p --mode=0700 %{buildroot}/%{_localstatedir}/log/%{srcname}
 
 # Setting up the agent to use keylime user/group.
 sed -e 's/^run_as.*/run_as = %{srcname}:%{srcname}/g' -i %{srcname}.conf
+
+# rhbz#2114485 - using sha256 for tpm_hash_alg.
+sed -e 's/^tpm_hash_alg[[:space:]]*=.*/tpm_hash_alg = sha256/g' -i %{srcname}.conf
+
 install -Dpm 600 %{srcname}.conf \
     %{buildroot}%{_sysconfdir}/%{srcname}.conf
 
diff --git a/sources b/sources
index e890003..ba018be 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v6.4.2.tar.gz) = 7bc365b17b719c03aad76796f63c103de06c7c8a0ac1e9741cd0be460110d4da9d44c2caebb5eb1390f577d3a082d4a3d6a565bdccb46bd5c9ec060dae2bc161
+SHA512 (v6.4.3.tar.gz) = fbc66d1b8677606bf382f03056b05edd6117dd5d845506365d96fd3ee8b5b291870ee672fe3cb17e9cc89b1acd29c99661a45826425e3bba45204f03f538c37f