Pretty up 'show macros' display with long macro names

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

Shorewall-common/changelog.txt

@@ -6,6 +6,12 @@ Changes in 4.1.2
 
 3)  Handle exit status 4 from iptables.
 
+4)  Fix formatting of macro headings (again).
+
+5)  Update sample shorewall.conf files with new options.
+
+6)  Correct Jabber macro names.  
+
 Changes in 4.1.1
 
 1)  Fix ULOG/NFLOG output.

Shorewall-common/lib.cli

@@ -374,7 +374,11 @@ show_command() {
 	if [ -n "$foo" ]; then
 	    macro=${macro#*.}
 	    foo=${foo%.*}
-	    echo "   $macro  ${foo#\#}"
+	    if [ ${#macro} -gt 10 ]; then
+		echo "   $macro  ${foo#\#}"
+	    else
+		$ECHO_E "   $macro  \t${foo#\#}"
+	    fi
 	fi
     }
 

Shorewall-common/macro.JabberPlain

@@ -1,12 +1,12 @@
 #
-# Shorewall version 3.4 - Jabberd (server intercommunication)
+# Shorewall version 3.4 - JabberPlain Macro
 #
-# /usr/share/shorewall/macro.Jabberd
+# /usr/share/shorewall/macro.JabberPlain
 #
-#	This macro accepts Jabberd intercommunication traffic
+#	This macro accepts Jabber traffic (plaintext).
 #
 ###############################################################################
 #TARGET	SOURCE	PROTO	DEST	SOURCE	RATE	USER/
 #			PORT(S)	PORT(S)	LIMIT	GROUP
-PARAM	-	-	tcp	5269
+PARAM	-	-	tcp	5222
 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE

Shorewall-common/macro.JabberSecure

@@ -1,12 +1,12 @@
 #
-# Shorewall version 3.4 - JabberPlain Macro
+# Shorewall version 3.4 - JabberSecure (ssl) Macro
 #
-# /usr/share/shorewall/macro.JabberPlain
+# /usr/share/shorewall/macro.JabberSecure
 #
-#	This macro accepts Jabber traffic (plaintext).
+#	This macro accepts Jabber traffic (ssl).
 #
 ###############################################################################
 #TARGET	SOURCE	PROTO	DEST	SOURCE	RATE	USER/
 #			PORT(S)	PORT(S)	LIMIT	GROUP
-PARAM	-	-	tcp	5222
+PARAM	-	-	tcp	5223
 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE

Shorewall-common/macro.Jabberd

@@ -1,12 +1,12 @@
 #
-# Shorewall version 3.4 - JabberSecure (ssl) Macro
+# Shorewall version 3.4 - Jabberd (server intercommunication)
 #
-# /usr/share/shorewall/macro.JabberSecure
+# /usr/share/shorewall/macro.Jabberd
 #
-#	This macro accepts Jabber traffic (ssl).
+#	This macro accepts Jabberd intercommunication traffic
 #
 ###############################################################################
 #TARGET	SOURCE	PROTO	DEST	SOURCE	RATE	USER/
 #			PORT(S)	PORT(S)	LIMIT	GROUP
-PARAM	-	-	tcp	5223
+PARAM	-	-	tcp	5269
 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE

Shorewall-common/releasenotes.txt

@@ -12,10 +12,38 @@ Shorewall 4.1 Patch Release 2.
 
 Problems corrected in Shorewall 4.1.2.
 
-1)  The iptables utility doesn't retry operations that fail due to
+1)  If any of the following files was missing, a harmless Perl warning
+    was issued:
+
+       accounting
+       maclist
+       masq
+       nat
+       netmap
+       rfc1918
+       routestopped
+       tunnels
+
+    This problem was experienced mostly by Debian users and users of
+    Debian derivatives such as Ubuntu.
+
+2)  The iptables utility doesn't retry operations that fail due to
     resource shortage. Beginning with this release, Shorewall reruns
     iptables when such a failure occurs.
 
+3)  Previously, Shorewall-perl did not accept log levels in upper case
+    (e.g., INFO). Log levels are treated in a case-insensitive manner
+    by Shorewall-perl.
+
+4)  The column headers in macro files were not aligned. This has been
+    corrected, along with some inaccuracies in the macro.template file.
+
+5)  The shorewall.conf files in the Samples did not contain some
+    recently-defined options. They are now up to date.
+
+6)  The names of the Jabber macros were shuffled. They are now named
+    correctly.
+
 Other changes in Shorewall 4.1.2.
 
 1)  Shorewall 4.1.2 contains enhanced operational logging capabilities

Shorewall-common/shorewall

@@ -1577,9 +1577,11 @@ banner="Shorewall-$version Status at $HOSTNAME -"
 case $(echo -e) in
     -e*)
 	RING_BELL="echo \a"
+	ECHO_E="echo"
 	;;
     *)
 	RING_BELL="echo -e \a"
+	ECHO_E="echo -e"
 	;;
 esac