diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2014-12-01 19:05:39 +0100 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2014-12-01 19:05:39 +0100 |
| commit | d73c83783ddef1071cf4de845b8594b116aa51ba (patch) | |
| tree | e10d5202970a8f8714204dc46415c4c1012be220 /main/openvpn | |
| parent | 97f7e247c61994ca22f7bc70980ec0b063d59e1c (diff) | |
Update icsopenvpn version, update translation, sync with released OpenVPN master
--HG--
extra : rebase_source : 68991da2166a00a17978934f9e20eea4b34a3425
Diffstat (limited to 'main/openvpn')
| -rw-r--r-- | main/openvpn/config-version.h | 2 | ||||
| -rw-r--r-- | main/openvpn/configure.ac | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/main/openvpn/config-version.h b/main/openvpn/config-version.h index 1b41a56b..d5ea5dff 100644 --- a/main/openvpn/config-version.h +++ b/main/openvpn/config-version.h @@ -1,2 +1,2 @@ -#define CONFIGURE_GIT_REVISION "icsopenvpn_623-7119a45a4cbb1778" +#define CONFIGURE_GIT_REVISION "icsopenvpn_623-ac8bac5aff772eaa" #define CONFIGURE_GIT_FLAGS "" diff --git a/main/openvpn/configure.ac b/main/openvpn/configure.ac index 608ab6d1..ddaa2b2e 100644 --- a/main/openvpn/configure.ac +++ b/main/openvpn/configure.ac @@ -73,7 +73,7 @@ AC_ARG_ENABLE( AC_ARG_ENABLE( [ofb-cfb], - [AS_HELP_STRING([--enable-ofb-cfb], [enable support for OFB and CFB cipher modes @<:@default=yes@:>@])], + [AS_HELP_STRING([--disable-ofb-cfb], [disable support for OFB and CFB cipher modes @<:@default=yes@:>@])], , [enable_crypto_ofb_cfb="yes"] ) @@ -157,14 +157,14 @@ AC_ARG_ENABLE( AC_ARG_ENABLE( [small], - [AS_HELP_STRING([--enable-small], [enable smaller executable size (disable OCC, usage message, and verb 4 parm list) @<:@default=yes@:>@])], + [AS_HELP_STRING([--enable-small], [enable smaller executable size (disable OCC, usage message, and verb 4 parm list) @<:@default=no@:>@])], , [enable_small="no"] ) AC_ARG_ENABLE( [password-save], - [AS_HELP_STRING([--enable-password-save], [allow --askpass and --auth-user-pass passwords to be read from a file @<:@default=yes@:>@])], + [AS_HELP_STRING([--enable-password-save], [allow --askpass and --auth-user-pass passwords to be read from a file @<:@default=no@:>@])], , [enable_password_save="no"] ) |