diff --git a/ipset-6.33-export-func.diff b/ipset-6.33-export-func.diff deleted file mode 100644 index e75af16..0000000 --- a/ipset-6.33-export-func.diff +++ /dev/null @@ -1,28 +0,0 @@ -From 4fc1ac6a4016c1e09cc393dfedb7eb4e9678efd3 Mon Sep 17 00:00:00 2001 -From: Jozsef Kadlecsik -Date: Thu, 14 Sep 2017 19:29:55 +0200 -Subject: [PATCH] New function added in commit 54802b2c is missing from - libipset.map The patch title was "Report if the option is supported by a - newer kernel release" - -Fixes bugzilla id #1182, reported by irherder@gmail.com. ---- - lib/libipset.map | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/lib/libipset.map b/lib/libipset.map -index d35e299..df632f2 100644 ---- a/lib/libipset.map -+++ b/lib/libipset.map -@@ -158,3 +158,8 @@ global: - ipset_parse_tcp_udp_port; - ipset_parse_uint16; - } LIBIPSET_4.3; -+ -+LIBIPSET_4.5 { -+global: -+ ipset_type_higher_rev; -+} LIBIPSET_4.4; --- -2.14.1 - diff --git a/ipset-6.33.tar.bz2 b/ipset-6.33.tar.bz2 deleted file mode 100644 index 67d7bd2..0000000 --- a/ipset-6.33.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f7b1d886eff32acc97f948871f966f7a53b72440057d4c013c22377b57ea3602 -size 546786 diff --git a/ipset-6.34.tar.bz2 b/ipset-6.34.tar.bz2 new file mode 100644 index 0000000..2abd02c --- /dev/null +++ b/ipset-6.34.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d70e831b670b7aa25dde81fd994d3a7ce0c0e801559a557105576df66cd8d680 +size 547940 diff --git a/ipset.changes b/ipset.changes index a6e4684..3e3a673 100644 --- a/ipset.changes +++ b/ipset.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Sep 23 19:10:12 UTC 2017 - jengelh@inai.de + +- Update to new upstream release 6.34 + * Reset state after a command failed, when multiple ones + are issued. + * Handle padding attribute properly in userspace. + * Test to check the fix to add an IPv4 range containing more + than 2^31 addresses. +- Remove ipset-6.33-export-func.diff (merged) + ------------------------------------------------------------------- Sun Sep 17 21:19:30 UTC 2017 - jengelh@inai.de diff --git a/ipset.spec b/ipset.spec index 7da48a0..84fad6f 100644 --- a/ipset.spec +++ b/ipset.spec @@ -25,7 +25,7 @@ %define ipset_build_kmp 0 %endif Name: ipset -Version: 6.33 +Version: 6.34 Release: 0 Summary: Netfilter ipset administration utility License: GPL-2.0 @@ -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: ipset-6.33-export-func.diff 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