Ok we have merged the delta from Ubuntu with the latest upload to unstable, with a few bug fixes on top. Please have a look to double check. Thanks!
** Summary changed: - [FFE] Please merge 4.1.3-4 into resolute + [FFE] Please merge 4.1.3-5 into resolute ** Description changed: ## FFE ## Packaging changes only from Debian. The main changes are autopkgtest being added, system user/group creation by shippin g the upstream sysusers.d config file, a patch to fix a unit test with the new version of cmocka, and a new meta package that automatically lists all the libraries provided by the tpm2-tss package, making it easier to pull them all in regardless of SONAME changes and additions/removals, which matches Fedora and makes it much easier for image builders. Given it's only packages changes, and that autopkgtest was added, risk of regressions is very low. This needs to go in tandem with tpm-udev 0.7 (https://bugs.launchpad.net/ubuntu/+source/tpm-udev/+bug/2142534). - The delta in Ubuntu is tiny so it's a very easy change to make. Diff - from 4.1.3-1.2 to 4.1.3-4 in Debian: + The delta from Ubuntu has been merged, so it's a simple sync to change + it. Diff from 4.1.3-1.2 to 4.1.3-5 in Debian: diff --git a/debian/changelog b/debian/changelog - index 9361160d..cbc4ea79 100644 + index 9361160d..ff16e4c1 100644 --- a/debian/changelog +++ b/debian/changelog - @@ -1,3 +1,39 @@ + @@ -1,3 +1,47 @@ + +tpm2-tss (4.1.3-5) unstable; urgency=medium + + + + [ Luca Boccassi ] + + * Disable lto, not yet ready upstream + + * Run dh-sequence-installsysusers + + + + -- Mario Limonciello <[email protected]> Tue, 24 Feb 2026 23:52:20 -0600 + + +tpm2-tss (4.1.3-4) unstable; urgency=medium + + [ Zaiba Sanglikar ] + * Add autopkgtest suite with upstream test suite (Closes: #1087380) + + [ Luca Boccassi ] + * libtss2-dev: drop ${shlibs:Depends} + * Add tpm2-tss metapackage that depends on all libtss2 library packages + + -- Mario Limonciello <[email protected]> Sun, 22 Feb 2026 07:57:28 -0600 + +tpm2-tss (4.1.3-3) unstable; urgency=medium + + [ Luca Boccassi ] + * Build depend on tmpfiles and sysusers packages + * Drop tpm-udev build dependency + * Add d/s/options to ignore files in git but not in tarball + + -- Mario Limonciello <[email protected]> Tue, 17 Feb 2026 22:56:25 -0600 + +tpm2-tss (4.1.3-2) unstable; urgency=medium + + [ Luca Boccassi ] + * Install sysusers.d conf file + + -- Mario Limonciello <[email protected]> Mon, 16 Feb 2026 14:29:24 -0600 + +tpm2-tss (4.1.3-1.3) unstable; urgency=medium + + * Non-maintainer upload + * Drop TCG license (Closes: #1115473) + * d/copyright: Keep the upstream license for patches by default + * Fix build with cmocka 2.0.1 (Closes: #1124214) + + -- Bastian Germann <[email protected]> Tue, 13 Jan 2026 18:07:59 +0100 + tpm2-tss (4.1.3-1.2) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/control b/debian/control - index 41b70ab7..ff800207 100644 + index 41b70ab7..5362ee5f 100644 --- a/debian/control +++ b/debian/control - @@ -24,7 +24,8 @@ Build-Depends: acl, + @@ -9,6 +9,7 @@ Build-Depends: acl, + autoconf, + autoconf-archive, + debhelper-compat (= 13), + + dh-sequence-installsysusers, + docbook-xml, + docbook-xsl, + doxygen, + @@ -24,7 +25,8 @@ Build-Depends: acl, libtpms-dev, libusb-1.0-0-dev, pkgconf, - tpm-udev, + systemd | systemd-standalone-tmpfiles | systemd-tmpfiles, + systemd | systemd-standalone-sysusers | systemd-sysusers, uthash-dev, uuid-dev, xsltproc - @@ -421,27 +422,8 @@ Section: libdevel + @@ -421,27 +423,8 @@ Section: libdevel Depends: libcurl4-openssl-dev | libcurl-ssl-dev, libjson-c-dev, libssl-dev, - libtss2-esys-3.0.2-0t64 (= ${binary:Version}), - libtss2-fapi1t64 (= ${binary:Version}), - libtss2-mu-4.0.1-0t64 (= ${binary:Version}), - libtss2-policy0t64 (= ${binary:Version}), - libtss2-rc0t64 (= ${binary:Version}), - libtss2-sys1t64 (= ${binary:Version}), - libtss2-tcti-cmd0t64 (= ${binary:Version}), - libtss2-tcti-device0t64 (= ${binary:Version}), - libtss2-tcti-i2c-ftdi0 (= ${binary:Version}), - libtss2-tcti-i2c-helper0 (= ${binary:Version}), - libtss2-tcti-libtpms0t64 (= ${binary:Version}), - libtss2-tcti-mssim0t64 (= ${binary:Version}), - libtss2-tcti-pcap0t64 (= ${binary:Version}), - libtss2-tcti-spi-ftdi0 (= ${binary:Version}), - libtss2-tcti-spi-helper0t64 (= ${binary:Version}), - libtss2-tcti-spi-ltt2go0 (= ${binary:Version}), - libtss2-tcti-spidev0 (= ${binary:Version}), - libtss2-tcti-swtpm0t64 (= ${binary:Version}), - libtss2-tctildr0t64 (= ${binary:Version}), + ${libtss2:All}, ${misc:Depends}, - ${shlibs:Depends} Multi-Arch: same Description: TPM2 Software stack library - development files TPM2.0 TSS (Software Stack) consists of API layers provided to support - @@ -456,6 +438,25 @@ Description: TPM2 Software stack library - development files + @@ -456,6 +439,25 @@ Description: TPM2 Software stack library - development files This package contains development files for use when writing applications that need access to TPM chips. +Package: tpm2-tss +Architecture: any +Depends: ${libtss2:All}, + ${misc:Depends}, +Multi-Arch: same +Description: TPM2 Software stack library - metapackage for libraries + TPM2.0 TSS (Software Stack) consists of API layers provided to support + TPM 2.0 chips. It is made out of three layers: + . + - Enhanced System API (ESAPI) + - System API (SAPI), which implements the system layer API; + - Marshaling/Unmarshaling (MU) + - TPM Command Transmission Interface (TCTI), which is used by SAPI to + allow communication with the TAB/RM layer; + . + This is a metapackage that depends on all the libtss2 binary packages, to + facilitate installing all libraries at once, independently of the changing + SONAMEs. + Package: libtss2-doc Architecture: all Section: doc diff --git a/debian/copyright b/debian/copyright index e0a150a0..e9b92357 100644 --- a/debian/copyright +++ b/debian/copyright @@ -13,65 +13,20 @@ Copyright: 2016 Canonical Ltd. 2017 Ying-Chun Liu (PaulLiU) <[email protected]> License: GPL-3 -License: TCG - Licenses and Notices - 1. Copyright Licenses: - . - Trusted Computing Group (TCG) grants to the user of the source code in - this specification (the "Source Code") a worldwide, irrevocable, - nonexclusive, - royalty free, copyright license to reproduce, create derivative works, - distribute, display and perform the Source Code and derivative works - thereof, and to grant others the rights granted herein. - . - The TCG grants to the user of the other parts of the specification - (other than the Source Code) the rights to reproduce, distribute, - display, and perform the specification solely for the purpose of - developing products based on such documents. - . - 2. Source Code Distribution Conditions: - . - Redistributions of Source Code must retain the above copyright licenses, - this list of conditions and the following disclaimers. - . - Redistributions in binary form must reproduce the above copyright - licenses, this list of conditions and the following disclaimers in - the documentation and/or other materials provided with the distribution. - . - 3. Disclaimers: - . - THE COPYRIGHT LICENSES SET FORTH ABOVE DO NOT REPRESENT ANY FORM OF LICENSE - OR WAIVER, EXPRESS OR IMPLIED, BY ESTOPPEL OR OTHERWISE, WITH RESPECT TO - PATENT RIGHTS HELD BY TCG MEMBERS (OR OTHER THIRD PARTIES) THAT MAY BE - NECESSARY - TO IMPLEMENT THIS SPECIFICATION OR OTHERWISE. Contact TCG Administration - ([email protected]) for information on specification - licensing - rights available through TCG membership agreements. - . - THIS SPECIFICATION IS PROVIDED "AS IS" WITH NO EXPRESS OR IMPLIED - WARRANTIES - WHATSOEVER, INCLUDING ANY WARRANTY OF MERCHANTABILITY OR FITNESS FOR A - PARTICULAR - PURPOSE, ACCURACY, COMPLETENESS, OR NONINFRINGEMENT OF INTELLECTUAL - PROPERTY - RIGHTS, OR ANY WARRANTY OTHERWISE ARISING OUT OF ANY PROPOSAL, - SPECIFICATION - OR SAMPLE. - . - Without limitation, TCG and its members and licensors disclaim all - liability, - including liability for infringement of any proprietary rights, relating to - use of information in this specification and to the implementation of this - specification, and TCG disclaims all liability for cost of procurement of - substitute goods or services, lost profits, loss of use, loss of data or - any - incidental, consequential, direct, indirect, or special damages, whether - under contract, tort, warranty or otherwise, arising in any way out of use - or reliance upon this specification or any information herein. - . - Any marks and brands contained herein are the property of their respective - owner. +Files: debian/patches/* +Copyright: Intel Corporation and individual contributors +License: BSD-2-clause + +Files: debian/patches/0001_disable_fapi_io_test.patch +Comment: Please consider licensing under BSD-2-clause to remove this paragraph +Copyright: 2017 Ying-Chun Liu (PaulLiU) <[email protected]> +License: GPL-3 + +Files: debian/patches/0002-fix-version.patch + debian/patches/disable-tests-on-big-endian.patch +Comment: Please consider licensing under BSD-2-clause to remove this paragraph +Copyright: 2016 Canonical Ltd. +License: GPL-3 License: GPL-3 On Debian systems the full text of the GNU General Public diff --git a/debian/libtss2-fapi1t64.install b/debian/libtss2-fapi1t64.install index 4db1f493..29acae82 100644 --- a/debian/libtss2-fapi1t64.install +++ b/debian/libtss2-fapi1t64.install @@ -1,4 +1,5 @@ etc/tmpfiles.d/tpm2-tss-fapi.conf usr/lib/tmpfiles.d/ +etc/sysusers.d/tpm2-tss.conf usr/lib/sysusers.d/ etc/tpm2-tss/fapi-config.json etc/tpm2-tss/fapi-profiles/P_*.json usr/lib/*/libtss2-fapi.so.* diff --git a/debian/not-installed b/debian/not-installed index 11b0470c..18a8feab 100644 --- a/debian/not-installed +++ b/debian/not-installed @@ -1,2 +1 @@ -etc/sysusers.d/tpm2-tss.conf usr/lib/${DEB_HOST_MULTIARCH}/udev/rules.d/tpm-udev.rules diff --git a/debian/patches/0007-incorrect-pointer-casts.patch b/debian/patches/0007-incorrect-pointer-casts.patch new file mode 100644 index 00000000..af1adf74 --- /dev/null +++ b/debian/patches/0007-incorrect-pointer-casts.patch @@ -0,0 +1,39 @@ +Origin: https://github.com/tpm2-software/tpm2-tss/pull/3041 +From: Marcin Serwin <[email protected]> +Date: Fri, 9 Jan 2026 19:42:59 +0100 +Subject: test: fix incorrect pointer casts + +When building with cmocka 2.0.1 the tests fail due to stricter type +checks, this patch fixes that. Tested with both cmocka 1.1.8 and 2.0.1. + +``` +test/unit/tcti-libtpms.c:148:5: error: initialization of 'const void *' from 'enum TPMLIB_StateType' makes pointer from integer without a cast [-Wint-conversion] + 148 | check_expected_ptr(st); + | ^~~~~~~~~~~~~~~~~~ +test/unit/tcti-libtpms.c:150:5: error: initialization of 'const void *' from 'uint32_t' {aka 'unsigned int'} makes pointer from integer without a cast [-Wint-conversion] + 150 | check_expected_ptr(buf_len); + | ^~~~~~~~~~~~~~~~~~ +``` + + +Signed-off-by: Marcin Serwin <[email protected]> +--- + test/unit/tcti-libtpms.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/unit/tcti-libtpms.c b/test/unit/tcti-libtpms.c +index 7d7247385..d6c07f448 100644 +--- a/test/unit/tcti-libtpms.c ++++ b/test/unit/tcti-libtpms.c +@@ -145,9 +145,9 @@ TPM_RESULT TPMLIB_Process(unsigned char **resp_buf, uint32_t *resp_len, uint32_t + } + TPM_RESULT TPMLIB_SetState(enum TPMLIB_StateType st, const unsigned char *buf, uint32_t buf_len) + { +- check_expected_ptr(st); ++ check_expected(st); + check_expected_ptr(buf); +- check_expected_ptr(buf_len); ++ check_expected(buf_len); + return mock_type(int); + } + void TPMLIB_Terminate(void) diff --git a/debian/patches/series b/debian/patches/series index 54de5c3f..53b09b48 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ disable-tests-on-big-endian.patch 0004-ESYS-FAPI-Fix-order-of-calloc-parameters.patch 0005-FAPI-Fix-wrong-format-directive-in-ifap_set_auth.patch 0006-test-skip-tcti-spidev-on-32bit-architectures-with-64.patch +0007-incorrect-pointer-casts.patch diff --git a/debian/rules b/debian/rules - index a4dbd2f0..15eb465a 100755 + index a4dbd2f0..aa981696 100755 --- a/debian/rules +++ b/debian/rules - @@ -34,3 +34,10 @@ tpmclient.1: debian/tpmclient.xml + @@ -1,5 +1,7 @@ + #!/usr/bin/make -f + + +export DEB_BUILD_MAINT_OPTIONS = optimize=-lto + + + DB2MAN = /usr/share/sgml/docbook/stylesheet/xsl/docbook-xsl/manpages/docbook.xsl + XP = xsltproc -''-nonet -''-param man.charmap.use.subset "0" + + @@ -34,3 +36,10 @@ tpmclient.1: debian/tpmclient.xml tpmtest.1: debian/tpmtest.xml $(XP) $(DB2MAN) $< + +execute_after_dh_gencontrol: + # debian/files will not exist until dh_gencontrol has ran at least once. + # The list of libraries is everchanging, so generate the dependency lists + # automatically at build time. + tsslibs=$$(grep -E 'libtss2-*' ./debian/files | grep -v -e 'dbgsym' -e 'libtss2-dev' -e 'libtss2-meta' -e 'libtss2-doc' | tr '_' ' ' | awk '{ print $$1,"(=",$$2 ")" }' | paste -sd ',' - | sed -e 's/,/, /g'); \ + dh_gencontrol -p libtss2-dev -p tpm2-tss -- -V"libtss2:All=$${tsslibs}" diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 00000000..c28ebf06 --- /dev/null +++ b/debian/source/options @@ -0,0 +1,2 @@ +# These are in git but not in the source tarball, ignore to avoid build failures on salsa-ci +extend-diff-ignore = "(^|/)(.*\.vcxproj|.*\.sln)$" diff --git a/debian/tests/control b/debian/tests/control new file mode 100644 index 00000000..dc780bca --- /dev/null +++ b/debian/tests/control @@ -0,0 +1,10 @@ +Tests: testsuite +Restrictions: allow-stderr +Depends: @, + @builddeps@, + iproute2, + procps, + swtpm-tools, + swtpm, + tpm-udev, + udev, diff --git a/debian/tests/testsuite b/debian/tests/testsuite new file mode 100644 index 00000000..196d8c63 --- /dev/null +++ b/debian/tests/testsuite @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e +set -x + +LIBDL_LDFLAGS="-ldl" ./bootstrap +./configure --enable-unit --enable-integration --enable-tcti-swtpm + +make -j$(nproc) check -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/2142535 Title: [FFE] Please merge 4.1.3-5 into resolute To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/tpm2-tss/+bug/2142535/+subscriptions -- ubuntu-bugs mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
