From 917fd097772c32be31a65b161f79ec5a301b78421911ecbf4981777118a8ac77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 29 Oct 2024 09:34:02 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main ibmtss revision ecaa4bd96bb52e475566bf96d06c79bb --- ibmtss-2.4.0.tar.gz | 3 + ...not-disable-optimization-for-debug-b.patch | 16 +-- ibmtss.changes | 12 ++ ibmtss.spec | 15 +-- ibmtss2.1.1.tar.gz | 3 - ...angelog-and-autotools-version-update.patch | 69 ++++++++++++ utils-Update-.so-version-to-2.4.patch | 104 ++++++++++++++++++ 7 files changed, 205 insertions(+), 17 deletions(-) create mode 100644 ibmtss-2.4.0.tar.gz delete mode 100644 ibmtss2.1.1.tar.gz create mode 100644 tss-Commit-changelog-and-autotools-version-update.patch create mode 100644 utils-Update-.so-version-to-2.4.patch diff --git a/ibmtss-2.4.0.tar.gz b/ibmtss-2.4.0.tar.gz new file mode 100644 index 0000000..5be3dea --- /dev/null +++ b/ibmtss-2.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0fde390a37ff5ba89bb7a3a5b6ca1f02d4ba330cb513347073959bf6feae836 +size 1403167 diff --git a/ibmtss-configure.ac-Do-not-disable-optimization-for-debug-b.patch b/ibmtss-configure.ac-Do-not-disable-optimization-for-debug-b.patch index 1f26055..50ebbc3 100644 --- a/ibmtss-configure.ac-Do-not-disable-optimization-for-debug-b.patch +++ b/ibmtss-configure.ac-Do-not-disable-optimization-for-debug-b.patch @@ -1,10 +1,11 @@ -From 005064b673d937a305427eb9fa4d549f93f6090a Mon Sep 17 00:00:00 2001 +From 6d5c05a167d847ac21315aa4a1c171715cd816af Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Mon, 17 Aug 2020 18:21:51 +0200 -Subject: [PATCH] configure.ac: Do not disable optimization for debug build. +Subject: [PATCH] configure.ac: Do not override optimization for debug build. -This conflicts with FORTIFY_SOURCE and generates completely different -assembly for debug and procuction. +-O0 conflicts with FORTIFY_SOURCE and generates completely different +assembly for debug and production. If user passes in C flags let them +override the suggested -O0. Signed-off-by: Michal Suchanek --- @@ -12,17 +13,18 @@ Signed-off-by: Michal Suchanek 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac +index 30e9254b339a..883c4bb84efa 100644 --- a/configure.ac +++ b/configure.ac -@@ -62,7 +62,7 @@ AC_CHECK_FUNCS([gethostbyname memmove memset socket strerror strtoul]) +@@ -67,7 +67,7 @@ AC_CHECK_FUNCS([gethostbyname memmove memset socket strerror strtoul]) # Replace autotools default optimization AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], [Build a TSS library used for debugging])) - AS_IF([test "$enable_debug" = "yes"], [CFLAGS="$USER_CFLAGS -g -ggdb -O0"]) -+ AS_IF([test "$enable_debug" = "yes"], [CFLAGS="$USER_CFLAGS -g -ggdb -Wextra -Werror"]) ++ AS_IF([test "$enable_debug" = "yes"], [CFLAGS="-O0 -g -ggdb $USER_CFLAGS -Wextra -Werror"]) # Linux requires -DTPM_POSIX case $host_os in -- -2.26.2 +2.46.1 diff --git a/ibmtss.changes b/ibmtss.changes index 4a17f91..933ce93 100644 --- a/ibmtss.changes +++ b/ibmtss.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Oct 21 09:23:53 UTC 2024 - Michal Suchanek + +- Update to 2.4.0: + * Add support for EK intermediate certificates + * Support different IMA log digest algorithms + * add regtest + * html documentation +- Refresh ibmtss-configure.ac-Do-not-disable-optimization-for-debug-b.patch +- tss-Commit-changelog-and-autotools-version-update.patch +- utils-Update-.so-version-to-2.4.patch + ------------------------------------------------------------------- Thu Nov 30 14:36:22 UTC 2023 - Pedro Monreal diff --git a/ibmtss.spec b/ibmtss.spec index 40a83f8..598a67a 100644 --- a/ibmtss.spec +++ b/ibmtss.spec @@ -1,7 +1,7 @@ # # spec file for package ibmtss # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,15 +21,17 @@ %define libpkgname %{libname}%{libversion} Name: ibmtss -Version: 2.1.1 +Version: 2.4.0 Release: 0 Summary: IBM's TPM 2.0 TSS License: BSD-3-Clause Group: Productivity/Security -URL: https://sourceforge.net/projects/ibmtpm20tss -Source: https://sourceforge.net/projects/ibmtpm20tss/files/ibmtss%{version}.tar.gz +URL: https://github.com/kgoldman/ibmtss +Source: https://github.com/kgoldman/ibmtss/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: 90-tpm-ibmtss.rules Patch1: ibmtss-configure.ac-Do-not-disable-optimization-for-debug-b.patch +Patch2: tss-Commit-changelog-and-autotools-version-update.patch +Patch3: utils-Update-.so-version-to-2.4.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: ibmswtpm2 @@ -71,8 +73,7 @@ Requires: %{name} = %{version} Includes IBM's TPM 2.0 TSS C header files %prep -%setup -q -c -%autopatch -p1 +%autosetup -p1 %build autoreconf -ifv @@ -107,7 +108,7 @@ find %{buildroot} -name .cvsignore | xargs rm -v %files %license LICENSE -%doc ibmtss.docx +%doc ibmtss.html ibmtss.docx README %{_bindir}/tss* %{_mandir}/man1/tss*.1%{?ext_man} diff --git a/ibmtss2.1.1.tar.gz b/ibmtss2.1.1.tar.gz deleted file mode 100644 index 8af467d..0000000 --- a/ibmtss2.1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:02d5e8686eb6742803e1521681ff377ca08ebec5a956f800fbc4fb13bc9658bd -size 1269381 diff --git a/tss-Commit-changelog-and-autotools-version-update.patch b/tss-Commit-changelog-and-autotools-version-update.patch new file mode 100644 index 0000000..2830733 --- /dev/null +++ b/tss-Commit-changelog-and-autotools-version-update.patch @@ -0,0 +1,69 @@ +From 851bdd1ba8f5bda7f739161ec8db27f3df383751 Mon Sep 17 00:00:00 2001 +From: Ken Goldman +Date: Mon, 14 Oct 2024 14:05:24 -0400 +Subject: [PATCH] tss: Commit changelog and autotools version update + +Signed-off-by: Ken Goldman +--- + ChangeLog | 12 ++++++++++++ + configure.ac | 6 +++--- + tss2.spec | 2 +- + 3 files changed, 16 insertions(+), 4 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index b2433926fa3e..024eda389b88 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,15 @@ ++---------------- ++Changes in 2.4.0 ++---------------- ++ ++Add support for SHA-256, SHA-384, and SHA-512 IMA event logs. Add ++local command line support and update the API to support ++attestation. Add known value test to event regression tests. Change ++the -ty switch to -ealg for event log angorithms. ++ ++Add support for EK intermediate certificates in the IWG standard ++locations. ++ + ---------------- + Changes in 2.3 1 + ---------------- +diff --git a/configure.ac b/configure.ac +index 081bc19528e0..30e9254b339a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3,13 +3,13 @@ + + # Set package release version" + # After committing set git tag version. +-AC_INIT(ibmtss, 2.3.1, kgold@linux.ibm.com) ++AC_INIT(ibmtss, 2.4.0, kgold@linux.ibm.com) + AC_PREREQ([2.63]) + + # Convert major.minor.micro to libtool versioning (current-revision-age) + TSSLIB_VER_MAJOR=2 +-TSSLIB_VER_MINOR=3 +-TSSLIB_VER_MICRO=1 ++TSSLIB_VER_MINOR=4 ++TSSLIB_VER_MICRO=0 + TSSLIB_VERSION_INFO=`expr $TSSLIB_VER_MAJOR + $TSSLIB_VER_MINOR`:$TSSLIB_VER_MICRO:$TSSLIB_VER_MINOR + AC_SUBST([TSSLIB_VERSION_INFO], [$TSSLIB_VERSION_INFO]) + +diff --git a/tss2.spec b/tss2.spec +index e32583d69b11..68c2047f96f5 100644 +--- a/tss2.spec ++++ b/tss2.spec +@@ -7,7 +7,7 @@ + + Name: tss2 + # this is the release of the TSS library +-Version: 2.3.2 ++Version: 2.4.0 + # this is the release of the fedora package, goes back to 1 when version changes + Release: 1%{?dist} + Epoch: 1 +-- +2.46.1 + diff --git a/utils-Update-.so-version-to-2.4.patch b/utils-Update-.so-version-to-2.4.patch new file mode 100644 index 0000000..e571b4d --- /dev/null +++ b/utils-Update-.so-version-to-2.4.patch @@ -0,0 +1,104 @@ +From 7cd742915823c0e18439c207018292c46deef513 Mon Sep 17 00:00:00 2001 +From: Ken Goldman +Date: Thu, 17 Oct 2024 16:41:36 -0400 +Subject: [PATCH] utils: Update .so version to 2.4 + +Signed-off-by: Ken Goldman +--- + utils/makefile.nofile | 4 ++-- + utils/makefiletpm12 | 4 ++-- + utils/makefiletpm20 | 4 ++-- + utils/makefiletpmc | 4 ++-- + 4 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/utils/makefile.nofile b/utils/makefile.nofile +index 860ab6f019db..f67581cd9f8b 100644 +--- a/utils/makefile.nofile ++++ b/utils/makefile.nofile +@@ -90,7 +90,7 @@ LNAFLAGS += -pie -Wl,-z,now -Wl,-rpath,. + LNALIBS += -libmtssutils -libmtssmin + + # versioned shared library +-LIBTSSVERSIONED=libibmtssmin.so.2.1 ++LIBTSSVERSIONED=libibmtssmin.so.2.4 + + # soname field of the shared library + # which will be made symbolic link to the versioned shared library +@@ -109,7 +109,7 @@ endif + + # TSS utilities shared library + +-LIBTSSUTILSVERSIONED=libibmtssutils.so.2.1 ++LIBTSSUTILSVERSIONED=libibmtssutils.so.2.4 + LIBTSSUTILSSONAME=libibmtssutils.so.2 + LIBTSSUTILS=libibmtssutils.so + +diff --git a/utils/makefiletpm12 b/utils/makefiletpm12 +index 9a115cbd3003..cae10cbec301 100644 +--- a/utils/makefiletpm12 ++++ b/utils/makefiletpm12 +@@ -103,7 +103,7 @@ LNALIBS += -libmtss + # shared library + + # versioned shared library +-LIBTSSVERSIONED=libibmtss.so.2.1 ++LIBTSSVERSIONED=libibmtss.so.2.4 + + # soname field of the shared library + # which will be made symbolic link to the versioned shared library +@@ -122,7 +122,7 @@ endif + + # TSS utilities shared library + +-LIBTSSUTILSVERSIONED=libibmtssutils.so.2.1 ++LIBTSSUTILSVERSIONED=libibmtssutils.so.2.4 + LIBTSSUTILSSONAME=libibmtssutils.so.2 + LIBTSSUTILS=libibmtssutils.so + +diff --git a/utils/makefiletpm20 b/utils/makefiletpm20 +index f6e55a9e822f..88e9343b76e8 100644 +--- a/utils/makefiletpm20 ++++ b/utils/makefiletpm20 +@@ -140,7 +140,7 @@ LNALIBS += -libmtssutils -libmtss + # shared library + + # versioned shared library +-LIBTSSVERSIONED=libibmtss.so.2.3 ++LIBTSSVERSIONED=libibmtss.so.2.4 + + # soname field of the shared library + # which will be made symbolic link to the versioned shared library +@@ -159,7 +159,7 @@ endif + + # TSS utilities shared library + +-LIBTSSUTILSVERSIONED=libibmtssutils.so.2.3 ++LIBTSSUTILSVERSIONED=libibmtssutils.so.2.4 + LIBTSSUTILSSONAME=libibmtssutils.so.2 + LIBTSSUTILS=libibmtssutils.so + +diff --git a/utils/makefiletpmc b/utils/makefiletpmc +index d2558f33b16b..00748b174bd4 100644 +--- a/utils/makefiletpmc ++++ b/utils/makefiletpmc +@@ -108,7 +108,7 @@ LNALIBS += -libmtssutils -libmtss + # shared library + + # versioned shared library +-LIBTSSVERSIONED=libibmtss.so.2.3 ++LIBTSSVERSIONED=libibmtss.so.2.4 + + # soname field of the shared library + # which will be made symbolic link to the versioned shared library +@@ -127,7 +127,7 @@ endif + + # TSS utilities shared library + +-LIBTSSUTILSVERSIONED=libibmtssutils.so.2.3 ++LIBTSSUTILSVERSIONED=libibmtssutils.so.2.4 + LIBTSSUTILSSONAME=libibmtssutils.so.2 + LIBTSSUTILS=libibmtssutils.so + +-- +2.46.1 +