mirror of
https://gitlab.com/shorewall/code.git
synced 2024-11-22 23:53:30 +01:00
Update for 2.2.5
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2144 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
e8e98ce288
commit
9cd4254dad
@ -7461,6 +7461,8 @@ do_initialize() {
|
|||||||
[ -e "$IPTABLES" ] || startup_error "\$IPTABLES=$IPTABLES does not exist or is not executable"
|
[ -e "$IPTABLES" ] || startup_error "\$IPTABLES=$IPTABLES does not exist or is not executable"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
PKTTYPE=$(added_param_value_no PKTTYPE $PKTTYPE) # Used in determine_capabilities
|
||||||
|
|
||||||
determine_capabilities
|
determine_capabilities
|
||||||
|
|
||||||
[ -z "${STATEDIR}" ] && STATEDIR=/var/state/shorewall
|
[ -z "${STATEDIR}" ] && STATEDIR=/var/state/shorewall
|
||||||
@ -7580,7 +7582,6 @@ do_initialize() {
|
|||||||
DISABLE_IPV6=$(added_param_value_no DISABLE_IPV6 $DISABLE_IPV6)
|
DISABLE_IPV6=$(added_param_value_no DISABLE_IPV6 $DISABLE_IPV6)
|
||||||
BRIDGING=$(added_param_value_no BRIDGING $BRIDGING)
|
BRIDGING=$(added_param_value_no BRIDGING $BRIDGING)
|
||||||
DYNAMIC_ZONES=$(added_param_value_no DYNAMIC_ZONES $DYNAMIC_ZONES)
|
DYNAMIC_ZONES=$(added_param_value_no DYNAMIC_ZONES $DYNAMIC_ZONES)
|
||||||
PKTTYPE=$(added_param_value_no PKTTYPE $PKTTYPE)
|
|
||||||
STARTUP_ENABLED=$(added_param_value_yes STARTUP_ENABLED $STARTUP_ENABLED)
|
STARTUP_ENABLED=$(added_param_value_yes STARTUP_ENABLED $STARTUP_ENABLED)
|
||||||
RETAIN_ALIASES=$(added_param_value_no RETAIN_ALIASES $RETAIN_ALIASES)
|
RETAIN_ALIASES=$(added_param_value_no RETAIN_ALIASES $RETAIN_ALIASES)
|
||||||
DELAYBLACKLISTLOAD=$(added_param_value_no DELAYBLACKLISTLOAD $DELAYBLACKLISTLOAD)
|
DELAYBLACKLISTLOAD=$(added_param_value_no DELAYBLACKLISTLOAD $DELAYBLACKLISTLOAD)
|
||||||
|
@ -247,9 +247,12 @@ find_zones() # $1 = name of the zone file
|
|||||||
{
|
{
|
||||||
while read zone display comments; do
|
while read zone display comments; do
|
||||||
[ -n "$zone" ] && case "$zone" in
|
[ -n "$zone" ] && case "$zone" in
|
||||||
|
[0-9*])
|
||||||
|
echo " Warning: Illegal zone name \"$zone\" in zones file ignored" 2>&2
|
||||||
|
;;
|
||||||
\#*)
|
\#*)
|
||||||
;;
|
;;
|
||||||
$FW)
|
$FW|all|none)
|
||||||
echo " Warning: Reserved zone name \"$zone\" in zones file ignored" >&2
|
echo " Warning: Reserved zone name \"$zone\" in zones file ignored" >&2
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
@ -1 +1 @@
|
|||||||
2.2.4
|
2.2.5
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
# shown below. Simply run this script to revert to your prior version of
|
# shown below. Simply run this script to revert to your prior version of
|
||||||
# Shoreline Firewall.
|
# Shoreline Firewall.
|
||||||
|
|
||||||
VERSION=2.2.4
|
VERSION=2.2.5
|
||||||
|
|
||||||
usage() # $1 = exit status
|
usage() # $1 = exit status
|
||||||
{
|
{
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
|
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
|
||||||
#
|
#
|
||||||
|
|
||||||
VERSION=2.2.4
|
VERSION=2.2.5
|
||||||
|
|
||||||
usage() # $1 = exit status
|
usage() # $1 = exit status
|
||||||
{
|
{
|
||||||
|
@ -9,6 +9,10 @@ Problems corrected in version 2.2.5
|
|||||||
2) A typo in the 'tunnel' script has been corrected (Thanks to Patrik
|
2) A typo in the 'tunnel' script has been corrected (Thanks to Patrik
|
||||||
Varmecký).
|
Varmecký).
|
||||||
|
|
||||||
|
3) A warning is now generated if an invalid short zone name is used in
|
||||||
|
/etc/shorewall/zones.
|
||||||
|
|
||||||
|
|
||||||
-----------------------------------------------------------------------
|
-----------------------------------------------------------------------
|
||||||
Problems corrected in version 2.2.4
|
Problems corrected in version 2.2.4
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
%define name shorewall
|
%define name shorewall
|
||||||
%define version 2.2.4
|
%define version 2.2.5
|
||||||
%define release 1
|
%define release 1
|
||||||
%define prefix /usr
|
%define prefix /usr
|
||||||
|
|
||||||
@ -139,6 +139,8 @@ fi
|
|||||||
%doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn
|
%doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri May 20 2005 Tom Eastep tom@shorewall.net
|
||||||
|
- Updated to 2.2.5-1
|
||||||
* Mon Apr 11 2005 Tom Eastep tom@shorewall.net
|
* Mon Apr 11 2005 Tom Eastep tom@shorewall.net
|
||||||
- Updated to 2.2.4-1
|
- Updated to 2.2.4-1
|
||||||
* Fri Apr 08 2005 Tom Eastep tom@shorewall.net
|
* Fri Apr 08 2005 Tom Eastep tom@shorewall.net
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
# You may only use this script to uninstall the version
|
# You may only use this script to uninstall the version
|
||||||
# shown below. Simply run this script to remove Seattle Firewall
|
# shown below. Simply run this script to remove Seattle Firewall
|
||||||
|
|
||||||
VERSION=2.2.4
|
VERSION=2.2.5
|
||||||
|
|
||||||
usage() # $1 = exit status
|
usage() # $1 = exit status
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user