From 1f6caf2687b4d4e8ecdf0645f3859985c9aa4aba7dcd7420923506b3588e2af4 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 25 Jun 2015 10:04:16 +0000
Subject: [PATCH] ipset-6.25.1

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ipset?expand=0&rev=46
---
 ipset-6.24.tar.bz2   |  3 ---
 ipset-6.25.1.tar.bz2 |  3 +++
 ipset.changes        | 12 ++++++++++++
 ipset.spec           |  4 ++--
 4 files changed, 17 insertions(+), 5 deletions(-)
 delete mode 100644 ipset-6.24.tar.bz2
 create mode 100644 ipset-6.25.1.tar.bz2

diff --git a/ipset-6.24.tar.bz2 b/ipset-6.24.tar.bz2
deleted file mode 100644
index ed8ec61..0000000
--- a/ipset-6.24.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3071fc283f00a6472b5b352ef57f9825c9face70dda5b0d8715f8d43d0e995d0
-size 518811
diff --git a/ipset-6.25.1.tar.bz2 b/ipset-6.25.1.tar.bz2
new file mode 100644
index 0000000..98e4e82
--- /dev/null
+++ b/ipset-6.25.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:658e15d0d0d6a7160137ef1c2bc2c8669cfee996eb9e049df8d7313e34795e7b
+size 531786
diff --git a/ipset.changes b/ipset.changes
index 5899320..7774b50 100644
--- a/ipset.changes
+++ b/ipset.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Jun 25 09:57:08 UTC 2015 - jengelh@inai.de
+
+- Update to new upstream release 6.25.1
+* Add element count to all set types header
+* Add element count to hash headers
+* Support linking libipset to C++ programs
+* When a single set is destroyed, make sure it cannot
+  be grabbed by dump
+* Check CIDR value only when attribute is given
+* Permit CIDR equal to the host address CIDR in IPv6
+
 -------------------------------------------------------------------
 Mon Nov 24 21:31:24 UTC 2014 - jengelh@inai.de
 
diff --git a/ipset.spec b/ipset.spec
index 34d6b16..92b34fc 100644
--- a/ipset.spec
+++ b/ipset.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ipset
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 Name:           ipset
 %define lname	libipset3
-Version:        6.24
+Version:        6.25.1
 Release:        0
 Summary:        Netfilter ipset administration utility
 License:        GPL-2.0