From 91c1b78f041698aeece4d3d432cd9a85585ae8e63987822250b75f123f416f7f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 3 Mar 2018 23:30:18 +0000 Subject: [PATCH] ipset-6.36 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ipset?expand=0&rev=73 --- 0001-build-do-install-libipset-args.h.patch | 27 --------------------- ipset-6.35.tar.bz2 | 3 --- ipset-6.36.tar.bz2 | 3 +++ ipset.changes | 8 ++++++ ipset.spec | 7 +++--- 5 files changed, 14 insertions(+), 34 deletions(-) delete mode 100644 0001-build-do-install-libipset-args.h.patch delete mode 100644 ipset-6.35.tar.bz2 create mode 100644 ipset-6.36.tar.bz2 diff --git a/0001-build-do-install-libipset-args.h.patch b/0001-build-do-install-libipset-args.h.patch deleted file mode 100644 index 58993f5..0000000 --- a/0001-build-do-install-libipset-args.h.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a51c2d3fe33d047874028a26f136ecddd9671f79 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -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 ---- - 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 - diff --git a/ipset-6.35.tar.bz2 b/ipset-6.35.tar.bz2 deleted file mode 100644 index a46e439..0000000 --- a/ipset-6.35.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:37071013e1f92e0ca2f5deac86e657db87290fe651f64f44ce662f3aa40bf4dc -size 545744 diff --git a/ipset-6.36.tar.bz2 b/ipset-6.36.tar.bz2 new file mode 100644 index 0000000..43b0b94 --- /dev/null +++ b/ipset-6.36.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:22224a90dc6c7d97b7a7addedd0740c3841e3d9a7ff8c8d2123bae0c3620d30d +size 545588 diff --git a/ipset.changes b/ipset.changes index 0914377..8b1ca88 100644 --- a/ipset.changes +++ b/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 diff --git a/ipset.spec b/ipset.spec index c0916ce..9f32c8a 100644 --- a/ipset.spec +++ b/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