From 9cc356f76f27fb178bb084e3cc8ec211bf72fc9b Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 19 2015 16:09:58 +0000 Subject: import trousers-0.3.13-1.el7 --- diff --git a/.gitignore b/.gitignore index f2332b0..7d14416 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/trousers-0.3.11.2.tar.gz +SOURCES/trousers-0.3.13.tar.gz diff --git a/.trousers.metadata b/.trousers.metadata index aefbee1..d062918 100644 --- a/.trousers.metadata +++ b/.trousers.metadata @@ -1 +1 @@ -46e96cee0f5bf70d67d64a2d8df7042106b34221 SOURCES/trousers-0.3.11.2.tar.gz +d23f1a3df4febffc4174f5cca7d1c54230477bb2 SOURCES/trousers-0.3.13.tar.gz diff --git a/SOURCES/rhbz-1071171-1224558.patch b/SOURCES/rhbz-1071171-1224558.patch deleted file mode 100644 index fa59d1f..0000000 --- a/SOURCES/rhbz-1071171-1224558.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 182e89a..6bdaddb 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: 4%{?dist} +Version: 0.3.13 +Release: 1%{?dist} License: BSD Group: System Environment/Libraries Url: http://trousers.sourceforge.net @@ -14,7 +14,6 @@ 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 @@ -45,7 +44,6 @@ 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 @@ -110,8 +108,8 @@ exit 0 %{_libdir}/libtddl.a %changelog -* Tue May 26 2015 Avesh Agarwal - 0.3.11.2-4 -Resolves: rhbz#1224558 +* Sun May 24 2015 Avesh Agarwal 0.3.13-1 +Resolves: rhbz#1173221 New upstream bug fix release * Fri Jan 24 2014 Daniel Mach - 0.3.11.2-3 - Mass rebuild 2014-01-24