[trousers/f20] Fix crash when linking libgnutls and libmysqlclient (#1069079)

[Steve Grubb]

commit 9f75d71b734e5ab30eb8f60d6f7df60cfcd571ce
Author: sgrubb <sgrubb at redhat.com>
Date:   Tue Mar 25 16:48:21 2014 -0400

    Fix crash when linking libgnutls and libmysqlclient (#1069079)
    
    - Don't order tcsd after syslog.target (#1055198)

 tcsd.service                   |    1 -
 trousers-0.3.11.2-constr.patch |   21 +++++++++++++++++++++
 trousers.spec                  |   23 +++++++++++++----------
 3 files changed, 34 insertions(+), 11 deletions(-)
---
diff --git a/tcsd.service b/tcsd.service
index 25647fd..dd76a33 100644
--- a/tcsd.service
+++ b/tcsd.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=TCG Core Services Daemon
-After=syslog.target
 
 [Service]
 Type=forking
diff --git a/trousers-0.3.11.2-constr.patch b/trousers-0.3.11.2-constr.patch
new file mode 100644
index 0000000..fa59d1f
--- /dev/null
+++ b/trousers-0.3.11.2-constr.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/trousers.spec b/trousers.spec
index 164c83d..91b70a0 100644
--- a/trousers.spec
+++ b/trousers.spec
@@ -1,15 +1,17 @@
 Name: trousers
 Summary: TCG's Software Stack v1.2
 Version: 0.3.11.2
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: System Environment/Libraries
 Url: http://trousers.sourceforge.net
+
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1: tcsd.service
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1: trousers-0.3.11.2-constr.patch
+
 BuildRequires: libtool, openssl-devel
-BuildRequires: systemd-units
+BuildRequires: systemd
 Requires(pre): shadow-utils
 Requires(post): systemd-units
 Requires(preun): systemd-units
@@ -44,6 +46,7 @@ applications.
 
 %prep
 %setup -q
+%patch1 -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
 
@@ -53,16 +56,12 @@ sed -i -e 's|/var/tpm|/var/lib/tpm|g' -e 's|/usr/local/var|/var|g' man/man5/tcsd
 make -k %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}/%{_localstatedir}/lib/tpm
 make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p"
 rm -f ${RPM_BUILD_ROOT}/%{_libdir}/libtspi.la
 mkdir -p $RPM_BUILD_ROOT%{_unitdir}
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/
 
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
 %pre
 getent group tss >/dev/null || groupadd -g 59 -r tss
 getent passwd tss >/dev/null || \
@@ -82,7 +81,6 @@ exit 0
 /sbin/ldconfig
 
 %files
-%defattr(-, root, root, -)
 %doc README LICENSE ChangeLog
 %{_sbindir}/tcsd
 %{_libdir}/libtspi.so.?
@@ -95,7 +93,6 @@ exit 0
 
 %files devel
 # The files to be used by developers, 'trousers-devel'
-%defattr(-, root, root, -)
 %doc doc/LTC-TSS_LLD_08_r2.pdf doc/TSS_programming_SNAFUs.txt
 %attr(0755, root, root) %{_libdir}/libtspi.so
 %{_includedir}/tss/
@@ -103,11 +100,17 @@ exit 0
 %doc %{_mandir}/man3/Tspi_*
 
 %files static
-%defattr(-, root, root, -)
 # The only static library shipped by trousers, the TDDL
 %{_libdir}/libtddl.a
 
 %changelog
+* Tue Mar 18 2014 Steve Grubb <sgrubb at redhat.com> 0.3.11.2-3
+- Fix crash when linking libgnutls and libmysqlclient (#1069079)
+- Don't order tcsd after syslog.target (#1055198)
+
+* Thu Feb 13 2014 Peter Robinson <pbrobinson at fedoraproject.org> 0.3.11.2-2
+- Minor spec cleanups
+
 * Mon Aug 19 2013 Steve Grubb <sgrubb at redhat.com> 0.3.11.2-1
 - New upstream bug fix and license change release