summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/libetpanstuff/libetpan-0.32-arm-linux.patch123
-rw-r--r--noncore/net/mail/libetpanstuff/libetpan-0.32-mailimap_sender.patch13
-rw-r--r--noncore/net/mail/libetpanstuff/libetpan-0.32-mailstream_fix.patch12
-rw-r--r--noncore/net/mail/libetpanstuff/libetpan-0.32-mimecontent_dbsymbol.patch90
-rw-r--r--noncore/net/mail/libetpanstuff/libetpan-0.33pre.tar.bz2bin452346 -> 0 bytes
-rw-r--r--noncore/net/mail/libetpanstuff/libetpan_031_patch308
-rw-r--r--noncore/net/mail/libetpanstuff/mailmime_content.c_arm_031_patch20
-rw-r--r--noncore/net/mail/libetpanstuff/mailmime_decode.c_arm_031_patch49
-rw-r--r--noncore/net/mail/libetpanstuff/mailstream_socket.patch36
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 @@
1diff -ru libetpan-0.32-patched/generic/imapdriver_tools.h libetpan-0.32-patched2/generic/imapdriver_tools.h
2 --- libetpan-0.32-patched/generic/imapdriver_tools.h2003-12-08 16:36:36.000000000 +0100
3 +++ libetpan-0.32-patched2/generic/imapdriver_tools.h2003-12-21 16:18:28.000000000 +0100
4@@ -41,6 +41,7 @@
5 #include "mailmime.h"
6 #include "imapdriver_types.h"
7 #include "mail_cache_db.h"
8+#include <sys/param.h>
9
10 #ifdef __cplusplus
11 extern "C" {
12diff -ru libetpan-0.32-patched/generic/imapdriver_types.h libetpan-0.32-patched2/generic/imapdriver_types.h
13 --- libetpan-0.32-patched/generic/imapdriver_types.h2003-12-15 04:33:57.000000000 +0100
14 +++ libetpan-0.32-patched2/generic/imapdriver_types.h2003-12-21 16:18:50.000000000 +0100
15@@ -43,6 +43,7 @@
16 #include <libetpan/maildriver_types.h>
17 #include <libetpan/generic_cache_types.h>
18 #include <libetpan/mailstorage_types.h>
19+#include <sys/param.h>
20
21 #ifdef __cplusplus
22 extern "C" {
23diff -ru libetpan-0.32-patched/generic/mailstorage_tools.c libetpan-0.32-patched2/generic/mailstorage_tools.c
24 --- libetpan-0.32-patched/generic/mailstorage_tools.c2003-12-15 04:33:57.000000000 +0100
25 +++ libetpan-0.32-patched2/generic/mailstorage_tools.c2003-12-21 16:10:52.000000000 +0100
26@@ -38,6 +38,7 @@
27 #include "libetpan-config.h"
28
29 #include <sys/types.h>
30+#include <sys/param.h>
31 #include <netdb.h>
32 #include <netinet/in.h>
33 #include <sys/socket.h>
34diff -ru libetpan-0.32-patched/generic/mhdriver_types.h libetpan-0.32-patched2/generic/mhdriver_types.h
35 --- libetpan-0.32-patched/generic/mhdriver_types.h2003-12-15 04:33:57.000000000 +0100
36 +++ libetpan-0.32-patched2/generic/mhdriver_types.h2003-12-21 16:17:53.000000000 +0100
37@@ -45,6 +45,8 @@
38 #include <libetpan/generic_cache_types.h>
39 #include <libetpan/mailstorage_types.h>
40
41+#include <sys/param.h>
42+
43 #ifdef __cplusplus
44 extern "C" {
45 #endif
46diff -ru libetpan-0.32-patched/generic/mime_message_driver.c libetpan-0.32-patched2/generic/mime_message_driver.c
47 --- libetpan-0.32-patched/generic/mime_message_driver.c2003-12-15 04:33:57.000000000 +0100
48 +++ libetpan-0.32-patched2/generic/mime_message_driver.c2003-12-21 16:20:17.000000000 +0100
49@@ -39,6 +39,7 @@
50
51 #include <sys/stat.h>
52 #include <sys/types.h>
53+#include <sys/param.h>
54 #include <unistd.h>
55 #include <sys/mman.h>
56 #include <stdlib.h>
57diff -ru libetpan-0.32-patched/generic/nntpdriver_types.h libetpan-0.32-patched2/generic/nntpdriver_types.h
58 --- libetpan-0.32-patched/generic/nntpdriver_types.h2003-12-15 04:33:57.000000000 +0100
59 +++ libetpan-0.32-patched2/generic/nntpdriver_types.h2003-12-21 16:19:43.000000000 +0100
60@@ -44,6 +44,7 @@
61 #include <libetpan/clist.h>
62 #include <libetpan/generic_cache_types.h>
63 #include <libetpan/mailstorage_types.h>
64+#include <sys/param.h>
65
66 #ifdef __cplusplus
67 extern "C" {
68diff -ru libetpan-0.32-patched/generic/pop3driver_types.h libetpan-0.32-patched2/generic/pop3driver_types.h
69 --- libetpan-0.32-patched/generic/pop3driver_types.h2003-12-15 04:33:57.000000000 +0100
70 +++ libetpan-0.32-patched2/generic/pop3driver_types.h2003-12-21 16:19:19.000000000 +0100
71@@ -44,6 +44,7 @@
72 #include <libetpan/maildriver_types.h>
73 #include <libetpan/chash.h>
74 #include <libetpan/mailstorage_types.h>
75+#include <sys/param.h>
76
77 #ifdef __cplusplus
78 extern "C" {
79diff -ru libetpan-0.32-patched/maildir/maildir_types.h libetpan-0.32-patched2/maildir/maildir_types.h
80 --- libetpan-0.32-patched/maildir/maildir_types.h2003-12-15 04:33:57.000000000 +0100
81 +++ libetpan-0.32-patched2/maildir/maildir_types.h2003-12-21 16:17:03.000000000 +0100
82@@ -38,6 +38,7 @@
83 #define MAILDIR_TYPES_H
84
85 #include <sys/types.h>
86+#include <sys/param.h>
87 #include <unistd.h>
88 #include <libetpan/chash.h>
89 #include <libetpan/carray.h>
90diff -ru libetpan-0.32-patched/mbox/mailmbox_types.h libetpan-0.32-patched2/mbox/mailmbox_types.h
91 --- libetpan-0.32-patched/mbox/mailmbox_types.h2003-12-15 04:33:57.000000000 +0100
92 +++ libetpan-0.32-patched2/mbox/mailmbox_types.h2003-12-21 16:14:58.000000000 +0100
93@@ -42,7 +42,7 @@
94 #endif
95
96 #include <sys/types.h>
97-
98+#include <sys/param.h>
99 #include <libetpan/libetpan-config.h>
100
101 #include <libetpan/mailimf.h>
102diff -ru libetpan-0.32-patched/tools/maillock.c libetpan-0.32-patched2/tools/maillock.c
103 --- libetpan-0.32-patched/tools/maillock.c2003-12-15 04:33:58.000000000 +0100
104 +++ libetpan-0.32-patched2/tools/maillock.c2003-12-21 16:14:19.000000000 +0100
105@@ -39,6 +39,7 @@
106
107 #include <sys/types.h>
108 #include <sys/stat.h>
109+#include <sys/param.h>
110 #include <fcntl.h>
111 #include <unistd.h>
112 #include <stdio.h>
113diff -ru libetpan-0.32-patched/tools/mmapstring.c libetpan-0.32-patched2/tools/mmapstring.c
114 --- libetpan-0.32-patched/tools/mmapstring.c2003-12-15 04:33:58.000000000 +0100
115 +++ libetpan-0.32-patched2/tools/mmapstring.c2003-12-21 16:13:32.000000000 +0100
116@@ -40,6 +40,7 @@
117 #include <stdlib.h>
118 #include <unistd.h>
119 #include <sys/mman.h>
120+#include <sys/param.h>
121 #include <string.h>
122 #include <pthread.h>
123
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 @@
1 --- imap/mailimap_sender.c.orig2003-12-15 04:33:57.000000000 +0100
2 +++ imap/mailimap_sender.c2004-01-08 03:22:13.000000000 +0100
3@@ -694,6 +694,10 @@
4 if (r != MAILIMAP_NO_ERROR)
5 return r;
6
7+ r = mailimap_space_send(fd);
8+ if (r != MAILIMAP_NO_ERROR)
9+ return r;
10+
11 r = mailimap_mailbox_send(fd, mb);
12 if (r != MAILIMAP_NO_ERROR)
13 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 @@
1diff -ru libetpan-0.32/tools/mailstream_helper.c libetpan-0.32_fixed/tools/mailstream_helper.c
2 --- libetpan-0.32/tools/mailstream_helper.c2003-12-15 04:33:58.000000000 +0100
3 +++ libetpan-0.32_fixed/tools/mailstream_helper.c2003-12-23 02:28:20.000000000 +0100
4@@ -352,7 +352,7 @@
5 current = message;
6 remaining = size;
7
8- while (remaining > 0) {
9+ while (remaining > 0 && remaining<=size) {
10 ssize_t length;
11
12 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 @@
1diff -ru libetpan-0.32/mime/mailmime_content.c libetpan-0.32-patched/mime/mailmime_content.c
2 --- libetpan-0.32/mime/mailmime_content.c2003-12-08 16:36:38.000000000 +0100
3 +++ libetpan-0.32-patched/mime/mailmime_content.c2003-12-21 15:42:04.000000000 +0100
4@@ -1549,7 +1549,7 @@
5 /* ************************************************************************* */
6 /* MIME part decoding */
7
8-static char get_base64_value(char ch)
9+static signed char get_base64_value(char ch)
10 {
11 if ((ch >= 'A') && (ch <= 'Z'))
12 return ch - 'A';
13@@ -1595,7 +1595,7 @@
14
15 i = 0;
16 while (1) {
17- char value;
18+ signed char value;
19
20 value = -1;
21 while (value == -1) {
22diff -ru libetpan-0.32/mime/mailmime_decode.c libetpan-0.32-patched/mime/mailmime_decode.c
23 --- libetpan-0.32/mime/mailmime_decode.c2003-12-03 22:35:31.000000000 +0100
24 +++ libetpan-0.32-patched/mime/mailmime_decode.c2003-12-21 15:42:25.000000000 +0100
25@@ -102,8 +102,8 @@
26 size_t cur_token;
27 int r;
28 int res;
29- char * str;
30- char * wordutf8;
31+ char * str = 0;
32+ char * wordutf8 = 0;
33 int type;
34
35 cur_token = * index;
36@@ -147,14 +147,14 @@
37 goto free;
38 }
39
40- if (mmap_string_append(gphrase, wordutf8) == NULL) {
41+ if (wordutf8==NULL || mmap_string_append(gphrase, wordutf8) == NULL) {
42 mailmime_encoded_word_free(word);
43- free(wordutf8);
44+ if (wordutf8) free(wordutf8);
45 res = MAILIMF_ERROR_MEMORY;
46 goto free;
47 }
48 mailmime_encoded_word_free(word);
49- free(wordutf8);
50+ if (wordutf8) free(wordutf8);
51 first = FALSE;
52 }
53 else if (r == MAILIMF_ERROR_PARSE) {
54@@ -183,14 +183,14 @@
55 r = charconv(tocode, default_fromcode, raw_word,
56 strlen(raw_word), &wordutf8);
57
58 -if (mmap_string_append(gphrase, wordutf8) == NULL) {
59- free(wordutf8);
60 +if (wordutf8==NULL || mmap_string_append(gphrase, wordutf8) == NULL) {
61+ if (wordutf8)free(wordutf8);
62 mailimf_word_free(raw_word);
63 res = MAILIMF_ERROR_MEMORY;
64 goto free;
65 }
66
67- free(wordutf8);
68+ if (wordutf8) free(wordutf8);
69 mailimf_word_free(raw_word);
70 first = FALSE;
71 }
72diff -ru libetpan-0.32/tools/mail_cache_db.c libetpan-0.32-patched/tools/mail_cache_db.c
73 --- libetpan-0.32/tools/mail_cache_db.c2003-12-15 04:33:58.000000000 +0100
74 +++ libetpan-0.32-patched/tools/mail_cache_db.c2003-12-21 15:45:36.000000000 +0100
75@@ -65,12 +65,13 @@
76
77 return cache_db;
78 }
79-
80+#endif
81 static void mail_cache_db_free(struct mail_cache_db * cache_db)
82 {
83+#if DBVERS >= 1
84 free(cache_db);
85-}
86 #endif
87+}
88
89 int mail_cache_db_open(const char * filename,
90 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
Binary files differ
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 @@
1Index: imap/mailimap_helper.c
2===================================================================
3RCS file: /cvsroot/libetpan/libetpan/imap/mailimap_helper.c,v
4retrieving revision 1.8
5retrieving revision 1.9
6diff -u -r1.8 -r1.9
7 --- imap/mailimap_helper.c 1 Dec 2003 05:06:28 -00001.8
8 +++ imap/mailimap_helper.c 11 Dec 2003 00:50:47 -00001.9
9@@ -30,7 +30,7 @@
10 */
11
12 /*
13- * $Id$
14+ * $Id$
15 */
16
17 #include "mailimap_helper.h"
18@@ -87,8 +87,8 @@
19 goto free;
20 }
21
22- * result = item->att_data.att_static->att_data.att_rfc822;
23- item->att_data.att_static->att_data.att_rfc822 = NULL;
24+ * result = item->att_data.att_static->att_data.att_rfc822.att_content;
25+ item->att_data.att_static->att_data.att_rfc822.att_content = NULL;
26 mailimap_fetch_list_free(fetch_list);
27
28 return MAILIMAP_NO_ERROR;
29@@ -149,8 +149,8 @@
30 goto err;
31 }
32
33- * result = item->att_data.att_static->att_data.att_rfc822_header;
34- item->att_data.att_static->att_data.att_rfc822_header = NULL;
35+ * result = item->att_data.att_static->att_data.att_rfc822_header.att_content;
36+ item->att_data.att_static->att_data.att_rfc822_header.att_content = NULL;
37 mailimap_fetch_list_free(fetch_list);
38
39 return MAILIMAP_NO_ERROR;
40Index: imap/mailimap_parser.c
41===================================================================
42RCS file: /cvsroot/libetpan/libetpan/imap/mailimap_parser.c,v
43retrieving revision 1.21
44retrieving revision 1.22
45diff -u -r1.21 -r1.22
46 --- imap/mailimap_parser.c 17 Nov 2003 01:03:25 -00001.21
47 +++ imap/mailimap_parser.c 11 Dec 2003 00:50:47 -00001.22
48@@ -30,7 +30,7 @@
49 */
50
51 /*
52- * $Id$
53+ * $Id$
54 */
55
56 #include <string.h>
57@@ -5868,7 +5868,7 @@
58 goto err;
59 }
60
61- sflag = 0;
62+ sflag = MAILIMAP_MBX_LIST_SFLAG_ERROR;
63 oflags_2 = NULL;
64
65 r = mailimap_struct_spaced_list_parse(fd, buffer, &cur_token,
66Index: imap/mailimap_print.c
67===================================================================
68RCS file: /cvsroot/libetpan/libetpan/imap/mailimap_print.c,v
69retrieving revision 1.11
70retrieving revision 1.12
71diff -u -r1.11 -r1.12
72 --- imap/mailimap_print.c 8 Dec 2003 15:36:38 -00001.11
73 +++ imap/mailimap_print.c 11 Dec 2003 00:50:47 -00001.12
74@@ -30,7 +30,7 @@
75 */
76
77 /*
78- * $Id$
79+ * $Id$
80 */
81 #ifdef DEBUG
82 #include "mailimap_print.h"
83@@ -736,7 +736,7 @@
84 case MAILIMAP_MSG_ATT_RFC822:
85 print_indent();
86 printf("rfc822 {\n");
87- printf("%s\n", msg_att_static->att_data.att_rfc822);
88+ printf("%s\n", msg_att_static->att_data.att_rfc822.att_content);
89 print_indent();
90 printf("}\n");
91 break;
92@@ -744,7 +744,7 @@
93 case MAILIMAP_MSG_ATT_RFC822_HEADER:
94 print_indent();
95 printf("rfc822-header {\n");
96- printf("%s\n", msg_att_static->att_data.att_rfc822_header);
97+ printf("%s\n", msg_att_static->att_data.att_rfc822_header.att_content);
98 print_indent();
99 printf("}\n");
100 break;
101@@ -752,7 +752,7 @@
102 case MAILIMAP_MSG_ATT_RFC822_TEXT:
103 print_indent();
104 printf("rfc822-text {\n");
105- printf("%s\n", msg_att_static->att_data.att_rfc822_text);
106+ printf("%s\n", msg_att_static->att_data.att_rfc822_text.att_content);
107 print_indent();
108 printf("}\n");
109 break;
110@@ -1039,9 +1039,9 @@
111 indent();
112
113 if (mbx_list_flags->mbf_type == MAILIMAP_MBX_LIST_FLAGS_SFLAG)
114- mailimap_mbx_list_sflag_print(mbx_list_flags->mbf_data.mbf_sflag);
115+ mailimap_mbx_list_sflag_print(mbx_list_flags->mbf_sflag);
116
117- for(cur = clist_begin(mbx_list_flags->mbf_data.mbf_oflags) ; cur != NULL ;
118+ for(cur = clist_begin(mbx_list_flags->mbf_oflags) ; cur != NULL ;
119 cur = clist_next(cur)) {
120 struct mailimap_mbx_list_oflag * oflag;
121
122Index: imap/mailimap_sender.c
123===================================================================
124RCS file: /cvsroot/libetpan/libetpan/imap/mailimap_sender.c,v
125retrieving revision 1.16
126retrieving revision 1.17
127diff -u -r1.16 -r1.17
128 --- imap/mailimap_sender.c 8 Dec 2003 15:36:38 -00001.16
129 +++ imap/mailimap_sender.c 11 Dec 2003 00:50:47 -00001.17
130@@ -30,7 +30,7 @@
131 */
132
133 /*
134- * $Id$
135+ * $Id$
136 */
137
138 #include "mailstream.h"
139@@ -396,6 +396,9 @@
140
141 static int is_atom(const char * str)
142 {
143+ if (* str == '\0')
144+ return 0;
145+
146 while (* str != '\0') {
147 unsigned char uch = (unsigned char) * str;
148
149Index: imap/mailimap_types.c
150===================================================================
151RCS file: /cvsroot/libetpan/libetpan/imap/mailimap_types.c,v
152retrieving revision 1.16
153retrieving revision 1.17
154diff -u -r1.16 -r1.17
155 --- imap/mailimap_types.c 1 Dec 2003 05:06:28 -00001.16
156 +++ imap/mailimap_types.c 11 Dec 2003 00:50:47 -00001.17
157@@ -30,7 +30,7 @@
158 */
159
160 /*
161- * $Id$
162+ * $Id$
163 */
164
165 #include "mailimap_types.h"
166@@ -1417,14 +1417,8 @@
167 return NULL;
168
169 mbx_list_flags->mbf_type = mbf_type;
170- switch (mbf_type) {
171- case MAILIMAP_MBX_LIST_FLAGS_SFLAG:
172- mbx_list_flags->mbf_data.mbf_oflags = mbf_oflags;
173- break;
174- case MAILIMAP_MBX_LIST_FLAGS_NO_SFLAG:
175- mbx_list_flags->mbf_data.mbf_sflag = mbf_sflag;
176- break;
177- }
178+ mbx_list_flags->mbf_oflags = mbf_oflags;
179+ mbx_list_flags->mbf_sflag = mbf_sflag;
180
181 return mbx_list_flags;
182 }
183@@ -1432,14 +1426,10 @@
184 void
185 mailimap_mbx_list_flags_free(struct mailimap_mbx_list_flags * mbx_list_flags)
186 {
187- switch (mbx_list_flags->mbf_type) {
188- case MAILIMAP_MBX_LIST_FLAGS_NO_SFLAG:
189- clist_foreach(mbx_list_flags->mbf_data.mbf_oflags,
190 - (clist_func) mailimap_mbx_list_oflag_free,
191 - NULL);
192- clist_free(mbx_list_flags->mbf_data.mbf_oflags);
193- break;
194- }
195+ clist_foreach(mbx_list_flags->mbf_oflags,
196+ (clist_func) mailimap_mbx_list_oflag_free,
197+ NULL);
198+ clist_free(mbx_list_flags->mbf_oflags);
199
200 free(mbx_list_flags);
201 }
202@@ -1765,14 +1755,16 @@
203 item->att_data.att_internal_date = att_internal_date;
204 break;
205 case MAILIMAP_MSG_ATT_RFC822:
206- item->att_data.att_rfc822 = att_rfc822;
207+ item->att_data.att_rfc822.att_content = att_rfc822;
208+ item->att_data.att_rfc822.att_length = att_length;
209 break;
210 case MAILIMAP_MSG_ATT_RFC822_HEADER:
211- item->att_data.att_rfc822_header = att_rfc822_header;
212+ item->att_data.att_rfc822_header.att_content = att_rfc822_header;
213+ item->att_data.att_rfc822_header.att_length = att_length;
214 break;
215 case MAILIMAP_MSG_ATT_RFC822_TEXT:
216- item->att_data.att_rfc822_text = att_rfc822_text;
217- item->att_data.att_length = att_length;
218+ item->att_data.att_rfc822_text.att_content = att_rfc822_text;
219+ item->att_data.att_rfc822_text.att_length = att_length;
220 break;
221 case MAILIMAP_MSG_ATT_RFC822_SIZE:
222 item->att_data.att_rfc822_size = att_rfc822_size;
223@@ -1807,16 +1799,16 @@
224 mailimap_msg_att_internaldate_free(item->att_data.att_internal_date);
225 break;
226 case MAILIMAP_MSG_ATT_RFC822:
227- if (item->att_data.att_rfc822 != NULL)
228- mailimap_msg_att_rfc822_free(item->att_data.att_rfc822);
229+ if (item->att_data.att_rfc822.att_content != NULL)
230+ mailimap_msg_att_rfc822_free(item->att_data.att_rfc822.att_content);
231 break;
232 case MAILIMAP_MSG_ATT_RFC822_HEADER:
233- if (item->att_data.att_rfc822_header != NULL)
234- mailimap_msg_att_rfc822_header_free(item->att_data.att_rfc822_header);
235+ if (item->att_data.att_rfc822_header.att_content != NULL)
236+ mailimap_msg_att_rfc822_header_free(item->att_data.att_rfc822_header.att_content);
237 break;
238 case MAILIMAP_MSG_ATT_RFC822_TEXT:
239- if (item->att_data.att_rfc822_text != NULL)
240- mailimap_msg_att_rfc822_text_free(item->att_data.att_rfc822_text);
241+ if (item->att_data.att_rfc822_text.att_content != NULL)
242+ mailimap_msg_att_rfc822_text_free(item->att_data.att_rfc822_text.att_content);
243 break;
244 case MAILIMAP_MSG_ATT_BODYSTRUCTURE:
245 if (item->att_data.att_bodystructure != NULL)
246Index: imap/mailimap_types.h
247===================================================================
248RCS file: /cvsroot/libetpan/libetpan/imap/mailimap_types.h,v
249retrieving revision 1.17
250retrieving revision 1.18
251diff -u -r1.17 -r1.18
252 --- imap/mailimap_types.h 1 Dec 2003 05:06:28 -00001.17
253 +++ imap/mailimap_types.h 11 Dec 2003 00:50:47 -00001.18
254@@ -30,7 +30,7 @@
255 */
256
257 /*
258- * $Id$
259+ * $Id$
260 */
261
262
263@@ -1642,6 +1642,7 @@
264 /* this is a single flag type */
265
266 enum {
267+ MAILIMAP_MBX_LIST_SFLAG_ERROR,
268 MAILIMAP_MBX_LIST_SFLAG_MARKED,
269 MAILIMAP_MBX_LIST_SFLAG_NOSELECT,
270 MAILIMAP_MBX_LIST_SFLAG_UNMARKED
271@@ -1660,11 +1661,9 @@
272
273 struct mailimap_mbx_list_flags {
274 int mbf_type;
275- union {
276- clist * mbf_oflags; /* list of
277- (struct mailimap_mbx_list_oflag *), != NULL */
278- int mbf_sflag;
279- } mbf_data;
280+ clist * mbf_oflags; /* list of
281+ (struct mailimap_mbx_list_oflag *), != NULL */
282+ int mbf_sflag;
283 };
284
285 struct mailimap_mbx_list_flags *
286@@ -1984,10 +1983,18 @@
287 union {
288 struct mailimap_envelope * att_env; /* can be NULL */
289 struct mailimap_date_time * att_internal_date; /* can be NULL */
290- char * att_rfc822; /* can be NULL */
291- char * att_rfc822_header; /* can be NULL */
292- char * att_rfc822_text; /* can be NULL */
293- size_t att_length;
294+ struct {
295+ char * att_content; /* can be NULL */
296+ size_t att_length;
297+ } att_rfc822;
298+ struct {
299+ char * att_content; /* can be NULL */
300+ size_t att_length;
301+ } att_rfc822_header;
302+ struct {
303+ char * att_content; /* can be NULL */
304+ size_t att_length;
305+ } att_rfc822_text;
306 uint32_t att_rfc822_size;
307 struct mailimap_body * att_bodystructure; /* can be NULL */
308 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 @@
1 --- mailmime_content.c.orig2003-12-16 17:45:47.000000000 +0100
2 +++ mailmime_content.c2003-12-16 17:45:55.000000000 +0100
3@@ -1549,7 +1549,7 @@
4 /* ************************************************************************* */
5 /* MIME part decoding */
6
7-static char get_base64_value(char ch)
8+static signed char get_base64_value(char ch)
9 {
10 if ((ch >= 'A') && (ch <= 'Z'))
11 return ch - 'A';
12@@ -1595,7 +1595,7 @@
13
14 i = 0;
15 while (1) {
16- char value;
17+ signed char value;
18
19 value = -1;
20 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 @@
1 --- mailmime_decode.c.orig2003-12-18 13:52:20.000000000 +0100
2 +++ mailmime_decode.c2003-12-18 13:50:46.000000000 +0100
3@@ -102,8 +102,8 @@
4 size_t cur_token;
5 int r;
6 int res;
7- char * str;
8- char * wordutf8;
9+ char * str = 0;
10+ char * wordutf8 = 0;
11 int type;
12
13 cur_token = * index;
14@@ -147,14 +147,14 @@
15 goto free;
16 }
17
18- if (mmap_string_append(gphrase, wordutf8) == NULL) {
19+ if (wordutf8==NULL || mmap_string_append(gphrase, wordutf8) == NULL) {
20 mailmime_encoded_word_free(word);
21- free(wordutf8);
22+ if (wordutf8) free(wordutf8);
23 res = MAILIMF_ERROR_MEMORY;
24 goto free;
25 }
26 mailmime_encoded_word_free(word);
27- free(wordutf8);
28+ if (wordutf8) free(wordutf8);
29 first = FALSE;
30 }
31 else if (r == MAILIMF_ERROR_PARSE) {
32@@ -183,14 +183,14 @@
33 r = charconv(tocode, default_fromcode, raw_word,
34 strlen(raw_word), &wordutf8);
35
36 -if (mmap_string_append(gphrase, wordutf8) == NULL) {
37- free(wordutf8);
38 +if (wordutf8==NULL || mmap_string_append(gphrase, wordutf8) == NULL) {
39+ if (wordutf8)free(wordutf8);
40 mailimf_word_free(raw_word);
41 res = MAILIMF_ERROR_MEMORY;
42 goto free;
43 }
44
45- free(wordutf8);
46+ if (wordutf8) free(wordutf8);
47 mailimf_word_free(raw_word);
48 first = FALSE;
49 }
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 @@
1Index: tools/mailstream_socket.c
2===================================================================
3RCS file: /cvsroot/libetpan/libetpan/tools/mailstream_socket.c,v
4retrieving revision 1.13
5diff -u -d -r1.13 mailstream_socket.c
6 --- tools/mailstream_socket.c 2 Mar 2004 23:54:17 -00001.13
7 +++ tools/mailstream_socket.c11 Mar 2004 12:30:02 -0000
8@@ -44,6 +44,7 @@
9 */
10 #include <sys/time.h>
11 #include <sys/types.h>
12+#include <sys/socket.h>
13 #include <unistd.h>
14 #include <sys/select.h>
15
16@@ -176,8 +177,8 @@
17 if (!FD_ISSET(socket_data->fd, &fds_read))
18 return 0;
19 }
20-
21- return read(socket_data->fd, buf, count);
22+
23+ return recv(socket_data->fd,buf,count,MSG_NOSIGNAL);
24 }
25
26 static ssize_t mailstream_low_socket_write(mailstream_low * s,
27@@ -207,8 +208,7 @@
28 if (!FD_ISSET(socket_data->fd, &fds_write))
29 return 0;
30 }
31-
32- return write(socket_data->fd, buf, count);
33+ return send(socket_data->fd,buf,count,MSG_NOSIGNAL);
34 }
35
36