diff --git a/trousers-0.3.13-noinline.patch b/trousers-0.3.13-noinline.patch new file mode 100644 index 0000000..da1b09c --- /dev/null +++ b/trousers-0.3.13-noinline.patch @@ -0,0 +1,70 @@ +diff -up trousers-0.3.13/src/include/tcsps.h.noinline trousers-0.3.13/src/include/tcsps.h +--- trousers-0.3.13/src/include/tcsps.h.noinline 2014-04-24 20:05:44.000000000 +0200 ++++ trousers-0.3.13/src/include/tcsps.h 2015-05-26 16:36:20.685075185 +0200 +@@ -27,8 +27,8 @@ void ps_destroy(); + TSS_RESULT read_data(int, void *, UINT32); + TSS_RESULT write_data(int, void *, UINT32); + #else +-inline TSS_RESULT read_data(int, void *, UINT32); +-inline TSS_RESULT write_data(int, void *, UINT32); ++TSS_RESULT read_data(int, void *, UINT32); ++TSS_RESULT write_data(int, void *, UINT32); + #endif + int write_key_init(int, UINT32, UINT32, UINT32); + TSS_RESULT cache_key(UINT32, UINT16, TSS_UUID *, TSS_UUID *, UINT16, UINT32, UINT32); +diff -up trousers-0.3.13/src/include/tspps.h.noinline trousers-0.3.13/src/include/tspps.h +--- trousers-0.3.13/src/include/tspps.h.noinline 2014-04-24 20:05:44.000000000 +0200 ++++ trousers-0.3.13/src/include/tspps.h 2015-05-26 16:36:31.730325291 +0200 +@@ -18,8 +18,8 @@ + + TSS_RESULT get_file(int *); + int put_file(int); +-inline TSS_RESULT read_data(int, void *, UINT32); +-inline TSS_RESULT write_data(int, void *, UINT32); ++TSS_RESULT read_data(int, void *, UINT32); ++TSS_RESULT write_data(int, void *, UINT32); + UINT32 psfile_get_num_keys(int); + TSS_RESULT psfile_get_parent_uuid_by_uuid(int, TSS_UUID *, TSS_UUID *); + TSS_RESULT psfile_remove_key_by_uuid(int, TSS_UUID *); +diff -up trousers-0.3.13/src/tcs/ps/ps_utils.c.noinline trousers-0.3.13/src/tcs/ps/ps_utils.c +--- trousers-0.3.13/src/tcs/ps/ps_utils.c.noinline 2014-04-24 20:05:44.000000000 +0200 ++++ trousers-0.3.13/src/tcs/ps/ps_utils.c 2015-05-26 16:38:33.626085483 +0200 +@@ -45,7 +45,7 @@ struct key_disk_cache *key_disk_cache_he + #ifdef SOLARIS + TSS_RESULT + #else +-inline TSS_RESULT ++TSS_RESULT + #endif + read_data(int fd, void *data, UINT32 size) + { +@@ -67,7 +67,7 @@ read_data(int fd, void *data, UINT32 siz + #ifdef SOLARIS + TSS_RESULT + #else +-inline TSS_RESULT ++TSS_RESULT + #endif + write_data(int fd, void *data, UINT32 size) + { +diff -up trousers-0.3.13/src/tspi/ps/ps_utils.c.noinline trousers-0.3.13/src/tspi/ps/ps_utils.c +--- trousers-0.3.13/src/tspi/ps/ps_utils.c.noinline 2014-04-24 20:05:44.000000000 +0200 ++++ trousers-0.3.13/src/tspi/ps/ps_utils.c 2015-05-26 16:39:30.881381965 +0200 +@@ -22,7 +22,7 @@ + #include "tspps.h" + #include "tsplog.h" + +-inline TSS_RESULT ++TSS_RESULT + read_data(int fd, void *data, UINT32 size) + { + int rc; +@@ -39,7 +39,7 @@ read_data(int fd, void *data, UINT32 siz + return TSS_SUCCESS; + } + +-inline TSS_RESULT ++TSS_RESULT + write_data(int fd, void *data, UINT32 size) + { + int rc; diff --git a/trousers.spec b/trousers.spec index b9d8a31..60f8e6e 100644 --- a/trousers.spec +++ b/trousers.spec @@ -8,6 +8,7 @@ Url: http://trousers.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: tcsd.service +Patch1: trousers-0.3.13-noinline.patch BuildRequires: libtool, openssl-devel BuildRequires: systemd @@ -55,6 +56,7 @@ applications. %prep %setup -q +%patch1 -p1 -b .noinline # fix man page paths sed -i -e 's|/var/tpm|/var/lib/tpm|g' -e 's|/usr/local/var|/var|g' man/man5/tcsd.conf.5.in man/man8/tcsd.8.in @@ -118,6 +120,7 @@ exit 0 %changelog * Tue May 26 2015 Tomáš Mráz 0.3.13-4 - Split libtspi to a trousers-lib subpackage (#1225062) +- Fix FTBFS with current gcc (drop inline keyword when bogus) * Mon Aug 18 2014 Fedora Release Engineering - 0.3.13-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild