2.2.3 version releases: manpage fix in ipset, TODO file added

4 files changed, 15 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 32b92d1..f26f9e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2.2.3
+ - memory allocation bug in iphash and nethash in connection with the SET
+   target was fixed (bug reported by Nikolai Malykh)
+ - lockhelp.h was removed from the 2.6.13 kernel tree, ip_set.c is
+   updated accordingly (Cardoso Didier, Samir Bellabes)
+ - manpage is updated to clearly state the command order in restore mode
+
 2.2.2
  - Jiffies rollover bug in ip_set_iptree reported and fixed by Rob Nielsen
  - Compiler warning in the non-SMP case fixed (Marcus Sundberg)
diff --git a/Makefile b/Makefile
index 0b72b0e..59b2443 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ ifndef KERNEL_DIR
 KERNEL_DIR=/usr/src/linux
 endif
 
-IPSET_VERSION:=2.2.2
+IPSET_VERSION:=2.2.3
 
 PREFIX:=/usr/local
 LIBDIR:=$(PREFIX)/lib
diff --git a/TODO b/TODO
new file mode 100644
index 0000000..9d46233
--- /dev/null
+++ b/TODO
@@ -0,0 +1,2 @@
+- rewrite kernel-userspace communication from sockopt to netlink
+- IPv6 support
diff --git a/ipset.8 b/ipset.8
index 5e87af2..32b5ae3 100644
--- a/ipset.8
+++ b/ipset.8
@@ -118,6 +118,11 @@ is specified to stdout in a format that --restore can read.
 .BI "-R, --restore "
 Restore a saved session generated by --save. The saved session
 can be fed from stdin.
+
+When generating a session file please note that the supported commands
+(create set, add element, bind) must appear in a strict order: first create
+the set, then add all elements. Then create the next set, add all its elements
+and so on. Finally you can append all binding commands. 
 .TP
 .BI "-A, --add " "\fIsetname\fP \fIIP\fP"
 Add an IP to a set.