ipset 6.13 released

diff --git a/ChangeLog b/ChangeLog
index 38d3b049239fd920d8c7e320a645fd4f63f36ad2..3a04cfbb13a722915cc47151a260870cbbd73bc6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+6.13
+ - Explain in more detail src/dst for hash:net,iface
+ - ipset help lists set types multiple times, fixed 
+   (reported by Mr Dash Four)
+ - The commandline parser was too permissive, make it more strict
+ - Allow saving to/restoring from a file without shell redirection
+ - Fix typo of word "unkown" to "unknown" (Neutron Soutmun)
+
 6.12.1
  - Enable silent (kernel style) compile messages
  - Fix build failed on --disable-dependency-tracking

diff --git a/configure.ac b/configure.ac
index ee8c9fa7d6cd5f373cc278c846a947cf0fe6b8db..7408c2879d4f693020cfb2c0d91ffb5cdf1ca36c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Boilerplate
-AC_INIT([ipset], [6.12.1], [kadlec@blackhole.kfki.hu])
+AC_INIT([ipset], [6.13], [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 819ac6e486ee411e4220bdc7901f567ec62feb9d..d27f81613bb7a6c045fc4b70022af6b9089782ea 100644 (file)
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,10 @@
+6.13
+ - ipset: Handle properly an IPSET_CMD_NONE (Tomasz Bursztyka)
+ - netfilter: ipset: hash:net,iface: fix interface comparison (Florian
+   Westphal)
+ - Timeout fixing bug broke SET target special timeout value, fixed
+ - Use MSEC_PER_SEC instead of harcoded value
+
 6.12
  - Backport nla_put_net* functions as NLA_PUT* were removed
  - netlink: add netlink_dump_control structure for netlink_dump_start()