mirror of
https://gitlab.com/shorewall/code.git
synced 2025-01-09 07:08:14 +01:00
Remove icmp.def; change versions to 1.4
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@449 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
6dd91309a8
commit
5fe2bef29e
@ -1,4 +1,4 @@
|
|||||||
Shoreline Firewall (Shorewall) Version 2.0 - 3/14/2003
|
Shoreline Firewall (Shorewall) Version 1.4 - 3/14/2003
|
||||||
----- ----
|
----- ----
|
||||||
|
|
||||||
-----------------------------------------------------------------------------
|
-----------------------------------------------------------------------------
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Shorewall 2.0 -- Blacklist File
|
# Shorewall 1.4 -- Blacklist File
|
||||||
#
|
#
|
||||||
# /etc/shorewall/blacklist
|
# /etc/shorewall/blacklist
|
||||||
#
|
#
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
Changes since 1.3.14
|
Changes since 1.3.14
|
||||||
|
|
||||||
1. All versions changed to 2.0.
|
1. All versions changed to 1.4.
|
||||||
|
|
||||||
2. Rework of error message generation to make the 'firewall' script
|
2. Rework of error message generation to make the 'firewall' script
|
||||||
smaller.
|
smaller.
|
||||||
@ -28,3 +28,7 @@ Changes since 1.3.14
|
|||||||
|
|
||||||
12. Corrected rule number calculation problem in 'shorewall add' command
|
12. Corrected rule number calculation problem in 'shorewall add' command
|
||||||
processing.
|
processing.
|
||||||
|
|
||||||
|
13. Update Documentation for 1.4
|
||||||
|
|
||||||
|
13. Remove icmp.def file.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
############################################################################
|
############################################################################
|
||||||
# Shorewall 2.0 -- /etc/shorewall/common.def
|
# Shorewall 1.4 -- /etc/shorewall/common.def
|
||||||
#
|
#
|
||||||
# This file defines the rules that are applied before a policy of
|
# This file defines the rules that are applied before a policy of
|
||||||
# DROP or REJECT is applied. In addition to the rules defined in this file,
|
# DROP or REJECT is applied. In addition to the rules defined in this file,
|
||||||
|
@ -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.0.0Alpha1
|
VERSION=1.4.0Alpha1
|
||||||
|
|
||||||
usage() # $1 = exit status
|
usage() # $1 = exit status
|
||||||
{
|
{
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
#
|
#
|
||||||
# The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V2.0 3/14/2003
|
# The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V1.4 3/14/2003
|
||||||
#
|
#
|
||||||
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
|
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
|
||||||
#
|
#
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
#
|
#
|
||||||
# Shorewall 2.0 -- /usr/lib/shorewall/functions
|
# Shorewall 1.4 -- /usr/lib/shorewall/functions
|
||||||
|
|
||||||
#
|
#
|
||||||
# Suppress all output for a command
|
# Suppress all output for a command
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Shorewall 2.0 - /etc/shorewall/hosts
|
# Shorewall 1.4 - /etc/shorewall/hosts
|
||||||
#
|
#
|
||||||
# WARNING: 90% of Shorewall users don't need to add entries to this
|
# WARNING: 90% of Shorewall users don't need to add entries to this
|
||||||
# file and 80% of those who try to add such entries get it
|
# file and 80% of those who try to add such entries get it
|
||||||
|
@ -1,6 +0,0 @@
|
|||||||
##############################################################################
|
|
||||||
# Shorewall 1.3 /etc/shorewall/icmp.def
|
|
||||||
#
|
|
||||||
# This file is obsolete and is included for compatibility with existing
|
|
||||||
# icmpdef extension scripts that source it.
|
|
||||||
#
|
|
@ -1,5 +1,5 @@
|
|||||||
############################################################################
|
############################################################################
|
||||||
# Shorewall 2.0 -- /etc/shorewall/init
|
# Shorewall 1.4 -- /etc/shorewall/init
|
||||||
#
|
#
|
||||||
# Add commands below that you want to be executed at the beginning of
|
# Add commands below that you want to be executed at the beginning of
|
||||||
# a "shorewall start" or "shorewall restart" command.
|
# a "shorewall start" or "shorewall restart" command.
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
RCDLINKS="2,S41 3,S41 6,K41"
|
RCDLINKS="2,S41 3,S41 6,K41"
|
||||||
#
|
#
|
||||||
# The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V2.0 3/14/2003
|
# The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V1.4 3/14/2003
|
||||||
#
|
#
|
||||||
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
|
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
|
||||||
#
|
#
|
||||||
|
@ -54,7 +54,7 @@
|
|||||||
# /etc/rc.d/rc.local file is modified to start the firewall.
|
# /etc/rc.d/rc.local file is modified to start the firewall.
|
||||||
#
|
#
|
||||||
|
|
||||||
VERSION=2.0.0Alpha1
|
VERSION=1.4.0Alpha1
|
||||||
|
|
||||||
usage() # $1 = exit status
|
usage() # $1 = exit status
|
||||||
{
|
{
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Shorewall 2.0 -- Interfaces File
|
# Shorewall 1.4 -- Interfaces File
|
||||||
#
|
#
|
||||||
# /etc/shorewall/interfaces
|
# /etc/shorewall/interfaces
|
||||||
#
|
#
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Shorewall 2.0 - MAC list file
|
# Shorewall 1.4 - MAC list file
|
||||||
#
|
#
|
||||||
# /etc/shorewall/maclist
|
# /etc/shorewall/maclist
|
||||||
#
|
#
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Shorewall 2.0 - Masquerade file
|
# Shorewall 1.4 - Masquerade file
|
||||||
#
|
#
|
||||||
# /etc/shorewall/masq
|
# /etc/shorewall/masq
|
||||||
#
|
#
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
##############################################################################
|
##############################################################################
|
||||||
# Shorewall 2.0 /etc/shorewall/modules
|
# Shorewall 1.4 /etc/shorewall/modules
|
||||||
#
|
#
|
||||||
# This file loads the modules needed by the firewall.
|
# This file loads the modules needed by the firewall.
|
||||||
#
|
#
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
##############################################################################
|
##############################################################################
|
||||||
#
|
#
|
||||||
# Shorewall 2.0 -- Network Address Translation Table
|
# Shorewall 1.4 -- Network Address Translation Table
|
||||||
#
|
#
|
||||||
# /etc/shorewall/nat
|
# /etc/shorewall/nat
|
||||||
#
|
#
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Shorewall 2.0 /etc/shorewall/params
|
# Shorewall 1.4 /etc/shorewall/params
|
||||||
#
|
#
|
||||||
# Assign any variables that you need here.
|
# Assign any variables that you need here.
|
||||||
#
|
#
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Shorewall 2.0 -- Policy File
|
# Shorewall 1.4 -- Policy File
|
||||||
#
|
#
|
||||||
# /etc/shorewall/policy
|
# /etc/shorewall/policy
|
||||||
#
|
#
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
##############################################################################
|
##############################################################################
|
||||||
#
|
#
|
||||||
# Shorewall 2.0 -- Proxy ARP
|
# Shorewall 1.4 -- Proxy ARP
|
||||||
#
|
#
|
||||||
# /etc/shorewall/proxyarp
|
# /etc/shorewall/proxyarp
|
||||||
#
|
#
|
||||||
|
@ -3,13 +3,13 @@ This is a major release of Shorewall.
|
|||||||
Function from 1.3 that has been omitted from this version include:
|
Function from 1.3 that has been omitted from this version include:
|
||||||
|
|
||||||
1) The MERGE_HOSTS variable in shorewall.conf is no longer
|
1) The MERGE_HOSTS variable in shorewall.conf is no longer
|
||||||
supported. Shorewall 2.0 behavior is the same as 1.3 with
|
supported. Shorewall 1.4 behavior is the same as 1.3 with
|
||||||
MERGE_HOSTS=Yes.
|
MERGE_HOSTS=Yes.
|
||||||
|
|
||||||
2. Interface names of the form <device>:<integer> in
|
2. Interface names of the form <device>:<integer> in
|
||||||
/etc/shorewall/interfaces now generate an error.
|
/etc/shorewall/interfaces now generate an error.
|
||||||
|
|
||||||
3. Shorewall 2.0 implements behavior consistent with
|
3. Shorewall 1.4 implements behavior consistent with
|
||||||
OLD_PING_HANDLING=No. OLD_PING_HANDLING=Yes will generate an error
|
OLD_PING_HANDLING=No. OLD_PING_HANDLING=Yes will generate an error
|
||||||
at startup as will specification of the 'noping' or 'filterping'
|
at startup as will specification of the 'noping' or 'filterping'
|
||||||
interface options.
|
interface options.
|
||||||
@ -22,10 +22,10 @@ Function from 1.3 that has been omitted from this version include:
|
|||||||
accepted.
|
accepted.
|
||||||
|
|
||||||
6. The ALLOWRELATED variable in shorewall.conf is no longer
|
6. The ALLOWRELATED variable in shorewall.conf is no longer
|
||||||
supported. Shorewall 2.0 behavior is the same as 1.3 with
|
supported. Shorewall 1.4 behavior is the same as 1.3 with
|
||||||
ALLOWRELATED=Yes.
|
ALLOWRELATED=Yes.
|
||||||
|
|
||||||
Changes for 2.0 include:
|
Changes for 1.4 include:
|
||||||
|
|
||||||
1. shorewall.conf has been completely reorganized into logical
|
1. shorewall.conf has been completely reorganized into logical
|
||||||
sections.
|
sections.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Shorewall 1.3 -- RFC1918 File
|
# Shorewall 1.4 -- RFC1918 File
|
||||||
#
|
#
|
||||||
# /etc/shorewall/rfc1918
|
# /etc/shorewall/rfc1918
|
||||||
#
|
#
|
||||||
@ -25,7 +25,7 @@
|
|||||||
192.0.2.0/24 logdrop # Example addresses
|
192.0.2.0/24 logdrop # Example addresses
|
||||||
192.168.0.0/16 logdrop # RFC 1918
|
192.168.0.0/16 logdrop # RFC 1918
|
||||||
#
|
#
|
||||||
# The following are generated using the Python program found at:
|
# The following are generated with the help of the Python program found at:
|
||||||
#
|
#
|
||||||
# http://www.shorewall.net/pub/shorewall/contrib/iana_reserved/
|
# http://www.shorewall.net/pub/shorewall/contrib/iana_reserved/
|
||||||
#
|
#
|
||||||
@ -43,6 +43,8 @@
|
|||||||
39.0.0.0/8 logdrop # Reserved
|
39.0.0.0/8 logdrop # Reserved
|
||||||
41.0.0.0/8 logdrop # Reserved
|
41.0.0.0/8 logdrop # Reserved
|
||||||
42.0.0.0/8 logdrop # Reserved
|
42.0.0.0/8 logdrop # Reserved
|
||||||
|
49.0.0.0/8 logdrop # JTC - Returned to IANA Mar 98
|
||||||
|
50.0.0.0/8 logdrop # JTC - Returned to IANA Mar 98
|
||||||
58.0.0.0/7 logdrop # Reserved
|
58.0.0.0/7 logdrop # Reserved
|
||||||
60.0.0.0/8 logdrop # Reserved
|
60.0.0.0/8 logdrop # Reserved
|
||||||
70.0.0.0/7 logdrop # Reserved
|
70.0.0.0/7 logdrop # Reserved
|
||||||
@ -53,6 +55,8 @@
|
|||||||
96.0.0.0/3 logdrop # Reserved
|
96.0.0.0/3 logdrop # Reserved
|
||||||
127.0.0.0/8 logdrop # Loopback
|
127.0.0.0/8 logdrop # Loopback
|
||||||
197.0.0.0/8 logdrop # Reserved
|
197.0.0.0/8 logdrop # Reserved
|
||||||
|
198.18.0.0/15 logdrop # Reserved
|
||||||
|
201.0.0.0/8 logdrop # Reserved - Central & South America
|
||||||
240.0.0.0/4 logdrop # Reserved
|
240.0.0.0/4 logdrop # Reserved
|
||||||
#
|
#
|
||||||
# End of generated entries
|
# End of generated entries
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
##############################################################################
|
##############################################################################
|
||||||
#
|
#
|
||||||
# Shorewall 2.0 -- Hosts Accessible when the Firewall is Stopped
|
# Shorewall 1.4 -- Hosts Accessible when the Firewall is Stopped
|
||||||
#
|
#
|
||||||
# /etc/shorewall/routestopped
|
# /etc/shorewall/routestopped
|
||||||
#
|
#
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Shorewall version 2.0 - Rules File
|
# Shorewall version 1.4 - Rules File
|
||||||
#
|
#
|
||||||
# /etc/shorewall/rules
|
# /etc/shorewall/rules
|
||||||
#
|
#
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
#
|
#
|
||||||
# Shorewall Packet Filtering Firewall Control Program - V2.0 - 3/14/2003
|
# Shorewall Packet Filtering Firewall Control Program - V1.4 - 3/14/2003
|
||||||
#
|
#
|
||||||
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
|
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
|
||||||
#
|
#
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
##############################################################################
|
##############################################################################
|
||||||
# /etc/shorewall/shorewall.conf V2.0 - Change the following variables to
|
# /etc/shorewall/shorewall.conf V1.4 - Change the following variables to
|
||||||
# match your setup
|
# match your setup
|
||||||
#
|
#
|
||||||
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
|
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
%define name shorewall
|
%define name shorewall
|
||||||
%define version 2.0.0
|
%define version 1.4.0
|
||||||
%define release 0Alpha1
|
%define release 0Alpha1
|
||||||
%define prefix /usr
|
%define prefix /usr
|
||||||
|
|
||||||
@ -105,7 +105,7 @@ fi
|
|||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Feb 06 2003 Tom Eastep <tom@shorewall.net>
|
* Thu Feb 06 2003 Tom Eastep <tom@shorewall.net>
|
||||||
- Changes version to 2.0.0Alpha1
|
- Changes version to 1.4.0Alpha1
|
||||||
- Delete icmp.def
|
- Delete icmp.def
|
||||||
- Move firewall and version to /usr/share/shorewall
|
- Move firewall and version to /usr/share/shorewall
|
||||||
* Tue Feb 04 2003 Tom Eastep <tom@shorewall.net>
|
* Tue Feb 04 2003 Tom Eastep <tom@shorewall.net>
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
############################################################################
|
############################################################################
|
||||||
# Shorewall 2.0 -- /etc/shorewall/start
|
# Shorewall 1.4 -- /etc/shorewall/start
|
||||||
#
|
#
|
||||||
# Add commands below that you want to be executed after shorewall has
|
# Add commands below that you want to be executed after shorewall has
|
||||||
# been started or restarted.
|
# been started or restarted.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
############################################################################
|
############################################################################
|
||||||
# Shorewall 2.0 -- /etc/shorewall/stop
|
# Shorewall 1.4 -- /etc/shorewall/stop
|
||||||
#
|
#
|
||||||
# Add commands below that you want to be executed at the beginning of a
|
# Add commands below that you want to be executed at the beginning of a
|
||||||
# "shorewall stop" command.
|
# "shorewall stop" command.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
############################################################################
|
############################################################################
|
||||||
# Shorewall 2.0 -- /etc/shorewall/stopped
|
# Shorewall 1.4 -- /etc/shorewall/stopped
|
||||||
#
|
#
|
||||||
# Add commands below that you want to be executed at the completion of a
|
# Add commands below that you want to be executed at the completion of a
|
||||||
# "shorewall stop" command.
|
# "shorewall stop" command.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Shorewall version 2.0 - Traffic Control Rules File
|
# Shorewall version 1.4 - Traffic Control Rules File
|
||||||
#
|
#
|
||||||
# /etc/shorewall/tcrules
|
# /etc/shorewall/tcrules
|
||||||
#
|
#
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Shorewall 2.0 -- /etc/shorewall/tos
|
# Shorewall 1.4 -- /etc/shorewall/tos
|
||||||
#
|
#
|
||||||
# This file defines rules for setting Type Of Service (TOS)
|
# This file defines rules for setting Type Of Service (TOS)
|
||||||
#
|
#
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
RCDLINKS="2,S45 3,S45 6,K45"
|
RCDLINKS="2,S45 3,S45 6,K45"
|
||||||
################################################################################
|
################################################################################
|
||||||
# Script to create a gre or ipip tunnel -- Shorewall 2.0
|
# Script to create a gre or ipip tunnel -- Shorewall 1.4
|
||||||
#
|
#
|
||||||
# Modified - Steve Cowles 5/9/2000
|
# Modified - Steve Cowles 5/9/2000
|
||||||
# Incorporated init {start|stop} syntax and iproute2 usage
|
# Incorporated init {start|stop} syntax and iproute2 usage
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Shorewall 2.0 - /etc/shorewall/tunnels
|
# Shorewall 1.4 - /etc/shorewall/tunnels
|
||||||
#
|
#
|
||||||
# This file defines IPSEC, GRE, IPIP and OPENVPN tunnels.
|
# This file defines IPSEC, GRE, IPIP and OPENVPN tunnels.
|
||||||
#
|
#
|
||||||
|
@ -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.0.0Alpha1
|
VERSION=1.4.0Alpha1
|
||||||
|
|
||||||
usage() # $1 = exit status
|
usage() # $1 = exit status
|
||||||
{
|
{
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Shorewall 2.0 /etc/shorewall/zones
|
# Shorewall 1.4 /etc/shorewall/zones
|
||||||
#
|
#
|
||||||
# This file determines your network zones. Columns are:
|
# This file determines your network zones. Columns are:
|
||||||
#
|
#
|
||||||
|
Loading…
Reference in New Issue
Block a user