RC3

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@754 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb

Shorewall/changelog.txt

@@ -94,3 +94,8 @@ Changes since 1.4.6
 41) Fix 'logunclean' log message disposition.
 
 42) Update rfc1918.
+
+43) Remove Conflict specification from shorewall.rpm to appease the
+    SuSE crowd.
+
+44) Removed a fly-speck at the beginning of the 'masq' file.

Shorewall/fallback.sh

@@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of
 #       Shoreline Firewall.
 
-VERSION=1.4.7-RC2
+VERSION=1.4.7-RC3
 
 usage() # $1 = exit status
 {

Shorewall/install.sh

@@ -54,7 +54,7 @@
 #        /etc/rc.d/rc.local file is modified to start the firewall.
 #
 
-VERSION=1.4.7-RC2
+VERSION=1.4.7-RC3
 
 usage() # $1 = exit status
 {

Shorewall/masq

@@ -1,4 +1,4 @@
-\#
+#
 # Shorewall 1.4 - Masquerade file
 #
 # /etc/shorewall/masq

Shorewall/releasenotes.txt

@@ -96,6 +96,9 @@ Problems Corrected since version 1.4.6:
 
     ACCEPT fw  net:192.0.2.12 tcp 23 - - - vladimir:
 
+19) The /etc/shorewall/masq file has had the spurious "/" character at
+    the front removed.
+
 Migration Issues:
 
 1) IP Traffic Accounting is changed from Snapshot 20030813. 
@@ -337,3 +340,5 @@ New Features:
     a set of local users and/or groups. See
     http://shorewall.net/UserSets.html for details.
 
+12) The RPM has been modified so that it no longer conflicts with
+    SuSE's bizarre kernel RPMs.

Shorewall/shorewall.spec

@@ -1,6 +1,6 @@
 %define name shorewall
 %define version 1.4.7
-%define release 0RC2
+%define release 0RC3
 %define prefix /usr
 
 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
@@ -16,7 +16,6 @@ URL: http://www.shorewall.net/
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: iptables iproute
-Conflicts: kernel <= 2.2
 
 %description
 
@@ -109,6 +108,9 @@ fi
 %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel
 
 %changelog
+* Sat Oct 04 2003 Tom Eastep <tom@shorewall.net>
+- Changed version to 1.4.7-0RC3
+- Removed conflict with 2.2 Kernels
 * Mon Sep 22 2003 Tom Eastep <tom@shorewall.net>
 - Changed version to 1.4.7-0RC2
 * Thu Sep 18 2003 Tom Eastep <tom@shorewall.net>

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 Seattle Firewall
 
-VERSION=1.4.7-RC2
+VERSION=1.4.7-RC3
 
 usage() # $1 = exit status
 {