diff options
| -rw-r--r-- | app-admin/tripwire/ChangeLog | 7 | ||||
| -rw-r--r-- | app-admin/tripwire/files/tripwire-friend-classes.patch | 34 | ||||
| -rw-r--r-- | app-admin/tripwire/tripwire-2.3.1.2-r2.ebuild | 4 |
3 files changed, 43 insertions, 2 deletions
diff --git a/app-admin/tripwire/ChangeLog b/app-admin/tripwire/ChangeLog index 55f96db6f4b7..8620b11f358a 100644 --- a/app-admin/tripwire/ChangeLog +++ b/app-admin/tripwire/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-admin/tripwire # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/ChangeLog,v 1.21 2006/02/01 10:11:54 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/ChangeLog,v 1.22 2006/03/08 18:44:36 taviso Exp $ + + 08 Mar 2006; Tavis Ormandy <taviso@gentoo.org> + +files/tripwire-friend-classes.patch, tripwire-2.3.1.2-r2.ebuild: + add patch provided by Justin Findlay in #124839 to correctly declare friend + classes. 30 Jan 2006; Simon Stelling <blubb@gentoo.org> -files/tripwire.gif, tripwire-2.3.1.2-r1.ebuild, tripwire-2.3.1.2-r2.ebuild: diff --git a/app-admin/tripwire/files/tripwire-friend-classes.patch b/app-admin/tripwire/files/tripwire-friend-classes.patch new file mode 100644 index 000000000000..4dbcc56bd000 --- /dev/null +++ b/app-admin/tripwire/files/tripwire-friend-classes.patch @@ -0,0 +1,34 @@ +diff -Nru tripwire-2.3.1-2/src/fco/fconame.h tripwire-2.3.1-2-p1/src/fco/fconame.h +--- tripwire-2.3.1-2/src/fco/fconame.h 2000-10-27 18:25:40.000000000 -0600 ++++ tripwire-2.3.1-2-p1/src/fco/fconame.h 2006-03-08 11:21:03.000000000 -0700 +@@ -49,6 +49,7 @@ + /////////////////////////////////////////////////////////////////////////////// + class cFCONameTblNode; + class cFCONameIter; ++class cFCOName_i; + + class cFCOName : public iTypedSerializable + { +diff -Nru tripwire-2.3.1-2/src/fco/fcosetimpl.h tripwire-2.3.1-2-p1/src/fco/fcosetimpl.h +--- tripwire-2.3.1-2/src/fco/fcosetimpl.h 2000-10-27 18:25:39.000000000 -0600 ++++ tripwire-2.3.1-2-p1/src/fco/fcosetimpl.h 2006-03-08 11:07:14.000000000 -0700 +@@ -46,6 +46,8 @@ + #include "fconame.h" + #endif + ++class cFCOIterImpl; ++ + class cFCOSetImpl : public iFCOSet + { + friend class cFCOIterImpl; +diff -Nru tripwire-2.3.1-2/src/tw/fcoreport.h tripwire-2.3.1-2-p1/src/tw/fcoreport.h +--- tripwire-2.3.1-2/src/tw/fcoreport.h 2000-10-27 18:25:36.000000000 -0600 ++++ tripwire-2.3.1-2-p1/src/tw/fcoreport.h 2006-03-08 11:07:53.000000000 -0700 +@@ -85,6 +85,7 @@ + class cFileHeaderID; + class cErrorQueue; + class cFCOReportGenreHeader; ++class cFCOReportSpecIter; + + class cFCOReport : public iTypedSerializable + { diff --git a/app-admin/tripwire/tripwire-2.3.1.2-r2.ebuild b/app-admin/tripwire/tripwire-2.3.1.2-r2.ebuild index 3cefae8b252d..42ab52e1e6ff 100644 --- a/app-admin/tripwire/tripwire-2.3.1.2-r2.ebuild +++ b/app-admin/tripwire/tripwire-2.3.1.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.3.1.2-r2.ebuild,v 1.9 2006/02/01 10:11:54 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.3.1.2-r2.ebuild,v 1.10 2006/03/08 18:44:36 taviso Exp $ inherit eutils flag-o-matic @@ -38,6 +38,8 @@ src_unpack() { # Paul Herman has been maintaining some updates to tripwire # including autoconf support and portability fixes. # http://www.frenchfries.net/paul/tripwire/ + export EPATCH_OPTS="-F3 -l" + epatch ${FILESDIR}/tripwire-friend-classes.patch epatch ${DISTDIR}/tripwire-2.3.1-2-pherman-portability-0.9.diff.bz2 epatch ${FILESDIR}/tripwire-2.3.0-50-rfc822.patch } |