summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2018-03-03 14:04:02 +0100
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2018-03-03 14:04:02 +0100
commita2620a29605b84edfeac45c203f15a15b21f4cdf (patch)
tree1a7d618b5f62bbbc248ed344cd35b088b506f4a9
parent36b914d87d3b3a9cb9554507d3f6702c89154f29 (diff)
ipset 6.36 releasedv6.36
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac2
-rw-r--r--kernel/ChangeLog7
3 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fb3f3fd..15a93e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+6.36
+ - Use 'ss' in runtest.sh but fall back to deprecated 'net-tools'
+ command (bugzilla id #1209)
+ - build: do install libipset/args.h (Jan Engelhardt)
+ - Add test to verify wraparound fix
+
6.35
- Userspace revision handling is reworked
- Replace the last reference to u_int8_t with uint8_t.
diff --git a/configure.ac b/configure.ac
index 3db0c06..46c39b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
dnl Boilerplate
-AC_INIT([ipset], [6.35], [kadlec@blackhole.kfki.hu])
+AC_INIT([ipset], [6.36], [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 cad926b..703fb0c 100644
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,10 @@
+6.36
+ - Remove duplicate module description
+ - netfilter: remove messages print and boot/module load time
+ (Pablo Neira Ayuso)
+ - Fix wraparound bug introduced in commit 48596a8ddc46 in v6.34
+ (reported by Thomas Schwark)
+
6.35
- netfilter: mark expected switch fall-throughs (Gustavo A. R. Silva)
- License cleanup: add SPDX GPL-2.0 license identifier to files with no