Update versions from 3.0 to 3.2

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3297 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-01-16 15:15:43 +00:00
parent 9325925aef
commit 01e38957e0
88 changed files with 95 additions and 91 deletions

View File

@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
59 Temple Place, Suite 3.2, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Foundation, Inc., 59 Temple Place, Suite 3.2, Boston, MA 02111-1307 USA
Also add information on how to contact you by electronic and paper mail.

View File

@ -1,4 +1,4 @@
Shoreline Firewall (Shorewall) Version 3.0
Shoreline Firewall (Shorewall) Version 3.2
----- ----
-----------------------------------------------------------------------------

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 -- Extension Script to create Limit action.
# Shorewall version 3.2 -- Extension Script to create Limit action.
#
# /usr/share/shorewall/Limit
##############################################################################

View File

@ -1 +1 @@
This is the Shorewall stable 3.0 branch of CVS.
This is the Shorewall Development 3.2 branch of CVS.

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Accounting File
# Shorewall version 3.2 - Accounting File
#
# /etc/shorewall/accounting
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Drop Action
# Shorewall version 3.2 - Drop Action
#
# /usr/share/shorewall/action.Drop
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Limit Action
# Shorewall version 3.2 - Limit Action
#
# /usr/share/shorewall/action.Limit
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Reject Action
# Shorewall version 3.2 - Reject Action
#
# /usr/share/shorewall/action.Reject
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Action Template
# Shorewall version 3.2 - Action Template
#
# /etc/shorewall/action.template
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Actions File
# Shorewall version 3.2 - Actions File
#
# /etc/shorewall/actions
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Actions.std File
# Shorewall version 3.2 - Actions.std File
#
# /usr/share/shorewall/actions.std
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Blacklist File
# Shorewall version 3.2 - Blacklist File
#
# /etc/shorewall/blacklist
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Default Config Path
# Shorewall version 3.2 - Default Config Path
#
# /usr/share/shorewall/configpath
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Continue File
# Shorewall version 3.2 - Continue File
#
# /etc/shorewall/continue
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Ecn File
# Shorewall version 3.2 - Ecn File
#
# /etc/shorewall/ecn
#

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V3.0
# The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V3.2
#
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
#
@ -1685,7 +1685,7 @@ validate_hosts_file() {
#
# Format a match by the passed MAC address
# The passed address begins with "~" and uses "-" as a separator between bytes
# Example: ~01-02-03-04-05-06
# Example: ~01-02-03.24-05-06
#
mac_match() # $1 = MAC address formated as described above
{

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# Shorewall 3.0 -- /usr/share/shorewall/functions
# Shorewall 3.2 -- /usr/share/shorewall/functions
#
# Message to stderr

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# Shorewall help subsystem - V3.0
# Shorewall help subsystem - V3.2
#
#
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Hosts file
# Shorewall version 3.2 - Hosts file
#
# /etc/shorewall/hosts
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Init File
# Shorewall version 3.2 - Init File
#
# /etc/shorewall/init
#

View File

@ -1,7 +1,7 @@
#!/bin/sh
RCDLINKS="2,S41 3,S41 6,K41"
#
# The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V3.0
# The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V3.2
#
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Initdone File
# Shorewall version 3.2 - Initdone File
#
# /etc/shorewall/initdone
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Interfaces File
# Shorewall version 3.2 - Interfaces File
#
# /etc/shorewall/interfaces
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Maclist file
# Shorewall version 3.2 - Maclist file
#
# /etc/shorewall/maclist
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - AllowICMPs Macro
# Shorewall version 3.2 - AllowICMPs Macro
#
# /usr/share/shorewall/macro.AllowICMPs
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Amanda Macro
# Shorewall version 3.2 - Amanda Macro
#
# /usr/share/shorewall/macro.Amanda
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Auth Macro
# Shorewall version 3.2 - Auth Macro
#
# /usr/share/shorewall/macro.Auth
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - BitTorrent Macro
# Shorewall version 3.2 - BitTorrent Macro
#
# /usr/share/shorewall/macro.BitTorrent
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - CVS Macro
# Shorewall version 3.2 - CVS Macro
#
# /usr/share/shorewall/macro.CVS
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - DNS Macro
# Shorewall version 3.2 - DNS Macro
#
# /usr/share/shorewall/macro.DNS
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Distcc Macro
# Shorewall version 3.2 - Distcc Macro
#
# /usr/share/shorewall/macro.Distcc
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - DropDNSrep Macro
# Shorewall version 3.2 - DropDNSrep Macro
#
# /usr/share/shorewall/macro.DropDNSrep
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - DropUPnP Macro
# Shorewall version 3.2 - DropUPnP Macro
#
# /usr/share/shorewall/macro.DropUPnP
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Edonkey Macro
# Shorewall version 3.2 - Edonkey Macro
#
# /usr/share/shorewall/macro.Edonkey
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - FTP Macro
# Shorewall version 3.2 - FTP Macro
#
# /usr/share/shorewall/macro.FTP
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Gnutella Macro
# Shorewall version 3.2 - Gnutella Macro
#
# /usr/share/shorewall/macro.Gnutella
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - ICQ Macro
# Shorewall version 3.2 - ICQ Macro
#
# /usr/share/shorewall/macro.ICQ
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - IMAP Macro
# Shorewall version 3.2 - IMAP Macro
#
# /usr/share/shorewall/macro.IMAP
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - LDAP Macro
# Shorewall version 3.2 - LDAP Macro
#
# /usr/share/shorewall/macro.LDAP
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - MySQL Macro
# Shorewall version 3.2 - MySQL Macro
#
# /usr/share/shorewall/macro.MySQL
#
@ -8,5 +8,5 @@
###############################################################################
#ACTION SOURCE DEST PROTO DEST SOURCE ORIGINAL RATE USER/
# PORT PORT(S) DEST LIMIT GROUP
PARAM - - tcp 3306
PARAM - - tcp 3.26
#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 NNTP Macro
# Shorewall version 3.2 NNTP Macro
#
# /usr/share/shorewall/macro.NNTP
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - NTP Macro
# Shorewall version 3.2 - NTP Macro
#
# /usr/share/shorewall/macro.NTP
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - NTPbrd Macro
# Shorewall version 3.2 - NTPbrd Macro
#
# /usr/share/shorewall/macro.NTPbrd
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - PCA Macro
# Shorewall version 3.2 - PCA Macro
#
# /usr/share/shorewall/macro.PCA
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - POP3 Macro
# Shorewall version 3.2 - POP3 Macro
#
# /usr/share/shorewall/macro.POP3
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Ping Macro
# Shorewall version 3.2 - Ping Macro
#
# /usr/share/shorewall/macro.Ping
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - PostgreSQL Macro
# Shorewall version 3.2 - PostgreSQL Macro
#
# /usr/share/shorewall/macro.PostgreSQL
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Rdate Macro
# Shorewall version 3.2 - Rdate Macro
#
# /usr/share/shorewall/macro.Rdate
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Rsync Macro
# Shorewall version 3.2 - Rsync Macro
#
# /usr/share/shorewall/macro.Rsync
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - SMB Macro
# Shorewall version 3.2 - SMB Macro
#
# /usr/share/shorewall/macro.SMB
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - SMBswat Macro
# Shorewall version 3.2 - SMBswat Macro
#
# /usr/share/shorewall/macro.SMBswat
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - SMTP Macro
# Shorewall version 3.2 - SMTP Macro
#
# /usr/share/shorewall/macro.SMTP
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - SNMP Macro
# Shorewall version 3.2 - SNMP Macro
#
# /usr/share/shorewall/macro.SNMP
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - SPAMD Macro
# Shorewall version 3.2 - SPAMD Macro
#
# /usr/share/shorewall/macro.SPAMD
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - SSH Macro
# Shorewall version 3.2 - SSH Macro
#
# /usr/share/shorewall/macro.SSH
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - SVN Macro
# Shorewall version 3.2 - SVN Macro
#
# /usr/share/shorewall/macro.SVN
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Submission Macro
# Shorewall version 3.2 - Submission Macro
#
# /usr/share/shorewall/macro.Submission
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Syslog Macro
# Shorewall version 3.2 - Syslog Macro
#
# /usr/share/shorewall/macro.Syslog
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Telnet Macro
# Shorewall version 3.2 - Telnet Macro
#
# /usr/share/shorewall/macro.Telnet
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 -Trcrt Macro
# Shorewall version 3.2 -Trcrt Macro
#
# /usr/share/shorewall/macro.Trcrt
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - VNC Macro
# Shorewall version 3.2 - VNC Macro
#
# /usr/share/shorewall/macro.VNC
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 -VNCL Macro
# Shorewall version 3.2 -VNCL Macro
#
# /usr/share/shorewall/macro.VNCL
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Web Macro
# Shorewall version 3.2 - Web Macro
#
# /usr/share/shorewall/macro.Web
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Webmin Macro
# Shorewall version 3.2 - Webmin Macro
#
# /usr/share/shorewall/macro.Webmin
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Macro Template
# Shorewall version 3.2 - Macro Template
#
# /usr/share/shorewall/macro.template
#

View File

@ -1,11 +1,15 @@
#
# Shorewall version 3.0 - Masq file
# Shorewall version 3.2 - Masq file
#
# /etc/shorewall/masq
#
# Use this file to define dynamic NAT (Masquerading) and to define
# Source NAT (SNAT).
#
# WARNING: The entries in this file are order-sensitive. The first
# entry that matches a particular connection will be the one that
# is used.
#
# WARNING: If you have more than one ISP, adding entries to this
# file will *not* force connections to go out through a particular
# ISP. You must use PREROUTING entries in /etc/shorewall/tcrules

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Modules File
# Shorewall version 3.2 - Modules File
#
# /etc/shorewall/modules
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Nat File
# Shorewall version 3.2 - Nat File
#
# /etc/shorewall/nat
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Netmap File
# Shorewall version 3.2 - Netmap File
#
# /etc/shorewall/netmap
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Params File
# Shorewall version 3.2 - Params File
#
# /etc/shorewall/params
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Policy File
# Shorewall version 3.2 - Policy File
#
# /etc/shorewall/policy
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Providers File
# Shorewall version 3.2 - Providers File
#
# /etc/shorewall/providers
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Proxyarp File
# Shorewall version 3.2 - Proxyarp File
#
# /etc/shorewall/proxyarp
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Rfc1918 File
# Shorewall version 3.2 - Rfc1918 File
#
# /etc/shorewall/rfc1918
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Routestopped File
# Shorewall version 3.2 - Routestopped File
#
# /etc/shorewall/routestopped
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Rules File
# Shorewall version 3.2 - Rules File
#
# /etc/shorewall/rules
#

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# Shorewall Packet Filtering Firewall Control Program - V3.0
# Shorewall Packet Filtering Firewall Control Program - V3.2
#
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Start File
# Shorewall version 3.2 - Start File
#
# /etc/shorewall/start
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Started File
# Shorewall version 3.2 - Started File
#
# /etc/shorewall/started
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Stop File
# Shorewall version 3.2 - Stop File
#
# /etc/shorewall/stop
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Stopped File
# Shorewall version 3.2 - Stopped File
#
# /etc/shorewall/stopped
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Tcclasses File
# Shorewall version 3.2 - Tcclasses File
#
# Based on tc4shorewall version 0.5 by Arne Bernin
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Tcdevices File
# Shorewall version 3.2 - Tcdevices File
#
# Based on tc4shorewall version 0.5 by Arne Bernin
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Tcrules File
# Shorewall version 3.2 - Tcrules File
#
# /etc/shorewall/tcrules
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Tos File
# Shorewall version 3.2 - Tos File
#
# /etc/shorewall/tos
#

View File

@ -2,7 +2,7 @@
RCDLINKS="2,S45 3,S45 6,K45"
################################################################################
# Script to create a gre or ipip tunnel -- Shorewall 3.0
# Script to create a gre or ipip tunnel -- Shorewall 3.2
#
# Modified - Steve Cowles 5/9/2000
# Incorporated init {start|stop} syntax and iproute2 usage

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Tunnels File
# Shorewall version 3.2 - Tunnels File
#
# /etc/shorewall/tunnels
#

View File

@ -1,5 +1,5 @@
#
# Shorewall version 3.0 - Zones File
# Shorewall version 3.2 - Zones File
#
# /etc/shorewall/zones
#