Preparing to tag v2.2-beta2v2.2-beta2

ChangeLog has been updated with information related to v2.2-beta1 as well.

Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>

2 files changed, 82 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 5580409..b17561c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 OpenVPN Change Log
 Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
 
-2010.08.09 -- Version 2.1.2
+2010.08.16 -- Version 2.2-beta2
 
 * Windows security issue:
   Fixed potential local privilege escalation vulnerability in
@@ -19,6 +19,10 @@ Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
 * Added Python-based based alternative build system for Windows using
   Visual Studio 2008 (in win directory).
 
+* Fixed compiler warning in ssl.c when compiling with --enable-strict
+
+2010.08.10 -- Version 2.2-beta1
+
 * When aborting in a non-graceful way, try to execute do_close_tun in
   init.c prior to daemon exit to ensure that the tun/tap interface is
   closed and any added routes are deleted.
@@ -108,10 +112,85 @@ Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
 
 * Fixed an issue where application payload transmissions on the
   TLS control channel (such as AUTH_FAILED) that occur during
-  or immediately after a TLS renegotiation might be dropped. 
+  or immediately after a TLS renegotiation might be dropped.
 
 * Added warning about tls-remote option in man page.
 
+* Community patches (from openvpn-testing.git tree)
+
+  Alberto Gonzalez Iniesta (1):
+      Debian patch: Fix spelling in log message
+
+  Dan Nelson (1):
+      bash->bourne script cleanup
+
+  Daniel Johnson (1):
+      auth-pam plugin update: Support DOMAIN+USERNAME in config
+
+  David Sommerseth (22):
+      Reworked the eurephia patch for inclusion to the openvpn-testing tree
+      Added mapping files from SVN commit ID to more descriptive commit IDs.
+      verb 5 logging wrongly reports received bytes
+      On TARGET_LINUX define _GNU_SOURCE if not defined
+      Fix autotools cross-compiling support
+      Add comile time information/settings from ./configure to --version
+      Make use of counter_type instead of int when counting bytes and network packets
+      Updated the man page to reflect the behavioural change of create_temp_file()
+      Removed no longer needed delete_file() call
+      Fixed potential NULL pointer issue
+      Fix dependency checking for configure.h (v2)
+      Make use of automake CLEANFILES variable instead of clean-local rule
+      Don't add compile time information if --enable-small is used
+      Harden create_temp_filename() (version 2)
+      Renamed all calls to create_temp_filename()
+      Updated the man page to reflect the behavioural change of create_temp_file()
+      Removed no longer needed delete_file() call
+      Avoid repetition of "this config may cache passwords in memory" (v2)
+      Revamped the script-security warning logging (version 2)
+      Fixed client hang when server don't PUSH (aka the NO_SOUP_FOR_YOU patch)
+      Solved hidden merge conflict between changes in feat_misc and bugfix2.1
+      Fix multiple configured scripts conflicts issue (version 2)
+
+  Davide Brini (6):
+      OCSP_check.sh: new check logic
+      The man page does not mention that the default value of "mssfix" is 1450.
+      Enhance contrib/pull-resolv-conf/client.{up,down} scripts
+      Fix missing /bin/bash -> /bin/sh
+      Fix certificate serial number export
+      Exclude ping and control packets from activity
+
+  Emilien Mantel (2):
+      Choose a different field in X509 to be username
+      Fixed static defined length check to use sizeof()
+
+  Enrico Scholz (1):
+      Allow 'lport 0' setup for random port binding
+
+  Fabian Knittel (1):
+      ssl.c: fix use of openvpn_run_script()'s return value
+
+  Gert Doering (3):
+      remove duplicate code in FREEBSD+DRAGONFLY system-dependent ifconfig
+      Implement IPv6 in TUN mode for Windows TAP driver.
+      fix date format mistake in PRODUCT_TAP_RELDATE (Peter Stuge)
+
+  Jan Brinkmann (1):
+      The man page needs dash escaping in UTF-8 environments
+
+  Karl O. Pinc (2):
+      Change verify-cn so cn is no longer hardcoded in openvpn's config file
+      Several updates to openvpn.8 (man page updates)
+
+  Mathieu GIANNECCHINI (1):
+      enhance tls-verify possibility
+
+  Wil Cooley (1):
+      pkitool lacks expected option "--help"
+
+  chantra (2):
+      Handle non standard subnets in PF grammar
+      Fix errors in openvpn-plugin.h documentation
+
 2009.12.11 -- Version 2.1.1
 
 * Fixed some breakage in openvpn.spec (which is required to build an
diff --git a/version.m4 b/version.m4
index 02208a2..856cc01 100644
--- a/version.m4
+++ b/version.m4
@@ -1,5 +1,5 @@
 dnl define the OpenVPN version
-define(PRODUCT_VERSION,[2.2-beta1])
+define(PRODUCT_VERSION,[2.2-beta2])
 dnl define the TAP version
 define(PRODUCT_TAP_ID,[tap0901])
 define(PRODUCT_TAP_WIN32_MIN_MAJOR,[9])