From 9cc8b9cede2cfdfebaf85c187e31cc596ac2be5e Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@fedoraproject.org>
Date: Mon, 18 Jul 2005 12:16:48 +0000
Subject: [PATCH] [tw] - new version 1.3.2 with additional patch for the
 misplaced free_opts call     from Marcus Sundberg

---
 .cvsignore                     |  1 +
 iptables-1.3.2-free_opts.patch | 20 ++++++++++++++++++++
 iptables.spec                  |  8 +++++++-
 sources                        |  2 +-
 4 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 iptables-1.3.2-free_opts.patch

diff --git a/.cvsignore b/.cvsignore
index f44d85f..4c33ba8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
 iptables-1.2.11.tar.bz2
 iptables-1.3.0.tar.bz2
 iptables-1.3.1.tar.bz2
+iptables-1.3.2.tar.bz2
diff --git a/iptables-1.3.2-free_opts.patch b/iptables-1.3.2-free_opts.patch
new file mode 100644
index 0000000..9f86874
--- /dev/null
+++ b/iptables-1.3.2-free_opts.patch
@@ -0,0 +1,20 @@
+--- iptables-1.3.2/iptables.c.free_opts	2005-07-18 14:06:41.000000000 +0200
++++ iptables-1.3.2/iptables.c	2005-07-18 14:06:40.000000000 +0200
+@@ -1028,9 +1028,6 @@
+ 	unsigned int num_old, num_new, i;
+ 	struct option *merge;
+ 
+-	/* Release previous options merged if any */
+-	free_opts(0);
+-	
+ 	for (num_old = 0; oldopts[num_old].name; num_old++);
+ 	for (num_new = 0; newopts[num_new].name; num_new++);
+ 
+@@ -1039,6 +1036,7 @@
+ 
+ 	merge = malloc(sizeof(struct option) * (num_new + num_old + 1));
+ 	memcpy(merge, oldopts, num_old * sizeof(struct option));
++	free_opts(0); /* Release previous options merged if any */
+ 	for (i = 0; i < num_new; i++) {
+ 		merge[num_old + i] = newopts[i];
+ 		merge[num_old + i].val += *option_offset;
diff --git a/iptables.spec b/iptables.spec
index 4d7e501..e327167 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -3,7 +3,7 @@
 
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities.
-Version: 1.3.1
+Version: 1.3.2
 Release: 1
 Source: http://www.netfilter.org/%{name}-%{version}.tar.bz2
 Source1: iptables.init
@@ -18,6 +18,7 @@ Patch6: iptables-1.2.10-counters.patch
 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.2-free_opts.patch
 Group: System Environment/Base
 URL: http://www.netfilter.org/
 BuildRoot: %{_tmppath}/%{name}-buildroot
@@ -76,6 +77,7 @@ cd ..
 %patch8 -p1 -b .cleanup
 %patch9 -p1 -b .autoload
 %patch10 -p1 -b .no_root
+%patch11 -p1 -b .free_opts
 
 # Put it to a reasonable place
 find . -type f -exec perl -pi -e "s,/usr/local,%{prefix},g" {} \;
@@ -150,6 +152,10 @@ fi
 %endif
 
 %changelog
+* Mon Jul 18 2005 Thomas Woerner <twoerner@redhat.com> 1.3.2-1
+- new version 1.3.2 with additional patch for the misplaced free_opts call
+  from Marcus Sundberg
+
 * Wed May 11 2005 Thomas Woerner <twoerner@redhat.com> 1.3.1-1
 - new version 1.3.1
 
diff --git a/sources b/sources
index 6209125..eab6271 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c3358a3bd0d7755df0b64a5063db296b  iptables-1.3.1.tar.bz2
+9a951971de3f6c7f60dece4023a48687  iptables-1.3.2.tar.bz2