* new version 2.19.9993

   * Aggregate operations allows bouncing a list of messages using a role.
     Suggested by Ulf-Dietrich Braumann.

   * Compilation error of module pith/reply.c if SMIME is not defined (as in
     Windows Alpine). There was a misplaced parenthesis.

   * Update to S/MIME to explain how to use a PKCS12 certificate in
     Alpine.

   * Fix error in compare_certs function, that would modify the name of
     the certificates after sorting them, and return when no certificates
     are given.

   * When replying to several messages, subject will be decoded first,
     and then stripped from re/fwd before they are compared to determine
     the subject of the replied message.

   * Add $(LIBINTL) to the flags to link rpdump, rpload, alpined and
     alpineldap because MAC OSX 10.8 x86_64 needs it.

   * When the download of an attachment is interrumpted, Alpine stills
     caches what was downloaded, making the download incomplete for
     subsequent calls of Alpine attempting to open the attachment. In the
     future, Alpine will not cache any downloaded part of the attachment
     when it is interrupted.

4 files changed, 11 insertions, 9 deletions

diff --git a/web/src/alpined.d/Makefile.am b/web/src/alpined.d/Makefile.am
index 9101e4fb..524cb7e1 100644
--- a/web/src/alpined.d/Makefile.am
+++ b/web/src/alpined.d/Makefile.am
@@ -27,6 +27,10 @@ alpineldap_SOURCES = alpineldap.c busy.c color.c imap.c ldap.c remote.c \
 		   signal.c debug.c status.c stubs.c \
 		   alpined.h color.h ldap.h
 
+alpined_LDADD = $(LDADD) $(INTLLIBS)
+
+alpineldap_LDADD = $(LDADD) $(INTLLIBS)
+
 LDADD = local.o \
 	@top_srcdir@/pith/libpith.a \
 	@top_srcdir@/pith/osdep/libpithosd.a \
diff --git a/web/src/alpined.d/Makefile.in b/web/src/alpined.d/Makefile.in
index 9824ba6e..1d542067 100644
--- a/web/src/alpined.d/Makefile.in
+++ b/web/src/alpined.d/Makefile.in
@@ -105,22 +105,18 @@ am_alpined_OBJECTS = alpined.$(OBJEXT) busy.$(OBJEXT) color.$(OBJEXT) \
 	signal.$(OBJEXT) debug.$(OBJEXT) status.$(OBJEXT) \
 	stubs.$(OBJEXT)
 alpined_OBJECTS = $(am_alpined_OBJECTS)
-alpined_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
-alpined_DEPENDENCIES = local.o @top_srcdir@/pith/libpith.a \
+am__DEPENDENCIES_2 = local.o @top_srcdir@/pith/libpith.a \
 	@top_srcdir@/pith/osdep/libpithosd.a \
 	@top_srcdir@/pith/charconv/libpithcc.a \
 	@top_srcdir@/c-client/c-client.a $(am__DEPENDENCIES_1)
+alpined_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
 am_alpineldap_OBJECTS = alpineldap.$(OBJEXT) busy.$(OBJEXT) \
 	color.$(OBJEXT) imap.$(OBJEXT) ldap.$(OBJEXT) remote.$(OBJEXT) \
 	signal.$(OBJEXT) debug.$(OBJEXT) status.$(OBJEXT) \
 	stubs.$(OBJEXT)
 alpineldap_OBJECTS = $(am_alpineldap_OBJECTS)
-alpineldap_LDADD = $(LDADD)
-alpineldap_DEPENDENCIES = local.o @top_srcdir@/pith/libpith.a \
-	@top_srcdir@/pith/osdep/libpithosd.a \
-	@top_srcdir@/pith/charconv/libpithcc.a \
-	@top_srcdir@/c-client/c-client.a $(am__DEPENDENCIES_1)
+alpineldap_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = 
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -312,6 +308,8 @@ alpineldap_SOURCES = alpineldap.c busy.c color.c imap.c ldap.c remote.c \
 		   signal.c debug.c status.c stubs.c \
 		   alpined.h color.h ldap.h
 
+alpined_LDADD = $(LDADD) $(INTLLIBS)
+alpineldap_LDADD = $(LDADD) $(INTLLIBS)
 LDADD = local.o \
 	@top_srcdir@/pith/libpith.a \
 	@top_srcdir@/pith/osdep/libpithosd.a \
diff --git a/web/src/alpined.d/signal.c b/web/src/alpined.d/signal.c
index 3bdb7b41..52d8e600 100644
--- a/web/src/alpined.d/signal.c
+++ b/web/src/alpined.d/signal.c
@@ -128,7 +128,7 @@ auger_in_signal(int sig)
       (void) unlink(peSocketName);
 
     snprintf(tmp_20k_buf, SIZEOF_20KBUF, "Abort: signal %d", sig);
-    panic(tmp_20k_buf);		/* clean up and get out */
+    alpine_panic(tmp_20k_buf);		/* clean up and get out */
     exit(-1);			/* in case panic doesn't kill us */
 }
 
diff --git a/web/src/alpined.d/stubs.c b/web/src/alpined.d/stubs.c
index 10b79914..c25b305e 100644
--- a/web/src/alpined.d/stubs.c
+++ b/web/src/alpined.d/stubs.c
@@ -100,7 +100,7 @@ exec_mailcap_test_cmd(cmd)
   This is also called from imap routines and fs_get and fs_resize.
   ----*/
 void
-panic(message)
+alpine_panic(message)
     char *message;
 {
     in_panic = 1;