Add notrack to Manpage indexes

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

docs/Manpages.xml

@@ -101,6 +101,9 @@
         <member><ulink url="manpages/shorewall-netmap.html">netmap</ulink> -
         How to map addresses from one net to another.</member>
 
+        <member><ulink url="shorewall-notrack.html">notrack</ulink> - Exclude
+        certain traffic from Netfilter connection tracking</member>
+
         <member><ulink url="manpages/shorewall-params.html">params</ulink> -
         Assign values to shell variables used in other files.</member>
 

docs/Manpages6.xml

@@ -89,6 +89,9 @@
         <member><ulink url="manpages6/shorewall6-nesting.html">nesting</ulink>
         - How to define nested zones.</member>
 
+        <member><ulink url="shorewall6-notrack.html">notrack</ulink> - Exclude
+        certain traffic from Netfilter6 connection tracking</member>
+
         <member><ulink url="manpages6/shorewall6-params.html">params</ulink> -
         Assign values to shell variables used in other files.</member>
 

tools/web/publish-4.4

@@ -0,0 +1,143 @@
+#!/bin/sh
+
+#STYLESHEET=/home/teastep/Shorewall/docbook-xsl-1.62.4//xhtml/docbook.xsl
+STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/current/xhtml/docbook.xsl
+WEBSITE=/home/teastep/Shorewall/Website
+HTMFILES="
+    6to4.htm
+    blacklisting_support.htm
+    configuration_file_basics.htm
+    CorpNetwork.htm
+    dhcp.htm
+    Documentation.htm
+    errata.htm
+    fallback.htm
+    FAQ.htm
+    GnuCopyright.htm
+    Install.htm
+    IPIP.htm
+    IPSEC.htm
+    kernel.htm
+    myfiles.htm
+    NAT.htm
+    ports.htm
+    PPTP.htm
+    ProxyARP.htm
+    quotes.htm
+    samba.htm
+    shorewall_extension_scripts.htm
+    shorewall_features.htm
+    shorewall_mirrors.htm
+    shorewall_prerequisites.htm
+    shorewall_quickstart_guide.htm
+    shorewall_setup_guide_fr.htm
+    shorewall_setup_guide.htm
+    Shorewall_sfindex_frame.htm
+    standalone.htm
+    starting_and_stopping_shorewall.htm
+    support.htm
+    three-interface.htm
+    traffic_shaping.htm
+    troubleshoot.htm
+    two-interface.htm
+    upgrade_issues.htm
+    VPN.htm
+    whitelisting_under_shorewall.htm"
+#
+# Suppress the table of contents in these short articles
+#
+NOTOC="
+    Documentation_Index.xml
+    ECN.xml
+    fallback.xml
+    GettingStarted.xml
+    IPP2P.xml
+    ping.xml
+    ProxyARP.xml
+    Shorewall_Doesnt.xml
+    shorewall_features.xml
+    shorewall_prerequisites.xml
+    SimpleBridge.xml"
+
+list_search() # $1 = element to search for , $2-$n = list
+{
+    local e
+    e=$1
+
+    while [ $# -gt 1 ]; do
+	shift
+	[ "x$e" = "x$1" ] && return 0
+    done
+
+    return 1
+}
+
+if [ $# -eq 0 ]; then
+    echo "Usage: $(basename $0) <XML file> ..."
+    exit 2
+fi
+
+while [ $# -gt 0 ]; do
+
+    case $1 in
+	*.xml)
+	    b=${1%.*}
+            #
+	    # The original HTML documents were created using MS FrontPage and
+	    # used the .htm suffix. The remainder use the .html suffix.
+	    #
+	    if list_search $b.htm $HTMFILES ; then
+		b=$b.htm
+		f="$WEBSITE/$b"
+	    else
+		b=$b.html
+		f="$WEBSITE/$b"
+	    fi
+
+	    list_search $1 $NOTOC && GENTOC="--stringparam generate.toc ''" || GENTOC=
+
+	    case $1 in
+		*_ru.xml)
+		    LANGUAGE="--stringparam l10n.gentext.default.language ru"
+		    ;;
+		*_fr.xml)
+		    LANGUAGE="--stringparam l10n.gentext.default.language fr"
+		    ;;
+		*)
+		    LANGUAGE=
+		    ;;
+	    esac
+
+	    echo "Converting $1 from XML to HTML ($b) ..."
+
+	    if xmllint --valid --noout $1 && xsltproc --output $f --stringparam html.stylesheet html.css --stringparam ulink.target _self $GENTOC $LANGUAGE --param toc.section.depth 3 $STYLESHEET $1 ; then
+		filestocopy="$filestocopy $f"
+	    fi
+	    ;;
+
+	*)
+	    filestocopy="$filestocopy $1"
+	    ;;
+    esac
+
+    shift
+
+done
+
+DESTS="
+webadmin@mail.shorewall.net:/srv/www/html/4.4
+"
+
+if [ -n "$filestocopy" ]; then
+    for f in $filestocopy; do
+	filestoreport="$filestoreport $(basename $f)"
+    done
+
+    chmod 664 $filestocopy
+    for d in $DESTS; do
+	echo "$filestoreport -> $d"
+	scp -qp $filestocopy $d
+    done
+fi
+
+

tools/web/publish-image-4.4

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+#	scp $@ teastep@shorewall.sourceforge.net:/home/groups/s/sh/shorewall/htdocs/images
+	scp -p  $@ webadmin@mail.shorewall.net:/srv/www/html/4.4/images
+#	cp  -pf $@ /home/teastep/Shorewall-docs
+
+

tools/web/publish-manpage

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #STYLESHEET=/home/teastep/Shorewall/docbook-xsl-1.62.4//xhtml/docbook.xsl
-STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl
+STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/current/xhtml/docbook.xsl
 WEBSITE=/home/teastep/Shorewall/Website
 
 list_search() # $1 = element to search for , $2-$n = list

tools/web/publish-manpage6-4.4

@@ -0,0 +1,65 @@
+#!/bin/sh
+
+#STYLESHEET=/home/teastep/Shorewall/docbook-xsl-1.62.4//xhtml/docbook.xsl
+STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/current/xhtml/docbook.xsl
+WEBSITE=/home/teastep/Shorewall/Website
+
+list_search() # $1 = element to search for , $2-$n = list
+{
+    local e
+    e=$1
+
+    while [ $# -gt 1 ]; do
+	shift
+	[ "x$e" = "x$1" ] && return 0
+    done
+
+    return 1
+}
+
+if [ $# -eq 0 ]; then
+    echo "Usage: $(basename $0) <XML file> ..."
+    exit 2
+fi
+
+while [ $# -gt 0 ]; do
+
+    case $1 in
+	*.xml)
+	    b=${1%.*}.html
+
+	    f="$WEBSITE/$b"
+
+	    echo "Converting $1 from XML to HTML ($b) ..."
+
+	    if xsltproc --output $f --stringparam html.stylesheet html.css --stringparam ulink.target _self -param toc.section.depth 3 $STYLESHEET $1 ; then
+		filestocopy="$filestocopy $f"
+	    fi
+	    ;;
+
+	*)
+	    filestocopy="$filestocopy $1"
+	    ;;
+    esac
+
+    shift
+
+done
+
+DESTS="
+webadmin@mail.shorewall.net:/srv/www/html/4.4/manpages6/
+"
+
+if [ -n "$filestocopy" ]; then
+    for f in $filestocopy; do
+	filestoreport="$filestoreport $(basename $f)"
+    done
+
+    chmod 664 $filestocopy
+    for d in $DESTS; do
+	echo "$filestoreport -> $d"
+	scp -qp $filestocopy $d
+    done
+fi
+
+

web/Notices.html

@@ -14,6 +14,9 @@
  cellspacing="0">
   <tbody>
     <tr>
+      <td style="vertical-align: top;"><a href="#Perl"><span
+ style="font-weight: bold;">Attention Shorewall-perl 4.2 Users</span></a><br>
+      </td>
       <td style="vertical-align: top; font-weight: bold;"><a
  href="#Notice">Attention Users of Shorewall's Multi-ISP Feature</a><br>
       </td>
@@ -26,7 +29,46 @@
     </tr>
   </tbody>
 </table>
-<hr><span style="font-weight: bold;">2009-01-15</span>
+<hr><span style="font-weight: bold;">2009-02-28<br>
+</span>
+<h2><span style="font-weight: bold;"><a name="Perl"></a>Attention
+Shorewall-perl 4.2 Users</span></h2>
+On February 28, Klemens Rutz reported a problem that affects all<span
+ style="font-family: monospace;"><span style="font-family: sans-serif;">
+</span></span>Shorewall-perl 4.2 versions prior to 4.2.6.1.<br>
+<span style="font-family: monospace;"><br>
+</span>The problem:<br>
+<ol>
+  <li>Only occurs when there are more than one non-firewall zone.</li>
+  <li>Results in the following interface options not being applied to
+forwarded traffic.</li>
+</ol>
+<div style="margin-left: 40px;">blacklist<br>
+dhcp<br>
+maclist (when MACLIST_TABLE=filter)<br>
+norfc1918<br>
+nosmurfs<br>
+tcpflags<br>
+</div>
+<br>
+User are encouraged to either:<br>
+<ul>
+  <li>Upgrade to Shorewall-perl-4.2.6.1 or later; or</li>
+  <li>Apply the patch found at:</li>
+</ul>
+<div style="margin-left: 40px;"><a class="moz-txt-link-freetext"
+ href="http://www.shorewall.net/pub/shorewall/4.2/forward.patch">http://www.shorewall.net/pub/shorewall/4.2/forward.patch</a><br>
+<a class="moz-txt-link-freetext"
+ href="ftp://ftp.shorewall.net/pub/shorewall/4.2/forward.patch">ftp://ftp.shorewall.net/pub/shorewall/4.2/forward.patch</a></div>
+<br>
+<div style="margin-left: 40px;">To apply the patch, execute this
+command:<br>
+</div>
+<div style="margin-left: 80px;">
+<pre> patch /usr/share/shorewall-perl/Shorewall/Rules.pm &lt; forward.patch</pre>
+</div>
+<div style="margin-left: 40px;">The patch may apply with fuzz and/or an
+offset, depending on your particular version.</div>
 <h2><a name="Notice">Attention Users of Shorewall's Multi-ISP
 Feature</a></h2>
 <p>A bug in Shorewall versions 3.2.0-3.2.10, 3.4.0-3.4.6 and

web/shorewall_index.htm

@@ -50,6 +50,9 @@
 </table>
 <hr style="width: 100%; height: 2px;"><span style="font-weight: bold;">2009-02-28<br>
 </span>
+<h2><span style="font-weight: bold;"><a href="Notices.html#Perl">Important
+Notice to Shorewall-perl 4.2 Users</a></span></h2>
+<h2><span style="font-weight: bold;"></span></h2>
 <h3><img alt="LFNW Logo" src="images/TotemCompletePlain.png"
  style="border: 0px solid ; width: 76px; height: 114px;">Plan to Attend
 <a target="_top" href="http://www.linuxfestnw.org">Linuxfest Northwest</a>