Merge tag 'upstream/2.3.10'

Upstream version 2.3.10

1 files changed, 14 insertions, 28 deletions

diff --git a/configure b/configure
index 881769d..d7495cf 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for OpenVPN 2.3.8.
+# Generated by GNU Autoconf 2.69 for OpenVPN 2.3.10.
 #
 # Report bugs to <openvpn-users@lists.sourceforge.net>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='OpenVPN'
 PACKAGE_TARNAME='openvpn'
-PACKAGE_VERSION='2.3.8'
-PACKAGE_STRING='OpenVPN 2.3.8'
+PACKAGE_VERSION='2.3.10'
+PACKAGE_STRING='OpenVPN 2.3.10'
 PACKAGE_BUGREPORT='openvpn-users@lists.sourceforge.net'
 PACKAGE_URL=''
 
@@ -827,7 +827,6 @@ enable_multihome
 enable_port_share
 enable_debug
 enable_small
-enable_password_save
 enable_iproute2
 enable_def_auth
 enable_pf
@@ -1427,7 +1426,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures OpenVPN 2.3.8 to adapt to many kinds of systems.
+\`configure' configures OpenVPN 2.3.10 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1497,7 +1496,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenVPN 2.3.8:";;
+     short | recursive ) echo "Configuration of OpenVPN 2.3.10:";;
    esac
   cat <<\_ACEOF
 
@@ -1542,8 +1541,6 @@ Optional Features:
                           7+ messages) [default=yes]
   --enable-small          enable smaller executable size (disable OCC, usage
                           message, and verb 4 parm list) [default=no]
-  --enable-password-save  allow --askpass and --auth-user-pass passwords to be
-                          read from a file [default=no]
   --enable-iproute2       enable support for iproute2 [default=no]
   --disable-def-auth      disable deferred authentication [default=yes]
   --disable-pf            disable internal packet filter [default=yes]
@@ -1701,7 +1698,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenVPN configure 2.3.8
+OpenVPN configure 2.3.10
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2483,7 +2480,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by OpenVPN $as_me 2.3.8, which was
+It was created by OpenVPN $as_me 2.3.10, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2847,7 +2844,7 @@ if test -z "${htmldir}"; then
 fi
 
 
-$as_echo "#define OPENVPN_VERSION_RESOURCE 2,3,8,0" >>confdefs.h
+$as_echo "#define OPENVPN_VERSION_RESOURCE 2,3,10,0" >>confdefs.h
 
 
 ac_aux_dir=
@@ -3371,7 +3368,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='openvpn'
- VERSION='2.3.8'
+ VERSION='2.3.10'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5194,15 +5191,6 @@ else
 fi
 
 
-# Check whether --enable-password-save was given.
-if test "${enable_password_save+set}" = set; then :
-  enableval=$enable_password_save;
-else
-  enable_password_save="no"
-
-fi
-
-
 # Check whether --enable-iproute2 was given.
 if test "${enable_iproute2+set}" = set; then :
   enableval=$enable_iproute2;
@@ -14399,6 +14387,7 @@ for ac_header in  \
 	netinet/in.h netinet/in_systm.h \
 	netinet/tcp.h arpa/inet.h netdb.h \
 	windows.h winsock2.h ws2tcpip.h \
+	versionhelpers.h \
 
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -16185,7 +16174,7 @@ int
 main ()
 {
 
-#if POLARSSL_VERSION_NUMBER < 0x01020A00 || POLARSSL_VERSION_NUMBER >= 0x01030000
+#if POLARSSL_VERSION_NUMBER < 0x01030800 || POLARSSL_VERSION_NUMBER >= 0x01040000
 #error invalid version
 #endif
 
@@ -16198,7 +16187,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
 else
-  as_fn_error $? "PolarSSL 1.2.x required and must be 1.2.10 or later" "$LINENO" 5
+  as_fn_error $? "PolarSSL 1.3.x required and must be 1.3.8 or later" "$LINENO" 5
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -16786,9 +16775,6 @@ $as_echo "#define ENABLE_PF 1" >>confdefs.h
 test "${enable_strict_options}" = "yes" &&
 $as_echo "#define ENABLE_STRICT_OPTIONS_CHECK 1" >>confdefs.h
 
-test "${enable_password_save}" = "yes" &&
-$as_echo "#define ENABLE_PASSWORD_SAVE 1" >>confdefs.h
-
 
 case "${with_crypto_library}" in
 	openssl)
@@ -17630,7 +17616,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by OpenVPN $as_me 2.3.8, which was
+This file was extended by OpenVPN $as_me 2.3.10, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17696,7 +17682,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-OpenVPN config.status 2.3.8
+OpenVPN config.status 2.3.10
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"