Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0a51b7d27351c6307059170f51e7347c769895e8

commit 0a51b7d27351c6307059170f51e7347c769895e8
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Sat Jan 17 20:52:56 2009 +0100

iptables-1.4.2-2-i686

- add public key
- add status support to rc.firewall

diff --git a/source/network/iptables/FrugalBuild 
b/source/network/iptables/FrugalBuild
index 5885126..3d59237 100644
--- a/source/network/iptables/FrugalBuild
+++ b/source/network/iptables/FrugalBuild
@@ -4,7 +4,7 @@

pkgname=iptables
pkgver=1.4.2
-pkgrel=1
+pkgrel=2
pkgdesc="IP packet filter administration"
url="http://www.iptables.org/";
depends=('glibc')
diff --git a/source/network/iptables/iptables.key 
b/source/network/iptables/iptables.key
new file mode 100644
index 0000000..d32e170
--- /dev/null
+++ b/source/network/iptables/iptables.key
@@ -0,0 +1,38 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+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
+oBNP
+=3YJS
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/source/network/iptables/rc.firewall 
b/source/network/iptables/rc.firewall
index aa32a38..392afd5 100644
--- a/source/network/iptables/rc.firewall
+++ b/source/network/iptables/rc.firewall
@@ -11,18 +11,22 @@
source /lib/initscripts/functions
TEXTDOMAIN=firewall

-actions=(restart start stop)
+actions=(restart start stop status)
daemon=$"iptables firewall"

+pid="test -f /var/lock/subsys/firewall && echo running"
+
rc_start()
{
start_msg
-       if [ -e /etc/sysconfig/iptables ] ; then
+       if [ -z "$(eval $pid)" -a -e /etc/sysconfig/iptables ]; then
source /etc/sysconfig/iptables
if (( $forward == 1 )) ; then
echo 1 > /proc/sys/net/ipv4/ip_forward
fi
/usr/sbin/iptables-restore < /etc/sysconfig/firewall
+               [ -d /var/lock/subsys ] || mkdir -p /var/lock/subsys
+               touch /var/lock/subsys/firewall
ok $?
else
ok 999
@@ -32,12 +36,17 @@ rc_start()
rc_stop()
{
stop_msg
-       echo 0 > /proc/sys/net/ipv4/ip_forward
-       iptables -F && \
-       iptables -P INPUT ACCEPT && \
-       iptables -P FORWARD ACCEPT && \
-       iptables -P OUTPUT ACCEPT
-       ok $?
+       if [ -n "$(eval $pid)" ]; then
+               echo 0 > /proc/sys/net/ipv4/ip_forward
+               iptables -F && \
+               iptables -P INPUT ACCEPT && \
+               iptables -P FORWARD ACCEPT && \
+               iptables -P OUTPUT ACCEPT
+               ok $?
+               rm -f /var/lock/subsys/firewall
+       else
+               ok 999
+       fi
}

rc_exec $1
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to