diff --git a/docs/Manpages.xml b/docs/Manpages.xml index c0386bcb5..ba1054050 100644 --- a/docs/Manpages.xml +++ b/docs/Manpages.xml @@ -101,6 +101,9 @@ netmap - How to map addresses from one net to another. + notrack - Exclude + certain traffic from Netfilter connection tracking + params - Assign values to shell variables used in other files. diff --git a/docs/Manpages6.xml b/docs/Manpages6.xml index 0a4359b10..60ec141fc 100644 --- a/docs/Manpages6.xml +++ b/docs/Manpages6.xml @@ -89,6 +89,9 @@ nesting - How to define nested zones. + notrack - Exclude + certain traffic from Netfilter6 connection tracking + params - Assign values to shell variables used in other files. diff --git a/tools/web/publish-4.4 b/tools/web/publish-4.4 new file mode 100755 index 000000000..4fef68156 --- /dev/null +++ b/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) ..." + 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 + + diff --git a/tools/web/publish-image-4.4 b/tools/web/publish-image-4.4 new file mode 100755 index 000000000..24eaf9a5f --- /dev/null +++ b/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 + + diff --git a/tools/web/publish-manpage b/tools/web/publish-manpage index 054d2ad0f..661a68143 100755 --- a/tools/web/publish-manpage +++ b/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 diff --git a/tools/web/publish-manpage6-4.4 b/tools/web/publish-manpage6-4.4 new file mode 100755 index 000000000..1a667ac85 --- /dev/null +++ b/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) ..." + 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 + + diff --git a/web/Notices.html b/web/Notices.html index b89794642..fcb10a839 100644 --- a/web/Notices.html +++ b/web/Notices.html @@ -14,6 +14,9 @@ cellspacing="0"> + Attention Shorewall-perl 4.2 Users
+ Attention Users of Shorewall's Multi-ISP Feature
@@ -26,7 +29,46 @@ -
2009-01-15 +
2009-02-28
+ +

Attention +Shorewall-perl 4.2 Users

+On February 28, Klemens Rutz reported a problem that affects all +Shorewall-perl 4.2 versions prior to 4.2.6.1.
+
+The problem:
+
    +
  1. Only occurs when there are more than one non-firewall zone.
    2. +
  2. Results in the following interface options not being applied to +forwarded traffic.
    3. +
+
blacklist
+dhcp
+maclist (when MACLIST_TABLE=filter)
+norfc1918
+nosmurfs
+tcpflags
+
+
+User are encouraged to either:
+ +
http://www.shorewall.net/pub/shorewall/4.2/forward.patch
+ftp://ftp.shorewall.net/pub/shorewall/4.2/forward.patch
+
+
To apply the patch, execute this +command:
+
+
+
 patch /usr/share/shorewall-perl/Shorewall/Rules.pm < forward.patch
+
+
The patch may apply with fuzz and/or an +offset, depending on your particular version.

Attention Users of Shorewall's Multi-ISP Feature

A bug in Shorewall versions 3.2.0-3.2.10, 3.4.0-3.4.6 and diff --git a/web/shorewall_index.htm b/web/shorewall_index.htm index 8e744d59f..45392a2a0 100644 --- a/web/shorewall_index.htm +++ b/web/shorewall_index.htm @@ -50,6 +50,9 @@

2009-02-28
 +

Important +Notice to Shorewall-perl 4.2 Users

+

LFNW LogoPlan to Attend Linuxfest Northwest