holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Change version to 3.4.0-Beta2

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5196 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-01-03 23:26:13 +00:00
parent 4fe788319f
commit c6459aaa27
12 changed files with 44 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall-lite/fallback.sh
View File

@ -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
{

10
Shorewall-lite/install.sh
View File

@ -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

6
Shorewall-lite/shorewall-lite
View File

@ -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

34
Shorewall-lite/shorewall-lite.spec
View File

@ -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

2
Shorewall-lite/uninstall.sh
View File

@ -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
{

2
Shorewall/fallback.sh
View File

@ -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
{

2
Shorewall/install.sh
View File

@ -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
{

9
Shorewall/releasenotes.txt
View File

@ -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:

4
Shorewall/shorewall.spec
View File

@ -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

2
Shorewall/uninstall.sh
View File

@ -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
{

3
manpages-lite/shorewall-lite.conf.xml
View File

@ -32,7 +32,8 @@
<para>Any option not specified in this file gets its value from the
shorewall.conf file used during compilation of
/var/lib/shorewall-lite/firewall.</para>
/var/lib/shorewall-lite/firewall. Those settings may be found in the file
/var/lib/shorewall-lite/firewall.conf.</para>
</refsect1>
<refsect1>

6
web/Documentation.html
View File

@ -28,7 +28,8 @@ Documentation License</a></span>”.<br>
style="font-weight: bold;">Index</span> of all
Articles</a> <a href="http://gomix.homelinux.net/gomix/shorewall/">(En
Español)</a></li>
<li><a href="FAQ.htm"><span style="font-weight: bold;">FAQ</span>s</a></li>
<li><a href="FAQ.htm"><span style="font-weight: bold;">FAQ</span>s<br>
</a></li>
<li><a href="shorewall_quickstart_guide.htm">QuickStart Guides
(<span style="font-weight: bold;">HOWTO</span>s for setting up
Shorewall in popular configurations)</a></li>
@ -43,8 +44,7 @@ cannot do)</a></li>
<li><a href="troubleshoot.htm"><span style="font-weight: bold;">Troubleshooting</span>
Guide</a></li>
<li><a href="upgrade_issues.htm"><span style="font-weight: bold;">Upgrade</span>&nbsp;Issues</a>
(when you
encounter problems after upgrading your Shorewall installation)</li>
(avoid problems when upgrading your Shorewall installation)</li>
</ul>
<br>
<div style="margin-left: 40px;"><a href="2.0/">Shorewall 2.x