0004-trousers-resolve-build-failure.patch 1.7 KB

1234567891011121314151617181920212223242526272829303132333435363738394041
  1. From c9b8c4434f3b11bae4f7e72c3aec5b4f3459eecc Mon Sep 17 00:00:00 2001
  2. From: Jerry Snitselaar <jsnitsel@redhat.com>
  3. Date: Wed, 18 Mar 2020 14:10:35 -0700
  4. Subject: [PATCH] trousers: resolve build failure
  5. The global variables tcsd_sa_chld and tcsd_sa_int in tcsd.h are
  6. causing build failures in latest Fedora release:
  7. /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
  8. /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
  9. They are no longer used since 9b40e581470b ("Improved daemon's signal
  10. handling") so just remove them.
  11. Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
  12. Signed-off-by: Debora Velarde Babb <debora@linux.ibm.com>
  13. [Retrieved from:
  14. https://sourceforge.net/p/trousers/trousers/ci/c9b8c4434f3b11bae4f7e72c3aec5b4f3459eecc]
  15. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  16. ---
  17. src/include/tcsd.h | 6 ------
  18. 1 file changed, 6 deletions(-)
  19. diff --git a/src/include/tcsd.h b/src/include/tcsd.h
  20. index 5b9462b..f5c286e 100644
  21. --- a/src/include/tcsd.h
  22. +++ b/src/include/tcsd.h
  23. @@ -164,10 +164,4 @@ TSS_RESULT tcsd_thread_create(int, char *);
  24. void *tcsd_thread_run(void *);
  25. void thread_signal_init();
  26. -/* signal handling */
  27. -#ifndef __APPLE__
  28. -struct sigaction tcsd_sa_int;
  29. -struct sigaction tcsd_sa_chld;
  30. -#endif
  31. -
  32. #endif
  33. --
  34. 2.28.0