rpms/iptables/devel iptables-1.3.2-free_opts.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 iptables.spec, 1.31, 1.32 sources, 1.15, 1.16

[fedora-cvs-commits at redhat.com]

Author: twoerner

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

Modified Files:
	.cvsignore iptables.spec sources 
Added Files:
	iptables-1.3.2-free_opts.patch 
Log Message:
[tw]
- new version 1.3.2 with additional patch for the misplaced free_opts call
  from Marcus Sundberg



iptables-1.3.2-free_opts.patch:
 iptables.c |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE iptables-1.3.2-free_opts.patch ---
--- 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;


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/iptables/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	11 May 2005 13:49:05 -0000	1.15
+++ .cvsignore	18 Jul 2005 12:16:48 -0000	1.16
@@ -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


Index: iptables.spec
===================================================================
RCS file: /cvs/dist/rpms/iptables/devel/iptables.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- iptables.spec	11 May 2005 13:49:05 -0000	1.31
+++ iptables.spec	18 Jul 2005 12:16:48 -0000	1.32
@@ -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 @@
 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 @@
 %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 @@
 %endif
 
 %changelog
+* Mon Jul 18 2005 Thomas Woerner <twoerner at 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 at redhat.com> 1.3.1-1
 - new version 1.3.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/iptables/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	11 May 2005 13:49:05 -0000	1.15
+++ sources	18 Jul 2005 12:16:48 -0000	1.16
@@ -1 +1 @@
-c3358a3bd0d7755df0b64a5063db296b  iptables-1.3.1.tar.bz2
+9a951971de3f6c7f60dece4023a48687  iptables-1.3.2.tar.bz2