* new version 2.11.8

  * Fix in configure script for recognition of SSL files in Ubuntu 12.04
  * Alpine does not attempt to automatically reopen a collection that
    was not opened due to cancellation by the user. Instead, the user
    must try to open it explicitly.
  * few improvements on new /tls1, /tls1_1, etc. options.

1 files changed, 72 insertions, 12 deletions

diff --git a/configure b/configure
index 3f9d5929..8a27618f 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Rev:4 by chappa@washington.edu.
+# From configure.ac Rev:5 by chappa@washington.edu.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for alpine 2.11.6.
+# Generated by GNU Autoconf 2.69 for alpine 2.11.8.
 #
 # Report bugs to <chappa@washington.edu>.
 #
@@ -730,8 +730,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='alpine'
 PACKAGE_TARNAME='alpine'
-PACKAGE_VERSION='2.11.6'
-PACKAGE_STRING='alpine 2.11.6'
+PACKAGE_VERSION='2.11.8'
+PACKAGE_STRING='alpine 2.11.8'
 PACKAGE_BUGREPORT='chappa@washington.edu'
 PACKAGE_URL=''
 
@@ -1594,7 +1594,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 alpine 2.11.6 to adapt to many kinds of systems.
+\`configure' configures alpine 2.11.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1664,7 +1664,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of alpine 2.11.6:";;
+     short | recursive ) echo "Configuration of alpine 2.11.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1948,7 +1948,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-alpine configure 2.11.6
+alpine configure 2.11.8
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2554,7 +2554,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 alpine $as_me 2.11.6, which was
+It was created by alpine $as_me 2.11.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3375,7 +3375,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='alpine'
- VERSION='2.11.6'
+ VERSION='2.11.8'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15569,7 +15569,7 @@ else
 	alpine_SSLINCLUDE="/usr/include/openssl"
 	alpine_SSLLIB="/usr/lib"
       elif test -f /etc/debian_release -o -f /etc/debian_version ; then
-        if test !-d /etc/osso-af-init ; then
+        if test ! -d /etc/osso-af-init ; then
 	   alpine_SSLDIR="/etc/ssl"
 	   alpine_SSLCERTS="$alpine_SSLDIR/certs"
 	   alpine_SSLKEYS="$alpine_SSLDIR/private"
@@ -16749,6 +16749,66 @@ fi
 	as_fn_error $? "Install openssl version >= 1.0.0c" "$LINENO" 5
 	exit 1
     fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing TLSv1_2_client_method" >&5
+$as_echo_n "checking for library containing TLSv1_2_client_method... " >&6; }
+if ${ac_cv_search_TLSv1_2_client_method+:} 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 TLSv1_2_client_method ();
+int
+main ()
+{
+return TLSv1_2_client_method ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' ssl; 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_TLSv1_2_client_method=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_TLSv1_2_client_method+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_TLSv1_2_client_method+:} false; then :
+
+else
+  ac_cv_search_TLSv1_2_client_method=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_TLSv1_2_client_method" >&5
+$as_echo "$ac_cv_search_TLSv1_2_client_method" >&6; }
+ac_res=$ac_cv_search_TLSv1_2_client_method
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+   alpine_c_client_cflags="$alpine_c_client_cflags -DTLSV1_2"
+
+$as_echo "#define SSL_SUPPORTS_TLSV1_2 1" >>confdefs.h
+
+
+fi
+
 fi
 
 if test "$alpine_with_ldap" = "yes" ; then
@@ -20161,7 +20221,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 alpine $as_me 2.11.6, which was
+This file was extended by alpine $as_me 2.11.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20227,7 +20287,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="\\
-alpine config.status 2.11.6
+alpine config.status 2.11.8
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"