From a9f4767c583784747fc21b0f7a74e935b0995cd7e37712108a1a9bbefb5f7da5 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 22 Sep 2012 14:51:54 +0000
Subject: [PATCH] ipset-6.14

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ipset?expand=0&rev=14
---
 ipset-6.13.tar.xz |  3 ---
 ipset-6.14.tar.xz |  3 +++
 ipset.changes     | 10 ++++++++++
 ipset.spec        |  5 +++--
 sles11.diff       |  2 +-
 5 files changed, 17 insertions(+), 6 deletions(-)
 delete mode 100644 ipset-6.13.tar.xz
 create mode 100644 ipset-6.14.tar.xz

diff --git a/ipset-6.13.tar.xz b/ipset-6.13.tar.xz
deleted file mode 100644
index 70cb376..0000000
--- a/ipset-6.13.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:043ba8a076e8af0e4cdf770af71baa4bb854e6c14c98500eb4c3293b8ccf73c2
-size 360620
diff --git a/ipset-6.14.tar.xz b/ipset-6.14.tar.xz
new file mode 100644
index 0000000..7898147
--- /dev/null
+++ b/ipset-6.14.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:49caca75ed8457f01c2cd97d9e986b1b0614140c0c56737ecba9cbd19b033cf0
+size 361600
diff --git a/ipset.changes b/ipset.changes
index d155e26..29072d2 100644
--- a/ipset.changes
+++ b/ipset.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sat Sep 22 14:20:06 UTC 2012 - jengelh@inai.de
+
+- Update to new upstream release 6.14
+* Internal CIDR bookkeeping was broken and would lead to mismatches
+  when the number of different sized networks are greater than the
+  smallest CIDR value
+* Support to match elements marked with "nomatch" in hash:*net* sets
+* Add /0 network support to hash:net,iface type
+
 -------------------------------------------------------------------
 Sat Jun 30 18:33:33 UTC 2012 - jengelh@inai.de
 
diff --git a/ipset.spec b/ipset.spec
index b80abf6..39a79ad 100644
--- a/ipset.spec
+++ b/ipset.spec
@@ -18,13 +18,14 @@
 
 Name:           ipset
 %define lname	libipset3
-Version:        6.13
+Version:        6.14
 Release:        0
 Summary:        Netfilter ipset administration utility
 License:        GPL-2.0
 Group:          Productivity/Networking/Security
 Url:            http://ipset.netfilter.org/
 
+#DL-URL:	ftp://ftp.netfilter.org/pub/ipset/ipset-6.14.tar.bz2
 #Git-Clone:	git://git.netfilter.org/ipset
 #Git-Web:	http://git.netfilter.org/
 Source:         %name-%version.tar.xz
@@ -46,7 +47,7 @@ BuildRequires:  linux-glibc-devel >= 2.6.24
 BuildRequires:  linux-kernel-headers >= 2.6.24
 %endif
 %if 0%{?redhat_version} || 0%{?centos_version} || 0%{?fedora_version}
-BuildRequires:  kernel-headers >= 2.6.24
+#BuildRequires:  kernel-headers >= 2.6.24
 %endif
 %if 0%{?suse_version}
 # Make quilt happy
diff --git a/sles11.diff b/sles11.diff
index b5ce472..16adfe3 100644
--- a/sles11.diff
+++ b/sles11.diff
@@ -1,5 +1,5 @@
 
-The evil overloads backported the 5-argument form,
+The evil overlords backported the 5-argument form,
 causing the version check to be meaningless.
 
 ---