From e5540117ba1c6563cfbf85e5ed5ba8c21dbbdbb1 Mon Sep 17 00:00:00 2001
From: sgrubb <sgrubb@redhat.com>
Date: Tue, 18 Mar 2014 16:49:09 -0400
Subject: [PATCH] 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                  |  8 +++++++-
 3 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 trousers-0.3.11.2-constr.patch

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 45ae1fc..91b70a0 100644
--- a/trousers.spec
+++ b/trousers.spec
@@ -1,13 +1,14 @@
 Name: trousers
 Summary: TCG's Software Stack v1.2
 Version: 0.3.11.2
-Release: 2%{?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
+Patch1: trousers-0.3.11.2-constr.patch
 
 BuildRequires: libtool, openssl-devel
 BuildRequires: systemd
@@ -45,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
 
@@ -102,6 +104,10 @@ exit 0
 %{_libdir}/libtddl.a
 
 %changelog
+* Tue Mar 18 2014 Steve Grubb <sgrubb@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@fedoraproject.org> 0.3.11.2-2
 - Minor spec cleanups