From 8011c37aa40bc4109e5f8c5d29f6e3eecda14631 Mon Sep 17 00:00:00 2001 From: judas_iscariote Date: Thu, 3 Aug 2006 04:16:32 +0000 Subject: [PATCH] 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 --- docs/Install.xml | 63 +++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/docs/Install.xml b/docs/Install.xml index 4627e6b9a..dc522e9bd 100644 --- a/docs/Install.xml +++ b/docs/Install.xml @@ -57,7 +57,7 @@ Shorewall RPMs are signed. To avoid warnings such as the - followingwarning: shorewall-3.0.1-1.noarch.rpm: V3 DSA signature: NOKEY, key ID 6c562ac4 + followingwarning: shorewall-3.2.1-1.noarch.rpm: V3 DSA signature: NOKEY, key ID 6c562ac4 download the Shorewall GPG @@ -110,10 +110,10 @@ - Some SUSE users have encountered - a problem whereby rpm reports a conflict with kernel <= 2.2 - even though a 2.4 kernel is installed. If this happens, simply - use the --nodeps option to rpm. + Some SUSE users have encountered a + problem whereby rpm reports a conflict with kernel <= 2.2 even + though a 2.4 kernel is installed. If this happens, simply use the + --nodeps option to rpm. rpm -ivh --nodeps <shorewall rpm> @@ -123,7 +123,7 @@ some distributions call this package iproute2 which will cause the installation of Shorewall to fail with the diagnostic: - error: failed dependencies:iproute is needed by shorewall-2.2.x-1 + error: failed dependencies:iproute is needed by shorewall-3.2.x-1 This problem should not occur if you are using the correct RPM package (see 1., above) but may be worked around by using the @@ -149,9 +149,7 @@ - Enable startup by removing - /etc/shorewall/startup_disabled (If you are - running Shorewall 2.1.3 or later, edit + Enable startup by editing /etc/shorewall/shorewall.conf and set STARTUP_ENABLED to Yes). @@ -176,7 +174,7 @@ cd to the shorewall directory (the version is encoded in the - directory name as in shorewall-3.0.0). + directory name as in shorewall-3.2.1). @@ -242,9 +240,16 @@ apt-get install shorewall To ensure that you are installing the latest version of Shorewall, - please modify your /etc/apt/preferences file as - described here. + please modify your /etc/apt/preferences: + + Package: shorewall +Pin: release o=Debian,a=testing +Pin-Priority: 700 + +Package: shorewall-doc +Pin: release o=Debian,a=testing +Pin-Priority: 700 Once you have completed configuring Shorewall, you can enable startup at boot time by setting startup=1 in @@ -297,12 +302,11 @@ package! The standard RPM package from shorewall.net and the mirrors is - known to work with SUSE, Power PPC, - Trustix and TurboLinux. There is also an RPM package provided by - Simon Matter that is tailored for RedHat/Fedora and another - package from Jack Coates that is customized for Mandriva. If you - try to upgrade using the wrong package, it probably won't - work. + known to work with SUSE, Power PPC, Trustix and + TurboLinux. There is also an RPM package provided by Simon Matter that + is tailored for RedHat/Fedora and another package from Jack Coates + that is customized for Mandriva. If you try to upgrade using the wrong + package, it probably won't work. @@ -311,21 +315,20 @@ rpm -Uvh <shorewall rpm file> - Some SUSE users have encountered - a problem whereby rpm reports a conflict with kernel <= 2.2 - even though a 2.4 kernel is installed. If this happens, simply - use the --nodeps option to rpm. + Some SUSE users have encountered a + problem whereby rpm reports a conflict with kernel <= 2.2 even + though a 2.4 kernel is installed. If this happens, simply use the + --nodeps option to rpm. rpm -Uvh --nodeps <shorewall rpm> - Beginning with Shorewall 1.4.0, Shorewall is dependent on the - iproute package. Unfortunately, some distributions call this package - iproute2 which will cause the upgrade of Shorewall to fail with the - diagnostic: + Shorewall is dependent on the iproute package. Unfortunately, + some distributions call this package iproute2 which will cause the + upgrade of Shorewall to fail with the diagnostic: - error: failed dependencies:iproute is needed by shorewall-1.4.0-1 + error: failed dependencies:iproute is needed by shorewall-3.2.1-1 This may be worked around by using the --nodeps option of rpm. @@ -365,7 +368,7 @@ cd to the shorewall directory (the version is encoded in the - directory name as in shorewall-3.0.1). + directory name as in shorewall-3.2.1). @@ -546,4 +549,4 @@ tar -xzvf /mnt/package2.lrp See Fallback and Uninstall. - + \ No newline at end of file