* new version 2.20.2

   * Further enhancement to the configure script in finding the location
     of the SSL include and library files, when they are installed in th e
     default location by openssl.

   * When Alpine sends an attachment, it will set the boundary attribute
     in lower case, as some SMTP servers, such as those of libero.it
     reject messages if the boundary attribute is in uppercase.

   * Alpine fails to remove temporary files used during a display or sending
     filter. Fix contributed by Phil Brooke.

   * SMIME: Crash when checking the signature of a message that contains
     a RFC822 attached message. Reported by Holger Trapp and Bjorn Krellner.

1 files changed, 34 insertions, 28 deletions

diff --git a/configure b/configure
index 47e55a6a..03ab0074 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Rev:16 by chappa@washington.edu.
+# From configure.ac Rev:17 by chappa@washington.edu.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for alpine 2.20.1.
+# Generated by GNU Autoconf 2.69 for alpine 2.20.3.
 #
 # Report bugs to <chappa@washington.edu>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='alpine'
 PACKAGE_TARNAME='alpine'
-PACKAGE_VERSION='2.20.1'
-PACKAGE_STRING='alpine 2.20.1'
+PACKAGE_VERSION='2.20.3'
+PACKAGE_STRING='alpine 2.20.3'
 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.20.1 to adapt to many kinds of systems.
+\`configure' configures alpine 2.20.3 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.20.1:";;
+     short | recursive ) echo "Configuration of alpine 2.20.3:";;
    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.20.1
+alpine configure 2.20.3
 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.20.1, which was
+It was created by alpine $as_me 2.20.3, 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.20.1'
+ VERSION='2.20.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16569,6 +16569,8 @@ if test "x$with_ssl" = "xno" ; then
   alpine_SSLTYPE="none"
 elif test -d /usr/local/ssl ; then
   alpine_SSLDIR="/usr/local/ssl"
+  alpine_SSLINCLUDE="$alpine_SSLDIR/include"
+  alpine_SSLLIB="$alpine_SSLDIR/lib"
 else
     case $host in
     *-linux-gnu*|*-k*bsd*-gnu*|*-gnu*)
@@ -16714,7 +16716,9 @@ else
       alpine_SSLDIR="/usr/local/ssl"
       ;;
   esac
+fi
 
+if test "x$alpine_SSLTYPE" != "xnone" ; then
 
 # Check whether --with-ssl-dir was given.
 if test "${with_ssl_dir+set}" = set; then :
@@ -16760,9 +16764,7 @@ 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
@@ -20638,25 +20640,29 @@ _ACEOF
     fi
   fi
 
-  if test ! -f ${certdir}/factory.pem ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: * * * SSL file \"${certdir}/factory.pem\" is missing." >&5
-$as_echo "$as_me: * * * SSL file \"${certdir}/factory.pem\" is missing." >&6;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: * * *   This might indicate that CA certs did not get properly" >&5
-$as_echo "$as_me: * * *   This might indicate that CA certs did not get properly" >&6;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: * * *   installed.  If you get certificate validation failures" >&5
-$as_echo "$as_me: * * *   installed.  If you get certificate validation failures" >&6;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: * * *   in Alpine, this might be the reason for them." >&5
-$as_echo "$as_me: * * *   in Alpine, this might be the reason for them." >&6;}
-  fi
 
+  SSL_CERT_LINK="no"
   if test -z "`ls ${certdir} | $EGREP '^[0-9A-Fa-f]{8}\.[0-9]'`" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: * * * No 8-hexdigit symlinks in certificate directory \"${certdir}\"." >&5
-$as_echo "$as_me: * * * No 8-hexdigit symlinks in certificate directory \"${certdir}\"." >&6;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: * * *   This might indicate that CA certs did not get properly" >&5
+     SSL_BUNDLE_EXISTS="no"
+     SSL_PEM="factory.pem ca-bundle.pem"
+     for SSL_BUNDLE in $SSL_PEM
+     do
+       if test -f ${certdir}/${SSL_BUNDLE} ; then
+          SSL_BUNDLE_EXISTS="yes"
+       fi
+     done
+  else
+     SSL_CERT_LINK="yes"
+  fi
+
+  if test "x$SSL_BUNDLE_EXISTS" = "xno" -a "x$SSL_CERT_LINK" = "xno" ; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: * * * No certificates found in \"${certdir}\"." >&5
+$as_echo "$as_me: * * * No certificates found in \"${certdir}\"." >&6;}
+     { $as_echo "$as_me:${as_lineno-$LINENO}: * * *   This might indicate that CA certs did not get properly" >&5
 $as_echo "$as_me: * * *   This might indicate that CA certs did not get properly" >&6;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: * * *   installed.  If you get certificate validation failures" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: * * *   installed.  If you get certificate validation failures" >&5
 $as_echo "$as_me: * * *   installed.  If you get certificate validation failures" >&6;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: * * *   in Alpine, this might be the reason for them." >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: * * *   in Alpine, this might be the reason for them." >&5
 $as_echo "$as_me: * * *   in Alpine, this might be the reason for them." >&6;}
   fi
 
@@ -21297,7 +21303,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.20.1, which was
+This file was extended by alpine $as_me 2.20.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21363,7 +21369,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.20.1
+alpine config.status 2.20.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"