@@ -3,6 +3,21 @@ Copyright (C) 2002-2008 OpenVPN Technologies, Inc. <sales@openvpn.net>

 $Id$

+2008.10.07 -- Version 2.1_rc13

+

+* Bundled OpenSSL 0.9.8i with Windows installer.

+

+* Management interface can now listen on a unix

+  domain socket, for example:

+

+    management /tmp/openvpn unix

+

+  Also added management-client-user and management-client-group

+  directives to control which processes are allowed to connect

+  to the socket.

+

+* Copyright change to OpenVPN Technologies, Inc.

+

 2008.09.23 -- Version 2.1_rc12

 * Patched Makefile.am so that the new t_cltsrv-down.sh script becomes

@@ -11,7 +26,7 @@ $Id$

 * Fixed --lladdr bug introduced in 2.1-rc9 where input validation code

   was incorrectly expecting the lladdr parameter to be an IP address

   when it is actually a MAC address (HoverHell).

-	

+

 2008.09.14 -- Version 2.1_rc11

 * Fixed a bug that can cause SSL/TLS negotiations in UDP mode

@@ -9,6 +9,10 @@

 #        make

 #        make install

+if ! [ "$KEEPAUTODEFS" = "yes" ]; then

+    rm -rf autodefs

+fi

+

 rm -f \

     *.o \

     service-win32/*.o \

@@ -49,7 +53,6 @@ rm -rf \

     .deps \

     */.deps \

     windest \

-    autodefs \

     gen \

     tapinstall \

     install-win32/tmp

@@ -28,7 +28,7 @@

 #

 # The following additional prerequisites may be omitted

 # when building in pre-built mode (see note below). 

-

+#

 # svn       -- for checking out source code (or TortoiseSVN)

 # Windows Driver Kit (6001_17121_HyperV_WDK.iso) -- for building

 #    TAP driver + tapinstall

@@ -49,9 +49,6 @@

 #                  Windows Driver Kit (formerly known as DDK).

 #                  Copy the 'devcon' source tree to ../tapinstall

 #                  Edit 'sources' and modify TARGETNAME=tapinstall

-#

-# ../svc-template -- This directory should contain service.[ch]

-#                    from the MS Platform SDK.

 # Note that all variables referenced here such as GENOUT,

 # GENOUT_PREBUILT, and CLEAN are defined in install-win32/settings.in

@@ -65,11 +62,11 @@

 #   this and use the pre-built version instead.  This would allow you, for

 #   example, to build an OpenVPN installer with custom edits to

 #   install-win32/settings.in, but then avoid needing to build all other

-#   components (such as OpenSSL, LZO, Pkcs11-helper, TAP driver windows

+#   components (such as OpenSSL, LZO, Pkcs11-helper, TAP driver, Windows

 #   service, etc.).  The procedure is as follows. First Download and expand

 #   the pre-built binaries from:

 #

-#     https://secure.openvpn.net/devel/ (choose the most recent -prebuilt .tbz file)

+#     http://openvpn.net/prebuilt/ (choose the most recent -prebuilt .tbz file)

 #

 #   After expanding the .tbz file, cd to the top level directory and

 #   expand an OpenVPN source distribution taken from either the subversion

@@ -80,12 +77,12 @@

 #

 #   gen-prebuilt     -> from prebuilt .tbz file

 #   lzo-2.02         -> from prebuilt .tbz file

-#   openssl-0.9.7m   -> from prebuilt .tbz file

+#   openssl-0.9.8i   -> from prebuilt .tbz file

 #   pkcs11-helper    -> from prebuilt .tbz file

-#   openvpn-2.1_rc7a.tar.gz  -> downloaded from openvpn.net

-#   openvpn-2.1_rc7a -> directory expanded from above file

+#   openvpn-2.1_rc13.tar.gz  -> downloaded from openvpn.net

+#   openvpn-2.1_rc13 -> directory expanded from above file

 #

-#   Now cd to your expanded source tree (openvpn-2.1_rc7a in the

+#   Now cd to your expanded source tree (openvpn-2.1_rc13 in the

 #   example above), make edits to install-win32/settings.in (or even

 #   patch the OpenVPN source code directly), and run this script:

 #

@@ -94,8 +91,6 @@

 #   If everything runs correctly, you should have a custom installer

 #   written to ./gen/install

-

-

 # First build the autodefs directory, containing C, sh, and NSIS versions

 # of global settings, using install-win32/settings.in as source.

 # These settings will then drive the rest of the build process. 

@@ -3,4 +3,4 @@

 # get version.nsi definitions

 . autodefs/defs.sh

-[ "$CLEAN" = "yes" ] && rm -rf $GENOUT

+[ "$CLEAN" = "yes" ] && rm -rf $GENOUT && KEEPAUTODEFS="yes" ./doclean

@@ -10,7 +10,7 @@ if [ -d "$OPENSSL_DIR" ] ; then

     for f in libeay32.dll libssl32.dll out/openssl.exe ; do

 	cp $OPENSSL_DIR/$f $GENOUT/lib

         if [ -z "$NO_STRIP" ]; then

-	    strip $GENOUT/lib/$f

+	    strip $GENOUT/lib/`basename $f`

 	fi

     done

     mv $GENOUT/lib/openssl.exe $GENOUT/bin

@@ -6,7 +6,7 @@

 # get version.nsi definitions

 . autodefs/defs.sh

-if [ -d "/c/WINDDK/$DDKVER" ] ; then

+if [ -n "$DDKVER" ] && [ -d "/c/WINDDK/$DDKVER" ] ; then

 # common declarations for all DDK build targets

 . install-win32/ddk-common

@@ -8,7 +8,7 @@

 # get version.nsi definitions

 . autodefs/defs.sh

-if [ -d "/c/WINDDK/$DDKVER" ] ; then

+if [ -n "$DDKVER" ] && [ -d "/c/WINDDK/$DDKVER" ] ; then

 if ! [ -d "$TISRC" ] ; then

     echo "$TISRC" NOT INSTALLED

@@ -2,21 +2,20 @@ Rebuild OpenSSL tarball without symbolic links, so

 it can be extracted on Windows (run on Unix):

   [download tarball and .asc sig]

-  gpg --verify openssl-0.9.8h.tar.gz.asc

-  tar xfz openssl-0.9.8h.tar.gz

-  rm openssl-0.9.8h.tar.gz

-  tar cfzh openssl-0.9.8h.tar.gz openssl-0.9.8h

+  gpg --verify openssl-0.9.8i.tar.gz.asc

+  tar xfz openssl-0.9.8i.tar.gz

+  tar cfzh openssl-0.9.8i-nolinks.tar.gz openssl-0.9.8i

 To apply patch (in MSYS shell):

-  cd /c/src/openssl-0.9.8h

+  cd /c/src/openssl-0.9.8i

   patch -p1 <../21/install-win32/openssl/openssl098.patch

 To build OpenSSL, open a command prompt window, then:

-  cd \src\openssl-0.9.8h

+  cd \src\openssl-0.9.8i

   ms\mw

 To build a new patch (optional):

-  diff -urw openssl-0.9.8h.orig openssl-0.9.8h | grep -v '^Only in' >openssl098.patch

+  diff -urw openssl-0.9.8i.orig openssl-0.9.8i | grep -v '^Only in' >openssl098.patch

@@ -22,10 +22,10 @@

 ;!define OPENVPN_XGUI_DIR "../ovpnxml"

 # Prebuilt libraries.  DMALLOC is optional.

-!define OPENSSL_DIR	  "../openssl-0.9.8h"

+!define OPENSSL_DIR	  "../openssl-0.9.8i"

 !define LZO_DIR		  "../lzo-2.02"

 !define PKCS11_HELPER_DIR "../pkcs11-helper"

-!define DMALLOC_DIR	  "../dmalloc-5.4.2"

+;!define DMALLOC_DIR	  "../dmalloc-5.4.2"

 # Optional directory of prebuilt OpenVPN binary components,

 # to be used as a source when build-from-scratch prerequisites

@@ -33,7 +33,8 @@

 !define GENOUT_PREBUILT  "../gen-prebuilt"

 # tapinstall.exe source code.

-# Not needed if DRVBINSRC is defined.

+# Not needed if DRVBINSRC is defined

+# (or if using pre-built mode).

 !define TISRC	"../tapinstall"

 # TAP Adapter parameters.  Note that PRODUCT_TAP_ID is

@@ -44,7 +45,7 @@

 !define PRODUCT_TAP_MINOR_VER           4

 !define PRODUCT_TAP_RELDATE             "01/22/2008"

-; visible=0x81  hidden=0x89

+# TAP adapter icon -- visible=0x81 or hidden=0x89

 !define PRODUCT_TAP_CHARACTERISTICS     0x81

 # Build debugging version of TAP driver

@@ -1,5 +1,5 @@

 dnl define the OpenVPN version

-define(PRODUCT_VERSION,[2.1_rc12a])

+define(PRODUCT_VERSION,[2.1_rc13])

 dnl define the TAP version

 define(PRODUCT_TAP_ID,[tap0901])

 define(PRODUCT_TAP_WIN32_MIN_MAJOR,[9])