* New version 2.19.8

    * Forwarding messages with attachments of content-type multipart, failed when
      attempting to signed it, with and "Error writing pipe" error.

11 files changed, 29 insertions, 24 deletions

diff --git a/VERSION b/VERSION
index 7b054ef0..3983e5a6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.19.7
+2.19.8
diff --git a/alpine/osdep/mswin.rc b/alpine/osdep/mswin.rc
index 982ba963..61cd7d7c 100644
--- a/alpine/osdep/mswin.rc
+++ b/alpine/osdep/mswin.rc
@@ -267,12 +267,12 @@ BEGIN
 #else
             VALUE "FileDescription", "Alpine\0"
 #endif
-            VALUE "FileVersion", "2.19.7\0"
+            VALUE "FileVersion", "2.19.8\0"
             VALUE "InternalName", "alpine\0"
             VALUE "LegalCopyright", "Copyright 2006-2009\0"
             VALUE "OriginalFilename", "alpine.exe\0"
             VALUE "ProductName", "alpine\0"
-            VALUE "ProductVersion", "2.19.7\0"
+            VALUE "ProductVersion", "2.19.8\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/configure b/configure
index e2f231c2..46b7bf3d 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Rev:9 by chappa@washington.edu.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for alpine 2.19.7.
+# Generated by GNU Autoconf 2.69 for alpine 2.19.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.19.7'
-PACKAGE_STRING='alpine 2.19.7'
+PACKAGE_VERSION='2.19.8'
+PACKAGE_STRING='alpine 2.19.8'
 PACKAGE_BUGREPORT='chappa@washington.edu'
 PACKAGE_URL=''
 
@@ -1596,7 +1596,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.7 to adapt to many kinds of systems.
+\`configure' configures alpine 2.19.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1666,7 +1666,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of alpine 2.19.7:";;
+     short | recursive ) echo "Configuration of alpine 2.19.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1952,7 +1952,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-alpine configure 2.19.7
+alpine configure 2.19.8
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2558,7 +2558,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.7, which was
+It was created by alpine $as_me 2.19.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3379,7 +3379,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='alpine'
- VERSION='2.19.7'
+ VERSION='2.19.8'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -20335,7 +20335,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.7, which was
+This file was extended by alpine $as_me 2.19.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20401,7 +20401,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.7
+alpine config.status 2.19.8
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/doc/alpine.1 b/doc/alpine.1
index 54a2e0c1..1816fc68 100644
--- a/doc/alpine.1
+++ b/doc/alpine.1
@@ -1,4 +1,4 @@
-.TH alpine 1 "Version 2.19.7"
+.TH alpine 1 "Version 2.19.8"
 .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 f691cc68..1e5fdc34 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.19.7, February 2014
+Version 2.19.8, February 2014
 
 <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 57390749..dba272e4 100644
--- a/doc/tech-notes/tech-notes.txt
+++ b/doc/tech-notes/tech-notes.txt
@@ -1,7 +1,7 @@
 
                              Alpine Technical Notes
 
-   Version 2.19.7, February 2014
+   Version 2.19.8, February 2014
 
 Table of Contents
 
diff --git a/include/config.wnt.h b/include/config.wnt.h
index 63b0fabd..644ce1eb 100644
--- a/include/config.wnt.h
+++ b/include/config.wnt.h
@@ -454,13 +454,13 @@
 #define PACKAGE_NAME "alpine"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "alpine 2.19.7"
+#define PACKAGE_STRING "alpine 2.19.8"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "alpine"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.19.7"
+#define PACKAGE_VERSION "2.19.8"
 
 /* Program users use to change their password */
 /* #undef PASSWD_PROG */
@@ -552,7 +552,7 @@
 #define UTF8_INTERNAL
 
 /* Version number of package */
-#define VERSION "2.19.7"
+#define VERSION "2.19.8"
 
 /* Windows is just too different */
 #ifndef _WINDOWS
diff --git a/mapi/pmapi.rc b/mapi/pmapi.rc
index bebfb812..653329f3 100644
--- a/mapi/pmapi.rc
+++ b/mapi/pmapi.rc
@@ -117,14 +117,14 @@ BEGIN
             VALUE "Comments", "alpine info: http://www.washington.edu/alpine\0"
             VALUE "CompanyName", "University of Washington\0"
             VALUE "FileDescription", "Simple MAPI DLL for Alpine for Windows\0"
-            VALUE "FileVersion", "2.19.7\0"
+            VALUE "FileVersion", "2.19.8\0"
             VALUE "InternalName", "pmapi32\0"
             VALUE "LegalCopyright", "Copyright ? 2006-2009\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.19.7\0"
+            VALUE "ProductVersion", "2.19.8\0"
             VALUE "SpecialBuild", " \0"
         END
     END
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 147e30d3..66299dfa 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 46 2014-02-17 01:15:10
+Alpine Commit 47 2014-02-20 00:06:00
 ============= h_news =================
 <HTML>
 <HEAD>
@@ -244,6 +244,9 @@ Bugs that have been addressed include:
   <LI> S/MIME: signed and encrypted messages from Thunderbird would not 
        validate. Thanks to Andreas Schamanek for testing, debugging and 
        advising during the process of fixing this problem.
+  <LI> S/MIME: Forwarding messages with multipart content-type failed to be signed
+       with &quot;Error writing pipe&quot; message. Reported by Andreas Schamanek
+       and Stefan Mueller.
   <LI> Crash when tcp connection to NNTP server was lost after connection
        had been established, but lost immediately afterwards.
   <LI> WebAlpine: add _GNU_SOURCE to make pubcookie build.
diff --git a/pith/smime.c b/pith/smime.c
index 9d588479..469a381e 100644
--- a/pith/smime.c
+++ b/pith/smime.c
@@ -1113,7 +1113,9 @@ rfc822_output_func(void *b, char *string)
 {
     BIO *bio = (BIO *) b;
 
-    return((BIO_puts(bio, string) > 0) ? 1L : 0L);
+    return(string ? *string ? (BIO_puts(bio, string) >  0 ? 1L : 0L) 
+			    : (BIO_puts(bio, string) >= 0 ? 1L : 0L)  
+		  : 0L);
 }
 
 
diff --git a/po/Makefile.in b/po/Makefile.in
index 23e9e0b1..22554d5f 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -11,7 +11,7 @@
 # Origin: gettext-0.16
 
 PACKAGE = alpine
-VERSION = 2.19.7
+VERSION = 2.19.8
 PACKAGE_BUGREPORT = chappa@washington.edu
 
 SHELL = /bin/sh