* new version 2.20.1

   * Ignore message from smtp server after a successful authentication
     challenge.

   * Alpine would not set include and lib paths for OpenSSL if this was
     installed in /usr/local/ssl.

   * If the .pinerc file is a symbolic link, Alpine might not write its
     contents when saving its configuration.

   * The _INIT_ token does not skip over non-alpha numeric characters in
     the name. Reported by Andreas Fehr.

   * If SSLDIR is defined somehow, do not disable S/MIME if the
     SSLCERTSDIR is not found.

   * Mismatch in size of UCS and CELL caused a corruption in the
     content of a pointer, which made the speller in PC-Alpine get
     the content of a word incorrectly.

   * Update splash screen to version 2.20 in main repository.

   * Skip testing openssl compatibility version when cross-compilation is
     detected. Fix contributed by Antti Seppälä.

1 files changed, 109 insertions, 99 deletions

diff --git a/configure b/configure
index 6b97f9ee..47e55a6a 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Rev:14 by chappa@washington.edu.
+# From configure.ac Rev:16 by chappa@washington.edu.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for alpine 2.19.9999.
+# Generated by GNU Autoconf 2.69 for alpine 2.20.1.
 #
 # Report bugs to <chappa@washington.edu>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='alpine'
 PACKAGE_TARNAME='alpine'
-PACKAGE_VERSION='2.19.9999'
-PACKAGE_STRING='alpine 2.19.9999'
+PACKAGE_VERSION='2.20.1'
+PACKAGE_STRING='alpine 2.20.1'
 PACKAGE_BUGREPORT='chappa@washington.edu'
 PACKAGE_URL=''
 
@@ -1466,7 +1466,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.19.9999 to adapt to many kinds of systems.
+\`configure' configures alpine 2.20.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1536,7 +1536,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of alpine 2.19.9999:";;
+     short | recursive ) echo "Configuration of alpine 2.20.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1830,7 +1830,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-alpine configure 2.19.9999
+alpine configure 2.20.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2436,7 +2436,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.19.9999, which was
+It was created by alpine $as_me 2.20.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3305,7 +3305,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='alpine'
- VERSION='2.19.9999'
+ VERSION='2.20.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16760,6 +16760,9 @@ if test "${with_ssl_lib_dir+set}" = set; then :
 
 fi
 
+fi
+
+if test "x$alpine_SSLTYPE" != "xnone" ; then
     if test -n "$alpine_SSLINCLUDE" ; then
     CPPFLAGS="-I$alpine_SSLINCLUDE $CPPFLAGS"
   elif test -n "$alpine_SSLDIR" ; then
@@ -16773,6 +16776,7 @@ fi
 fi
 
 
+
 # Check whether --with-krb5 was given.
 if test "${with_krb5+set}" = set; then :
   withval=$with_krb5;  with_krb5=$withval
@@ -17636,9 +17640,48 @@ if test "x$alpine_DL" = "xnone" ; then
 fi
 
 if test "x$alpine_SSLTYPE" != "xnone" ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSLeay" >&5
-$as_echo_n "checking for library containing SSLeay... " >&6; }
-if ${ac_cv_search_SSLeay+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Openssl library version >= 1.0.0c" >&5
+$as_echo_n "checking Openssl library version >= 1.0.0c... " >&6; }
+  if test "$cross_compiling" = yes; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5
+$as_echo "$as_me: WARNING: cross compiling: not checking" >&2;}
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+#include <stdlib.h>
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif /* HAVE_STDINT_H */
+#include <openssl/ssl.h>
+int main(void) {
+
+	if (OPENSSL_VERSION_NUMBER >= 0x1000003f)
+		exit(0);
+
+	exit(2);
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+   alpine_SSLTYPE="none"
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+    if test "x$alpine_SSLTYPE" = "xnone" ; then
+	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
@@ -17651,16 +17694,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char SSLeay ();
+char TLSv1_2_client_method ();
 int
 main ()
 {
-return SSLeay ();
+return TLSv1_2_client_method ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' crypto; do
+for ac_lib in '' ssl; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
@@ -17668,42 +17711,40 @@ for ac_lib in '' crypto; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
   if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_SSLeay=$ac_res
+  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_SSLeay+:} false; then :
+  if ${ac_cv_search_TLSv1_2_client_method+:} false; then :
   break
 fi
 done
-if ${ac_cv_search_SSLeay+:} false; then :
+if ${ac_cv_search_TLSv1_2_client_method+:} false; then :
 
 else
-  ac_cv_search_SSLeay=no
+  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_SSLeay" >&5
-$as_echo "$ac_cv_search_SSLeay" >&6; }
-ac_res=$ac_cv_search_SSLeay
+{ $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
+
 
-else
-   alpine_CRYPTO="none"
 fi
 
-  if test "x$alpine_CRYPTO" = "xnone" ; then
-     as_fn_error $? "crypto library NOT found" "$LINENO" 5
-     exit 1
-  fi
 fi
 
 if test "x$alpine_SSLTYPE" != "xnone" ; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSL_library_init" >&5
-$as_echo_n "checking for library containing SSL_library_init... " >&6; }
-if ${ac_cv_search_SSL_library_init+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSLeay" >&5
+$as_echo_n "checking for library containing SSLeay... " >&6; }
+if ${ac_cv_search_SSLeay+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -17716,16 +17757,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char SSL_library_init ();
+char SSLeay ();
 int
 main ()
 {
-return SSL_library_init ();
+return SSLeay ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' ssl; do
+for ac_lib in '' crypto; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
@@ -17733,79 +17774,42 @@ for ac_lib in '' ssl; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
   if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_SSL_library_init=$ac_res
+  ac_cv_search_SSLeay=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if ${ac_cv_search_SSL_library_init+:} false; then :
+  if ${ac_cv_search_SSLeay+:} false; then :
   break
 fi
 done
-if ${ac_cv_search_SSL_library_init+:} false; then :
+if ${ac_cv_search_SSLeay+:} false; then :
 
 else
-  ac_cv_search_SSL_library_init=no
+  ac_cv_search_SSLeay=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSL_library_init" >&5
-$as_echo "$ac_cv_search_SSL_library_init" >&6; }
-ac_res=$ac_cv_search_SSL_library_init
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSLeay" >&5
+$as_echo "$ac_cv_search_SSLeay" >&6; }
+ac_res=$ac_cv_search_SSLeay
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 else
-   alpine_SSLTYPE="none"
+   alpine_CRYPTO="none"
 fi
 
-
-  if test "x$alpine_SSLTYPE" = "xnone" ; then
-     as_fn_error $? "No library containing SSL_library_init found in your path" "$LINENO" 5
+  if test "x$alpine_CRYPTO" = "xnone" ; then
+     as_fn_error $? "crypto library NOT found" "$LINENO" 5
      exit 1
   fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Openssl library version >= 1.0.1c" >&5
-$as_echo_n "checking Openssl library version >= 1.0.1c... " >&6; }
-  if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <openssl/ssl.h>
-int main(void) {
-
-	if (OPENSSL_VERSION_NUMBER >= 0x1000003f)
-		exit(0);
-
-	exit(2);
-}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-   alpine_SSLTYPE="none"
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
-    if test "x$alpine_SSLTYPE" = "xnone" ; then
-	as_fn_error $? "Install openssl version >= 1.0.1c" "$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 :
+if test "x$alpine_SSLTYPE" != "xnone" ; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSL_library_init" >&5
+$as_echo_n "checking for library containing SSL_library_init... " >&6; }
+if ${ac_cv_search_SSL_library_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -17818,11 +17822,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char TLSv1_2_client_method ();
+char SSL_library_init ();
 int
 main ()
 {
-return TLSv1_2_client_method ();
+return SSL_library_init ();
   ;
   return 0;
 }
@@ -17835,33 +17839,37 @@ for ac_lib in '' ssl; do
     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
+  ac_cv_search_SSL_library_init=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if ${ac_cv_search_TLSv1_2_client_method+:} false; then :
+  if ${ac_cv_search_SSL_library_init+:} false; then :
   break
 fi
 done
-if ${ac_cv_search_TLSv1_2_client_method+:} false; then :
+if ${ac_cv_search_SSL_library_init+:} false; then :
 
 else
-  ac_cv_search_TLSv1_2_client_method=no
+  ac_cv_search_SSL_library_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_TLSv1_2_client_method" >&5
-$as_echo "$ac_cv_search_TLSv1_2_client_method" >&6; }
-ac_res=$ac_cv_search_TLSv1_2_client_method
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSL_library_init" >&5
+$as_echo "$ac_cv_search_SSL_library_init" >&6; }
+ac_res=$ac_cv_search_SSL_library_init
 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
+else
+   alpine_SSLTYPE="none"
+fi
 
 
-fi
+  if test "x$alpine_SSLTYPE" = "xnone" ; then
+     as_fn_error $? "No library containing SSL_library_init found in your path" "$LINENO" 5
+     exit 1
+  fi
 
 fi
 
@@ -20608,6 +20616,8 @@ else
     certdir="${alpine_SSLDIR}/ssl/certs"
   elif test -n "$alpine_SSLCERTS_ORIG" -a -d "$alpine_SSLCERTS_ORIG" ; then
     certdir="$alpine_SSLCERTS_ORIG"
+  elif test -n "$alpine_SSLCERTS" ; then
+    certdir="$alpine_SSLCERTS"
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: SSL Problem: certificate directory not found" >&5
 $as_echo "$as_me: SSL Problem: certificate directory not found" >&6;}
@@ -21287,7 +21297,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.19.9999, which was
+This file was extended by alpine $as_me 2.20.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21353,7 +21363,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.19.9999
+alpine config.status 2.20.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"