diff mbox series

[meta-security] tpm2-tss: update to 4.2.0

Message ID 20261022085044.3244953-1-l.anderweit@phytec.de
State New
Headers show
Series [meta-security] tpm2-tss: update to 4.2.0 | expand

Commit Message

Leonard Anderweit Oct. 22, 2026, 8:50 a.m. UTC 
Update to version 4.2.0 and rebase the patch accordingly.
Also, remove the CVE_STATUS for CVE-2024-29040 because it is now
properly detected as fixed.

Signed-off-by: Leonard Anderweit <l.anderweit@phytec.de>
---
 .../tpm2-tss/tpm2-tss/fixup_hosttools.patch         | 13 +++++++------
 .../{tpm2-tss_4.1.3.bb => tpm2-tss_4.2.0.bb}        |  4 +---
 2 files changed, 8 insertions(+), 9 deletions(-)
 rename meta-tpm/recipes-tpm2/tpm2-tss/{tpm2-tss_4.1.3.bb => tpm2-tss_4.2.0.bb} (94%)
diff mbox series

Patch

diff --git a/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/fixup_hosttools.patch b/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/fixup_hosttools.patch
index 8822d1b3c4f7..798a0c724924 100644
--- a/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/fixup_hosttools.patch
+++ b/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/fixup_hosttools.patch
@@ -1,4 +1,4 @@ 
-From ab120a9642516cdfdae5c5b8a91e42e2c9898172 Mon Sep 17 00:00:00 2001
+From 8913c8c4b207ae6dfd3ae58d886e2074d53cc268 Mon Sep 17 00:00:00 2001
 From: Valentin Kunin <kunin@google.com>
 Date: Mon, 20 May 2024 21:09:27 +0000
 Subject: [PATCH] revert configure: add checks for all tools used by make
@@ -15,10 +15,10 @@  Signed-off-by: Valentin Kunin <kunin@google.com>
  1 file changed, 11 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index eb6051ea..a52c4725 100644
+index 4a1f1b022772..5a745e9c5c22 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -663,17 +663,6 @@ AM_CONDITIONAL([SYSD_SYSUSERS], [test "x$systemd_sysusers" = "xyes" && test "x$s
+@@ -658,17 +658,6 @@ AM_CONDITIONAL([SYSD_SYSUSERS], [test "x$systemd_sysusers" = "xyes" && test "x$s
  AC_CHECK_PROG(systemd_tmpfiles, systemd-tmpfiles, yes)
  AM_CONDITIONAL([SYSD_TMPFILES], [test "x$systemd_tmpfiles" = "xyes" && test "x$tmpfilesdir" != "xno"])
  
@@ -29,12 +29,13 @@  index eb6051ea..a52c4725 100644
 -      AC_CHECK_PROG(adduser, adduser, yes)
 -      AC_CHECK_PROG(addgroup, addgroup, yes)
 -      AS_IF([test "x$addgroup" != "xyes" && test "x$groupadd" != "xyes" ],
--         [AC_MSG_ERROR([addgroup or groupadd are needed.])])
+-         [AC_MSG_WARN([addgroup or groupadd are needed for install.])])
 -      AS_IF([test "x$adduser" != "xyes" && test "x$useradd" != "xyes" ],
--         [AC_MSG_ERROR([adduser or useradd are needed.])])])
+-         [AC_MSG_WARN([adduser or useradd are needed for install.])])])
 -
  AC_SUBST([PATH])
  
  dnl --------- Doxy Gen -----------------------
 -- 
-2.45.0.rc1.225.g2a3ae87e7f-goog
+2.43.0
+
diff --git a/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_4.1.3.bb b/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_4.2.0.bb
similarity index 94%
rename from meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_4.1.3.bb
rename to meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_4.2.0.bb
index 30e984ea48f8..0d5b36a832b4 100644
--- a/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_4.1.3.bb
+++ b/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_4.2.0.bb
@@ -11,7 +11,7 @@  SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN
            file://fixup_hosttools.patch \
            "
 
-SRC_URI[sha256sum] = "37f1580200ab78305d1fc872d89241aaee0c93cbe85bc559bf332737a60d3be8"
+SRC_URI[sha256sum] = "b53f0c5c8c4ce17f05701a410ca9688f725ca380c9bc4640eacd0eadb1fea124"
 
 UPSTREAM_CHECK_URI = "https://github.com/tpm2-software/${BPN}/releases"
 
@@ -94,5 +94,3 @@  FILES:${PN} = "\
     ${sysconfdir}/sysusers.d"
 
 BBCLASSEXTEND = "native nativesdk"
-
-CVE_STATUS[CVE-2024-29040] = "fixed-version: Fixed since version 4.1.0"