holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Revert "Bump version to Beta 3"

Browse Source 
This reverts commit 465e729288.
This commit is contained in:
Tom Eastep 2011-05-18 17:50:12 -07:00
parent 465e729288
commit ce8df2f66c
20 changed files with 20 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall-init/install.sh
View File

@ -23,7 +23,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # 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 usage() # $1 = exit status
{ {

4
Shorewall-init/shorewall-init.spec
View File

@ -1,6 +1,6 @@
%define name shorewall-init %define name shorewall-init
%define version 4.4.20 %define version 4.4.20
%define release 0Beta3 %define release 0Beta2
Summary: Shorewall-init adds functionality to Shoreline Firewall (Shorewall). Summary: Shorewall-init adds functionality to Shoreline Firewall (Shorewall).
Name: %{name} Name: %{name}
@ -120,8 +120,6 @@ fi
%changelog %changelog
* Wed May 18 2011 Tom Eastep tom@shorewall.net * 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 - Updated to 4.4.20-0Beta2
* Sat Apr 16 2011 Tom Eastep tom@shorewall.net * Sat Apr 16 2011 Tom Eastep tom@shorewall.net
- Updated to 4.4.19-1 - Updated to 4.4.19-1

2
Shorewall-init/uninstall.sh
View File

@ -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 Shorewall Firewall # shown below. Simply run this script to remove Shorewall Firewall
VERSION=4.4.20-Beta3 VERSION=4.4.20-Beta2
usage() # $1 = exit status usage() # $1 = exit status
{ {

2
Shorewall-lite/install.sh
View File

@ -22,7 +22,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # 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 usage() # $1 = exit status
{ {

4
Shorewall-lite/shorewall-lite.spec
View File

@ -1,6 +1,6 @@
%define name shorewall-lite %define name shorewall-lite
%define version 4.4.20 %define version 4.4.20
%define release 0Beta3 %define release 0Beta2
Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems. Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems.
Name: %{name} Name: %{name}
@ -104,8 +104,6 @@ fi
%changelog %changelog
* Wed May 18 2011 Tom Eastep tom@shorewall.net * 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 - Updated to 4.4.20-0Beta2
* Sat Apr 16 2011 Tom Eastep tom@shorewall.net * Sat Apr 16 2011 Tom Eastep tom@shorewall.net
- Updated to 4.4.20-0Beta1 - Updated to 4.4.20-0Beta1

2
Shorewall-lite/uninstall.sh
View File

@ -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 Shorewall Firewall # shown below. Simply run this script to remove Shorewall Firewall
VERSION=4.4.20-Beta3 VERSION=4.4.20-Beta2
usage() # $1 = exit status usage() # $1 = exit status
{ {

20
Shorewall/Perl/Shorewall/Config.pm
View File

@ -262,7 +262,6 @@ my %capdesc = ( NAT_ENABLED => 'NAT',
MARK_ANYWHERE => 'Mark in any table', MARK_ANYWHERE => 'Mark in any table',
HEADER_MATCH => 'Header Match', HEADER_MATCH => 'Header Match',
ACCOUNT_TARGET => 'ACCOUNT Target', ACCOUNT_TARGET => 'ACCOUNT Target',
AUDIT_TARGET => 'AUDIT Target',
CAPVERSION => 'Capability Version', CAPVERSION => 'Capability Version',
KERNELVERSION => 'Kernel Version', KERNELVERSION => 'Kernel Version',
); );
@ -413,8 +412,8 @@ sub initialize( $ ) {
EXPORT => 0, EXPORT => 0,
STATEMATCH => '-m state --state', STATEMATCH => '-m state --state',
UNTRACKED => 0, UNTRACKED => 0,
VERSION => "4.4.20-Beta3", VERSION => "4.4.20-Beta2",
CAPVERSION => 40420, CAPVERSION => 40417 ,
); );
# #
# From shorewall.conf file # From shorewall.conf file
@ -562,8 +561,7 @@ sub initialize( $ ) {
PANIC => 0, PANIC => 0,
NONE => '', NONE => '',
NFLOG => 'NFLOG', NFLOG => 'NFLOG',
LOGMARK => 'LOGMARK', LOGMARK => 'LOGMARK' );
AUDIT => 'AUDIT' );
# #
# From parsing the capabilities file or capabilities detection # From parsing the capabilities file or capabilities detection
@ -621,7 +619,6 @@ sub initialize( $ ) {
MARK_ANYWHERE => undef, MARK_ANYWHERE => undef,
HEADER_MATCH => undef, HEADER_MATCH => undef,
ACCOUNT_TARGET => undef, ACCOUNT_TARGET => undef,
AUDIT_TARGET => undef,
CAPVERSION => undef, CAPVERSION => undef,
KERNELVERSION => undef, KERNELVERSION => undef,
); );
@ -2056,12 +2053,6 @@ sub validate_level( $ ) {
return 'LOGMARK'; 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 ); level_error( $rawlevel );
} }
@ -2534,14 +2525,9 @@ sub Account_Target() {
} }
} }
sub Audit_Target() {
qt1( "$iptables -A $sillyname -j AUDIT --type DROP" );
}
our %detect_capability = our %detect_capability =
( ACCOUNT_TARGET =>\&Account_Target, ( ACCOUNT_TARGET =>\&Account_Target,
ADDRTYPE => \&Addrtype, ADDRTYPE => \&Addrtype,
AUDIT_TARGET => \&Audit_Target,
CLASSIFY_TARGET => \&Classify_Target, CLASSIFY_TARGET => \&Classify_Target,
COMMENTS => \&Comments, COMMENTS => \&Comments,
CONNLIMIT_MATCH => \&Connlimit_Match, CONNLIMIT_MATCH => \&Connlimit_Match,

2
Shorewall/install.sh
View File

@ -22,7 +22,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # 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 usage() # $1 = exit status
{ {

2
Shorewall/lib.base
View File

@ -29,7 +29,7 @@
# #
SHOREWALL_LIBVERSION=40407 SHOREWALL_LIBVERSION=40407
SHOREWALL_CAPVERSION=40420 SHOREWALL_CAPVERSION=40417
[ -n "${VARDIR:=/var/lib/shorewall}" ] [ -n "${VARDIR:=/var/lib/shorewall}" ]
[ -n "${SHAREDIR:=/usr/share/shorewall}" ] [ -n "${SHAREDIR:=/usr/share/shorewall}" ]

4
Shorewall/lib.cli
View File

@ -1707,7 +1707,6 @@ determine_capabilities() {
MARK_ANYWHERE= MARK_ANYWHERE=
HEADER_MATCH= HEADER_MATCH=
ACCOUNT_TARGET= ACCOUNT_TARGET=
AUDIT_TARGET=
chain=fooX$$ chain=fooX$$
@ -1847,7 +1846,6 @@ determine_capabilities() {
qt $IPTABLES -A $chain -j LOG || LOG_TARGET= 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 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 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 -F $chain
qt $IPTABLES -X $chain qt $IPTABLES -X $chain
@ -1930,7 +1928,6 @@ report_capabilities() {
report_capability "Mark in any table" $MARK_ANYWHERE report_capability "Mark in any table" $MARK_ANYWHERE
report_capability "Header Match" $HEADER_MATCH report_capability "Header Match" $HEADER_MATCH
report_capability "ACCOUNT Target" $ACCOUNT_TARGET report_capability "ACCOUNT Target" $ACCOUNT_TARGET
report_capability "AUDIT Target" $AUDIT_TARGET
fi fi
[ -n "$PKTTYPE" ] || USEPKTTYPE= [ -n "$PKTTYPE" ] || USEPKTTYPE=
@ -1998,7 +1995,6 @@ report_capabilities1() {
report_capability1 MARK_ANYWHERE report_capability1 MARK_ANYWHERE
report_capability1 HEADER_MATCH report_capability1 HEADER_MATCH
report_capability1 ACCOUNT_TARGET report_capability1 ACCOUNT_TARGET
report_capability1 AUDIT_TARGET
echo CAPVERSION=$SHOREWALL_CAPVERSION echo CAPVERSION=$SHOREWALL_CAPVERSION
echo KERNELVERSION=$KERNELVERSION echo KERNELVERSION=$KERNELVERSION

4
Shorewall/shorewall.spec
View File

@ -1,6 +1,6 @@
%define name shorewall %define name shorewall
%define version 4.4.20 %define version 4.4.20
%define release 0Beta3 %define release 0Beta2
Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
Name: %{name} Name: %{name}
@ -110,8 +110,6 @@ fi
%changelog %changelog
* Wed May 18 2011 Tom Eastep tom@shorewall.net * 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 - Updated to 4.4.20-0Beta2
* Fri Apr 15 2011 Tom Eastep tom@shorewall.net * Fri Apr 15 2011 Tom Eastep tom@shorewall.net
- Updated to 4.4.20-0Beta1 - Updated to 4.4.20-0Beta1

2
Shorewall/uninstall.sh
View File

@ -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 Shorewall Firewall # shown below. Simply run this script to remove Shorewall Firewall
VERSION=4.4.20-Beta3 VERSION=4.4.20-Beta2
usage() # $1 = exit status usage() # $1 = exit status
{ {

2
Shorewall6-lite/install.sh
View File

@ -22,7 +22,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # 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 usage() # $1 = exit status
{ {

4
Shorewall6-lite/shorewall6-lite.spec
View File

@ -1,6 +1,6 @@
%define name shorewall6-lite %define name shorewall6-lite
%define version 4.4.20 %define version 4.4.20
%define release 0Beta3 %define release 0Beta2
Summary: Shoreline Firewall 6 Lite is an ip6tables-based firewall for Linux systems. Summary: Shoreline Firewall 6 Lite is an ip6tables-based firewall for Linux systems.
Name: %{name} Name: %{name}
@ -95,8 +95,6 @@ fi
%changelog %changelog
* Wed May 18 2011 Tom Eastep tom@shorewall.net * 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 - Updated to 4.4.20-0Beta2
* Sat Apr 16 2011 Tom Eastep tom@shorewall.net * Sat Apr 16 2011 Tom Eastep tom@shorewall.net
- Updated to 4.4.20-0Beta1 - Updated to 4.4.20-0Beta1

2
Shorewall6-lite/uninstall.sh
View File

@ -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 Shorewall Firewall # shown below. Simply run this script to remove Shorewall Firewall
VERSION=4.4.20-Beta3 VERSION=4.4.20-Beta2
usage() # $1 = exit status usage() # $1 = exit status
{ {

2
Shorewall6/install.sh
View File

@ -22,7 +22,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # 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 usage() # $1 = exit status
{ {

2
Shorewall6/lib.base
View File

@ -33,7 +33,7 @@
# #
SHOREWALL_LIBVERSION=40407 SHOREWALL_LIBVERSION=40407
SHOREWALL_CAPVERSION=40420 SHOREWALL_CAPVERSION=40417
[ -n "${VARDIR:=/var/lib/shorewall6}" ] [ -n "${VARDIR:=/var/lib/shorewall6}" ]
[ -n "${SHAREDIR:=/usr/share/shorewall6}" ] [ -n "${SHAREDIR:=/usr/share/shorewall6}" ]

2
Shorewall6/lib.cli
View File

@ -1568,7 +1568,6 @@ report_capabilities() {
report_capability "Mark in any table" $MARK_ANYWHERE report_capability "Mark in any table" $MARK_ANYWHERE
report_capability "Header Match" $HEADER_MATCH report_capability "Header Match" $HEADER_MATCH
report_capability "ACCOUNT Match" $ACCOUNT_TARGET report_capability "ACCOUNT Match" $ACCOUNT_TARGET
report_capability "AUDIT Match" $AUDIT_TARGET
fi fi
[ -n "$PKTTYPE" ] || USEPKTTYPE= [ -n "$PKTTYPE" ] || USEPKTTYPE=
@ -1633,7 +1632,6 @@ report_capabilities1() {
report_capability1 MARK_ANYWHERE report_capability1 MARK_ANYWHERE
report_capability1 HEADER_MATCH report_capability1 HEADER_MATCH
report_capability1 ACCOUNT_TARGET report_capability1 ACCOUNT_TARGET
report_capability1 AUDIT_TARGET
echo CAPVERSION=$SHOREWALL_CAPVERSION echo CAPVERSION=$SHOREWALL_CAPVERSION
echo KERNELVERSION=$KERNELVERSION echo KERNELVERSION=$KERNELVERSION

4
Shorewall6/shorewall6.spec
View File

@ -1,6 +1,6 @@
%define name shorewall6 %define name shorewall6
%define version 4.4.20 %define version 4.4.20
%define release 0Beta3 %define release 0Beta2
Summary: Shoreline Firewall 6 is an ip6tables-based firewall for Linux systems. Summary: Shoreline Firewall 6 is an ip6tables-based firewall for Linux systems.
Name: %{name} Name: %{name}
@ -99,8 +99,6 @@ fi
%changelog %changelog
* Wed May 18 2011 Tom Eastep tom@shorewall.net * 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 - Updated to 4.4.20-0Beta2
* Sat Apr 16 2011 Tom Eastep tom@shorewall.net * Sat Apr 16 2011 Tom Eastep tom@shorewall.net
- Updated to 4.4.20-0Beta1 - Updated to 4.4.20-0Beta1

2
Shorewall6/uninstall.sh
View File

@ -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 Shorewall Firewall # shown below. Simply run this script to remove Shorewall Firewall
VERSION=4.4.20-Beta3 VERSION=4.4.20-Beta2
usage() # $1 = exit status usage() # $1 = exit status
{ {