summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2011-11-25 09:36:04 +0100
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2011-11-25 09:36:04 +0100
commit7c061f216ee04a8df5f49521b146f4a274b5f1ac (patch)
tree088be2b2073ce20cca4511ceaa876a9e94397d1a
parentb3e8f7feacf438e601aa2c7e96de92f3ca061b34 (diff)
ipset 6.10 releasedv6.10
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac2
-rw-r--r--kernel/ChangeLog4
3 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 85a9e2e..8137cc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+6.10
+ - Tests added to check ICMP/ICMPv6 type/code parsing
+ - ICMP/ICMPv6 type/code parser bug fixed (bug reported by Sabitov)
+ - ipset: fix lookup of tcp port names (Stephen Hemminger)
+ - Optionally disable building the kernel module (Mathieu Bridon)
+ - Make tidy complete
+
6.9
- build: move ipset_errcode into library (Jan Engelhardt)
- build: abort autogen on subcommand failure (Jan Engelhardt)
diff --git a/configure.ac b/configure.ac
index 9ad8bed..692f740 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
dnl Boilerplate
-AC_INIT([ipset], [6.9.1], [kadlec@blackhole.kfki.hu])
+AC_INIT([ipset], [6.10], [kadlec@blackhole.kfki.hu])
AC_CANONICAL_HOST
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADER([config.h])
diff --git a/kernel/ChangeLog b/kernel/ChangeLog
index c6b3537..cf502e6 100644
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,7 @@
+6.10
+ - Invert the logic to include version.h in ip_set_core.c
+ - Suppress false compile-time warnings about uninitialized variable ip_to
+
6.9.1
- Fix compiling ipset as external kernel modules