From c6050f9fbb726bfce1f5507355c6115fd3a69078 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Mon, 13 Mar 2017 16:55:45 -0700 Subject: [PATCH 1/4] Correct log message from IPv6 Multicast action Signed-off-by: Tom Eastep --- Shorewall6/Actions/action.Multicast | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Shorewall6/Actions/action.Multicast b/Shorewall6/Actions/action.Multicast index 68e1dee31..07eba7579 100644 --- a/Shorewall6/Actions/action.Multicast +++ b/Shorewall6/Actions/action.Multicast @@ -50,7 +50,7 @@ if ( have_capability( 'ADDRTYPE' ) ) { add_jump $chainref, $target, 0, '-m addrtype --dst-type MULTICAST '; } else { - log_rule_limit( $level, $chainref, 'Broadcast' , $action, '', $tag, 'add', join( ' ', '-d', IPv6_MULTICAST . ' ' ) ) if $level ne ''; + log_rule_limit( $level, $chainref, 'Multicast' , $action, '', $tag, 'add', join( ' ', '-d', IPv6_MULTICAST . ' ' ) ) if $level ne ''; add_jump $chainref, $target, 0, join( ' ', '-d', IPv6_MULTICAST . ' ' ); } From a447d726fa47e7aeb6454f141c3ccd65fac6211d Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Tue, 14 Mar 2017 12:44:33 -0700 Subject: [PATCH 2/4] Revert change which screwed up ?begin perl ... ?end perl line numbering Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Config.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index c8e09b323..253e6bb71 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -748,7 +748,7 @@ sub initialize( $;$$) { TC_SCRIPT => '', EXPORT => 0, KLUDGEFREE => '', - VERSION => "5.1.1-RC1", + VERSION => "5.1.3", CAPVERSION => 50100 , BLACKLIST_LOG_TAG => '', RELATED_LOG_TAG => '', @@ -3772,8 +3772,6 @@ sub read_a_line($) { while ( <$currentfile> ) { chomp; - - $currentlinenumber = $. unless $currentlinenumber; # # Handle directives # @@ -3787,6 +3785,8 @@ sub read_a_line($) { $directive_callback->( 'OMITTED', $_ ) if ( $directive_callback ); next; } + + $currentlinenumber = $. unless $currentlinenumber; # # Suppress leading whitespace in certain continuation lines # From 54ef4e4ced9b4cba4a4905ce712903c2a06e70c3 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Tue, 14 Mar 2017 13:46:24 -0700 Subject: [PATCH 3/4] Delete deprecated actions during install Signed-off-by: Tom Eastep --- Shorewall/install.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Shorewall/install.sh b/Shorewall/install.sh index 1868d5217..876694ff7 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -442,6 +442,9 @@ if [ -z "$first_install" ]; then delete_file ${DESTDIR}${SHAREDIR}/shorewall/action.A_REJECT delete_file ${DESTDIR}${SHAREDIR}/shorewall/action.Drop delete_file ${DESTDIR}${SHAREDIR}/shorewall/action.Reject + delete_file ${DESTDIR}${SHAREDIR}/shorewall/action.A_Drop + delete_file ${DESTDIR}${SHAREDIR}/shorewall/action.A_Reject + delete_file ${DESTDIR}${SHAREDIR}/shorewall/action.A_AllowICMPs fi fi From a00d7217e3dea3d0667997dd41d2309664956f69 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Tue, 14 Mar 2017 13:58:59 -0700 Subject: [PATCH 4/4] Correct last commit Signed-off-by: Tom Eastep --- Shorewall/install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/Shorewall/install.sh b/Shorewall/install.sh index 876694ff7..e32e1b4a7 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -444,7 +444,6 @@ if [ -z "$first_install" ]; then delete_file ${DESTDIR}${SHAREDIR}/shorewall/action.Reject delete_file ${DESTDIR}${SHAREDIR}/shorewall/action.A_Drop delete_file ${DESTDIR}${SHAREDIR}/shorewall/action.A_Reject - delete_file ${DESTDIR}${SHAREDIR}/shorewall/action.A_AllowICMPs fi fi