From e24dbb9aea639b0df651607f1ce8678903f77e20 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Sun, 23 Aug 2009 10:43:01 -0700
Subject: [PATCH] Add 'clean' target to Makefiles

---
 Shorewall/Makefile                 | 4 ++++
 Shorewall/Perl/Shorewall/Config.pm | 9 +++++++++
 Shorewall/changelog.txt            | 2 ++
 Shorewall/releasenotes.txt         | 4 +++-
 Shorewall6/Makefile                | 4 ++++
 5 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/Shorewall/Makefile b/Shorewall/Makefile
index f2a7876d4..c30df8da3 100644
--- a/Shorewall/Makefile
+++ b/Shorewall/Makefile
@@ -14,4 +14,8 @@ $(VARDIR)/${RESTOREFILE}: $(CONFDIR)/*
 	    /sbin/shorewall -q restart 2>&1 | tail >&2; \
 	fi
 
+clean:
+	@rm -f $(CONFDIR)/*~
+.PHONY: clean
+
 # EOF
diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm
index a7815f42d..c2487b582 100644
--- a/Shorewall/Perl/Shorewall/Config.pm
+++ b/Shorewall/Perl/Shorewall/Config.pm
@@ -1406,6 +1406,11 @@ sub pop_open() {
     pop_include;
 }
 
+#
+# This function is called by in-line PERL to generate a line of input for the current file.
+# If the in-line PERL returns an indication of success, then the generated lines will be
+# processed as regular file input.
+#
 sub shorewall {
     unless ( $scriptfile ) {
 	fatal_error "shorewall() may not be called in this context" unless $currentfile;
@@ -1585,6 +1590,10 @@ sub read_a_line() {
 	    # Line not blank -- Handle any first-entry message/capabilities check
 	    #
 	    if ( $first_entry ) {
+		#
+		# $first_entry can contain either a function reference or a message. If it
+		# contains a reference, call the function -- otherwise issue the message
+		#
 		reftype( $first_entry ) ? $first_entry->() : progress_message2( $first_entry );
 		$first_entry = 0;
 	    }
diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index f656bcdd1..ff3bf9ce6 100644
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -10,6 +10,8 @@ Changes in Shorewall 4.4.1
 
 5)  Minor performance improvements.
 
+6)  Add 'clean' target to Makefile.
+
 Changes in Shorewall 4.4.0
 
 1)  Fix 'compile ... -' so that it no longer requires '-v-1'
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index cca880cee..de806a12a 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -206,7 +206,9 @@ None.
     kernel does not, there is no way for Shorewall to determine that
     persistent SNAT isn't going to work. The kernel SNAT code blindly
     accepts all SNAT flags without verifying them and returns them to
-    iptables when asked.	
+    iptables when asked.
+
+2)  A 'clean' target has been added to the Makefiles.	
 
 ----------------------------------------------------------------------------
                  N E W   F E A T U R E S   I N   4 . 4
diff --git a/Shorewall6/Makefile b/Shorewall6/Makefile
index a7b34f616..9a8cb1c75 100644
--- a/Shorewall6/Makefile
+++ b/Shorewall6/Makefile
@@ -14,4 +14,8 @@ $(VARDIR)/${RESTOREFILE}: $(CONFDIR)/*
 	    /sbin/shorewall6 -q restart 2>&1 | tail >&2; \
 	fi
 
+clean:
+	@rm -f $(CONFDIR)/*~
+.PHONY: clean
+
 # EOF