diff --git a/SOURCES/rhbz-1071171-1224558.patch b/SOURCES/rhbz-1071171-1224558.patch new file mode 100644 index 0000000..fa59d1f --- /dev/null +++ b/SOURCES/rhbz-1071171-1224558.patch @@ -0,0 +1,21 @@ +diff -ur trousers-0.3.11.2/src/tspi/rpc/hosttable.c trousers-0.3.11.2.new/src/tspi/rpc/hosttable.c +--- trousers-0.3.11.2/src/tspi/rpc/hosttable.c 2013-07-12 18:27:37.000000000 +0200 ++++ trousers-0.3.11.2.new/src/tspi/rpc/hosttable.c 2014-02-28 12:13:25.763293218 +0100 +@@ -39,7 +39,7 @@ + #pragma init(_init) + void _init(void) + #else +-void __attribute__ ((constructor)) my_init(void) ++static void __attribute__ ((constructor)) my_init(void) + #endif + { + host_table_init(); +@@ -73,7 +72,7 @@ + #pragma fini(_fini) + void _fini(void) + #else +-void __attribute__ ((destructor)) my_fini(void) ++static void __attribute__ ((destructor)) my_fini(void) + #endif + { + host_table_final(); diff --git a/SPECS/trousers.spec b/SPECS/trousers.spec index 091c2b1..182e89a 100644 --- a/SPECS/trousers.spec +++ b/SPECS/trousers.spec @@ -1,7 +1,7 @@ Name: trousers Summary: TCG's Software Stack v1.2 Version: 0.3.11.2 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: System Environment/Libraries Url: http://trousers.sourceforge.net @@ -14,6 +14,7 @@ Requires(pre): shadow-utils Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units +Patch0: rhbz-1071171-1224558.patch %description TrouSerS is an implementation of the Trusted Computing Group's Software Stack @@ -44,6 +45,7 @@ applications. %prep %setup -q +%patch0 -p1 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 @@ -108,6 +110,9 @@ exit 0 %{_libdir}/libtddl.a %changelog +* Tue May 26 2015 Avesh Agarwal - 0.3.11.2-4 +Resolves: rhbz#1224558 + * Fri Jan 24 2014 Daniel Mach - 0.3.11.2-3 - Mass rebuild 2014-01-24