upgrade instructions to 3.2.1

merge the /etc/apt/preferences suggestion from PPPPPPPPPS to the main docs


git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4293 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
judas_iscariote 2006-08-03 04:16:32 +00:00
parent 70c7dbd486
commit 8011c37aa4

View File

@ -57,7 +57,7 @@
<note> <note>
<para>Shorewall RPMs are signed. To avoid warnings such as the <para>Shorewall RPMs are signed. To avoid warnings such as the
following<programlisting>warning: shorewall-3.0.1-1.noarch.rpm: V3 DSA signature: NOKEY, key ID 6c562ac4</programlisting></para> following<programlisting>warning: shorewall-3.2.1-1.noarch.rpm: V3 DSA signature: NOKEY, key ID 6c562ac4</programlisting></para>
<para>download the <ulink <para>download the <ulink
url="https://lists.shorewall.net/shorewall.gpg.key">Shorewall GPG url="https://lists.shorewall.net/shorewall.gpg.key">Shorewall GPG
@ -110,10 +110,10 @@
</caution> </caution>
<note> <note>
<para>Some <trademark>SUSE</trademark> users have encountered <para>Some <trademark>SUSE</trademark> users have encountered a
a problem whereby rpm reports a conflict with kernel &lt;= 2.2 problem whereby rpm reports a conflict with kernel &lt;= 2.2 even
even though a 2.4 kernel is installed. If this happens, simply though a 2.4 kernel is installed. If this happens, simply use the
use the --nodeps option to rpm.</para> --nodeps option to rpm.</para>
<programlisting><filename><command>rpm -ivh --nodeps &lt;shorewall rpm&gt;</command></filename></programlisting> <programlisting><filename><command>rpm -ivh --nodeps &lt;shorewall rpm&gt;</command></filename></programlisting>
</note> </note>
@ -123,7 +123,7 @@
some distributions call this package iproute2 which will cause the some distributions call this package iproute2 which will cause the
installation of Shorewall to fail with the diagnostic:</para> installation of Shorewall to fail with the diagnostic:</para>
<programlisting>error: failed dependencies:iproute is needed by shorewall-2.2.x-1</programlisting> <programlisting>error: failed dependencies:iproute is needed by shorewall-3.2.x-1</programlisting>
<para>This problem should not occur if you are using the correct RPM <para>This problem should not occur if you are using the correct RPM
package (see 1., above) but may be worked around by using the package (see 1., above) but may be worked around by using the
@ -149,9 +149,7 @@
</listitem> </listitem>
<listitem> <listitem>
<para>Enable startup by removing <para>Enable startup by editing
<filename>/etc/shorewall/startup_disabled</filename> (If you are
running Shorewall 2.1.3 or later, edit
/<filename>etc/shorewall/shorewall.conf</filename> and set /<filename>etc/shorewall/shorewall.conf</filename> and set
STARTUP_ENABLED to Yes).</para> STARTUP_ENABLED to Yes).</para>
</listitem> </listitem>
@ -176,7 +174,7 @@
<listitem> <listitem>
<para>cd to the shorewall directory (the version is encoded in the <para>cd to the shorewall directory (the version is encoded in the
directory name as in <quote>shorewall-3.0.0</quote>).</para> directory name as in <quote>shorewall-3.2.1</quote>).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -242,9 +240,16 @@
<para><command>apt-get install shorewall</command></para> <para><command>apt-get install shorewall</command></para>
<para>To ensure that you are installing the latest version of Shorewall, <para>To ensure that you are installing the latest version of Shorewall,
please modify your <filename>/etc/apt/preferences </filename> file as please modify your <filename>/etc/apt/preferences: </filename><ulink
described <ulink url="http://sourceforge.net/mailarchive/message.php?msg_id=13995291"></ulink></para>
url="http://sourceforge.net/mailarchive/message.php?msg_id=13995291">here</ulink>.</para>
<para><programlisting>Package: shorewall
Pin: release o=Debian,a=testing
Pin-Priority: 700
Package: shorewall-doc
Pin: release o=Debian,a=testing
Pin-Priority: 700</programlisting></para>
<para><emphasis role="bold">Once you have completed configuring Shorewall, <para><emphasis role="bold">Once you have completed configuring Shorewall,
you can enable startup at boot time by setting startup=1 in you can enable startup at boot time by setting startup=1 in
@ -297,12 +302,11 @@
package!</emphasis></para> package!</emphasis></para>
<para>The standard RPM package from shorewall.net and the mirrors is <para>The standard RPM package from shorewall.net and the mirrors is
known to work with <trademark>SUSE</trademark>, Power PPC, known to work with <trademark>SUSE</trademark>, Power PPC, Trustix and
Trustix and TurboLinux. There is also an RPM package provided by TurboLinux. There is also an RPM package provided by Simon Matter that
Simon Matter that is tailored for RedHat/Fedora and another is tailored for RedHat/Fedora and another package from Jack Coates
package from Jack Coates that is customized for Mandriva. If you that is customized for Mandriva. If you try to upgrade using the wrong
try to upgrade using the wrong package, it probably won't package, it probably won't work.</para>
work.</para>
</listitem> </listitem>
<listitem> <listitem>
@ -311,21 +315,20 @@
<programlisting><command>rpm -Uvh &lt;shorewall rpm file&gt;</command></programlisting> <programlisting><command>rpm -Uvh &lt;shorewall rpm file&gt;</command></programlisting>
<note> <note>
<para>Some <trademark>SUSE</trademark> users have encountered <para>Some <trademark>SUSE</trademark> users have encountered a
a problem whereby rpm reports a conflict with kernel &lt;= 2.2 problem whereby rpm reports a conflict with kernel &lt;= 2.2 even
even though a 2.4 kernel is installed. If this happens, simply though a 2.4 kernel is installed. If this happens, simply use the
use the --nodeps option to rpm.</para> --nodeps option to rpm.</para>
<programlisting><command>rpm -Uvh --nodeps &lt;shorewall rpm&gt;</command></programlisting> <programlisting><command>rpm -Uvh --nodeps &lt;shorewall rpm&gt;</command></programlisting>
</note> </note>
<note> <note>
<para>Beginning with Shorewall 1.4.0, Shorewall is dependent on the <para>Shorewall is dependent on the iproute package. Unfortunately,
iproute package. Unfortunately, some distributions call this package some distributions call this package iproute2 which will cause the
iproute2 which will cause the upgrade of Shorewall to fail with the upgrade of Shorewall to fail with the diagnostic:</para>
diagnostic:</para>
<programlisting>error: failed dependencies:iproute is needed by shorewall-1.4.0-1</programlisting> <programlisting>error: failed dependencies:iproute is needed by shorewall-3.2.1-1</programlisting>
<para>This may be worked around by using the --nodeps option of <para>This may be worked around by using the --nodeps option of
rpm.</para> rpm.</para>
@ -365,7 +368,7 @@
<listitem> <listitem>
<para>cd to the shorewall directory (the version is encoded in the <para>cd to the shorewall directory (the version is encoded in the
directory name as in <quote>shorewall-3.0.1</quote>).</para> directory name as in <quote>shorewall-3.2.1</quote>).</para>
</listitem> </listitem>
<listitem> <listitem>