Control: tags -1 patch
I am uploading a NMU to DELAYED/2 to address this. Please find the debdiff attached. The changes are also in git.
diff -Nru tpm2-tss-4.1.3/debian/changelog tpm2-tss-4.1.3/debian/changelog --- tpm2-tss-4.1.3/debian/changelog 2024-10-26 12:25:25.000000000 +0200 +++ tpm2-tss-4.1.3/debian/changelog 2026-01-13 18:07:59.000000000 +0100 @@ -1,3 +1,12 @@ +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 -Nru tpm2-tss-4.1.3/debian/copyright tpm2-tss-4.1.3/debian/copyright --- tpm2-tss-4.1.3/debian/copyright 2024-10-10 00:35:59.000000000 +0200 +++ tpm2-tss-4.1.3/debian/copyright 2026-01-13 18:06:31.000000000 +0100 @@ -13,65 +13,20 @@ 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 -Nru tpm2-tss-4.1.3/debian/patches/0007-incorrect-pointer-casts.patch tpm2-tss-4.1.3/debian/patches/0007-incorrect-pointer-casts.patch --- tpm2-tss-4.1.3/debian/patches/0007-incorrect-pointer-casts.patch 1970-01-01 01:00:00.000000000 +0100 +++ tpm2-tss-4.1.3/debian/patches/0007-incorrect-pointer-casts.patch 2026-01-13 18:06:31.000000000 +0100 @@ -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 -Nru tpm2-tss-4.1.3/debian/patches/series tpm2-tss-4.1.3/debian/patches/series --- tpm2-tss-4.1.3/debian/patches/series 2024-10-10 02:41:06.000000000 +0200 +++ tpm2-tss-4.1.3/debian/patches/series 2026-01-13 18:06:31.000000000 +0100 @@ -4,3 +4,4 @@ 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
