[packages/tripwire] - patch for gcc-4.7

draenog draenog at pld-linux.org
Wed May 15 11:39:45 CEST 2013


commit 035bcf494a4ede1eaad9747f1386e332f25fd20c
Author: Kacper Kornet <draenog at pld-linux.org>
Date:   Wed May 15 10:37:01 2013 +0100

    - patch for gcc-4.7

 tripwire-gcc47.patch | 24 ++++++++++++++++++++++++
 tripwire.spec        |  2 ++
 2 files changed, 26 insertions(+)
---
diff --git a/tripwire.spec b/tripwire.spec
index 4bcffb2..ba26a18 100644
--- a/tripwire.spec
+++ b/tripwire.spec
@@ -20,6 +20,7 @@ Source3:	README.SuSE
 Patch0:		%{name}-sec.patch
 Patch1:		off_t.patch
 Patch2:		policyconfig.patch
+Patch3:		%{name}-gcc47.patch
 URL:		http://sourceforge.net/projects/tripwire/
 %{?with_static:BuildRequires:	glibc-static}
 BuildRequires:	libstdc++-devel
@@ -42,6 +43,7 @@ measures immediately.
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 install %{SOURCE3} .
 
 %build
diff --git a/tripwire-gcc47.patch b/tripwire-gcc47.patch
new file mode 100644
index 0000000..6b25def
--- /dev/null
+++ b/tripwire-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"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/tripwire.git/commitdiff/035bcf494a4ede1eaad9747f1386e332f25fd20c



More information about the pld-cvs-commit mailing list