From 26f25a43a950ec408ddd67a213491a2ef438110c Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@medozas.de>
Date: Wed, 9 Sep 2009 17:37:07 +0200
Subject: [PATCH] Xtables-addons 1.18

---
 configure.ac        | 4 ++--
 doc/changelog.txt   | 6 +++++-
 xtables-addons.8.in | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 68abfbb..21164b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 
-AC_INIT([xtables-addons], [1.17])
+AC_INIT([xtables-addons], [1.18])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_INSTALL
@@ -89,7 +89,7 @@ else
 	fi;
 fi;
 echo "Found kernel version $kmajor.$kminor.$kmicro.$kstable in $kbuilddir";
-if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 30; then
+if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 31; then
 	echo "WARNING: You are trying a newer kernel. Results may vary. :-)";
 elif test \( "$kmajor" -lt 2 -o "$kminor" -lt 6 -o "$kmicro" -lt 17 \) -o \
     \( "$kmajor" -eq 2 -a "$kminor" -eq 6 -a "$kmicro" -eq 18 -a \
diff --git a/doc/changelog.txt b/doc/changelog.txt
index 7dc2ab8..6e522c6 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -1,11 +1,15 @@
 
 
-- build: support for Linux 2.6.31-rc1
+Xtables-addons 1.18 (September 09 2009)
+=======================================
+- build: support for Linux 2.6.31
 - ipset: fast forward to v3.2
 - quota2: support anonymous counters
 - quota2: reduce memory footprint for anonymous counters
 - quota2: extend locked period during cleanup (locking bugfix)
 - quota2: use strtoull instead of strtoul
+- merged xt_ACCOUNT module
+- merged xt_psd module
 
 
 Xtables-addons 1.17 (June 16 2009)
diff --git a/xtables-addons.8.in b/xtables-addons.8.in
index 0bca8b5..aa7b848 100644
--- a/xtables-addons.8.in
+++ b/xtables-addons.8.in
@@ -1,6 +1,6 @@
-.TH xtables\-addons 8 "v1.17 (2009\-06\-16)" "" "v1.17 (2009\-06\-16)"
+.TH xtables-addons 8 "v1.18 (2009-09-09)" "" "v1.18 (2009-09-09)"
 .SH Name
-Xtables\-addons - additional extensions for iptables, ip6tables, etc.
+Xtables-addons \(em additional extensions for iptables, ip6tables, etc.
 .SH Targets
 .\" @TARGET@
 .SH Matches