Merge Cristian's patch

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

Shorewall/changelog.txt

@@ -4,6 +4,10 @@ Changes in 3.0.2
 
 2) Incompatibility with old kernels worked around.
 
+3) Added new Webmin macro
+
+4) Arch Linux installation routines improved
+
 Changes in 3.0.1
 
 1) Set policies for chains in nat, mangle and raw tables.

Shorewall/init.archlinux.sh

@@ -0,0 +1,58 @@
+#!/bin/bash
+
+OPTIONS="-f"
+
+if [ -f /etc/sysconfig/shorewall ] ; then
+	. /etc/sysconfig/shorewall
+elif [ -f /etc/default/shorewall ] ; then
+	. /etc/default/shorewall
+fi
+
+# if you want to override options, do so in /etc/sysconfig/shorewall or
+# in /etc/default/shorewall --
+# i strongly encourage you use the latter, since /etc/sysconfig/ does not exist.
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+DAEMON_NAME="shorewall" # of course shorewall is NOT a deamon.
+
+case "$1" in
+	start)
+		stat_busy "Starting $DAEMON_NAME"
+		/sbin/shorewall $OPTIONS start &>/dev/null
+		if [ $? -gt 0 ]; then
+			stat_fail
+		else
+			add_daemon $DAEMON_NAME
+			stat_done
+		fi
+		;;
+		
+
+	stop)
+		stat_busy "Stopping $DAEMON_NAME"
+		/sbin/shorewall stop &>/dev/null
+		if [ $? -gt 0 ]; then
+			stat_fail
+		else
+			rm_daemon $DAEMON_NAME
+			stat_done
+		fi
+		;;
+
+	restart)
+		stat_busy "Restarting $DAEMON_NAME"
+		/sbin/shorewall restart &>/dev/null
+		if [ $? -gt 0  ]; then
+			stat_fail
+		else
+			stat_done
+		fi
+		;;
+
+	*)
+		echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
+

Shorewall/install.sh

@@ -207,6 +207,10 @@ echo "shorewall control program installed in ${PREFIX}/sbin/shorewall"
 #
 if [ -n "$DEBIAN" ]; then
     install_file_with_backup init.debian.sh /etc/init.d/shorewall 0544 ${PREFIX}/usr/share/shorewall-${VERSION}.bkout
+
+elif [ -n "$ARCHLINUX" ]; then
+    install_file_with_backup init.archlinux.sh ${PREFIX}${DEST}/$INIT 0544 ${PREFIX}/usr/share/shorewall-${VERSION}.bkout
+
 else
     install_file_with_backup init.sh ${PREFIX}${DEST}/$INIT 0544 ${PREFIX}/usr/share/shorewall-${VERSION}.bkout
 fi

Shorewall/macro.SVN

@@ -3,7 +3,8 @@
 #
 # /usr/share/shorewall/macro.SVN
 #
-#	This macro handles connections to the Subversion (SVN) server.
+#	This macro handles connections to the Subversion server (svnserve).
+#
 #
 ###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGINAL	RATE	USER/

Shorewall/macro.Webmin

@@ -0,0 +1,12 @@
+#
+# Shorewall version 3.0 - Webmin Macro
+#
+# /usr/share/shorewall/macro.Webmin
+#
+#	This macro handles Webmin traffic.
+#
+###############################################################################
+#ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGINAL	RATE	USER/
+#				PORT	PORT(S)	DEST		LIMIT	GROUP
+PARAM	-	-	tcp	10000
+#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE

Shorewall/releasenotes.txt

@@ -9,6 +9,12 @@ Problems Corrected in 3.0.2
    the Linux kernel (2.4.7 for example). The new code ignores errors
    produced when Shorewall 3.x is run on these ancient kernels.
 
+3) Arch Linux installation routines has been improved.
+
+New Features in 3.0.2
+
+1) New Webmin macro
+ 
 Problems Corrected in 3.0.1
 
 1) If the previous firewall configuration included a policy other than

Shorewall/shorewall.spec

@@ -151,6 +151,7 @@ fi
 %attr(0600,root,root) /usr/share/shorewall/macro.VNC
 %attr(0600,root,root) /usr/share/shorewall/macro.VNCL
 %attr(0600,root,root) /usr/share/shorewall/macro.Web
+%attr(0600,root,root) /usr/share/shorewall/macro.Webmin
 %attr(0600,root,root) /usr/share/shorewall/rfc1918
 %attr(0600,root,root) /usr/share/shorewall/configpath