Accepting request 582293 from security:netfilter

- Update to new upstream release 6.36

OBS-URL: https://build.opensuse.org/request/show/582293
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ipset?expand=0&rev=29

0001-build-do-install-libipset-args.h.patch

@@ -1,27 +0,0 @@
-From a51c2d3fe33d047874028a26f136ecddd9671f79 Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Mon, 22 Jan 2018 22:48:09 +0100
-Subject: [PATCH] build: do install libipset/args.h
-
-libipset/types.h includes args.h, therefore args.h must be installed
-too.
-
-Signed-off-by: Jan Engelhardt <jengelh@inai.de>
----
- include/libipset/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/libipset/Makefile.am b/include/libipset/Makefile.am
-index 3b47518..79a1357 100644
---- a/include/libipset/Makefile.am
-+++ b/include/libipset/Makefile.am
-@@ -1,5 +1,6 @@
- pkgincludedir = ${includedir}/libipset
- pkginclude_HEADERS = \
-+	args.h \
- 	data.h \
- 	errcode.h \
- 	linux_ip_set_bitmap.h \
--- 
-2.15.1
-

ipset-6.35.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:37071013e1f92e0ca2f5deac86e657db87290fe651f64f44ce662f3aa40bf4dc
-size 545744

ipset-6.36.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:22224a90dc6c7d97b7a7addedd0740c3841e3d9a7ff8c8d2123bae0c3620d30d
+size 545588

ipset.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Mar  3 23:27:51 UTC 2018 - jengelh@inai.de
+
+- Update to new upstream release 6.36
+  * Adding a IPv4 range x.x.x.x–255.255.255.255 could lead to
+    memory exhaustion, which has been fixed.
+- Drop 0001-build-do-install-libipset-args.h.patch (merged)
+
 -------------------------------------------------------------------
 Mon Jan 22 21:49:31 UTC 2018 - jengelh@inai.de
 

ipset.spec

@@ -25,10 +25,10 @@
 %define ipset_build_kmp 0
 %endif
 Name:           ipset
-Version:        6.35
+Version:        6.36
 Release:        0
 Summary:        Netfilter ipset administration utility
-License:        GPL-2.0
+License:        GPL-2.0-only
 Group:          Productivity/Networking/Security
 Url:            http://ipset.netfilter.org/
 #Git-Clone:	git://git.netfilter.org/ipset
@@ -36,7 +36,6 @@ Url:            http://ipset.netfilter.org/
 Source:         http://ipset.netfilter.org/%name-%version.tar.bz2
 Source3:        %name-preamble
 Patch1:         ipset-destdir.diff
-Patch2:         0001-build-do-install-libipset-args.h.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -105,7 +104,7 @@ when matching an entry against a set.
 
 %prep
 %setup -q
-%patch -P 1 -P 2 -p1
+%patch -P 1 -p1
 
 %build
 # build wants to call modinfo at some point