From ce8df2f66c0a0348e0c92026b0b9651177ed07e8 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Wed, 18 May 2011 17:50:12 -0700 Subject: [PATCH] Revert "Bump version to Beta 3" This reverts commit 465e729288121705779a2c4cd2303f245b63d20b. --- Shorewall-init/install.sh | 2 +- Shorewall-init/shorewall-init.spec | 4 +--- Shorewall-init/uninstall.sh | 2 +- Shorewall-lite/install.sh | 2 +- Shorewall-lite/shorewall-lite.spec | 4 +--- Shorewall-lite/uninstall.sh | 2 +- Shorewall/Perl/Shorewall/Config.pm | 20 +++----------------- Shorewall/install.sh | 2 +- Shorewall/lib.base | 2 +- Shorewall/lib.cli | 4 ---- Shorewall/shorewall.spec | 4 +--- Shorewall/uninstall.sh | 2 +- Shorewall6-lite/install.sh | 2 +- Shorewall6-lite/shorewall6-lite.spec | 4 +--- Shorewall6-lite/uninstall.sh | 2 +- Shorewall6/install.sh | 2 +- Shorewall6/lib.base | 2 +- Shorewall6/lib.cli | 2 -- Shorewall6/shorewall6.spec | 4 +--- Shorewall6/uninstall.sh | 2 +- 20 files changed, 20 insertions(+), 50 deletions(-) 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/install.sh b/Shorewall-lite/install.sh index 0921b2d66..b25b76f27 100755 --- a/Shorewall-lite/install.sh +++ b/Shorewall-lite/install.sh @@ -22,7 +22,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-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec index 7f21b83c8..92818a626 100644 --- a/Shorewall-lite/shorewall-lite.spec +++ b/Shorewall-lite/shorewall-lite.spec @@ -1,6 +1,6 @@ %define name shorewall-lite %define version 4.4.20 -%define release 0Beta3 +%define release 0Beta2 Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems. Name: %{name} @@ -104,8 +104,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.20-0Beta1 diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh index e7c53190d..a4ac7f298 100755 --- a/Shorewall-lite/uninstall.sh +++ b/Shorewall-lite/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/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index 5911ebb01..d4e1fc36a 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -262,7 +262,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', ); @@ -413,8 +412,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 @@ -562,8 +561,7 @@ sub initialize( $ ) { PANIC => 0, NONE => '', NFLOG => 'NFLOG', - LOGMARK => 'LOGMARK', - AUDIT => 'AUDIT' ); + LOGMARK => 'LOGMARK' ); # # From parsing the capabilities file or capabilities detection @@ -621,7 +619,6 @@ sub initialize( $ ) { MARK_ANYWHERE => undef, HEADER_MATCH => undef, ACCOUNT_TARGET => undef, - AUDIT_TARGET => undef, CAPVERSION => undef, KERNELVERSION => undef, ); @@ -2056,12 +2053,6 @@ sub validate_level( $ ) { return 'LOGMARK'; } - if ( $level =~ /^AUDIT\(.+\)$/ ) { - require_capability( 'AUDIT_TARGET', 'AUDIT', 's' ); - fatal_error "Invalid AUDIT type ($2)" unless $2 =~ /^(?:DROP|REJECT|ACCEPT)$/; - return "AUDIT --type $2"; - } - level_error( $rawlevel ); } @@ -2534,14 +2525,9 @@ sub Account_Target() { } } -sub Audit_Target() { - qt1( "$iptables -A $sillyname -j AUDIT --type DROP" ); -} - our %detect_capability = ( ACCOUNT_TARGET =>\&Account_Target, ADDRTYPE => \&Addrtype, - AUDIT_TARGET => \&Audit_Target, CLASSIFY_TARGET => \&Classify_Target, COMMENTS => \&Comments, CONNLIMIT_MATCH => \&Connlimit_Match, diff --git a/Shorewall/install.sh b/Shorewall/install.sh index 8e55e085d..2b046d6cd 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -22,7 +22,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/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 0ceef14ce..716f9d9d4 100644 --- a/Shorewall/lib.cli +++ b/Shorewall/lib.cli @@ -1707,7 +1707,6 @@ determine_capabilities() { MARK_ANYWHERE= HEADER_MATCH= ACCOUNT_TARGET= - AUDIT_TARGET= chain=fooX$$ @@ -1847,7 +1846,6 @@ determine_capabilities() { qt $IPTABLES -A $chain -j LOG || LOG_TARGET= qt $IPTABLES -A $chain -j MARK --set-mark 5 && MARK_ANYWHERE=Yes qt $IPTABLES -A $chain -j ACCOUNT --addr 192.168.1.0/29 --tname $chain && ACCOUNT_TARGET=Yes - qt $IPTABLES -A $chain -j AUDIT --type DROP && ACCOUNT_TARGET=Yes qt $IPTABLES -F $chain qt $IPTABLES -X $chain @@ -1930,7 +1928,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= @@ -1998,7 +1995,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..995ef60b6 100644 --- a/Shorewall/shorewall.spec +++ b/Shorewall/shorewall.spec @@ -1,6 +1,6 @@ %define name shorewall %define version 4.4.20 -%define release 0Beta3 +%define release 0Beta2 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. Name: %{name} @@ -110,8 +110,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 * Fri Apr 15 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.20-0Beta1 diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh index ce62594a5..6ff39e240 100755 --- a/Shorewall/uninstall.sh +++ b/Shorewall/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/Shorewall6-lite/install.sh b/Shorewall6-lite/install.sh index c3a7ba81b..aff5e58b8 100755 --- a/Shorewall6-lite/install.sh +++ b/Shorewall6-lite/install.sh @@ -22,7 +22,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/Shorewall6-lite/shorewall6-lite.spec b/Shorewall6-lite/shorewall6-lite.spec index 806bcf06e..0e9206ff4 100644 --- a/Shorewall6-lite/shorewall6-lite.spec +++ b/Shorewall6-lite/shorewall6-lite.spec @@ -1,6 +1,6 @@ %define name shorewall6-lite %define version 4.4.20 -%define release 0Beta3 +%define release 0Beta2 Summary: Shoreline Firewall 6 Lite is an ip6tables-based firewall for Linux systems. Name: %{name} @@ -95,8 +95,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.20-0Beta1 diff --git a/Shorewall6-lite/uninstall.sh b/Shorewall6-lite/uninstall.sh index 29a380ae1..93ea184a3 100755 --- a/Shorewall6-lite/uninstall.sh +++ b/Shorewall6-lite/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/Shorewall6/install.sh b/Shorewall6/install.sh index f00c1c609..76155ba03 100755 --- a/Shorewall6/install.sh +++ b/Shorewall6/install.sh @@ -22,7 +22,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/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 cc607dbe8..76e6bf542 100644 --- a/Shorewall6/lib.cli +++ b/Shorewall6/lib.cli @@ -1568,7 +1568,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= @@ -1633,7 +1632,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..2c017ffaa 100644 --- a/Shorewall6/shorewall6.spec +++ b/Shorewall6/shorewall6.spec @@ -1,6 +1,6 @@ %define name shorewall6 %define version 4.4.20 -%define release 0Beta3 +%define release 0Beta2 Summary: Shoreline Firewall 6 is an ip6tables-based firewall for Linux systems. Name: %{name} @@ -99,8 +99,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.20-0Beta1 diff --git a/Shorewall6/uninstall.sh b/Shorewall6/uninstall.sh index 99eacb4d4..8113d4507 100755 --- a/Shorewall6/uninstall.sh +++ b/Shorewall6/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 {