From 3670a98a72eedbbc76cfcab606b27da7094f7488 Mon Sep 17 00:00:00 2001 From: Thomas Woerner Date: Wed, 18 Jul 2012 16:14:07 +0200 Subject: [PATCH] - added fixrestore patch submitted to upstream by fryasu (nfbz#774) (RHBZ#825796) --- iptables-1.4.12-fixresore.patch | 28 ++++++++++++++++++++++++++++ iptables.spec | 8 +++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 iptables-1.4.12-fixresore.patch diff --git a/iptables-1.4.12-fixresore.patch b/iptables-1.4.12-fixresore.patch new file mode 100644 index 0000000..94358f7 --- /dev/null +++ b/iptables-1.4.12-fixresore.patch @@ -0,0 +1,28 @@ +diff -Nur iptables-1.4.12.2/iptables/ip6tables-restore.c iptables-1.4.12.2-fixrestore/iptables/ip6tables-restore.c +--- iptables-1.4.12.2/iptables/ip6tables-restore.c 2012-01-03 02:19:09.000000000 +0900 ++++ iptables-1.4.12.2-fixrestore/iptables/ip6tables-restore.c 2012-03-01 10:56:10.000000000 +0900 +@@ -380,9 +380,9 @@ + quote_open = 0; + escaped = 0; + param_len = 0; ++ char param_buffer[1024]; + + for (curchar = parsestart; *curchar; curchar++) { +- char param_buffer[1024]; + + if (quote_open) { + if (escaped) { +diff -Nur iptables-1.4.12.2/iptables/iptables-restore.c iptables-1.4.12.2-fixrestore/iptables/iptables-restore.c +--- iptables-1.4.12.2/iptables/iptables-restore.c 2012-01-03 02:19:09.000000000 +0900 ++++ iptables-1.4.12.2-fixrestore/iptables/iptables-restore.c 2012-03-01 10:56:00.000000000 +0900 +@@ -377,9 +377,9 @@ + quote_open = 0; + escaped = 0; + param_len = 0; ++ char param_buffer[1024]; + + for (curchar = parsestart; *curchar; curchar++) { +- char param_buffer[1024]; + + if (quote_open) { + if (escaped) { diff --git a/iptables.spec b/iptables.spec index 546adae..2d57361 100644 --- a/iptables.spec +++ b/iptables.spec @@ -22,11 +22,12 @@ Name: iptables Summary: Tools for managing Linux kernel packet filtering capabilities Version: 1.4.14 -Release: 1%{?dist} +Release: 2%{?dist} Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2 Source1: iptables.init Source2: iptables-config Source3: iptables.service +Patch1: iptables-1.4.12-fixresore.patch Group: System Environment/Base URL: http://www.netfilter.org/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -76,6 +77,7 @@ stable and may change with every new version. It is therefore unsupported. %prep %setup -q +%patch1 -p1 -b fixresore %build CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing " \ @@ -244,6 +246,10 @@ fi %{_libdir}/pkgconfig/xtables.pc %changelog +* Wed Jul 18 2012 Thomas Woerner 1.4.14-2 +- added fixrestore patch submitted to upstream by fryasu (nfbz#774) + (RHBZ#825796) + * Wed Jul 18 2012 Thomas Woerner 1.4.14-1 - new version 1.4.14 - extensions: add IPv6 capable ECN match extension