Index: general.ent
===================================================================
--- general.ent	(revision 1586494b11a736d54b3116961a7caed817b4ceb6)
+++ general.ent	(revision dc94017e468f094cc3f2116e42c8d73f97059ff5)
@@ -34,5 +34,5 @@
 <!ENTITY iptables-version             "1.2.11"> 
 <!ENTITY gnupg-version                "1.2.6">  
-<!ENTITY tripwire-version             "2.3.1-2">   
+<!ENTITY tripwire-version             "portable-0.9">   
 <!ENTITY heimdal-version              "0.6.2">   
 <!ENTITY mitkrb-version               "1.3.5"> 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 1586494b11a736d54b3116961a7caed817b4ceb6)
+++ introduction/welcome/changelog.xml	(revision dc94017e468f094cc3f2116e42c8d73f97059ff5)
@@ -22,4 +22,6 @@
 
 <itemizedlist>
+
+<listitem><para>December 21st, 2004 [bdubbs]: Updated tripwire.</para></listitem>
 
 <listitem><para>December 21st, 2004 [randy]: Updated to KOffice-1.3.5 and 
Index: postlfs/security/tripwire.xml
===================================================================
--- postlfs/security/tripwire.xml	(revision 1586494b11a736d54b3116961a7caed817b4ceb6)
+++ postlfs/security/tripwire.xml	(revision dc94017e468f094cc3f2116e42c8d73f97059ff5)
@@ -5,12 +5,12 @@
   %general-entities;
 
-  <!ENTITY tripwire-download-http "http://prdownloads.sourceforge.net/tripwire/tripwire-&tripwire-version;.tar.gz">
-  <!ENTITY tripwire-download-ftp  "ftp://ftp.fu-berlin.de/unix/security/tripwire/tripwire-&tripwire-version;.tar.gz">
-  <!ENTITY tripwire-size          "1.4 MB">
-  <!ENTITY tripwire-buildsize     "63 MB">
-  <!ENTITY tripwire-time          "2.35 SBU">
+  <!ENTITY tripwire-download-http "http://www.frenchfries.net/paul/tripwire/tripwire-&tripwire-version;.tar.gz">
+  <!ENTITY tripwire-download-ftp  " ">
+  <!ENTITY tripwire-size          "869 KB">
+  <!ENTITY tripwire-buildsize     "22 MB">
+  <!ENTITY tripwire-time          "2.96 SBU">
 ]>
 
-<sect1 id="tripwire" xreflabel="Tripwire-&tripwire-version;">
+<sect1 id="tripwire-portable" xreflabel="Tripwire-&tripwire-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -39,12 +39,4 @@
 </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-1.patch"/></para></listitem>
-</itemizedlist>
-</sect3>
-
 <sect3><title><application>Tripwire</application> dependencies</title>
 <sect4><title>Optional</title>
@@ -60,17 +52,14 @@
 commands:</para>
 
-<screen><userinput><command>patch -Np1 -i ../tripwire-&tripwire-version;-gcc3_build_fixes-1.patch &amp;&amp;
-make -C src release &amp;&amp;
-cp install/install.{sh,cfg} .</command></userinput></screen>
+<screen><userinput><command>sed -i -e 's@TWDB="${prefix}@TWDB="/var/lib@' install/install.cfg &amp;&amp;
+./configure --prefix=/usr --sysconfdir=/etc/tripwire &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+cp policy/*.txt /usr/share/doc/tripwire</command></userinput></screen>
 
 <para>The default configuration is to use a local <acronym>MTA</acronym>. If 
 you don't have an <acronym>MTA</acronym> installed and have no wish to install 
 one, modify <filename>install.cfg</filename> to use an <acronym>SMTP</acronym> 
-server instead. Install <application>Tripwire</application> by running the 
-following commands:</para>
-
-<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>
+server instead.</para>
 
 </sect2>
@@ -79,10 +68,12 @@
 <title>Command explanations</title>
 
-<para><command>make release</command>: This command creates the
-<application>Tripwire</application> binaries.</para>
-
-<para><command>cp install.{sh,cfg} .</command>: These files are copied to 
-the main <application>Tripwire</application> directory so that the script 
-can be used to install the package.</para>
+<para><command>sed -i -e 's@TWDB="${prefix}@TWDB="/var/lib@' install/install.cfg</command>: 
+This command tells the package to install the program database and reports in
+<filename>/var/lib/tripwire</filename>.</para>
+
+<para><command>make install</command>: This command creates the
+<application>Tripwire</application> security keys as well as installing the
+binaries. There are two keys: a site key and a local key which are stored in
+<filename class="directory">/etc/tripwire/</filename>.</para>
 
 <para><command>cp policy/*.txt /usr/share/doc/tripwire</command>: This command 
@@ -103,9 +94,8 @@
 files are integrity checked. The default policy file 
 (<filename>/etc/tripwire/twpol.txt</filename>) is for a default 
-installation of Redhat 7.0 and is woefully outdated.</para>
-
-<para>Policy files are also a custom thing and should be tailored to each 
-individual distribution and/or installation. Some custom policy files can be 
-found below: </para>
+installation Redhat and will need to be updated for your system.</para>
+
+<para>Policy files should be tailored to each individual distribution and/or
+installation. Some custom policy files can be found below: </para>
 
 <screen><ulink url="http://home.iprimus.com.au/glombowski/blfs/twpol-all.txt"/>
@@ -129,10 +119,6 @@
 configuration steps:</para>
 
-<screen><userinput><command>twadmin -m P /etc/tripwire/twpol.txt &amp;&amp;
-tripwire -m i</command></userinput></screen>
-
-<para>During installation <application>Tripwire</application> will create two
-keys: a site key and a local key which are stored in 
-<filename class="directory">/etc/tripwire/</filename>.</para>
+<screen><userinput><command>twadmin --create-polfile --site-keyfile=/etc/tripwire site.key /etc/tripwire/twpol.txt &amp;&amp;
+tripwire --init</command></userinput></screen>
 
 </sect3>
@@ -142,5 +128,5 @@
 to run a report, use the following command:</para>
 
-<screen><userinput><command>tripwire -m c &gt; /etc/tripwire/report.txt</command></userinput></screen>
+<screen><userinput><command>tripwire --check &gt; /etc/tripwire/report.txt</command></userinput></screen>
 
 <para>View the output to check the integrity of your files. An automatic
@@ -161,5 +147,5 @@
 substitutions for <replaceable>[?]</replaceable>:</para>
 
-<screen><userinput><command>tripwire -m u -r /var/lib/tripwire/report/linux-<replaceable>[???????]</replaceable>-<replaceable>[??????]</replaceable>.twr</command></userinput></screen>
+<screen><userinput><command>tripwire --update -twrfile /var/lib/tripwire/report/linux-<replaceable>[???????]</replaceable>-<replaceable>[??????]</replaceable>.twr</command></userinput></screen>
 
 <para>You will be placed into <application>vim</application> with a copy of 
@@ -177,6 +163,6 @@
 commands:</para>
 
-<screen><userinput><command>twadmin -m P /etc/tripwire/twpol.txt &amp;&amp;
-tripwire -m i</command></userinput></screen>
+<screen><userinput><command>twadmin --create-polfile /etc/tripwire/twpol.txt &amp;&amp;
+tripwire --init</command></userinput></screen>
 
 </sect3>
@@ -186,35 +172,42 @@
 <sect2>
 <title>Contents</title>
-
-<para>The <application>Tripwire</application> package contains 
-<command>siggen</command>, <command>tripwire</command>, 
-<command>twadmin</command> and <command>twprint</command>.</para>
-
-</sect2>
-
-<sect2>
-<title>Description</title>
-
-<sect3>
-<title>siggen</title>
-<para><command>siggen</command> is a signature gathering utility that displays 
-the hash function values for the specified files.</para></sect3>
-
-<sect3>
-<title>tripwire</title>
-<para><command>tripwire</command> is the main file integrity checking program.
-</para></sect3>
-
-<sect3>
-<title>twadmin</title>
-<para><command>twadmin</command> is <application>Tripwire</application>'s 
-administrative and utility tool used to perform certain administrative 
-functions related to <application>Tripwire</application> files and 
-configuration options.</para></sect3>
-
-<sect3>
-<title>twprint</title>
-<para><command>twprint</command> prints <application>Tripwire</application> 
-database and report files in clear text format.</para></sect3>
+<segmentedlist>
+  <segtitle>Installed Programs</segtitle>
+  <seglistitem>
+    <seg>siggen, tripwire, twadmin and twprint.</seg>
+  </seglistitem>
+</segmentedlist>
+
+<variablelist>
+  <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+  <?dbfo list-presentation="list"?>
+
+  <varlistentry id="siggen"> 
+    <term><command>siggen</command></term>
+    <listitem><para>is a signature gathering utility that displays 
+      the hash function values for the specified files.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry id='tripwire'>
+    <term><command>tripwire</command></term> 
+    <listitem><para>is the main file integrity checking program.</para></listitem>
+  </varlistentry>
+
+  <varlistentry id='twadmin'>
+    <term><command>twadmin</command></term>
+    <listitem><para>administrative and utility tool used to perform 
+      certain administrative functions related to 
+      <application>Tripwire</application> files and configuration options.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry id='twprint'>
+    <term><command>twprint</command></term>
+    <listitem><para>prints <application>Tripwire</application> 
+      database and report files in clear text format.</para>
+    </listitem>
+  </varlistentry>
+</variablelist>
 
 </sect2>
