diff --git a/.gitignore b/.gitignore index 2d85d98..fcf168a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ trousers-0.3.1.tar.gz trousers-0.3.4.tar.gz /trousers-0.3.6.tar.gz /trousers-0.3.9.tar.gz +/trousers-0.3.10.tar.gz diff --git a/sources b/sources index d471d82..7741b79 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1322030eb2540ea0640cfe471b077f32 trousers-0.3.9.tar.gz +27b7374d991874b4a0a973b1c952c79f trousers-0.3.10.tar.gz diff --git a/trousers-no-werror.patch b/trousers-no-werror.patch deleted file mode 100644 index 639b580..0000000 --- a/trousers-no-werror.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur trousers-0.3.9.orig/configure trousers-0.3.9/configure ---- trousers-0.3.9.orig/configure 2012-05-30 11:16:40.000000000 -0400 -+++ trousers-0.3.9/configure 2012-08-30 14:14:18.569347485 -0400 -@@ -13503,7 +13503,7 @@ - - - if test "x${GCC}" = "xyes"; then -- CFLAGS="$CFLAGS -W -Wall -Werror -Wno-unused-parameter -Wsign-compare" -+ CFLAGS="$CFLAGS -W -Wall -Wno-unused-parameter -Wsign-compare" - fi - - CFLAGS="$CFLAGS -I../include \ -diff -ur trousers-0.3.9.orig/src/tcsd/Makefile.in trousers-0.3.9/src/tcsd/Makefile.in ---- trousers-0.3.9.orig/src/tcsd/Makefile.in 2012-05-30 11:16:41.000000000 -0400 -+++ trousers-0.3.9/src/tcsd/Makefile.in 2012-08-30 14:14:18.570347484 -0400 -@@ -56,7 +56,7 @@ - ${top_builddir}/src/tddl/libtddl.a - tcsd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(tcsd_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+ -Wl,-z,relro -Wl,-z,now $(LDFLAGS) -o $@ - DEFAULT_INCLUDES = -I.@am__isrc@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles diff --git a/trousers.spec b/trousers.spec index 23d6f83..ae52bc8 100644 --- a/trousers.spec +++ b/trousers.spec @@ -1,14 +1,12 @@ Name: trousers Summary: TCG's Software Stack v1.2 -Version: 0.3.9 -Release: 4%{?dist} +Version: 0.3.10 +Release: 1%{?dist} License: CPL Group: System Environment/Libraries Url: http://trousers.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: tcsd.service -# We have newer compiler which has new warnings -Patch1: trousers-no-werror.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool, openssl-devel BuildRequires: systemd-units @@ -46,7 +44,6 @@ 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 @@ -109,6 +106,9 @@ exit 0 %{_libdir}/libtddl.a %changelog +* Tue Sep 25 2012 Steve Grubb 0.3.10-1 +- New upstream bug fix release + * Thu Aug 30 2012 Steve Grubb 0.3.9-4 - Make daemon full RELRO