rpms/iptables/devel iptables-config, 1.4, 1.5 iptables.init, 1.9, 1.10 iptables.spec, 1.33, 1.34 iptables-1.3.4-status.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: twoerner

Update of /cvs/dist/rpms/iptables/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31768

Modified Files:
	iptables-config iptables.init iptables.spec 
Removed Files:
	iptables-1.3.4-status.patch 
Log Message:
[tw] 
- dropped new status patch
- integration directly in the config file and init script



Index: iptables-config
===================================================================
RCS file: /cvs/dist/rpms/iptables/devel/iptables-config,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- iptables-config	18 Mar 2005 16:40:36 -0000	1.4
+++ iptables-config	18 Nov 2005 12:34:33 -0000	1.5
@@ -36,3 +36,13 @@
 # Print IP addresses and port numbers in numeric format in the status output.
 IPTABLES_STATUS_NUMERIC="yes"
 
+# Verbose status output
+#   Value: yes|no,  default: yes
+# Print info about the number of packets and bytes plus the "input-" and
+# "outputdevice" in the status output.
+IPTABLES_STATUS_VERBOSE="no"
+
+# Status output with numbered lines
+#   Value: yes|no,  default: yes
+# Print a counter/number for every rule in the status output.
+IPTABLES_STATUS_LINENUMBERS="yes"


Index: iptables.init
===================================================================
RCS file: /cvs/dist/rpms/iptables/devel/iptables.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- iptables.init	17 Sep 2004 10:41:31 -0000	1.9
+++ iptables.init	18 Nov 2005 12:34:33 -0000	1.10
@@ -244,10 +244,12 @@
 }
 
 status() {
+    tables=`cat $PROC_IPTABLES_NAMES 2>/dev/null`
+
     # Do not print status if lockfile is missing and iptables modules are not 
     # loaded.
     # Check if iptable module is loaded
-    if [ ! -f "$VAR_SUBSYS_IPTABLES" ]; then
+    if [ ! -f "$VAR_SUBSYS_IPTABLES" -a -z "$tables" ]; then
 	echo $"Firewall is stopped."
 	return 1
     fi
@@ -257,7 +259,6 @@
 	echo $"Firewall is not configured. "
 	return 1
     fi
-    tables=`cat $PROC_IPTABLES_NAMES 2>/dev/null`
     if [ -z "$tables" ]; then
 	echo $"Firewall is not configured. "
 	return 1
@@ -265,10 +266,14 @@
 
     NUM=
     [ "x$IPTABLES_STATUS_NUMERIC" = "xyes" ] && NUM="-n"
+    VERBOSE= 
+    [ "x$IPTABLES_STATUS_VERBOSE" = "xyes" ] && VERBOSE="--verbose"
+    COUNT=
+    [ "x$IPTABLES_STATUS_LINENUMBERS" = "xyes" ] && COUNT="--line-numbers"
 
     for table in $tables; do
 	echo $"Table: $table"
-	$IPTABLES -t $table --list $NUM && echo
+	$IPTABLES -t $table --list $NUM $VERBOSE $COUNT && echo
     done
 
     return 0


Index: iptables.spec
===================================================================
RCS file: /cvs/dist/rpms/iptables/devel/iptables.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- iptables.spec	18 Nov 2005 12:26:15 -0000	1.33
+++ iptables.spec	18 Nov 2005 12:34:33 -0000	1.34
@@ -14,7 +14,6 @@
 Patch8: iptables-1.3.0-cleanup.patch
 Patch9: iptables-1.3.0-autoload.patch
 Patch10: iptables-1.3.0-no_root.patch
-Patch11: iptables-1.3.4-status.patch
 Group: System Environment/Base
 URL: http://www.netfilter.org/
 BuildRoot: %{_tmppath}/%{name}-buildroot
@@ -68,7 +67,6 @@
 %patch8 -p1 -b .cleanup
 %patch9 -p1 -b .autoload
 %patch10 -p1 -b .no_root
-%patch11 -p1 -b .status
 
 # Put it to a reasonable place
 find . -type f -exec perl -pi -e "s,/usr/local,%{prefix},g" {} \;


--- iptables-1.3.4-status.patch DELETED ---