From a29f0123031170e68456e34d228d5a69e77c368c Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Thu, 25 Jan 2007 18:28:16 +0000
Subject: [PATCH] Rename SixXS macro

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5300 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/changelog.txt                | 4 ++++
 Shorewall/{macro.SIXXS => macro.SixXS} | 2 +-
 Shorewall/releasenotes.txt             | 3 ++-
 Shorewall/shorewall.spec               | 1 +
 4 files changed, 8 insertions(+), 2 deletions(-)
 rename Shorewall/{macro.SIXXS => macro.SixXS} (95%)

diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index bae0f4a04..b356427f4 100644
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -2,6 +2,10 @@ Changes in 3.4.0 RC 1
 
 1)  LITEDIR option in shorewall.conf
 
+2)  Add some hacks for Shorewall Lite on OpenWRT
+
+3)  Add macro for SixXS.
+
 Changes in 3.4.0 Beta 3
 
 1)  Handle VLAN interface names like vlanX@ethY.
diff --git a/Shorewall/macro.SIXXS b/Shorewall/macro.SixXS
similarity index 95%
rename from Shorewall/macro.SIXXS
rename to Shorewall/macro.SixXS
index e71d9c1d6..65c202772 100644
--- a/Shorewall/macro.SIXXS
+++ b/Shorewall/macro.SixXS
@@ -1,7 +1,7 @@
 #
 # Shorewall version 3.4 - SIXXS Macro
 #
-# /usr/share/shorewall/macro.SIXXS
+# /usr/share/shorewall/macro.SixXS
 #
 #	This macro handles SixXS -- An IPv6 Deployment and Tunnel Broken
 #
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index 737180b84..730dd6003 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -53,7 +53,8 @@ Problems Corrected in 3.4.0 RC 1
 
 Other Changes in 3.4.0 RC 1
 
-None.
+1)  A macro that handles SixXS has been contributed by Christian
+    Roessner.
 
 Migration Considerations:
 
diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec
index eb91cf74b..60f6cc745 100644
--- a/Shorewall/shorewall.spec
+++ b/Shorewall/shorewall.spec
@@ -163,6 +163,7 @@ fi
 %attr(0644,root,root) /usr/share/shorewall/macro.Rdate
 %attr(0644,root,root) /usr/share/shorewall/macro.Reject
 %attr(0644,root,root) /usr/share/shorewall/macro.Rsync
+%attr(0644,root,root) /usr/share/shorewall/macro.SixXS
 %attr(0644,root,root) /usr/share/shorewall/macro.SMB
 %attr(0644,root,root) /usr/share/shorewall/macro.SMBBI
 %attr(0644,root,root) /usr/share/shorewall/macro.SMBswat