[tw]
- new version 1.3.2 with additional patch for the misplaced free_opts call from Marcus Sundberg
This commit is contained in:
parent
1bda6a62be
commit
9cc8b9cede
@ -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
|
||||
|
20
iptables-1.3.2-free_opts.patch
Normal file
20
iptables-1.3.2-free_opts.patch
Normal file
@ -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;
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user