Re: [ptxdist] [PATCH] tpm2-tools: Version bump. 4.1 -> 5.2

[Christian Melki <christian.melki@t2data.com>]

On 1/28/22 10:31 AM, Michael Olbrich wrote:
> On Thu, Jan 27, 2022 at 04:54:31PM +0100, Bruno Thomsen wrote:
>> Hi
>>
>> Den tor. 27. jan. 2022 kl. 15.36 skrev Christian Melki
>> <christian.melki@t2data.com>:
>>>
>>> Approx 2 years worth of fixes.
>>> https://github.com/tpm2-software/tpm2-tools/releases
>>>
>>> Fixes CVE-2021-3565.
>>> Update license file hash.
>>> tpm2-tools now depend on EFIVAR.
>>>
>>> Signed-off-by: Christian Melki <christian.melki@t2data.com>
>>> ---
>>>   rules/tpm2-tools.in   | 1 +
>>>   rules/tpm2-tools.make | 5 ++---
>>>   2 files changed, 3 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/rules/tpm2-tools.in b/rules/tpm2-tools.in
>>> index 4c9cbaa92..99482845b 100644
>>> --- a/rules/tpm2-tools.in
>>> +++ b/rules/tpm2-tools.in
>>> @@ -5,6 +5,7 @@ config TPM2_TOOLS
>>>          select TPM2_TSS
>>>          select OPENSSL
>>>          select LIBCURL
>>> +       select EFIVAR
> 
> It's optional and TPMs are used on !EFI platforms, so please add an option
> for this.
>

Hmm. There is a bit of a pitfall here.
tpm2-tools seems to detect the efivar header and library a bit separately.
So if someone installs efivar on dependency and does not select adding 
efivar it will find the headers but ptxdist will block the pkgconfig.
Which will result in a failed build.

There is no "add this if someone else selected the dependency already" ? :)

>>>          prompt "tpm2-tools"
>>>          help
>>>            This package contains a set of tools to use with TPM 2.0
>>> diff --git a/rules/tpm2-tools.make b/rules/tpm2-tools.make
>>> index ead881ffb..16cedff74 100644
>>> --- a/rules/tpm2-tools.make
>>> +++ b/rules/tpm2-tools.make
>>> @@ -14,15 +14,14 @@ PACKAGES-$(PTXCONF_TPM2_TOOLS) += tpm2-tools
>>>   #
>>>   # Paths and names
>>>   #
>>> -TPM2_TOOLS_VERSION             := 4.1
>>> -TPM2_TOOLS_MD5                 := aecec22668233776922909f2ebf55e65
>>> +TPM2_TOOLS_VERSION             := 5.2
>>> +TPM2_TOOLS_MD5                 := 0057615ef43b9322d4577fc3bde0e8d6
>>>   TPM2_TOOLS                     := tpm2-tools-$(TPM2_TOOLS_VERSION)
>>>   TPM2_TOOLS_SUFFIX              := tar.gz
>>>   TPM2_TOOLS_URL                 := https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION)/$(TPM2_TOOLS).$(TPM2_TOOLS_SUFFIX)
>>>   TPM2_TOOLS_SOURCE              := $(SRCDIR)/$(TPM2_TOOLS).$(TPM2_TOOLS_SUFFIX)
>>>   TPM2_TOOLS_DIR                 := $(BUILDDIR)/$(TPM2_TOOLS)
>>>   TPM2_TOOLS_LICENSE             := BSD-3-Clause
>>> -TPM2_TOOLS_LICENSE_FILES       := file://LICENSE;md5=0eb1216e46938bd723098d93a23c3bcc
>>
>> You forgot to add the new license file hash as stated in the commit message.
> 
> Indeed. Please add it again.
> 
> Michael
> 
> 

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de