From b8e44c76f5e353ed1b8889b1ec37c6255d8446ca4fbe2860b2988384638734b5 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 16 Mar 2016 23:30:10 +0000
Subject: [PATCH] - Update to new upstream release 6.29

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ipset?expand=0&rev=52
---
 ipset-6.28.tar.bz2 |  3 ---
 ipset-6.29.tar.bz2 |  3 +++
 ipset-pkgc.diff    | 31 -------------------------------
 ipset.changes      |  6 ++++++
 ipset.spec         |  4 +---
 5 files changed, 10 insertions(+), 37 deletions(-)
 delete mode 100644 ipset-6.28.tar.bz2
 create mode 100644 ipset-6.29.tar.bz2
 delete mode 100644 ipset-pkgc.diff

diff --git a/ipset-6.28.tar.bz2 b/ipset-6.28.tar.bz2
deleted file mode 100644
index 0ac4bef..0000000
--- a/ipset-6.28.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fd4239590b3f8dec31f9b4e8fdc7bc2d35f17ebd75fe448282d230b00e996b2e
-size 542058
diff --git a/ipset-6.29.tar.bz2 b/ipset-6.29.tar.bz2
new file mode 100644
index 0000000..66d82a0
--- /dev/null
+++ b/ipset-6.29.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6af58b21c8b475b1058e02529ea9f15b4b727dbc13dc9cbddf89941b0103880e
+size 542735
diff --git a/ipset-pkgc.diff b/ipset-pkgc.diff
deleted file mode 100644
index 70d09f8..0000000
--- a/ipset-pkgc.diff
+++ /dev/null
@@ -1,31 +0,0 @@
----
- Makefile.am  |    2 +-
- configure.ac |    2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-Index: ipset-6.28/Makefile.am
-===================================================================
---- ipset-6.28.orig/Makefile.am
-+++ ipset-6.28/Makefile.am
-@@ -71,7 +71,7 @@ modules_install:
- if WITH_KMOD
- 	${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net \
- 			KDIR=$$PWD/kernel modules_install
--	@modinfo ip_set_hash_ip | ${GREP} /extra/ >/dev/null || echo "$$DEPMOD_WARNING"
-+	${AM_V_at}modinfo -b ${DESTDIR} ip_set_hash_ip | ${GREP} /extra/ >/dev/null || echo "$$DEPMOD_WARNING"
- 	@lsmod | ${GREP} '^ip_set' >/dev/null && echo "$$MODULE_WARNING"
- else
- 	@echo Skipping kernel modules due to --with-kmod=no
-Index: ipset-6.28/configure.ac
-===================================================================
---- ipset-6.28.orig/configure.ac
-+++ ipset-6.28/configure.ac
-@@ -12,6 +12,8 @@ LT_INIT([dlopen])
- LT_CONFIG_LTDL_DIR([libltdl])
- LTDL_INIT([nonrecursive])
- 
-+PKG_PROG_PKG_CONFIG
-+
- dnl Shortcut: Linux supported alone
- case "$host" in
- *-*-linux* | *-*-uclinux*) ;;
diff --git a/ipset.changes b/ipset.changes
index 2236102..cf0b9ae 100644
--- a/ipset.changes
+++ b/ipset.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Mar 16 23:25:41 UTC 2016 - jengelh@inai.de
+
+- Update to new upstream release 6.29
+* Fix race condition in ipset save, swap and delete
+
 -------------------------------------------------------------------
 Sat Mar 12 21:40:08 UTC 2016 - jengelh@inai.de
 
diff --git a/ipset.spec b/ipset.spec
index 44fbb98..24a4527 100644
--- a/ipset.spec
+++ b/ipset.spec
@@ -18,7 +18,7 @@
 
 Name:           ipset
 %define lname	libipset3
-Version:        6.28
+Version:        6.29
 Release:        0
 Summary:        Netfilter ipset administration utility
 License:        GPL-2.0
@@ -28,7 +28,6 @@ Url:            http://ipset.netfilter.org/
 #Git-Web:	http://git.netfilter.org/
 Source:         ftp://ftp.netfilter.org/pub/ipset/%name-%version.tar.bz2
 Source3:        %name-preamble
-Patch1:         ipset-pkgc.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -98,7 +97,6 @@ when matching an entry against a set.
 
 %prep
 %setup -q
-%patch -P 1 -p1
 
 %build
 # build wants to call modinfo at some point