Control: tags 957884 + pending Dear maintainer,
I've prepared an NMU for trousers (versioned as 0.3.14+fixed1-1.1) and uploaded it to DELAYED/0 as per the recommended delays from the developers' reference. Best Regards, OdyX diff -Nru trousers-0.3.14+fixed1/debian/changelog trousers-0.3.14+fixed1/debian/changelog --- trousers-0.3.14+fixed1/debian/changelog 2016-11-20 16:10:31.000000000 +0100 +++ trousers-0.3.14+fixed1/debian/changelog 2020-08-17 07:36:43.000000000 +0200 @@ -1,3 +1,11 @@ +trousers (0.3.14+fixed1-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Backport upstream patch to fix GCC-10/-fno-common FTBFS (Closes: #957884) + * Consequently, remove two unused symbols from libtspi1 + + -- Didier Raboud <[email protected]> Mon, 17 Aug 2020 07:36:43 +0200 + trousers (0.3.14+fixed1-1) unstable; urgency=medium * New upstream version 0.3.14 (Closes: #828579) diff -Nru trousers-0.3.14+fixed1/debian/libtspi1.symbols trousers-0.3.14+fixed1/debian/libtspi1.symbols --- trousers-0.3.14+fixed1/debian/libtspi1.symbols 2016-11-20 16:10:31.000000000 +0100 +++ trousers-0.3.14+fixed1/debian/libtspi1.symbols 2020-08-17 07:34:32.000000000 +0200 @@ -1023,8 +1023,6 @@ tcs_normal_api@Base 0.3.1 tcs_sendit@Base 0.3.5 tcs_transport_api@Base 0.3.1 - tcsd_sa_chld@Base 0.3.1 - tcsd_sa_int@Base 0.3.1 tpm_free@Base 0.3.1 tpm_list@Base 0.3.1 unpin_mem@Base 0.3.1 diff -Nru trousers-0.3.14+fixed1/debian/patches/09-trousers-resolve-build-failure.patch trousers-0.3.14+fixed1/debian/patches/09-trousers-resolve-build-failure.patch --- trousers-0.3.14+fixed1/debian/patches/09-trousers-resolve-build-failure.patch 1970-01-01 01:00:00.000000000 +0100 +++ trousers-0.3.14+fixed1/debian/patches/09-trousers-resolve-build-failure.patch 2020-08-17 07:34:32.000000000 +0200 @@ -0,0 +1,38 @@ +From c9b8c4434f3b11bae4f7e72c3aec5b4f3459eecc Mon Sep 17 00:00:00 2001 +From: Jerry Snitselaar <[email protected]> +Date: Wed, 18 Mar 2020 14:10:35 -0700 +Subject: [PATCH] trousers: resolve build failure + +The global variables tcsd_sa_chld and tcsd_sa_int in tcsd.h are +causing build failures in latest Fedora release: + +/usr/bin/ld: ../../src/tcs/libtcs.a(libtcs_a-tcsi_changeauth.o):/builddir/build/BUILD/trousers-0.3.13/src/tcs/../include/tcsd.h:169: multiple definition of `tcsd_sa_chld'; tcsd-svrside.o:/builddir/build/BUILD/trousers-0.3.13/src/tcsd/../../src/include/tcsd.h:169: first defined here +/usr/bin/ld: ../../src/tcs/libtcs.a(libtcs_a-tcsi_changeauth.o):/builddir/build/BUILD/trousers-0.3.13/src/tcs/../include/tcsd.h:168: multiple definition of `tcsd_sa_int'; tcsd-svrside.o:/builddir/build/BUILD/trousers-0.3.13/src/tcsd/../../src/include/tcsd.h:168: first defined here + +They are no longer used since 9b40e581470b ("Improved daemon's signal +handling") so just remove them. + +Signed-off-by: Jerry Snitselaar <[email protected]> +Signed-off-by: Debora Velarde Babb <[email protected]> +--- + src/include/tcsd.h | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/src/include/tcsd.h b/src/include/tcsd.h +index 5b9462b..f5c286e 100644 +--- a/src/include/tcsd.h ++++ b/src/include/tcsd.h +@@ -164,10 +164,4 @@ TSS_RESULT tcsd_thread_create(int, char *); + void *tcsd_thread_run(void *); + void thread_signal_init(); + +-/* signal handling */ +-#ifndef __APPLE__ +-struct sigaction tcsd_sa_int; +-struct sigaction tcsd_sa_chld; +-#endif +- + #endif +-- +2.28.0 + diff -Nru trousers-0.3.14+fixed1/debian/patches/series trousers-0.3.14+fixed1/debian/patches/series --- trousers-0.3.14+fixed1/debian/patches/series 2016-11-20 16:10:31.000000000 +0100 +++ trousers-0.3.14+fixed1/debian/patches/series 2020-08-17 07:36:24.000000000 +0200 @@ -5,3 +5,4 @@ 06-host_name_max.patch 07-read_data-not-inline.patch 08-fix-wrong-version-0.3.14.patch +09-trousers-resolve-build-failure.patch
