ipset 7.18 released

Signed-off-by: Jozsef Kadlecsik <kadlec@netfilter.org>

diff --git a/ChangeLog b/ChangeLog
index 5ec1a39d6f7f1591cccd91871ddd97195d692006..cf73acfad0e06bcbf4d8a9716df29b6576701482 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+7.18
+  - Add json output to list command (Thomas Oberhammer)
+  - tests: hash:ip,port.t: Replace VRRP by GRE protocol (Phil Sutter)
+  - tests: hash:ip,port.t: 'vrrp' is printed as 'carp' (Phil Sutter)
+  - tests: cidr.sh: Add ipcalc fallback (Phil Sutter)
+  - tests: xlate: Make test input valid (Phil Sutter)
+  - tests: xlate: Test built binary by default (Phil Sutter)
+  - xlate: Drop dead code (Phil Sutter)
+  - xlate: Fix for fd leak in error path (Phil Sutter)
+  - configure.ac: fix bashisms (Sam James)
+  - lib/Makefile.am: fix pkgconfig dir (Sam James)
+
 7.17
   - Tests: When verifying comments/timeouts, make sure entries don't expire
   - Tests: Make sure the internal batches add the correct number of elements

diff --git a/configure.ac b/configure.ac
index 59a342159df0de3f1ea8ede085001b9b241cbc94..cad93af99587f4bac2b7c3c5d1317159ff873b11 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Boilerplate
-AC_INIT([ipset], [7.17], [kadlec@netfilter.org])
+AC_INIT([ipset], [7.18], [kadlec@netfilter.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CANONICAL_HOST
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/kernel/ChangeLog b/kernel/ChangeLog
index fd23007b270bbb956d85f2fa345ec2da1e4af7b2..17e91271c8d90bd35282f2351426caf6806889eb 100644 (file)
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,18 @@
+7.18
+  - netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP
+    (reported by Kyle Zeng)
+  - netfilter: ipset: add the missing IP_SET_HASH_WITH_NET0 macro for
+    ip_set_hash_netportnet.c (Kyle Zeng)
+  - compatibility: handle strscpy_pad()
+  - netfilter: ipset: refactor deprecated strncpy (Justin Stitt)
+  - netfilter: ipset: remove rcu_read_lock_bh pair from ip_set_test
+    (Florian Westphal)
+  - netfilter: ipset: Replace strlcpy with strscpy (Azeem Shaikh)
+  - netfilter: ipset: Add schedule point in call_ad(). (Kuniyuki Iwashima)
+  - net: Kconfig: fix spellos (Randy Dunlap)
+  - netfilter: ipset: Fix overflow before widen in the bitmap_ip_create()
+    function. (Gavrilov Ilia)
+
 7.17
   - netfilter: ipset: Rework long task execution when adding/deleting entries
   - netfilter: ipset: fix hash:net,port,net hang with /0 subnet