Merge tag 'upstream/2.3.7'

Upstream version 2.3.7

1 files changed, 278 insertions, 30 deletions

diff --git a/configure b/configure
index cc8e3d2..1156c4b 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.5.
+# Generated by GNU Autoconf 2.69 for OpenVPN 2.3.7.
 #
 # 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.5'
-PACKAGE_STRING='OpenVPN 2.3.5'
+PACKAGE_VERSION='2.3.7'
+PACKAGE_STRING='OpenVPN 2.3.7'
 PACKAGE_BUGREPORT='openvpn-users@lists.sourceforge.net'
 PACKAGE_URL=''
 
@@ -660,6 +660,8 @@ OPTIONAL_DL_LIBS
 TAP_WIN_MIN_MINOR
 TAP_WIN_MIN_MAJOR
 TAP_WIN_COMPONENT_ID
+P11KIT_LIBS
+P11KIT_CFLAGS
 libsystemd_LIBS
 libsystemd_CFLAGS
 LZO_LIBS
@@ -882,7 +884,9 @@ POLARSSL_LIBS
 LZO_CFLAGS
 LZO_LIBS
 libsystemd_CFLAGS
-libsystemd_LIBS'
+libsystemd_LIBS
+P11KIT_CFLAGS
+P11KIT_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1423,7 +1427,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.5 to adapt to many kinds of systems.
+\`configure' configures OpenVPN 2.3.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1493,7 +1497,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenVPN 2.3.5:";;
+     short | recursive ) echo "Configuration of OpenVPN 2.3.7:";;
    esac
   cat <<\_ACEOF
 
@@ -1512,7 +1516,7 @@ Optional Features:
                           allow limited interoperability with LZO-enabled
                           peers [default=no]
   --disable-crypto        disable crypto support [default=yes]
-  --enable-ofb-cfb        enable support for OFB and CFB cipher modes
+  --disable-ofb-cfb       disable support for OFB and CFB cipher modes
                           [default=yes]
   --disable-ssl           disable SSL support for TLS-based key exchange
                           [default=yes]
@@ -1537,9 +1541,9 @@ Optional Features:
   --disable-debug         disable debugging support (disable gremlin and verb
                           7+ messages) [default=yes]
   --enable-small          enable smaller executable size (disable OCC, usage
-                          message, and verb 4 parm list) [default=yes]
+                          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=yes]
+                          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]
@@ -1627,6 +1631,9 @@ Some influential environment variables:
               C compiler flags for libsystemd, overriding pkg-config
   libsystemd_LIBS
               linker flags for libsystemd, overriding pkg-config
+  P11KIT_CFLAGS
+              C compiler flags for P11KIT, overriding pkg-config
+  P11KIT_LIBS linker flags for P11KIT, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1694,7 +1701,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenVPN configure 2.3.5
+OpenVPN configure 2.3.7
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2476,7 +2483,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.5, which was
+It was created by OpenVPN $as_me 2.3.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2840,7 +2847,7 @@ if test -z "${htmldir}"; then
 fi
 
 
-$as_echo "#define OPENVPN_VERSION_RESOURCE 2,3,5,0" >>confdefs.h
+$as_echo "#define OPENVPN_VERSION_RESOURCE 2,3,7,0" >>confdefs.h
 
 
 ac_aux_dir=
@@ -2876,6 +2883,8 @@ ac_config_headers="$ac_config_headers config.h"
 
 
 
+
+
 am__api_version='1.14'
 
 # Find a good install program.  We prefer a C program (faster),
@@ -3048,8 +3057,8 @@ test "$program_suffix" != NONE &&
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 if test x"${MISSING+set}" != xset; then
   case $am_aux_dir in
@@ -3362,7 +3371,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='openvpn'
- VERSION='2.3.5'
+ VERSION='2.3.7'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3454,7 +3463,7 @@ END
     as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
   fi
 fi
-# Make sure we can run config.sub.
+ # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
   as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
@@ -14460,7 +14469,7 @@ SOCKET_INCLUDES="
 #endif
 "
 
-for ac_header in net/if.h netinet/ip.h netinet/if_ether.h resolv.h sys/un.h net/if_utun.h sys/kern_control.h
+for ac_header in net/if.h netinet/ip.h resolv.h sys/un.h net/if_utun.h sys/kern_control.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "${SOCKET_INCLUDES}
@@ -15098,17 +15107,6 @@ _ACEOF
 fi
 done
 
-for ac_func in res_init
-do :
-  ac_fn_c_check_func "$LINENO" "res_init" "ac_cv_func_res_init"
-if test "x$ac_cv_func_res_init" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_RES_INIT 1
-_ACEOF
-
-fi
-done
-
 # Windows use stdcall for winsock so we cannot auto detect these
 
 
@@ -15209,6 +15207,178 @@ done
 fi
 LIBS="${old_LIBS}"
 
+# we assume res_init() always exist, but need to find out *where*...
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing __res_init" >&5
+$as_echo_n "checking for library containing __res_init... " >&6; }
+if ${ac_cv_search___res_init+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __res_init ();
+int
+main ()
+{
+return __res_init ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' resolv bind; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search___res_init=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search___res_init+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search___res_init+:} false; then :
+
+else
+  ac_cv_search___res_init=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search___res_init" >&5
+$as_echo "$ac_cv_search___res_init" >&6; }
+ac_res=$ac_cv_search___res_init
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing res_9_init" >&5
+$as_echo_n "checking for library containing res_9_init... " >&6; }
+if ${ac_cv_search_res_9_init+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char res_9_init ();
+int
+main ()
+{
+return res_9_init ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' resolv bind; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_res_9_init=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_res_9_init+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_res_9_init+:} false; then :
+
+else
+  ac_cv_search_res_9_init=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_res_9_init" >&5
+$as_echo "$ac_cv_search_res_9_init" >&6; }
+ac_res=$ac_cv_search_res_9_init
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing res_init" >&5
+$as_echo_n "checking for library containing res_init... " >&6; }
+if ${ac_cv_search_res_init+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char res_init ();
+int
+main ()
+{
+return res_init ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' resolv bind; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_res_init=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_res_init+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_res_init+:} false; then :
+
+else
+  ac_cv_search_res_init=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_res_init" >&5
+$as_echo "$ac_cv_search_res_init" >&6; }
+ac_res=$ac_cv_search_res_init
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+fi
+
+fi
+
+
 
 old_CFLAGS="${CFLAGS}"
 CFLAGS="${CFLAGS} ${TAP_CFLAGS}"
@@ -16730,6 +16900,84 @@ if test "${enable_pkcs11}" = "yes"; then
 
 $as_echo "#define ENABLE_PKCS11 1" >>confdefs.h
 
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for P11KIT" >&5
+$as_echo_n "checking for P11KIT... " >&6; }
+
+if test -n "$P11KIT_CFLAGS"; then
+    pkg_cv_P11KIT_CFLAGS="$P11KIT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"p11-kit-1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "p11-kit-1") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_P11KIT_CFLAGS=`$PKG_CONFIG --cflags "p11-kit-1" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$P11KIT_LIBS"; then
+    pkg_cv_P11KIT_LIBS="$P11KIT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"p11-kit-1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "p11-kit-1") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_P11KIT_LIBS=`$PKG_CONFIG --libs "p11-kit-1" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        P11KIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "p11-kit-1" 2>&1`
+        else
+	        P11KIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "p11-kit-1" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$P11KIT_PKG_ERRORS" >&5
+
+
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+
+else
+	P11KIT_CFLAGS=$pkg_cv_P11KIT_CFLAGS
+	P11KIT_LIBS=$pkg_cv_P11KIT_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	proxy_module="`$PKG_CONFIG --variable=proxy_module p11-kit-1`"
+
+cat >>confdefs.h <<_ACEOF
+#define DEFAULT_PKCS11_MODULE "${proxy_module}"
+_ACEOF
+
+fi
 fi
 
 if test "${enable_pedantic}" = "yes"; then
@@ -17388,7 +17636,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.5, which was
+This file was extended by OpenVPN $as_me 2.3.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17454,7 +17702,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.5
+OpenVPN config.status 2.3.7
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"