diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh index 263783c73..b4d3bb498 100755 --- a/Shorewall-init/install.sh +++ b/Shorewall-init/install.sh @@ -23,7 +23,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -VERSION=4.4.20-Beta3 +VERSION=4.4.20-Beta2 usage() # $1 = exit status { diff --git a/Shorewall-init/shorewall-init.spec b/Shorewall-init/shorewall-init.spec index 00589fa18..680a2a827 100644 --- a/Shorewall-init/shorewall-init.spec +++ b/Shorewall-init/shorewall-init.spec @@ -1,6 +1,6 @@ %define name shorewall-init %define version 4.4.20 -%define release 0Beta3 +%define release 0Beta2 Summary: Shorewall-init adds functionality to Shoreline Firewall (Shorewall). Name: %{name} @@ -120,8 +120,6 @@ fi %changelog * Wed May 18 2011 Tom Eastep tom@shorewall.net -- Updated to 4.4.20-0Beta3 -* Wed May 18 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.20-0Beta2 * Sat Apr 16 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.19-1 diff --git a/Shorewall-init/uninstall.sh b/Shorewall-init/uninstall.sh index 39373e60e..70ebafd26 100755 --- a/Shorewall-init/uninstall.sh +++ b/Shorewall-init/uninstall.sh @@ -26,7 +26,7 @@ # You may only use this script to uninstall the version # shown below. Simply run this script to remove Shorewall Firewall -VERSION=4.4.20-Beta3 +VERSION=4.4.20-Beta2 usage() # $1 = exit status { diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec index 7f21b83c8..a8003a39e 100644 --- a/Shorewall-lite/shorewall-lite.spec +++ b/Shorewall-lite/shorewall-lite.spec @@ -103,7 +103,7 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog -* Wed May 18 2011 Tom Eastep tom@shorewall.net +* Thu May 19 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.20-0Beta3 * Wed May 18 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.20-0Beta2 diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index e6e153e9a..8c684990c 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -264,7 +264,6 @@ my %capdesc = ( NAT_ENABLED => 'NAT', MARK_ANYWHERE => 'Mark in any table', HEADER_MATCH => 'Header Match', ACCOUNT_TARGET => 'ACCOUNT Target', - AUDIT_TARGET => 'AUDIT Target', CAPVERSION => 'Capability Version', KERNELVERSION => 'Kernel Version', ); @@ -419,8 +418,8 @@ sub initialize( $ ) { EXPORT => 0, STATEMATCH => '-m state --state', UNTRACKED => 0, - VERSION => "4.4.20-Beta3", - CAPVERSION => 40420, + VERSION => "4.4.20-Beta2", + CAPVERSION => 40417 , ); # # From shorewall.conf file @@ -626,7 +625,6 @@ sub initialize( $ ) { MARK_ANYWHERE => undef, HEADER_MATCH => undef, ACCOUNT_TARGET => undef, - AUDIT_TARGET => undef, CAPVERSION => undef, KERNELVERSION => undef, ); @@ -2539,8 +2537,8 @@ sub Audit_Target() { our %detect_capability = ( ACCOUNT_TARGET =>\&Account_Target, - ADDRTYPE => \&Addrtype, AUDIT_TARGET => \&Audit_Target, + ADDRTYPE => \&Addrtype, CLASSIFY_TARGET => \&Classify_Target, COMMENTS => \&Comments, CONNLIMIT_MATCH => \&Connlimit_Match, diff --git a/Shorewall/lib.base b/Shorewall/lib.base index 098e9911d..5adad0e93 100644 --- a/Shorewall/lib.base +++ b/Shorewall/lib.base @@ -29,7 +29,7 @@ # SHOREWALL_LIBVERSION=40407 -SHOREWALL_CAPVERSION=40420 +SHOREWALL_CAPVERSION=40417 [ -n "${VARDIR:=/var/lib/shorewall}" ] [ -n "${SHAREDIR:=/usr/share/shorewall}" ] diff --git a/Shorewall/lib.cli b/Shorewall/lib.cli index cb87829d6..78f41376a 100644 --- a/Shorewall/lib.cli +++ b/Shorewall/lib.cli @@ -1710,7 +1710,6 @@ determine_capabilities() { MARK_ANYWHERE= HEADER_MATCH= ACCOUNT_TARGET= - AUDIT_TARGET= chain=fooX$$ @@ -1933,7 +1932,6 @@ report_capabilities() { report_capability "Mark in any table" $MARK_ANYWHERE report_capability "Header Match" $HEADER_MATCH report_capability "ACCOUNT Target" $ACCOUNT_TARGET - report_capability "AUDIT Target" $AUDIT_TARGET fi [ -n "$PKTTYPE" ] || USEPKTTYPE= @@ -2001,7 +1999,6 @@ report_capabilities1() { report_capability1 MARK_ANYWHERE report_capability1 HEADER_MATCH report_capability1 ACCOUNT_TARGET - report_capability1 AUDIT_TARGET echo CAPVERSION=$SHOREWALL_CAPVERSION echo KERNELVERSION=$KERNELVERSION diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec index 2d8142f8b..929fd3d39 100644 --- a/Shorewall/shorewall.spec +++ b/Shorewall/shorewall.spec @@ -109,7 +109,7 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt Contrib/* Samples %changelog -* Wed May 18 2011 Tom Eastep tom@shorewall.net +* Thu May 19 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.20-0Beta3 * Wed May 18 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.20-0Beta2 diff --git a/Shorewall6-lite/shorewall6-lite.spec b/Shorewall6-lite/shorewall6-lite.spec index 806bcf06e..4faf648a5 100644 --- a/Shorewall6-lite/shorewall6-lite.spec +++ b/Shorewall6-lite/shorewall6-lite.spec @@ -94,7 +94,7 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog -* Wed May 18 2011 Tom Eastep tom@shorewall.net +* Thu May 19 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.20-0Beta3 * Wed May 18 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.20-0Beta2 diff --git a/Shorewall6/lib.base b/Shorewall6/lib.base index b61005f6a..d94cd828c 100644 --- a/Shorewall6/lib.base +++ b/Shorewall6/lib.base @@ -33,7 +33,7 @@ # SHOREWALL_LIBVERSION=40407 -SHOREWALL_CAPVERSION=40420 +SHOREWALL_CAPVERSION=40417 [ -n "${VARDIR:=/var/lib/shorewall6}" ] [ -n "${SHAREDIR:=/usr/share/shorewall6}" ] diff --git a/Shorewall6/lib.cli b/Shorewall6/lib.cli index 26bac9009..bc2f510a6 100644 --- a/Shorewall6/lib.cli +++ b/Shorewall6/lib.cli @@ -1573,7 +1573,6 @@ report_capabilities() { report_capability "Mark in any table" $MARK_ANYWHERE report_capability "Header Match" $HEADER_MATCH report_capability "ACCOUNT Match" $ACCOUNT_TARGET - report_capability "AUDIT Match" $AUDIT_TARGET fi [ -n "$PKTTYPE" ] || USEPKTTYPE= @@ -1638,7 +1637,6 @@ report_capabilities1() { report_capability1 MARK_ANYWHERE report_capability1 HEADER_MATCH report_capability1 ACCOUNT_TARGET - report_capability1 AUDIT_TARGET echo CAPVERSION=$SHOREWALL_CAPVERSION echo KERNELVERSION=$KERNELVERSION diff --git a/Shorewall6/shorewall6.spec b/Shorewall6/shorewall6.spec index 4b61817bc..50024d041 100644 --- a/Shorewall6/shorewall6.spec +++ b/Shorewall6/shorewall6.spec @@ -98,7 +98,7 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn ipv6 Samples6 %changelog -* Wed May 18 2011 Tom Eastep tom@shorewall.net +* Thu May 19 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.20-0Beta3 * Wed May 18 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.20-0Beta2