summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2013-02-21 16:44:09 +0100
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2013-02-21 16:44:09 +0100
commit0b80b607f858cd44dd4e8fbf88baa7681fc52000 (patch)
treefa8b4616bdfa2856c547ac478d4f076bd12dfb0c
parentcfa1fe2bcb9f9983f66b218d68718ac362ba5bfa (diff)
ipset 6.17 releasedv6.17
-rw-r--r--ChangeLog8
-rw-r--r--Makefile.am8
-rw-r--r--configure.ac2
-rw-r--r--kernel/ChangeLog5
4 files changed, 22 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 392b571..59c0ef9 100644
--- 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 9e2d59b..60d0754 100644
--- 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 4c9fcad..a86d596 100644
--- 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 0c26ba8..b9ca38c 100644
--- 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