extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-08 08:44:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts

Browse Source
This commit is contained in:
Tom Eastep 2011-05-19 15:10:22 -07:00
commit e9df13a42b
12 changed files with 12 additions and 21 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.
#
VERSION=4.4.20-Beta3
VERSION=4.4.20-Beta2
usage() # $1 = exit status
{

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

@ -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

2
Shorewall-init/uninstall.sh
View File

@ -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
{

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

@ -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

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

@ -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,

2
Shorewall/lib.base
View File

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

3
Shorewall/lib.cli
View File

@ -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

2
Shorewall/shorewall.spec
View File

@ -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

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

@ -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

2
Shorewall6/lib.base
View File

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

2
Shorewall6/lib.cli
View File

@ -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

2
Shorewall6/shorewall6.spec
View File

@ -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