From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Fri, 29 Jun 2012 19:48:45 +0000 (+0200)
Subject: ipset 6.13 released
X-Git-Tag: v6.13^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c7b022a18ea2bae11d889b345caef87f3bf145e;p=thirdparty%2Fipset.git

ipset 6.13 released
---

diff --git a/ChangeLog b/ChangeLog
index 38d3b049..3a04cfbb 100644
--- 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 ee8c9fa7..7408c287 100644
--- 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 819ac6e4..d27f8161 100644
--- 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()