From 042bf2d438738c1c60b9dd6f95784700223e0de6 Mon Sep 17 00:00:00 2001
From: Michael Rash <mbr@cipherdyne.org>
Date: Thu, 16 Jul 2015 11:59:34 -0700
Subject: [PATCH] bump version to 2.6.7 (getting close to 2.6.7-pre1)

---
 ChangeLog      | 23 ++++++++++++++++-------
 VERSION        |  2 +-
 configure.ac   |  2 +-
 win32/config.h |  2 +-
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index de513e3a..141b9d15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,20 @@
 fwknop-2.6.7 (05//2015):
-    - Added --key-gen to fwknopd. This feature was suggested by Jonathan
-      Bennett, and will help with ease of use efforts. The first platform to
-      take advantage of this will likely be OpenWRT thanks to Jonathan.
-    - Added a script from Jonathan Bennett at extras/console-qr/console-qr.sh
-      to generate QR codes from fwknopd access.conf keys.
-    - Added --with-firewalld to the autoconf configure script. This is a
-      synonym for --with-firewall-cmd to avoid confusion. Some package
+    - [server] Kevin Layer reported a bug to the fwknop mailing list that
+      simultaneous NAT access for two different access.conf stanza was not
+      functioning properly. After some diagnosis, this is a result of
+      rule_exists() not properly detecting and differentiating existing DNAT
+      rules from new ones with different port numbers when 'iptables -C'
+      support is not available. This was against iptables-1.4.7, and has been
+      fixed in this release of fwknop (tracked as issue #162).
+    - [server] Added --key-gen to fwknopd. This feature was suggested by
+      Jonathan Bennett, and will help with ease of use efforts. The first
+      platform to take advantage of this will likely be OpenWRT thanks to
+      Jonathan.
+    - [extras] Added a script from Jonathan Bennett at
+      extras/console-qr/console-qr.sh to generate QR codes from fwknopd
+      access.conf keys.
+    - [build] Added --with-firewalld to the autoconf configure script. This is
+      a synonym for --with-firewall-cmd to avoid confusion. Some package
       maintainers use --with-firewalld to build fwknop.
 
 fwknop-2.6.6 (04/23/2015):
diff --git a/VERSION b/VERSION
index 338a5b5d..e261122d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6.6
+2.6.7
diff --git a/configure.ac b/configure.ac
index 7c5bb8cd..8fcc79ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ AC_PREREQ(2.62)
 
 dnl Define our name, version and email.
 m4_define(my_package,   [fwknop])
-m4_define(my_version,   [2.6.6])
+m4_define(my_version,   [2.6.7])
 m4_define(my_bug_email, [dstuart@dstuart.org])
 
 AC_INIT(my_package, my_version, my_bug_email)
diff --git a/win32/config.h b/win32/config.h
index 6a86136a..1d9ac9f0 100644
--- a/win32/config.h
+++ b/win32/config.h
@@ -178,7 +178,7 @@
 #undef TIME_WITH_SYS_TIME
 
 /* Version number of package */
-#define VERSION "2.6.6"
+#define VERSION "2.6.7"
 
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */