From 4523a4836ef5b350b0a64624e9b0f02f0a16aa85 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sat, 9 Sep 2006 16:35:27 +0000
Subject: [PATCH] 'functions' symbolic link to lib.base

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4557 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/install.sh       |  8 ++++----
 Shorewall/releasenotes.txt | 19 +++++++++++++++----
 Shorewall/shorewall.spec   |  1 +
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index 7076f5bb2..9c46cb1dc 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -470,10 +470,6 @@ delete_file ${PREFIX}/usr/share/shorewall/tcstart
 delete_file ${PREFIX}/usr/share/shorewall/action.Limit
 delete_file ${PREFIX}/usr/share/shorewall/Limit
 #
-# Delete the functions file
-#
-delete_file ${PREFIX}/usr/share/shorewall/functions
-#
 # Delete the xmodules file
 #
 delete_file ${PREFIX}/usr/share/shorewall/xmodules
@@ -655,6 +651,10 @@ for f in lib.* ; do
     fi
 done
 #
+# Symbolically link 'functions' to lib.base
+#
+ln -sf lib.base ${PREFIX}/usr/share/shorewall/functions
+#
 # Install the program skeleton files
 #
 for f in prog.* ; do
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index 8b4a3f6ad..bb6730c44 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -45,11 +45,22 @@ Problems Corrected in 3.3.2
 
 Other changes in 3.3.2
 
-1)  /etc/shorewall/functions has been renamed
-    /etc/shorewall/lib.base. If you soure the 'functions' file in any
-    of your own scripts, please modify them accordingly.
+1)  /usr/share/shorewall/functions has been renamed
+    /usr/share/shorewall/lib.base. It remains symbolically linked by
+    its old name so that existing scripts that source this file will
+    continue to work.
 
-2)  The output of "shorewall show log" and "shorewall logwatch" now
+2)  /usr/share/shorewall/lib.base (formerly /etc/shorewall/functions)
+    has been split into two libraries:
+
+    - /usr/share/shorewall/lib.base -- code common to all Shorewall
+      components. This file is also released as part of Shorewall Lite.
+
+    - /usr/share/shorewall/lib.conf -- configuration file parsing code 
+      common to /usr/share/shorewall/compiler and
+      /usr/share/shorewall/firewall.
+
+3)  The output of "shorewall show log" and "shorewall logwatch" now
     include the name of the log file being accessed. 
 
 Migration Considerations:
diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec
index 37ebd60f7..88e696a9c 100644
--- a/Shorewall/shorewall.spec
+++ b/Shorewall/shorewall.spec
@@ -111,6 +111,7 @@ fi
 %attr(0644,root,root) /usr/share/shorewall/action.template
 %attr(0555,root,root) /usr/share/shorewall/compiler
 %attr(0555,root,root) /usr/share/shorewall/firewall
+/usr/share/shorewall/functions
 %attr(0555,root,root) /usr/share/shorewall/help
 %attr(0444,root,root) /usr/share/shorewall/lib.accounting
 %attr(0444,root,root) /usr/share/shorewall/lib.actions