[103798] trunk/dports/security/tripwire

[jmr at macports.org]

Revision: 103798
          https://trac.macports.org/changeset/103798
Author:   jmr at macports.org
Date:     2013-03-07 13:00:31 -0800 (Thu, 07 Mar 2013)
Log Message:
-----------
tripwire: fix build with current automake, fix code instead of not using clang (#32684)

Modified Paths:
--------------
    trunk/dports/security/tripwire/Portfile
    trunk/dports/security/tripwire/files/patch-configure.in

Added Paths:
-----------
    trunk/dports/security/tripwire/files/patch-src_core_archive.cpp
    trunk/dports/security/tripwire/files/patch-src_cryptlib_algebra.h
    trunk/dports/security/tripwire/files/patch-src_fco_fcospec.cpp

Modified: trunk/dports/security/tripwire/Portfile
===================================================================
--- trunk/dports/security/tripwire/Portfile	2013-03-07 20:56:22 UTC (rev 103797)
+++ trunk/dports/security/tripwire/Portfile	2013-03-07 21:00:31 UTC (rev 103798)
@@ -38,16 +38,16 @@
                     patch-configure.in   \
                     patch-configure      \
                     patch-install.cfg    \
-                    patch-install.sh 
+                    patch-install.sh     \
+                    patch-src_cryptlib_algebra.h \
+                    patch-src_core_archive.cpp \
+                    patch-src_fco_fcospec.cpp
 
 post-patch {
+    move ${worksrcpath}/configure.in ${worksrcpath}/configure.ac
     file attributes ${worksrcpath}/configure -permissions +x
 }
 
-if {${configure.compiler} == "clang"} {
-    configure.compiler llvm-gcc-4.2
-}
-
 pre-configure {
     system "cd ${worksrcpath} && aclocal"
 }

Modified: trunk/dports/security/tripwire/files/patch-configure.in
===================================================================
--- trunk/dports/security/tripwire/files/patch-configure.in	2013-03-07 20:56:22 UTC (rev 103797)
+++ trunk/dports/security/tripwire/files/patch-configure.in	2013-03-07 21:00:31 UTC (rev 103798)
@@ -1,5 +1,14 @@
---- configure.in.orig	Tue Sep 18 22:18:53 2007
-+++ configure.in	Fri Sep 21 19:36:56 2007
+--- configure.in.orig	2007-03-31 14:03:27.000000000 +1000
++++ configure.in	2013-03-08 07:16:05.000000000 +1100
+@@ -6,7 +6,7 @@
+ AC_CONFIG_SRCDIR([src/tw/tw.cpp])
+ AC_CANONICAL_TARGET([])
+ AM_INIT_AUTOMAKE(tripwire, 2.4.1)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS([config.h])
+ 
+ dnl #################################
+ dnl Cleanup Cruft Leftover From Patch
 @@ -38,6 +38,7 @@
  dnl ###################
  dnl Checks for programs

Added: trunk/dports/security/tripwire/files/patch-src_core_archive.cpp
===================================================================
--- trunk/dports/security/tripwire/files/patch-src_core_archive.cpp	                        (rev 0)
+++ trunk/dports/security/tripwire/files/patch-src_core_archive.cpp	2013-03-07 21:00:31 UTC (rev 103798)
@@ -0,0 +1,13 @@
+--- src/core/archive.cpp.orig	2005-09-16 13:12:36.000000000 +1000
++++ src/core/archive.cpp	2013-03-08 07:28:07.000000000 +1100
+@@ -886,8 +886,8 @@ void cLockedTemporaryFileArchive::OpenRe
+         catch( eFSServices& e)
+           {
+             TSTRING errStr = TSS_GetString( cCore, core::STR_BAD_TEMPDIRECTORY );
+-            eArchiveOpen e(strTempFile, errStr);
+-            throw e;
++            eArchiveOpen e2(strTempFile, errStr);
++            throw e2;
+           }
+       }
+     ///////////////////////////////////////////////////////////////////////////////

Added: trunk/dports/security/tripwire/files/patch-src_cryptlib_algebra.h
===================================================================
--- trunk/dports/security/tripwire/files/patch-src_cryptlib_algebra.h	                        (rev 0)
+++ trunk/dports/security/tripwire/files/patch-src_cryptlib_algebra.h	2013-03-07 21:00:31 UTC (rev 103798)
@@ -0,0 +1,11 @@
+--- src/cryptlib/algebra.h.orig	2005-09-16 13:12:35.000000000 +1000
++++ src/cryptlib/algebra.h	2013-03-08 07:21:17.000000000 +1100
+@@ -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;

Added: trunk/dports/security/tripwire/files/patch-src_fco_fcospec.cpp
===================================================================
--- trunk/dports/security/tripwire/files/patch-src_fco_fcospec.cpp	                        (rev 0)
+++ trunk/dports/security/tripwire/files/patch-src_fco_fcospec.cpp	2013-03-07 21:00:31 UTC (rev 103798)
@@ -0,0 +1,10 @@
+--- src/fco/fcospec.cpp.orig	2005-09-16 13:12:38.000000000 +1000
++++ src/fco/fcospec.cpp	2013-03-08 07:54:32.000000000 +1100
+@@ -51,6 +51,7 @@
+ class cDefaultSpecMask : public iFCOSpecMask
+ {
+ public:
++	cDefaultSpecMask(){};
+ 	virtual const TSTRING& GetName() const;
+ 	virtual bool Accept(const iFCO* pFCO) const;
+ private:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130307/74d34b66/attachment.html>