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

Fix redundant capabilities collection problem

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5920 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-04-13 22:40:37 +00:00
parent 881dec5346
commit 77a920a87f
2 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Shorewall-common/releasenotes.txt
View File

@ -1,4 +1,4 @@
Shorewall 3.9.1 Shorewall 3.9.2
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
R E L E A S E H I G H L I G H T S R E L E A S E H I G H L I G H T S
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
@ -6,7 +6,7 @@ Shorewall 3.9.1
Shorewall-perl compiler. See the "New Features" section below. Shorewall-perl compiler. See the "New Features" section below.
2) You are now offered a choice as to which compiler(s) you install. In 2) You are now offered a choice as to which compiler(s) you install. In
3.9.1, there are the following packages: 3.9.2, there are the following packages:
- Shorewall ( common files ) - Shorewall ( common files )
- Shorewall-shell ( the shell-based compiler ) - Shorewall-shell ( the shell-based compiler )
@ -15,7 +15,14 @@ Shorewall 3.9.1
You must install Shorewall and at least one of the compiler packages You must install Shorewall and at least one of the compiler packages
(you may install them both). (you may install them both).
Problems corrected in Shorewall 3.9.1 Problems corrected in Shorewall 3.9.2
1) When the -e flag was passed to the compiler, the generated script
looked for the file /usr/share/shorewall/lib.base. This totally
broke Shorewall Lite.
2) The params file was being copied into the generated script
independent of the setting of EXPORTPARAMS.
Migration Considerations: Migration Considerations:
@ -24,26 +31,26 @@ Migration Considerations:
If you attempt to upgrade using the RPM, you get this result: If you attempt to upgrade using the RPM, you get this result:
gateway:~ # rpm -Uvh shorewall-3.9.1-1.noarch.rpm gateway:~ # rpm -Uvh shorewall-3.9.2-1.noarch.rpm
error: Failed dependencies: error: Failed dependencies:
shorewall_compiler is needed by shorewall-3.9.1-1.noarch shorewall_compiler is needed by shorewall-3.9.2-1.noarch
gateway:~ # gateway:~ #
You must either: You must either:
rpm -U shorewall-3.9.1.noarch.rpm shorewall-shell-3.9.1.noarch.rpm rpm -U shorewall-3.9.2.noarch.rpm shorewall-shell-3.9.2.noarch.rpm
or or
rpm -U shorewall-3.9.1.noarch.rpm shorewall-perl-3.9.1.noarch.rpm rpm -U shorewall-3.9.2.noarch.rpm shorewall-perl-3.9.2.noarch.rpm
or or
rpm -i shorewall-shell-3.9.1.noarch.rpm rpm -i shorewall-shell-3.9.2.noarch.rpm
rpm -U shorewall-3.9.1.noarch.rpm rpm -U shorewall-3.9.2.noarch.rpm
or or
rpm -i shorewall-perl-3.9.1.noarch.rpm rpm -i shorewall-perl-3.9.2.noarch.rpm
rpm -U shorewall-3.9.1.noarch.rpm rpm -U shorewall-3.9.2.noarch.rpm
If you are upgrading using the tarball, you must install either If you are upgrading using the tarball, you must install either
shorewall-shell or shorewall-perl before you upgrade shorewall-shell or shorewall-perl before you upgrade
@ -57,8 +64,6 @@ Migration Considerations:
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
N E W F E A T U R E S N E W F E A T U R E S
----------------------------------------------------------------------------
Shorewall-perl 3.9.1
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
This companion product to Shorewall 3.4.2 and later includes a complete This companion product to Shorewall 3.4.2 and later includes a complete
rewrite of the compiler in Perl. rewrite of the compiler in Perl.

1
Shorewall-common/shorewall
View File

@ -1097,6 +1097,7 @@ reload_command() # $* = original arguments less the command.
if [ -z "$getcaps" ]; then if [ -z "$getcaps" ]; then
SHOREWALL_DIR=$(resolve_file $directory) SHOREWALL_DIR=$(resolve_file $directory)
ensure_config_path
capabilities=$(find_file capabilities) capabilities=$(find_file capabilities)
[ -f $capabilities ] || getcaps=Yes [ -f $capabilities ] || getcaps=Yes
fi fi