diff options
| -rw-r--r-- | ChangeLog | 73 | ||||
| -rw-r--r-- | INSTALL-win32.txt | 18 | ||||
| -rwxr-xr-x | install-win32/openvpn.nsi | 72 | ||||
| -rw-r--r-- | install-win32/settings.in | 12 | ||||
| -rw-r--r-- | version.m4 | 2 |
5 files changed, 138 insertions, 39 deletions
@@ -3,6 +3,79 @@ Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net> $Id$ +2008.01.23 -- Version 2.1_rc5 + +* Fixed Win2K TAP driver bug that was introduced by Vista fixes, + incremented driver version to 9.4. + +* Windows build system changes: + + Incremented included OpenSSL version to openssl-0.9.7m. + + Updated openssl.patch for openssl-0.9.7m and added some + brief usage comments to the head of the patch. + + Added build-pkcs11-helper.sh for building the pkcs11-helper + library. + + Integrated inclusion of pkcs11-helper into Windows build + system. + + Upgraded TAP build scripts to use WDK 6001.17121 + (Windows 2008 Server pre-RTM). + +* Windows installer changes: + + Clean up the start menu folder. + + Allow for a site-specific sample configuration file and keys + to be included in a custom installer (see SAMPCONF macros + in settings.in). + + New icon (temporary). + +* Added "forget-passwords" command to the management interface + (Alon Bar-Lev). + +* Added --management-signal option to signal SIGUSR1 when the + management interface disconnects (Alon Bar-Lev). + +* Modified command line and config file parser to allow + quoted strings using single quotes ('') (Alon Bar-Lev). + +* Use pkcs11-helper as external library, can be downloaded from + https://www.opensc-project.org/pkcs11-helper (Alon Bar-Lev). + +* Fixed interim memory growth issue in TCP connect loop where + "TCP: connect to %s failed, will try again in %d seconds: %s" + is output. + +* Fixed bug in epoll driver in event.c, where the lack of a + handler for EPOLLHUP could cause 99% CPU usage. + +* Defined ALLOW_NON_CBC_CIPHERS for people who don't + want to use a CBC cipher for OpenVPN's data channel. + +* Added PLUGIN_LIBDIR preprocessor string to prepend a default + plugin directory to the dlopen search list when the user + specifies the basename of the plugin only (Marius Tomaschewski). + +* Rewrote extract_x509_field and modified COMMON_NAME_CHAR_CLASS + to allow forward slash characters ("/") in the X509 common name + (Pavel Shramov). + +* Allow OpenVPN to run completely unprivileged under Linux + by allowing openvpn --mktun to be used with --user and --group + to set the UID/GID of the tun device node. Also added --iproute + option to allow an alternative command to be executed in place + of the default iproute2 command (Alon Bar-Lev). + +* Fixed --disable-iproute2 in ./configure to actually disable + iproute2 usage (Alon Bar-Lev). + +* Added --management-forget-disconnect option -- forget + passwords when management session disconnects (Alon Bar-Lev). + 2007.04.25 -- Version 2.1_rc4 * Worked out remaining issues with TAP driver signing diff --git a/INSTALL-win32.txt b/INSTALL-win32.txt index a5e27c4..cc79d72 100644 --- a/INSTALL-win32.txt +++ b/INSTALL-win32.txt @@ -1,17 +1,19 @@ -OpenVPN 2.1 Client Quickstart for Windows ------------------------------------------ +IMPORTANT NOTE FOR VISTA USERS + +Note that on Windows Vista, you will need to run the OpenVPN +GUI with administrator privileges, so that it can add routes +to the routing table that are pulled from the OpenVPN server. +You can do this by right-clicking on the OpenVPN GUI +desktop icon, and selecting "Run as administrator". + +GENERAL QUICKSTART FOR WINDOWS The OpenVPN Client requires a configuration file and key/certificate files. You should obtain these and save them to \Program Files\OpenVPN\config. To start OpenVPN, first run the OpenVPN GUI by double -clicking the desktop icon. Note that on Windows Vista, -you will probably need to run the OpenVPN GUI with -administrator privileges, so that it can add routes to -the routing table that are pulled from the OpenVPN server. -You can do this by right clicking on the OpenVPN GUI -desktop icon, and selecting "Run as administrator". +clicking on the desktop icon or start menu icon. The OpenVPN GUI is a system-tray applet, so an icon for the GUI will appear in the lower-right corner of the screen. diff --git a/install-win32/openvpn.nsi b/install-win32/openvpn.nsi index add382f..37fa0ca 100755 --- a/install-win32/openvpn.nsi +++ b/install-win32/openvpn.nsi @@ -189,6 +189,10 @@ Function .onInit Abort ok: +# Delete previous start menu + RMDir /r $SMPROGRAMS\${PRODUCT_NAME} + +# Check windows version Call GetWindowsVersion Pop $1 StrCmp $1 "2000" goodwinver @@ -392,10 +396,11 @@ Section "Add Shortcuts to Start Menu" SecAddShortcuts SetOverwrite on CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}" - WriteINIStr "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME} Windows Notes.url" "InternetShortcut" "URL" "http://openvpn.net/INSTALL-win32.html" - WriteINIStr "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME} Manual Page.url" "InternetShortcut" "URL" "http://openvpn.net/man.html" - WriteINIStr "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME} HOWTO.url" "InternetShortcut" "URL" "http://openvpn.net/howto.html" - WriteINIStr "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME} Web Site.url" "InternetShortcut" "URL" "http://openvpn.net/" + CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}\Documentation" + WriteINIStr "$SMPROGRAMS\${PRODUCT_NAME}\Documentation\${PRODUCT_NAME} Windows Notes.url" "InternetShortcut" "URL" "http://openvpn.net/INSTALL-win32.html" + WriteINIStr "$SMPROGRAMS\${PRODUCT_NAME}\Documentation\${PRODUCT_NAME} Manual Page.url" "InternetShortcut" "URL" "http://openvpn.net/man.html" + WriteINIStr "$SMPROGRAMS\${PRODUCT_NAME}\Documentation\${PRODUCT_NAME} HOWTO.url" "InternetShortcut" "URL" "http://openvpn.net/howto.html" + WriteINIStr "$SMPROGRAMS\${PRODUCT_NAME}\Documentation\${PRODUCT_NAME} Web Site.url" "InternetShortcut" "URL" "http://openvpn.net/" CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall ${PRODUCT_NAME}.lnk" "$INSTDIR\Uninstall.exe" SectionEnd @@ -497,19 +502,19 @@ Section -post File "${HOME}\images\${PRODUCT_ICON}" ; store sample config files -!ifdef SAMPCONF_DIR - SetOverwrite on - SetOutPath "$INSTDIR\config" -!ifdef SAMPCONF_CONF - File "${HOME}\..\${SAMPCONF_DIR}\${SAMPCONF_CONF}" -!endif -!ifdef SAMPCONF_P12 - File "${HOME}\..\${SAMPCONF_DIR}\${SAMPCONF_P12}" -!endif -!ifdef SAMPCONF_TA - File "${HOME}\..\${SAMPCONF_DIR}\${SAMPCONF_TA}" -!endif -!endif + !ifdef SAMPCONF_DIR + SetOverwrite on + SetOutPath "$INSTDIR\config" + !ifdef SAMPCONF_CONF + File "${HOME}\..\${SAMPCONF_DIR}\${SAMPCONF_CONF}" + !endif + !ifdef SAMPCONF_P12 + File "${HOME}\..\${SAMPCONF_DIR}\${SAMPCONF_P12}" + !endif + !ifdef SAMPCONF_TA + File "${HOME}\..\${SAMPCONF_DIR}\${SAMPCONF_TA}" + !endif + !endif ; Create file association if requested SectionGetFlags ${SecFileAssociation} $R0 @@ -523,8 +528,12 @@ Section -post WriteRegStr HKCR "${PRODUCT_NAME}File\shell\run" "" "Start ${PRODUCT_NAME} on this config file" WriteRegStr HKCR "${PRODUCT_NAME}File\shell\run\command" "" '"$INSTDIR\bin\${PRODUCT_UNIX_NAME}.exe" --pause-exit --config "%1"' - ; Create start menu and desktop shortcuts to OpenVPN GUI + ; Create start menu folders noass: + CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}\Utilities" + CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}\Shortcuts" + + ; Create start menu and desktop shortcuts to OpenVPN GUI !ifdef OPENVPN_GUI_DEFINED IfFileExists "$INSTDIR\bin\${OPENVPN_GUI}" "" tryaddtap CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME} GUI.lnk" "$INSTDIR\bin\${OPENVPN_GUI}" "" @@ -534,29 +543,29 @@ Section -post ; Create start menu shortcuts to addtap.bat and deltapall.bat tryaddtap: IfFileExists "$INSTDIR\bin\addtap.bat" "" trydeltap - CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Add a new TAP-Win32 virtual ethernet adapter.lnk" "$INSTDIR\bin\addtap.bat" "" + CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Utilities\Add a new TAP-Win32 virtual ethernet adapter.lnk" "$INSTDIR\bin\addtap.bat" "" trydeltap: IfFileExists "$INSTDIR\bin\deltapall.bat" "" config_shortcut - CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Delete ALL TAP-Win32 virtual ethernet adapters.lnk" "$INSTDIR\bin\deltapall.bat" "" + CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Utilities\Delete ALL TAP-Win32 virtual ethernet adapters.lnk" "$INSTDIR\bin\deltapall.bat" "" ; Create start menu shortcuts for config and log directories config_shortcut: IfFileExists "$INSTDIR\config" "" log_shortcut - CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME} configuration file directory.lnk" "$INSTDIR\config" "" + CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Shortcuts\${PRODUCT_NAME} configuration file directory.lnk" "$INSTDIR\config" "" log_shortcut: IfFileExists "$INSTDIR\log" "" samp_shortcut - CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME} log file directory.lnk" "$INSTDIR\log" "" + CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Shortcuts\${PRODUCT_NAME} log file directory.lnk" "$INSTDIR\log" "" samp_shortcut: IfFileExists "$INSTDIR\sample-config" "" genkey_shortcut - CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME} Sample Configuration Files.lnk" "$INSTDIR\sample-config" "" + CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Shortcuts\${PRODUCT_NAME} Sample Configuration Files.lnk" "$INSTDIR\sample-config" "" genkey_shortcut: IfFileExists "$INSTDIR\bin\${PRODUCT_UNIX_NAME}.exe" "" noshortcuts IfFileExists "$INSTDIR\config" "" noshortcuts - CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Generate a static ${PRODUCT_NAME} key.lnk" "$INSTDIR\bin\${PRODUCT_UNIX_NAME}.exe" '--pause-exit --verb 3 --genkey --secret "$INSTDIR\config\key.txt"' "$INSTDIR\${PRODUCT_ICON}" 0 + CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Utilities\Generate a static ${PRODUCT_NAME} key.lnk" "$INSTDIR\bin\${PRODUCT_UNIX_NAME}.exe" '--pause-exit --verb 3 --genkey --secret "$INSTDIR\config\key.txt"' "$INSTDIR\${PRODUCT_ICON}" 0 noshortcuts: ; Create uninstaller @@ -626,6 +635,19 @@ Section "Uninstall" RMDir /r $SMPROGRAMS\${PRODUCT_NAME} + ; delete sample config files + !ifdef SAMPCONF_DIR + !ifdef SAMPCONF_CONF + Delete "$INSTDIR\config\${SAMPCONF_CONF}" + !endif + !ifdef SAMPCONF_P12 + Delete "$INSTDIR\config\${SAMPCONF_P12}" + !endif + !ifdef SAMPCONF_TA + Delete "$INSTDIR\config\${SAMPCONF_TA}" + !endif + !endif + !ifdef OPENVPN_GUI_DEFINED Delete "$INSTDIR\bin\${OPENVPN_GUI}" Delete "$DESKTOP\${PRODUCT_NAME} GUI.lnk" @@ -674,9 +696,11 @@ Section "Uninstall" Delete "$INSTDIR\sample-config\*.${PRODUCT_FILE_EXT}" RMDir "$INSTDIR\bin" + RMDir "$INSTDIR\config" RMDir "$INSTDIR\driver" RMDir "$INSTDIR\easy-rsa" RMDir "$INSTDIR\sample-config" + RMDir /r "$INSTDIR\log" RMDir "$INSTDIR" !insertmacro DelRegKeyIfUnchanged HKCR ".${SERV_CONFIG_EXT}" "${PRODUCT_NAME}File" diff --git a/install-win32/settings.in b/install-win32/settings.in index a2c138d..5be27a4 100644 --- a/install-win32/settings.in +++ b/install-win32/settings.in @@ -75,13 +75,13 @@ !define MAKE_CLEAN "yes" ; DEBUGGING -- set to something like "-DBG2" -!define OUTFILE_LABEL "-T4" +!define OUTFILE_LABEL "" ; DEBUGGING -- set to something like "DEBUG2" -!define TITLE_LABEL "TEST4" +!define TITLE_LABEL "" # include a sample configuration file and key -!define SAMPCONF_DIR "test-key" -!define SAMPCONF_CONF "test.ovpn" -!define SAMPCONF_P12 "test.p12" -!define SAMPCONF_TA "ta.key" +;!define SAMPCONF_DIR "test-key" +;!define SAMPCONF_CONF "test.ovpn" +;!define SAMPCONF_P12 "test.p12" +;!define SAMPCONF_TA "ta.key" @@ -1,2 +1,2 @@ dnl define the OpenVPN version -define(PRODUCT_VERSION,[2.1_rc4a]) +define(PRODUCT_VERSION,[2.1_rc5]) |