move compressed files to the mirrors

Package-Manager: portage-2.1_pre3-r1

18 files changed, 432 insertions, 38 deletions

diff --git a/app-admin/tripwire/ChangeLog b/app-admin/tripwire/ChangeLog
index 8a32e55ed6c9..7cc61d48cbd0 100644
--- a/app-admin/tripwire/ChangeLog
+++ b/app-admin/tripwire/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-admin/tripwire
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/ChangeLog,v 1.18 2005/08/22 18:08:01 taviso Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/ChangeLog,v 1.19 2006/01/29 15:39:26 blubb Exp $
+
+  28 Jan 2006; Simon Stelling <blubb@gentoo.org>
+  +files/tripwire-2.3.0-50-rfc822.patch,
+  -files/tripwire-2.3.0-50-rfc822.patch.bz2,
+  +files/tripwire-2.3.1-2-fhs.patch, +files/tripwire-2.3.1-gcc3.patch,
+  -files/tripwire-2.3.1-2-fhs.patch.bz2,
+  -files/tripwire-2.3.1-gcc3.patch.bz2,
+  +files/tripwire-2.3.1-2-gcc-3.3.patch,
+  -files/tripwire-2.3.1-2-gcc-3.3.patch.bz2, +files/tripwire-jbj.patch,
+  -files/tripwire-jbj.patch.bz2, +files/tripwire-mkstemp.patch,
+  -files/tripwire-mkstemp.patch.bz2, tripwire-2.3.1.2-r1.ebuild,
+  tripwire-2.3.1.2-r2.ebuild:
+  move compressed files that are too big to the mirrors
 
   22 Aug 2005; Tavis Ormandy <taviso@gentoo.org> tripwire-2.3.1.2-r2.ebuild:
   stable on x86
diff --git a/app-admin/tripwire/Manifest b/app-admin/tripwire/Manifest
index 9d1c0dd354fc..2d0165387375 100644
--- a/app-admin/tripwire/Manifest
+++ b/app-admin/tripwire/Manifest
@@ -1,19 +1,19 @@
-MD5 d846d9e5f1826e553513d8640c1093b6 tripwire-2.3.1.2-r2.ebuild 2826
-MD5 b1afb5171fb12827d214ec74053d13b5 tripwire-2.3.1.2-r1.ebuild 2858
-MD5 4da136b7ca6ed91fe4e71904349a7d71 ChangeLog 2773
-MD5 96f9cca8215d6e0286f08431592d3677 metadata.xml 597
-MD5 fa08ee8d578671e3f18b1ce684e0fa31 files/tripwire-2.3.1-2-fhs.patch.bz2 327
-MD5 7b5cac2555db706d0bdc2c49d7f6b9e9 files/tripwire-mkstemp.patch.bz2 564
-MD5 4a83584d44a4974cd6d48d695dfd1d67 files/twcfg.txt 604
-MD5 9493ba83857bc6cfcd276f74becaa98e files/digest-tripwire-2.3.1.2-r1 142
-MD5 1e76f292b15c2e2e490e3f7a7fbc4e9c files/digest-tripwire-2.3.1.2-r2 163
-MD5 0700fa22e2353e11c842f48453703d96 files/tripwire-2.3.0-50-rfc822.patch.bz2 347
+MD5 281b2a9b3afd21580f3fdbf4b3e5c21d ChangeLog 3389
+MD5 6b7d0475909884203025366820f9e857 files/digest-tripwire-2.3.1.2-r1 197
+MD5 7459c141258909d28c85d6158c4ffbf6 files/digest-tripwire-2.3.1.2-r2 218
+MD5 75e9a1c6b641f3fa13745cdf62a4557a files/tripwire-2.3.0-50-rfc822.patch 557
+MD5 9d0dd73d8730c89f332535146322befa files/tripwire-2.3.1-2-fhs.patch 577
+MD5 3959b3b97784a77954221e0bee1a4902 files/tripwire-2.3.1-2-gcc-3.3.patch 227
+MD5 89200584fa7125d82bf1f7b9d03ee3f9 files/tripwire-2.3.1-gcc3.patch 10099
 MD5 87628f7bb2693d2ee923ad3bc1877533 files/tripwire-format-string-email-report.diff 472
-MD5 c0cf6e656870aa10c4ba2e4730080131 files/twinstall.sh 10100
-MD5 f776500cdf290f2a953a9884c0e49f72 files/twpol.txt.gz 7586
-MD5 30e2f2f5df395d3dd1dc02fb40d9810c files/tripwire-2.3.1-gcc3.patch.bz2 2878
-MD5 504ee0af20b026a651c89030f87c6e10 files/tripwire-2.3.1-2-gcc-3.3.patch.bz2 197
+MD5 9f4d29db16f00de44b06e3c3d4f7f50e files/tripwire-jbj.patch 2301
+MD5 b6be71c9a5138de4a71127fee3d9885e files/tripwire-mkstemp.patch 966
 MD5 033e88454d3adcf1cfc83270b4dc452e files/tripwire.cron 315
-MD5 6e77715bf58f0e8122d2a2ec2344edab files/tripwire-jbj.patch.bz2 791
 MD5 e68a00cf5ccdd906adec70a54fdfb66b files/tripwire.gif 4679
 MD5 9bbdaa3abc2c11b40d15b5d19d2c56f0 files/tripwire.txt 8401
+MD5 4a83584d44a4974cd6d48d695dfd1d67 files/twcfg.txt 604
+MD5 c0cf6e656870aa10c4ba2e4730080131 files/twinstall.sh 10100
+MD5 f776500cdf290f2a953a9884c0e49f72 files/twpol.txt.gz 7586
+MD5 96f9cca8215d6e0286f08431592d3677 metadata.xml 597
+MD5 fddf2cf1fc2aa765572a6e52100bf02d tripwire-2.3.1.2-r1.ebuild 2815
+MD5 479a942c1d5edd08a431708ee8d4cafc tripwire-2.3.1.2-r2.ebuild 2802
diff --git a/app-admin/tripwire/files/digest-tripwire-2.3.1.2-r1 b/app-admin/tripwire/files/digest-tripwire-2.3.1.2-r1
index 7bf1e05bec86..7b82e63c8560 100644
--- a/app-admin/tripwire/files/digest-tripwire-2.3.1.2-r1
+++ b/app-admin/tripwire/files/digest-tripwire-2.3.1.2-r1
@@ -1,2 +1,3 @@
 MD5 6a15fe110565cef9ed33c1c7e070355e tripwire-2.3.1-2.tar.gz 1514955
 MD5 46659bfa3a1201757e070c51207de884 tripwire_2.3.1.2-6.1.diff.gz 608867
+MD5 f776500cdf290f2a953a9884c0e49f72 twpol.txt.gz 7586
diff --git a/app-admin/tripwire/files/digest-tripwire-2.3.1.2-r2 b/app-admin/tripwire/files/digest-tripwire-2.3.1.2-r2
index 91953f2b95f3..0eb4dc5334e8 100644
--- a/app-admin/tripwire/files/digest-tripwire-2.3.1.2-r2
+++ b/app-admin/tripwire/files/digest-tripwire-2.3.1.2-r2
@@ -1,2 +1,3 @@
-MD5 6a15fe110565cef9ed33c1c7e070355e tripwire-2.3.1-2.tar.gz 1514955
 MD5 636163bdefb935e1e5e46aa57f4051eb tripwire-2.3.1-2-pherman-portability-0.9.diff.bz2 739663
+MD5 6a15fe110565cef9ed33c1c7e070355e tripwire-2.3.1-2.tar.gz 1514955
+MD5 f776500cdf290f2a953a9884c0e49f72 twpol.txt.gz 7586
diff --git a/app-admin/tripwire/files/tripwire-2.3.0-50-rfc822.patch b/app-admin/tripwire/files/tripwire-2.3.0-50-rfc822.patch
new file mode 100644
index 000000000000..7811135a9ffa
--- /dev/null
+++ b/app-admin/tripwire/files/tripwire-2.3.0-50-rfc822.patch
@@ -0,0 +1,12 @@
+diff -Naur tripwire-2.3.0-50-orig/src/tripwire/mailmessage.cpp tripwire-2.3.0-50/src/tripwire/mailmessage.cpp
+--- tripwire-2.3.0-50-orig/src/tripwire/mailmessage.cpp	Sat Oct 28 02:26:18 2000
++++ tripwire-2.3.0-50/src/tripwire/mailmessage.cpp	Thu Jul  5 05:12:54 2001
+@@ -241,7 +241,7 @@
+ 	time_t current_time = time(NULL);
+ 	tm = localtime ( &current_time );
+ 	
+-	const TCHAR* szFormat = _T("%a %d %b %Y %H:%M:%S %z");
++	const TCHAR* szFormat = _T("%a, %d %b %Y %H:%M:%S %z");
+ 	
+ 	size_t numChars = _tcsftime( szDate, countof( szDate ), szFormat, tm );
+ 	
diff --git a/app-admin/tripwire/files/tripwire-2.3.0-50-rfc822.patch.bz2 b/app-admin/tripwire/files/tripwire-2.3.0-50-rfc822.patch.bz2
deleted file mode 100644
index 7dbf773552e8..000000000000
--- a/app-admin/tripwire/files/tripwire-2.3.0-50-rfc822.patch.bz2
+++ /dev/null
diff --git a/app-admin/tripwire/files/tripwire-2.3.1-2-fhs.patch b/app-admin/tripwire/files/tripwire-2.3.1-2-fhs.patch
new file mode 100644
index 000000000000..0a146ebb6f87
--- /dev/null
+++ b/app-admin/tripwire/files/tripwire-2.3.1-2-fhs.patch
@@ -0,0 +1,13 @@
+The header defines USES_FHS, while some source files expect USE_FHS, so
+define both to be safe.
+
+--- tripwire-2.3.1-2/src/core/platform.h	Fri Aug 10 00:29:29 2001
++++ tripwire-2.3.1-2/src/core/platform.h	Fri Aug 10 00:29:36 2001
+@@ -291,6 +291,7 @@
+ //       where <tw-exe-dir> is the directory the tripwire executable is located in.
+ //=============================================================================
+ #define USES_FHS 				IS_LINUX
++#define USE_FHS 				IS_LINUX
+ 
+ //=============================================================================
+ // Miscellaneous
diff --git a/app-admin/tripwire/files/tripwire-2.3.1-2-fhs.patch.bz2 b/app-admin/tripwire/files/tripwire-2.3.1-2-fhs.patch.bz2
deleted file mode 100644
index e88f0054f81a..000000000000
--- a/app-admin/tripwire/files/tripwire-2.3.1-2-fhs.patch.bz2
+++ /dev/null
diff --git a/app-admin/tripwire/files/tripwire-2.3.1-2-gcc-3.3.patch b/app-admin/tripwire/files/tripwire-2.3.1-2-gcc-3.3.patch
new file mode 100644
index 000000000000..9d9f30b2a8cd
--- /dev/null
+++ b/app-admin/tripwire/files/tripwire-2.3.1-2-gcc-3.3.patch
@@ -0,0 +1,11 @@
+--- src/core/debug.h~	2000-10-28 03:15:19.000000000 +0200
++++ src/core/debug.h	2003-07-14 06:16:37.000000000 +0200
+@@ -43,7 +43,7 @@
+ 
+ 
+ #include <iostream>
+-#include <varargs.h>
++#include <stdarg.h>
+ #include "types.h"
+ 
+ //
diff --git a/app-admin/tripwire/files/tripwire-2.3.1-2-gcc-3.3.patch.bz2 b/app-admin/tripwire/files/tripwire-2.3.1-2-gcc-3.3.patch.bz2
deleted file mode 100644
index d8ca42dc028f..000000000000
--- a/app-admin/tripwire/files/tripwire-2.3.1-2-gcc-3.3.patch.bz2
+++ /dev/null
diff --git a/app-admin/tripwire/files/tripwire-2.3.1-gcc3.patch b/app-admin/tripwire/files/tripwire-2.3.1-gcc3.patch
new file mode 100644
index 000000000000..9b2ae7539ce1
--- /dev/null
+++ b/app-admin/tripwire/files/tripwire-2.3.1-gcc3.patch
@@ -0,0 +1,256 @@
+--- tripwire-2.3.1-2/src/core/stringutil.h.sopwith	Sun Feb  4 00:38:27 2001
++++ tripwire-2.3.1-2/src/core/stringutil.h	Fri Feb  1 01:11:59 2002
+@@ -64,7 +64,7 @@
+     Convert( std::string& lhs, const std::string& rhs )
+     {
+       lhs = rhs;
+-      return lhs.c_str();
++      return std::string::const_iterator(lhs.c_str());
+     }
+ 
+   /// Specialize Everything Else
+--- tripwire-2.3.1-2/src/core/charutil.cpp.sopwith	Sat Oct 28 15:22:55 2000
++++ tripwire-2.3.1-2/src/core/charutil.cpp	Fri Feb  1 01:11:59 2002
+@@ -105,7 +105,7 @@
+     }
+ 
+     first = cur;
+-    last = tss::strinc( cur );
++    last = TSTRING::const_iterator(tss::strinc( cur.base() ));
+     return true;
+ }
+ 
+--- tripwire-2.3.1-2/src/core/displayencoder.cpp.sopwith	Fri Oct 27 21:15:20 2000
++++ tripwire-2.3.1-2/src/core/displayencoder.cpp	Fri Feb  1 01:11:59 2002
+@@ -828,7 +828,8 @@
+             ach[0] = ch;
+             for( sack_type::const_iterator atE = m_encodings.begin(); atE != m_encodings.end(); atE++ )
+             {
+-                if( (*atE)->NeedsEncoding( &ach[0], &ach[1] ) )
++                if( (*atE)->NeedsEncoding( std::string::const_iterator(&ach[0]),
++					   std::string::const_iterator(&ach[1]) ) )
+                 {
+                     if( fFailedATest )
+                         return false; // each char can only fail one test
+--- tripwire-2.3.1-2/src/core/displayutil.cpp.sopwith	Sat Oct 28 15:22:55 2000
++++ tripwire-2.3.1-2/src/core/displayutil.cpp	Fri Feb  1 01:11:59 2002
+@@ -45,7 +45,7 @@
+     TOSTRINGSTREAM sstr;
+     TSTRING strT;
+     bool fFirstLine = true;
+-    for( TSTRING::const_iterator i = str.begin(); i != str.end(); i = tss::strinc( i ) )
++    for( TSTRING::const_iterator i = str.begin(); i != str.end(); i = TSTRING::const_iterator(tss::strinc( i.base() )) )
+     {
+         // return found -- add line to output string
+         if( _T('\n') == *i )
+@@ -74,7 +74,7 @@
+         else
+         {
+             // add char to string   
+-            strT.append( i, (TSTRING::const_iterator)tss::strinc( i ) );
++            strT.append( i, TSTRING::const_iterator(tss::strinc( i.base() )) );
+         }
+     }    
+                 
+--- tripwire-2.3.1-2/src/cryptlib/misc.h.sopwith	Fri Oct 27 20:26:21 2000
++++ tripwire-2.3.1-2/src/cryptlib/misc.h	Fri Feb  1 01:11:59 2002
+@@ -150,7 +150,7 @@
+ 	operator T *()
+ 		{return ptr;}
+ 
+-#if !defined(_MSC_VER) && !defined(_KCC)
++#if !defined(_MSC_VER) && !defined(_KCC) && 0
+     T *operator +(unsigned int offset)
+ 		{return ptr+offset;}
+ 	const T *operator +(unsigned int offset) const
+--- tripwire-2.3.1-2/src/cryptlib/i686-pc-linux.mak.sopwith	Fri Feb  1 01:12:57 2002
++++ tripwire-2.3.1-2/src/cryptlib/i686-pc-linux.mak	Fri Feb  1 01:13:12 2002
+@@ -71,12 +71,12 @@
+ # Recusively call make defining the appropriate $(D_FLAGS) var
+ 
+ debug:
+-	gmake -f $(MAKEFILE) cryptlib_d.a "D_FLAGS=$(DEBUG_FLAGS)" "LDFLAGS=DEBUG_LDFLAGS"
+-#	gmake -f $(MAKEFILE) cryptest_d "D_FLAGS=$(DEBUG_FLAGS)" "LDFLAGS=DEBUG_LDFLAGS"
++	$(MAKE) -f $(MAKEFILE) cryptlib_d.a "D_FLAGS=$(DEBUG_FLAGS)" "LDFLAGS=DEBUG_LDFLAGS"
++#	$(MAKE) -f $(MAKEFILE) cryptest_d "D_FLAGS=$(DEBUG_FLAGS)" "LDFLAGS=DEBUG_LDFLAGS"
+ 
+ release: 
+-	gmake -f $(MAKEFILE) cryptlib.a "D_FLAGS=$(NDEBUG_FLAGS)" "LDFLAGS=NDEBUG_LDFLAGS"
+-#	gmake -f $(MAKEFILE) cryptest "D_FLAGS=$(NDEBUG_FLAGS)" "LDFLAGS=NDEBUG_LDFLAGS"
++	$(MAKE) -f $(MAKEFILE) cryptlib.a "D_FLAGS=$(NDEBUG_FLAGS)" "LDFLAGS=NDEBUG_LDFLAGS"
++#	$(MAKE) -f $(MAKEFILE) cryptest "D_FLAGS=$(NDEBUG_FLAGS)" "LDFLAGS=NDEBUG_LDFLAGS"
+ 
+  
+ ###############################################################################
+--- tripwire-2.3.1-2/src/db/hierdatabase.cpp.sopwith	Sun Feb 25 00:41:13 2001
++++ tripwire-2.3.1-2/src/db/hierdatabase.cpp	Fri Feb  1 01:11:59 2002
+@@ -255,7 +255,8 @@
+ 	}
+ 	else
+ 	{
+-		int offset	= rhs.mIter - rhs.mEntries.begin();
++	        int offset;
++		offset = -(rhs.mEntries.begin() - rhs.mIter);
+ 		mIter		= mEntries.begin() + offset;
+ 	}
+ 
+--- tripwire-2.3.1-2/src/fco/fconame.cpp.sopwith	Fri Oct 27 20:25:41 2000
++++ tripwire-2.3.1-2/src/fco/fconame.cpp	Fri Feb  1 01:11:59 2002
+@@ -269,7 +269,7 @@
+ 	
+     mpPathName->ClearList();
+ 	
+-	TSTRING::const_iterator at  = ( pszin + 0 );
++	TSTRING::const_iterator at  = TSTRING::const_iterator( pszin + 0 );
+     TSTRING::const_iterator end = at;
+     while ( *end ) ++end;               // NOTE: Find end
+ 
+@@ -277,9 +277,9 @@
+ 	while ( at < end )
+ 	{
+ 		while ( !(*at == mDelimiter) && at < end )
+-            at = tss::strinc( at );
++            at = TSTRING::const_iterator(tss::strinc( at.base() ));
+ 
+-        if ( at == beg && tss::strinc(at) >= end && at != pszin )
++        if ( at == beg && TSTRING::const_iterator(tss::strinc(at.base())) >= end && at.base() != pszin )
+             break;
+ 
+ 		cFCONameTblNode* pNode = 
+@@ -287,7 +287,7 @@
+ 
+         mpPathName->mNames.push_back( pNode );
+ 		
+-        beg = ( at = tss::strinc( at ) );
++        beg = ( at = TSTRING::const_iterator(tss::strinc( at.base() )) );
+ 	}
+ }
+ 
+Binary files tripwire-2.3.1-2/src/make_include/i686-pc-linux.inc.sopwith and tripwire-2.3.1-2/src/make_include/i686-pc-linux.inc differ
+--- tripwire-2.3.1-2/src/siggen/siggenmain.cpp.sopwith	Fri Oct 27 20:26:25 2000
++++ tripwire-2.3.1-2/src/siggen/siggenmain.cpp	Fri Feb  1 01:11:59 2002
+@@ -118,11 +118,7 @@
+         // set unexpected and terminate handlers
+         // Note: we do this before Init() in case it attempts to call these handlers
+         // TODO: move this into the Init() routine
+-#if IS_GCC
+-            #define EXCEPTION_NAMESPACE 
+-        #else
+-            #define EXCEPTION_NAMESPACE std::
+-        #endif
++#define EXCEPTION_NAMESPACE std::
+         EXCEPTION_NAMESPACE set_terminate(tw_terminate_handler);
+         EXCEPTION_NAMESPACE set_unexpected(tw_unexpected_handler);
+ 
+--- tripwire-2.3.1-2/src/tripwire/mailmessage.cpp.sopwith	Fri Feb  1 01:11:59 2002
++++ tripwire-2.3.1-2/src/tripwire/mailmessage.cpp	Fri Feb  1 01:11:59 2002
+@@ -509,9 +509,9 @@
+     std::string::size_type stringSize = 0;
+     std::string::const_iterator at;
+     std::string::difference_type charSize;
+-    for( at = sIn.begin(), charSize = ( tss::strinc( at ) - at );
++    for( at = sIn.begin(), charSize = ( std::string::const_iterator(tss::strinc( at.base() )) - at );
+          at != sIn.end();
+-         at += charSize, charSize = ( tss::strinc( at ) - at ) )
++         at += charSize, charSize = ( std::string::const_iterator(tss::strinc( at.base() )) - at ) )
+     {
+         ASSERT( charSize > 0 );
+ 
+--- tripwire-2.3.1-2/src/tripwire/tripwiremain.cpp.sopwith	Sat Feb 24 14:02:12 2001
++++ tripwire-2.3.1-2/src/tripwire/tripwiremain.cpp	Fri Feb  1 01:11:59 2002
+@@ -122,11 +122,7 @@
+         // set unexpected and terminate handlers
+         // Note: we do this before Init() in case it attempts to call these handlers
+         // TODO: move this into the Init() routine
+-#if IS_GCC
+-            #define EXCEPTION_NAMESPACE 
+-        #else
+-            #define EXCEPTION_NAMESPACE std::
+-        #endif
++#define EXCEPTION_NAMESPACE std::
+         EXCEPTION_NAMESPACE set_terminate(tw_terminate_handler);
+         EXCEPTION_NAMESPACE set_unexpected(tw_unexpected_handler);
+ 
+--- tripwire-2.3.1-2/src/twadmin/twadminmain.cpp.sopwith	Fri Oct 27 20:26:22 2000
++++ tripwire-2.3.1-2/src/twadmin/twadminmain.cpp	Fri Feb  1 01:11:59 2002
+@@ -86,11 +86,7 @@
+         // set unexpected and terminate handlers
+         // Note: we do this before Init() in case it attempts to call these handlers
+         // TODO: move this into the Init() routine
+-#if IS_GCC
+-            #define EXCEPTION_NAMESPACE 
+-        #else
+-            #define EXCEPTION_NAMESPACE std::
+-        #endif
++#define EXCEPTION_NAMESPACE std::
+         EXCEPTION_NAMESPACE set_terminate(tw_terminate_handler);
+         EXCEPTION_NAMESPACE set_unexpected(tw_unexpected_handler);
+ 
+--- tripwire-2.3.1-2/src/twparser/policyparser.cpp.sopwith	Sat Feb 24 14:02:12 2001
++++ tripwire-2.3.1-2/src/twparser/policyparser.cpp	Fri Feb  1 01:11:59 2002
+@@ -228,7 +228,7 @@
+          // at gets incremented when used....
+        )
+     {
+-        int nBytes = ::mblen( (char*)at, MB_CUR_MAX );
++        int nBytes = ::mblen( at.base(), MB_CUR_MAX );
+         if ( nBytes == -1 )
+         {
+             d.TraceDebug( "Unrecognized Character: %c\n", *at );
+--- tripwire-2.3.1-2/src/twprint/twprintmain.cpp.sopwith	Fri Oct 27 20:26:19 2000
++++ tripwire-2.3.1-2/src/twprint/twprintmain.cpp	Fri Feb  1 01:11:59 2002
+@@ -98,8 +98,8 @@
+ #if IS_GCC
+           #define EXCEPTION_NAMESPACE 
+         #else
+-          #define EXCEPTION_NAMESPACE std::
+         #endif
++#define EXCEPTION_NAMESPACE std::
+ 	  EXCEPTION_NAMESPACE set_terminate(tw_terminate_handler);
+ 	  EXCEPTION_NAMESPACE set_unexpected(tw_unexpected_handler);
+ 
+--- tripwire-2.3.1-2/src/Makefile.sopwith	Sat Mar  3 23:03:52 2001
++++ tripwire-2.3.1-2/src/Makefile	Fri Feb  1 01:11:59 2002
+@@ -93,7 +93,7 @@
+ # file to Makefile.linux_intel or something similar.
+ 
+ MAKEFILE = Makefile
+-GMAKE = gmake
++GMAKE = $(MAKE)
+ 
+ #-----------------------------------------------------------------------------
+ # STLPORT
+@@ -145,7 +145,7 @@
+ 
+ # It's handy for clean, .PHONY, etc. to have one big list
+ #
+-targets  = $(debugbinaries) $(debuglibraries) $(releasebinaries) $(releaselibraries) STLport_d STLport_r
++targets  = $(debugbinaries) $(debuglibraries) $(releasebinaries) $(releaselibraries) 
+ 
+ 
+ # Let make know these aren't real file names...
+--- tripwire-2.3.1-2/src/make_include/i686-pc-linux.inc.sopwith	Fri Oct 27 20:26:25 2000
++++ tripwire-2.3.1-2/src/make_include/i686-pc-linux.inc	Fri Feb  1 01:11:59 2002
+@@ -19,11 +19,11 @@
+ # General variable definitions
+ #
+ 
+-GMAKE = /usr/bin/gmake
++GMAKE = $(MAKE)
+ CC = g++
+ CXX = $(CC)
+ AR = ar
+-SYSDEF=-D_REDHAT -D_IX86 -D_GCC
++SYSDEF=-D_REDHAT -D_IX86 -D_GCC $(RPM_OPT_FLAGS)
+ STLPORT=../STLport-4.0
+ 
+ #
+@@ -33,7 +33,7 @@
+ CXXFLAGS_R = -I.. -I$(STLPORT)/stlport -ftemplate-depth-32
+ DEFINES_R = -DNDEBUG $(SYSDEF)
+ LINKFLAGS_R = -static
+-LIBRARYFLAGS_R = -L../../lib/$(SYSPRE)_r -lm -lstlport_gcc
++LIBRARYFLAGS_R = -L../../lib/$(SYSPRE)_r -lm
+ ARFLAGS_R = crv
+ 
+ #
diff --git a/app-admin/tripwire/files/tripwire-2.3.1-gcc3.patch.bz2 b/app-admin/tripwire/files/tripwire-2.3.1-gcc3.patch.bz2
deleted file mode 100644
index 2aef20ecf0d4..000000000000
--- a/app-admin/tripwire/files/tripwire-2.3.1-gcc3.patch.bz2
+++ /dev/null
diff --git a/app-admin/tripwire/files/tripwire-jbj.patch b/app-admin/tripwire/files/tripwire-jbj.patch
new file mode 100644
index 000000000000..9906c23a40ec
--- /dev/null
+++ b/app-admin/tripwire/files/tripwire-jbj.patch
@@ -0,0 +1,53 @@
+--- tripwire-2.3.1-2/src/core/resources.h.jbj	2002-11-16 13:08:59.000000000 -0500
++++ tripwire-2.3.1-2/src/core/resources.h	2002-11-16 14:07:42.000000000 -0500
+@@ -98,7 +98,7 @@
+         typedef Value&              ValueRef;
+         typedef const Value&        ConstValueRef;
+         
+-        typedef Table::value_type   Pair;           
++        typedef typename Table::value_type   Pair;           
+ 
+         
+ 
+--- tripwire-2.3.1-2/src/core/archive.cpp.jbj	2002-11-16 13:42:37.000000000 -0500
++++ tripwire-2.3.1-2/src/core/archive.cpp	2002-11-16 13:42:51.000000000 -0500
+@@ -45,7 +45,7 @@
+ #include <fcntl.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#include <iostream.h>
++#include <iostream>
+ #include "file.h"
+ #include "stringutil.h"
+ 
+--- tripwire-2.3.1-2/src/core/stringutil.h.jbj	2002-11-16 13:44:39.000000000 -0500
++++ tripwire-2.3.1-2/src/core/stringutil.h	2002-11-16 13:49:08.000000000 -0500
+@@ -169,7 +169,7 @@
+             //- - - - - - - - - - - - - - - - - - - - - - - - - -
+             // required typedef ( to be a container it must have this... )
+             //- - - - - - - - - - - - - - - - - - - - - - - - - -
+-           typedef _ParentT::value_type    value_type;
++           typedef typename _ParentT::value_type    value_type;
+ 
+             //- - - - - - - - - - - - - - - - - - - - - - - - - -
+             // required constructors and assignment operators...
+--- tripwire-2.3.1-2/src/tw/twutil.cpp.jbj	2002-11-16 14:34:10.000000000 -0500
++++ tripwire-2.3.1-2/src/tw/twutil.cpp	2002-11-16 14:37:07.000000000 -0500
+@@ -672,7 +672,7 @@
+         throw eSerializerInputStreamFmt(_T(""), filename, eSerializer::TY_FILE);
+     }
+ 
+-    d.TraceDebug("Found a file header of type %d.\n", fileHeader.GetID());
++    // d.TraceDebug("Found a file header of type %d.\n", fileHeader.GetID());
+ 
+     // check for a mismatched header
+     if (fileHeader.GetID() != cConfigFile::GetFileHeaderID())
+@@ -775,7 +775,7 @@
+         throw eSerializerInputStreamFmt(_T(""), filename.c_str(), eSerializer::TY_FILE);
+     }
+ 
+-    d.TraceDebug("Found a file header of type %d.\n", fileHeader.GetID());
++    // d.TraceDebug("Found a file header of type %d.\n", fileHeader.GetID());
+ 
+     // check for a mismatched header
+     if (fileHeader.GetID() != cConfigFile::GetFileHeaderID())
diff --git a/app-admin/tripwire/files/tripwire-jbj.patch.bz2 b/app-admin/tripwire/files/tripwire-jbj.patch.bz2
deleted file mode 100644
index faa2b338068c..000000000000
--- a/app-admin/tripwire/files/tripwire-jbj.patch.bz2
+++ /dev/null
diff --git a/app-admin/tripwire/files/tripwire-mkstemp.patch b/app-admin/tripwire/files/tripwire-mkstemp.patch
new file mode 100644
index 000000000000..daeae8cc33a5
--- /dev/null
+++ b/app-admin/tripwire/files/tripwire-mkstemp.patch
@@ -0,0 +1,30 @@
+--- tripwire-2.3.1-2/src/core/unix/unixfsservices.cpp.mkstemp	2001-02-24 14:02:12.000000000 -0500
++++ tripwire-2.3.1-2/src/core/unix/unixfsservices.cpp	2003-01-04 12:54:33.000000000 -0500
+@@ -243,6 +243,7 @@
+ {
+     char* pchTempFileName;
+     char szTemplate[MAXPATHLEN];
++    int fd;
+ 
+ #ifdef _UNICODE
+     // convert template from wide character to multi-byte string
+@@ -253,13 +254,12 @@
+     strcpy( szTemplate, strName.c_str() );
+ #endif
+ 
+-    // create temp filename
+-    pchTempFileName = mktemp( szTemplate );
+-
+-    //check to see if mktemp failed
+-    if ( pchTempFileName == NULL || strlen(pchTempFileName) == 0) {
+-      throw eFSServicesGeneric( strName );
+-    }
++    // create temp filename and check to see if mkstemp failed
++    if ((fd = mkstemp( szTemplate )) == -1)
++	throw eFSServicesGeneric( strName );
++    else
++	close(fd);
++    pchTempFileName = szTemplate;
+ 
+     // change name so that it has the XXXXXX part filled in
+ #ifdef _UNICODE
diff --git a/app-admin/tripwire/files/tripwire-mkstemp.patch.bz2 b/app-admin/tripwire/files/tripwire-mkstemp.patch.bz2
deleted file mode 100644
index eb449d45169f..000000000000
--- a/app-admin/tripwire/files/tripwire-mkstemp.patch.bz2
+++ /dev/null
diff --git a/app-admin/tripwire/tripwire-2.3.1.2-r1.ebuild b/app-admin/tripwire/tripwire-2.3.1.2-r1.ebuild
index 32375946aa01..3c18b7020566 100644
--- a/app-admin/tripwire/tripwire-2.3.1.2-r1.ebuild
+++ b/app-admin/tripwire/tripwire-2.3.1.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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-r1.ebuild,v 1.8 2005/01/01 11:32:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.3.1.2-r1.ebuild,v 1.9 2006/01/29 15:39:26 blubb Exp $
 
 inherit eutils flag-o-matic
 
@@ -8,7 +8,8 @@ TW_VER="2.3.1-2"
 DESCRIPTION="Open Source File Integrity Checker and IDS"
 HOMEPAGE="http://www.tripwire.org/"
 SRC_URI="mirror://sourceforge/tripwire/tripwire-${TW_VER}.tar.gz
-	http://non-us.debian.org/debian-non-US/pool/non-US/main/t/tripwire/tripwire_2.3.1.2-6.1.diff.gz"
+	http://non-us.debian.org/debian-non-US/pool/non-US/main/t/tripwire/tripwire_2.3.1.2-6.1.diff.gz
+	mirror://gentoo/twpol.txt.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -28,16 +29,18 @@ S=${WORKDIR}/tripwire-${TW_VER}
 
 src_unpack() {
 	# unpack tripwire source tarball
-	unpack tripwire-${TW_VER}.tar.gz; cd ${S}
-
+	unpack tripwire-${TW_VER}.tar.gz
+	unpack twpol.txt.gz
+	cd ${S}
+	
 	# some patches ive collected/made for tripwire
 	# mostly from mandrake, some from other sources
-	epatch ${FILESDIR}/tripwire-2.3.0-50-rfc822.patch.bz2
-	epatch ${FILESDIR}/tripwire-2.3.1-2-fhs.patch.bz2
-	epatch ${FILESDIR}/tripwire-2.3.1-2-gcc-3.3.patch.bz2
-	epatch ${FILESDIR}/tripwire-2.3.1-gcc3.patch.bz2
-	epatch ${FILESDIR}/tripwire-jbj.patch.bz2
-	epatch ${FILESDIR}/tripwire-mkstemp.patch.bz2
+	epatch ${FILESDIR}/tripwire-2.3.0-50-rfc822.patch
+	epatch ${FILESDIR}/tripwire-2.3.1-2-fhs.patch
+	epatch ${FILESDIR}/tripwire-2.3.1-2-gcc-3.3.patch
+	epatch ${FILESDIR}/tripwire-2.3.1-gcc3.patch
+	epatch ${FILESDIR}/tripwire-jbj.patch
+	epatch ${FILESDIR}/tripwire-mkstemp.patch
 
 	# pull out the interesting debian patches
 	filterdiff  -i '*/man/man8/twadmin.8' -z  --strip=1	\
@@ -82,9 +85,8 @@ src_install() {
 	dodoc README Release_Notes ChangeLog policy/policyguide.txt TRADEMARK \
 		${FILESDIR}/tripwire.gif ${FILESDIR}/tripwire.txt
 
-	zcat ${FILESDIR}/twpol.txt > ${T}/twpol.txt || ewarn "twcfg.txt zcat error"
 	insinto /etc/tripwire
-	doins ${T}/twpol.txt ${FILESDIR}/twcfg.txt
+	doins ${WORKDIR}/twpol.txt ${FILESDIR}/twcfg.txt
 
 	exeinto /etc/tripwire
 	doexe ${FILESDIR}/twinstall.sh
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 8a6c48adfdf3..47563617ffe5 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-2005 Gentoo Foundation
+# 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.7 2005/08/22 18:08:01 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.3.1.2-r2.ebuild,v 1.8 2006/01/29 15:39:26 blubb Exp $
 
 inherit eutils flag-o-matic
 
@@ -8,7 +8,8 @@ TW_VER="2.3.1-2"
 DESCRIPTION="Open Source File Integrity Checker and IDS"
 HOMEPAGE="http://www.tripwire.org/"
 SRC_URI="mirror://sourceforge/tripwire/tripwire-${TW_VER}.tar.gz
-	mirror://gentoo/tripwire-2.3.1-2-pherman-portability-0.9.diff.bz2"
+	mirror://gentoo/tripwire-2.3.1-2-pherman-portability-0.9.diff.bz2
+	mirror://gentoo/twpol.txt.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -29,13 +30,15 @@ S=${WORKDIR}/tripwire-${TW_VER}
 
 src_unpack() {
 	# unpack tripwire source tarball
-	unpack tripwire-${TW_VER}.tar.gz; cd ${S}
+	unpack tripwire-${TW_VER}.tar.gz
+	unpack twpol.txt.gz
+	cd ${S}
 
 	# Paul Herman has been maintaining some updates to tripwire
 	# including autoconf support and portability fixes.
 	# http://www.frenchfries.net/paul/tripwire/
 	epatch ${DISTDIR}/tripwire-2.3.1-2-pherman-portability-0.9.diff.bz2
-	epatch ${FILESDIR}/tripwire-2.3.0-50-rfc822.patch.bz2
+	epatch ${FILESDIR}/tripwire-2.3.0-50-rfc822.patch
 }
 
 src_compile() {
@@ -79,9 +82,8 @@ src_install() {
 	dodoc README Release_Notes ChangeLog policy/policyguide.txt TRADEMARK \
 		${FILESDIR}/tripwire.gif ${FILESDIR}/tripwire.txt
 
-	zcat ${FILESDIR}/twpol.txt > ${T}/twpol.txt || ewarn "twcfg.txt zcat error"
 	insinto /etc/tripwire
-	doins ${T}/twpol.txt ${FILESDIR}/twcfg.txt
+	doins ${WORKDIR}/twpol.txt ${FILESDIR}/twcfg.txt
 
 	exeinto /etc/tripwire
 	doexe ${FILESDIR}/twinstall.sh