From 5a26d80d19a11a7ba8d6d687fa37166d76ed6790 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Wed, 4 Mar 2009 00:46:31 +0000
Subject: [PATCH] Create a Macros directory in SVN to help unclutter the
 product directory

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9585 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/{ => Macros}/macro.AllowICMPs   |  0
 Shorewall/{ => Macros}/macro.Amanda       |  0
 Shorewall/{ => Macros}/macro.Auth         |  0
 Shorewall/{ => Macros}/macro.BitTorrent   |  0
 Shorewall/Macros/macro.BitTorrent32       | 17 +++++++++++++++++
 Shorewall/{ => Macros}/macro.CVS          |  0
 Shorewall/{ => Macros}/macro.DAAP         |  0
 Shorewall/{ => Macros}/macro.DCC          |  0
 Shorewall/{ => Macros}/macro.DNS          |  0
 Shorewall/{ => Macros}/macro.Distcc       |  0
 Shorewall/{ => Macros}/macro.Drop         |  0
 Shorewall/{ => Macros}/macro.DropDNSrep   |  0
 Shorewall/{ => Macros}/macro.DropUPnP     |  0
 Shorewall/{ => Macros}/macro.Edonkey      |  0
 Shorewall/{ => Macros}/macro.FTP          |  0
 Shorewall/{ => Macros}/macro.Finger       |  0
 Shorewall/{ => Macros}/macro.GNUnet       |  0
 Shorewall/{ => Macros}/macro.GRE          |  0
 Shorewall/Macros/macro.Git                | 12 ++++++++++++
 Shorewall/{ => Macros}/macro.Gnutella     |  0
 Shorewall/{ => Macros}/macro.HTTP         |  0
 Shorewall/{ => Macros}/macro.HTTPS        |  0
 Shorewall/{ => Macros}/macro.ICQ          |  0
 Shorewall/{ => Macros}/macro.IMAP         |  0
 Shorewall/{ => Macros}/macro.IMAPS        |  0
 Shorewall/{ => Macros}/macro.IPIP         |  0
 Shorewall/{ => Macros}/macro.IPP          |  0
 Shorewall/{ => Macros}/macro.IPPserver    |  0
 Shorewall/{ => Macros}/macro.IPsec        |  0
 Shorewall/{ => Macros}/macro.IPsecah      |  0
 Shorewall/{ => Macros}/macro.IPsecnat     |  0
 Shorewall/{ => Macros}/macro.IRC          |  0
 Shorewall/{ => Macros}/macro.JAP          |  0
 Shorewall/{ => Macros}/macro.JabberPlain  |  0
 Shorewall/{ => Macros}/macro.JabberSecure |  0
 Shorewall/{ => Macros}/macro.Jabberd      |  0
 Shorewall/{ => Macros}/macro.Jetdirect    |  0
 Shorewall/{ => Macros}/macro.L2TP         |  0
 Shorewall/{ => Macros}/macro.LDAP         |  0
 Shorewall/{ => Macros}/macro.LDAPS        |  0
 Shorewall/{ => Macros}/macro.Mail         |  0
 Shorewall/{ => Macros}/macro.MySQL        |  0
 Shorewall/{ => Macros}/macro.NNTP         |  0
 Shorewall/{ => Macros}/macro.NNTPS        |  0
 Shorewall/{ => Macros}/macro.NTP          |  0
 Shorewall/{ => Macros}/macro.NTPbrd       |  0
 Shorewall/{ => Macros}/macro.OpenVPN      |  0
 Shorewall/{ => Macros}/macro.PCA          |  0
 Shorewall/{ => Macros}/macro.POP3         |  0
 Shorewall/{ => Macros}/macro.POP3S        |  0
 Shorewall/{ => Macros}/macro.PPtP         |  0
 Shorewall/{ => Macros}/macro.Ping         |  0
 Shorewall/{ => Macros}/macro.PostgreSQL   |  0
 Shorewall/{ => Macros}/macro.Printer      |  0
 Shorewall/{ => Macros}/macro.RDP          |  0
 Shorewall/{ => Macros}/macro.RNDC         |  0
 Shorewall/{ => Macros}/macro.Rdate        |  0
 Shorewall/{ => Macros}/macro.Reject       |  0
 Shorewall/{ => Macros}/macro.Rfc1918      |  0
 Shorewall/{ => Macros}/macro.Rsync        |  0
 Shorewall/{ => Macros}/macro.SANE         |  0
 Shorewall/{ => Macros}/macro.SMB          |  0
 Shorewall/{ => Macros}/macro.SMBBI        |  0
 Shorewall/{ => Macros}/macro.SMBswat      |  0
 Shorewall/{ => Macros}/macro.SMTP         |  0
 Shorewall/{ => Macros}/macro.SMTPS        |  0
 Shorewall/{ => Macros}/macro.SNMP         |  0
 Shorewall/{ => Macros}/macro.SPAMD        |  0
 Shorewall/{ => Macros}/macro.SSH          |  0
 Shorewall/{ => Macros}/macro.SVN          |  0
 Shorewall/{ => Macros}/macro.SixXS        |  0
 Shorewall/{ => Macros}/macro.Submission   |  0
 Shorewall/{ => Macros}/macro.Syslog       |  0
 Shorewall/{ => Macros}/macro.TFTP         |  0
 Shorewall/{ => Macros}/macro.Telnet       |  0
 Shorewall/{ => Macros}/macro.Telnets      |  0
 Shorewall/{ => Macros}/macro.Time         |  0
 Shorewall/{ => Macros}/macro.Trcrt        |  0
 Shorewall/{ => Macros}/macro.VNC          |  0
 Shorewall/{ => Macros}/macro.VNCL         |  0
 Shorewall/{ => Macros}/macro.Web          |  0
 Shorewall/{ => Macros}/macro.Webmin       |  0
 Shorewall/{ => Macros}/macro.Whois        |  0
 Shorewall/{ => Macros}/macro.template     |  0
 Shorewall/install.sh                      |  4 ++++
 85 files changed, 33 insertions(+)
 rename Shorewall/{ => Macros}/macro.AllowICMPs (100%)
 rename Shorewall/{ => Macros}/macro.Amanda (100%)
 rename Shorewall/{ => Macros}/macro.Auth (100%)
 rename Shorewall/{ => Macros}/macro.BitTorrent (100%)
 create mode 100644 Shorewall/Macros/macro.BitTorrent32
 rename Shorewall/{ => Macros}/macro.CVS (100%)
 rename Shorewall/{ => Macros}/macro.DAAP (100%)
 rename Shorewall/{ => Macros}/macro.DCC (100%)
 rename Shorewall/{ => Macros}/macro.DNS (100%)
 rename Shorewall/{ => Macros}/macro.Distcc (100%)
 rename Shorewall/{ => Macros}/macro.Drop (100%)
 rename Shorewall/{ => Macros}/macro.DropDNSrep (100%)
 rename Shorewall/{ => Macros}/macro.DropUPnP (100%)
 rename Shorewall/{ => Macros}/macro.Edonkey (100%)
 rename Shorewall/{ => Macros}/macro.FTP (100%)
 rename Shorewall/{ => Macros}/macro.Finger (100%)
 rename Shorewall/{ => Macros}/macro.GNUnet (100%)
 rename Shorewall/{ => Macros}/macro.GRE (100%)
 create mode 100644 Shorewall/Macros/macro.Git
 rename Shorewall/{ => Macros}/macro.Gnutella (100%)
 rename Shorewall/{ => Macros}/macro.HTTP (100%)
 rename Shorewall/{ => Macros}/macro.HTTPS (100%)
 rename Shorewall/{ => Macros}/macro.ICQ (100%)
 rename Shorewall/{ => Macros}/macro.IMAP (100%)
 rename Shorewall/{ => Macros}/macro.IMAPS (100%)
 rename Shorewall/{ => Macros}/macro.IPIP (100%)
 rename Shorewall/{ => Macros}/macro.IPP (100%)
 rename Shorewall/{ => Macros}/macro.IPPserver (100%)
 rename Shorewall/{ => Macros}/macro.IPsec (100%)
 rename Shorewall/{ => Macros}/macro.IPsecah (100%)
 rename Shorewall/{ => Macros}/macro.IPsecnat (100%)
 rename Shorewall/{ => Macros}/macro.IRC (100%)
 rename Shorewall/{ => Macros}/macro.JAP (100%)
 rename Shorewall/{ => Macros}/macro.JabberPlain (100%)
 rename Shorewall/{ => Macros}/macro.JabberSecure (100%)
 rename Shorewall/{ => Macros}/macro.Jabberd (100%)
 rename Shorewall/{ => Macros}/macro.Jetdirect (100%)
 rename Shorewall/{ => Macros}/macro.L2TP (100%)
 rename Shorewall/{ => Macros}/macro.LDAP (100%)
 rename Shorewall/{ => Macros}/macro.LDAPS (100%)
 rename Shorewall/{ => Macros}/macro.Mail (100%)
 rename Shorewall/{ => Macros}/macro.MySQL (100%)
 rename Shorewall/{ => Macros}/macro.NNTP (100%)
 rename Shorewall/{ => Macros}/macro.NNTPS (100%)
 rename Shorewall/{ => Macros}/macro.NTP (100%)
 rename Shorewall/{ => Macros}/macro.NTPbrd (100%)
 rename Shorewall/{ => Macros}/macro.OpenVPN (100%)
 rename Shorewall/{ => Macros}/macro.PCA (100%)
 rename Shorewall/{ => Macros}/macro.POP3 (100%)
 rename Shorewall/{ => Macros}/macro.POP3S (100%)
 rename Shorewall/{ => Macros}/macro.PPtP (100%)
 rename Shorewall/{ => Macros}/macro.Ping (100%)
 rename Shorewall/{ => Macros}/macro.PostgreSQL (100%)
 rename Shorewall/{ => Macros}/macro.Printer (100%)
 rename Shorewall/{ => Macros}/macro.RDP (100%)
 rename Shorewall/{ => Macros}/macro.RNDC (100%)
 rename Shorewall/{ => Macros}/macro.Rdate (100%)
 rename Shorewall/{ => Macros}/macro.Reject (100%)
 rename Shorewall/{ => Macros}/macro.Rfc1918 (100%)
 rename Shorewall/{ => Macros}/macro.Rsync (100%)
 rename Shorewall/{ => Macros}/macro.SANE (100%)
 rename Shorewall/{ => Macros}/macro.SMB (100%)
 rename Shorewall/{ => Macros}/macro.SMBBI (100%)
 rename Shorewall/{ => Macros}/macro.SMBswat (100%)
 rename Shorewall/{ => Macros}/macro.SMTP (100%)
 rename Shorewall/{ => Macros}/macro.SMTPS (100%)
 rename Shorewall/{ => Macros}/macro.SNMP (100%)
 rename Shorewall/{ => Macros}/macro.SPAMD (100%)
 rename Shorewall/{ => Macros}/macro.SSH (100%)
 rename Shorewall/{ => Macros}/macro.SVN (100%)
 rename Shorewall/{ => Macros}/macro.SixXS (100%)
 rename Shorewall/{ => Macros}/macro.Submission (100%)
 rename Shorewall/{ => Macros}/macro.Syslog (100%)
 rename Shorewall/{ => Macros}/macro.TFTP (100%)
 rename Shorewall/{ => Macros}/macro.Telnet (100%)
 rename Shorewall/{ => Macros}/macro.Telnets (100%)
 rename Shorewall/{ => Macros}/macro.Time (100%)
 rename Shorewall/{ => Macros}/macro.Trcrt (100%)
 rename Shorewall/{ => Macros}/macro.VNC (100%)
 rename Shorewall/{ => Macros}/macro.VNCL (100%)
 rename Shorewall/{ => Macros}/macro.Web (100%)
 rename Shorewall/{ => Macros}/macro.Webmin (100%)
 rename Shorewall/{ => Macros}/macro.Whois (100%)
 rename Shorewall/{ => Macros}/macro.template (100%)

diff --git a/Shorewall/macro.AllowICMPs b/Shorewall/Macros/macro.AllowICMPs
similarity index 100%
rename from Shorewall/macro.AllowICMPs
rename to Shorewall/Macros/macro.AllowICMPs
diff --git a/Shorewall/macro.Amanda b/Shorewall/Macros/macro.Amanda
similarity index 100%
rename from Shorewall/macro.Amanda
rename to Shorewall/Macros/macro.Amanda
diff --git a/Shorewall/macro.Auth b/Shorewall/Macros/macro.Auth
similarity index 100%
rename from Shorewall/macro.Auth
rename to Shorewall/Macros/macro.Auth
diff --git a/Shorewall/macro.BitTorrent b/Shorewall/Macros/macro.BitTorrent
similarity index 100%
rename from Shorewall/macro.BitTorrent
rename to Shorewall/Macros/macro.BitTorrent
diff --git a/Shorewall/Macros/macro.BitTorrent32 b/Shorewall/Macros/macro.BitTorrent32
new file mode 100644
index 000000000..074d78c5b
--- /dev/null
+++ b/Shorewall/Macros/macro.BitTorrent32
@@ -0,0 +1,17 @@
+#
+# Shorewall version 4 - BitTorrent 3.2 Macro
+#
+# /usr/share/shorewall/macro.BitTorrent32
+#
+#	This macro handles BitTorrent traffic for BitTorrent 3.2 and later.
+#
+###############################################################################
+#ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	RATE	USER/
+#				PORT(S)	PORT(S)	LIMIT	GROUP
+PARAM	-	-	tcp	6881:6999
+#
+# It may also be necessary to allow UDP traffic:
+#
+PARAM	-	-	udp	6881
+#
+#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE
diff --git a/Shorewall/macro.CVS b/Shorewall/Macros/macro.CVS
similarity index 100%
rename from Shorewall/macro.CVS
rename to Shorewall/Macros/macro.CVS
diff --git a/Shorewall/macro.DAAP b/Shorewall/Macros/macro.DAAP
similarity index 100%
rename from Shorewall/macro.DAAP
rename to Shorewall/Macros/macro.DAAP
diff --git a/Shorewall/macro.DCC b/Shorewall/Macros/macro.DCC
similarity index 100%
rename from Shorewall/macro.DCC
rename to Shorewall/Macros/macro.DCC
diff --git a/Shorewall/macro.DNS b/Shorewall/Macros/macro.DNS
similarity index 100%
rename from Shorewall/macro.DNS
rename to Shorewall/Macros/macro.DNS
diff --git a/Shorewall/macro.Distcc b/Shorewall/Macros/macro.Distcc
similarity index 100%
rename from Shorewall/macro.Distcc
rename to Shorewall/Macros/macro.Distcc
diff --git a/Shorewall/macro.Drop b/Shorewall/Macros/macro.Drop
similarity index 100%
rename from Shorewall/macro.Drop
rename to Shorewall/Macros/macro.Drop
diff --git a/Shorewall/macro.DropDNSrep b/Shorewall/Macros/macro.DropDNSrep
similarity index 100%
rename from Shorewall/macro.DropDNSrep
rename to Shorewall/Macros/macro.DropDNSrep
diff --git a/Shorewall/macro.DropUPnP b/Shorewall/Macros/macro.DropUPnP
similarity index 100%
rename from Shorewall/macro.DropUPnP
rename to Shorewall/Macros/macro.DropUPnP
diff --git a/Shorewall/macro.Edonkey b/Shorewall/Macros/macro.Edonkey
similarity index 100%
rename from Shorewall/macro.Edonkey
rename to Shorewall/Macros/macro.Edonkey
diff --git a/Shorewall/macro.FTP b/Shorewall/Macros/macro.FTP
similarity index 100%
rename from Shorewall/macro.FTP
rename to Shorewall/Macros/macro.FTP
diff --git a/Shorewall/macro.Finger b/Shorewall/Macros/macro.Finger
similarity index 100%
rename from Shorewall/macro.Finger
rename to Shorewall/Macros/macro.Finger
diff --git a/Shorewall/macro.GNUnet b/Shorewall/Macros/macro.GNUnet
similarity index 100%
rename from Shorewall/macro.GNUnet
rename to Shorewall/Macros/macro.GNUnet
diff --git a/Shorewall/macro.GRE b/Shorewall/Macros/macro.GRE
similarity index 100%
rename from Shorewall/macro.GRE
rename to Shorewall/Macros/macro.GRE
diff --git a/Shorewall/Macros/macro.Git b/Shorewall/Macros/macro.Git
new file mode 100644
index 000000000..a7e5c125a
--- /dev/null
+++ b/Shorewall/Macros/macro.Git
@@ -0,0 +1,12 @@
+#
+# Shorewall version 4 - Git Macro
+#
+# /usr/share/shorewall/macro.Git
+#
+#	This macro handles Git traffic.
+#
+###############################################################################
+#ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	RATE	USER/
+#				PORT(S)	PORT(S)	LIMIT	GROUP
+PARAM	-	-	tcp	9418
+#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE
diff --git a/Shorewall/macro.Gnutella b/Shorewall/Macros/macro.Gnutella
similarity index 100%
rename from Shorewall/macro.Gnutella
rename to Shorewall/Macros/macro.Gnutella
diff --git a/Shorewall/macro.HTTP b/Shorewall/Macros/macro.HTTP
similarity index 100%
rename from Shorewall/macro.HTTP
rename to Shorewall/Macros/macro.HTTP
diff --git a/Shorewall/macro.HTTPS b/Shorewall/Macros/macro.HTTPS
similarity index 100%
rename from Shorewall/macro.HTTPS
rename to Shorewall/Macros/macro.HTTPS
diff --git a/Shorewall/macro.ICQ b/Shorewall/Macros/macro.ICQ
similarity index 100%
rename from Shorewall/macro.ICQ
rename to Shorewall/Macros/macro.ICQ
diff --git a/Shorewall/macro.IMAP b/Shorewall/Macros/macro.IMAP
similarity index 100%
rename from Shorewall/macro.IMAP
rename to Shorewall/Macros/macro.IMAP
diff --git a/Shorewall/macro.IMAPS b/Shorewall/Macros/macro.IMAPS
similarity index 100%
rename from Shorewall/macro.IMAPS
rename to Shorewall/Macros/macro.IMAPS
diff --git a/Shorewall/macro.IPIP b/Shorewall/Macros/macro.IPIP
similarity index 100%
rename from Shorewall/macro.IPIP
rename to Shorewall/Macros/macro.IPIP
diff --git a/Shorewall/macro.IPP b/Shorewall/Macros/macro.IPP
similarity index 100%
rename from Shorewall/macro.IPP
rename to Shorewall/Macros/macro.IPP
diff --git a/Shorewall/macro.IPPserver b/Shorewall/Macros/macro.IPPserver
similarity index 100%
rename from Shorewall/macro.IPPserver
rename to Shorewall/Macros/macro.IPPserver
diff --git a/Shorewall/macro.IPsec b/Shorewall/Macros/macro.IPsec
similarity index 100%
rename from Shorewall/macro.IPsec
rename to Shorewall/Macros/macro.IPsec
diff --git a/Shorewall/macro.IPsecah b/Shorewall/Macros/macro.IPsecah
similarity index 100%
rename from Shorewall/macro.IPsecah
rename to Shorewall/Macros/macro.IPsecah
diff --git a/Shorewall/macro.IPsecnat b/Shorewall/Macros/macro.IPsecnat
similarity index 100%
rename from Shorewall/macro.IPsecnat
rename to Shorewall/Macros/macro.IPsecnat
diff --git a/Shorewall/macro.IRC b/Shorewall/Macros/macro.IRC
similarity index 100%
rename from Shorewall/macro.IRC
rename to Shorewall/Macros/macro.IRC
diff --git a/Shorewall/macro.JAP b/Shorewall/Macros/macro.JAP
similarity index 100%
rename from Shorewall/macro.JAP
rename to Shorewall/Macros/macro.JAP
diff --git a/Shorewall/macro.JabberPlain b/Shorewall/Macros/macro.JabberPlain
similarity index 100%
rename from Shorewall/macro.JabberPlain
rename to Shorewall/Macros/macro.JabberPlain
diff --git a/Shorewall/macro.JabberSecure b/Shorewall/Macros/macro.JabberSecure
similarity index 100%
rename from Shorewall/macro.JabberSecure
rename to Shorewall/Macros/macro.JabberSecure
diff --git a/Shorewall/macro.Jabberd b/Shorewall/Macros/macro.Jabberd
similarity index 100%
rename from Shorewall/macro.Jabberd
rename to Shorewall/Macros/macro.Jabberd
diff --git a/Shorewall/macro.Jetdirect b/Shorewall/Macros/macro.Jetdirect
similarity index 100%
rename from Shorewall/macro.Jetdirect
rename to Shorewall/Macros/macro.Jetdirect
diff --git a/Shorewall/macro.L2TP b/Shorewall/Macros/macro.L2TP
similarity index 100%
rename from Shorewall/macro.L2TP
rename to Shorewall/Macros/macro.L2TP
diff --git a/Shorewall/macro.LDAP b/Shorewall/Macros/macro.LDAP
similarity index 100%
rename from Shorewall/macro.LDAP
rename to Shorewall/Macros/macro.LDAP
diff --git a/Shorewall/macro.LDAPS b/Shorewall/Macros/macro.LDAPS
similarity index 100%
rename from Shorewall/macro.LDAPS
rename to Shorewall/Macros/macro.LDAPS
diff --git a/Shorewall/macro.Mail b/Shorewall/Macros/macro.Mail
similarity index 100%
rename from Shorewall/macro.Mail
rename to Shorewall/Macros/macro.Mail
diff --git a/Shorewall/macro.MySQL b/Shorewall/Macros/macro.MySQL
similarity index 100%
rename from Shorewall/macro.MySQL
rename to Shorewall/Macros/macro.MySQL
diff --git a/Shorewall/macro.NNTP b/Shorewall/Macros/macro.NNTP
similarity index 100%
rename from Shorewall/macro.NNTP
rename to Shorewall/Macros/macro.NNTP
diff --git a/Shorewall/macro.NNTPS b/Shorewall/Macros/macro.NNTPS
similarity index 100%
rename from Shorewall/macro.NNTPS
rename to Shorewall/Macros/macro.NNTPS
diff --git a/Shorewall/macro.NTP b/Shorewall/Macros/macro.NTP
similarity index 100%
rename from Shorewall/macro.NTP
rename to Shorewall/Macros/macro.NTP
diff --git a/Shorewall/macro.NTPbrd b/Shorewall/Macros/macro.NTPbrd
similarity index 100%
rename from Shorewall/macro.NTPbrd
rename to Shorewall/Macros/macro.NTPbrd
diff --git a/Shorewall/macro.OpenVPN b/Shorewall/Macros/macro.OpenVPN
similarity index 100%
rename from Shorewall/macro.OpenVPN
rename to Shorewall/Macros/macro.OpenVPN
diff --git a/Shorewall/macro.PCA b/Shorewall/Macros/macro.PCA
similarity index 100%
rename from Shorewall/macro.PCA
rename to Shorewall/Macros/macro.PCA
diff --git a/Shorewall/macro.POP3 b/Shorewall/Macros/macro.POP3
similarity index 100%
rename from Shorewall/macro.POP3
rename to Shorewall/Macros/macro.POP3
diff --git a/Shorewall/macro.POP3S b/Shorewall/Macros/macro.POP3S
similarity index 100%
rename from Shorewall/macro.POP3S
rename to Shorewall/Macros/macro.POP3S
diff --git a/Shorewall/macro.PPtP b/Shorewall/Macros/macro.PPtP
similarity index 100%
rename from Shorewall/macro.PPtP
rename to Shorewall/Macros/macro.PPtP
diff --git a/Shorewall/macro.Ping b/Shorewall/Macros/macro.Ping
similarity index 100%
rename from Shorewall/macro.Ping
rename to Shorewall/Macros/macro.Ping
diff --git a/Shorewall/macro.PostgreSQL b/Shorewall/Macros/macro.PostgreSQL
similarity index 100%
rename from Shorewall/macro.PostgreSQL
rename to Shorewall/Macros/macro.PostgreSQL
diff --git a/Shorewall/macro.Printer b/Shorewall/Macros/macro.Printer
similarity index 100%
rename from Shorewall/macro.Printer
rename to Shorewall/Macros/macro.Printer
diff --git a/Shorewall/macro.RDP b/Shorewall/Macros/macro.RDP
similarity index 100%
rename from Shorewall/macro.RDP
rename to Shorewall/Macros/macro.RDP
diff --git a/Shorewall/macro.RNDC b/Shorewall/Macros/macro.RNDC
similarity index 100%
rename from Shorewall/macro.RNDC
rename to Shorewall/Macros/macro.RNDC
diff --git a/Shorewall/macro.Rdate b/Shorewall/Macros/macro.Rdate
similarity index 100%
rename from Shorewall/macro.Rdate
rename to Shorewall/Macros/macro.Rdate
diff --git a/Shorewall/macro.Reject b/Shorewall/Macros/macro.Reject
similarity index 100%
rename from Shorewall/macro.Reject
rename to Shorewall/Macros/macro.Reject
diff --git a/Shorewall/macro.Rfc1918 b/Shorewall/Macros/macro.Rfc1918
similarity index 100%
rename from Shorewall/macro.Rfc1918
rename to Shorewall/Macros/macro.Rfc1918
diff --git a/Shorewall/macro.Rsync b/Shorewall/Macros/macro.Rsync
similarity index 100%
rename from Shorewall/macro.Rsync
rename to Shorewall/Macros/macro.Rsync
diff --git a/Shorewall/macro.SANE b/Shorewall/Macros/macro.SANE
similarity index 100%
rename from Shorewall/macro.SANE
rename to Shorewall/Macros/macro.SANE
diff --git a/Shorewall/macro.SMB b/Shorewall/Macros/macro.SMB
similarity index 100%
rename from Shorewall/macro.SMB
rename to Shorewall/Macros/macro.SMB
diff --git a/Shorewall/macro.SMBBI b/Shorewall/Macros/macro.SMBBI
similarity index 100%
rename from Shorewall/macro.SMBBI
rename to Shorewall/Macros/macro.SMBBI
diff --git a/Shorewall/macro.SMBswat b/Shorewall/Macros/macro.SMBswat
similarity index 100%
rename from Shorewall/macro.SMBswat
rename to Shorewall/Macros/macro.SMBswat
diff --git a/Shorewall/macro.SMTP b/Shorewall/Macros/macro.SMTP
similarity index 100%
rename from Shorewall/macro.SMTP
rename to Shorewall/Macros/macro.SMTP
diff --git a/Shorewall/macro.SMTPS b/Shorewall/Macros/macro.SMTPS
similarity index 100%
rename from Shorewall/macro.SMTPS
rename to Shorewall/Macros/macro.SMTPS
diff --git a/Shorewall/macro.SNMP b/Shorewall/Macros/macro.SNMP
similarity index 100%
rename from Shorewall/macro.SNMP
rename to Shorewall/Macros/macro.SNMP
diff --git a/Shorewall/macro.SPAMD b/Shorewall/Macros/macro.SPAMD
similarity index 100%
rename from Shorewall/macro.SPAMD
rename to Shorewall/Macros/macro.SPAMD
diff --git a/Shorewall/macro.SSH b/Shorewall/Macros/macro.SSH
similarity index 100%
rename from Shorewall/macro.SSH
rename to Shorewall/Macros/macro.SSH
diff --git a/Shorewall/macro.SVN b/Shorewall/Macros/macro.SVN
similarity index 100%
rename from Shorewall/macro.SVN
rename to Shorewall/Macros/macro.SVN
diff --git a/Shorewall/macro.SixXS b/Shorewall/Macros/macro.SixXS
similarity index 100%
rename from Shorewall/macro.SixXS
rename to Shorewall/Macros/macro.SixXS
diff --git a/Shorewall/macro.Submission b/Shorewall/Macros/macro.Submission
similarity index 100%
rename from Shorewall/macro.Submission
rename to Shorewall/Macros/macro.Submission
diff --git a/Shorewall/macro.Syslog b/Shorewall/Macros/macro.Syslog
similarity index 100%
rename from Shorewall/macro.Syslog
rename to Shorewall/Macros/macro.Syslog
diff --git a/Shorewall/macro.TFTP b/Shorewall/Macros/macro.TFTP
similarity index 100%
rename from Shorewall/macro.TFTP
rename to Shorewall/Macros/macro.TFTP
diff --git a/Shorewall/macro.Telnet b/Shorewall/Macros/macro.Telnet
similarity index 100%
rename from Shorewall/macro.Telnet
rename to Shorewall/Macros/macro.Telnet
diff --git a/Shorewall/macro.Telnets b/Shorewall/Macros/macro.Telnets
similarity index 100%
rename from Shorewall/macro.Telnets
rename to Shorewall/Macros/macro.Telnets
diff --git a/Shorewall/macro.Time b/Shorewall/Macros/macro.Time
similarity index 100%
rename from Shorewall/macro.Time
rename to Shorewall/Macros/macro.Time
diff --git a/Shorewall/macro.Trcrt b/Shorewall/Macros/macro.Trcrt
similarity index 100%
rename from Shorewall/macro.Trcrt
rename to Shorewall/Macros/macro.Trcrt
diff --git a/Shorewall/macro.VNC b/Shorewall/Macros/macro.VNC
similarity index 100%
rename from Shorewall/macro.VNC
rename to Shorewall/Macros/macro.VNC
diff --git a/Shorewall/macro.VNCL b/Shorewall/Macros/macro.VNCL
similarity index 100%
rename from Shorewall/macro.VNCL
rename to Shorewall/Macros/macro.VNCL
diff --git a/Shorewall/macro.Web b/Shorewall/Macros/macro.Web
similarity index 100%
rename from Shorewall/macro.Web
rename to Shorewall/Macros/macro.Web
diff --git a/Shorewall/macro.Webmin b/Shorewall/Macros/macro.Webmin
similarity index 100%
rename from Shorewall/macro.Webmin
rename to Shorewall/Macros/macro.Webmin
diff --git a/Shorewall/macro.Whois b/Shorewall/Macros/macro.Whois
similarity index 100%
rename from Shorewall/macro.Whois
rename to Shorewall/Macros/macro.Whois
diff --git a/Shorewall/macro.template b/Shorewall/Macros/macro.template
similarity index 100%
rename from Shorewall/macro.template
rename to Shorewall/Macros/macro.template
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index 3b3d6d87b..ca1d4809d 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -646,10 +646,14 @@ done
 
 # Install the Macro files
 #
+cd Macros
+
 for f in macro.* ; do
     install_file $f ${PREFIX}/usr/share/shorewall/$f 0644
     echo "Macro ${f#*.} file installed as ${PREFIX}/usr/share/shorewall/$f"
 done
+
+cd ..
 #
 # Install the libraries
 #