diff mbox series

[meta-security] ibmswtpm2: update to 164-2020-192.1

Message ID 20230524200307.37451-1-geissonator@yahoo.com
State New
Headers show
Series [meta-security] ibmswtpm2: update to 164-2020-192.1 | expand

Commit Message

Andrew Geissler May 24, 2023, 8:03 p.m. UTC
This version supports openssl 3.1

The maintainer changed his tag versions hence the different looking
version.

The maintainer also has stopped releasing tar files and asked we
directly grab from git.

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
---
 ...ibmswtpm2_1682.bb => ibmswtpm2_164-2020-192.1.bb} | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
 rename meta-tpm/recipes-tpm2/ibmswtpm2/{ibmswtpm2_1682.bb => ibmswtpm2_164-2020-192.1.bb} (73%)

Comments

akuster808 May 24, 2023, 8:38 p.m. UTC | #1
On 5/24/23 4:03 PM, Andrew Geissler wrote:
> This version supports openssl 3.1
>
> The maintainer changed his tag versions hence the different looking
> version.
>
> The maintainer also has stopped releasing tar files and asked we
> directly grab from git.

Why did the License file change?

-armin
> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
> ---
>   ...ibmswtpm2_1682.bb => ibmswtpm2_164-2020-192.1.bb} | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
>   rename meta-tpm/recipes-tpm2/ibmswtpm2/{ibmswtpm2_1682.bb => ibmswtpm2_164-2020-192.1.bb} (73%)
>
> diff --git a/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1682.bb b/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_164-2020-192.1.bb
> similarity index 73%
> rename from meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1682.bb
> rename to meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_164-2020-192.1.bb
> index 85fc7e0..fbeb872 100644
> --- a/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1682.bb
> +++ b/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_164-2020-192.1.bb
> @@ -11,18 +11,18 @@ Advantages of this approach: \
>   HOMEPAGE = "http://ibmswtpm.sourceforge.net/ibmswtpm2.html"
>   LICENSE = "BSD-2-Clause"
>   SECTION = "securty/tpm"
> -LIC_FILES_CHKSUM = "file://../LICENSE;md5=1e023f61454ac828b4aa1bc4293f7d5f"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=c75e465155c42c14154bf6a2acb7347b"
>   
>   DEPENDS = "openssl"
>   
> -SRC_URI = "https://sourceforge.net/projects/ibmswtpm2/files/ibmtpm${PV}.tar.gz \
> +SRC_URI = "git://git.code.sf.net/p/ibmswtpm2/tpm2;protocol=https;branch=master \
>              file://tune-makefile.patch \
> -           "
> -SRC_URI[sha256sum] = "3cb642f871a17b23d50b046e5f95f449c2287415fc1e7aeb4bdbb8920dbcb38f"
> +           ""
> +SRCREV = "5452af422edeff70fcae8ea99dd28a0922051d7b"
>   
> -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/ibmswtpm2/files/"
> +UPSTREAM_CHECK_URI = "https://git.code.sf.net/p/ibmswtpm2/tpm2"
>   
> -S = "${WORKDIR}/src"
> +S = "${WORKDIR}/git/src"
>   
>   CFLAGS += "-Wno-error=maybe-uninitialized -DALG_CAMELLIA=ALG_NO"
>   
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#60115): https://lists.yoctoproject.org/g/yocto/message/60115
> Mute This Topic: https://lists.yoctoproject.org/mt/99116759/3616698
> Group Owner: yocto+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [akuster808@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Andrew Geissler May 24, 2023, 9:38 p.m. UTC | #2
> On May 24, 2023, at 4:38 PM, akuster808 <akuster808@gmail.com> wrote:
> 
> 
> 
> On 5/24/23 4:03 PM, Andrew Geissler wrote:
>> This version supports openssl 3.1
>> 
>> The maintainer changed his tag versions hence the different looking
>> version.
>> 
>> The maintainer also has stopped releasing tar files and asked we
>> directly grab from git.
> 
> Why did the License file change?

Good question. I think I got a bit turned around when I moved over to git. 

This repo has 2 LICENSE files:
  https://sourceforge.net/p/ibmswtpm2/tpm2/ci/master/tree/LICENSE
  https://sourceforge.net/p/ibmswtpm2/tpm2/ci/master/tree/src/LICENSE 

My commit moved to the base LICENSE file in the tree. The original recipe
pointed to the second LICENSE file under src/.

The original src/LICENSE appears to be a subset of the root LICENSE
but I can move the recipe back to the original src/LICENSE if that’s the
expected behavior here.

> 
> -armin
>> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
>> ---
>>  ...ibmswtpm2_1682.bb => ibmswtpm2_164-2020-192.1.bb} | 12 ++++++------
>>  1 file changed, 6 insertions(+), 6 deletions(-)
>>  rename meta-tpm/recipes-tpm2/ibmswtpm2/{ibmswtpm2_1682.bb => ibmswtpm2_164-2020-192.1.bb} (73%)
>> 
>> diff --git a/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1682.bb b/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_164-2020-192.1.bb
>> similarity index 73%
>> rename from meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1682.bb
>> rename to meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_164-2020-192.1.bb
>> index 85fc7e0..fbeb872 100644
>> --- a/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1682.bb
>> +++ b/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_164-2020-192.1.bb
>> @@ -11,18 +11,18 @@ Advantages of this approach: \
>>  HOMEPAGE = "http://ibmswtpm.sourceforge.net/ibmswtpm2.html"
>>  LICENSE = "BSD-2-Clause"
>>  SECTION = "securty/tpm"
>> -LIC_FILES_CHKSUM = "file://../LICENSE;md5=1e023f61454ac828b4aa1bc4293f7d5f"
>> +LIC_FILES_CHKSUM = "file://LICENSE;md5=c75e465155c42c14154bf6a2acb7347b"
>>    DEPENDS = "openssl"
>>  -SRC_URI = "https://sourceforge.net/projects/ibmswtpm2/files/ibmtpm${PV}.tar.gz \
>> +SRC_URI = "git://git.code.sf.net/p/ibmswtpm2/tpm2;protocol=https;branch=master \
>>             file://tune-makefile.patch \
>> -           "
>> -SRC_URI[sha256sum] = "3cb642f871a17b23d50b046e5f95f449c2287415fc1e7aeb4bdbb8920dbcb38f"
>> +           ""
>> +SRCREV = "5452af422edeff70fcae8ea99dd28a0922051d7b"
>>  -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/ibmswtpm2/files/"
>> +UPSTREAM_CHECK_URI = "https://git.code.sf.net/p/ibmswtpm2/tpm2"
>>  -S = "${WORKDIR}/src"
>> +S = "${WORKDIR}/git/src"
>>    CFLAGS += "-Wno-error=maybe-uninitialized -DALG_CAMELLIA=ALG_NO"
>>  
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#60115): https://lists.yoctoproject.org/g/yocto/message/60115
>> Mute This Topic: https://lists.yoctoproject.org/mt/99116759/3616698
>> Group Owner: yocto+owner@lists.yoctoproject.org
>> Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [akuster808@gmail.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
akuster808 May 25, 2023, 10:20 p.m. UTC | #3
On 5/24/23 5:38 PM, Andrew Geissler wrote:
>
>> On May 24, 2023, at 4:38 PM, akuster808 <akuster808@gmail.com> wrote:
>>
>>
>>
>> On 5/24/23 4:03 PM, Andrew Geissler wrote:
>>> This version supports openssl 3.1
>>>
>>> The maintainer changed his tag versions hence the different looking
>>> version.
>>>
>>> The maintainer also has stopped releasing tar files and asked we
>>> directly grab from git.
>> Why did the License file change?
> Good question. I think I got a bit turned around when I moved over to git.

Looking at their changes, it looks like they appended or subtracted 
spaces  to various lines in that License file. Nothing other than noise.

>
> This repo has 2 LICENSE files:
>    https://sourceforge.net/p/ibmswtpm2/tpm2/ci/master/tree/LICENSE
>    https://sourceforge.net/p/ibmswtpm2/tpm2/ci/master/tree/src/LICENSE

They look like to different licenses, one has IBM in it the other does not.

Maybe list both and their sha's should address that.

thanks,
Armin
>
> My commit moved to the base LICENSE file in the tree. The original recipe
> pointed to the second LICENSE file under src/.
>
> The original src/LICENSE appears to be a subset of the root LICENSE
> but I can move the recipe back to the original src/LICENSE if that’s the
> expected behavior here.
>
>> -armin
>>> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
>>> ---
>>>   ...ibmswtpm2_1682.bb => ibmswtpm2_164-2020-192.1.bb} | 12 ++++++------
>>>   1 file changed, 6 insertions(+), 6 deletions(-)
>>>   rename meta-tpm/recipes-tpm2/ibmswtpm2/{ibmswtpm2_1682.bb => ibmswtpm2_164-2020-192.1.bb} (73%)
>>>
>>> diff --git a/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1682.bb b/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_164-2020-192.1.bb
>>> similarity index 73%
>>> rename from meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1682.bb
>>> rename to meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_164-2020-192.1.bb
>>> index 85fc7e0..fbeb872 100644
>>> --- a/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1682.bb
>>> +++ b/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_164-2020-192.1.bb
>>> @@ -11,18 +11,18 @@ Advantages of this approach: \
>>>   HOMEPAGE = "http://ibmswtpm.sourceforge.net/ibmswtpm2.html"
>>>   LICENSE = "BSD-2-Clause"
>>>   SECTION = "securty/tpm"
>>> -LIC_FILES_CHKSUM = "file://../LICENSE;md5=1e023f61454ac828b4aa1bc4293f7d5f"
>>> +LIC_FILES_CHKSUM = "file://LICENSE;md5=c75e465155c42c14154bf6a2acb7347b"
>>>     DEPENDS = "openssl"
>>>   -SRC_URI = "https://sourceforge.net/projects/ibmswtpm2/files/ibmtpm${PV}.tar.gz \
>>> +SRC_URI = "git://git.code.sf.net/p/ibmswtpm2/tpm2;protocol=https;branch=master \
>>>              file://tune-makefile.patch \
>>> -           "
>>> -SRC_URI[sha256sum] = "3cb642f871a17b23d50b046e5f95f449c2287415fc1e7aeb4bdbb8920dbcb38f"
>>> +           ""
>>> +SRCREV = "5452af422edeff70fcae8ea99dd28a0922051d7b"
>>>   -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/ibmswtpm2/files/"
>>> +UPSTREAM_CHECK_URI = "https://git.code.sf.net/p/ibmswtpm2/tpm2"
>>>   -S = "${WORKDIR}/src"
>>> +S = "${WORKDIR}/git/src"
>>>     CFLAGS += "-Wno-error=maybe-uninitialized -DALG_CAMELLIA=ALG_NO"
>>>   
>>> -=-=-=-=-=-=-=-=-=-=-=-
>>> Links: You receive all messages sent to this group.
>>> View/Reply Online (#60115): https://lists.yoctoproject.org/g/yocto/message/60115
>>> Mute This Topic: https://lists.yoctoproject.org/mt/99116759/3616698
>>> Group Owner: yocto+owner@lists.yoctoproject.org
>>> Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [akuster808@gmail.com]
>>> -=-=-=-=-=-=-=-=-=-=-=-
Andrew Geissler May 30, 2023, 5:55 p.m. UTC | #4
> On May 25, 2023, at 6:20 PM, akuster808 <akuster808@gmail.com> wrote:
> 
> 
> 
> On 5/24/23 5:38 PM, Andrew Geissler wrote:
>> 
>>> On May 24, 2023, at 4:38 PM, akuster808 <akuster808@gmail.com> wrote:
>>> 
>>> 
>>> 
>>> On 5/24/23 4:03 PM, Andrew Geissler wrote:
>>>> This version supports openssl 3.1
>>>> 
>>>> The maintainer changed his tag versions hence the different looking
>>>> version.
>>>> 
>>>> The maintainer also has stopped releasing tar files and asked we
>>>> directly grab from git.
>>> Why did the License file change?
>> Good question. I think I got a bit turned around when I moved over to git.
> 
> Looking at their changes, it looks like they appended or subtracted spaces  to various lines in that License file. Nothing other than noise.
> 
>> 
>> This repo has 2 LICENSE files:
>>   https://sourceforge.net/p/ibmswtpm2/tpm2/ci/master/tree/LICENSE <https://sourceforge.net/p/ibmswtpm2/tpm2/ci/master/tree/LICENSE>
>>   https://sourceforge.net/p/ibmswtpm2/tpm2/ci/master/tree/src/LICENSE <https://sourceforge.net/p/ibmswtpm2/tpm2/ci/master/tree/src/LICENSE>
> 
> They look like to different licenses, one has IBM in it the other does not.
> 
> Maybe list both and their sha's should address that.

Sounds good, I’ll send a new patch to this thread.

> 
> thanks,
> Armin
Andrew Geissler May 30, 2023, 5:58 p.m. UTC | #5
This version supports openssl 3.1

The maintainer changed his tag versions hence the different looking
version.

The maintainer also has stopped releasing tar files and asked we
directly grab from git.

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
---
 .../{ibmswtpm2_1682.bb => ibmswtpm2_164-2020-192.1.bb}   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
 rename meta-tpm/recipes-tpm2/ibmswtpm2/{ibmswtpm2_1682.bb => ibmswtpm2_164-2020-192.1.bb} (78%)

diff --git a/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1682.bb b/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_164-2020-192.1.bb
similarity index 78%
rename from meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1682.bb
rename to meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_164-2020-192.1.bb
index 85fc7e0..7060a64 100644
--- a/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1682.bb
+++ b/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_164-2020-192.1.bb
@@ -12,17 +12,18 @@ HOMEPAGE = "http://ibmswtpm.sourceforge.net/ibmswtpm2.html"
 LICENSE = "BSD-2-Clause"
 SECTION = "securty/tpm"
 LIC_FILES_CHKSUM = "file://../LICENSE;md5=1e023f61454ac828b4aa1bc4293f7d5f"
+LIC_FILES_CHKSUM += "file://LICENSE;md5=c75e465155c42c14154bf6a2acb7347b"
 
 DEPENDS = "openssl"
 
-SRC_URI = "https://sourceforge.net/projects/ibmswtpm2/files/ibmtpm${PV}.tar.gz \
+SRC_URI = "git://git.code.sf.net/p/ibmswtpm2/tpm2;protocol=https;branch=master \
            file://tune-makefile.patch \
            "
-SRC_URI[sha256sum] = "3cb642f871a17b23d50b046e5f95f449c2287415fc1e7aeb4bdbb8920dbcb38f"
+SRCREV = "5452af422edeff70fcae8ea99dd28a0922051d7b"
 
-UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/ibmswtpm2/files/"
+UPSTREAM_CHECK_URI = "https://git.code.sf.net/p/ibmswtpm2/tpm2"
 
-S = "${WORKDIR}/src"
+S = "${WORKDIR}/git/src"
 
 CFLAGS += "-Wno-error=maybe-uninitialized -DALG_CAMELLIA=ALG_NO"
diff mbox series

Patch

diff --git a/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1682.bb b/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_164-2020-192.1.bb
similarity index 73%
rename from meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1682.bb
rename to meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_164-2020-192.1.bb
index 85fc7e0..fbeb872 100644
--- a/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1682.bb
+++ b/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_164-2020-192.1.bb
@@ -11,18 +11,18 @@  Advantages of this approach: \
 HOMEPAGE = "http://ibmswtpm.sourceforge.net/ibmswtpm2.html"
 LICENSE = "BSD-2-Clause"
 SECTION = "securty/tpm"
-LIC_FILES_CHKSUM = "file://../LICENSE;md5=1e023f61454ac828b4aa1bc4293f7d5f"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=c75e465155c42c14154bf6a2acb7347b"
 
 DEPENDS = "openssl"
 
-SRC_URI = "https://sourceforge.net/projects/ibmswtpm2/files/ibmtpm${PV}.tar.gz \
+SRC_URI = "git://git.code.sf.net/p/ibmswtpm2/tpm2;protocol=https;branch=master \
            file://tune-makefile.patch \
-           "
-SRC_URI[sha256sum] = "3cb642f871a17b23d50b046e5f95f449c2287415fc1e7aeb4bdbb8920dbcb38f"
+           ""
+SRCREV = "5452af422edeff70fcae8ea99dd28a0922051d7b"
 
-UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/ibmswtpm2/files/"
+UPSTREAM_CHECK_URI = "https://git.code.sf.net/p/ibmswtpm2/tpm2"
 
-S = "${WORKDIR}/src"
+S = "${WORKDIR}/git/src"
 
 CFLAGS += "-Wno-error=maybe-uninitialized -DALG_CAMELLIA=ALG_NO"