From dde6759990d08526db58289c38ed53e43b29da4c Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Wed, 18 Jul 2012 09:23:34 +0200
Subject: [PATCH] - new version 1.4.14   - extensions: add IPv6 capable ECN
 match extension   - extensions: add nfacct match   - extensions: add rpfilter
 module   - extensions: libxt_rateest: output all options in save hook   -
 iptables: missing free() in function cache_add_entry()   - iptables: missing
 free() in function delete_entry()   - libiptc: fix retry path in TC_INIT   -
 libiptc: Returns the position the entry was inserted   - libipt_ULOG: fix
 --ulog-cprange   - libxt_CT: add --timeout option   - ip(6)tables-restore:
 make sure argv is NULL terminated   - Revert "libiptc: Returns the position
 the entry was inserted"   - src: mark newly opened fds as FD_CLOEXEC (close
 on exec)   - tests: add rateest match rules - dropped patch5 (cloexec),
 merged upstream

---
 .gitignore    |  1 +
 iptables.spec | 24 ++++++++++++++++++++----
 sources       |  2 +-
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1c537e6..1c632b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ iptables-1.4.9.tar.bz2
 /iptables-1.4.12.tar.bz2
 /iptables-1.4.12.1.tar.bz2
 /iptables-1.4.12.2.tar.bz2
+/iptables-1.4.14.tar.bz2
diff --git a/iptables.spec b/iptables.spec
index 039c6c1..546adae 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -21,13 +21,12 @@
 
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities
-Version: 1.4.12.2
-Release: 5%{?dist}
+Version: 1.4.14
+Release: 1%{?dist}
 Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables-config
 Source3: iptables.service
-Patch5: iptables-1.4.11-cloexec.patch
 Group: System Environment/Base
 URL: http://www.netfilter.org/
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -77,7 +76,6 @@ stable and may change with every new version. It is therefore unsupported.
 
 %prep
 %setup -q
-%patch5 -p1 -b .cloexec
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing " \
@@ -246,6 +244,24 @@ fi
 %{_libdir}/pkgconfig/xtables.pc
 
 %changelog
+* Wed Jul 18 2012 Thomas Woerner <twoerner@redhat.com> 1.4.14-1
+- new version 1.4.14
+  - extensions: add IPv6 capable ECN match extension
+  - extensions: add nfacct match
+  - extensions: add rpfilter module
+  - extensions: libxt_rateest: output all options in save hook
+  - iptables: missing free() in function cache_add_entry()
+  - iptables: missing free() in function delete_entry()
+  - libiptc: fix retry path in TC_INIT
+  - libiptc: Returns the position the entry was inserted
+  - libipt_ULOG: fix --ulog-cprange
+  - libxt_CT: add --timeout option
+  - ip(6)tables-restore: make sure argv is NULL terminated
+  - Revert "libiptc: Returns the position the entry was inserted"
+  - src: mark newly opened fds as FD_CLOEXEC (close on exec)
+  - tests: add rateest match rules
+- dropped patch5 (cloexec), merged upstream
+
 * Mon Apr 23 2012 Thomas Woerner <twoerner@redhat.com> 1.4.12.2-5
 - reenable iptables default services
 
diff --git a/sources b/sources
index 7d6ce52..4e75144 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-212112389c7f10c72efb31a4ed193a4c  iptables-1.4.12.2.tar.bz2
+5ab24ad683f76689cfe7e0c73f44855d  iptables-1.4.14.tar.bz2