From be7bb9cd70de48c2076c20d2a03b9a8c5388bff7 Mon Sep 17 00:00:00 2001
From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Sat, 27 Oct 2018 18:09:10 +0200
Subject: ipset 7.0 released

---
 ChangeLog        | 20 ++++++++++++++++++++
 configure.ac     |  2 +-
 kernel/ChangeLog | 22 ++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 916245e..dab80da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+7.0
+  - Introduction of new commands and protocol version 7, updated
+    kernel include files
+  - Add compatibility support for async in pernet_operations
+  - Use more robust awk patterns to check for backward compatibility
+  - Prepare the ipset tool to handle multiple protocol version
+  - Fix warning message handling
+  - Correct to test null valued entry in hash:net6,port,net6 test
+  - Library reworked to support embedding ipset completely
+  - Add compatibility to support kvcalloc()
+  - Validate string type attributes in attr2data() (Stefano Brivio)
+  - manpage: Add comment about matching on destination MAC address
+    (Stefano Brivio)
+  - Add compatibility to support is_zero_ether_addr()
+  - Fix use-after-free in ipset_parse_name_compat() (Stefano Brivio)
+  - Fix leak in build_argv() on line parsing error (Stefano Brivio)
+  - Simplify return statement in ipset_mnl_query() (Stefano Brivio)
+  - tests/check_klog.sh: Try dmesg too, don't let shell terminate script
+    (Stefano Brivio)
+
 6.38
   - Fix API version number
 
diff --git a/configure.ac b/configure.ac
index 1532997..5a74e6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Boilerplate
-AC_INIT([ipset], [6.38], [kadlec@blackhole.kfki.hu])
+AC_INIT([ipset], [7.0], [kadlec@blackhole.kfki.hu])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CANONICAL_HOST
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/kernel/ChangeLog b/kernel/ChangeLog
index 3c7fbdc..8e8f607 100644
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,25 @@
+7.0
+  - Introduction of new commands and protocol version 7
+  - License cleanup: add SPDX license identifier to uapi header files with
+    no license (Greg Kroah-Hartman)
+  - net: Convert ip_set_net_ops (Kirill Tkhai)
+  - netfilter: Replace spin_is_locked() with lockdep (Lance Roy)
+  - Fix calling ip_set() macro at dumping
+  - Correct rcu_dereference() call in ip_set_put_comment()
+  - netfilter: ipset: fix ip_set_list allocation failure (Andrey Ryabinin)
+  - ipset: Make invalid MAC address checks consisten (Stefano Brivio)
+  - ipset: Allow matching on destination MAC address for mac and ipmac sets
+    (Stefano Brivio)
+  - netfilter: ipset: actually allow allowable CIDR 0 in hash:net,port,net
+    (Eric Westbrook)
+  - ipset: list:set: Decrease refcount synchronously on deletion and replace
+    (Stefano Brivio)
+  - netfilter: ipset: forbid family for hash:mac sets (Florent Fourcot)
+  - Limit max timeout value to (UINT_MAX >> 1)/MSEC_PER_SEC
+  - List timing out entries with "timeout 1" instead of zero timeout value
+    (Fixes bugzilla #1258)
+  - netfilter: xt_set: Check hook mask correctly (Serhey Popovych)
+
 6.37
   - netfilter: ipset: Use is_zero_ether_addr instead of static and memcmp
     (Joe Perches)
-- 
cgit v1.2.3