From 229f4d2b93f4b8dc7df23bcec67708c1a6998b08dbb075bc315826b27dd7f962 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 5 Mar 2014 08:52:06 +0000
Subject: [PATCH] ipset-6.21

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ipset?expand=0&rev=34
---
 ipset-6.20.1.tar.xz |  3 ---
 ipset-6.21.tar.bz2  |  3 +++
 ipset.changes       | 14 ++++++++++++++
 ipset.spec          | 12 +++++-------
 4 files changed, 22 insertions(+), 10 deletions(-)
 delete mode 100644 ipset-6.20.1.tar.xz
 create mode 100644 ipset-6.21.tar.bz2

diff --git a/ipset-6.20.1.tar.xz b/ipset-6.20.1.tar.xz
deleted file mode 100644
index 97c99e9..0000000
--- a/ipset-6.20.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:08456439ead82686f5884c90791240009f828be349c9564e5deef70734e53dcd
-size 423584
diff --git a/ipset-6.21.tar.bz2 b/ipset-6.21.tar.bz2
new file mode 100644
index 0000000..ca3dc4b
--- /dev/null
+++ b/ipset-6.21.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8be13cbc384e8fabf643a7d2fa028869dca80614d72f7ea43a7058b11848ed14
+size 504938
diff --git a/ipset.changes b/ipset.changes
index 9391623..25db106 100644
--- a/ipset.changes
+++ b/ipset.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Mar  5 08:47:39 UTC 2014 - jengelh@inai.de
+
+- Update to new upstream release 6.21
+* add userspace support for forceadd
+* fix ifname "physdev:" prefix parsing
+* print mark & mark mask in hex rather then decimal
+* add markmask for hash:ip,mark data type
+* add hash:ip,mark data type to ipset
+* Fix all set output from list/save when set with counters in use.
+* ipset: Fix malformed output from list/save for ICMP types in port 
+  field
+* ipset: fix timeout data type size (Nikolay Martynov)
+
 -------------------------------------------------------------------
 Mon Oct 28 12:34:04 UTC 2013 - jengelh@inai.de
 
diff --git a/ipset.spec b/ipset.spec
index 8f25c29..e790d7a 100644
--- a/ipset.spec
+++ b/ipset.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ipset
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,8 +17,8 @@
 
 
 Name:           ipset
-%define lname	libipset3
-Version:        6.20.1
+%define lname	libipset2
+Version:        6.21
 Release:        0
 Summary:        Netfilter ipset administration utility
 License:        GPL-2.0
@@ -26,10 +26,9 @@ Group:          Productivity/Networking/Security
 Url:            http://ipset.netfilter.org/
 
 #Freecode-URL:	http://freecode.com/projects/ipset/
-#DL-URL:	ftp://ftp.netfilter.org/pub/ipset/ipset-6.19.tar.bz2
 #Git-Clone:	git://git.netfilter.org/ipset
 #Git-Web:	http://git.netfilter.org/
-Source:         %name-%version.tar.xz
+Source:         ftp://ftp.netfilter.org/pub/ipset/%name-%version.tar.bz2
 Source3:        %name-preamble
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -37,7 +36,6 @@ BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
 BuildRequires:  pkgconfig >= 0.21
-BuildRequires:  xz
 %if 0%{?suse_version} >= 1140 || 0%{?fedora_version}
 BuildRequires:  pkgconfig(libmnl) >= 1
 %else
@@ -169,7 +167,7 @@ find "$b/%_libdir" -type f -name "*.la" -delete;
 
 %files -n %lname
 %defattr(-,root,root)
-%_libdir/libipset.so.3*
+%_libdir/libipset.so.2*
 
 %files devel
 %defattr(-,root,root)