diff --git a/.cvsignore b/.cvsignore index d7b1ae7..7f9cce8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -iptables-1.2.9.tar.bz2 +iptables-1.2.10.tar.bz2 diff --git a/iptables-1.2.10-counters.patch b/iptables-1.2.10-counters.patch new file mode 100644 index 0000000..b037a94 --- /dev/null +++ b/iptables-1.2.10-counters.patch @@ -0,0 +1,14 @@ +--- iptables-1.2.10/iptables-restore.c.counters 2004-06-15 00:02:16.000000000 +0200 ++++ iptables-1.2.10/iptables-restore.c 2004-06-17 14:01:50.953645355 +0200 +@@ -73,7 +73,10 @@ + + int parse_counters(char *string, struct ipt_counters *ctr) + { +- return (sscanf(string, "[%llu:%llu]", (unsigned long long *)&ctr->pcnt, (unsigned long long *)&ctr->bcnt) == 2); ++ if (string != NULL) ++ return (sscanf(string, "[%llu:%llu]", (unsigned long long *)&ctr->pcnt, (unsigned long long *)&ctr->bcnt) == 2); ++ else ++ return (0 == 2); + } + + /* global new argv and argc */ diff --git a/iptables.spec b/iptables.spec index db60e4c..43461bd 100644 --- a/iptables.spec +++ b/iptables.spec @@ -3,8 +3,8 @@ Name: iptables Summary: Tools for managing Linux kernel packet filtering capabilities. -Version: 1.2.9 -Release: 3 +Version: 1.2.10 +Release: 1 Source: http://www.netfilter.org/%{name}-%{version}.tar.bz2 Source1: iptables.init Source2: iptables-config @@ -12,10 +12,9 @@ Source2: iptables-config Source3: netfilter-2.4.20.tar.gz %endif Patch2: iptables-1.2.8-nolibnsl.patch -Patch3: iptables-1.2.8-print_type.patch Patch4: iptables-1.2.9-netlink.patch Patch5: iptables-1.2.9-selinux.patch -Patch6: iptables-1.2.9-counters.patch +Patch6: iptables-1.2.10-counters.patch Group: System Environment/Base URL: http://www.netfilter.org/ BuildRoot: %{_tmppath}/%{name}-buildroot @@ -68,7 +67,6 @@ tar -zxf %{SOURCE3} cd .. %endif %patch2 -p1 -b .nolibnsl -%patch3 -p1 -b .print_type %patch4 -p1 -b .netlink %patch5 -p1 -b .selinux %patch6 -p1 -b .counters @@ -146,6 +144,9 @@ fi %endif %changelog +* Thu Jun 17 2004 Thomas Woerner 1.2.10-1 +- new version 1.2.10 + * Tue Jun 15 2004 Elliot Lee - rebuilt diff --git a/sources b/sources index 2e42af4..5361b2f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8299db6ffbe98496d7f57dbb00f17e7d iptables-1.2.9.tar.bz2 +ca877a03e5af5f003444313e11b3672a iptables-1.2.10.tar.bz2