[packages/tripwire] - removed obsolete patches

baggins baggins at pld-linux.org
Thu Jan 25 19:57:59 CET 2018


commit 063b60f9b85ef59a70f105fd174dda7a8a280f9a
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Jan 25 19:57:29 2018 +0100

    - removed obsolete patches

 off_t.patch          | 12 ------------
 tripwire-gcc47.patch | 24 ------------------------
 tripwire.spec        |  4 ----
 3 files changed, 40 deletions(-)
---
diff --git a/tripwire.spec b/tripwire.spec
index b9b56ab..da55591 100644
--- a/tripwire.spec
+++ b/tripwire.spec
@@ -18,9 +18,7 @@ Source1:	%{name}.verify
 Source2:	%{name}-tw.cfg
 Source3:	README.SuSE
 Patch0:		%{name}-sec.patch
-Patch1:		off_t.patch
 Patch2:		policyconfig.patch
-Patch3:		%{name}-gcc47.patch
 URL:		https://github.com/Tripwire/tripwire-open-source
 %{?with_static:BuildRequires:	glibc-static}
 BuildRequires:	libstdc++-devel
@@ -41,9 +39,7 @@ measures immediately.
 
 %prep
 %setup -q -n %{name}-open-source-%{version}
-%patch1 -p1
 %patch2 -p1
-%patch3 -p1
 install %{SOURCE3} .
 
 %build
diff --git a/off_t.patch b/off_t.patch
deleted file mode 100644
index b516d44..0000000
--- a/off_t.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr tripwire-2.4.1.2-src.orig//src/core/file.h tripwire-2.4.1.2-src//src/core/file.h
---- tripwire-2.4.1.2-src.orig//src/core/file.h 2005-09-16 05:12:36.000000000 +0200
-+++ tripwire-2.4.1.2-src//src/core/file.h  2009-06-04 16:58:07.168416000 +0200
-@@ -73,7 +73,7 @@
- {
- public:
- #if IS_UNIX
--	typedef int32 File_t;
-+	typedef off_t File_t;
-
- #else //WIN32
-     typedef int64 File_t;
diff --git a/tripwire-gcc47.patch b/tripwire-gcc47.patch
deleted file mode 100644
index 6b25def..0000000
--- a/tripwire-gcc47.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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/063b60f9b85ef59a70f105fd174dda7a8a280f9a



More information about the pld-cvs-commit mailing list