add patch provided by Justin Findlay in #124839 to correctly declare friend classes.

Package-Manager: portage-2.0.51.22-r3

4 files changed, 54 insertions, 46 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/Manifest b/app-admin/tripwire/Manifest
index 347d303cea6d..de481f8c52b0 100644
--- a/app-admin/tripwire/Manifest
+++ b/app-admin/tripwire/Manifest
@@ -1,51 +1,18 @@
-MD5 f0964a0160239a46e78f9c364349d381 ChangeLog 3687
-RMD160 c276ea33cbe3ad1805d6a1481b73c86156aece58 ChangeLog 3687
-SHA256 1051e7f3b91d28b3941e89d30afdecefd2eff2ad530236efa7de62074870a13f ChangeLog 3687
+MD5 e09264af88c4e9e8d9405f1d202a2785 tripwire-2.3.1.2-r2.ebuild 2911
+MD5 9433e066b2ab9f1acdee2054db93b340 tripwire-2.3.1.2-r1.ebuild 2839
+MD5 15d49395a4b8936fc207d4cf33a6d14a ChangeLog 3895
+MD5 96f9cca8215d6e0286f08431592d3677 metadata.xml 597
+MD5 89200584fa7125d82bf1f7b9d03ee3f9 files/tripwire-2.3.1-gcc3.patch 10099
+MD5 4a83584d44a4974cd6d48d695dfd1d67 files/twcfg.txt 604
 MD5 e914d46903a40939fe0be1057fdacc49 files/digest-tripwire-2.3.1.2-r1 564
-RMD160 7468a0dfd45af42f32ad9208bdcce805239b3e88 files/digest-tripwire-2.3.1.2-r1 564
-SHA256 1307e2fb8c45be00cd1331a770fdd887a2781ce7ff0ccd8e77154ae102b468ec files/digest-tripwire-2.3.1.2-r1 564
 MD5 deddc44c877ce004d107a14ac0f59307 files/digest-tripwire-2.3.1.2-r2 585
-RMD160 aae0cab6c4fa0407ffb3728bc06558c8d06a9a7c files/digest-tripwire-2.3.1.2-r2 585
-SHA256 bb21a5c79d9e9ea989993330e07d6d9aee62f94aabf5896a9209c62b9f944fa2 files/digest-tripwire-2.3.1.2-r2 585
 MD5 75e9a1c6b641f3fa13745cdf62a4557a files/tripwire-2.3.0-50-rfc822.patch 557
-RMD160 923f7c71e9d04313a8d788a9ddce9b9060dbd709 files/tripwire-2.3.0-50-rfc822.patch 557
-SHA256 c7b135e171a413669554f0198e69cbe865ce2f0c1ddcddcdd15b0d297f4c8491 files/tripwire-2.3.0-50-rfc822.patch 557
-MD5 9d0dd73d8730c89f332535146322befa files/tripwire-2.3.1-2-fhs.patch 577
-RMD160 60aa81a2e530ab4506326414cb3cf9acf1b3436a files/tripwire-2.3.1-2-fhs.patch 577
-SHA256 19ab8e5d04ec81a62770d0e6aba725ba74356f9f10e5265706812b9811db8431 files/tripwire-2.3.1-2-fhs.patch 577
-MD5 3959b3b97784a77954221e0bee1a4902 files/tripwire-2.3.1-2-gcc-3.3.patch 227
-RMD160 159a0ad6877ede8d4f87657e7909ef671062e20a files/tripwire-2.3.1-2-gcc-3.3.patch 227
-SHA256 888bf46f1b187a7f2067faad6013005cc48d7bb5e1365ec9b363542f683777ca files/tripwire-2.3.1-2-gcc-3.3.patch 227
-MD5 89200584fa7125d82bf1f7b9d03ee3f9 files/tripwire-2.3.1-gcc3.patch 10099
-RMD160 97520328897ca6494878d22c4385620ab1872117 files/tripwire-2.3.1-gcc3.patch 10099
-SHA256 c9908821e8db4e4be0bae927b1d0a090e39a76c79d4542f617c98f9d9af65a40 files/tripwire-2.3.1-gcc3.patch 10099
 MD5 87628f7bb2693d2ee923ad3bc1877533 files/tripwire-format-string-email-report.diff 472
-RMD160 bb73ceec4e3c467691aced7a64f307c2a221dd89 files/tripwire-format-string-email-report.diff 472
-SHA256 f1810f65bc0060539891ce46390c34ef276f68017b82f008b8b423f3f2e6a312 files/tripwire-format-string-email-report.diff 472
-MD5 9f4d29db16f00de44b06e3c3d4f7f50e files/tripwire-jbj.patch 2301
-RMD160 27c2dcc48f7856e1716956e2b254cbebe768e157 files/tripwire-jbj.patch 2301
-SHA256 bb688eb669f7d818853e0d225cf77b3cb915f03272b737861556c48d455c2afe files/tripwire-jbj.patch 2301
+MD5 c0cf6e656870aa10c4ba2e4730080131 files/twinstall.sh 10100
+MD5 dc8a15588e15d69aac97b46c51e2c83f files/tripwire-friend-classes.patch 1246
 MD5 b6be71c9a5138de4a71127fee3d9885e files/tripwire-mkstemp.patch 966
-RMD160 7d973717ba9b86d5700425e5d4f54be56871ee61 files/tripwire-mkstemp.patch 966
-SHA256 b9c8493ba919fa92de1911bacab93b127688b52e620659ac611506e9880f22f6 files/tripwire-mkstemp.patch 966
 MD5 033e88454d3adcf1cfc83270b4dc452e files/tripwire.cron 315
-RMD160 54365261e5bf170880680b97a7031d179bcb744d files/tripwire.cron 315
-SHA256 be7a322661616b558124d7c1124f742a20d9c83119648a1e1f83156015f634d0 files/tripwire.cron 315
+MD5 3959b3b97784a77954221e0bee1a4902 files/tripwire-2.3.1-2-gcc-3.3.patch 227
+MD5 9d0dd73d8730c89f332535146322befa files/tripwire-2.3.1-2-fhs.patch 577
 MD5 9bbdaa3abc2c11b40d15b5d19d2c56f0 files/tripwire.txt 8401
-RMD160 56bce8a3c2b46a4868fffb0a9f5691c2cdf3214e files/tripwire.txt 8401
-SHA256 6fdb25e5f862eb1d68d3d30fda73613f57ad572a97e2914b3054c3422f9c263f files/tripwire.txt 8401
-MD5 4a83584d44a4974cd6d48d695dfd1d67 files/twcfg.txt 604
-RMD160 430439e5fa5ae93efb5fc769c40e5b97daf466b7 files/twcfg.txt 604
-SHA256 31d7d51cf90ee95627e27732524a3ba2b90f074ceda23d0035c52d2b02d90846 files/twcfg.txt 604
-MD5 c0cf6e656870aa10c4ba2e4730080131 files/twinstall.sh 10100
-RMD160 e316719b100990112dc005964ec8bab73828a322 files/twinstall.sh 10100
-SHA256 edc9c96dee54c1564de52ca5e755bfdac42a35d5b821a97d4342d6121ffe433d files/twinstall.sh 10100
-MD5 96f9cca8215d6e0286f08431592d3677 metadata.xml 597
-RMD160 6e2dd8ea827cdf2fe6f42a6f1c6d60a784b5a532 metadata.xml 597
-SHA256 fb9731d8c088de4b66b051dfd72b5026aa8d91c0c8918ae5622e0174f9b4c527 metadata.xml 597
-MD5 9433e066b2ab9f1acdee2054db93b340 tripwire-2.3.1.2-r1.ebuild 2839
-RMD160 c44d97f4db72dee966b6676c5922d06c88bacf37 tripwire-2.3.1.2-r1.ebuild 2839
-SHA256 5ee19a835b4ea44ae429df2cab59cfab11ca61ab71d4c91c7b2d2dae3985aaf1 tripwire-2.3.1.2-r1.ebuild 2839
-MD5 2bca41a9c6a83c8f48621b938bf0c367 tripwire-2.3.1.2-r2.ebuild 2830
-RMD160 e9872f2993d762be7044b16e406e3f9ed2a22a48 tripwire-2.3.1.2-r2.ebuild 2830
-SHA256 db18ff19b273f8cebc01be9a6b6b121f2e6708cc18294d34ebfda82993db53b0 tripwire-2.3.1.2-r2.ebuild 2830
+MD5 9f4d29db16f00de44b06e3c3d4f7f50e files/tripwire-jbj.patch 2301
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
 }