From e62f16132b79a21183c7e5eddc3962aa08660df9 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@fedoraproject.org>
Date: Fri, 18 Nov 2005 12:26:15 +0000
Subject: [PATCH] [tw] - new version 1.3.4 - dropped free_opts patch (upstream
 fixed) - made libipq PIC (#158623) - additional configuration options for
 iptables startup script (#172929)     Thanks to Jan Gruenwald for the patch -
 spec file cleanup (dropped linux_header define and usage)

---
 .cvsignore                   |  1 +
 iptables-1.3.0-cleanup.patch | 20 ++++++++++++++++++++
 iptables.spec                | 25 ++++++++++++-------------
 sources                      |  2 +-
 4 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 4c33ba8..ae8cddd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,3 +2,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
+iptables-1.3.4.tar.bz2
diff --git a/iptables-1.3.0-cleanup.patch b/iptables-1.3.0-cleanup.patch
index e907b30..d108040 100644
--- a/iptables-1.3.0-cleanup.patch
+++ b/iptables-1.3.0-cleanup.patch
@@ -1,3 +1,23 @@
+--- iptables-1.3.0/extensions/libipt_rpc.c.cleanup	2005-11-09 16:37:34.000000000 +0100
++++ iptables-1.3.0/extensions/libipt_rpc.c	2005-11-09 16:37:38.000000000 +0100
+@@ -205,7 +205,7 @@
+ 
+ 	memset(buf, 0, sizeof(buf));
+ 
+-	for (src=string, dst=buf; term != 1 ; src++, dst++) {
++	for (src=string, dst=buf; term != 1 ; src++) {
+ 
+ 		if ( *src != ',' && *src != '\0' ) {
+ 			if ( ( *src >= 65 && *src <= 90 ) || ( *src >= 97 && *src <= 122) ) {
+@@ -220,7 +220,7 @@
+ 					   string, src - string + 1);
+ 
+ 			}
+-
++			dst++;
+ 		} else {
+ 			*dst = '\0';
+ 			if ( idup == 1 ) {
 --- iptables-1.3.0/extensions/libipt_rpc.c.cleanup	2005-03-18 16:25:34.174370567 +0100
 +++ iptables-1.3.0/extensions/libipt_rpc.c	2005-03-18 16:25:32.000000000 +0100
 @@ -252,7 +252,7 @@
diff --git a/iptables.spec b/iptables.spec
index e327167..ecd0267 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -1,16 +1,12 @@
 %define build_devel 1
-%define linux_header 0
 
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities.
-Version: 1.3.2
+Version: 1.3.4
 Release: 1
 Source: http://www.netfilter.org/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables-config
-%if %{linux_header}
-Source3: netfilter-2.4.20.tar.gz
-%endif
 Patch2: iptables-1.2.8-nolibnsl.patch
 Patch4: iptables-1.2.9-netlink.patch
 Patch5: iptables-1.3.0-selinux.patch
@@ -18,7 +14,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
+Patch11: iptables-1.3.4-status.patch
 Group: System Environment/Base
 URL: http://www.netfilter.org/
 BuildRoot: %{_tmppath}/%{name}-buildroot
@@ -65,11 +61,6 @@ you should install this package.
 rm -rf %{buildroot}
 
 %setup -q
-%if %{linux_header}
-cd include 
-tar -zxf %{SOURCE3}
-cd ..
-%endif
 %patch2 -p1 -b .nolibnsl
 %patch4 -p1 -b .netlink
 %patch5 -p1 -b .selinux
@@ -77,14 +68,14 @@ cd ..
 %patch8 -p1 -b .cleanup
 %patch9 -p1 -b .autoload
 %patch10 -p1 -b .no_root
-%patch11 -p1 -b .free_opts
+%patch11 -p1 -b .status
 
 # Put it to a reasonable place
 find . -type f -exec perl -pi -e "s,/usr/local,%{prefix},g" {} \;
 
 %build
 TOPDIR=`pwd`
-OPT="$RPM_OPT_FLAGS -I$TOPDIR/include"
+OPT="$RPM_OPT_FLAGS -I$TOPDIR/include -fPIC"
 make COPT_FLAGS="$OPT" KERNEL_DIR=/usr LIBDIR=/%{_lib}
 make COPT_FLAGS="$OPT" KERNEL_DIR=/usr LIBDIR=/%{_lib} iptables-save iptables-restore
 make COPT_FLAGS="$OPT" KERNEL_DIR=/usr LIBDIR=/%{_lib} ip6tables-save ip6tables-restore
@@ -152,6 +143,14 @@ fi
 %endif
 
 %changelog
+* Fri Nov 18 2005 Thomas Woerner <twoerner@redhat.com> 1.3.4-1
+- new version 1.3.4
+- dropped free_opts patch (upstream fixed)
+- made libipq PIC (#158623)
+- additional configuration options for iptables startup script (#172929)
+  Thanks to Jan Gruenwald for the patch
+- spec file cleanup (dropped linux_header define and usage)
+
 * 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
diff --git a/sources b/sources
index eab6271..28ef15b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9a951971de3f6c7f60dece4023a48687  iptables-1.3.2.tar.bz2
+fdff8abe890807968226b0c374335305  iptables-1.3.4.tar.bz2