[tripwire] 2.4.2.2, fix ftbfs

[Tom Callaway]

commit 9122326da1c6757abe7835c92eff953e7ff87257
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Mon Mar 5 15:31:59 2012 -0500

    2.4.2.2, fix ftbfs

 .gitignore                   |    1 +
 sources                      |    2 +-
 tripwire-2.4.2.2-gcc47.patch |   24 ++++++++++++++++++++++++
 tripwire.spec                |   26 ++++++++++++++++++--------
 4 files changed, 44 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3b8502d..eaae35c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 tripwire-2.4.1.2-src.tar.bz2
+/tripwire-2.4.2.2-src.tar.bz2
diff --git a/sources b/sources
index ba5d079..701ab99 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8a1147c278b528ed593023912c4b649a  tripwire-2.4.1.2-src.tar.bz2
+2462ea16fb0b5ae810471011ad2f2dd6  tripwire-2.4.2.2-src.tar.bz2
diff --git a/tripwire-2.4.2.2-gcc47.patch b/tripwire-2.4.2.2-gcc47.patch
new file mode 100644
index 0000000..6b25def
--- /dev/null
+++ b/tripwire-2.4.2.2-gcc47.patch
@@ -0,0 +1,24 @@
+diff -up tripwire-2.4.2.2-src/src/cryptlib/algebra.h.gcc47 tripwire-2.4.2.2-src/src/cryptlib/algebra.h
+--- tripwire-2.4.2.2-src/src/cryptlib/algebra.h.gcc47	2011-11-21 11:06:56.000000000 -0500
++++ tripwire-2.4.2.2-src/src/cryptlib/algebra.h	2012-03-05 15:17:32.733038609 -0500
+@@ -273,7 +273,7 @@ template <class T> T AbstractEuclideanDo
+ 	Element g[3]={b, a};
+ 	unsigned int i0=0, i1=1, i2=2;
+ 
+-	while (!Equal(g[i1], this->Zero()))
++	while (!this->Equal(g[i1], this->Zero()))
+ 	{
+ 		g[i2] = Mod(g[i0], g[i1]);
+ 		unsigned int t = i0; i0 = i1; i1 = i2; i2 = t;
+diff -up tripwire-2.4.2.2-src/src/twadmin/twadmincl.cpp.gcc47 tripwire-2.4.2.2-src/src/twadmin/twadmincl.cpp
+--- tripwire-2.4.2.2-src/src/twadmin/twadmincl.cpp.gcc47	2012-03-05 15:21:21.811528228 -0500
++++ tripwire-2.4.2.2-src/src/twadmin/twadmincl.cpp	2012-03-05 15:21:29.140447912 -0500
+@@ -35,6 +35,8 @@
+ 
+ #include "stdtwadmin.h"
+ 
++#include <unistd.h>
++
+ #include "twadmincl.h"
+ #include "twadminstrings.h"
+ #include "keygeneration.h"
diff --git a/tripwire.spec b/tripwire.spec
index 22d49b9..d8d97e9 100644
--- a/tripwire.spec
+++ b/tripwire.spec
@@ -2,8 +2,8 @@
 %define		path_to_sendmail /usr/sbin/sendmail
 
 Name:		tripwire
-Version:	2.4.1.2
-Release:	14%{?dist}
+Version:	2.4.2.2
+Release:	1%{?dist}
 Summary:	IDS (Intrusion Detection System)
 
 License:	GPLv2+
@@ -24,6 +24,7 @@ BuildRequires:	openssl-devel
 Requires(post):	sed
 
 Patch1:		tripwire-siggen-man8.patch
+Patch2:         tripwire-2.4.2.2-gcc47.patch
 
 %description
 Tripwire is a very valuable security tool for Linux systems, if  it  is
@@ -49,19 +50,25 @@ altered.
 %{__cp} -p %{SOURCE3} .
 
 %patch1 -p1 -b .siggen.manpage
+%patch2 -p1 -b .gcc47
 
 %build
 %{__chmod} 755 configure
 # RPM_OPT_FLAGS break the code (deadlock).
-export CXXFLAGS="-O -Wall -pipe -g"
-./configure -q \
+# export CXXFLAGS="-O -Wall -pipe -g"
+%configure \ 
 	path_to_vi=%{path_to_vi} \
 	path_to_sendmail=%{path_to_sendmail} \
-	--prefix=/ \
 	--sysconfdir=%{_sysconfdir}/tripwire \
-	--sbindir=%{_sbindir} \
-	--libdir=%{_var}/lib \
-	--mandir=%{_mandir}
+
+# ./configure -q \
+#	path_to_vi=%{path_to_vi} \
+#	path_to_sendmail=%{path_to_sendmail} \
+#	--prefix=/ \
+#	--sysconfdir=%{_sysconfdir}/tripwire \
+#	--sbindir=%{_sbindir} \
+#	--libdir=%{_var}/lib \
+#	--mandir=%{_mandir}
 
 %{__make} %{?_smp_mflags}
 
@@ -146,6 +153,9 @@ done
 
 
 %changelog
+* Mon Mar  5 2012 Tom Callaway <spot at fedoraproject.org> - 2.4.2.2-1
+- update to 2.4.2.2
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.1.2-14
 - Rebuilt for c++ ABI breakage