Delete shorewall-perl and shorewall-shell during upgrade

This commit is contained in:
Tom Eastep 2009-10-01 07:37:30 -07:00
parent 39ee3b2025
commit d323c5b9c5
3 changed files with 43 additions and 7 deletions

View File

@ -792,6 +792,11 @@ cd ..
echo "Man Pages Installed" echo "Man Pages Installed"
if [ -z "$PREFIX" ]; then
rm -rf /usr/share/shorewall-perl
rm -rf /usr/share/shorewall-shell
fi
if [ -z "$PREFIX" -a -n "$first_install" -a -z "$CYGWIN" ]; then if [ -z "$PREFIX" -a -n "$first_install" -a -z "$CYGWIN" ]; then
if [ -n "$DEBIAN" ]; then if [ -n "$DEBIAN" ]; then
run_install $OWNERSHIP -m 0644 default.debian /etc/default/shorewall run_install $OWNERSHIP -m 0644 default.debian /etc/default/shorewall

View File

@ -1,4 +1,8 @@
<<<<<<< HEAD:Shorewall/releasenotes.txt
Shorewall 4.4.2 Shorewall 4.4.2
=======
Shorewall 4.4.1 patch release 3
>>>>>>> 4f9987d831538189c9a9dea8729c92bb1deb5a9c:Shorewall/releasenotes.txt
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
R E L E A S E 4 . 4 H I G H L I G H T S R E L E A S E 4 . 4 H I G H L I G H T S
@ -66,10 +70,9 @@ Shorewall 4.4.2
WARNING: SHOREWALL_COMPILER=shell ignored. Shorewall-shell WARNING: SHOREWALL_COMPILER=shell ignored. Shorewall-shell
support has been removed in this release. support has been removed in this release.
b) Review the incompatibilities between Shorewall-shell and b) Review the shell->perl migration information at
Shorewall-perl at http://www.shorewall.net/LennyToSqueeze.html and make changes as
http://www.shorewall.net/Shorewall-perl.html#Incompatibilities necessary.
and make changes to your configuration as necessary.
We strongly recommend that you migrate to Shorewall-perl on your We strongly recommend that you migrate to Shorewall-perl on your
current Shorewall version before upgrading to Shorewall 4.4.0. That current Shorewall version before upgrading to Shorewall 4.4.0. That
@ -171,7 +174,35 @@ Shorewall 4.4.2
then it may have no additional members in /etc/shorewall/hosts. then it may have no additional members in /etc/shorewall/hosts.
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
<<<<<<< HEAD:Shorewall/releasenotes.txt
P R O B L E M S C O R R E C T E D I N 4 . 4 . 2 P R O B L E M S C O R R E C T E D I N 4 . 4 . 2
=======
P R O B L E M S C O R R E C T E D I N 4 . 4 . 1 . 3
----------------------------------------------------------------------------
1) The routestopped file wasn't verified during 'shorewall check' and
'shorewall6 check'.
2) Previously, it was not possible to specify an IP address range in
ADDRESS column of /etc/shorewall/masq. Thanks go to Jessee Shrieve
for the patch.
----------------------------------------------------------------------------
P R O B L E M S C O R R E C T E D I N 4 . 4 . 1 . 2
----------------------------------------------------------------------------
1) The compiler's chain table was not being re-initialized prior to
creating the stop_firewall() function, resulting in Perl run-time
errors.
----------------------------------------------------------------------------
P R O B L E M S C O R R E C T E D I N 4 . 4 . 1 . 1
----------------------------------------------------------------------------
1) Detection of Persistent SNAT support was broken in the compiler.
2) Initialization of the compiler's chain table was broken in ways
that made some features not work and that caused Perl runtime errors.
----------------------------------------------------------------------------
P R O B L E M S C O R R E C T E D I N 4 . 4 . 1
>>>>>>> 4f9987d831538189c9a9dea8729c92bb1deb5a9c:Shorewall/releasenotes.txt
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
1) Detection of Persistent SNAT was broken in the rules compiler. 1) Detection of Persistent SNAT was broken in the rules compiler.

View File

@ -582,8 +582,8 @@ eth0 eth1</programlisting>
<para>Current routing configuration:</para> <para>Current routing configuration:</para>
<programlisting>gateway:~# <command>ip route ls dev eth1</command> <programlisting>gateway:~# ip route ls dev eth1
172.20.1.0/24 proto kernel scope link src 172.20.1.254 <emphasis role="bold">172.20.1.0/24</emphasis> proto kernel scope link src 172.20.1.254
224.0.0.0/4 scope link 224.0.0.0/4 scope link
gateway:~# gateway:~#
</programlisting> </programlisting>
@ -592,7 +592,7 @@ gateway:~#
<programlisting>#INTERFACE SOURCE ADDRESS PROTO PORT(S) IPSEC MARK USER/ <programlisting>#INTERFACE SOURCE ADDRESS PROTO PORT(S) IPSEC MARK USER/
# GROUP # GROUP
eth0 172.20.1.0/24</programlisting> eth0 <emphasis role="bold">172.20.1.0/24</emphasis></programlisting>
<para>Note that no entry is included for 224.0.0.0/4 since that is the <para>Note that no entry is included for 224.0.0.0/4 since that is the
multicast IP range and there should never be any packets with a SOURCE multicast IP range and there should never be any packets with a SOURCE