diff --git a/Lrp2/etc/shorewall/tos b/Lrp2/etc/shorewall/tos index ff2bbb281..9f9d2bd91 100644 --- a/Lrp2/etc/shorewall/tos +++ b/Lrp2/etc/shorewall/tos @@ -43,10 +43,10 @@ # ############################################################################## #SOURCE DEST PROTOCOL SOURCE PORTS DEST PORTS TOS -all all tcp - ssh 16 -all all tcp ssh - 16 -all all tcp - ftp 16 -all all tcp ftp - 16 -all all tcp ftp-data - 8 -all all tcp - ftp-data 8 +all all tcp - 22 16 +all all tcp 22 - 16 +all all tcp - 21 16 +all all tcp 21 - 16 +all all tcp 20 - 8 +all all tcp - 20 8 #LAST LINE -- Add your entries above -- DO NOT REMOVE diff --git a/Lrp2/usr/share/shorewall/action.AllowNNTP b/Lrp2/usr/share/shorewall/action.AllowNNTP index f4b745cfe..3bf9f4926 100644 --- a/Lrp2/usr/share/shorewall/action.AllowNNTP +++ b/Lrp2/usr/share/shorewall/action.AllowNNTP @@ -1,10 +1,11 @@ # -# Shorewall 2.0 /etc/shorewall/action.AllowNNTP +# Shorewall 2.0 /usr/share/shorewall/action.AllowNNTP # -# This action accepts NNTP traffic (Usenet). +# This action accepts NNTP traffic (Usenet) and encrypted NNTP (NNTPS) # ###################################################################################### #TARGET SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT PORT(S) LIMIT GROUP ACCEPT - - tcp 119 +ACCEPT - - tcp 563 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Lrp2/usr/share/shorewall/bogons b/Lrp2/usr/share/shorewall/bogons index 7b96cefde..46af67c47 100644 --- a/Lrp2/usr/share/shorewall/bogons +++ b/Lrp2/usr/share/shorewall/bogons @@ -14,9 +14,7 @@ # # Columns are: # -# SUBNET The subnet (host addresses also allowed as are IP -# address ranges provided that your kernel and iptables -# include iprange match support). +# SUBNET The subnet (host addresses also allowed) # TARGET Where to send packets to/from this subnet # RETURN - let the packet be processed normally # DROP - silently drop the packet @@ -48,7 +46,6 @@ 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 73.0.0.0/8 logdrop # Reserved 74.0.0.0/7 logdrop # Reserved 76.0.0.0/6 logdrop # Reserved diff --git a/Lrp2/usr/share/shorewall/version b/Lrp2/usr/share/shorewall/version index 0a692060f..6cbacdc8d 100644 --- a/Lrp2/usr/share/shorewall/version +++ b/Lrp2/usr/share/shorewall/version @@ -1 +1 @@ -2.0.10 +2.0.11 diff --git a/STABLE2/action.AllowNNTP b/STABLE2/action.AllowNNTP index f4b745cfe..3bf9f4926 100644 --- a/STABLE2/action.AllowNNTP +++ b/STABLE2/action.AllowNNTP @@ -1,10 +1,11 @@ # -# Shorewall 2.0 /etc/shorewall/action.AllowNNTP +# Shorewall 2.0 /usr/share/shorewall/action.AllowNNTP # -# This action accepts NNTP traffic (Usenet). +# This action accepts NNTP traffic (Usenet) and encrypted NNTP (NNTPS) # ###################################################################################### #TARGET SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT PORT(S) LIMIT GROUP ACCEPT - - tcp 119 +ACCEPT - - tcp 563 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/STABLE2/changelog.txt b/STABLE2/changelog.txt index e25b7dd08..be6561039 100644 --- a/STABLE2/changelog.txt +++ b/STABLE2/changelog.txt @@ -79,3 +79,5 @@ Changes in 2.0.11 2) Correct bogons file. 3) Replace service names by port numbers in /etc/shorewall/tos. + +4) Added NNTPS to action.AllowNNTP. diff --git a/STABLE2/fallback.sh b/STABLE2/fallback.sh index 8bf8e8920..187eb9bac 100755 --- a/STABLE2/fallback.sh +++ b/STABLE2/fallback.sh @@ -28,7 +28,7 @@ # shown below. Simply run this script to revert to your prior version of # Shoreline Firewall. -VERSION=2.0.10 +VERSION=2.0.11 usage() # $1 = exit status { diff --git a/STABLE2/install.sh b/STABLE2/install.sh index c25259a98..bfda8d6aa 100755 --- a/STABLE2/install.sh +++ b/STABLE2/install.sh @@ -22,7 +22,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA # -VERSION=2.0.10 +VERSION=2.0.11 usage() # $1 = exit status { @@ -540,7 +540,7 @@ fi install_file_with_backup firewall ${PREFIX}/usr/share/shorewall/firewall 0544 if [ -z "$PREFIX" ]; then - if -n "$first_install" ]; then + if [ -n "$first_install" ]; then if [ -n "$DEBIAN" ]; then run_install -o $OWNER -g $GROUP -m 0644 default.debian /etc/default/shorewall ln -s ../init.d/shorewall /etc/rcS.d/S40shorewall diff --git a/STABLE2/releasenotes.txt b/STABLE2/releasenotes.txt index af23bd24e..44a89a43c 100644 --- a/STABLE2/releasenotes.txt +++ b/STABLE2/releasenotes.txt @@ -1,4 +1,4 @@ -Shorewall 2.0.10 +Shorewall 2.0.11 ---------------------------------------------------------------------- Problems Corrected in version 2.0.4 @@ -181,3 +181,8 @@ Problems corrected in 2.0.11 2) The bogons file has been updated. 3) Service names are replaced by port numbers in /etc/shorewall/tos. +----------------------------------------------------------------------- +New Features in 2.0.11 + +1) The AllowNNTP action now allows NNTP over SSL/TLS (NTTPS). + diff --git a/STABLE2/shorewall.spec b/STABLE2/shorewall.spec index cdbe77cce..c5f054e31 100644 --- a/STABLE2/shorewall.spec +++ b/STABLE2/shorewall.spec @@ -1,5 +1,5 @@ %define name shorewall -%define version 2.0.10 +%define version 2.0.11 %define release 1 %define prefix /usr @@ -141,6 +141,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel %changelog +* Mon Nov 22 2004 Tom Eastep tom@shorewall.net +- Updated to 2.0.11-1 * Mon Oct 25 2004 Tom Eastep tom@shorewall.net - Updated to 2.0.10-1 * Thu Sep 23 2004 Tom Eastep tom@shorewall.net diff --git a/STABLE2/uninstall.sh b/STABLE2/uninstall.sh index b2de9408e..c003d223d 100755 --- a/STABLE2/uninstall.sh +++ b/STABLE2/uninstall.sh @@ -26,7 +26,7 @@ # You may only use this script to uninstall the version # shown below. Simply run this script to remove Seattle Firewall -VERSION=2.0.10 +VERSION=2.0.11 usage() # $1 = exit status {