From 6f78f2fb3b61904fcf5a52860fe60c91e201bb52 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j@w1.fi>
Date: Tue, 6 Jan 2009 20:11:15 +0200
Subject: [PATCH] Preparations for 0.6.7 release

---
 hostapd/ChangeLog                 |  5 +++--
 hostapd/README                    |  2 +-
 hostapd/hostapd.c                 |  4 ++--
 hostapd/hostapd_cli.c             |  4 ++--
 src/common/version.h              |  2 +-
 wpa_supplicant/ChangeLog          |  2 +-
 wpa_supplicant/README             |  2 +-
 wpa_supplicant/README-Windows.txt |  3 +--
 wpa_supplicant/wpa_cli.c          |  4 ++--
 wpa_supplicant/wpa_supplicant.c   |  4 ++--
 www/hostapd/index.html            | 11 ++++++-----
 www/index.html                    | 13 +++++++------
 www/versions.dot                  |  3 ++-
 www/wpa_supplicant/index.html     | 14 ++++++++------
 14 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/hostapd/ChangeLog b/hostapd/ChangeLog
index 09b34cd9b..f85a4fb11 100644
--- a/hostapd/ChangeLog
+++ b/hostapd/ChangeLog
@@ -1,10 +1,11 @@
 ChangeLog for hostapd
 
-????-??-?? - v0.6.7
+2009-01-06 - v0.6.7
 	* added support for Wi-Fi Protected Setup (WPS)
 	  (hostapd can now be configured to act as an integrated WPS Registrar
 	  and provision credentials for WPS Enrollees using PIN and PBC
-	  methods; external WPS Registrars are not supported); WPS support can
+	  methods; external wireless Registrar can configure the AP, but
+	  external WLAN Manager Registrars are not supported); WPS support can
 	  be enabled by adding CONFIG_WPS=y into .config and setting the
 	  runtime configuration variables in hostapd.conf (see WPS section in
 	  the example configuration file); new hostapd_cli commands wps_pin and
diff --git a/hostapd/README b/hostapd/README
index 674377470..eb9aa4815 100644
--- a/hostapd/README
+++ b/hostapd/README
@@ -2,7 +2,7 @@ hostapd - user space IEEE 802.11 AP and IEEE 802.1X/WPA/WPA2/EAP
 	  Authenticator and RADIUS authentication server
 ================================================================
 
-Copyright (c) 2002-2008, Jouni Malinen <j@w1.fi> and contributors
+Copyright (c) 2002-2009, Jouni Malinen <j@w1.fi> and contributors
 All Rights Reserved.
 
 This program is dual-licensed under both the GPL version 2 and BSD
diff --git a/hostapd/hostapd.c b/hostapd/hostapd.c
index 1da0bf52a..8f2ec4cb6 100644
--- a/hostapd/hostapd.c
+++ b/hostapd/hostapd.c
@@ -1,6 +1,6 @@
 /*
  * hostapd / Initialization and configuration
- * Copyright (c) 2002-2008, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2002-2009, Jouni Malinen <j@w1.fi>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -1658,7 +1658,7 @@ static void show_version(void)
 		"hostapd v" VERSION_STR "\n"
 		"User space daemon for IEEE 802.11 AP management,\n"
 		"IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator\n"
-		"Copyright (c) 2002-2008, Jouni Malinen <j@w1.fi> "
+		"Copyright (c) 2002-2009, Jouni Malinen <j@w1.fi> "
 		"and contributors\n");
 }
 
diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c
index 68ff091cf..9c3e65b2a 100644
--- a/hostapd/hostapd_cli.c
+++ b/hostapd/hostapd_cli.c
@@ -1,6 +1,6 @@
 /*
  * hostapd - command line interface for hostapd daemon
- * Copyright (c) 2004-2008, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2004-2009, Jouni Malinen <j@w1.fi>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -22,7 +22,7 @@
 
 static const char *hostapd_cli_version =
 "hostapd_cli v" VERSION_STR "\n"
-"Copyright (c) 2004-2008, Jouni Malinen <j@w1.fi> and contributors";
+"Copyright (c) 2004-2009, Jouni Malinen <j@w1.fi> and contributors";
 
 
 static const char *hostapd_cli_license =
diff --git a/src/common/version.h b/src/common/version.h
index cf137f9f4..7651b48a1 100644
--- a/src/common/version.h
+++ b/src/common/version.h
@@ -1,6 +1,6 @@
 #ifndef VERSION_H
 #define VERSION_H
 
-#define VERSION_STR "0.6.6"
+#define VERSION_STR "0.6.7"
 
 #endif /* VERSION_H */
diff --git a/wpa_supplicant/ChangeLog b/wpa_supplicant/ChangeLog
index 361c17126..37ab7224b 100644
--- a/wpa_supplicant/ChangeLog
+++ b/wpa_supplicant/ChangeLog
@@ -1,6 +1,6 @@
 ChangeLog for wpa_supplicant
 
-????-??-?? - v0.6.7
+2009-01-06 - v0.6.7
 	* added support for Wi-Fi Protected Setup (WPS)
 	  (wpa_supplicant can now be configured to act as a WPS Enrollee to
 	  enroll credentials for a network using PIN and PBC methods; in
diff --git a/wpa_supplicant/README b/wpa_supplicant/README
index 643a727a8..778b0ba72 100644
--- a/wpa_supplicant/README
+++ b/wpa_supplicant/README
@@ -1,7 +1,7 @@
 WPA Supplicant
 ==============
 
-Copyright (c) 2003-2008, Jouni Malinen <j@w1.fi> and contributors
+Copyright (c) 2003-2009, Jouni Malinen <j@w1.fi> and contributors
 All Rights Reserved.
 
 This program is dual-licensed under both the GPL version 2 and BSD
diff --git a/wpa_supplicant/README-Windows.txt b/wpa_supplicant/README-Windows.txt
index e2b75bdde..292223d2d 100644
--- a/wpa_supplicant/README-Windows.txt
+++ b/wpa_supplicant/README-Windows.txt
@@ -1,8 +1,7 @@
 wpa_supplicant for Windows
 ==========================
 
-Copyright (c) 2003-2008, Jouni Malinen <j@w1.fi> and
-contributors
+Copyright (c) 2003-2009, Jouni Malinen <j@w1.fi> and contributors
 All Rights Reserved.
 
 This program is dual-licensed under both the GPL version 2 and BSD
diff --git a/wpa_supplicant/wpa_cli.c b/wpa_supplicant/wpa_cli.c
index c36277a0e..c49b67401 100644
--- a/wpa_supplicant/wpa_cli.c
+++ b/wpa_supplicant/wpa_cli.c
@@ -1,6 +1,6 @@
 /*
  * WPA Supplicant - command line interface for wpa_supplicant daemon
- * Copyright (c) 2004-2008, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2004-2009, Jouni Malinen <j@w1.fi>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -31,7 +31,7 @@
 
 static const char *wpa_cli_version =
 "wpa_cli v" VERSION_STR "\n"
-"Copyright (c) 2004-2008, Jouni Malinen <j@w1.fi> and contributors";
+"Copyright (c) 2004-2009, Jouni Malinen <j@w1.fi> and contributors";
 
 
 static const char *wpa_cli_license =
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index d23220d3a..d2c45525e 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -1,6 +1,6 @@
 /*
  * WPA Supplicant
- * Copyright (c) 2003-2008, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2003-2009, Jouni Malinen <j@w1.fi>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -42,7 +42,7 @@
 
 const char *wpa_supplicant_version =
 "wpa_supplicant v" VERSION_STR "\n"
-"Copyright (c) 2003-2008, Jouni Malinen <j@w1.fi> and contributors";
+"Copyright (c) 2003-2009, Jouni Malinen <j@w1.fi> and contributors";
 
 const char *wpa_supplicant_license =
 "This program is free software. You can distribute it and/or modify it\n"
diff --git a/www/hostapd/index.html b/www/hostapd/index.html
index 0b89eb3af..551d31b0e 100644
--- a/www/hostapd/index.html
+++ b/www/hostapd/index.html
@@ -3,7 +3,7 @@
   <head>
     <title>hostapd: IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator</title>
     <meta name="description" content="hostapd (IEEE 802.1X, WPA, WPA2, RSN, IEEE 802.11i Authenticator and RADIUS authentication server)">
-    <meta name="keywords" content="WPA, WPA2, IEEE 802.11i, IEEE 802.1X, WPA Authenticator, hostapd, TKIP, CCMP, EAP-PEAP, EAP-TLS, EAP-TTLS, EAP-SIM, EAP-AKA, EAP-GTC, EAP-MSCHAPv2, EAP-MD5, EAP-PAX, EAP-PSK, EAP-FAST, IEEE 802.1X Supplicant, IEEE 802.1aa, EAPOL, RSN, pre-authentication, PMKSA caching, BSD WPA Authenticator, FreeBSD WPA Authenticator, RADIUS authentication server, EAP authenticator, EAP server, EAP-TNC, TNCS, IF-IMV, IF-TNCCS">
+    <meta name="keywords" content="WPA, WPA2, IEEE 802.11i, IEEE 802.1X, WPA Authenticator, hostapd, TKIP, CCMP, EAP-PEAP, EAP-TLS, EAP-TTLS, EAP-SIM, EAP-AKA, EAP-GTC, EAP-MSCHAPv2, EAP-MD5, EAP-PAX, EAP-PSK, EAP-FAST, IEEE 802.1X Supplicant, IEEE 802.1aa, EAPOL, RSN, pre-authentication, PMKSA caching, BSD WPA Authenticator, FreeBSD WPA Authenticator, RADIUS authentication server, EAP authenticator, EAP server, EAP-TNC, TNCS, IF-IMV, IF-TNCCS, WPS">
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   </head>
 
@@ -33,6 +33,7 @@ RADIUS backend authentication server) ("WPA-Enterprise")</li>
 <li>RSN: PMKSA caching, pre-authentication</li>
 <li>RADIUS accounting</li>
 <li>RADIUS authentication server with EAP</li>
+<li>Wi-Fi Protected Setup (WPS)</li>
 </ul>
 
 <h4>Supported EAP methods (integrated EAP server and RADIUS authentication server)</h4>
@@ -59,7 +60,7 @@ RADIUS backend authentication server) ("WPA-Enterprise")</li>
 <li>EAP-SAKE</li>
 <li>EAP-FAST</li>
 <li>EAP-IKEv2</li>
-<li>EAP-GPSK (experimental)</li>
+<li>EAP-GPSK</li>
 </ul>
 
 <p>Following methods are also supported, but since they do not generate keying
@@ -89,7 +90,7 @@ available in <a href="/gitweb/gitweb.cgi?p=hostap.git;a=blob_plain;f=hostapd/eap
 
 <p>
 <b>hostapd</b><br>
-Copyright (c) 2002-2008, Jouni Malinen &lt;j@w1.fi&gt;
+Copyright (c) 2002-2009, Jouni Malinen &lt;j@w1.fi&gt;
 and contributors.
 </p>
 
@@ -132,7 +133,7 @@ for the current documentation.</b></p>
 </ul>
 <li>Latest development release:
 <ul>
-<li><a href="../releases/hostapd-0.6.6.tar.gz">hostapd-0.6.6.tar.gz</a></li>
+<li><a href="../releases/hostapd-0.6.7.tar.gz">hostapd-0.6.7.tar.gz</a></li>
 </ul>
 <li>ChangeLog:
 <ul>
@@ -261,7 +262,7 @@ bug/feature request</a>.
     <address><a href="mailto:j@w1.fi">Jouni Malinen</a></address>
 <!-- Created: Sun Jan  2 17:20:17 PST 2005 -->
 <!-- hhmts start -->
-Last modified: Fri Dec 26 15:37:54 EET 2008
+Last modified: Tue Jan  6 20:05:09 EET 2009
 <!-- hhmts end -->
     </div>
   </body>
diff --git a/www/index.html b/www/index.html
index 2f67c734c..0f0a4a976 100644
--- a/www/index.html
+++ b/www/index.html
@@ -141,13 +141,13 @@ and contributors.
 
 <p>
 <b>hostapd</b><br>
-Copyright (c) 2002-2008, Jouni Malinen &lt;j@w1.fi&gt;
+Copyright (c) 2002-2009, Jouni Malinen &lt;j@w1.fi&gt;
 and contributors.
 </p>
 
 <p>
 <b>wpa_supplicant</b><br>
-Copyright (c) 2003-2008, Jouni Malinen &lt;j@w1.fi&gt;
+Copyright (c) 2003-2009, Jouni Malinen &lt;j@w1.fi&gt;
 and contributors.
 </p>
 
@@ -213,9 +213,10 @@ main kernel tree.
 </ul>
 <li>Latest development release:
 <ul>
-<li><a href="releases/hostapd-0.6.6.tar.gz">hostapd-0.6.6.tar.gz</a>
-<li><a href="releases/wpa_supplicant-0.6.6.tar.gz">wpa_supplicant-0.6.6.tar.gz</a> (source code for all versions)</li>
-<li><a href="releases/wpa_supplicant-windows-bin-0.6.6.zip">wpa_supplicant-windows-bin-0.6.6.zip</a> (binaries for Windows)</li>
+<li><a href="releases/hostapd-0.6.7.tar.gz">hostapd-0.6.7.tar.gz</a>
+<li><a href="releases/wpa_supplicant-0.6.7.tar.gz">wpa_supplicant-0.6.7.tar.gz</a> (source code for all versions)</li>
+<li><a href="releases/wpa_supplicant-0.6.7.exe">wpa_supplicant-0.6.7.exe</a> (binary installer for Windows)</li>
+<li><a href="releases/wpa_supplicant-windows-bin-0.6.7.zip">wpa_supplicant-windows-bin-0.6.7.zip</a> (binaries for Windows)</li>
 <li><a href="wpa_supplicant/qt4/wpa_gui-qt433-windows-dll.zip">wpa_gui-qt433-windows-dll.zip</a> (Qt4 libraries from wpa_gui/Windows)</li>
 </ul>
 <li>ChangeLog:
@@ -294,7 +295,7 @@ get lost, please report it through the bug tracking system as
     <address><a href="mailto:j@w1.fi">Jouni Malinen</a></address>
 <!-- Created: Mon May 27 20:08:41 EEST 2002 -->
 <!-- hhmts start -->
-Last modified: Fri Dec 26 15:37:35 EET 2008
+Last modified: Tue Jan  6 20:03:17 EET 2009
 <!-- hhmts end -->
     </div>
   </body>
diff --git a/www/versions.dot b/www/versions.dot
index d24abe95e..4a0a5a89c 100644
--- a/www/versions.dot
+++ b/www/versions.dot
@@ -43,6 +43,7 @@ digraph versions {
 	v064 [label="0.6.4  hw\n2008-08-10"]
 	v065 [label="0.6.5  hw\n2008-11-01"]
 	v066 [label="0.6.6  hw\n2008-11-23"]
+	v067 [label="0.6.7  hw\n2009-01-06"]
 
 # stable releases
 
@@ -75,7 +76,7 @@ digraph versions {
 	v024 -> v030 -> v031 -> v032 -> v033 -> v034 -> v035 -> v036 -> v037
 	v037 -> v040 -> v041 -> v042 -> v043 -> v044 -> v045 -> v046 -> v047
 	v047 -> v050 -> v051 -> v052 -> v053 -> v054 -> v055 -> v056 -> v057
-	v057 -> v060 -> v061 -> v062 -> v063 -> v064 -> v065 -> v066
+	v057 -> v060 -> v061 -> v062 -> v063 -> v064 -> v065 -> v066 -> v067
 
 	{rank=same; v001 v024}
 	{rank=same; v030 v037}
diff --git a/www/wpa_supplicant/index.html b/www/wpa_supplicant/index.html
index cfb128a3f..05042a0cb 100644
--- a/www/wpa_supplicant/index.html
+++ b/www/wpa_supplicant/index.html
@@ -3,7 +3,7 @@
   <head>
     <title>Linux WPA Supplicant (IEEE 802.1X, WPA, WPA2, RSN, IEEE 802.11i)</title>
     <meta name="description" content="WPA Supplicant for Linux, BSD, and Windows (IEEE 802.1X, WPA, WPA2, RSN, IEEE 802.11i)">
-    <meta name="keywords" content="WPA, WPA2, IEEE 802.11i, IEEE 802.1X, WPA Supplicant, wpa_supplicant, TKIP, CCMP, EAP-PEAP, EAP-TLS, EAP-TTLS, EAP-SIM, EAP-AKA, EAP-PSK, EAP-GTC, EAP-MSCHAPv2, EAP-MD5, EAP-FAST, EAP-PAX, EAP-IKEv2IEEE 802.1X Supplicant, IEEE 802.1aa, EAPOL, RSN, pre-authentication, PMKSA caching, BSD WPA Supplicant, FreeBSD WPA Supplicant, wireless, WinXP WPA Supplicant, EAP-TNC, TNCC, IF-IMC, IF-TNCCS">
+    <meta name="keywords" content="WPA, WPA2, IEEE 802.11i, IEEE 802.1X, WPA Supplicant, wpa_supplicant, TKIP, CCMP, EAP-PEAP, EAP-TLS, EAP-TTLS, EAP-SIM, EAP-AKA, EAP-PSK, EAP-GTC, EAP-MSCHAPv2, EAP-MD5, EAP-FAST, EAP-PAX, EAP-IKEv2IEEE 802.1X Supplicant, IEEE 802.1aa, EAPOL, RSN, pre-authentication, PMKSA caching, BSD WPA Supplicant, FreeBSD WPA Supplicant, wireless, WinXP WPA Supplicant, EAP-TNC, TNCC, IF-IMC, IF-TNCCS, WPS">
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   </head>
 
@@ -41,6 +41,7 @@ build for x86 target).</p>
 <li>key management for CCMP, TKIP, WEP104, WEP40</li>
 <li>WPA and full IEEE 802.11i/RSN/WPA2</li>
 <li>RSN: PMKSA caching, pre-authentication</li>
+<li>Wi-Fi Protected Setup (WPS)</li>
 </ul>
 
 <h4>Supported EAP methods (IEEE 802.1X Supplicant)</h4>
@@ -69,7 +70,7 @@ build for x86 target).</p>
 <li>EAP-PAX</li>
 <li>EAP-SAKE</li>
 <li>EAP-IKEv2</li>
-<li>EAP-GPSK (experimental)</li>
+<li>EAP-GPSK</li>
 <li>LEAP (note: requires special support from the driver)</li>
 </ul>
 
@@ -138,7 +139,7 @@ other drivers.</p>
 
 <p>
 <b>wpa_supplicant</b><br>
-Copyright (c) 2003-2008, Jouni Malinen &lt;j@w1.fi&gt;
+Copyright (c) 2003-2009, Jouni Malinen &lt;j@w1.fi&gt;
 and contributors.
 </p>
 
@@ -186,8 +187,9 @@ has some more information about the Windows port of wpa_supplicant.</p>
 </ul>
 <li>Latest development release:
 <ul>
-<li><a href="../releases/wpa_supplicant-0.6.6.tar.gz">wpa_supplicant-0.6.6.tar.gz</a> (source code for all versions)</li>
-<li><a href="../releases/wpa_supplicant-windows-bin-0.6.6.zip">wpa_supplicant-windows-bin-0.6.6.zip</a> (binaries for Windows)</li>
+<li><a href="../releases/wpa_supplicant-0.6.7.tar.gz">wpa_supplicant-0.6.7.tar.gz</a> (source code for all versions)</li>
+<li><a href="../releases/wpa_supplicant-0.6.7.exe">wpa_supplicant-0.6.7.exe</a> (binary installer for Windows)</li>
+<li><a href="../releases/wpa_supplicant-windows-bin-0.6.7.zip">wpa_supplicant-windows-bin-0.6.7.zip</a> (binaries for Windows)</li>
 <li><a href="qt4/wpa_gui-qt433-windows-dll.zip">wpa_gui-qt433-windows-dll.zip</a> (Qt4 libraries from wpa_gui/Windows)</li>
 </ul>
 <li>ChangeLog:
@@ -351,7 +353,7 @@ bug/feature request</a>.
     <address><a href="mailto:j@w1.fi">Jouni Malinen</a></address>
 <!-- Created: Sat May 22 21:41:58 PDT 2004 -->
 <!-- hhmts start -->
-Last modified: Fri Dec 26 15:37:46 EET 2008
+Last modified: Tue Jan  6 20:06:04 EET 2009
 <!-- hhmts end -->
     </div>
   </body>