* 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.

17 files changed, 102 insertions, 72 deletions

diff --git a/VERSION b/VERSION
index 4e2200b9..4b0fa5fd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.20.1
+2.20.3
diff --git a/alpine/dispfilt.c b/alpine/dispfilt.c
index 3c4525a0..4fdf5c1f 100644
--- a/alpine/dispfilt.c
+++ b/alpine/dispfilt.c
@@ -148,7 +148,7 @@ dfilter(char *rawcmd, STORE_S *input_so, gf_io_t output_pc, FILTLIST_S *aux_filt
 	if(resultf){
 	    if(name_file_size(resultf) > 0L)
 	      display_output_file(resultf, "Filter", NULL, DOF_BRIEF);
-
+	    our_unlink(resultf);
 	    fs_give((void **)&resultf);
 	}
 
diff --git a/alpine/osdep/alpine-splash.bmp b/alpine/osdep/alpine-splash.bmp
index 3289bc2b..3d08f04a 100644
--- a/alpine/osdep/alpine-splash.bmp
+++ b/alpine/osdep/alpine-splash.bmp
diff --git a/alpine/osdep/mswin.rc b/alpine/osdep/mswin.rc
index 2769c8c3..af9440ba 100644
--- a/alpine/osdep/mswin.rc
+++ b/alpine/osdep/mswin.rc
@@ -244,8 +244,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,20,1,0
- PRODUCTVERSION 2,20,1,0
+ FILEVERSION 2,20,3,0
+ PRODUCTVERSION 2,20,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -267,12 +267,12 @@ BEGIN
 #else
             VALUE "FileDescription", "Alpine\0"
 #endif
-            VALUE "FileVersion", "2.20.1\0"
+            VALUE "FileVersion", "2.20.3\0"
             VALUE "InternalName", "alpine\0"
             VALUE "LegalCopyright", "Copyright 2006-2009 University of Washington, Copyright 2013-2014\0"
             VALUE "OriginalFilename", "alpine.exe\0"
             VALUE "ProductName", "alpine\0"
-            VALUE "ProductVersion", "2.20.1\0"
+            VALUE "ProductVersion", "2.20.3\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/alpine/send.c b/alpine/send.c
index 2e1386d8..5725b482 100644
--- a/alpine/send.c
+++ b/alpine/send.c
@@ -5439,7 +5439,7 @@ filter_message_text(char *fcmd, ENVELOPE *outgoing, struct mail_bodystruct *body
     if(resultf){
 	if(name_file_size(resultf) > 0L)
 	  display_output_file(resultf, "Filter", NULL, DOF_BRIEF);
-
+	our_unlink(resultf);
 	fs_give((void **)&resultf);
     }
     else if(errstr){
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\\"
 
diff --git a/configure.ac b/configure.ac
index ab83a4ad..272144e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ dnl  */
 
 AC_PREREQ([2.69])
 
-AC_REVISION([Rev:16 by chappa@washington.edu])
+AC_REVISION([Rev:17 by chappa@washington.edu])
 
 dnl Alpine Version Number is in $srcdir/VERSION
 AC_INIT([alpine],[m4_normalize(m4_include(VERSION))],[chappa@washington.edu])
@@ -720,6 +720,8 @@ dnl When the system has openssl installed in its default location
 dnl instead of the one used by the distribution assume that this
 dnl is the one intended to be used.
   alpine_SSLDIR="/usr/local/ssl"
+  alpine_SSLINCLUDE="$alpine_SSLDIR/include" 
+  alpine_SSLLIB="$alpine_SSLDIR/lib"
 else
   dnl preload c-client default locations/options
   case $host in
@@ -869,7 +871,9 @@ dnl find it anywhere else.
       alpine_SSLDIR="/usr/local/ssl"
       ;;
   esac
+fi
 
+if test "x$alpine_SSLTYPE" != "xnone" ; then
   AC_ARG_WITH(ssl-dir,
     AS_HELP_STRING([--with-ssl-dir=DIR],[Root of SSL lib/include path]),
     [
@@ -903,9 +907,7 @@ dnl find it anywhere else.
 	alpine_SSLLIB=$withval
       fi
     ])
-fi
 
-if test "x$alpine_SSLTYPE" != "xnone" ; then
   dnl setup globals so tests below work
   if test -n "$alpine_SSLINCLUDE" ; then
     CPPFLAGS="-I$alpine_SSLINCLUDE $CPPFLAGS"
@@ -1874,18 +1876,26 @@ else
     fi
   fi
 
-  if test ! -f ${certdir}/factory.pem ; then
-    AC_MSG_NOTICE([* * * SSL file "${certdir}/factory.pem" is missing.])
-    AC_MSG_NOTICE([* * *   This might indicate that CA certs did not get properly])
-    AC_MSG_NOTICE([* * *   installed.  If you get certificate validation failures])
-    AC_MSG_NOTICE([* * *   in Alpine, this might be the reason for them.])
-  fi
 
+  SSL_CERT_LINK="no"
   if test -z "`ls ${certdir} | $EGREP '^@<:@0-9A-Fa-f@:>@{8}\.@<:@0-9@:>@'`" ; then
-    AC_MSG_NOTICE([* * * No 8-hexdigit symlinks in certificate directory "${certdir}".])
-    AC_MSG_NOTICE([* * *   This might indicate that CA certs did not get properly])
-    AC_MSG_NOTICE([* * *   installed.  If you get certificate validation failures])
-    AC_MSG_NOTICE([* * *   in Alpine, this might be the reason for them.])
+     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
+     AC_MSG_NOTICE([* * * No certificates found in "${certdir}".])
+     AC_MSG_NOTICE([* * *   This might indicate that CA certs did not get properly])
+     AC_MSG_NOTICE([* * *   installed.  If you get certificate validation failures])
+     AC_MSG_NOTICE([* * *   in Alpine, this might be the reason for them.])
   fi
 
   if test -n "$alpine_SSLINCLUDE" ; then
diff --git a/doc/alpine.1 b/doc/alpine.1
index 5ca4f8b8..66e0d8d8 100644
--- a/doc/alpine.1
+++ b/doc/alpine.1
@@ -1,4 +1,4 @@
-.TH alpine 1 "Version 2.20.1"
+.TH alpine 1 "Version 2.20.3"
 .SH NAME
 alpine \- an Alternatively Licensed Program for Internet News and Email
 .SH SYNTAX 
diff --git a/doc/tech-notes/index.html b/doc/tech-notes/index.html
index f9dda945..34905862 100644
--- a/doc/tech-notes/index.html
+++ b/doc/tech-notes/index.html
@@ -3,7 +3,7 @@
 <BODY>
 <H1>Alpine Technical Notes</H1>
  
-Version 2.20.1, January 2015
+Version 2.20.3, February 2015
 
 <H2><A NAME="TOC">Table of Contents</A></H2><P>
 
diff --git a/doc/tech-notes/tech-notes.txt b/doc/tech-notes/tech-notes.txt
index e339aaaa..366aae46 100644
--- a/doc/tech-notes/tech-notes.txt
+++ b/doc/tech-notes/tech-notes.txt
@@ -1,7 +1,7 @@
 
                              Alpine Technical Notes
 
-   Version 2.20.1, January 2015
+   Version 2.20.3, February 2015
 
 Table of Contents
 
diff --git a/mapi/pmapi.c b/mapi/pmapi.c
index 6b050415..c0d10a91 100644
--- a/mapi/pmapi.c
+++ b/mapi/pmapi.c
@@ -1952,7 +1952,7 @@ BOOL APIENTRY DllMain(
 
 	now = time((time_t *)0);
 	tm_now = localtime(&now);
-	fprintf(ms_global->dfd, "pmapi32.dll for Alpine Version 2.20.1\r\n");
+	fprintf(ms_global->dfd, "pmapi32.dll for Alpine Version 2.20.3\r\n");
 	fprintf(ms_global->dfd, " Build date: %s\r\n", datestamp);
 	fprintf(ms_global->dfd,
 		" please report all bugs to chappa@gmx.com\r\n");
diff --git a/mapi/pmapi.rc b/mapi/pmapi.rc
index 27fc3426..d9207349 100644
--- a/mapi/pmapi.rc
+++ b/mapi/pmapi.rc
@@ -98,8 +98,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,20,1,0
- PRODUCTVERSION 2,20,1,0
+ FILEVERSION 2,20,3,0
+ PRODUCTVERSION 2,20,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x29L
@@ -117,14 +117,14 @@ BEGIN
             VALUE "Comments", "alpine info: http://patches.freeiz.com/alpine\0"
             VALUE "CompanyName", "Patches for Alpine\0"
             VALUE "FileDescription", "Simple MAPI DLL for Alpine for Windows\0"
-            VALUE "FileVersion", "2.20.1\0"
+            VALUE "FileVersion", "2.20.3\0"
             VALUE "InternalName", "pmapi32\0"
             VALUE "LegalCopyright", "Copyright ? University of Washington 2006-2009, Eduardo Chappa 2013-2014\0"
             VALUE "LegalTrademarks", "Apache License, Version 2.0\0"
             VALUE "OriginalFilename", "pmapi32.dll\0"
             VALUE "PrivateBuild", " \0"
             VALUE "ProductName", "Simple MAPI for Alpine for Windows\0"
-            VALUE "ProductVersion", "2.20.1\0"
+            VALUE "ProductVersion", "2.20.3\0"
             VALUE "SpecialBuild", " \0"
         END
     END
diff --git a/pico/osdep/mswin.c b/pico/osdep/mswin.c
index df4370ee..151a062c 100644
--- a/pico/osdep/mswin.c
+++ b/pico/osdep/mswin.c
@@ -8499,7 +8499,7 @@ mswin_savefile(char *dir_utf8, int nMaxDName, char *fName_utf8, int nMaxFName)
  *      Possible return values:
  *      0   no file selected
  *      1   file selected
- *     -1   some sort of error
+ *     -1   some sort of error +++++++++++++
  */
 int
 mswin_openfile(char *dir_utf8, int nMaxDName, char *fName_utf8,
diff --git a/pith/pine.hlp b/pith/pine.hlp
index f360dda6..4b0acfeb 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any
 reasonable place to be called from.
 Dummy change to get revision in pine.hlp
 ============= h_revision =================
-Alpine Commit 68 2015-01-25 18:52:07
+Alpine Commit 69 2015-02-28 15:59:49
 ============= h_news =================
 <HTML>
 <HEAD>
@@ -180,29 +180,39 @@ addresses bugs found in previous releases and has a few additions as well.
 Additions include:
 <UL>
   <LI> Ignore message from smtp server after a successful authentication
-     challenge.
+       challenge.
   <LI> If SSLDIR is defined somehow, do not disable S/MIME if the
-     SSLCERTSDIR is not found.
+       SSLCERTSDIR is not found.
+  <LI> 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.
 </UL>
 
 <P>
 Bugs that have been addressed include:
 <UL>
+  <LI> SMIME: Crash when checking the signature of a message that contains
+       a RFC822 attached message. Reported by Holger Trapp and Bj&ouml;rn 
+       Krellner.
+
   <LI> Alpine would not set include and lib paths for OpenSSL if this was
-     installed in /usr/local/ssl.
+       installed in /usr/local/ssl.
 
   <LI> If the .pinerc file is a symbolic link, Alpine might not write its
-     contents when saving its configuration.
+       contents when saving its configuration.
 
   <LI> The _INIT_ token does not skip over non-alpha numeric characters in
-     the name. Reported by Andreas Fehr.
+       the name. Reported by Andreas Fehr.
 
   <LI> 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.
+       content of a pointer, which made the speller in PC-Alpine get the 
+       content of a word incorrectly.
+
+  <LI> Skip testing openssl compatibility version when cross-compilation
+       is detected. Fix contributed by Antti Sepp&auml;l&auml;
 
-  <LI> Skip testing openssl compatibility version when cross-compilation 
-     is detected. Fix contributed by Antti Seppälä.
+  <LI> Alpine fails to remove temporary files used during a display or sending
+       filter. Fix contributed by Phil Brooke.
 
 </UL>
 
diff --git a/pith/send.c b/pith/send.c
index dac18579..5495a80b 100644
--- a/pith/send.c
+++ b/pith/send.c
@@ -2906,7 +2906,7 @@ pine_encode_body (struct mail_bodystruct *body)
 	  snprintf (tmp,sizeof(tmp),"%ld-%ld-%ld=:%ld",gethostid (),random (),(long) time (0),
 		    (long) getpid ());
 	  tmp[sizeof(tmp)-1] = '\0';
-	  set_parameter(&body->parameter, "BOUNDARY", tmp);
+	  set_parameter(&body->parameter, "boundary", tmp);
       }
 
       if(freethis)
diff --git a/pith/smime.c b/pith/smime.c
index a731df34..3482e045 100644
--- a/pith/smime.c
+++ b/pith/smime.c
@@ -2829,15 +2829,19 @@ do_detached_signature_verify(BODY *b, long msgno, char *section)
 		char *h = (char *) so_text(msg_so);
 		char *bstart = strstr(h, "\r\n\r\n");
 		ENVELOPE *env;
-		BODY *body;
+		BODY *body, *tmpB;
 
 		bstart += 4;
 		INIT(&bs, mail_string, bstart, tlen);
-		rfc822_parse_msg_full(&env, &body, h, bstart-h, &bs, BADHOST, 0, 0);
+		rfc822_parse_msg_full(&env, &body, h, bstart-h-4, &bs, BADHOST, 0, 0);
 		mail_free_envelope(&env);
 
 		mail_free_body_part(&b->nested.part);
-		b->nested.part = mail_body_section(body, section)->nested.part;
+		tmpB = mail_body_section(body, section);
+		if(MIME_MSG(tmpB->type, tmpB->subtype))
+		   b->nested.part = tmpB->nested.msg->body->nested.part;
+		else
+		   b->nested.part = tmpB->nested.part;
 		create_local_cache(bstart, bstart, &b->nested.part->body, 1);
 		modified_the_body = 1;
 
diff --git a/po/Makefile.in b/po/Makefile.in
index 4abd6756..7990eef9 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -11,7 +11,7 @@
 # Origin: gettext-0.16
 
 PACKAGE = alpine
-VERSION = 2.20.1
+VERSION = 2.20.2
 PACKAGE_BUGREPORT = chappa@washington.edu
 
 SHELL = /bin/sh