From 50a5d3e2de2f7a98377154f71f6637b14a688094 Mon Sep 17 00:00:00 2001
From: Tushar Teredesai <tushar@linuxfromscratch.org>
Date: Wed, 8 Oct 2003 04:18:56 +0000
Subject: [PATCH] Fixed tripwire to compile with gcc3

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@1344 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 introduction/welcome/changelog.xml           |  3 +++
 postlfs/security/tripwire/tripwire-exp.xml   | 15 +-----------
 postlfs/security/tripwire/tripwire-inst.xml  | 24 ++++++++------------
 postlfs/security/tripwire/tripwire-intro.xml |  7 ++++++
 4 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 4af787cda1..71fab5e77a 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -11,6 +11,9 @@ who wrote what.</para>
 
 <itemizedlist>
 
+<listitem><para>October 7th, 2003 [tushar]: Add patch and modify tripwire
+instructions for gcc3 compilation.</para></listitem>
+
 <listitem><para>October 7th, 2003 [larry]: courier patch submitted by Jim Gifford</para></listitem>
 	
 <listitem><para>October 7th, 2003 [igor]: Added missing http/ftp
diff --git a/postlfs/security/tripwire/tripwire-exp.xml b/postlfs/security/tripwire/tripwire-exp.xml
index 15deffd5b3..0a09cf5348 100644
--- a/postlfs/security/tripwire/tripwire-exp.xml
+++ b/postlfs/security/tripwire/tripwire-exp.xml
@@ -1,20 +1,7 @@
 <sect2>
 <title>Command explanations</title>
 
-<para><screen><command>export PATH_HOLD=$PATH &amp;&amp;
-export PATH=/opt/gcc-2.95.3/bin:$PATH</command></screen>These
-instructions save the current <envar>PATH</envar> and then places
-<application><acronym>GCC</acronym>-2.95.3</application> at the head of
-the path. This is done because <application>Tripwire</application> will
-not compile with the newer
-<application><acronym>GCC</acronym></application>.</para>
-
-<para><command>ln -s make /usr/bin/gmake</command>: The reason we create the 
-<command>gmake</command> symlink is that <application>Tripwire</application> 
-will only install if the symlink is present. It may be safely removed after 
-installation.</para>
-
-<para><command>gmake release</command>: This command creates the
+<para><command>make release</command>: This command creates the
 <application>Tripwire</application> binaries.</para>
 
 <para><command>cp install.{sh,cfg} .</command>: These are copied to the main
diff --git a/postlfs/security/tripwire/tripwire-inst.xml b/postlfs/security/tripwire/tripwire-inst.xml
index 8af6f7e8ef..2d1d2fbb4d 100644
--- a/postlfs/security/tripwire/tripwire-inst.xml
+++ b/postlfs/security/tripwire/tripwire-inst.xml
@@ -1,27 +1,21 @@
 <sect2>
 <title>Installation of <application>Tripwire</application></title>
 
-<para>Download the patch for <application>Tripwire</application> config from 
-<ulink url="&patch-root;/tripwire-&tripwire-version;-cfg.patch"/>.</para>
+<para>Compile <application>Tripwire</application> by running the following 
+commands:</para>
+
+<screen><userinput><command>patch -Np1 -i ../tripwire-&tripwire-version;-gcc3-build-fixes.patch &amp;&amp;
+cd src &amp;&amp;
+make release &amp;&amp;
+cd .. &amp;&amp;
+cp install/install.{sh,cfg} .</command></userinput></screen>
 
 <para>Install <application>Tripwire</application> by running the following 
 commands:</para>
 
-<screen><userinput><command>export PATH_HOLD=$PATH &amp;&amp;
-export PATH=/opt/gcc-2.95.3/bin:$PATH &amp;&amp;
-ln -s make /usr/bin/gmake &amp;&amp;
-cd src &amp;&amp;
-gmake release &amp;&amp;
-cd .. &amp;&amp;
-cp install/install.{sh,cfg} . &amp;&amp;
-patch -Np0 -i ../tripwire-&tripwire-version;-cfg.patch &amp;&amp;
-./install.sh &amp;&amp;
+<screen><userinput><command>./install.sh &amp;&amp;
 cp /etc/tripwire/tw.cfg /usr/sbin &amp;&amp;
 cp policy/*.txt /usr/share/doc/tripwire</command></userinput></screen>
 
-<para>Reverse the modifications made above:</para>
-<screen><userinput><command>rm /usr/bin/gmake &amp;&amp;
-export PATH=$PATH_HOLD</command></userinput></screen>
-
 </sect2>
 
diff --git a/postlfs/security/tripwire/tripwire-intro.xml b/postlfs/security/tripwire/tripwire-intro.xml
index 0eca83aa81..ced8840ab2 100644
--- a/postlfs/security/tripwire/tripwire-intro.xml
+++ b/postlfs/security/tripwire/tripwire-intro.xml
@@ -18,4 +18,11 @@ url="&tripwire-download-ftp;"/></para></listitem>
 &tripwire-time;</para></listitem></itemizedlist>
 </sect3>
 
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required patch to fix multiple build issues (see patch for more information):
+<ulink url="&patch-root;/tripwire-&tripwire-version;-gcc3-build-fixes.patch"/></para></listitem>
+</itemizedlist>
+</sect3>
+
 </sect2>