From c6459aaa273b1ba7b7886a3c2336b6a2a9dfb9e4 Mon Sep 17 00:00:00 2001 From: teastep Date: Wed, 3 Jan 2007 23:26:13 +0000 Subject: [PATCH] Change version to 3.4.0-Beta2 git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5196 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall-lite/fallback.sh | 2 +- Shorewall-lite/install.sh | 10 ++++---- Shorewall-lite/shorewall-lite | 6 ++--- Shorewall-lite/shorewall-lite.spec | 34 +++++++++++++++++---------- Shorewall-lite/uninstall.sh | 2 +- Shorewall/fallback.sh | 2 +- Shorewall/install.sh | 2 +- Shorewall/releasenotes.txt | 9 ++----- Shorewall/shorewall.spec | 4 +++- Shorewall/uninstall.sh | 2 +- manpages-lite/shorewall-lite.conf.xml | 3 ++- web/Documentation.html | 6 ++--- 12 files changed, 44 insertions(+), 38 deletions(-) diff --git a/Shorewall-lite/fallback.sh b/Shorewall-lite/fallback.sh index d9ea9d53f..d179942f2 100755 --- a/Shorewall-lite/fallback.sh +++ b/Shorewall-lite/fallback.sh @@ -28,7 +28,7 @@ # shown below. Simply run this script to revert to your prior version of # Shoreline Firewall. -VERSION=3.4.0-Beta1 +VERSION=3.4.0-Beta2 usage() # $1 = exit status { diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index c963cae68..81595f09e 100755 --- a/Shorewall-lite/install.sh +++ b/Shorewall-lite/install.sh @@ -22,7 +22,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA # -VERSION=3.4.0-Beta1 +VERSION=3.4.0-Beta2 usage() # $1 = exit status { @@ -227,6 +227,8 @@ if [ -z "$PREFIX" -a -d /etc/shorewall-lite ]; then backup_directory /usr/share/shorewall-lite backup_directory /var/lib/shorewall-lite fi + [ -f /etc/shorewall-lite/shorewall.conf ] && \ + mv -f /etc/shorewall-lite/shorewall.conf /etc/shorewall-lite/shorewall-lite.conf else first_install="Yes" rm -rf ${PREFIX}/etc/shorewall-lite @@ -267,9 +269,9 @@ chmod 755 ${PREFIX}/usr/share/shorewall-lite # # Install the config file # -if [ ! -f ${PREFIX}/etc/shorewall-lite/shorewall.conf ]; then - run_install $OWNERSHIP -m 0744 shorewall.conf ${PREFIX}/etc/shorewall-lite/shorewall.conf - echo "Config file installed as ${PREFIX}/etc/shorewall-lite/shorewall.conf" +if [ ! -f ${PREFIX}/etc/shorewall-lite/shorewall-lite.conf ]; then + run_install $OWNERSHIP -m 0744 shorewall-lite.conf ${PREFIX}/etc/shorewall-lite/shorewall-lite.conf + echo "Config file installed as ${PREFIX}/etc/shorewall-lite/shorewall-lite.conf" fi if [ -n "$ARCHLINUX" ] ; then diff --git a/Shorewall-lite/shorewall-lite b/Shorewall-lite/shorewall-lite index 44bdaafef..5eba5108f 100755 --- a/Shorewall-lite/shorewall-lite +++ b/Shorewall-lite/shorewall-lite @@ -84,7 +84,7 @@ # address and vice versa. # -# Set the configuration variables from shorewall.conf +# Set the configuration variables from shorewall-lite.conf # get_config() { @@ -535,9 +535,7 @@ done ensure_config_path -config=$(find_file shorewall.conf) - -[ -f $config ] || config=$(find_file shorewall-lite.conf) +config=$(find_file shorewall-lite.conf) if [ -f $config ]; then if [ -r $config ]; then diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec index 2e1f9e0d6..1324fd2f3 100644 --- a/Shorewall-lite/shorewall-lite.spec +++ b/Shorewall-lite/shorewall-lite.spec @@ -1,6 +1,6 @@ %define name shorewall-lite %define version 3.4.0 -%define release 0Beta1 +%define release 0Beta2 %define prefix /usr Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems. @@ -41,25 +41,30 @@ export GROUP=`id -n -g` ;\ %clean rm -rf $RPM_BUILD_ROOT +%pre + +if [ $1 -eq 2 -a -f /etc/shorewall-lite/shorewall.conf ]; then + mv -f /etc/shorewall-lite/shorewall.conf /etc/shorewall-lite/shorewall-lite.conf +fi + %post if [ $1 -eq 1 ]; then - if [ -x /sbin/insserv ]; then - /sbin/insserv /etc/rc.d/shorewall-lite - elif [ -x /sbin/chkconfig ]; then - /sbin/chkconfig --add shorewall-lite; - fi + if [ -x /sbin/insserv ]; then + /sbin/insserv /etc/rc.d/shorewall-lite + elif [ -x /sbin/chkconfig ]; then + /sbin/chkconfig --add shorewall-lite; + fi fi %preun -if [ $1 = 0 ]; then - if [ -x /sbin/insserv ]; then - /sbin/insserv -r /etc/init.d/shorewall-lite - elif [ -x /sbin/chkconfig ]; then - /sbin/chkconfig --del shorewall-lite - fi - +if [ $1 -eq 0 ]; then + if [ -x /sbin/insserv ]; then + /sbin/insserv -r /etc/init.d/shorewall-lite + elif [ -x /sbin/chkconfig ]; then + /sbin/chkconfig --del shorewall-lite + fi fi %files @@ -89,6 +94,9 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog +* Wed Jan 03 2007 Tom Eastep tom@shorewall.net +- Updated to 3.4.0-0Beta2 +- Handle rename of shorewall.conf * Thu Dec 14 2006 Tom Eastep tom@shorewall.net - Updated to 3.4.0-0Beta1 * Sat Nov 25 2006 Tom Eastep tom@shorewall.net diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh index 2d762f757..5d24a9c83 100755 --- a/Shorewall-lite/uninstall.sh +++ b/Shorewall-lite/uninstall.sh @@ -26,7 +26,7 @@ # You may only use this script to uninstall the version # shown below. Simply run this script to remove Shorewall Firewall -VERSION=3.4.0-Beta1 +VERSION=3.4.0-Beta2 usage() # $1 = exit status { diff --git a/Shorewall/fallback.sh b/Shorewall/fallback.sh index 439814837..5bf46f84b 100755 --- a/Shorewall/fallback.sh +++ b/Shorewall/fallback.sh @@ -28,7 +28,7 @@ # shown below. Simply run this script to revert to your prior version of # Shoreline Firewall. -VERSION=3.4.0-Beta1 +VERSION=3.4.0-Beta2 usage() # $1 = exit status { diff --git a/Shorewall/install.sh b/Shorewall/install.sh index 96483a812..05f95bf7e 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -22,7 +22,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA # -VERSION=3.4.0-Beta1 +VERSION=3.4.0-Beta2 usage() # $1 = exit status { diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index a0e6a0b3d..41174467e 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -117,13 +117,8 @@ Migration Considerations: 4) This issue only applies if you run Shorewall Lite. The /etc/shorewall-lite/shorewall.conf file has been renamed - /etc/shorewall-lite/shorewall-lite.conf. If you use the - tarball to install, your shorewall.conf file will be - retained and Shorewall Lite will continue to use it. - - If you use an RPM and you have modified the existing - /etc/shorewall/shorewall.conf, make a copy of the file - so that you can restore the changes once you have upgraded. + /etc/shorewall-lite/shorewall-lite.conf. When you upgrade, + your shorewall.conf file will be renamed shorewall-lite.conf. New Features in Shorewall 3.4: diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec index 1795ae143..910233776 100644 --- a/Shorewall/shorewall.spec +++ b/Shorewall/shorewall.spec @@ -1,6 +1,6 @@ %define name shorewall %define version 3.4.0 -%define release 0Beta1 +%define release 0Beta2 %define prefix /usr Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. @@ -257,6 +257,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples %changelog +* Wed Jan 03 2007 Tom Eastep tom@shorewall.net +- Updated to 3.4.0-0Beta2 * Thu Dec 14 2006 Tom Eastep tom@shorewall.net - Updated to 3.4.0-0Beta1 * Sat Nov 25 2006 Tom Eastep tom@shorewall.net diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh index ed9ff886c..77057f2c9 100755 --- a/Shorewall/uninstall.sh +++ b/Shorewall/uninstall.sh @@ -26,7 +26,7 @@ # You may only use this script to uninstall the version # shown below. Simply run this script to remove Shorewall Firewall -VERSION=3.4.0-Beta1 +VERSION=3.4.0-Beta2 usage() # $1 = exit status { diff --git a/manpages-lite/shorewall-lite.conf.xml b/manpages-lite/shorewall-lite.conf.xml index 2a99d9c7b..6ec8e0df4 100644 --- a/manpages-lite/shorewall-lite.conf.xml +++ b/manpages-lite/shorewall-lite.conf.xml @@ -32,7 +32,8 @@ Any option not specified in this file gets its value from the shorewall.conf file used during compilation of - /var/lib/shorewall-lite/firewall. + /var/lib/shorewall-lite/firewall. Those settings may be found in the file + /var/lib/shorewall-lite/firewall.conf. diff --git a/web/Documentation.html b/web/Documentation.html index 25a4ae763..de9c1fd5d 100644 --- a/web/Documentation.html +++ b/web/Documentation.html @@ -28,7 +28,8 @@ Documentation License”.
style="font-weight: bold;">Index of all Articles (En Español) -
  • FAQs
    • +
  • FAQs
    +
  • QuickStart Guides (HOWTOs for setting up Shorewall in popular configurations)
    • @@ -43,8 +44,7 @@ cannot do)
  • Troubleshooting Guide
  • Upgrade Issues -(when you -encounter problems after upgrading your Shorewall installation)
    • +(avoid problems when upgrading your Shorewall installation)
    Shorewall 2.x