diff --git a/.cvsignore b/.cvsignore index e556967..5eaaafc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -iptables-1.2.3.tar.bz2 +iptables-1.2.4.tar.bz2 diff --git a/iptables.init b/iptables.init index e87132b..e26337e 100755 --- a/iptables.init +++ b/iptables.init @@ -40,6 +40,12 @@ if /sbin/lsmod 2>/dev/null |grep -q ipchains ; then exit 0 fi +iftable() { + if fgrep -qsx $1 /proc/net/ip_tables_names; then + iptables -t "$@" + fi +} + start() { # don't do squat if we don't have the config file if [ -f $IPTABLES_CONFIG ]; then @@ -75,14 +81,14 @@ stop() { success $"Removing user defined chains:" || \ failure $"Removing user defined chains:" echo -n $"Resetting built-in chains to the default ACCEPT policy:" - iptables -P INPUT ACCEPT && \ - iptables -P OUTPUT ACCEPT && \ - iptables -P FORWARD ACCEPT && \ - iptables -t nat -P PREROUTING ACCEPT && \ - iptables -t nat -P POSTROUTING ACCEPT && \ - iptables -t nat -P OUTPUT ACCEPT && \ - iptables -t mangle -P PREROUTING ACCEPT && \ - iptables -t mangle -P OUTPUT ACCEPT && \ + iftable filter -P INPUT ACCEPT && \ + iftable filter -P OUTPUT ACCEPT && \ + iftable filter -P FORWARD ACCEPT && \ + iftable nat -P PREROUTING ACCEPT && \ + iftable nat -P POSTROUTING ACCEPT && \ + iftable nat -P OUTPUT ACCEPT && \ + iftable mangle -P PREROUTING ACCEPT && \ + iftable mangle -P OUTPUT ACCEPT && \ success $"Resetting built-in chains to the default ACCEPT policy" || \ failure $"Resetting built-in chains to the default ACCEPT policy" echo @@ -110,45 +116,44 @@ case "$1" in ;; status) - echo $"Table: filter" - iptables --list - echo $"Table: nat" - iptables -t nat --list - echo $"Table: mangle" - iptables -t mangle --list + tables=`cat /proc/net/ip_tables_names 2>/dev/null` + for table in $tables; do + echo $"Table: $table" + iptables -t $table --list + done ;; panic) echo -n $"Changing target policies to DROP: " - iptables -P INPUT DROP && \ - iptables -P FORWARD DROP && \ - iptables -P OUTPUT DROP && \ - iptables -t nat -P PREROUTING DROP && \ - iptables -t nat -P POSTROUTING DROP && \ - iptables -t nat -P OUTPUT DROP && \ - iptables -t mangle -P PREROUTING DROP && \ - iptables -t mangle -P OUTPUT DROP && \ + iftable filter -P INPUT DROP && \ + iftable filter -P FORWARD DROP && \ + iftable filter -P OUTPUT DROP && \ + iftable nat -P PREROUTING DROP && \ + iftable nat -P POSTROUTING DROP && \ + iftable nat -P OUTPUT DROP && \ + iftable mangle -P PREROUTING DROP && \ + iftable mangle -P OUTPUT DROP && \ success $"Changing target policies to DROP" || \ failure $"Changing target policies to DROP" echo - iptables -F INPUT && \ - iptables -F FORWARD && \ - iptables -F OUTPUT && \ - iptables -t nat -F PREROUTING && \ - iptables -t nat -F POSTROUTING && \ - iptables -t nat -F OUTPUT && \ - iptables -t mangle -F PREROUTING && \ - iptables -t mangle -F OUTPUT && \ + iftable filter -F INPUT && \ + iftable filter -F FORWARD && \ + iftable filter -F OUTPUT && \ + iftable nat -F PREROUTING && \ + iftable nat -F POSTROUTING && \ + iftable nat -F OUTPUT && \ + iftable mangle -F PREROUTING && \ + iftable mangle -F OUTPUT && \ success $"Flushing all chains:" || \ failure $"Flushing all chains:" - iptables -X INPUT && \ - iptables -X FORWARD && \ - iptables -X OUTPUT && \ - iptables -t nat -X PREROUTING && \ - iptables -t nat -X POSTROUTING && \ - iptables -t nat -X OUTPUT && \ - iptables -t mangle -X PREROUTING && \ - iptables -t mangle -X OUTPUT && \ + iftable filter -X INPUT && \ + iftable filter -X FORWARD && \ + iftable filter -X OUTPUT && \ + iftable nat -X PREROUTING && \ + iftable nat -X POSTROUTING && \ + iftable nat -X OUTPUT && \ + iftable mangle -X PREROUTING && \ + iftable mangle -X OUTPUT && \ success $"Removing user defined chains:" || \ failure $"Removing user defined chains:" ;; diff --git a/iptables.spec b/iptables.spec index 2ab7ff0..a2da505 100644 --- a/iptables.spec +++ b/iptables.spec @@ -1,6 +1,6 @@ Name: iptables Summary: Tools for managing Linux kernel packet filtering capabilities. -Version: 1.2.3 +Version: 1.2.4 Release: 2 Source: http://netfilter.kernelnotes.org/%{name}-%{version}.tar.bz2 Source1: iptables.init @@ -66,7 +66,7 @@ rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/%{name}-%{version} chkconfig --add iptables %preun -if [ $1 = 0 ]; then +if [ "$1" = 0 ]; then chkconfig --del iptables fi @@ -84,8 +84,13 @@ fi /lib/iptables/libip6t* %changelog -* Wed Sep 26 2001 Bill Nottingham 1.2.3-2 -- fix updating (#53952) +* Mon Nov 5 2001 Bernhard Rosenkraenzer 1.2.4-2 +- Fix %preun script + +* Tue Oct 30 2001 Bernhard Rosenkraenzer 1.2.4-1 +- Update to 1.2.4 (various fixes, including security fixes; among others: + #42990, #50500, #53325, #54280) +- Fix init script (#31133) * Mon Sep 3 2001 Bernhard Rosenkraenzer 1.2.3-1 - 1.2.3 (5 security fixes, some other fixes) diff --git a/sources b/sources index e258ee5..c58843a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -68c55130d68a03c451de0ac900c67448 iptables-1.2.3.tar.bz2 +e78e5780bc61b9c3016b0ac312c7777f iptables-1.2.4.tar.bz2