ipset 6.17 released

diff --git a/ChangeLog b/ChangeLog
index 392b571d9bb64f9545f0b30c2484ef54f2be29c6..59c0ef95fa66287b9f919b7800fe658bd4b6432a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+6.17
+ - Fix revision printing in XML mode (reported by Mart Frauenlob)
+ - Correct "Suspicious condition (assignment + comparison)" (Thomas Jarosch)
+ - Fix error path when protocol number is used with port range
+ - Interactive mode error after syntax error (reported by Mart Frauenlob)
+ - The ipset_bash_completion tool is added
+ - The ipset_list tool is added
+
 6.16
  - Remove all modules before testing resize
  - build: support for Linux 3.7 UAPI (Jan Engelhardt)

diff --git a/Makefile.am b/Makefile.am
index 9e2d59b44e50c765d9abe62d9d8649ba43bac646..60d0754ca4cf01587e8ed53365dd7a73be8bc157 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,6 +58,14 @@ update_includes:
        ./update ip_set_hash.h
        ./update ip_set_list.h
 
+update_utils:
+       wget -O /tmp/ipset-bash-completion.tar.gz http://sourceforge.net/projects/ipset-bashcompl/files/latest/download
+       cd utils/ipset_bash_completion; tar xz --strip-components=1 -f /tmp/ipset-bash-completion.tar.gz
+       rm -f /tmp/ipset-bash-completion.tar.gz
+       wget -O /tmp/ipset-list.tar.gz http://sourceforge.net/projects/ipset-list/files/latest/download
+       cd utils/ipset_list; tar xz --strip-components=1 -f /tmp/ipset-list.tar.gz
+       rm -f /tmp/ipset-list.tar.gz
+
 tests:
        cd tests; ./runtest.sh
 

diff --git a/configure.ac b/configure.ac
index 4c9fcade47b0fb84ea17f62dfdcdb1015da3fc9e..a86d596e90185bac17d70123138a161ef18a5c29 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Boilerplate
-AC_INIT([ipset], [6.16.1], [kadlec@blackhole.kfki.hu])
+AC_INIT([ipset], [6.17], [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 0c26ba8942edb0f66f5ae05d99cccd8d70249884..b9ca38c8bff0eac596853030f9a7bfaf0134b071 100644 (file)
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,8 @@
+6.17
+  - Make sure ip_set_max isn't set to IPSET_INVALID_ID
+  - netfilter: ipset: timeout values corrupted on set resize (Josh Hunt)
+  - "Directory not empty" error message (reported by John Brendler)
+
 6.16.1
  - Add ipset package version to external module description
  - Backport RCU handling up to 2.6.32.x