Fix crash when linking libgnutls and libmysqlclient (#1069079)

- Don't order tcsd after syslog.target (#1055198)
epel9
sgrubb 11 years ago
parent 7d09ecae40
commit e5540117ba

@ -1,6 +1,5 @@
[Unit] [Unit]
Description=TCG Core Services Daemon Description=TCG Core Services Daemon
After=syslog.target
[Service] [Service]
Type=forking Type=forking

@ -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();

@ -1,13 +1,14 @@
Name: trousers Name: trousers
Summary: TCG's Software Stack v1.2 Summary: TCG's Software Stack v1.2
Version: 0.3.11.2 Version: 0.3.11.2
Release: 2%{?dist} Release: 3%{?dist}
License: BSD License: BSD
Group: System Environment/Libraries Group: System Environment/Libraries
Url: http://trousers.sourceforge.net Url: http://trousers.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1: tcsd.service Source1: tcsd.service
Patch1: trousers-0.3.11.2-constr.patch
BuildRequires: libtool, openssl-devel BuildRequires: libtool, openssl-devel
BuildRequires: systemd BuildRequires: systemd
@ -45,6 +46,7 @@ applications.
%prep %prep
%setup -q %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 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 %{_libdir}/libtddl.a
%changelog %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 * Thu Feb 13 2014 Peter Robinson <pbrobinson@fedoraproject.org> 0.3.11.2-2
- Minor spec cleanups - Minor spec cleanups

Loading…
Cancel
Save