More manpage updates

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

docs/6to4.xml

@@ -78,7 +78,7 @@
 
       <programlisting>SIT="sit1"
 INTERFACES="eth1"
-ADDRESS=206.124.146.180
+ADDRESS4=206.124.146.180
 SLA=1</programlisting>
 
       <itemizedlist>
@@ -92,13 +92,13 @@ SLA=1</programlisting>
         </listitem>
 
         <listitem>
-          <para>ADDRESS - A static IPv4 address on your firewall that you want
+          <para>ADDRESS4 - A static IPv4 address on your firewall that you
-          to use for the tunnel.</para>
+          want to use for the tunnel.</para>
         </listitem>
 
         <listitem>
-          <para>The identity of the first local sub-network that you want to
+          <para>SLA - The identity of the first local sub-network that you
-          assign to the interfaces listed in INTERFACES. Normally one
+          want to assign to the interfaces listed in INTERFACES. Normally one
           (0001).</para>
         </listitem>
       </itemizedlist>
@@ -107,7 +107,7 @@ SLA=1</programlisting>
 
       <programlisting>SIT="sit1"
 INTERFACES="eth0 eth2"
-ADDRESS=206.124.146.180
+ADDRESS4=206.124.146.180
 SLA=1</programlisting>
 
       <para>eth0 is the interface to my local network (both wired and
@@ -159,8 +159,8 @@ gateway:~ # </programlisting>
       ADDRESS (206.124.146.180). So once you start the 6to4 tunnel, you are
       the proud owner of 2<superscript>80</superscript> IPv6 addresses! In the
       case shown here, 2002:ce7c:92b4::/48. The SLA is used to assign each
-      interface in INTERFACES, 2<superscript>64</superscript> addresses; in
+      interface in INTERFACES, a subnet of 2<superscript>64</superscript>
-      the case of eth0, 2002:ce7c:92b4:1::/64.</para>
+      addresses; in the case of eth0, 2002:ce7c:92b4:1::/64.</para>
 
       <para>I run <ulink url="http://www.litech.org/radvd/">radvd</ulink> on
       the firewall to allow hosts conntected to eth0 and eth2 to automatically
@@ -290,6 +290,11 @@ ursa:~ #</programlisting>
       <para>The Shorewall6 configuration on my firewall is a very basic
       three-interface one.</para>
 
+      <para>Key entry in
+      <filename>/etc/shorewall6/shorewall6.conf</filename>:</para>
+
+      <programlisting>IP_FORWARDING=On</programlisting>
+
       <para><filename>/etc/shorewall6/zones</filename>:</para>
 
       <programlisting>#ZONE	TYPE	OPTIONS			IN			OUT

manpages-lite/shorewall-lite.conf.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
 <refentry>
   <refmeta>
     <refentrytitle>shorewall-lite.conf</refentrytitle>
@@ -92,8 +94,9 @@
       </varlistentry>
 
       <varlistentry>
-        <term>PATH=[<emphasis>pathname</emphasis>[<emphasis
+        <term><emphasis role="bold"><emphasis
-        role="bold">:</emphasis><emphasis>pathname</emphasis>]...]</term>
+        role="bold">PATH=</emphasis><emphasis>pathname</emphasis>[<emphasis
+        role="bold">:</emphasis><emphasis>pathname</emphasis>]...</emphasis></term>
 
         <listitem>
           <para>Determines the order in which Shorewall searches directories

manpages6-lite/shorewall6-lite.conf.xml

@@ -94,8 +94,10 @@
       </varlistentry>
 
       <varlistentry>
-        <term>PATH=[<emphasis>pathname</emphasis>[<emphasis
+        <term><emphasis role="bold">PATH</emphasis><emphasis
-        role="bold">:</emphasis><emphasis>pathname</emphasis>]...]</term>
+        role="bold"><emphasis
+        role="bold">=</emphasis><emphasis>pathname</emphasis>[<emphasis
+        role="bold">:</emphasis><emphasis>pathname</emphasis>]...</emphasis></term>
 
         <listitem>
           <para>Determines the order in which Shorewall6 searches directories
@@ -144,7 +146,8 @@
       </varlistentry>
 
       <varlistentry>
-        <term>VERBOSITY=[<emphasis role="bold">number</emphasis>]</term>
+        <term><emphasis role="bold">VERBOSITY=</emphasis>[<emphasis
+        role="bold"><emphasis>number</emphasis></emphasis>]</term>
 
         <listitem>
           <para>Shorewall6 has traditionally been very noisy (produced lots of

tools/build/buildshorewall

@@ -358,25 +358,35 @@ case $VERSION in
 	PATCHNUM=${VERSION##*.}
 	BASEVERSION=${VERSION%.*}
 	SVNBRANCH="tags/${BASEVERSION}/Shorewall-common-${PATCHNUM}"
+	SVN6BRANCH="tags/${BASEVERSION}/Shorewall6-${PATCHNUM}"
 	LITESVNBRANCH="/tags/${BASEVERSION}/Shorewall-lite-${PATCHNUM}"
+	LITE6SVNBRANCH="/tags/${BASEVERSION}/Shorewall6-lite-${PATCHNUM}"
 	PERLBRANCH="tags/${BASEVERSION}/Shorewall-perl-${PATCHNUM}"
 	SHELLBRANCH="tags/${BASEVERSION}/Shorewall-shell-${PATCHNUM}"
 	DOCTAG="trunk/docs"
 	XMLPROJ="docs-4.2"
 	SAMPLESTAG="tags/${BASEVERSION}/Samples"
+	SAMPLES6TAG="trunk/Samples6"
 	MANPAGETAG="tags/${BASEVERSION}/manpages"
+	MANPAGE6TAG="tags/${BASEVERSION}/manpages6"
 	LITEMANPAGETAG="tags/${BASEVERSION}/manpages-lite"
+	LITE6MANPAGETAG="tags/${BASEVERSION}/manpages6-lite"
 	;;
      4.2.*)
 	SVNBRANCH="branches/4.2/Shorewall-common"
+	SVN6BRANCH="branches/4.2//Shorewall6"
 	LITESVNBRANCH="branches/4.2/Shorewall-lite"
+	LITE6SVNBRANCH="branches/4.2/Shorewall6-lite"
 	PERLBRANCH="branches/4.2/Shorewall-perl"
 	SHELLBRANCH="branches/4.2/Shorewall-shell"
 	DOCTAG="trunk/docs"
 	XMLPROJ="docs-4.2"
 	SAMPLESTAG="trunk/Samples"
+	SAMPLES6TAG="trunk/Samples6"
 	MANPAGETAG=trunk/manpages
+	MANPAGE6TAG=trunk/manpages6
 	LITEMANPAGETAG=trunk/manpages-lite
+	LITE6MANPAGETAG=trunk/manpages6-lite
 	;;
      4.0.*.*)
 	PATCHRELEASE=Yes

tools/build/upload

@@ -142,7 +142,9 @@ case $1 in
 	DEST="/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1"
 	SHOREWALL=shorewall-common
 	rpm=shorewall-common-${1%-*}-0${1#*-}.noarch.rpm
+	rpm6=shorewall6-${1%-*}-0${1#*-}.noarch.rpm
 	literpm=shorewall-lite-${1%-*}-0${1#*-}.noarch.rpm
+	lite6rpm=shorewall6-lite-${1%-*}-0${1#*-}.noarch.rpm
 	perlrpm=shorewall-perl-${1%-*}-0${1#*-}.noarch.rpm
 	shellrpm=shorewall-shell-${1%-*}-0${1#*-}.noarch.rpm
 	BASE=Yes
@@ -153,7 +155,9 @@ case $1 in
 	DEST="/srv/ftp/pub/shorewall/${BASEVERSION%.*}/shorewall-${BASEVERSION}"
 	SHOREWALL=shorewall-common
 	rpm=shorewall-common-${BASEVERSION}-${PATCHNUM}.noarch.rpm
+	rpm6=shorewall6-${BASEVERSION}-${PATCHNUM}.noarch.rpm
 	literpm=shorewall-lite-${BASEVERSION}-${PATCHNUM}.noarch.rpm
+	lite6rpm=shorewall6-lite-${BASEVERSION}-${PATCHNUM}.noarch.rpm
 	perlrpm=shorewall-perl-${BASEVERSION}-${PATCHNUM}.noarch.rpm
 	shellrpm=shorewall-shell-${BASEVERSION}-${PATCHNUM}.noarch.rpm
 	;;
@@ -161,7 +165,9 @@ case $1 in
 	DEST="/srv/ftp/pub/shorewall/${1%.*}/shorewall-$1"
 	SHOREWALL=shorewall-common
 	rpm=shorewall-common-${1}-0base.noarch.rpm
+	rpm6=shorewall6-${1}-0base.noarch.rpm
 	literpm=shorewall-lite-${1}-0base.noarch.rpm
+	lite6rpm=shorewall6-lite-${1}-0base.noarch.rpm
 	perlrpm=shorewall-perl-${1}-0base.noarch.rpm
 	shellrpm=shorewall-shell-${1}-0base.noarch.rpm
 	BASE=Yes
@@ -177,42 +183,9 @@ case $1 in
 	lite6rpm=shorewall6-lite-${1}-0base.noarch.rpm
 	BASE=Yes
 	;;
-    3.*[13579].*)
-	DEST="/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1"
-	rpm=shorewall-${1}-1.noarch.rpm
-	literpm=shorewall-lite-${1}-1.noarch.rpm
-	;;
-    *.*[13579].*)
-	DEST="/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1"
-	rpm=shorewall-${1}-1.noarch.rpm
-	;;
-    3.*Beta*|*RC*)
-	DEST="/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1"
-	rpm=shorewall-${1%-*}-0${1#*-}.noarch.rpm
-	literpm=shorewall-lite-${1%-*}-0${1#*-}.noarch.rpm
-	;;
-    *.*Beta*|*RC*)
-	DEST="/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1"
-	rpm=shorewall-${1%-*}-0${1#*-}.noarch.rpm
-	literpm=shorewall-lite-${1%-*}-0${1#*-}.noarch.rpm
-	perlrpm=shorewall-perl-${1%-*}-0${1#*-}.noarch.rpm
-	shellrpm=shorewall-shell-${1%-*}-0${1#*-}.noarch.rpm
-	;;
-    3.[2468].*)
-	DEST="/srv/ftp/pub/shorewall/${1%.*}/shorewall-$1"
-	rpm=shorewall-${1}-1.noarch.rpm
-	literpm=shorewall-lite-${1}-1.noarch.rpm
-	;;
-    *.[2468].*)
-	DEST="/srv/ftp/pub/shorewall/${1%.*}/shorewall-$1"
-	rpm=shorewall-${1}-1.noarch.rpm
-	literpm=shorewall-lite-${1}-1.noarch.rpm
-	perlrpm=shorewall-perl-${1}-1.noarch.rpm
-	shellrpm=shorewall-shell-${1}-1.noarch.rpm
-	;;
     *)
-	DEST="/srv/ftp/pub/shorewall/${1%.*}/shorewall-$1"
+	echo "Unknown Version $1" >&2
-	rpm=shorewall-${1}-1.noarch.rpm
+	exit 1
 	;;
 esac