A number of web updates

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9283 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb

docs/Shorewall_Doesnt.xml

@@ -16,9 +16,7 @@
     <pubdate><?dbtimestamp format="Y/m/d"?></pubdate>
 
     <copyright>
-      <year>2003-</year>
+      <year>2003-2009</year>
-
-      <year>2005</year>
 
       <holder>Thomas M Eastep</holder>
     </copyright>
@@ -96,10 +94,10 @@
     <itemizedlist>
       <listitem>
         <para>Shorewall generally does not contain any support for Netfilter
-        <ulink url="http://www.netfilter.org">Patch-O-Matic-ng</ulink>
+        <ulink
-        features or any other features that require kernel patching --
+        url="http://dev.medozas.de/files/xtables/">xtables-addons</ulink>
-        Shorewall only supports features from released kernels except in
+        features -- Shorewall only supports features from released kernels
-        unusual cases.</para>
+        except in unusual cases.</para>
       </listitem>
     </itemizedlist>
   </section>

docs/upgrade_issues.xml

@@ -27,6 +27,8 @@
 
       <year>2007</year>
 
+      <year>2008</year>
+
       <holder>Thomas M. Eastep</holder>
 
       <holder></holder>
@@ -69,6 +71,109 @@
     command to see the groups associated with each of your zones.</para>
   </section>
 
+  <section>
+    <title>Versions &gt;= 4.2.0</title>
+
+    <orderedlist>
+      <listitem>
+        <para> Previously, when HIGH_ROUTE_MARKS=Yes, Shorewall allowed
+        non-zero mark values &lt; 256 to be assigned in the OUTPUT chain. This
+        has been changed so that only high mark values may be assigned there.
+        Packet marking rules for traffic shaping of packets originating on the
+        firewall must be coded in the POSTROUTING table.</para>
+      </listitem>
+
+      <listitem>
+        <para>Previously, Shorewall did not range-check the value of the
+        VERBOSITY option in shorewall.conf. Beginning with Shorewall 4.2: a) A
+        VERBOSITY setting outside the range -1 through 2 is rejected. b) After
+        the -v and -q options are applied, the resulting value is adjusted to
+        fall within the range -1 through 2.</para>
+      </listitem>
+
+      <listitem>
+        <para>Specifying a destination zone in a NAT-only rule now generates a
+        warning and the destination zone is ignored. NAT-only rules
+        are:<simplelist>
+            <member>NONAT</member>
+
+            <member>REDIRECT-</member>
+
+            <member>DNAT-</member>
+          </simplelist></para>
+      </listitem>
+
+      <listitem>
+        <para>The default value for LOG_MARTIANS has been changed. Previously,
+        the defaults were: Shorewall-perl - 'Off' Shorewall-shell - 'No' The
+        new default values are:</para>
+
+        <variablelist>
+          <varlistentry>
+            <term>Shorewall-perl</term>
+
+            <listitem>
+              <para>'On.</para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term>Shorewall-shell</term>
+
+            <listitem>
+              <para>'Yes'</para>
+            </listitem>
+          </varlistentry>
+        </variablelist>
+
+        <para>Shorewall-perl users may:</para>
+
+        <orderedlist>
+          <listitem>
+            <para>Accept the new default -- martians will be logged from all
+            interfaces with route filtering except those with log_martians=0
+            in /etc/shorewall/interfaces.</para>
+          </listitem>
+
+          <listitem>
+            <para>Explicitly set LOG_MARTIANS=Off to maintain compatibility
+            with prior versions of Shorewall.</para>
+          </listitem>
+        </orderedlist>
+
+        <para>Shorewall-shell users may:</para>
+
+        <orderedlist>
+          <listitem>
+            <para>Accept the new default -- martians will be logged from all
+            interfaces with the route filtering enabled.</para>
+          </listitem>
+
+          <listitem>
+            <para>Explicitly set LOG_MARTIONS=No to maintain compatibility
+            with prior versions of Shorewall.</para>
+          </listitem>
+        </orderedlist>
+      </listitem>
+
+      <listitem>
+        <para>The value of IMPLICIT_CONTINUE in shorewall.conf (and samples)
+        has been changed from Yes to No. </para>
+      </listitem>
+
+      <listitem>
+        <para>The 'norfc1918' option is deprecated. Use explicit rules
+        instead. Note that there is a new 'Rfc1918' macro that acts on
+        addresses reserved by RFC 1918.</para>
+      </listitem>
+
+      <listitem>
+        <para>DYNAMIC_ZONES=Yes is no longer supported by Shorewall-perl. Use
+        ipset-based zones instead. </para>
+      </listitem>
+    </orderedlist>
+  </section>
+
   <section id="V4.0.0">
     <title>Versions &gt;= 4.0.0-Beta7</title>
 
@@ -596,7 +701,8 @@ all             all             REJECT:MyReject info</programlisting>
 
         <para>The shorewall.conf file included in this release sets
         IPSECFILE=zones so that new users are expected to use the <ulink
-        url="manpages/shorewall-zones.html">new zone file format</ulink>.</para>
+        url="manpages/shorewall-zones.html">new zone file
+        format</ulink>.</para>
       </listitem>
 
       <listitem>

web/Banner.html

@@ -18,6 +18,17 @@
       <div style="background-color: rgb(255, 255, 255);" align="center">
       <img src="images/gareth-davies-logo3.png" alt="(Shorewall Logo)"
  style="width: 430px; height: 90px;" align="middle"> </div>
+      </td>
+      <td style="vertical-align: top;"><br>
+      </td>
+      <td style="vertical-align: top;"><br>
+      </td>
+      <td style="vertical-align: top;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      <br>
+      </td>
+      <td style="vertical-align: top;"><br>
+      </td>
+      <td style="vertical-align: top;"><br>
       </td>
       <td style="vertical-align: middle;"><!-- Search Google -->
       <center>
@@ -31,9 +42,9 @@
             <tr>
               <td><a href="http://www.google.com/"><img
  src="http://www.google.com/logos/Logo_40wht.gif" alt="Google"
- align="middle" border="0"></a> <input name="q" size="25"
+ style="border: 0px solid ; width: 100px; height: 41px;" align="middle"></a>
- maxlength="255" value="" type="text"> <input name="btnG"
+              <input name="q" size="25" maxlength="255" value=""
- value="Site Search by Google" type="submit"></td>
+ type="text"> <input name="btnG" value="Search" type="submit"></td>
             </tr>
             <tr style="color: rgb(51, 0, 51);">
               <td>

web/Documentation.html

@@ -21,56 +21,87 @@ license is included in the section entitled “<span class="quote"><a
  href="GnuCopyright.htm" target="_self">GNU Free Documentation
 License</a></span>”.<br>
 </p>
-<p>2009-01-02<br>
+<p>2009-01-14<br>
 </p>
 <hr style="width: 100%; height: 2px;"> <strong></strong>
+<br>
+<table style="text-align: left; width: 100%;" border="1" cellpadding="2"
+ cellspacing="2">
+  <tbody>
+    <tr style="font-weight: bold;">
+      <td style="vertical-align: top; text-align: center;">Document<br>
+      </td>
+      <td style="vertical-align: top; text-align: center;">Shorewall 3.x<br>
+      </td>
+      <td style="vertical-align: top; text-align: center;">Shorewall 4.0<br>
+      </td>
+      <td style="vertical-align: top; text-align: center;">Shorewall 4.2<br>
+      </td>
+      <td style="vertical-align: top; text-align: left;">Description<br>
+      </td>
+    </tr>
+    <tr>
+      <td style="vertical-align: top;"><span style="font-weight: bold;">Alphabetical
+Index</span><br>
+      </td>
+      <td style="vertical-align: top; text-align: center;"><span
+ style="font-weight: bold;"></span><a style="font-weight: bold;"
+ href="3.0/Documentation_Index.html">Index</a></td>
+      <td style="vertical-align: top; text-align: center;"><strong><a
+ href="Documentation_Index.html"><strong>Index</strong></a></strong></td>
+      <td style="vertical-align: top; text-align: center;"><a
+ href="Documentation_Index.html"><strong>Index</strong></a></td>
+      <td style="vertical-align: top;">Index to over 70 articles with
+topics ranging from Accounting to Xen</td>
+    </tr>
+    <tr>
+      <td style="vertical-align: top;"><span style="font-weight: bold;">FAQs</span><br>
+      </td>
+      <td
+ style="vertical-align: top; text-align: center; font-weight: bold;"><a
+ href="3.0/FAQ.htm">FAQs</a></td>
+      <td style="vertical-align: top; text-align: center;"><a
+ href="FAQ.htm"><strong>FAQs</strong></a> </td>
+      <td style="vertical-align: top; text-align: center;"><a
+ href="FAQ.htm"><strong>FAQs</strong></a> </td>
+      <td style="vertical-align: top;">Answers to the most commonly
+asked
+questions</td>
+    </tr>
+    <tr>
+      <td style="vertical-align: top;"><span style="font-weight: bold;">IPv4
+Man pages</span><br>
+      </td>
+      <td style="vertical-align: top; text-align: center;">-<br>
+      </td>
+      <td
+ style="vertical-align: top; text-align: center; font-weight: bold;"><a
+ href="../../../../../4.0/Manpages.html">Manpages</a></td>
+      <td style="vertical-align: top; text-align: center;"><strong><a
+ href="Manpages.html"><strong>Manpages<br>
+      </strong></a></strong></td>
+      <td style="vertical-align: top;">Online version of the Shorewall
+and Shorewall-lite man pages</td>
+    </tr>
+    <tr>
+      <td style="vertical-align: top;"><span style="font-weight: bold;">IPv6
+Man Pages</span><br>
+      </td>
+      <td style="vertical-align: top; text-align: center;">-<br>
+      </td>
+      <td style="vertical-align: top; text-align: center;">-<br>
+      </td>
+      <td style="vertical-align: top; text-align: center;"><a
+ href="Manpages6.html"><span style="font-weight: bold;">Manpages<br>
+      </span></a></td>
+      <td style="vertical-align: top;">Online version of the Shorewall6
+and Shorewall6-lite man pages<br>
+      </td>
+    </tr>
+  </tbody>
+</table>
+<a href="Documentation_Index.html"><strong></strong></a>
 <ul>
-  <li> <strong>Alphabetical Index</strong> -- Over 70 articles with
-topics ranging from Accounting to Xen<br>
-    <br>
-    <a href="3.0/Documentation_Index.html">Shorewall 3.x</a><br>
-    <a href="Documentation_Index.html">Shorewall 4.x<br>
-    </a><br>
-  </li>
-  <li><strong>FAQs</strong> -- Answers to the most commonly asked
-questions. <br>
-    <br>
-    <a href="3.0/FAQ.htm">Shorewall 3.x</a><br>
-    <a href="FAQ.htm">Shorewall 4.x<br>
-    </a><br>
-  </li>
-  <li><strong>Getting Started</strong> -- Introductory Articles and
-Beginner HOWTOs <br>
-    <br>
-    <a href="3.0/shorewall_quickstart_guide.htm">Shorewall 3.x</a><br>
-    <a href="shorewall_quickstart_guide.htm">Shorewall 4.x </a><a
- href="shorewall_quickstart_guide.htm"><br>
-    </a><br>
-  </li>
-  <li><strong>Man Pages</strong> -- Online version of the manpages
-released with Shorewall 3.4.0 and later <br>
-    <br>
-    <a href="/3.0/manpages/Manpages.html">Shorewall 3.x</a><br>
-    <a href="/4.0/Manpages.html">Shorewall 4.0</a><br>
-    <a href="Manpages.html">Shorewall 4.2</a><br>
-    <a href="Manpages6.html">Shorewall6 4.2 (IPv6 Support)</a><br>
-    <br>
-  </li>
-  <li><a href="shorewall_features.htm">Shorewall <span
- style="font-weight: bold;">Features</span></a> -- What it can do<br>
-  </li>
-  <li><a href="Shorewall_Doesnt.html"><span style="font-weight: bold;">Limitations</span></a>
--- Some things that it cannot do<br>
-  </li>
-  <li><a href="troubleshoot.htm"><span style="font-weight: bold;">Troubleshooting</span>
-Guide</a> -- Look here when "it doesn't work"<br>
-  </li>
-  <li><a href="upgrade_issues.htm"><span style="font-weight: bold;">Upgrade</span>&nbsp;Issues</a>
--- avoid problems when upgrading your Shorewall installation</li>
-  <li><strong>PPPPPPPS</strong> ( or, Paul's Principles for Practical
-Provision of Packet Processing with Shorewall ) <a
- href="http://linuxman.wikispaces.com/PPPPPPS">http://linuxman.wikispaces.com/PPPPPPS</a>
--- Some very useful tips for dealing with Shorewall from Paul Gear</li>
 </ul>
 </body>
 </html>

web/Shorewall_index_frame.htm

@@ -8,7 +8,8 @@
   <title="default" media="screen"></title="default">
 </head>
 <body>
-<h3><a target="_top" href="index.htm">Home</a><br>
+<h4><a target="_top" href="index.htm">Home</a><br>
+<a href="Notices.html">Important Notices</a><br>
 <a href="download.htm">Download</a><br>
 <a href="Documentation.html">Documentation</a><br>
 <a href="support.htm">Support</a><br>
@@ -19,16 +20,16 @@
 to Contribute</a><br>
 <a target="_top" href="http://wiki.shorewall.net/">Trac Wiki</a><br>
 <a href="useful_links.html">Other Links</a><br>
-</h3>
+</h4>
 <p class="copyright"><a href="copyright.htm">Copyright©&nbsp;2001-2009<br>
 Thomas&nbsp;M.&nbsp;Eastep</a></p>
 <!-- shorewall logo -->
 <img alt="Shorweall Logo"
  style="border: 0px solid ; width: 88px; height: 31px;"
- src="images/gareth-davies-logo3_88x31.png" align="left"><br>
+ src="images/gareth-davies-logo3_88x31.png" align="middle"><br>
 <br>
-<p class="copyright">Please&nbsp;report&nbsp;errors&nbsp;<br>
+Please&nbsp;report&nbsp;errors<br>
 on&nbsp;this&nbsp;site&nbsp;to <a
- href="mailto:webmaster@shorewall.net?subject=Website%20Comments">the&nbsp;Webmaster</a></p>
+ href="mailto:webmaster@shorewall.net?subject=Website%20Comments">the&nbsp;Webmaster</a>
 </body>
 </html>

web/download.htm

@@ -12,7 +12,7 @@
 <h1 align="left">Shorewall Download</h1>
 <p><b>Tom Eastep<br>
 <br>
-</b>Copyright ©&nbsp; 2001-2008 Thomas M. Eastep</p>
+</b>Copyright ©&nbsp; 2001-2009 Thomas M. Eastep</p>
 <p>Permission is granted to copy, distribute and/or modify this
 document
 under the terms of the GNU Free Documentation License, Version 1.2 or
@@ -23,13 +23,14 @@ Sections, with no Front-Cover, and with no Back-Cover Texts. A copy of
 the
 license is included in the section entitled “<a href="GnuCopyright.htm"
  target="_self">GNU Free Documentation License</a>”.</p>
-<p>2008-12-29 </p>
+<p>2009-01-14 </p>
 <hr>
 <h2>Table of Contents</h2>
 <p><b><a href="#Which">Package Information</a><br>
-<a href="#Updates">Finding Updates that Correct Known Problems</a><br>
 <a href="#Sites">Download Sites</a><br>
-<a href="#SVN">SVN</a></b></p>
+</b><a href="#SVN"><b><a href="download.htm#Updates">Finding Updates
+that Correct Known Problems</a><br>
+</b></a><b><a href="#SVN">SVN</a></b></p>
 <hr>
 <h2><a name="Which"></a>Package Information</h2>
 <p><b>Before trying to install, I strongly urge you to read and print a
@@ -39,7 +40,7 @@ Guide</a> for the configuration that most closely matches your own.</b>
 </p>
 <p>The documentation in both XML and HTML formats is available for
 download
-from the Download Sites listed in the table below.</p>
+from the Download Sites listed in the<a href="#Sites"> table below</a>.</p>
 <p><font color="#ff0000"><b>NOTICE: There are two current Shorewall
 Release
 Series:</b></font></p>
@@ -62,27 +63,34 @@ AND IS NOT SUPPORTED.</strong> </p>
 <p>Beginning with Shorewall version 4.0.0 RC1, there are four related
 packages:</p>
 <ul>
-  <li>Shorewall-shell -- the legacy Shorewall configuration compiler
+  <li><span style="font-weight: bold;">Shorewall-shell</span> -- the
-written in Bourne Shell.</li>
+legacy Shorewall configuration compiler
-  <li>Shorewall-perl -- an implementation of the Shorewall
+written in Bourne Shell. Not recommended for new installations.<br>
+  </li>
+  <li><span style="font-weight: bold;">Shorewall-perl</span> -- an
+implementation of the Shorewall
 configuration compiler written in the Perl programming language. This
 compiler is much faster than Shorewall-shell and produces a firewall
 script that runs faster. It is the preferred compiler for new Shorewall
 installations.</li>
-  <li>Shorewall-common -- A base package required by both
+  <li><span style="font-weight: bold;">Shorewall-common</span> -- A
+base package required by both
 Shorewall-shell and Shorewall-perl.</li>
-  <li>Shorewall Lite -- a light-weight Shorewall version that will run
+  <li><span style="font-weight: bold;">Shorewall Lite</span> -- a
+light-weight Shorewall version that will run
 compiled firewall scripts generated on a system with one of the
 compiler packages installed.</li>
 </ul>
 Beginning with Shorewall version 4.2.4, there are two additional
 packages that provide IPv6 support:<br>
 <ul>
-  <li>Shorewall6 -- Provides /sbin/shorewall6 for controlling an IPv6
+  <li><span style="font-weight: bold;">Shorewall6</span> -- Provides
+/sbin/shorewall6 for controlling an IPv6
 firewall. Requires Shorewall-common and Shorewall-perl,&nbsp; 4.2.4 or
 later.<br>
   </li>
-  <li>Shorewall6-lite -- a light-weight Shorewall6 version that will
+  <li><span style="font-weight: bold;">Shorewall6-lite</span> -- a
+light-weight Shorewall6 version that will
 run compiled firewall scripts generated on a system with Shorewall6
 installed.<br>
   </li>
@@ -154,9 +162,9 @@ installing the RPM.</p>
     <p style="margin-bottom: 0in;">If you run <a
  href="http://www.debian.org/"><b>Debian</b></a> and would like a .deb
 package, Shorewall is included in both the <a
- href="http://packages.debian.org/testing/net/shorewall.html">Debian
+ href="http://packages.debian.org/testing/net/">Debian
 Testing Branch</a> and the <a
- href="http://packages.debian.org/unstable/net/shorewall.html">Debian
+ href="http://packages.debian.org/unstable/net/">Debian
 Unstable Branch</a>. Additionally, packages for the current Debian
 stable release are available from the package maintainer's <a
  href="http://people.connexer.com/%7Eroberto/debian/">personal page</a>.
@@ -164,7 +172,8 @@ stable release are available from the package maintainer's <a
   </li>
   <li>
     <p style="margin-bottom: 0in;">If you run <a
- href="http://leaf.sourceforge.net/">LEAF/Bering</a> or one if it's
+ style="font-weight: bold;" href="http://leaf.sourceforge.net/">LEAF/Bering</a>
+or one if it's
 derivatives, you can download a .lrp file from the Leaf site.<br>
     <br>
 From the LEAF Bering-uClibc Team: We try to provide the latest stable
@@ -186,39 +195,13 @@ which itself links to cvs:<br>
  href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/leaf/bin/bering-uclibc/packages/shorwall.lrp?rev=HEAD&amp;content-type=application/octet-stream">http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/leaf/bin/bering-uclibc/packages/shorwall.lrp?rev=HEAD&amp;content-type=application/octet-stream</a></p>
   </li>
   <li>
-    <p>Otherwise, download the <i>shorewall</i> module (.tgz) </p>
+    <p><span style="font-weight: bold;">Otherwise</span>, download the<span
+ style="font-style: italic;"> </span>appropriate
+tarballs (.tgz or tar.bz2) </p>
   </li>
 </ul>
 <p>You will probably also want to download the HTML version of the
 documentation for easy reference.</p>
-<h2><a name="Updates"></a>Finding Updates that Correct Known Problems</h2>
-<p>Beginning with Shorewall 4.0.6, updated packages that include fixes
-to
-known problems are made available.</p>
-<p>Example:</p>
-<blockquote>
-  <pre>ftp&gt; cd pub/shorewall/4.0/shorewall-4.0.6<br>250 OK. Current directory is /pub/shorewall/4.0/shorewall-4.0.6<br>ftp&gt; ls<br>200 PORT command successful<br>150 Connecting to port 36018<br>drwxr-sr-x    4 1006     8            4096 Dec  1 08:16 .<br>drwxr-sr-x    9 1006     8            4096 Nov 23 08:22 ..<br>-rw-r--r--    1 1006     8             194 Nov 24 07:38 4.0.6-2.md5sums<br>-rw-r--r--    1 1006     8             218 Nov 24 07:38 4.0.6-2.sha1sums<br>-rw-r--r--    1 1006     8             841 Nov 26 13:26 4.0.6.md5sums<br>-rw-r--r--    1 1006     8             945 Nov 26 13:26 4.0.6.sha1sums<br>-rw-r--r--    1 1006     8             322 Nov 26 08:35 README.txt<br>drwxr-xr-x    4 1006     8            4096 Nov 23 17:16 errata<br>drwxr-xr-x    4 1006     8            4096 Nov 23 08:21 <strong>base</strong>
--rw-r--r--    1 1006     8            1570 Dec  1 08:16 known_problems.txt
--rw-r--r--    1 1006     8          148363 Nov 23 08:22 patch-4.0.6
--rw-r--r--    1 1006     8            5249 Nov 24 07:38 <strong>patch-4.0.6-2</strong>
-...
-
--rw-r--r--    1 1006     8          102295 Nov 24 07:38 shorewall-perl-4.0.6<strong>-2</strong>.noarch.rpm   &lt;=========<br>-rw-r--r--    1 1006     8           99884 Nov 24 07:38 shorewall-perl-4.0.6<strong>-2</strong>.tar.bz2      &lt;=========  <br>-rw-r--r--    1 1006     8             300 Nov 24 07:38 shorewall-perl-4.0.6<strong>-2</strong>.tar.bz2.asc  &lt;=========<br>-rw-r--r--    1 1006     8          124814 Nov 24 07:38 shorewall-perl-4.0.6<strong>-2</strong>.tgz          &lt;=========<br>-rw-r--r--    1 1006     8             300 Nov 24 07:38 shorewall-perl-4.0.6<strong>-2</strong>.tgz.asc      &lt;=========<br>-rw-r--r--    1 1006     8           59124 Nov 23 08:22 shorewall-shell-4.0.6-1.noarch.rpm<br>-rw-r--r--    1 1006     8           76500 Nov 23 08:22 shorewall-shell-4.0.6.tar.bz2<br>-rw-r--r--    1 1006     8             300 Nov 23 08:22 shorewall-shell-4.0.6.tar.bz2.asc<br>-rw-r--r--    1 1006     8           95193 Nov 23 08:22 shorewall-shell-4.0.6.tgz<br>-rw-r--r--    1 1006     8             300 Nov 23 08:22 shorewall-shell-4.0.6.tgz.asc<br>drwxr-sr-x    2 1006     8            4096 Nov 26 08:33 <strong>superseded</strong>
-226-Options: -a -l 
-226 41 matches total
-ftp</pre>
-</blockquote>
-<blockquote>
-  <p>The lines flagged with &lt;====== show that the Shorewall-perl
-package has been updated to include a bug fix (note the "-2" in the
-version). The base tarballs for the release are found in the <strong>base</strong>
-directory. The unified diff file name <strong>patch-4.0.6-2</strong>
-may be applied to the base (4.0.6) Shorewall-perl release to produce
-4.0.6-2. The original Shorewall-perl packages may be found in the <strong>superseded</strong>
-directory. Note that the fixes are still available in the <strong>errata</strong>
-directory; the <strong>known_problems.txt</strong> file indicates
-which problems are fixed in each updated package.</p>
-</blockquote>
 <h2><a name="Sites"></a><b>Download Sites</b></h2>
 <p style="margin-left: 0.42in;">Use the sites below to download the
 <b>tarball</b>, the <b>documentation</b> and the <b>standard RPM</b>
@@ -293,8 +276,7 @@ using our public key <a
           </td>
         </tr>
         <tr>
-          <td style="vertical-align: top;">Moscow, Russia (Temporarily
+          <td style="vertical-align: top;">Moscow, Russia<br>
-Offline)<br>
           </td>
           <td style="vertical-align: top;">Shorewall.ru<br>
           </td>
@@ -383,6 +365,24 @@ site</a>.<br>
 <b>Leaf/Bering </b>package is available at <a
  href="http://leaf.sourceforge.net/bering-uclibc/index.php?module=pagemaster&amp;PAGE_user_op=view_page&amp;PAGE_id=3&amp;MMN_position=3:3">http://leaf.sourceforge.net/bering-uclibc/index.php?module=pagemaster&amp;PAGE_user_op=view_page&amp;PAGE_id=3&amp;MMN_position=3:3</a><br>
 </p>
+<h2><a name="Updates"></a>Finding Updates that Correct Known Problems</h2>
+<p>Beginning with Shorewall 4.0.6, updated packages that include fixes
+to
+known problems are made available.</p>
+<p>Example:</p>
+<blockquote>
+  <pre>ftp&gt; cd pub/shorewall/4.0/shorewall-4.0.6<br>250 OK. Current directory is /pub/shorewall/4.0/shorewall-4.0.6<br>ftp&gt; ls<br>200 PORT command successful<br>150 Connecting to port 36018<br>drwxr-sr-x    4 1006     8            4096 Dec  1 08:16 .<br>drwxr-sr-x    9 1006     8            4096 Nov 23 08:22 ..<br>-rw-r--r--    1 1006     8             194 Nov 24 07:38 4.0.6-2.md5sums<br>-rw-r--r--    1 1006     8             218 Nov 24 07:38 4.0.6-2.sha1sums<br>-rw-r--r--    1 1006     8             841 Nov 26 13:26 4.0.6.md5sums<br>-rw-r--r--    1 1006     8             945 Nov 26 13:26 4.0.6.sha1sums<br>-rw-r--r--    1 1006     8             322 Nov 26 08:35 README.txt<br>drwxr-xr-x    4 1006     8            4096 Nov 23 08:21 <strong>base</strong><br>-rw-r--r--    1 1006     8            1570 Dec  1 08:16 known_problems.txt<br>-rw-r--r--    1 1006     8          148363 Nov 23 08:22 patch-4.0.6<br>-rw-r--r--    1 1006     8            5249 Nov 24 07:38 <strong>patch-4.0.6-2</strong><br>...<br><br>-rw-r--r--    1 1006     8          102295 Nov 24 07:38 shorewall-perl-4.0.6<strong>-2</strong>.noarch.rpm   &lt;=========<br>-rw-r--r--    1 1006     8           99884 Nov 24 07:38 shorewall-perl-4.0.6<strong>-2</strong>.tar.bz2      &lt;=========  <br>-rw-r--r--    1 1006     8             300 Nov 24 07:38 shorewall-perl-4.0.6<strong>-2</strong>.tar.bz2.asc  &lt;=========<br>-rw-r--r--    1 1006     8          124814 Nov 24 07:38 shorewall-perl-4.0.6<strong>-2</strong>.tgz          &lt;=========<br>-rw-r--r--    1 1006     8             300 Nov 24 07:38 shorewall-perl-4.0.6<strong>-2</strong>.tgz.asc      &lt;=========<br>-rw-r--r--    1 1006     8           59124 Nov 23 08:22 shorewall-shell-4.0.6-1.noarch.rpm<br>-rw-r--r--    1 1006     8           76500 Nov 23 08:22 shorewall-shell-4.0.6.tar.bz2<br>-rw-r--r--    1 1006     8             300 Nov 23 08:22 shorewall-shell-4.0.6.tar.bz2.asc<br>-rw-r--r--    1 1006     8           95193 Nov 23 08:22 shorewall-shell-4.0.6.tgz<br>-rw-r--r--    1 1006     8             300 Nov 23 08:22 shorewall-shell-4.0.6.tgz.asc<br>drwxr-sr-x    2 1006     8            4096 Nov 26 08:33 <strong>superseded</strong><br>226-Options: -a -l <br>226 41 matches total<br>ftp</pre>
+</blockquote>
+<blockquote>
+  <p>The lines flagged with &lt;====== show that the Shorewall-perl
+package has been updated to include a bug fix (note the "-2" in the
+version). The base tarballs for the release are found in the <strong>base</strong>
+directory. The unified diff file name <strong>patch-4.0.6-2</strong>
+may be applied to the base (4.0.6) Shorewall-perl release to produce
+4.0.6-2. The original Shorewall-perl packages may be found in the <strong>superseded</strong>
+directory. The <strong>known_problems.txt</strong> file indicates
+which problems are fixed in each updated package.</p>
+</blockquote>
 <h2><a name="SVN"></a><b>SVN</b></h2>
 <blockquote> The <a href="https://sourceforge.net/svn/?group_id=22587"
  target="_blank">SVN&nbsp;Repository at Sourceforge</a> is used as a
@@ -516,7 +516,24 @@ web sites.</blockquote>
     <blockquote> <b>Shorewall-lite<br>
       <br>
       </b>This project contains Shorewall Lite -- introduced in
-Shorewall version 3.2.0 RC1.</blockquote>
+Shorewall version 3.2.0 RC1.<br>
+    </blockquote>
+  </li>
+  <li>
+    <blockquote><b>Shorewall6<br>
+      <br>
+      </b>This project contains Shorewall6 -- introduced in Shorewall
+version
+4.2.4.</blockquote>
+  </li>
+  <li>
+    <blockquote><b>Shorewall6-lite<br>
+      <br>
+      </b>This project contains Shorewall6 Lite -- introduced in
+Shorewall
+version 4.2.4.
+      <blockquote> </blockquote>
+    </blockquote>
   </li>
 </ol>
 </body>

web/shorewall_index.htm

@@ -22,7 +22,7 @@ license is included in the section entitled <span
  style="text-decoration: underline;">"</span><a href="GnuCopyright.htm"
  target="_self">GNU Free Documentation License</a>".<br>
 </p>
-<p>The Shorewall Logo is by Gareth Davies of <a target="_top"
+<p>The Shorewall Logo is the work of Gareth Davies of <a target="_top"
  href="http://thusa.co.za">Thusa</a> and is licensed under the Creative
 Commons
 Attribution-Share Alike 2.5 South Africa License. To view a copy of
@@ -44,17 +44,6 @@ Shorewall</a><br>
 <a href="#Glossary">Glossary</a><br>
 <a href="#WhatIs">What is Shorewall?</a><a href="#Info"></a><br>
 <a href="#License">License</a></p>
-<p style="margin-left: 0.42in;"><a href="Notices.html#Notice"><strong>Important
-Notice to
-users of Shorewall Multi-ISP Feature</strong></a> -- <strong>UPDATED 7
-November 2007</strong></p>
-<p style="margin-left: 0.42in;"><a href="Notices.html#Notice1"><strong>Important
-Notice
-to users of BRIDGING=Yes</strong></a><br>
-</p>
-<p style="margin-left: 0.42in;"><a href="Notices.html#Kernel2.4"><strong>Important
-Notice
-to users running Kernel 2.4</strong></a></p>
 <p style="margin-left: 0.42in;"></p>
 <h3><a name="Releases"></a>Current Shorewall Releases</h3>
 <p style="margin-left: 40px;">The <span style="font-weight: bold;">current