cleanups and switch to new etpan-tarball

9 files changed, 36 insertions, 615 deletions

diff --git a/noncore/net/mail/libetpanstuff/libetpan-0.32-arm-linux.patch b/noncore/net/mail/libetpanstuff/libetpan-0.32-arm-linux.patch
deleted file mode 100644
index 1e51a99..0000000
--- a/noncore/net/mail/libetpanstuff/libetpan-0.32-arm-linux.patch
+++ b/dev/null
@@ -1,123 +0,0 @@
-diff -ru libetpan-0.32-patched/generic/imapdriver_tools.h libetpan-0.32-patched2/generic/imapdriver_tools.h
---- libetpan-0.32-patched/generic/imapdriver_tools.h	2003-12-08 16:36:36.000000000 +0100
-+++ libetpan-0.32-patched2/generic/imapdriver_tools.h	2003-12-21 16:18:28.000000000 +0100
-@@ -41,6 +41,7 @@
- #include "mailmime.h"
- #include "imapdriver_types.h"
- #include "mail_cache_db.h"
-+#include <sys/param.h>
- 
- #ifdef __cplusplus
- extern "C" {
-diff -ru libetpan-0.32-patched/generic/imapdriver_types.h libetpan-0.32-patched2/generic/imapdriver_types.h
---- libetpan-0.32-patched/generic/imapdriver_types.h	2003-12-15 04:33:57.000000000 +0100
-+++ libetpan-0.32-patched2/generic/imapdriver_types.h	2003-12-21 16:18:50.000000000 +0100
-@@ -43,6 +43,7 @@
- #include <libetpan/maildriver_types.h>
- #include <libetpan/generic_cache_types.h>
- #include <libetpan/mailstorage_types.h>
-+#include <sys/param.h>
- 
- #ifdef __cplusplus
- extern "C" {
-diff -ru libetpan-0.32-patched/generic/mailstorage_tools.c libetpan-0.32-patched2/generic/mailstorage_tools.c
---- libetpan-0.32-patched/generic/mailstorage_tools.c	2003-12-15 04:33:57.000000000 +0100
-+++ libetpan-0.32-patched2/generic/mailstorage_tools.c	2003-12-21 16:10:52.000000000 +0100
-@@ -38,6 +38,7 @@
- #include "libetpan-config.h"
- 
- #include <sys/types.h>
-+#include <sys/param.h>
- #include <netdb.h>
- #include <netinet/in.h>
- #include <sys/socket.h>
-diff -ru libetpan-0.32-patched/generic/mhdriver_types.h libetpan-0.32-patched2/generic/mhdriver_types.h
---- libetpan-0.32-patched/generic/mhdriver_types.h	2003-12-15 04:33:57.000000000 +0100
-+++ libetpan-0.32-patched2/generic/mhdriver_types.h	2003-12-21 16:17:53.000000000 +0100
-@@ -45,6 +45,8 @@
- #include <libetpan/generic_cache_types.h>
- #include <libetpan/mailstorage_types.h>
- 
-+#include <sys/param.h>
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
-diff -ru libetpan-0.32-patched/generic/mime_message_driver.c libetpan-0.32-patched2/generic/mime_message_driver.c
---- libetpan-0.32-patched/generic/mime_message_driver.c	2003-12-15 04:33:57.000000000 +0100
-+++ libetpan-0.32-patched2/generic/mime_message_driver.c	2003-12-21 16:20:17.000000000 +0100
-@@ -39,6 +39,7 @@
- 
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/param.h>
- #include <unistd.h>
- #include <sys/mman.h>
- #include <stdlib.h>
-diff -ru libetpan-0.32-patched/generic/nntpdriver_types.h libetpan-0.32-patched2/generic/nntpdriver_types.h
---- libetpan-0.32-patched/generic/nntpdriver_types.h	2003-12-15 04:33:57.000000000 +0100
-+++ libetpan-0.32-patched2/generic/nntpdriver_types.h	2003-12-21 16:19:43.000000000 +0100
-@@ -44,6 +44,7 @@
- #include <libetpan/clist.h>
- #include <libetpan/generic_cache_types.h>
- #include <libetpan/mailstorage_types.h>
-+#include <sys/param.h>
- 
- #ifdef __cplusplus
- extern "C" {
-diff -ru libetpan-0.32-patched/generic/pop3driver_types.h libetpan-0.32-patched2/generic/pop3driver_types.h
---- libetpan-0.32-patched/generic/pop3driver_types.h	2003-12-15 04:33:57.000000000 +0100
-+++ libetpan-0.32-patched2/generic/pop3driver_types.h	2003-12-21 16:19:19.000000000 +0100
-@@ -44,6 +44,7 @@
- #include <libetpan/maildriver_types.h>
- #include <libetpan/chash.h>
- #include <libetpan/mailstorage_types.h>
-+#include <sys/param.h>
- 
- #ifdef __cplusplus
- extern "C" {
-diff -ru libetpan-0.32-patched/maildir/maildir_types.h libetpan-0.32-patched2/maildir/maildir_types.h
---- libetpan-0.32-patched/maildir/maildir_types.h	2003-12-15 04:33:57.000000000 +0100
-+++ libetpan-0.32-patched2/maildir/maildir_types.h	2003-12-21 16:17:03.000000000 +0100
-@@ -38,6 +38,7 @@
- #define MAILDIR_TYPES_H
- 
- #include <sys/types.h>
-+#include <sys/param.h>
- #include <unistd.h>
- #include <libetpan/chash.h>
- #include <libetpan/carray.h>
-diff -ru libetpan-0.32-patched/mbox/mailmbox_types.h libetpan-0.32-patched2/mbox/mailmbox_types.h
---- libetpan-0.32-patched/mbox/mailmbox_types.h	2003-12-15 04:33:57.000000000 +0100
-+++ libetpan-0.32-patched2/mbox/mailmbox_types.h	2003-12-21 16:14:58.000000000 +0100
-@@ -42,7 +42,7 @@
- #endif
- 
- #include <sys/types.h>
--
-+#include <sys/param.h>
- #include <libetpan/libetpan-config.h>
- 
- #include <libetpan/mailimf.h>
-diff -ru libetpan-0.32-patched/tools/maillock.c libetpan-0.32-patched2/tools/maillock.c
---- libetpan-0.32-patched/tools/maillock.c	2003-12-15 04:33:58.000000000 +0100
-+++ libetpan-0.32-patched2/tools/maillock.c	2003-12-21 16:14:19.000000000 +0100
-@@ -39,6 +39,7 @@
- 
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/param.h>
- #include <fcntl.h>
- #include <unistd.h>
- #include <stdio.h>
-diff -ru libetpan-0.32-patched/tools/mmapstring.c libetpan-0.32-patched2/tools/mmapstring.c
---- libetpan-0.32-patched/tools/mmapstring.c	2003-12-15 04:33:58.000000000 +0100
-+++ libetpan-0.32-patched2/tools/mmapstring.c	2003-12-21 16:13:32.000000000 +0100
-@@ -40,6 +40,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <sys/mman.h>
-+#include <sys/param.h>
- #include <string.h>
- #include <pthread.h>
- 
diff --git a/noncore/net/mail/libetpanstuff/libetpan-0.32-mailimap_sender.patch b/noncore/net/mail/libetpanstuff/libetpan-0.32-mailimap_sender.patch
deleted file mode 100644
index 7f737f0..0000000
--- a/noncore/net/mail/libetpanstuff/libetpan-0.32-mailimap_sender.patch
+++ b/dev/null
@@ -1,13 +0,0 @@
---- imap/mailimap_sender.c.orig	2003-12-15 04:33:57.000000000 +0100
-+++ imap/mailimap_sender.c	2004-01-08 03:22:13.000000000 +0100
-@@ -694,6 +694,10 @@
-   if (r != MAILIMAP_NO_ERROR)
-     return r;
- 
-+  r = mailimap_space_send(fd);
-+  if (r != MAILIMAP_NO_ERROR)
-+    return r;
-+  
-   r = mailimap_mailbox_send(fd, mb);
-   if (r != MAILIMAP_NO_ERROR)
-     return r;
diff --git a/noncore/net/mail/libetpanstuff/libetpan-0.32-mailstream_fix.patch b/noncore/net/mail/libetpanstuff/libetpan-0.32-mailstream_fix.patch
deleted file mode 100644
index e9fa44b..0000000
--- a/noncore/net/mail/libetpanstuff/libetpan-0.32-mailstream_fix.patch
+++ b/dev/null
@@ -1,12 +0,0 @@
-diff -ru libetpan-0.32/tools/mailstream_helper.c libetpan-0.32_fixed/tools/mailstream_helper.c
---- libetpan-0.32/tools/mailstream_helper.c	2003-12-15 04:33:58.000000000 +0100
-+++ libetpan-0.32_fixed/tools/mailstream_helper.c	2003-12-23 02:28:20.000000000 +0100
-@@ -352,7 +352,7 @@
-   current = message;
-   remaining = size;
- 
--  while (remaining > 0) {
-+  while (remaining > 0 && remaining<=size) {
-     ssize_t length;
-   
-     length = send_data_line(s, current, remaining);
diff --git a/noncore/net/mail/libetpanstuff/libetpan-0.32-mimecontent_dbsymbol.patch b/noncore/net/mail/libetpanstuff/libetpan-0.32-mimecontent_dbsymbol.patch
deleted file mode 100644
index 1c2c723..0000000
--- a/noncore/net/mail/libetpanstuff/libetpan-0.32-mimecontent_dbsymbol.patch
+++ b/dev/null
@@ -1,90 +0,0 @@
-diff -ru libetpan-0.32/mime/mailmime_content.c libetpan-0.32-patched/mime/mailmime_content.c
---- libetpan-0.32/mime/mailmime_content.c	2003-12-08 16:36:38.000000000 +0100
-+++ libetpan-0.32-patched/mime/mailmime_content.c	2003-12-21 15:42:04.000000000 +0100
-@@ -1549,7 +1549,7 @@
- /* ************************************************************************* */
- /* MIME part decoding */
- 
--static char get_base64_value(char ch)
-+static signed char get_base64_value(char ch)
- {
-   if ((ch >= 'A') && (ch <= 'Z'))
-     return ch - 'A';
-@@ -1595,7 +1595,7 @@
- 
-   i = 0;
-   while (1) {
--    char value;
-+    signed char value;
- 
-     value = -1;
-     while (value == -1) {
-diff -ru libetpan-0.32/mime/mailmime_decode.c libetpan-0.32-patched/mime/mailmime_decode.c
---- libetpan-0.32/mime/mailmime_decode.c	2003-12-03 22:35:31.000000000 +0100
-+++ libetpan-0.32-patched/mime/mailmime_decode.c	2003-12-21 15:42:25.000000000 +0100
-@@ -102,8 +102,8 @@
-   size_t cur_token;
-   int r;
-   int res;
--  char * str;
--  char * wordutf8;
-+  char * str = 0;
-+  char * wordutf8 = 0;
-   int type;
- 
-   cur_token = * index;
-@@ -147,14 +147,14 @@
- 	goto free;
-       }
- 
--      if (mmap_string_append(gphrase, wordutf8) == NULL) {
-+      if (wordutf8==NULL || mmap_string_append(gphrase, wordutf8) == NULL) {
- 	mailmime_encoded_word_free(word);
--        free(wordutf8);
-+        if (wordutf8) free(wordutf8);
- 	res = MAILIMF_ERROR_MEMORY;
- 	goto free;
-       }
-       mailmime_encoded_word_free(word);
--      free(wordutf8);
-+      if (wordutf8) free(wordutf8);
-       first = FALSE;
-     }
-     else if (r == MAILIMF_ERROR_PARSE) {
-@@ -183,14 +183,14 @@
-         r = charconv(tocode, default_fromcode, raw_word,
-             strlen(raw_word), &wordutf8);
- 
--	if (mmap_string_append(gphrase, wordutf8) == NULL) {
--          free(wordutf8);
-+	if (wordutf8==NULL || mmap_string_append(gphrase, wordutf8) == NULL) {
-+      if (wordutf8)free(wordutf8);
- 	  mailimf_word_free(raw_word);
- 	  res = MAILIMF_ERROR_MEMORY;
- 	  goto free;
- 	}
- 
--        free(wordutf8);
-+    if (wordutf8) free(wordutf8);
- 	mailimf_word_free(raw_word);
- 	first = FALSE;
-       }
-diff -ru libetpan-0.32/tools/mail_cache_db.c libetpan-0.32-patched/tools/mail_cache_db.c
---- libetpan-0.32/tools/mail_cache_db.c	2003-12-15 04:33:58.000000000 +0100
-+++ libetpan-0.32-patched/tools/mail_cache_db.c	2003-12-21 15:45:36.000000000 +0100
-@@ -65,12 +65,13 @@
-   
-   return cache_db;
- }
--
-+#endif
- static void mail_cache_db_free(struct mail_cache_db * cache_db)
- {
-+#if DBVERS >= 1
-   free(cache_db);
--}
- #endif
-+}
- 
- int mail_cache_db_open(const char * filename,
-     struct mail_cache_db ** pcache_db)
diff --git a/noncore/net/mail/libetpanstuff/libetpan-0.33pre.tar.bz2 b/noncore/net/mail/libetpanstuff/libetpan-0.33pre.tar.bz2
deleted file mode 100644
index 3f3e5ba..0000000
--- a/noncore/net/mail/libetpanstuff/libetpan-0.33pre.tar.bz2
+++ b/dev/null
diff --git a/noncore/net/mail/libetpanstuff/libetpan_031_patch b/noncore/net/mail/libetpanstuff/libetpan_031_patch
deleted file mode 100644
index 0e6bb41..0000000
--- a/noncore/net/mail/libetpanstuff/libetpan_031_patch
+++ b/dev/null
@@ -1,308 +0,0 @@
-Index: imap/mailimap_helper.c
-===================================================================
-RCS file: /cvsroot/libetpan/libetpan/imap/mailimap_helper.c,v
-retrieving revision 1.8
-retrieving revision 1.9
-diff -u -r1.8 -r1.9
---- imap/mailimap_helper.c	1 Dec 2003 05:06:28 -0000	1.8
-+++ imap/mailimap_helper.c	11 Dec 2003 00:50:47 -0000	1.9
-@@ -30,7 +30,7 @@
-  */
- 
- /*
-- * $Id$
-+ * $Id$
-  */
- 
- #include "mailimap_helper.h"
-@@ -87,8 +87,8 @@
-     goto free;
-   }
-   
--  * result = item->att_data.att_static->att_data.att_rfc822;
--  item->att_data.att_static->att_data.att_rfc822 = NULL;
-+  * result = item->att_data.att_static->att_data.att_rfc822.att_content;
-+  item->att_data.att_static->att_data.att_rfc822.att_content = NULL;
-   mailimap_fetch_list_free(fetch_list);
- 
-   return MAILIMAP_NO_ERROR;
-@@ -149,8 +149,8 @@
-     goto err;
-   }
- 
--  * result = item->att_data.att_static->att_data.att_rfc822_header;
--  item->att_data.att_static->att_data.att_rfc822_header = NULL;
-+  * result = item->att_data.att_static->att_data.att_rfc822_header.att_content;
-+  item->att_data.att_static->att_data.att_rfc822_header.att_content = NULL;
-   mailimap_fetch_list_free(fetch_list);
- 
-   return MAILIMAP_NO_ERROR;
-Index: imap/mailimap_parser.c
-===================================================================
-RCS file: /cvsroot/libetpan/libetpan/imap/mailimap_parser.c,v
-retrieving revision 1.21
-retrieving revision 1.22
-diff -u -r1.21 -r1.22
---- imap/mailimap_parser.c	17 Nov 2003 01:03:25 -0000	1.21
-+++ imap/mailimap_parser.c	11 Dec 2003 00:50:47 -0000	1.22
-@@ -30,7 +30,7 @@
-  */
- 
- /*
-- * $Id$
-+ * $Id$
-  */
- 
- #include <string.h>
-@@ -5868,7 +5868,7 @@
-     goto err;
-   }
- 
--  sflag = 0;
-+  sflag = MAILIMAP_MBX_LIST_SFLAG_ERROR;
-   oflags_2 = NULL;
- 
-   r = mailimap_struct_spaced_list_parse(fd, buffer, &cur_token,
-Index: imap/mailimap_print.c
-===================================================================
-RCS file: /cvsroot/libetpan/libetpan/imap/mailimap_print.c,v
-retrieving revision 1.11
-retrieving revision 1.12
-diff -u -r1.11 -r1.12
---- imap/mailimap_print.c	8 Dec 2003 15:36:38 -0000	1.11
-+++ imap/mailimap_print.c	11 Dec 2003 00:50:47 -0000	1.12
-@@ -30,7 +30,7 @@
-  */
- 
- /*
-- * $Id$
-+ * $Id$
-  */
- #ifdef DEBUG
- #include "mailimap_print.h"
-@@ -736,7 +736,7 @@
-   case MAILIMAP_MSG_ATT_RFC822:
-     print_indent();
-     printf("rfc822 {\n");
--    printf("%s\n", msg_att_static->att_data.att_rfc822);
-+    printf("%s\n", msg_att_static->att_data.att_rfc822.att_content);
-     print_indent();
-     printf("}\n");
-     break;
-@@ -744,7 +744,7 @@
-   case MAILIMAP_MSG_ATT_RFC822_HEADER:
-     print_indent();
-     printf("rfc822-header {\n");
--    printf("%s\n", msg_att_static->att_data.att_rfc822_header);
-+    printf("%s\n", msg_att_static->att_data.att_rfc822_header.att_content);
-     print_indent();
-     printf("}\n");
-     break;
-@@ -752,7 +752,7 @@
-   case MAILIMAP_MSG_ATT_RFC822_TEXT:
-     print_indent();
-     printf("rfc822-text {\n");
--    printf("%s\n", msg_att_static->att_data.att_rfc822_text);
-+    printf("%s\n", msg_att_static->att_data.att_rfc822_text.att_content);
-     print_indent();
-     printf("}\n");
-     break;
-@@ -1039,9 +1039,9 @@
-   indent();
- 
-   if (mbx_list_flags->mbf_type == MAILIMAP_MBX_LIST_FLAGS_SFLAG)
--    mailimap_mbx_list_sflag_print(mbx_list_flags->mbf_data.mbf_sflag);
-+    mailimap_mbx_list_sflag_print(mbx_list_flags->mbf_sflag);
- 
--  for(cur = clist_begin(mbx_list_flags->mbf_data.mbf_oflags) ; cur != NULL ;
-+  for(cur = clist_begin(mbx_list_flags->mbf_oflags) ; cur != NULL ;
-       cur = clist_next(cur)) {
-     struct mailimap_mbx_list_oflag * oflag;
- 
-Index: imap/mailimap_sender.c
-===================================================================
-RCS file: /cvsroot/libetpan/libetpan/imap/mailimap_sender.c,v
-retrieving revision 1.16
-retrieving revision 1.17
-diff -u -r1.16 -r1.17
---- imap/mailimap_sender.c	8 Dec 2003 15:36:38 -0000	1.16
-+++ imap/mailimap_sender.c	11 Dec 2003 00:50:47 -0000	1.17
-@@ -30,7 +30,7 @@
-  */
- 
- /*
-- * $Id$
-+ * $Id$
-  */
- 
- #include "mailstream.h"
-@@ -396,6 +396,9 @@
- 
- static int is_atom(const char * str)
- {
-+  if (* str == '\0')
-+    return 0;
-+  
-   while (* str != '\0') {
-     unsigned char uch = (unsigned char) * str;
-     
-Index: imap/mailimap_types.c
-===================================================================
-RCS file: /cvsroot/libetpan/libetpan/imap/mailimap_types.c,v
-retrieving revision 1.16
-retrieving revision 1.17
-diff -u -r1.16 -r1.17
---- imap/mailimap_types.c	1 Dec 2003 05:06:28 -0000	1.16
-+++ imap/mailimap_types.c	11 Dec 2003 00:50:47 -0000	1.17
-@@ -30,7 +30,7 @@
-  */
- 
- /*
-- * $Id$
-+ * $Id$
-  */
- 
- #include "mailimap_types.h"
-@@ -1417,14 +1417,8 @@
-     return NULL;
- 
-   mbx_list_flags->mbf_type = mbf_type;
--  switch (mbf_type) {
--  case MAILIMAP_MBX_LIST_FLAGS_SFLAG:
--    mbx_list_flags->mbf_data.mbf_oflags = mbf_oflags;
--    break;
--  case MAILIMAP_MBX_LIST_FLAGS_NO_SFLAG:
--    mbx_list_flags->mbf_data.mbf_sflag = mbf_sflag;
--    break;
--  }
-+  mbx_list_flags->mbf_oflags = mbf_oflags;
-+  mbx_list_flags->mbf_sflag = mbf_sflag;
-   
-   return mbx_list_flags;
- }
-@@ -1432,14 +1426,10 @@
- void
- mailimap_mbx_list_flags_free(struct mailimap_mbx_list_flags * mbx_list_flags)
- {
--  switch (mbx_list_flags->mbf_type) {
--  case MAILIMAP_MBX_LIST_FLAGS_NO_SFLAG:
--    clist_foreach(mbx_list_flags->mbf_data.mbf_oflags,
--		  (clist_func) mailimap_mbx_list_oflag_free,
--		  NULL);
--    clist_free(mbx_list_flags->mbf_data.mbf_oflags);
--    break;
--  }
-+  clist_foreach(mbx_list_flags->mbf_oflags,
-+      (clist_func) mailimap_mbx_list_oflag_free,
-+      NULL);
-+  clist_free(mbx_list_flags->mbf_oflags);
-   
-   free(mbx_list_flags);
- }
-@@ -1765,14 +1755,16 @@
-     item->att_data.att_internal_date = att_internal_date;
-     break;
-   case MAILIMAP_MSG_ATT_RFC822:
--    item->att_data.att_rfc822 = att_rfc822;
-+    item->att_data.att_rfc822.att_content = att_rfc822;
-+    item->att_data.att_rfc822.att_length = att_length;
-     break;
-   case MAILIMAP_MSG_ATT_RFC822_HEADER:
--    item->att_data.att_rfc822_header = att_rfc822_header;
-+    item->att_data.att_rfc822_header.att_content = att_rfc822_header;
-+    item->att_data.att_rfc822_header.att_length = att_length;
-     break;
-   case MAILIMAP_MSG_ATT_RFC822_TEXT:
--    item->att_data.att_rfc822_text = att_rfc822_text;
--    item->att_data.att_length = att_length;
-+    item->att_data.att_rfc822_text.att_content = att_rfc822_text;
-+    item->att_data.att_rfc822_text.att_length = att_length;
-     break;
-   case MAILIMAP_MSG_ATT_RFC822_SIZE:
-     item->att_data.att_rfc822_size = att_rfc822_size;
-@@ -1807,16 +1799,16 @@
-       mailimap_msg_att_internaldate_free(item->att_data.att_internal_date);
-     break;
-   case MAILIMAP_MSG_ATT_RFC822:
--    if (item->att_data.att_rfc822 != NULL)
--      mailimap_msg_att_rfc822_free(item->att_data.att_rfc822);
-+    if (item->att_data.att_rfc822.att_content != NULL)
-+      mailimap_msg_att_rfc822_free(item->att_data.att_rfc822.att_content);
-     break;
-   case MAILIMAP_MSG_ATT_RFC822_HEADER:
--    if (item->att_data.att_rfc822_header != NULL)
--      mailimap_msg_att_rfc822_header_free(item->att_data.att_rfc822_header);
-+    if (item->att_data.att_rfc822_header.att_content != NULL)
-+      mailimap_msg_att_rfc822_header_free(item->att_data.att_rfc822_header.att_content);
-     break;
-   case MAILIMAP_MSG_ATT_RFC822_TEXT:
--    if (item->att_data.att_rfc822_text != NULL)
--      mailimap_msg_att_rfc822_text_free(item->att_data.att_rfc822_text);
-+    if (item->att_data.att_rfc822_text.att_content != NULL)
-+      mailimap_msg_att_rfc822_text_free(item->att_data.att_rfc822_text.att_content);
-     break;
-   case MAILIMAP_MSG_ATT_BODYSTRUCTURE:
-     if (item->att_data.att_bodystructure != NULL)
-Index: imap/mailimap_types.h
-===================================================================
-RCS file: /cvsroot/libetpan/libetpan/imap/mailimap_types.h,v
-retrieving revision 1.17
-retrieving revision 1.18
-diff -u -r1.17 -r1.18
---- imap/mailimap_types.h	1 Dec 2003 05:06:28 -0000	1.17
-+++ imap/mailimap_types.h	11 Dec 2003 00:50:47 -0000	1.18
-@@ -30,7 +30,7 @@
-  */
- 
- /*
-- * $Id$
-+ * $Id$
-  */
- 
- 
-@@ -1642,6 +1642,7 @@
- /* this is a single flag type */
- 
- enum {
-+  MAILIMAP_MBX_LIST_SFLAG_ERROR,
-   MAILIMAP_MBX_LIST_SFLAG_MARKED,
-   MAILIMAP_MBX_LIST_SFLAG_NOSELECT,
-   MAILIMAP_MBX_LIST_SFLAG_UNMARKED
-@@ -1660,11 +1661,9 @@
- 
- struct mailimap_mbx_list_flags {
-   int mbf_type;
--  union {
--    clist * mbf_oflags; /* list of
--                           (struct mailimap_mbx_list_oflag *), != NULL */
--    int mbf_sflag;
--  } mbf_data;
-+  clist * mbf_oflags; /* list of
-+                         (struct mailimap_mbx_list_oflag *), != NULL */
-+  int mbf_sflag;
- };
- 
- struct mailimap_mbx_list_flags *
-@@ -1984,10 +1983,18 @@
-   union {
-     struct mailimap_envelope * att_env;            /* can be NULL */
-     struct mailimap_date_time * att_internal_date; /* can be NULL */
--    char * att_rfc822;        /* can be NULL */
--    char * att_rfc822_header; /* can be NULL */
--    char * att_rfc822_text;   /* can be NULL */
--    size_t att_length;
-+    struct {
-+      char * att_content; /* can be NULL */
-+      size_t att_length;
-+    } att_rfc822;        
-+    struct {
-+      char * att_content; /* can be NULL */
-+      size_t att_length;
-+    } att_rfc822_header;
-+    struct {
-+      char * att_content; /* can be NULL */
-+      size_t att_length;
-+    } att_rfc822_text;
-     uint32_t att_rfc822_size;
-     struct mailimap_body * att_bodystructure; /* can be NULL */
-     struct mailimap_body * att_body;          /* can be NULL */
diff --git a/noncore/net/mail/libetpanstuff/mailmime_content.c_arm_031_patch b/noncore/net/mail/libetpanstuff/mailmime_content.c_arm_031_patch
deleted file mode 100644
index 45fc834..0000000
--- a/noncore/net/mail/libetpanstuff/mailmime_content.c_arm_031_patch
+++ b/dev/null
@@ -1,20 +0,0 @@
---- mailmime_content.c.orig	2003-12-16 17:45:47.000000000 +0100
-+++ mailmime_content.c	2003-12-16 17:45:55.000000000 +0100
-@@ -1549,7 +1549,7 @@
- /* ************************************************************************* */
- /* MIME part decoding */
- 
--static char get_base64_value(char ch)
-+static signed char get_base64_value(char ch)
- {
-   if ((ch >= 'A') && (ch <= 'Z'))
-     return ch - 'A';
-@@ -1595,7 +1595,7 @@
- 
-   i = 0;
-   while (1) {
--    char value;
-+    signed char value;
- 
-     value = -1;
-     while (value == -1) {
diff --git a/noncore/net/mail/libetpanstuff/mailmime_decode.c_arm_031_patch b/noncore/net/mail/libetpanstuff/mailmime_decode.c_arm_031_patch
deleted file mode 100644
index 2963a14..0000000
--- a/noncore/net/mail/libetpanstuff/mailmime_decode.c_arm_031_patch
+++ b/dev/null
@@ -1,49 +0,0 @@
---- mailmime_decode.c.orig	2003-12-18 13:52:20.000000000 +0100
-+++ mailmime_decode.c	2003-12-18 13:50:46.000000000 +0100
-@@ -102,8 +102,8 @@
-   size_t cur_token;
-   int r;
-   int res;
--  char * str;
--  char * wordutf8;
-+  char * str = 0;
-+  char * wordutf8 = 0;
-   int type;
- 
-   cur_token = * index;
-@@ -147,14 +147,14 @@
- 	goto free;
-       }
- 
--      if (mmap_string_append(gphrase, wordutf8) == NULL) {
-+      if (wordutf8==NULL || mmap_string_append(gphrase, wordutf8) == NULL) {
- 	mailmime_encoded_word_free(word);
--        free(wordutf8);
-+        if (wordutf8) free(wordutf8);
- 	res = MAILIMF_ERROR_MEMORY;
- 	goto free;
-       }
-       mailmime_encoded_word_free(word);
--      free(wordutf8);
-+      if (wordutf8) free(wordutf8);
-       first = FALSE;
-     }
-     else if (r == MAILIMF_ERROR_PARSE) {
-@@ -183,14 +183,14 @@
-         r = charconv(tocode, default_fromcode, raw_word,
-             strlen(raw_word), &wordutf8);
- 
--	if (mmap_string_append(gphrase, wordutf8) == NULL) {
--          free(wordutf8);
-+	if (wordutf8==NULL || mmap_string_append(gphrase, wordutf8) == NULL) {
-+      if (wordutf8)free(wordutf8);
- 	  mailimf_word_free(raw_word);
- 	  res = MAILIMF_ERROR_MEMORY;
- 	  goto free;
- 	}
- 
--        free(wordutf8);
-+    if (wordutf8) free(wordutf8);
- 	mailimf_word_free(raw_word);
- 	first = FALSE;
-       }
diff --git a/noncore/net/mail/libetpanstuff/mailstream_socket.patch b/noncore/net/mail/libetpanstuff/mailstream_socket.patch
new file mode 100644
index 0000000..10c8fa3
--- a/dev/null
+++ b/noncore/net/mail/libetpanstuff/mailstream_socket.patch
@@ -0,0 +1,36 @@
+Index: tools/mailstream_socket.c
+===================================================================
+RCS file: /cvsroot/libetpan/libetpan/tools/mailstream_socket.c,v
+retrieving revision 1.13
+diff -u -d -r1.13 mailstream_socket.c
+--- tools/mailstream_socket.c	2 Mar 2004 23:54:17 -0000	1.13
++++ tools/mailstream_socket.c	11 Mar 2004 12:30:02 -0000
+@@ -44,6 +44,7 @@
+ */
+ #include <sys/time.h>
+ #include <sys/types.h>
++#include <sys/socket.h>
+ #include <unistd.h>
+ #include <sys/select.h>
+ 
+@@ -176,8 +177,8 @@
+     if (!FD_ISSET(socket_data->fd, &fds_read))
+       return 0;
+   }
+-  
+-  return read(socket_data->fd, buf, count);
++ 
++  return recv(socket_data->fd,buf,count,MSG_NOSIGNAL);
+ }
+ 
+ static ssize_t mailstream_low_socket_write(mailstream_low * s,
+@@ -207,8 +208,7 @@
+     if (!FD_ISSET(socket_data->fd, &fds_write))
+       return 0;
+   }
+-  
+-  return write(socket_data->fd, buf, count);
++  return send(socket_data->fd,buf,count,MSG_NOSIGNAL);
+ }
+ 
+