1 |
commit: 8ce0f9e555fa6e7732573e2f61cddcab0178e354 |
2 |
Author: Donnie Berkholz <dberkholz <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 27 01:33:37 2011 +0000 |
4 |
Commit: Donnie Berkholz <dberkholz <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 27 01:33:37 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dberkholz.git;a=commit;h=8ce0f9e5 |
7 |
|
8 |
mutt: add a version with courier-compatible sidebar & sendbar patches. |
9 |
|
10 |
--- |
11 |
mail-client/mutt/ChangeLog | 497 +++++++++++++++++++- |
12 |
mail-client/mutt/Manifest | 14 +- |
13 |
.../mutt/files/1.5.21-resent-header-weeding.patch | 39 ++ |
14 |
mail-client/mutt/files/1.5.21-sendbox-bounce.patch | 119 +++++ |
15 |
mail-client/mutt/files/1.5.21-sendbox.patch | 125 +++++ |
16 |
.../mutt/files/1.5.21-write_postponed.patch | 433 +++++++++++++++++ |
17 |
mail-client/mutt/metadata.xml | 9 - |
18 |
mail-client/mutt/mutt-1.5.18.ebuild | 181 ------- |
19 |
mail-client/mutt/mutt-1.5.21-r3.ebuild | 242 ++++++++++ |
20 |
9 files changed, 1461 insertions(+), 198 deletions(-) |
21 |
|
22 |
diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog |
23 |
index 255ab92..204ae98 100644 |
24 |
--- a/mail-client/mutt/ChangeLog |
25 |
+++ b/mail-client/mutt/ChangeLog |
26 |
@@ -1,6 +1,499 @@ |
27 |
# ChangeLog for mail-client/mutt |
28 |
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.121 2008/03/09 21:36:14 ricmm Exp $ |
30 |
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
31 |
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.214 2011/04/26 17:32:13 grobian Exp $ |
32 |
+ |
33 |
+*mutt-1.5.21-r2 (26 Apr 2011) |
34 |
+ |
35 |
+ 26 Apr 2011; Fabian Groffen <grobian@g.o> +mutt-1.5.21-r2.ebuild: |
36 |
+ Revision bump with three fixes from upstream, added trash folder feature |
37 |
+ patch for GMail users, bug #364379 |
38 |
+ |
39 |
+ 17 Apr 2011; Raúl Porcel <armin76@g.o> mutt-1.5.21-r1.ebuild: |
40 |
+ ia64/sparc stable wrt #357795 |
41 |
+ |
42 |
+ 27 Mar 2011; Kacper Kowalik <xarthisius@g.o> mutt-1.5.21-r1.ebuild: |
43 |
+ ppc64 stable wrt #357795 |
44 |
+ |
45 |
+ 27 Mar 2011; Tobias Klausmann <klausman@g.o> mutt-1.5.21-r1.ebuild: |
46 |
+ Stable on alpha, bug #357795 |
47 |
+ |
48 |
+ 26 Mar 2011; Christian Faulhammer <fauli@g.o> |
49 |
+ mutt-1.5.21-r1.ebuild: |
50 |
+ stable x86, bug 357795 |
51 |
+ |
52 |
+ 22 Mar 2011; Brent Baude <ranger@g.o> mutt-1.5.21-r1.ebuild: |
53 |
+ stable ppc, bug 357795 |
54 |
+ |
55 |
+ 08 Mar 2011; Markos Chandras <hwoarang@g.o> mutt-1.5.21-r1.ebuild: |
56 |
+ Stable on amd64 wrt bug #357795 |
57 |
+ |
58 |
+ 08 Mar 2011; Jeroen Roovers <jer@g.o> mutt-1.5.21-r1.ebuild: |
59 |
+ Stable for HPPA (bug #357795). |
60 |
+ |
61 |
+ 30 Jan 2011; Fabian Groffen <grobian@g.o> mutt-1.5.21-r1.ebuild: |
62 |
+ Add urls for our mercurial sources, don't compress files, fixes bug #352764 |
63 |
+ |
64 |
+ 07 Dec 2010; Fabian Groffen <grobian@g.o> |
65 |
+ -files/mutt-1.5.13-prefix-mailcap.patch, |
66 |
+ -files/mutt-1.5.16-parallel-make.patch, |
67 |
+ -files/mutt-1.5.18-bdb-prefix.patch, -files/mutt-1.5.18-interix.patch, |
68 |
+ -files/mutt-1.5.18-solaris-ncurses-chars.patch, -mutt-1.5.20-r6.ebuild, |
69 |
+ -mutt-1.5.20-r10.ebuild, -mutt-1.5.20-r13.ebuild, -mutt-1.5.20-r15.ebuild, |
70 |
+ -mutt-1.5.20-r17.ebuild, |
71 |
+ -files/mutt-1.5.20-crash-on-invalid-limit-pattern.patch, |
72 |
+ -files/mutt-1.5.20-dont-reveal-bbc.patch, |
73 |
+ -files/mutt-1.5.20-gpgme-1.2.0.patch, |
74 |
+ -files/mutt-1.5.20-realpath-slowness.patch: |
75 |
+ Drop old versions, 1.5.20-r6 can be removed per bug #347994 |
76 |
+ |
77 |
+ 07 Dec 2010; Matt Turner <mattst88@g.o> mutt-1.5.21-r1.ebuild: |
78 |
+ Readded ~mips keyword, bug 290154. |
79 |
+ |
80 |
+ 10 Oct 2010; Raúl Porcel <armin76@g.o> mutt-1.5.20-r18.ebuild: |
81 |
+ ia64/sparc stable wrt #339040 |
82 |
+ |
83 |
+ 05 Oct 2010; Markus Meier <maekke@g.o> mutt-1.5.20-r18.ebuild: |
84 |
+ x86 stable, bug #339040 |
85 |
+ |
86 |
+ 05 Oct 2010; Jeroen Roovers <jer@g.o> mutt-1.5.20-r18.ebuild: |
87 |
+ Stable for PPC (bug #339040). |
88 |
+ |
89 |
+ 05 Oct 2010; Jeroen Roovers <jer@g.o> mutt-1.5.20-r18.ebuild: |
90 |
+ Stable for HPPA (bug #339040). |
91 |
+ |
92 |
+ 03 Oct 2010; Markos Chandras <hwoarang@g.o> mutt-1.5.20-r18.ebuild: |
93 |
+ Stable on amd64 wrt bug #339040 |
94 |
+ |
95 |
+ 03 Oct 2010; Tobias Klausmann <klausman@g.o> |
96 |
+ mutt-1.5.20-r18.ebuild: |
97 |
+ Stable on alpha, bug #339040 |
98 |
+ |
99 |
+*mutt-1.5.21-r1 (02 Oct 2010) |
100 |
+ |
101 |
+ 02 Oct 2010; Fabian Groffen <grobian@g.o> -mutt-1.5.21.ebuild, |
102 |
+ +mutt-1.5.21-r1.ebuild: |
103 |
+ Bump, include aggregated fixes from upstream, add pdmef's progress bar |
104 |
+ patch, add fixed sidebar patch from Stuart Henderson/OpenBSD, update url |
105 |
+ to quickstart guide to Mutt |
106 |
+ |
107 |
+ 28 Sep 2010; Samuli Suominen <ssuominen@g.o> |
108 |
+ mutt-1.5.20-r18.ebuild: |
109 |
+ ppc64 stable wrt #339040 |
110 |
+ |
111 |
+*mutt-1.5.21 (17 Sep 2010) |
112 |
+ |
113 |
+ 17 Sep 2010; Fabian Groffen <grobian@g.o> +mutt-1.5.21.ebuild: |
114 |
+ Version bump. Masked for as long USE=sidebar is missing an updated sidebar |
115 |
+ patch. |
116 |
+ |
117 |
+*mutt-1.5.20-r18 (10 Aug 2010) |
118 |
+ |
119 |
+ 10 Aug 2010; Fabian Groffen <grobian@g.o> +mutt-1.5.20-r18.ebuild: |
120 |
+ Revbump, include latest bunch of fixes from upstream. |
121 |
+ |
122 |
+*mutt-1.5.20-r17 (02 Aug 2010) |
123 |
+ |
124 |
+ 02 Aug 2010; Fabian Groffen <grobian@g.o> -mutt-1.5.20-r16.ebuild, |
125 |
+ +mutt-1.5.20-r17.ebuild: |
126 |
+ Revision bump, drop mbox_hook patch as it breaks move messages on exit. |
127 |
+ The patch seems to be very outdated and not in use by other distros. |
128 |
+ Thanks Norman Yarvin. |
129 |
+ |
130 |
+ 23 Jul 2010; Fabian Groffen <grobian@g.o> mutt-1.5.20-r16.ebuild: |
131 |
+ Bump patchset to fix some misc compilation issues, most notably when |
132 |
+ USE=-nntp, bug #329501 |
133 |
+ |
134 |
+*mutt-1.5.20-r16 (22 Jul 2010) |
135 |
+ |
136 |
+ 22 Jul 2010; Fabian Groffen <grobian@g.o> +mutt-1.5.20-r16.ebuild: |
137 |
+ Bump, next to a little bugfix from upstream, this revision no longer has |
138 |
+ USE=vanilla (because vanilla Mutt is simply useless these days), always |
139 |
+ has the nntp patch applied (but enabled/disabled per configure), and has |
140 |
+ (most people were longing for this) the sidebar patch applied on top of |
141 |
+ all other fixes and features. |
142 |
+ |
143 |
+ 16 Jul 2010; Fabian Groffen <grobian@g.o> mutt-1.5.20-r15.ebuild, |
144 |
+ -files/mutt-1.5.20_ssl.patch: |
145 |
+ Undo last commit, as it broke unpacking, since -r10 the patch is already |
146 |
+ included. |
147 |
+ |
148 |
+ 15 Jul 2010; Markos Chandras <hwoarang@g.o> mutt-1.5.20-r15.ebuild, |
149 |
+ +files/mutt-1.5.20_ssl.patch: |
150 |
+ Apply upstream patch to fix compilation with openssl-1.0.0. Bug #328487 |
151 |
+ |
152 |
+ 02 Jul 2010; Fabian Groffen <grobian@g.o> mutt-1.5.20-r15.ebuild: |
153 |
+ Cleanup logic for USE=sidebar. Add big fat warnings that USE=sidebar |
154 |
+ implies USE=vanilla, and that USE=vanilla excludes the use of zillions of |
155 |
+ bugfixes applied upstream since the last Mutt release. |
156 |
+ |
157 |
+ 12 Jun 2010; Fabian Groffen <grobian@g.o> mutt-1.5.20-r15.ebuild, |
158 |
+ +files/mutt-1.5.20-crash-on-invalid-limit-pattern.patch: |
159 |
+ Add patch for bug #323613, needs to be taken upstream, works for me to |
160 |
+ resolve the crash. Reorganise src_prepare such that we don't patch |
161 |
+ anything other than what is strictly necessary with USE=vanilla. |
162 |
+ |
163 |
+*mutt-1.5.20-r15 (06 Jun 2010) |
164 |
+ |
165 |
+ 06 Jun 2010; Fabian Groffen <grobian@g.o> -mutt-1.5.20-r14.ebuild, |
166 |
+ +mutt-1.5.20-r15.ebuild: |
167 |
+ Bump for new bugfixes/patches from upstream HG, drop masked -r14 |
168 |
+ |
169 |
+ 12 Apr 2010; Fabian Groffen <grobian@g.o> mutt-1.5.20-r14.ebuild: |
170 |
+ Test drive fix for segfault with -r14 |
171 |
+ |
172 |
+ 12 Apr 2010; Fabian Groffen <grobian@g.o> mutt-1.5.20-r6.ebuild, |
173 |
+ mutt-1.5.20-r10.ebuild, mutt-1.5.20-r13.ebuild, mutt-1.5.20-r14.ebuild: |
174 |
+ Fix up -r4 patch to fix compilation issue, bug #314785 |
175 |
+ |
176 |
+*mutt-1.5.20-r14 (11 Apr 2010) |
177 |
+ |
178 |
+ 11 Apr 2010; Fabian Groffen <grobian@g.o> |
179 |
+ -files/mutt-1.5.19-libgnutls-test-15c662a95b91.patch, |
180 |
+ -files/mutt-1.5.19-mutt-gnutls-7d0583e0315d-0b13183e40e0.patch, |
181 |
+ -files/mutt-1.5.19-mutt_ssl-3af7e8af1983-dc9ec900c657.patch, |
182 |
+ -mutt-1.5.20-r4.ebuild, mutt-1.5.20-r6.ebuild, mutt-1.5.20-r10.ebuild, |
183 |
+ -mutt-1.5.20-r12.ebuild, mutt-1.5.20-r13.ebuild, +mutt-1.5.20-r14.ebuild, |
184 |
+ -files/mutt-1.5.20-abort-prompt-ctrlc-c837ab790d2e.patch, |
185 |
+ -files/mutt-1.5.20-copy-From-to-imap-b2b97c7a2ae6.patch, |
186 |
+ -files/mutt-1.5.20-display-unsigned-pgp-7f37d0a57d83.patch, |
187 |
+ -files/mutt-1.5.20-fix-mh-parsing-14bb498c6a1c.patch, |
188 |
+ -files/mutt-1.5.20-gpgme-case-insensitive-domain-2c78b28027cc.patch, |
189 |
+ -files/mutt-1.5.20-gpgme-keys-d41e043fa775.patch, |
190 |
+ -files/mutt-1.5.20-hcache-restore-address-848f08512bf3.patch, |
191 |
+ -files/mutt-1.5.20-hcache-uidvalidity-size-fix-a2a4286491b4.patch, |
192 |
+ -files/mutt-1.5.20-header-weeding-f40de578e8ed.patch, |
193 |
+ -files/mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch, |
194 |
+ -files/mutt-1.5.20-imap-start-fatal-fe30f394cbe6.patch, |
195 |
+ -files/mutt-1.5.20-leave-mailbox-no-new-mail-118b8fef8aae.patch, |
196 |
+ -files/mutt-1.5.20-mailbox-save-message-double-free-57124ea5592e.patch, |
197 |
+ -files/mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch, |
198 |
+ -files/mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch, |
199 |
+ -files/mutt-1.5.20-mhs-flags-leak-9f3053f75f27.patch, |
200 |
+ -files/mutt-1.5.20-next-invalid-pattern-crash-6a08a5244d60.patch, |
201 |
+ -files/mutt-1.5.20-no-hcolor-in-hcache-b7d2cb7c7ce1.patch, |
202 |
+ -files/mutt-1.5.20-null-dptr-use-data-817c60d5da7d.patch, |
203 |
+ -files/mutt-1.5.20-off-by-one-mailcap-736b6af3c5f1.patch, |
204 |
+ -files/mutt-1.5.20-pop-port-in-url-6b057dc52222.patch, |
205 |
+ -files/mutt-1.5.20-propagate-mh_read_sequences-2fc9348684fe.patch, |
206 |
+ +files/mutt-1.5.20-realpath-slowness.patch, |
207 |
+ -files/mutt-1.5.20-regexp-fail-crash-05cec973f0d9.patch, |
208 |
+ -files/mutt-1.5.20-rfc-2047-decode-before-dequote-2a4ca6917fd0.patch, |
209 |
+ -files/mutt-1.5.20-search-pattern-crash-053ef7bbaa72.patch, |
210 |
+ -files/mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch, |
211 |
+ -files/mutt-1.5.20-ssl-CVE-2009-3765-dc09812e63a3.patch, |
212 |
+ -files/mutt-1.5.20-ssl-stack-compile-fix-1cf34ea1f128.patch, |
213 |
+ -files/mutt-1.5.20-subject-mistruncation-31881f38ca1e.patch, |
214 |
+ -files/mutt-1.5.20-tab-subject-questionmark-298194c414f0-cff8e8ce4327.patc |
215 |
+ h, -files/mutt-1.5.20-ungroup-command-77ac8b5c2be6.patch, |
216 |
+ -files/mutt-1.5.20-unmailbox-segfault-25e46aad362b.patch, |
217 |
+ -files/mutt-1.5.20-yes-no-non-ascii-a6fddecdc5f5.patch: |
218 |
+ - Drop unused ebuilds |
219 |
+ - Drop keywords from mutt-1.5.20-r6: it is the last version for mips |
220 |
+ - Drop HG patches from filesdir, all moved to jumbo patches from the |
221 |
+ patchball |
222 |
+ - Added mutt-1.5.20-r14 with latest fixes from upstream |
223 |
+ |
224 |
+*mutt-1.5.20-r13 (11 Mar 2010) |
225 |
+ |
226 |
+ 11 Mar 2010; Fabian Groffen <grobian@g.o> +mutt-1.5.20-r13.ebuild, |
227 |
+ +files/mutt-1.5.20-abort-prompt-ctrlc-c837ab790d2e.patch, |
228 |
+ +files/mutt-1.5.20-gpgme-case-insensitive-domain-2c78b28027cc.patch, |
229 |
+ +files/mutt-1.5.20-mailbox-save-message-double-free-57124ea5592e.patch, |
230 |
+ +files/mutt-1.5.20-null-dptr-use-data-817c60d5da7d.patch, |
231 |
+ +files/mutt-1.5.20-pop-port-in-url-6b057dc52222.patch, |
232 |
+ +files/mutt-1.5.20-regexp-fail-crash-05cec973f0d9.patch, |
233 |
+ +files/mutt-1.5.20-rfc-2047-decode-before-dequote-2a4ca6917fd0.patch: |
234 |
+ Bump du jour, add another bunch of patches from upstream, they really |
235 |
+ should make a new release. Convert to EAPI=3, remove WANT_AUTOCONF |
236 |
+ unsetting. |
237 |
+ |
238 |
+*mutt-1.5.20-r12 (22 Feb 2010) |
239 |
+ |
240 |
+ 22 Feb 2010; Fabian Groffen <grobian@g.o> -mutt-1.5.20-r11.ebuild, |
241 |
+ +mutt-1.5.20-r12.ebuild, |
242 |
+ +files/mutt-1.5.20-yes-no-non-ascii-a6fddecdc5f5.patch: |
243 |
+ Revbump for upstream patch dealing with yes/no prompt |
244 |
+ |
245 |
+*mutt-1.5.20-r11 (11 Feb 2010) |
246 |
+ |
247 |
+ 11 Feb 2010; Fabian Groffen <grobian@g.o> +mutt-1.5.20-r11.ebuild, |
248 |
+ +files/mutt-1.5.20-copy-From-to-imap-b2b97c7a2ae6.patch: |
249 |
+ Add patch from upstream to preserve From when copying mail from e.g. mbox |
250 |
+ to imap. |
251 |
+ |
252 |
+ 01 Feb 2010; Markus Meier <maekke@g.o> mutt-1.5.20-r10.ebuild: |
253 |
+ amd64 stable, bug #290660 |
254 |
+ |
255 |
+ 12 Jan 2010; Jeroen Roovers <jer@g.o> mutt-1.5.20-r10.ebuild: |
256 |
+ Stable for HPPA (bug #290660). |
257 |
+ |
258 |
+ 09 Jan 2010; Raúl Porcel <armin76@g.o> mutt-1.5.20-r10.ebuild: |
259 |
+ alpha/ia64/sparc stable wrt #290660 |
260 |
+ |
261 |
+ 09 Jan 2010; Christian Faulhammer <fauli@g.o> |
262 |
+ mutt-1.5.20-r10.ebuild: |
263 |
+ stable x86, security bug 290660 |
264 |
+ |
265 |
+ 08 Jan 2010; Brent Baude <ranger@g.o> mutt-1.5.20-r10.ebuild: |
266 |
+ Marking mutt-1.5.20-r10 ppc64 and ppc for bug 290660 |
267 |
+ |
268 |
+ 31 Dec 2009; Brent Baude <ranger@g.o> mutt-1.5.20-r10.ebuild: |
269 |
+ Marking mutt-1.5.20-r10 ~ppc64 for bug 290154 |
270 |
+ |
271 |
+*mutt-1.5.20-r10 (29 Dec 2009) |
272 |
+ |
273 |
+ 29 Dec 2009; Fabian Groffen <grobian@g.o> -mutt-1.5.20-r9.ebuild, |
274 |
+ +mutt-1.5.20-r10.ebuild, |
275 |
+ +files/mutt-1.5.20-subject-mistruncation-31881f38ca1e.patch: |
276 |
+ Bump for patch to fix subject not properly being truncated when there are |
277 |
+ tree arrows on the same line |
278 |
+ |
279 |
+ 17 Dec 2009; Fabian Groffen <grobian@g.o> mutt-1.5.20-r6, |
280 |
+ mutt-1.5.20-r9.ebuild: |
281 |
+ update nntp patch to latest sources, thanks Michael Meyer |
282 |
+ |
283 |
+*mutt-1.5.20-r9 (15 Dec 2009) |
284 |
+ |
285 |
+ 15 Dec 2009; Fabian Groffen <grobian@g.o> -mutt-1.5.20-r8.ebuild, |
286 |
+ +mutt-1.5.20-r9.ebuild, |
287 |
+ +files/mutt-1.5.20-no-hcolor-in-hcache-b7d2cb7c7ce1.patch, |
288 |
+ +files/mutt-1.5.20-off-by-one-mailcap-736b6af3c5f1.patch: |
289 |
+ Bump to fix two bugs fixed upstream: don't store header colors in header |
290 |
+ cache and fix off-by-one errors in mailcap parsing |
291 |
+ |
292 |
+ 08 Dec 2009; Fabian Groffen <grobian@g.o> mutt-1.5.20-r8.ebuild, |
293 |
+ +files/mutt-1.5.20-ssl-stack-compile-fix-1cf34ea1f128.patch: |
294 |
+ Add patch from upstream for compiling against newer OpenSSL |
295 |
+ |
296 |
+ 30 Nov 2009; Raúl Porcel <armin76@g.o> mutt-1.5.20-r8.ebuild: |
297 |
+ Re-add ~ia64/~sparc wrt #290154 |
298 |
+ |
299 |
+ 06 Nov 2009; Jeroen Roovers <jer@g.o> mutt-1.5.20-r8.ebuild: |
300 |
+ Marked ~hppa (bug #290154). |
301 |
+ |
302 |
+ 31 Oct 2009; Mounir Lamouri <volkmar@g.o> mutt-1.5.20-r8.ebuild: |
303 |
+ Re-Keywording for ppc, bug 290154 |
304 |
+ |
305 |
+ 27 Oct 2009; Fabian Groffen <grobian@g.o> mutt-1.5.20-r8.ebuild: |
306 |
+ Remove mmdf.5 and mbox.5 manpages, bug #177605 |
307 |
+ |
308 |
+ 27 Oct 2009; Alexis Ballier <aballier@g.o> mutt-1.5.20-r8.ebuild: |
309 |
+ keyword ~x86-fbsd, bug #290154 |
310 |
+ |
311 |
+*mutt-1.5.20-r8 (27 Oct 2009) |
312 |
+ |
313 |
+ 27 Oct 2009; Fabian Groffen <grobian@g.o> -mutt-1.5.20-r7.ebuild, |
314 |
+ +mutt-1.5.20-r8.ebuild, |
315 |
+ +files/mutt-1.5.20-ssl-CVE-2009-3765-dc09812e63a3.patch: |
316 |
+ Add patch to fix ssl security issue CVE-2009-3765, bug #290660 |
317 |
+ |
318 |
+ 27 Oct 2009; Fabian Groffen <grobian@g.o> -mutt-1.5.16.ebuild, |
319 |
+ -mutt-1.5.19-r1.ebuild: |
320 |
+ Dropped vulnerable versions that won't get a backported fix, bug #290660 |
321 |
+ |
322 |
+ 26 Oct 2009; Tobias Klausmann <klausman@g.o> mutt-1.5.20-r7.ebuild: |
323 |
+ Keyworded on alpha, bug #290154 |
324 |
+ |
325 |
+*mutt-1.5.20-r7 (22 Oct 2009) |
326 |
+ |
327 |
+ 22 Oct 2009; Fabian Groffen <grobian@g.o> mutt-1.5.20-r6.ebuild, |
328 |
+ +mutt-1.5.20-r7.ebuild: |
329 |
+ Revert addition of tokyocabinet USE-flag to -r6, add it to -r7 and drop |
330 |
+ keywords for arches that don't have tokyocabinet keyworded, bug #290154 |
331 |
+ |
332 |
+ 20 Oct 2009; Fabian Groffen <grobian@g.o> mutt-1.5.20-r6.ebuild: |
333 |
+ Add tokyocabinet support with USE=tokyocabinet, thanks Tim Harder in bug |
334 |
+ #289010 |
335 |
+ |
336 |
+*mutt-1.5.20-r6 (21 Sep 2009) |
337 |
+ |
338 |
+ 21 Sep 2009; Fabian Groffen <grobian@g.o> -mutt-1.5.20-r5.ebuild, |
339 |
+ +mutt-1.5.20-r6.ebuild, +files/mutt-1.5.20-dont-reveal-bbc.patch: |
340 |
+ Add patch from Debian to fix upstream ticket 3337: mutt disclosing bcc |
341 |
+ header to mta |
342 |
+ |
343 |
+ 15 Sep 2009; Joseph Jezak <josejx@g.o> mutt-1.5.20-r4.ebuild: |
344 |
+ Marked ppc stable for bug #275703. |
345 |
+ |
346 |
+ 15 Sep 2009; Jeroen Roovers <jer@g.o> mutt-1.5.20-r4.ebuild: |
347 |
+ Stable for HPPA (bug #275703). |
348 |
+ |
349 |
+ 13 Sep 2009; Raúl Porcel <armin76@g.o> mutt-1.5.20-r4.ebuild: |
350 |
+ ia64/sparc stable wrt #275703 |
351 |
+ |
352 |
+*mutt-1.5.20-r5 (07 Sep 2009) |
353 |
+ |
354 |
+ 07 Sep 2009; Fabian Groffen <grobian@g.o> +mutt-1.5.20-r5.ebuild, |
355 |
+ +files/mutt-1.5.20-fix-mh-parsing-14bb498c6a1c.patch, |
356 |
+ +files/mutt-1.5.20-next-invalid-pattern-crash-6a08a5244d60.patch, |
357 |
+ +files/mutt-1.5.20-search-pattern-crash-053ef7bbaa72.patch: |
358 |
+ Bump, three more regression patches fixing a block when opening an MH |
359 |
+ folder, a segfault on certain search patterns and a segfault after 'next' |
360 |
+ when the previous search pattern was invalid |
361 |
+ |
362 |
+ 07 Sep 2009; Fabian Groffen <grobian@g.o> -mutt-1.5.15-r2.ebuild, |
363 |
+ -files/mutt-1.5.15-parallel-make.patch, -mutt-1.5.20-r1.ebuild, |
364 |
+ -files/mutt-1.5.20-tab-subject-questionmark-298194c414f0.patch, |
365 |
+ -files/slang.patch: |
366 |
+ Drop old versions |
367 |
+ |
368 |
+ 31 Aug 2009; Brent Baude <ranger@g.o> mutt-1.5.20-r4.ebuild: |
369 |
+ Marking mutt-1.5.20-r4 ppc64 for bug 275703 |
370 |
+ |
371 |
+ 27 Aug 2009; Fabian Groffen <grobian@g.o> mutt-1.5.20-r4.ebuild: |
372 |
+ Avoid compilation errors when ncurses is not built with unicode (wide |
373 |
+ character) support, bug #282834 |
374 |
+ |
375 |
+ 27 Aug 2009; Thomas Anderson <tanderson@g.o> |
376 |
+ mutt-1.5.20-r4.ebuild: |
377 |
+ stable amd64, bug 275703 |
378 |
+ |
379 |
+ 26 Aug 2009; Tobias Klausmann <klausman@g.o> mutt-1.5.20-r4.ebuild: |
380 |
+ Stable on alpha, bug #275703 |
381 |
+ |
382 |
+ 25 Aug 2009; Christian Faulhammer <fauli@g.o> |
383 |
+ mutt-1.5.20-r4.ebuild: |
384 |
+ stable x86, bug 275703 |
385 |
+ |
386 |
+ 25 Aug 2009; Tobias Klausmann <klausman@g.o> mutt-1.5.19-r1.ebuild: |
387 |
+ Stable on alpha, bug #275703 |
388 |
+ |
389 |
+ 30 Jul 2009; Fabian Groffen <grobian@g.o> mutt-1.5.20-r4.ebuild, |
390 |
+ -files/mutt-1.5.20-hcache-uidvalidity-size-fix.patch, |
391 |
+ +files/mutt-1.5.20-hcache-uidvalidity-size-fix-a2a4286491b4.patch: |
392 |
+ Switch to using the real committed patch, which is codewise identical to |
393 |
+ the suggested patch. |
394 |
+ |
395 |
+*mutt-1.5.20-r4 (29 Jul 2009) |
396 |
+ |
397 |
+ 29 Jul 2009; Fabian Groffen <grobian@g.o> -mutt-1.5.20-r3.ebuild, |
398 |
+ +mutt-1.5.20-r4.ebuild, |
399 |
+ +files/mutt-1.5.20-hcache-uidvalidity-size-fix.patch, |
400 |
+ +files/mutt-1.5.20-propagate-mh_read_sequences-2fc9348684fe.patch, |
401 |
+ +files/mutt-1.5.20-ungroup-command-77ac8b5c2be6.patch: |
402 |
+ Bump to -r4 having the latest patches plus sparc64 hcache fix. Possible |
403 |
+ fix for bug #278332, introduction of USE=doc, so we don't have to build |
404 |
+ documentation all the time (it's on the web anyway) |
405 |
+ |
406 |
+*mutt-1.5.20-r3 (23 Jul 2009) |
407 |
+ |
408 |
+ 23 Jul 2009; Fabian Groffen <grobian@g.o> -mutt-1.5.20-r2.ebuild, |
409 |
+ +mutt-1.5.20-r3.ebuild, +files/mutt-1.5.20-gpgme-keys-d41e043fa775.patch, |
410 |
+ +files/mutt-1.5.20-hcache-restore-address-848f08512bf3.patch, |
411 |
+ +files/mutt-1.5.20-mhs-flags-leak-9f3053f75f27.patch: |
412 |
+ Revision bump for some new fixes from upstream. |
413 |
+ |
414 |
+ 21 Jul 2009; Fabian Groffen <grobian@g.o> mutt-1.5.20-r2.ebuild, |
415 |
+ +files/mutt-1.5.20-gpgme-1.2.0.patch: |
416 |
+ Fix bug #278394, allow mutt to run correctly with gpgme-1.2.0 |
417 |
+ |
418 |
+ 21 Jul 2009; Fabian Groffen <grobian@g.o> mutt-1.5.20-r2.ebuild: |
419 |
+ Patch in Gentoo version on mutt -v for (upstream) bug-reports |
420 |
+ |
421 |
+*mutt-1.5.20-r2 (20 Jul 2009) |
422 |
+ |
423 |
+ 20 Jul 2009; Fabian Groffen <grobian@g.o> +mutt-1.5.20-r2.ebuild, |
424 |
+ +files/mutt-1.5.20-leave-mailbox-no-new-mail-118b8fef8aae.patch, |
425 |
+ +files/mutt-1.5.20-tab-subject-questionmark-298194c414f0-cff8e8ce4327.patch: |
426 |
+ Apply follow-up patch for tab-subject-questionsmark patch, add new patch |
427 |
+ for new mail in mailboxes just left, rename gpgme USE-flag to gpg, require |
428 |
+ <gpgme-1.2.0 for now, since 1.2.0 doesn't really work, bug #278394 |
429 |
+ |
430 |
+*mutt-1.5.20-r1 (02 Jul 2009) |
431 |
+ |
432 |
+ 02 Jul 2009; Fabian Groffen <grobian@g.o> |
433 |
+ +files/mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch, |
434 |
+ -mutt-1.5.20.ebuild, +mutt-1.5.20-r1.ebuild: |
435 |
+ Bump for patch to fix bug #276101, regarding smtp batching with authentication. |
436 |
+ |
437 |
+ 29 Jun 2009; Fabian Groffen <grobian@g.o> |
438 |
+ +files/mutt-1.5.20-tab-subject-questionmark-298194c414f0.patch, |
439 |
+ mutt-1.5.20.ebuild: |
440 |
+ Add another patch from upstream. Don't show tabs in the subject as question |
441 |
+ marks in the index. |
442 |
+ |
443 |
+ 29 Jun 2009; Fabian Groffen <grobian@g.o> |
444 |
+ +files/mutt-1.5.20-imap-start-fatal-fe30f394cbe6.patch, |
445 |
+ mutt-1.5.20.ebuild: |
446 |
+ Add another upstream patch. Solve a partial hang on IMAP connection errors. |
447 |
+ |
448 |
+*mutt-1.5.20 (28 Jun 2009) |
449 |
+ |
450 |
+ 28 Jun 2009; Fabian Groffen <grobian@g.o> |
451 |
+ +files/mutt-1.5.13-prefix-mailcap.patch, |
452 |
+ +files/mutt-1.5.18-bdb-prefix.patch, +files/mutt-1.5.18-interix.patch, |
453 |
+ +files/mutt-1.5.18-solaris-ncurses-chars.patch, +mutt-1.5.20.ebuild, |
454 |
+ +files/mutt-1.5.20-display-unsigned-pgp-7f37d0a57d83.patch, |
455 |
+ +files/mutt-1.5.20-header-weeding-f40de578e8ed.patch, |
456 |
+ +files/mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch, |
457 |
+ +files/mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch, |
458 |
+ +files/mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch, |
459 |
+ +files/mutt-1.5.20-unmailbox-segfault-25e46aad362b.patch: |
460 |
+ Version bump to 1.5.20, with a bunch of post release regression fixes from |
461 |
+ upstream. The pgp_timeout patch has been dropped for this release, since |
462 |
+ it no longer applies. |
463 |
+ |
464 |
+ 20 Jun 2009; Fabian Groffen <grobian@g.o> -mutt-1.5.13-r2.ebuild, |
465 |
+ -mutt-1.5.14.ebuild: |
466 |
+ Drop old |
467 |
+ |
468 |
+ 19 Jun 2009; Fabian Groffen <grobian@g.o> mutt-1.5.19-r1.ebuild: |
469 |
+ Avoid QA warning about --enable-{compressed,nntp} when USE=sidebar |
470 |
+ |
471 |
+ 19 Jun 2009; Fabian Groffen <grobian@g.o> |
472 |
+ files/mutt-1.5.19-mutt-gnutls-7d0583e0315d-0b13183e40e0.patch: |
473 |
+ Remove mutt_read_line hunk from ssl_gnutls patch, thanks to Martin Jansa in |
474 |
+ bug #274603 |
475 |
+ |
476 |
+ 18 Jun 2009; Fabian Groffen <grobian@g.o> |
477 |
+ files/mutt-1.5.19-mutt_ssl-3af7e8af1983-dc9ec900c657.patch: |
478 |
+ Update patch to include parts that were non-local to the ssl-files. |
479 |
+ Unfortunately the fix is non-straight-forward, and includes a lot of other |
480 |
+ changesets, causing this to happen. Should fix bug #274603. |
481 |
+ |
482 |
+*mutt-1.5.19-r1 (18 Jun 2009) |
483 |
+ |
484 |
+ 18 Jun 2009; Fabian Groffen <grobian@g.o> |
485 |
+ +files/mutt-1.5.19-mutt-gnutls-7d0583e0315d-0b13183e40e0.patch, |
486 |
+ +files/mutt-1.5.19-mutt_ssl-3af7e8af1983-dc9ec900c657.patch, |
487 |
+ -mutt-1.5.19.ebuild, +mutt-1.5.19-r1.ebuild: |
488 |
+ Revision bump for CVE-2009-1390, add related patches |
489 |
+ |
490 |
+ 09 Jun 2009; Fabian Groffen <grobian@g.o> |
491 |
+ +files/mutt-1.5.19-libgnutls-test-15c662a95b91.patch, mutt-1.5.19.ebuild: |
492 |
+ Add patch from upstream to fix libgnutls detection for the latest version of |
493 |
+ the latter library. Bug #268456 |
494 |
+ |
495 |
+ 28 May 2009; Fabian Groffen <grobian@g.o> -mutt-1.5.11-r2.ebuild, |
496 |
+ -mutt-1.5.12.ebuild, -mutt-1.5.13.ebuild, -mutt-1.5.13-r1.ebuild, |
497 |
+ mutt-1.5.19.ebuild: |
498 |
+ Remove old. Update sidebar patch to fix 'wrong new mail notifications' |
499 |
+ (http://dev.mutt.org/trac/ticket/3204#comment:2) |
500 |
+ |
501 |
+ 21 Mar 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o> |
502 |
+ metadata.xml: |
503 |
+ Removing ferdy as a maintainer since he was retired. |
504 |
+ |
505 |
+ 11 Mar 2009; Fabian Groffen <grobian@g.o> mutt-1.5.16.ebuild, |
506 |
+ mutt-1.5.19.ebuild: |
507 |
+ Fix QA warning about --disable-nntp, bug #262069 |
508 |
+ |
509 |
+ 09 Mar 2009; Fabian Groffen <grobian@g.o> metadata.xml, |
510 |
+ mutt-1.5.19.ebuild: |
511 |
+ Upstream has updated the sidebar patch |
512 |
+ |
513 |
+ 12 Jan 2009; Fabian Groffen <grobian@g.o> mutt-1.5.19.ebuild: |
514 |
+ Drop wc-func bit for darwin, it doesn't change a thing on Darwin8 and simply |
515 |
+ breaks Darwin9 |
516 |
+ |
517 |
+*mutt-1.5.19 (11 Jan 2009) |
518 |
+ |
519 |
+ 11 Jan 2009; Fabian Groffen <grobian@g.o> +mutt-1.5.19.ebuild: |
520 |
+ Version bump. Added new patches in Gentoo patchset. Masked because sidebar |
521 |
+ patch does not apply. |
522 |
+ |
523 |
+ 23 Aug 2008; Doug Goldstein <cardoe@g.o> metadata.xml: |
524 |
+ add GLEP 56 USE flag desc from use.local.desc |
525 |
|
526 |
09 Mar 2008; <ricmm@g.o> mutt-1.5.11-r2.ebuild, |
527 |
mutt-1.5.13-r1.ebuild, mutt-1.5.16.ebuild: |
528 |
|
529 |
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest |
530 |
index 4a50968..caeacbe 100644 |
531 |
--- a/mail-client/mutt/Manifest |
532 |
+++ b/mail-client/mutt/Manifest |
533 |
@@ -1,10 +1,12 @@ |
534 |
+AUX 1.5.21-resent-header-weeding.patch 1583 RMD160 2948ee174b3904590dd7339179700e7b1c0b0aeb SHA1 f48b04c1c0c4d6ebb1c55da247bb2277843a011e SHA256 8ecdfb01d755945cd2f37a4782d6a3d8fe3cbb00ac71594fdb3153ede4d34d24 |
535 |
+AUX 1.5.21-sendbox-bounce.patch 3305 RMD160 446d058cf632e7a9fe1ec348b186ef7953191355 SHA1 27b0bccfc5187db744f4da99bc39c4ce985ebe6d SHA256 ce67fe56695af26824d8a69c9b45327366b31e4e267285e72f6c85d0dba89c41 |
536 |
+AUX 1.5.21-sendbox.patch 4179 RMD160 80fddc24340c1cbfc7cce012faa842916ac736be SHA1 dde0b83ea1151c1e8b3a53b2bcc98087cfe19497 SHA256 346827552a37c636c194253108b692df5cf672e756a219308a9419341877deea |
537 |
+AUX 1.5.21-write_postponed.patch 13650 RMD160 eaa96e52253d880aeabfc382f15150e0a7f2f804 SHA1 a784652e5f168b2ad2fc482851fa3fb34efada38 SHA256 9c023419dd9f9512cdda17b5d5c4deda432f3717fc8cfea8770fc39549dfde6d |
538 |
AUX Muttrc 667 RMD160 0405e73c6a4122869ce9a9bd408068d316740b71 SHA1 e30c96e6f21a30fe576abcb3be65a34accf4e11f SHA256 932940db69c951caaa87a17ee98a8e2262aeadf1e978f6d671b642184c5d545f |
539 |
AUX Muttrc.mbox 486 RMD160 0f692c9d3a7591f3a0611529616aa94a5c62a641 SHA1 9e231303fe9fb2fe80542115ceefb972c7b11d5a SHA256 10b251f88ccc5d4c95c96ab17b6ab6a30a16d6590ab896a60037f869fc4d44a0 |
540 |
AUX mutt-1.5.17-parallel-make.patch 936 RMD160 f6a216d9ff06ae55d9569e05632b60332cf49ebe SHA1 0a9b98b37987ffa10039424bb6f5849a08dbb168 SHA256 3ecc199b83f6fa747d342694d8ffacf0aedd4590e0d9943c9b6004c31cbdb931 |
541 |
AUX slang.patch 493 RMD160 16dcedee86fe91ecac48ec5be8a6f67798ef7ac0 SHA1 f913e8c717f76186b0edc8856bf02a167d540c70 SHA256 040c8b63b2d805dae800fa9b1826d158b7104641339cee9a404985616b3502c7 |
542 |
-DIST mutt-1.5.18-gentoo-patches-r1.tar.bz2 59271 RMD160 c9afc88aa201262d65dcfd22c06a472b90f6a800 SHA1 79a06ea53466d0368f532eef1fcaeff3a640b232 SHA256 1f46ff04b2ce900087e30ab4d29a7b5e8b0156a1313da15330eafb3d1a5507e4 |
543 |
-DIST mutt-1.5.18.tar.gz 3602632 RMD160 1c8595f66eb9aa94c01a6020be20a75c0c8d2d14 SHA1 a835a1933297494f2c6c68b9a334cc1d71a95e5a SHA256 8bb6d69ea2c72030b66ec9bb4bd4007ba6d8dc5f60fdfde7b712e2784e08bfb3 |
544 |
-DIST patch-1.5.18.sidebar.20080611.txt 52201 RMD160 c1c27ea98786abd3fd44b85449dc84aab40ca58e SHA1 c5df4de9d2940a8420cfd66e9c191a0e5b1fdfdc SHA256 a94bc11072dbfe9a4a7d5a761105bf40a496bb2706e9940978de7b64d1555fa7 |
545 |
-EBUILD mutt-1.5.18.ebuild 4864 RMD160 93445f9eee19789103939498185b2c3706745ab4 SHA1 b5be605a803ce562b435c8a52acf31758cb5bb89 SHA256 d4be469a45dcafbc6cb36044a6522d2910b589e0b801776e7d475fc1e8aa3da2 |
546 |
-MISC ChangeLog 27479 RMD160 24bb07c2595a086165a1d109817f8c93c329b5c1 SHA1 f2c0da2d912b03844401ed85b2aa4f68827833f8 SHA256 0e3ca04e6170888f551983c374ad6ce74d2dd082dfa197ae7d798e764a7667ca |
547 |
-MISC metadata.xml 259 RMD160 ce66370016fba0ddf047802d9dc8463041b4a585 SHA1 9f7a04d0cab1654d39498db3f124fc755202adb7 SHA256 d0e8725b6ece5de6014dd4b18064854b993b1e3ab04d838370d7744756656ae5 |
548 |
+DIST mutt-1.5.21-gentoo-patches-r3.tar.bz2 73247 RMD160 5e658dce6e2e93193808f88490f83672f629e6d3 SHA1 e2a27668c6327597f90d9abe4ea2869fb216b397 SHA256 d61dccc0eb5179036d1108a70601ff43367dbe70d162c3042c376acd2a87daf0 |
549 |
+DIST mutt-1.5.21.tar.gz 3716886 RMD160 b235a42972ae410592253cdc117a90baf279f47a SHA1 a8475f2618ce5d5d33bff85c0affdf21ab1d76b9 SHA256 2141f36e8d0f4f71c9ca6780001e7cc679fe313e643953fc07f001223e67c4a0 |
550 |
+EBUILD mutt-1.5.21-r3.ebuild 7896 RMD160 a064a94b727c0fa3dbbae34492712d181fe4d140 SHA1 fc35d77ca790b67e082f27641e7221ac8d606e9b SHA256 0e8eefea56abfc5a8a2dad42d43943b94165410fb9acb7652653680536d419d5 |
551 |
+MISC ChangeLog 48499 RMD160 6e416e0da020639c4254c26a23c0e653241c5d7f SHA1 ed9c0af2c86b929ae363695790ae21234d854559 SHA256 8e3dd35c0f68d7474ddd71dd1e7f8cada79df3f59df1363a8b48a5bf6d156139 |
552 |
|
553 |
diff --git a/mail-client/mutt/files/1.5.21-resent-header-weeding.patch b/mail-client/mutt/files/1.5.21-resent-header-weeding.patch |
554 |
new file mode 100644 |
555 |
index 0000000..350b9c4 |
556 |
--- /dev/null |
557 |
+++ b/mail-client/mutt/files/1.5.21-resent-header-weeding.patch |
558 |
@@ -0,0 +1,39 @@ |
559 |
+Add resent header weeding, used by sendbox |
560 |
+ |
561 |
+Signed-off-by: Aron Griffis <agrif...@×××××.net> |
562 |
+ |
563 |
+diff -r bffd60d2ac16 -r 4119b2394228 copy.c |
564 |
+--- a/copy.c Tue Apr 28 11:17:28 2009 -0400 |
565 |
++++ b/copy.c Tue Apr 28 11:17:31 2009 -0400 |
566 |
+@@ -65,7 +65,8 @@ |
567 |
+ buf[0] = '\n'; |
568 |
+ buf[1] = 0; |
569 |
+ |
570 |
+- if ((flags & (CH_REORDER | CH_WEED | CH_MIME | CH_DECODE | CH_PREFIX | CH_WEED_DELIVERED)) == 0) |
571 |
++ if ((flags & (CH_REORDER | CH_WEED | CH_MIME | CH_DECODE | CH_PREFIX | |
572 |
++ CH_WEED_DELIVERED | CH_WEED_RESENT)) == 0) |
573 |
+ { |
574 |
+ /* Without these flags to complicate things |
575 |
+ * we can do a more efficient line to line copying |
576 |
+@@ -194,6 +195,10 @@ |
577 |
+ if ((flags & CH_WEED_DELIVERED) && |
578 |
+ ascii_strncasecmp ("Delivered-To:", buf, 13) == 0) |
579 |
+ continue; |
580 |
++ if ((flags & CH_WEED_RESENT) && |
581 |
++ (ascii_strncasecmp ("Resent-To:", buf, 10) == 0 || |
582 |
++ ascii_strncasecmp ("Resent-From:", buf, 12) == 0)) |
583 |
++ continue; |
584 |
+ if ((flags & (CH_UPDATE | CH_XMIT | CH_NOSTATUS)) && |
585 |
+ (ascii_strncasecmp ("Status:", buf, 7) == 0 || |
586 |
+ ascii_strncasecmp ("X-Status:", buf, 9) == 0)) |
587 |
+diff -r bffd60d2ac16 -r 4119b2394228 copy.h |
588 |
+--- a/copy.h Tue Apr 28 11:17:28 2009 -0400 |
589 |
++++ b/copy.h Tue Apr 28 11:17:31 2009 -0400 |
590 |
+@@ -53,6 +53,7 @@ |
591 |
+ #define CH_UPDATE_IRT (1<<16) /* update In-Reply-To: */ |
592 |
+ #define CH_UPDATE_REFS (1<<17) /* update References: */ |
593 |
+ #define CH_DISPLAY (1<<18) /* display result to user */ |
594 |
++#define CH_WEED_RESENT (1<<19) /* weed Resent-To: header */ |
595 |
+ |
596 |
+ |
597 |
+ int mutt_copy_hdr (FILE *, FILE *, LOFF_T, LOFF_T, int, const char *); |
598 |
|
599 |
diff --git a/mail-client/mutt/files/1.5.21-sendbox-bounce.patch b/mail-client/mutt/files/1.5.21-sendbox-bounce.patch |
600 |
new file mode 100644 |
601 |
index 0000000..bd73b7d |
602 |
--- /dev/null |
603 |
+++ b/mail-client/mutt/files/1.5.21-sendbox-bounce.patch |
604 |
@@ -0,0 +1,119 @@ |
605 |
+Add support for sendbox (bounce path) |
606 |
+ |
607 |
+This patch adds support for "sendbox" to the bounce path. |
608 |
+Additionally a bug is fixed: previously there would be no warning or error |
609 |
+emitted if mutt failed to create the temporary file when bouncing a message. |
610 |
+ |
611 |
+Signed-off-by: Aron Griffis <agrif...@×××××.net> |
612 |
+ |
613 |
+diff -r a1d30c527520 -r 0069fde2f491 sendlib.c |
614 |
+--- a/sendlib.c Tue Apr 28 11:17:31 2009 -0400 |
615 |
++++ b/sendlib.c Tue Apr 28 11:17:31 2009 -0400 |
616 |
+@@ -2669,6 +2669,13 @@ |
617 |
+ FILE *f; |
618 |
+ char date[SHORT_STRING], tempfile[_POSIX_PATH_MAX]; |
619 |
+ MESSAGE *msg = NULL; |
620 |
++ int ch_flags; |
621 |
++ char *msgid_str; |
622 |
++#ifdef USE_SENDBOX |
623 |
++ struct mutt_message_handle *mh = NULL; |
624 |
++ CONTEXT sctx; |
625 |
++ MESSAGE *smsg = NULL; |
626 |
++#endif |
627 |
+ |
628 |
+ if (!h) |
629 |
+ { |
630 |
+@@ -2685,28 +2692,65 @@ |
631 |
+ |
632 |
+ if (!fp) fp = msg->fp; |
633 |
+ |
634 |
+- mutt_mktemp (tempfile, sizeof (tempfile)); |
635 |
+- if ((f = safe_fopen (tempfile, "w")) != NULL) |
636 |
++ ch_flags = CH_XMIT | CH_NONEWLINE | CH_NOQFROM; |
637 |
++ if (!option (OPTBOUNCEDELIVERED)) |
638 |
++ ch_flags |= CH_WEED_DELIVERED; |
639 |
++ |
640 |
++ /* create a message which is the original message with Resent |
641 |
++ * header fields prepended. For sendmail and smtp, the message is |
642 |
++ * a tempfile. For sendbox, it's a newly created message in the |
643 |
++ * Sendbox folder. |
644 |
++ */ |
645 |
++#ifdef USE_SENDBOX |
646 |
++ if (Sendbox) |
647 |
+ { |
648 |
+- int ch_flags = CH_XMIT | CH_NONEWLINE | CH_NOQFROM; |
649 |
+- char* msgid_str; |
650 |
+- |
651 |
+- if (!option (OPTBOUNCEDELIVERED)) |
652 |
+- ch_flags |= CH_WEED_DELIVERED; |
653 |
+- |
654 |
+- fseeko (fp, h->offset, 0); |
655 |
+- fprintf (f, "Resent-From: %s", resent_from); |
656 |
+- fprintf (f, "\nResent-%s", mutt_make_date (date, sizeof(date))); |
657 |
+- msgid_str = mutt_gen_msgid(); |
658 |
+- fprintf (f, "Resent-Message-ID: %s\n", msgid_str); |
659 |
+- fputs ("Resent-To: ", f); |
660 |
+- mutt_write_address_list (to, f, 11, 0); |
661 |
+- mutt_copy_header (fp, h, f, ch_flags, NULL); |
662 |
+- fputc ('\n', f); |
663 |
+- mutt_copy_bytes (fp, f, h->content->length); |
664 |
++ mh = mutt_start_message (Sendbox, h, &sctx, &smsg, 1); |
665 |
++ if (!mh) |
666 |
++ { |
667 |
++ ret = -1; |
668 |
++ goto close_msg; |
669 |
++ } |
670 |
++ f = smsg->fp; |
671 |
++ |
672 |
++ /* Resent-To: headers will be unioned by the MTA to |
673 |
++ * determine the recipient, so weed any old ones |
674 |
++ */ |
675 |
++ ch_flags |= CH_WEED_RESENT; |
676 |
++ } |
677 |
++ else |
678 |
++#endif |
679 |
++ { |
680 |
++ mutt_mktemp (tempfile, sizeof(tempfile)); |
681 |
++ if ((f = safe_fopen (tempfile, "w")) == NULL) |
682 |
++ { |
683 |
++ mutt_perror (tempfile); |
684 |
++ ret = -1; |
685 |
++ goto close_msg; |
686 |
++ } |
687 |
++ } |
688 |
++ |
689 |
++ /* prepend the Resent header fields */ |
690 |
++ fprintf (f, "Resent-From: %s", resent_from); |
691 |
++ fprintf (f, "\nResent-%s", mutt_make_date (date, sizeof(date))); |
692 |
++ msgid_str = mutt_gen_msgid(); |
693 |
++ fprintf (f, "Resent-Message-ID: %s\n", msgid_str); |
694 |
++ FREE (&msgid_str); |
695 |
++ fputs ("Resent-To: ", f); |
696 |
++ mutt_write_address_list (to, f, 11, 0); |
697 |
++ |
698 |
++ /* copy original message */ |
699 |
++ fseeko (fp, h->offset, 0); |
700 |
++ mutt_copy_header (fp, h, f, ch_flags, NULL); |
701 |
++ fputc ('\n', f); |
702 |
++ mutt_copy_bytes (fp, f, h->content->length); |
703 |
++ |
704 |
++#ifdef USE_SENDBOX |
705 |
++ if (Sendbox) |
706 |
++ ret = mutt_finish_message (mh, Sendbox, h, &sctx, &smsg, 1); |
707 |
++ else |
708 |
++#endif |
709 |
++ { |
710 |
+ safe_fclose (&f); |
711 |
+- FREE (&msgid_str); |
712 |
+- |
713 |
+ #if USE_SMTP |
714 |
+ if (SmtpUrl) |
715 |
+ ret = mutt_smtp_send (env_from, to, NULL, NULL, tempfile, |
716 |
+@@ -2717,6 +2724,7 @@ |
717 |
+ h->content->encoding == ENC8BIT); |
718 |
+ } |
719 |
+ |
720 |
++close_msg: |
721 |
+ if (msg) |
722 |
+ mx_close_message (&msg); |
723 |
+ |
724 |
|
725 |
diff --git a/mail-client/mutt/files/1.5.21-sendbox.patch b/mail-client/mutt/files/1.5.21-sendbox.patch |
726 |
new file mode 100644 |
727 |
index 0000000..2686d4d |
728 |
--- /dev/null |
729 |
+++ b/mail-client/mutt/files/1.5.21-sendbox.patch |
730 |
@@ -0,0 +1,125 @@ |
731 |
+Add support for sendbox (primary send path) |
732 |
+ |
733 |
+This patch adds support for Courier IMAP's Outbox feature. It adds the setting |
734 |
+"sendbox" which specifies a mailbox to which sent messages should be saved, |
735 |
+overriding the sendmail and smtp_url settings. This patch only affects the |
736 |
+primary send path, bounce is handled in a follow-on patch. |
737 |
+ |
738 |
+Signed-off-by: Aron Griffis <agrif...@×××××.net> |
739 |
+ |
740 |
+diff -r 4119b2394228 -r a1d30c527520 configure.ac |
741 |
+--- a/configure.ac Tue Apr 28 11:17:31 2009 -0400 |
742 |
++++ b/configure.ac Tue Apr 28 11:17:31 2009 -0400 |
743 |
+@@ -652,6 +652,11 @@ |
744 |
+ |
745 |
+ dnl -- end imap dependencies -- |
746 |
+ |
747 |
++AC_ARG_ENABLE(sendbox, AC_HELP_STRING([--enable-sendbox], [Enable support for Courier-style Outbox]), |
748 |
++ [if test $enableval = yes; then |
749 |
++ AC_DEFINE(USE_SENDBOX, 1, [Define if you want support for Courier-style Outbox]) |
750 |
++ fi]) |
751 |
++ |
752 |
+ AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl@<:@=PFX@:>@], [Enable TLS support using OpenSSL]), |
753 |
+ [ if test "$with_ssl" != "no" |
754 |
+ then |
755 |
+diff -r 4119b2394228 -r a1d30c527520 globals.h |
756 |
+--- a/globals.h Tue Apr 28 11:17:31 2009 -0400 |
757 |
++++ b/globals.h Tue Apr 28 11:17:31 2009 -0400 |
758 |
+@@ -114,6 +114,9 @@ |
759 |
+ WHERE char *QueryFormat; |
760 |
+ WHERE char *Realname; |
761 |
+ WHERE short SearchContext; |
762 |
++#ifdef USE_SENDBOX |
763 |
++WHERE char *Sendbox; |
764 |
++#endif |
765 |
+ WHERE char *SendCharset; |
766 |
+ WHERE char *Sendmail; |
767 |
+ WHERE char *Shell; |
768 |
+diff -r 4119b2394228 -r a1d30c527520 init.h |
769 |
+--- a/init.h Tue Apr 28 11:17:31 2009 -0400 |
770 |
++++ b/init.h Tue Apr 28 11:17:31 2009 -0400 |
771 |
+@@ -2464,6 +2464,18 @@ |
772 |
+ ** In case the text cannot be converted into one of these exactly, |
773 |
+ ** mutt uses $$charset as a fallback. |
774 |
+ */ |
775 |
++#ifdef USE_SENDBOX |
776 |
++ { "sendbox", DT_PATH, R_NONE, UL &Sendbox, 0 }, |
777 |
++ /* |
778 |
++ ** .pp |
779 |
++ ** Specifies a special mailbox that will |
780 |
++ ** \fBsend\fP mail when written. When \fIset\fP, this variable overrides |
781 |
++ ** \fIsmtp_url\fP and \fIsendmail\fP. |
782 |
++ ** To make use of this, you probably want a Courier IMAP server configured for |
783 |
++ ** sending, see |
784 |
++ ** http://www.inter7.com/courierimap/INSTALL.html#imapsend |
785 |
++ */ |
786 |
++#endif |
787 |
+ { "sendmail", DT_PATH, R_NONE, UL &Sendmail, UL SENDMAIL " -oem -oi" }, |
788 |
+ /* |
789 |
+ ** .pp |
790 |
+diff -r 4119b2394228 -r a1d30c527520 protos.h |
791 |
+--- a/protos.h Tue Apr 28 11:17:31 2009 -0400 |
792 |
++++ b/protos.h Tue Apr 28 11:17:31 2009 -0400 |
793 |
+@@ -349,6 +349,9 @@ |
794 |
+ int _mutt_save_message (HEADER *, CONTEXT *, int, int, int); |
795 |
+ int mutt_save_message (HEADER *, int, int, int, int *); |
796 |
+ int mutt_search_command (int, int); |
797 |
++#ifdef USE_SENDBOX |
798 |
++int mutt_sendbox_send (HEADER *); |
799 |
++#endif |
800 |
+ #ifdef USE_SMTP |
801 |
+ int mutt_smtp_send (const ADDRESS *, const ADDRESS *, const ADDRESS *, |
802 |
+ const ADDRESS *, const char *, int); |
803 |
+diff -r 4119b2394228 -r a1d30c527520 send.c |
804 |
+--- a/send.c Tue Apr 28 11:17:31 2009 -0400 |
805 |
++++ b/send.c Tue Apr 28 11:17:31 2009 -0400 |
806 |
+@@ -984,6 +984,15 @@ |
807 |
+ short old_write_bcc; |
808 |
+ #endif |
809 |
+ |
810 |
++#ifdef USE_SENDBOX |
811 |
++ /* Some imap servers can send mail by saving to a special folder. |
812 |
++ * In this case, there's no need for the intermediate tempfile because |
813 |
++ * we'll write directly to the folder. |
814 |
++ */ |
815 |
++ if (Sendbox) |
816 |
++ return mutt_sendbox_send (msg); |
817 |
++#endif |
818 |
++ |
819 |
+ /* Write out the message in MIME form. */ |
820 |
+ mutt_mktemp (tempfile, sizeof (tempfile)); |
821 |
+ if ((tempfp = safe_fopen (tempfile, "w")) == NULL) |
822 |
+diff -r 4119b2394228 -r a1d30c527520 sendlib.c |
823 |
+--- a/sendlib.c Tue Apr 28 11:17:31 2009 -0400 |
824 |
++++ b/sendlib.c Tue Apr 28 11:17:31 2009 -0400 |
825 |
+@@ -2929,3 +2929,30 @@ |
826 |
+ set_noconv_flags (hdr->content, 0); |
827 |
+ return ret; |
828 |
+ } |
829 |
++ |
830 |
++#ifdef USE_SENDBOX |
831 |
++int mutt_sendbox_send (HEADER *hdr) |
832 |
++{ |
833 |
++ struct mutt_message_handle *mh; |
834 |
++ CONTEXT ctx; |
835 |
++ MESSAGE *msg; |
836 |
++ short old_write_bcc; |
837 |
++ |
838 |
++ hdr->read = 0; /* make sure to put it in the `new' directory (maildir) */ |
839 |
++ |
840 |
++ mh = mutt_start_message (Sendbox, hdr, &ctx, &msg, 0); |
841 |
++ if (!mh) |
842 |
++ return -1; |
843 |
++ |
844 |
++ /* need to write the bcc in the headers */ |
845 |
++ old_write_bcc = option (OPTWRITEBCC); |
846 |
++ set_option (OPTWRITEBCC); |
847 |
++ |
848 |
++ mutt_write_rfc822_header (msg->fp, hdr->env, hdr->content, 0, 0, 1); |
849 |
++ |
850 |
++ if (!old_write_bcc) |
851 |
++ unset_option (OPTWRITEBCC); |
852 |
++ |
853 |
++ return mutt_finish_message (mh, Sendbox, hdr, &ctx, &msg, 1); |
854 |
++} |
855 |
++#endif |
856 |
|
857 |
diff --git a/mail-client/mutt/files/1.5.21-write_postponed.patch b/mail-client/mutt/files/1.5.21-write_postponed.patch |
858 |
new file mode 100644 |
859 |
index 0000000..44dc99e |
860 |
--- /dev/null |
861 |
+++ b/mail-client/mutt/files/1.5.21-write_postponed.patch |
862 |
@@ -0,0 +1,433 @@ |
863 |
+diff -urN mutt-1.5.21.orig//compose.c mutt-1.5.21//compose.c |
864 |
+--- mutt-1.5.21.orig//compose.c 2011-06-26 20:17:58.671443063 -0500 |
865 |
++++ mutt-1.5.21//compose.c 2011-06-26 20:16:57.061738838 -0500 |
866 |
+@@ -1370,7 +1370,7 @@ |
867 |
+ if (msg->content->next) |
868 |
+ msg->content = mutt_make_multipart (msg->content); |
869 |
+ |
870 |
+- if (mutt_write_fcc (fname, msg, NULL, 0, NULL) < 0) |
871 |
++ if (mutt_write_fcc (fname, msg) < 0) |
872 |
+ msg->content = mutt_remove_multipart (msg->content); |
873 |
+ else |
874 |
+ mutt_message _("Message written."); |
875 |
+diff -urN mutt-1.5.21.orig//protos.h mutt-1.5.21//protos.h |
876 |
+--- mutt-1.5.21.orig//protos.h 2011-06-26 20:17:59.051441238 -0500 |
877 |
++++ mutt-1.5.21//protos.h 2011-06-26 20:16:57.071738790 -0500 |
878 |
+@@ -367,7 +367,8 @@ |
879 |
+ void mutt_update_num_postponed (void); |
880 |
+ int mutt_wait_filter (pid_t); |
881 |
+ int mutt_which_case (const char *); |
882 |
+-int mutt_write_fcc (const char *path, HEADER *hdr, const char *msgid, int, char *); |
883 |
++int mutt_write_fcc (const char *path, HEADER *hdr); |
884 |
++int mutt_write_postponed (const char *path, HEADER *hdr, const char *msgid, char *fcc); |
885 |
+ int mutt_write_mime_body (BODY *, FILE *); |
886 |
+ int mutt_write_mime_header (BODY *, FILE *); |
887 |
+ int mutt_write_one_header (FILE *fp, const char *tag, const char *value, const char *pfx, int wraplen, int flags); |
888 |
+diff -urN mutt-1.5.21.orig//send.c mutt-1.5.21//send.c |
889 |
+--- mutt-1.5.21.orig//send.c 2011-06-26 20:17:59.051441238 -0500 |
890 |
++++ mutt-1.5.21//send.c 2011-06-26 20:16:57.071738790 -0500 |
891 |
+@@ -1684,7 +1684,7 @@ |
892 |
+ mutt_prepare_envelope (msg->env, 0); |
893 |
+ mutt_env_to_idna (msg->env, NULL, NULL); /* Handle bad IDNAs the next time. */ |
894 |
+ |
895 |
+- if (!Postponed || mutt_write_fcc (NONULL (Postponed), msg, (cur && (flags & SENDREPLY)) ? cur->env->message_id : NULL, 1, fcc) < 0) |
896 |
++ if (!Postponed || mutt_write_postponed (NONULL (Postponed), msg, (cur && (flags & SENDREPLY)) ? cur->env->message_id : NULL, fcc) < 0) |
897 |
+ { |
898 |
+ msg->content = mutt_remove_multipart (msg->content); |
899 |
+ decode_descriptions (msg->content); |
900 |
+@@ -1882,7 +1882,7 @@ |
901 |
+ * message was first postponed. |
902 |
+ */ |
903 |
+ msg->received = time (NULL); |
904 |
+- if (mutt_write_fcc (fcc, msg, NULL, 0, NULL) == -1) |
905 |
++ if (mutt_write_fcc (fcc, msg) == -1) |
906 |
+ { |
907 |
+ /* |
908 |
+ * Error writing FCC, we should abort sending. |
909 |
+diff -urN mutt-1.5.21.orig//sendlib.c mutt-1.5.21//sendlib.c |
910 |
+--- mutt-1.5.21.orig//sendlib.c 2011-06-26 20:17:59.051441238 -0500 |
911 |
++++ mutt-1.5.21//sendlib.c 2011-06-26 20:17:17.151642453 -0500 |
912 |
+@@ -2575,6 +2575,165 @@ |
913 |
+ rfc2047_decode (&env->x_label); |
914 |
+ } |
915 |
+ |
916 |
++static int count_length_lines (FILE *fp, LOFF_T *content_lengthp, int *linesp) |
917 |
++{ |
918 |
++ char sasha[LONG_STRING]; |
919 |
++ int lines = 0; |
920 |
++ |
921 |
++ /* count the number of lines */ |
922 |
++ while (fgets (sasha, sizeof (sasha), fp) != NULL) |
923 |
++ lines++; |
924 |
++ if (ferror (fp)) |
925 |
++ return -1; |
926 |
++ |
927 |
++ *linesp = lines; |
928 |
++ *content_lengthp = (LOFF_T) ftello (fp); |
929 |
++ |
930 |
++ return 0; |
931 |
++} |
932 |
++ |
933 |
++/* state maintained between mutt_start_message and |
934 |
++ * mutt_finish_message, opaque to callers. |
935 |
++ */ |
936 |
++struct mutt_message_handle |
937 |
++{ |
938 |
++ FILE *tempfp; |
939 |
++ char tempfile[_POSIX_PATH_MAX]; |
940 |
++ LOFF_T content_length; |
941 |
++ int lines; |
942 |
++ struct stat st; |
943 |
++ int passthru; |
944 |
++}; |
945 |
++ |
946 |
++static struct mutt_message_handle * |
947 |
++mutt_start_message (const char *path, HEADER *hdr, |
948 |
++ CONTEXT *ctxp, MESSAGE **msgp, int passthru) |
949 |
++{ |
950 |
++ struct mutt_message_handle *mh; |
951 |
++ |
952 |
++ if (mx_open_mailbox (path, M_APPEND | M_QUIET, ctxp) == NULL) |
953 |
++ { |
954 |
++ dprint (1, (debugfile, "mutt_start_message: unable to open mailbox %s" |
955 |
++ "in append-mode, aborting.\n", path)); |
956 |
++ return NULL; |
957 |
++ } |
958 |
++ |
959 |
++ mh = safe_calloc (1, sizeof (*mh)); |
960 |
++ mh->passthru = passthru; |
961 |
++ |
962 |
++ if (ctxp->magic == M_MMDF || ctxp->magic == M_MBOX) |
963 |
++ { |
964 |
++ /* remember new mail status before appending message */ |
965 |
++ stat (path, &mh->st); |
966 |
++ |
967 |
++ if (!passthru) { |
968 |
++ /* need to add a Content-Length field to avoid problems |
969 |
++ * where a line in the message body begins with "From " |
970 |
++ */ |
971 |
++ mutt_mktemp (mh->tempfile, sizeof (mh->tempfile)); |
972 |
++ mh->tempfp = safe_fopen (mh->tempfile, "w+"); |
973 |
++ if (!mh->tempfp) |
974 |
++ { |
975 |
++ mutt_perror (mh->tempfile); |
976 |
++ dprint (1, (debugfile, "mutt_start_message: failed " |
977 |
++ "to open tempfile, aborting.\n")); |
978 |
++ goto error_out; |
979 |
++ } |
980 |
++ |
981 |
++ mutt_write_mime_body (hdr->content, mh->tempfp); |
982 |
++ |
983 |
++ /* make sure the last line ends with a newline. Emacs doesn't ensure |
984 |
++ * this will happen, and it can cause problems parsing the mailbox |
985 |
++ * later. |
986 |
++ */ |
987 |
++ fseek (mh->tempfp, -1, 2); |
988 |
++ if (fgetc (mh->tempfp) != '\n') |
989 |
++ { |
990 |
++ fseek (mh->tempfp, 0, 2); |
991 |
++ fputc ('\n', mh->tempfp); |
992 |
++ } |
993 |
++ if (fflush (mh->tempfp) || ferror (mh->tempfp)) |
994 |
++ { |
995 |
++ dprint (1, (debugfile, "mutt_start_message: failed " |
996 |
++ "to write tempfile, aborting.\n")); |
997 |
++ goto error_out; |
998 |
++ } |
999 |
++ |
1000 |
++ rewind (mh->tempfp); |
1001 |
++ |
1002 |
++ if (count_length_lines (mh->tempfp, &mh->content_length, &mh->lines)) |
1003 |
++ { |
1004 |
++ mutt_perror (mh->tempfile); |
1005 |
++ dprint (1, (debugfile, "mutt_start_message: failed " |
1006 |
++ "to count message length, aborting.\n")); |
1007 |
++ goto error_out; |
1008 |
++ } |
1009 |
++ } |
1010 |
++ } |
1011 |
++ |
1012 |
++ if ((*msgp = mx_open_new_message (ctxp, hdr, M_ADD_FROM)) == NULL) |
1013 |
++ { |
1014 |
++ dprint (1, (debugfile, "mutt_start_message: mx_open_new_message " |
1015 |
++ "failed in %s, aborting.\n", path)); |
1016 |
++ goto error_out; |
1017 |
++ } |
1018 |
++ return mh; |
1019 |
++ |
1020 |
++error_out: |
1021 |
++ /* error message already provided, just clean up */ |
1022 |
++ if (mh->tempfp) |
1023 |
++ { |
1024 |
++ safe_fclose (&mh->tempfp); |
1025 |
++ unlink (mh->tempfile); |
1026 |
++ } |
1027 |
++ FREE (&mh); |
1028 |
++ mx_close_mailbox (ctxp, NULL); |
1029 |
++ return NULL; |
1030 |
++} |
1031 |
++ |
1032 |
++static int mutt_finish_message (struct mutt_message_handle *mh, |
1033 |
++ const char *path, HEADER *hdr, |
1034 |
++ CONTEXT *ctxp, MESSAGE **msgp, int skip_buffy) |
1035 |
++{ |
1036 |
++ int ret = 0; |
1037 |
++ |
1038 |
++ if (mh->tempfp) |
1039 |
++ { |
1040 |
++ fprintf ((*msgp)->fp, "Content-Length: " OFF_T_FMT "\n", mh->content_length); |
1041 |
++ fprintf ((*msgp)->fp, "Lines: %d\n\n", mh->lines); /* NOTE double newline */ |
1042 |
++ |
1043 |
++ /* copy the body */ |
1044 |
++ rewind (mh->tempfp); |
1045 |
++ ret = mutt_copy_stream (mh->tempfp, (*msgp)->fp); |
1046 |
++ if (safe_fclose (&mh->tempfp)) |
1047 |
++ ret = -1; |
1048 |
++ |
1049 |
++ /* if there was an error, leave the temp version */ |
1050 |
++ if (!ret) |
1051 |
++ unlink (mh->tempfile); |
1052 |
++ } |
1053 |
++ else |
1054 |
++ { |
1055 |
++ if (!mh->passthru) |
1056 |
++ { |
1057 |
++ fputc ('\n', (*msgp)->fp); /* finish off the header */ |
1058 |
++ ret = mutt_write_mime_body (hdr->content, (*msgp)->fp); |
1059 |
++ } |
1060 |
++ skip_buffy = 1; /* only needed for file-based mailboxes */ |
1061 |
++ } |
1062 |
++ |
1063 |
++ ret |= mx_commit_message (*msgp, ctxp); |
1064 |
++ mx_close_message (msgp); |
1065 |
++ mx_close_mailbox (ctxp, NULL); |
1066 |
++ |
1067 |
++ if (!skip_buffy) |
1068 |
++ mutt_buffy_cleanup (path, &mh->st); |
1069 |
++ |
1070 |
++ FREE (&mh); |
1071 |
++ |
1072 |
++ return ret; |
1073 |
++} |
1074 |
++ |
1075 |
+ static int _mutt_bounce_message (FILE *fp, HEADER *h, ADDRESS *to, const char *resent_from, |
1076 |
+ ADDRESS *env_from) |
1077 |
+ { |
1078 |
+@@ -2740,81 +2899,60 @@ |
1079 |
+ } |
1080 |
+ } |
1081 |
+ |
1082 |
+-int mutt_write_fcc (const char *path, HEADER *hdr, const char *msgid, int post, char *fcc) |
1083 |
++int mutt_write_fcc (const char *path, HEADER *hdr) |
1084 |
+ { |
1085 |
++ struct mutt_message_handle *mh; |
1086 |
+ CONTEXT f; |
1087 |
+ MESSAGE *msg; |
1088 |
+- char tempfile[_POSIX_PATH_MAX]; |
1089 |
+- FILE *tempfp = NULL; |
1090 |
+- int r, need_buffy_cleanup = 0; |
1091 |
+- struct stat st; |
1092 |
+- char buf[SHORT_STRING]; |
1093 |
+ |
1094 |
+- if (post) |
1095 |
+- set_noconv_flags (hdr->content, 1); |
1096 |
++ hdr->read = 1; /* make sure to put it in the `cur' directory (maildir) */ |
1097 |
+ |
1098 |
+- if (mx_open_mailbox (path, M_APPEND | M_QUIET, &f) == NULL) |
1099 |
+- { |
1100 |
+- dprint (1, (debugfile, "mutt_write_fcc(): unable to open mailbox %s in append-mode, aborting.\n", |
1101 |
+- path)); |
1102 |
+- return (-1); |
1103 |
+- } |
1104 |
++ mh = mutt_start_message (path, hdr, &f, &msg, 0); |
1105 |
++ if (!mh) |
1106 |
++ return -1; |
1107 |
+ |
1108 |
+- /* We need to add a Content-Length field to avoid problems where a line in |
1109 |
+- * the message body begins with "From " |
1110 |
+- */ |
1111 |
+- if (f.magic == M_MMDF || f.magic == M_MBOX) |
1112 |
+- { |
1113 |
+- mutt_mktemp (tempfile, sizeof (tempfile)); |
1114 |
+- if ((tempfp = safe_fopen (tempfile, "w+")) == NULL) |
1115 |
+- { |
1116 |
+- mutt_perror (tempfile); |
1117 |
+- mx_close_mailbox (&f, NULL); |
1118 |
+- return (-1); |
1119 |
+- } |
1120 |
+- /* remember new mail status before appending message */ |
1121 |
+- need_buffy_cleanup = 1; |
1122 |
+- stat (path, &st); |
1123 |
+- } |
1124 |
++ mutt_write_rfc822_header (msg->fp, hdr->env, hdr->content, 0, 0, 1); |
1125 |
++ fprintf (msg->fp, "Status: RO\n"); |
1126 |
++ |
1127 |
++ return mutt_finish_message (mh, path, hdr, &f, &msg, 0); |
1128 |
++} |
1129 |
++ |
1130 |
++int mutt_write_postponed (const char *path, HEADER *hdr, const char *msgid, char *fcc) |
1131 |
++{ |
1132 |
++ struct mutt_message_handle *mh; |
1133 |
++ CONTEXT f; |
1134 |
++ MESSAGE *msg; |
1135 |
++ int ret; |
1136 |
++ |
1137 |
++ hdr->read = 0; /* make sure to put it in the `new' directory (maildir) */ |
1138 |
++ set_noconv_flags (hdr->content, 1); |
1139 |
+ |
1140 |
+- hdr->read = !post; /* make sure to put it in the `cur' directory (maildir) */ |
1141 |
+- if ((msg = mx_open_new_message (&f, hdr, M_ADD_FROM)) == NULL) |
1142 |
++ mh = mutt_start_message (path, hdr, &f, &msg, 0); |
1143 |
++ if (!mh) |
1144 |
+ { |
1145 |
+- mx_close_mailbox (&f, NULL); |
1146 |
+- return (-1); |
1147 |
++ set_noconv_flags (hdr->content, 0); |
1148 |
++ return -1; |
1149 |
+ } |
1150 |
+ |
1151 |
+- /* post == 1 => postpone message. Set mode = -1 in mutt_write_rfc822_header() |
1152 |
+- * post == 0 => Normal mode. Set mode = 0 in mutt_write_rfc822_header() |
1153 |
+- * */ |
1154 |
+- mutt_write_rfc822_header (msg->fp, hdr->env, hdr->content, post ? -post : 0, 0, 1); |
1155 |
++ mutt_write_rfc822_header (msg->fp, hdr->env, hdr->content, -1, 0, 1); |
1156 |
+ |
1157 |
+- /* (postponment) if this was a reply of some sort, <msgid> contians the |
1158 |
++ /* if this was a reply of some sort, <msgid> contains the |
1159 |
+ * Message-ID: of message replied to. Save it using a special X-Mutt- |
1160 |
+ * header so it can be picked up if the message is recalled at a later |
1161 |
+ * point in time. This will allow the message to be marked as replied if |
1162 |
+ * the same mailbox is still open. |
1163 |
+ */ |
1164 |
+- if (post && msgid) |
1165 |
++ if (msgid) |
1166 |
+ fprintf (msg->fp, "X-Mutt-References: %s\n", msgid); |
1167 |
+ |
1168 |
+- /* (postponment) save the Fcc: using a special X-Mutt- header so that |
1169 |
++ /* save the Fcc: using a special X-Mutt- header so that |
1170 |
+ * it can be picked up when the message is recalled |
1171 |
+ */ |
1172 |
+- if (post && fcc) |
1173 |
++ if (fcc) |
1174 |
+ fprintf (msg->fp, "X-Mutt-Fcc: %s\n", fcc); |
1175 |
+ |
1176 |
+- if (f.magic == M_MMDF || f.magic == M_MBOX) |
1177 |
+- fprintf (msg->fp, "Status: RO\n"); |
1178 |
+- |
1179 |
+- /* mutt_write_rfc822_header() only writes out a Date: header with |
1180 |
+- * mode == 0, i.e. _not_ postponment; so write out one ourself */ |
1181 |
+- if (post) |
1182 |
+- fprintf (msg->fp, "%s", mutt_make_date (buf, sizeof (buf))); |
1183 |
+- |
1184 |
+- /* (postponment) if the mail is to be signed or encrypted, save this info */ |
1185 |
+- if ((WithCrypto & APPLICATION_PGP) |
1186 |
+- && post && (hdr->security & APPLICATION_PGP)) |
1187 |
++ /* if the mail is to be signed or encrypted, save this info */ |
1188 |
++ if ((WithCrypto & APPLICATION_PGP) && (hdr->security & APPLICATION_PGP)) |
1189 |
+ { |
1190 |
+ fputs ("X-Mutt-PGP: ", msg->fp); |
1191 |
+ if (hdr->security & ENCRYPT) |
1192 |
+@@ -2830,9 +2968,8 @@ |
1193 |
+ fputc ('\n', msg->fp); |
1194 |
+ } |
1195 |
+ |
1196 |
+- /* (postponment) if the mail is to be signed or encrypted, save this info */ |
1197 |
+- if ((WithCrypto & APPLICATION_SMIME) |
1198 |
+- && post && (hdr->security & APPLICATION_SMIME)) |
1199 |
++ /* if the mail is to be signed or encrypted, save this info */ |
1200 |
++ if ((WithCrypto & APPLICATION_SMIME) && (hdr->security & APPLICATION_SMIME)) |
1201 |
+ { |
1202 |
+ fputs ("X-Mutt-SMIME: ", msg->fp); |
1203 |
+ if (hdr->security & ENCRYPT) { |
1204 |
+@@ -2851,86 +2988,22 @@ |
1205 |
+ } |
1206 |
+ |
1207 |
+ #ifdef MIXMASTER |
1208 |
+- /* (postponement) if the mail is to be sent through a mixmaster |
1209 |
++ /* if the mail is to be sent through a mixmaster |
1210 |
+ * chain, save that information |
1211 |
+ */ |
1212 |
+- |
1213 |
+- if (post && hdr->chain && hdr->chain) |
1214 |
++ if (hdr->chain) |
1215 |
+ { |
1216 |
+ LIST *p; |
1217 |
+- |
1218 |
+ fputs ("X-Mutt-Mix:", msg->fp); |
1219 |
+ for (p = hdr->chain; p; p = p->next) |
1220 |
+ fprintf (msg->fp, " %s", (char *) p->data); |
1221 |
+- |
1222 |
+ fputc ('\n', msg->fp); |
1223 |
+ } |
1224 |
+ #endif |
1225 |
+ |
1226 |
+- if (tempfp) |
1227 |
+- { |
1228 |
+- char sasha[LONG_STRING]; |
1229 |
+- int lines = 0; |
1230 |
+- |
1231 |
+- mutt_write_mime_body (hdr->content, tempfp); |
1232 |
+- |
1233 |
+- /* make sure the last line ends with a newline. Emacs doesn't ensure |
1234 |
+- * this will happen, and it can cause problems parsing the mailbox |
1235 |
+- * later. |
1236 |
+- */ |
1237 |
+- fseek (tempfp, -1, 2); |
1238 |
+- if (fgetc (tempfp) != '\n') |
1239 |
+- { |
1240 |
+- fseek (tempfp, 0, 2); |
1241 |
+- fputc ('\n', tempfp); |
1242 |
+- } |
1243 |
+- |
1244 |
+- fflush (tempfp); |
1245 |
+- if (ferror (tempfp)) |
1246 |
+- { |
1247 |
+- dprint (1, (debugfile, "mutt_write_fcc(): %s: write failed.\n", tempfile)); |
1248 |
+- safe_fclose (&tempfp); |
1249 |
+- unlink (tempfile); |
1250 |
+- mx_commit_message (msg, &f); /* XXX - really? */ |
1251 |
+- mx_close_message (&msg); |
1252 |
+- mx_close_mailbox (&f, NULL); |
1253 |
+- return -1; |
1254 |
+- } |
1255 |
+- |
1256 |
+- /* count the number of lines */ |
1257 |
+- rewind (tempfp); |
1258 |
+- while (fgets (sasha, sizeof (sasha), tempfp) != NULL) |
1259 |
+- lines++; |
1260 |
+- fprintf (msg->fp, "Content-Length: " OFF_T_FMT "\n", (LOFF_T) ftello (tempfp)); |
1261 |
+- fprintf (msg->fp, "Lines: %d\n\n", lines); |
1262 |
+- |
1263 |
+- /* copy the body and clean up */ |
1264 |
+- rewind (tempfp); |
1265 |
+- r = mutt_copy_stream (tempfp, msg->fp); |
1266 |
+- if (fclose (tempfp) != 0) |
1267 |
+- r = -1; |
1268 |
+- /* if there was an error, leave the temp version */ |
1269 |
+- if (!r) |
1270 |
+- unlink (tempfile); |
1271 |
+- } |
1272 |
+- else |
1273 |
+- { |
1274 |
+- fputc ('\n', msg->fp); /* finish off the header */ |
1275 |
+- r = mutt_write_mime_body (hdr->content, msg->fp); |
1276 |
+- } |
1277 |
+- |
1278 |
+- if (mx_commit_message (msg, &f) != 0) |
1279 |
+- r = -1; |
1280 |
+- mx_close_message (&msg); |
1281 |
+- mx_close_mailbox (&f, NULL); |
1282 |
+- |
1283 |
+- if (!post && need_buffy_cleanup) |
1284 |
+- mutt_buffy_cleanup (path, &st); |
1285 |
+- |
1286 |
+- if (post) |
1287 |
+- set_noconv_flags (hdr->content, 0); |
1288 |
+- |
1289 |
+- return r; |
1290 |
++ ret = mutt_finish_message (mh, path, hdr, &f, &msg, 0); |
1291 |
++ set_noconv_flags (hdr->content, 0); |
1292 |
++ return ret; |
1293 |
+ } |
1294 |
+ |
1295 |
+ #ifdef USE_SENDBOX |
1296 |
|
1297 |
diff --git a/mail-client/mutt/metadata.xml b/mail-client/mutt/metadata.xml |
1298 |
deleted file mode 100644 |
1299 |
index f13b107..0000000 |
1300 |
--- a/mail-client/mutt/metadata.xml |
1301 |
+++ /dev/null |
1302 |
@@ -1,9 +0,0 @@ |
1303 |
-<?xml version="1.0" encoding="UTF-8"?> |
1304 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
1305 |
-<pkgmetadata> |
1306 |
- <herd>net-mail</herd> |
1307 |
- <maintainer> |
1308 |
- <email>ferdy@g.o</email> |
1309 |
- <name>Fernando J. Pereda</name> |
1310 |
- </maintainer> |
1311 |
-</pkgmetadata> |
1312 |
|
1313 |
diff --git a/mail-client/mutt/mutt-1.5.18.ebuild b/mail-client/mutt/mutt-1.5.18.ebuild |
1314 |
deleted file mode 100644 |
1315 |
index 9c237e7..0000000 |
1316 |
--- a/mail-client/mutt/mutt-1.5.18.ebuild |
1317 |
+++ /dev/null |
1318 |
@@ -1,181 +0,0 @@ |
1319 |
-# Copyright 1999-2008 Gentoo Foundation |
1320 |
-# Distributed under the terms of the GNU General Public License v2 |
1321 |
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.16.ebuild,v 1.12 2008/03/09 21:36:14 ricmm Exp $ |
1322 |
- |
1323 |
-inherit eutils flag-o-matic autotools |
1324 |
- |
1325 |
-PATCHSET_REV="-r1" |
1326 |
- |
1327 |
-SIDEBAR_PATCH_N="patch-${PV}.sidebar.20080611.txt" |
1328 |
- |
1329 |
-DESCRIPTION="a small but very powerful text-based mail client" |
1330 |
-HOMEPAGE="http://www.mutt.org" |
1331 |
-SRC_URI="ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz |
1332 |
- !vanilla? ( |
1333 |
- !sidebar? ( |
1334 |
- mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2 |
1335 |
- ) |
1336 |
- ) |
1337 |
- sidebar? ( |
1338 |
- http://www.lunar-linux.org/~tchan/mutt/${SIDEBAR_PATCH_N} |
1339 |
- )" |
1340 |
-IUSE="berkdb crypt debug gdbm gnutls gpgme idn imap mbox nls nntp pop qdbm sasl |
1341 |
-sidebar smime smtp ssl vanilla" |
1342 |
-SLOT="0" |
1343 |
-LICENSE="GPL-2" |
1344 |
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" |
1345 |
-RDEPEND=">=sys-libs/ncurses-5.2 |
1346 |
- qdbm? ( dev-db/qdbm ) |
1347 |
- !qdbm? ( |
1348 |
- gdbm? ( sys-libs/gdbm ) |
1349 |
- !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) |
1350 |
- ) |
1351 |
- imap? ( |
1352 |
- gnutls? ( >=net-libs/gnutls-1.0.17 ) |
1353 |
- !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) |
1354 |
- sasl? ( >=dev-libs/cyrus-sasl-2 ) |
1355 |
- ) |
1356 |
- pop? ( |
1357 |
- gnutls? ( >=net-libs/gnutls-1.0.17 ) |
1358 |
- !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) |
1359 |
- sasl? ( >=dev-libs/cyrus-sasl-2 ) |
1360 |
- ) |
1361 |
- smtp? ( |
1362 |
- gnutls? ( >=net-libs/gnutls-1.0.17 ) |
1363 |
- !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) |
1364 |
- sasl? ( >=dev-libs/cyrus-sasl-2 ) |
1365 |
- ) |
1366 |
- idn? ( net-dns/libidn ) |
1367 |
- gpgme? ( >=app-crypt/gpgme-0.9.0 ) |
1368 |
- smime? ( >=dev-libs/openssl-0.9.6 ) |
1369 |
- app-misc/mime-types" |
1370 |
-DEPEND="${RDEPEND} |
1371 |
- net-mail/mailbase |
1372 |
- !vanilla? ( |
1373 |
- dev-libs/libxml2 |
1374 |
- dev-libs/libxslt |
1375 |
- app-text/docbook-xsl-stylesheets |
1376 |
- || ( www-client/lynx www-client/w3m www-client/elinks ) |
1377 |
- )" |
1378 |
- |
1379 |
-PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV} |
1380 |
- |
1381 |
-src_unpack() { |
1382 |
- unpack ${A//${SIDEBAR_PATCH_N}} && cd "${S}" || die "unpack failed" |
1383 |
- |
1384 |
- if ! use vanilla && ! use sidebar ; then |
1385 |
- use nntp || rm "${PATCHDIR}"/06-nntp.patch |
1386 |
- for p in "${PATCHDIR}"/*.patch ; do |
1387 |
- epatch "${p}" |
1388 |
- done |
1389 |
- fi |
1390 |
- |
1391 |
- if use sidebar ; then |
1392 |
- use vanilla || \ |
1393 |
- ewarn "The sidebar patch is only applied to a vanilla mutt tree." |
1394 |
- epatch "${DISTDIR}"/${SIDEBAR_PATCH_N} |
1395 |
- fi |
1396 |
- |
1397 |
- #epatch "${FILESDIR}"/${P}-parallel-make.patch |
1398 |
- AT_M4DIR="m4" eautoreconf |
1399 |
-} |
1400 |
- |
1401 |
-src_compile() { |
1402 |
- declare myconf=" |
1403 |
- $(use_enable nls) \ |
1404 |
- $(use_enable gpgme) \ |
1405 |
- $(use_enable imap) \ |
1406 |
- $(use_enable pop) \ |
1407 |
- $(use_enable smtp) \ |
1408 |
- $(use_enable crypt pgp) \ |
1409 |
- $(use_enable smime) \ |
1410 |
- $(use_enable debug) \ |
1411 |
- $(use_with idn) \ |
1412 |
- --with-curses \ |
1413 |
- --sysconfdir=/etc/${PN} \ |
1414 |
- --with-docdir=/usr/share/doc/${PN}-${PVR} \ |
1415 |
- --with-regex \ |
1416 |
- --disable-fcntl --enable-flock \ |
1417 |
- --enable-nfs-fix --enable-external-dotlock \ |
1418 |
- --with-mixmaster" |
1419 |
- |
1420 |
- # See Bug #22787 |
1421 |
- unset WANT_AUTOCONF_2_5 WANT_AUTOCONF |
1422 |
- |
1423 |
- # mutt prioritizes gdbm over bdb, so we will too. |
1424 |
- # hcache feature requires at least one database is in USE. |
1425 |
- if use qdbm; then |
1426 |
- myconf="${myconf} --enable-hcache \ |
1427 |
- --with-qdbm --without-gdbm --without-bdb" |
1428 |
- elif use gdbm ; then |
1429 |
- myconf="${myconf} --enable-hcache \ |
1430 |
- --without-qdbm --with-gdbm --without-bdb" |
1431 |
- elif use berkdb; then |
1432 |
- myconf="${myconf} --enable-hcache \ |
1433 |
- --without-gdbm --without-qdbm --with-bdb" |
1434 |
- else |
1435 |
- myconf="${myconf} --disable-hcache \ |
1436 |
- --without-qdbm --without-gdbm --without-bdb" |
1437 |
- fi |
1438 |
- |
1439 |
- # there's no need for gnutls, ssl or sasl without socket support |
1440 |
- if use pop || use imap || use smtp ; then |
1441 |
- if use gnutls; then |
1442 |
- myconf="${myconf} --with-gnutls" |
1443 |
- elif use ssl; then |
1444 |
- myconf="${myconf} --with-ssl" |
1445 |
- fi |
1446 |
- # not sure if this should be mutually exclusive with the other two |
1447 |
- myconf="${myconf} $(use_with sasl)" |
1448 |
- else |
1449 |
- myconf="${myconf} --without-gnutls --without-ssl --without-sasl" |
1450 |
- fi |
1451 |
- |
1452 |
- # See Bug #11170 |
1453 |
- case ${ARCH} in |
1454 |
- alpha|ppc) replace-flags "-O[3-9]" "-O2" ;; |
1455 |
- esac |
1456 |
- |
1457 |
- if use mbox; then |
1458 |
- myconf="${myconf} --with-mailpath=/var/spool/mail" |
1459 |
- else |
1460 |
- myconf="${myconf} --with-homespool=Maildir" |
1461 |
- fi |
1462 |
- |
1463 |
- if ! use vanilla; then |
1464 |
- # rr.compressed patch |
1465 |
- myconf="${myconf} --enable-compressed" |
1466 |
- |
1467 |
- # nntp patch |
1468 |
- myconf="${myconf} $(use_enable nntp)" |
1469 |
- fi |
1470 |
- |
1471 |
- econf ${myconf} || die "configure failed" |
1472 |
- emake || die "make failed" |
1473 |
-} |
1474 |
- |
1475 |
-src_install() { |
1476 |
- make DESTDIR="${D}" install || die "install failed" |
1477 |
- find "${D}"/usr/share/doc -type f | grep -v "html\|manual" | xargs gzip |
1478 |
- if use mbox; then |
1479 |
- insinto /etc/mutt |
1480 |
- newins "${FILESDIR}"/Muttrc.mbox Muttrc |
1481 |
- else |
1482 |
- insinto /etc/mutt |
1483 |
- doins "${FILESDIR}"/Muttrc |
1484 |
- fi |
1485 |
- |
1486 |
- # A newer file is provided by app-misc/mime-types. So we link it. |
1487 |
- rm "${D}"/etc/${PN}/mime.types |
1488 |
- dosym /etc/mime.types /etc/${PN}/mime.types |
1489 |
- |
1490 |
- dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION |
1491 |
-} |
1492 |
- |
1493 |
-pkg_postinst() { |
1494 |
- echo |
1495 |
- elog "If you are new to mutt you may want to take a look at" |
1496 |
- elog "the Gentoo QuickStart Guide to Mutt E-Mail:" |
1497 |
- elog " http://www.gentoo.org/doc/en/guide-to-mutt.xml" |
1498 |
- echo |
1499 |
-} |
1500 |
|
1501 |
diff --git a/mail-client/mutt/mutt-1.5.21-r3.ebuild b/mail-client/mutt/mutt-1.5.21-r3.ebuild |
1502 |
new file mode 100644 |
1503 |
index 0000000..868d299 |
1504 |
--- /dev/null |
1505 |
+++ b/mail-client/mutt/mutt-1.5.21-r3.ebuild |
1506 |
@@ -0,0 +1,242 @@ |
1507 |
+# Copyright 1999-2011 Gentoo Foundation |
1508 |
+# Distributed under the terms of the GNU General Public License v2 |
1509 |
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.21-r2.ebuild,v 1.1 2011/04/26 17:32:14 grobian Exp $ |
1510 |
+ |
1511 |
+EAPI="3" |
1512 |
+ |
1513 |
+inherit eutils flag-o-matic autotools |
1514 |
+ |
1515 |
+PATCHSET_REV="-r3" |
1516 |
+ |
1517 |
+DESCRIPTION="A small but very powerful text-based mail client" |
1518 |
+HOMEPAGE="http://www.mutt.org" |
1519 |
+SRC_URI="ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz |
1520 |
+ mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2 |
1521 |
+ http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2" |
1522 |
+IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl sidebar smime smtp ssl tokyocabinet" |
1523 |
+SLOT="0" |
1524 |
+LICENSE="GPL-2" |
1525 |
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
1526 |
+RDEPEND=">=sys-libs/ncurses-5.2 |
1527 |
+ tokyocabinet? ( dev-db/tokyocabinet ) |
1528 |
+ !tokyocabinet? ( |
1529 |
+ qdbm? ( dev-db/qdbm ) |
1530 |
+ !qdbm? ( |
1531 |
+ gdbm? ( sys-libs/gdbm ) |
1532 |
+ !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) |
1533 |
+ ) |
1534 |
+ ) |
1535 |
+ imap? ( |
1536 |
+ gnutls? ( >=net-libs/gnutls-1.0.17 ) |
1537 |
+ !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) |
1538 |
+ sasl? ( >=dev-libs/cyrus-sasl-2 ) |
1539 |
+ ) |
1540 |
+ pop? ( |
1541 |
+ gnutls? ( >=net-libs/gnutls-1.0.17 ) |
1542 |
+ !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) |
1543 |
+ sasl? ( >=dev-libs/cyrus-sasl-2 ) |
1544 |
+ ) |
1545 |
+ smtp? ( |
1546 |
+ gnutls? ( >=net-libs/gnutls-1.0.17 ) |
1547 |
+ !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) |
1548 |
+ sasl? ( >=dev-libs/cyrus-sasl-2 ) |
1549 |
+ ) |
1550 |
+ idn? ( net-dns/libidn ) |
1551 |
+ gpg? ( >=app-crypt/gpgme-0.9.0 ) |
1552 |
+ smime? ( >=dev-libs/openssl-0.9.6 ) |
1553 |
+ app-misc/mime-types" |
1554 |
+DEPEND="${RDEPEND} |
1555 |
+ net-mail/mailbase |
1556 |
+ doc? ( |
1557 |
+ dev-libs/libxml2 |
1558 |
+ dev-libs/libxslt |
1559 |
+ app-text/docbook-xsl-stylesheets |
1560 |
+ || ( www-client/lynx www-client/w3m www-client/elinks ) |
1561 |
+ )" |
1562 |
+ |
1563 |
+PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV} |
1564 |
+ |
1565 |
+src_prepare() { |
1566 |
+ # Post-release hot-fixes grabbed from HG, this is what all following |
1567 |
+ # patches are based on in my Mercurial patchqueue (mq). |
1568 |
+ # If you ever take over or need to modify patches here, just check |
1569 |
+ # out the gentoo branch(es) of Gentoo's Mutt Mercurial clone, and |
1570 |
+ # the patchqueue as it'll save you a lot of work. |
1571 |
+ # http://prefix.gentooexperimental.org:8000/mutt/ |
1572 |
+ # http://prefix.gentooexperimental.org:8000/mutt-patches/ |
1573 |
+ for rev in $(eval echo {0..${PR#r}}) ; do |
1574 |
+ local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch |
1575 |
+ [[ -e ${revpatch} ]] && \ |
1576 |
+ epatch "${revpatch}" |
1577 |
+ done |
1578 |
+ |
1579 |
+ # this patch is non-generic and only works because we use a sysconfdir |
1580 |
+ # different from the one used by the mailbase ebuild |
1581 |
+ use prefix && epatch "${PATCHDIR}"/prefix-mailcap.patch |
1582 |
+ |
1583 |
+ # must have fixes to compile or behave correctly, upstream |
1584 |
+ # ignores, disagrees or simply doesn't respond/apply |
1585 |
+ epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection |
1586 |
+ epatch "${PATCHDIR}"/interix-btowc.patch |
1587 |
+ epatch "${PATCHDIR}"/solaris-ncurses-chars.patch |
1588 |
+ epatch "${PATCHDIR}"/gpgme-1.2.0.patch |
1589 |
+ # same category, but functional bits |
1590 |
+ epatch "${PATCHDIR}"/dont-reveal-bbc.patch |
1591 |
+ |
1592 |
+ # the big feature patches that upstream doesn't want to include, but |
1593 |
+ # nearly every distro has due to their usefulness |
1594 |
+ for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do |
1595 |
+ epatch "${p}" |
1596 |
+ done |
1597 |
+ |
1598 |
+ # Add sendbox feature (Courier-IMAP's OUTBOX, which sends email if |
1599 |
+ # placed in that folder). Patches taken from |
1600 |
+ # http://pkgbuild.com/git/aur.git/tree/mutt-sendbox |
1601 |
+ epatch "${FILESDIR}"/1.5.21-resent-header-weeding.patch |
1602 |
+ epatch "${FILESDIR}"/1.5.21-sendbox.patch |
1603 |
+ epatch "${FILESDIR}"/1.5.21-write_postponed.patch |
1604 |
+ epatch "${FILESDIR}"/1.5.21-sendbox-bounce.patch |
1605 |
+ |
1606 |
+ # we conditionalise this one, simply because it has considerable |
1607 |
+ # impact on the code |
1608 |
+ if use sidebar; then |
1609 |
+ epatch "${PATCHDIR}"/sidebar.patch |
1610 |
+ # From http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=523774 |
1611 |
+ # sidebar-dotted handles Courier IMAP folders correctly |
1612 |
+ epatch "${PATCHDIR}"/sidebar-dotted.patch |
1613 |
+ # sidebar-sorted will sort IMAP folders instead of randomly |
1614 |
+ # displaying them |
1615 |
+ epatch "${PATCHDIR}"/sidebar-sorted.patch |
1616 |
+ fi |
1617 |
+ |
1618 |
+ # patch version string for bug reports |
1619 |
+ sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \ |
1620 |
+ muttlib.c || die "failed patching in Gentoo version" |
1621 |
+ |
1622 |
+ # many patches touch the buildsystem, we always need this |
1623 |
+ AT_M4DIR="m4" eautoreconf |
1624 |
+ |
1625 |
+ # the configure script contains some "cleverness" whether or not to setgid |
1626 |
+ # the dotlock program, resulting in bugs like #278332 |
1627 |
+ sed -i -e 's/@DOTLOCK_GROUP@//' \ |
1628 |
+ Makefile.in || die "sed failed" |
1629 |
+ |
1630 |
+ # don't just build documentation (lengthy process, with big dependencies) |
1631 |
+ if use !doc ; then |
1632 |
+ sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die |
1633 |
+ fi |
1634 |
+} |
1635 |
+ |
1636 |
+src_configure() { |
1637 |
+ local myconf=" |
1638 |
+ $(use_enable crypt pgp) \ |
1639 |
+ $(use_enable debug) \ |
1640 |
+ $(use_enable gpg gpgme) \ |
1641 |
+ $(use_enable imap) \ |
1642 |
+ $(use_enable nls) \ |
1643 |
+ $(use_enable nntp) \ |
1644 |
+ $(use_enable pop) \ |
1645 |
+ $(use_enable smime) \ |
1646 |
+ $(use_enable smtp) \ |
1647 |
+ $(use_with idn) \ |
1648 |
+ $(use_with !nntp mixmaster) \ |
1649 |
+ --enable-compressed \ |
1650 |
+ --enable-external-dotlock \ |
1651 |
+ --enable-nfs-fix \ |
1652 |
+ --sysconfdir="${EPREFIX}"/etc/${PN} \ |
1653 |
+ --with-curses \ |
1654 |
+ --with-docdir="${EPREFIX}"/usr/share/doc/${PN}-${PVR} \ |
1655 |
+ --with-regex \ |
1656 |
+ --with-exec-shell=${EPREFIX}/bin/sh" |
1657 |
+ |
1658 |
+ case $CHOST in |
1659 |
+ *-solaris*) |
1660 |
+ # Solaris has no flock in the standard headers |
1661 |
+ myconf="${myconf} --enable-fcntl --disable-flock" |
1662 |
+ ;; |
1663 |
+ *) |
1664 |
+ myconf="${myconf} --disable-fcntl --enable-flock" |
1665 |
+ ;; |
1666 |
+ esac |
1667 |
+ |
1668 |
+ # mutt prioritizes gdbm over bdb, so we will too. |
1669 |
+ # hcache feature requires at least one database is in USE. |
1670 |
+ if use tokyocabinet; then |
1671 |
+ myconf="${myconf} --enable-hcache \ |
1672 |
+ --with-tokyocabinet --without-qdbm --without-gdbm --without-bdb" |
1673 |
+ elif use qdbm; then |
1674 |
+ myconf="${myconf} --enable-hcache \ |
1675 |
+ --without-tokyocabinet --with-qdbm --without-gdbm --without-bdb" |
1676 |
+ elif use gdbm ; then |
1677 |
+ myconf="${myconf} --enable-hcache \ |
1678 |
+ --without-tokyocabinet --without-qdbm --with-gdbm --without-bdb" |
1679 |
+ elif use berkdb; then |
1680 |
+ myconf="${myconf} --enable-hcache \ |
1681 |
+ --without-tokyocabinet --without-qdbm --without-gdbm --with-bdb" |
1682 |
+ else |
1683 |
+ myconf="${myconf} --disable-hcache \ |
1684 |
+ --without-tokyocabinet --without-qdbm --without-gdbm --without-bdb" |
1685 |
+ fi |
1686 |
+ |
1687 |
+ # there's no need for gnutls, ssl or sasl without socket support |
1688 |
+ if use pop || use imap || use smtp ; then |
1689 |
+ if use gnutls; then |
1690 |
+ myconf="${myconf} --with-gnutls" |
1691 |
+ elif use ssl; then |
1692 |
+ myconf="${myconf} --with-ssl" |
1693 |
+ fi |
1694 |
+ # not sure if this should be mutually exclusive with the other two |
1695 |
+ myconf="${myconf} $(use_with sasl)" |
1696 |
+ else |
1697 |
+ myconf="${myconf} --without-gnutls --without-ssl --without-sasl" |
1698 |
+ fi |
1699 |
+ |
1700 |
+ if use mbox; then |
1701 |
+ myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail" |
1702 |
+ else |
1703 |
+ myconf="${myconf} --with-homespool=Maildir" |
1704 |
+ fi |
1705 |
+ |
1706 |
+ econf ${myconf} || die "configure failed" |
1707 |
+} |
1708 |
+ |
1709 |
+src_install() { |
1710 |
+ make DESTDIR="${D}" install || die "install failed" |
1711 |
+ if use mbox; then |
1712 |
+ insinto /etc/mutt |
1713 |
+ newins "${FILESDIR}"/Muttrc.mbox Muttrc |
1714 |
+ else |
1715 |
+ insinto /etc/mutt |
1716 |
+ doins "${FILESDIR}"/Muttrc |
1717 |
+ fi |
1718 |
+ |
1719 |
+ # A newer file is provided by app-misc/mime-types. So we link it. |
1720 |
+ rm "${ED}"/etc/${PN}/mime.types |
1721 |
+ dosym /etc/mime.types /etc/${PN}/mime.types |
1722 |
+ |
1723 |
+ # A man-page is always handy |
1724 |
+ if use !doc; then |
1725 |
+ cp doc/mutt.man mutt.1 |
1726 |
+ cp doc/muttbug.man flea.1 |
1727 |
+ doman mutt.1 flea.1 |
1728 |
+ else |
1729 |
+ # nuke manpages that should be provided by an MTA, bug #177605 |
1730 |
+ rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \ |
1731 |
+ || ewarn "failed to remove files, please file a bug" |
1732 |
+ fi |
1733 |
+ |
1734 |
+ if use !prefix ; then |
1735 |
+ fowners root:mail /usr/bin/mutt_dotlock |
1736 |
+ fperms g+s /usr/bin/mutt_dotlock |
1737 |
+ fi |
1738 |
+ |
1739 |
+ dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION |
1740 |
+} |
1741 |
+ |
1742 |
+pkg_postinst() { |
1743 |
+ echo |
1744 |
+ elog "If you are new to mutt you may want to take a look at" |
1745 |
+ elog "the Gentoo QuickStart Guide to Mutt E-Mail:" |
1746 |
+ elog " http://dev.gentoo.org/~grobian/guide-to-mutt.xml" |
1747 |
+ echo |
1748 |
+} |