Attachment #93523 for bug #131445

View | Details | Raw Unified | Return to bug 131445
Collapse All | Expand All

Lines 116-123 Link Here

(-)./Makefile (-3 / +3 lines)
116	#	116	#
117		117
118	PORTNAME= mutt-devel	118	PORTNAME= mutt-devel
119	PORTVERSION= 1.5.18	119	PORTVERSION= 1.5.19
120	PORTREVISION?= 4	120	PORTREVISION?= 0
121	CATEGORIES+= mail ipv6	121	CATEGORIES+= mail ipv6
122	.if defined(WITH_MUTT_NNTP)	122	.if defined(WITH_MUTT_NNTP)
123	CATEGORIES+= news	123	CATEGORIES+= news
Lines 168-174 Link Here
168	CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS}	168	CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS}
169	.endif	169	.endif
170		170
171	USE_AUTOTOOLS= automake:19 autoconf:262	171	USE_AUTOTOOLS= automake:110 autoconf:262
172	USE_OPENSSL= yes	172	USE_OPENSSL= yes
173		173
174	PLIST= ${WRKDIR}/PLIST	174	PLIST= ${WRKDIR}/PLIST




MD5 (mutt/mutt-1.5.19.tar.gz) = 73b3747bc7f7c805921e8d24ebac693f
SHA256 (mutt/mutt-1.5.19.tar.gz) = b160baedf2676a4c2c1a5c74049e2c63f00fccff43ee2594367087a08bfd63c8
SIZE (mutt/mutt-1.5.19.tar.gz) = 3558746
MD5 (mutt/patch-1.5.19.rr.compressed.gz) = 3f0aa26613fc20c7c6f21995730c1fd5
SHA256 (mutt/patch-1.5.19.rr.compressed.gz) = d04a7c129d11e0e8a71ecf4992986f97df17843777b3f70136a2c88464977533
SIZE (mutt/patch-1.5.19.rr.compressed.gz) = 10143
MD5 (mutt/patch-1.5.19.vvv.nntp.gz) = 1e2ad0cb9b918f8382537752df0c9958
SHA256 (mutt/patch-1.5.19.vvv.nntp.gz) = 213c944d196eee81fd402e35a1d04b745e01bd63971f4319645b65cf9e61e4ef
SIZE (mutt/patch-1.5.19.vvv.nntp.gz) = 55132
MD5 (mutt/patch-1.5.4.cd.ifdef.1) = a545036cdb55519154d0b35465f52daa
SHA256 (mutt/patch-1.5.4.cd.ifdef.1) = 7d11892bcc688bbc82b5996ca0fda2d4446d8e928bec50b2731f8a3a5d9be373
SIZE (mutt/patch-1.5.4.cd.ifdef.1) = 3545
MD5 (mutt/patch-1.5.19.vvv.initials.gz) = 10fa7e4ccfb121c699ec79157231d4f7
SHA256 (mutt/patch-1.5.19.vvv.initials.gz) = f803dfb7dd747c2dc749bb4fe1364234c361cb0740e8072063101ab622ffa9e0
SIZE (mutt/patch-1.5.19.vvv.initials.gz) = 685
MD5 (mutt/patch-1.5.19.vvv.quote.gz) = ce3e7f010058948ed11f5b3daa55829c
SHA256 (mutt/patch-1.5.19.vvv.quote.gz) = 2dc24cfe09c98197e0bef8c05aba78aba9348f5dda55c8b167d982ed47bdc683
SIZE (mutt/patch-1.5.19.vvv.quote.gz) = 1756
MD5 (mutt/p0-patch-1.5.18.dw.mbox-hook.1) = ae70a6668e297bdc804b2673221b4727
SHA256 (mutt/p0-patch-1.5.18.dw.mbox-hook.1) = 12b9f41476850a5e2eed2334be9326e4905e8a6d786740689b6966a5d285070c
SIZE (mutt/p0-patch-1.5.18.dw.mbox-hook.1) = 6812




--- doc/mutt.man.orig	2009-02-06 13:52:38.000000000 +0100
+++ doc/mutt.man	2009-02-06 13:55:05.000000000 +0100
@@ -69,7 +69,8 @@
 .PP
 Mutt is a small but very powerful text based program for reading and sending electronic
 mail under unix operating systems, including support for color terminals, MIME,
-OpenPGP, and a threaded sorting mode.
+OpenPGP, and a threaded sorting mode. Details of how to use all of this is
+available in \fI${DOCSDIR}\fP.
 .SH OPTIONS
 .PP
 .I Note:
 .IR




--- doc/Makefile.am.orig	2009-02-06 13:25:21.000000000 +0100
+++ doc/Makefile.am	2009-02-06 13:27:06.000000000 +0100
@@ -44,7 +44,7 @@
 
 all: makedoc-all
 

 
 install-data-local: makedoc-all instdoc
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
@@ -66,9 +66,6 @@
 		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
 	done
 	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)

 	$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
 	-if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
 		mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \
@@ -99,9 +96,7 @@
 
 check:
 manual.txt: manual.html
-	-LC_ALL=C lynx -dump -nolist -with_backspaces manual.html > $@ || \
-	LC_ALL=C w3m -dump manual.html > $@ || \
-	LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@
+	-LC_ALL=C lynx -dump -nolist -with_backspaces manual.html > $@
+	-lynx -dump -nolist -with_backspaces manual.html > $@
 
 Muttrc: stamp-doc-rc
 




 	done
 
 uninstall-local:
--- init.h.orig	2009-02-06 13:27:52.000000000 +0100
+++ init.h	2009-02-06 13:34:09.000000000 +0100
@@ -1808,9 +1808,8 @@
   ** .pp
   ** For examples on how to configure these formats for the various versions
   ** of PGP which are floating around, see the pgp and gpg sample configuration files in
-  ** the \fCsamples/\fP subdirectory which has been installed on your system
-  ** alongside the documentation.
-  ** (PGP only)
+  ** the \fCshare/examples/mutt/\fP subdirectory which has been installed on
+  **  your system. (PGP only)
   */
   { "pgp_getkeys_command",	DT_STR, R_NONE, UL &PgpGetkeysCommand, 0},
   /*
@@ -2017,9 +2016,8 @@
   ** .de
   ** .pp
   ** For examples on how to configure these formats, see the \fCsmime.rc\fP in
-  ** the \fCsamples/\fP subdirectory which has been installed on your system
-  ** alongside the documentation.
-  ** (S/MIME only)
+  ** the \fCshare/examples/mutt/\fP subdirectory which has been installed on
+  ** your system. (S/MIME only)
   */
   { "smime_verify_command", 	DT_STR, R_NONE, UL &SmimeVerifyCommand, 0},
   /*
--- INSTALL.orig	Mon Nov 25 15:16:46 2002
+++ INSTALL	Wed Mar 26 15:59:57 2003
@@ -225,13 +225,13 @@

 
 into your system's global Muttrc, which normally resides in /etc or
 /usr/local/etc.
--- doc/manual.txt.orig	2009-01-06 01:37:18.000000000 +0100
+++ doc/manual.txt	2009-02-06 13:32:18.000000000 +0100
@@ -2982,9 +2982,10 @@
 shows that arguments can be quoted: the script will receive the expanded string
 between the single quotes as the only argument.
 

+filter for $status_format to set the current terminal's title, if supported.
+
 
 Chapter 4. Advanced Usage
 
@@ -7576,8 +7577,8 @@
     One or more key IDs.
 
 For examples on how to configure these formats for the various versions of PGP
 which are floating around, see the pgp and gpg sample configuration files in
-the samples/ subdirectory which has been installed on your system alongside the
-documentation. (PGP only)
+the share/examples/mutt/ subdirectory which has been installed on your system.
+(PGP only)
 
 3.170. pgp_getkeys_command
 
@@ -7809,9 +7810,9 @@
     or file, this expands to ?-CApath $smime_ca_location? or ?-CAfile
     $smime_ca_location?.
     $smime_ca_location".
 
-For examples on how to configure these formats, see the smime.rc in the samples
-/ subdirectory which has been installed on your system alongside the
-documentation. (S/MIME only)
+For examples on how to configure these formats, see the smime.rc in the 
+share/examples/mutt/ subdirectory which has been installed on your system.
+(S/MIME only)
 
 3.189. smime_verify_command
 




--- handler.c.orig	2008-01-30 05:26:50.000000000 +0100
+++ handler.c	2008-10-16 10:56:40.000000000 +0200
@@ -1199,11 +1199,12 @@
     
     if (rc)
     {
+      mutt_error ("One or more parts of this message could not be displayed");
       dprint (1, (debugfile, "Failed on attachment #%d, type %s/%s.\n", count, TYPE(p), NONULL (p->subtype)));
     }
     
-    if (rc || ((s->flags & M_REPLYING)
-               && (option (OPTINCLUDEONLYFIRST)) && (s->flags & M_FIRSTDONE)))
+    if ((s->flags & M_REPLYING)
+        && (option (OPTINCLUDEONLYFIRST)) && (s->flags & M_FIRSTDONE))
       break;
   }
 
@@ -1564,6 +1565,14 @@
 
     if (!handler)
       handler = multipart_handler;
+    
+    if (b->encoding != ENC7BIT && b->encoding != ENC8BIT
+        && b->encoding != ENCBINARY)
+    {
+      dprint (1, (debugfile, "Bad encoding type %d for multipart entity, "
+                  "assuming 7 bit\n", b->encoding));
+      b->encoding = ENC7BIT;
+    }
   }
   else if (WithCrypto && b->type == TYPEAPPLICATION)
   {




Index: imap/browse.c
Obtained from: http://dev.mutt.org/trac/changeset/5401%3Abba92e401440/imap/browse.c?old=5378%3Aac00273b3a88&old_path=imap%2Fbrowse.c
Bug description: http://dev.mutt.org/trac/ticket/3057
===================================================================
--- imap/browse.c
+++ imap/browse.c
@@ -229,5 +229,5 @@
   }
 
-  if (!imap_mxcmp(mx.mbox, idata->mailbox))
+  if (idata->ctx && !imap_mxcmp(mx.mbox, idata->mailbox))
   {
     state->new = idata->ctx->new;

Lines 1-6 Link Here

(-)./files/patch-mktemp (-4 / +4 lines)
1	--- muttlib.c.orig Fri Feb 4 08:09:25 2005	1	--- muttlib.c.orig 2009-02-06 13:39:51.000000000 +0100
2	+++ muttlib.c Fri Feb 4 08:13:37 2005	2	+++ muttlib.c 2009-02-06 13:42:35.000000000 +0100
3	@@ -664,7 +664,11 @@	3	@@ -733,7 +733,11 @@
4		4
5	void _mutt_mktemp (char s, const char src, int line)	5	void _mutt_mktemp (char s, const char src, int line)
6	{	6	{
Lines 10-15 Link Here
10	+ snprintf (s, _POSIX_PATH_MAX-6, "%s/mutt-%s-XXXXXXXX", NONULL(Tempdir), NONULL(Hostname));	10	+ snprintf (s, _POSIX_PATH_MAX-6, "%s/mutt-%s-XXXXXXXX", NONULL(Tempdir), NONULL(Hostname));
11	+ mktemp (s);	11	+ mktemp (s);
12	+ strncat(s, t, 6);	12	+ strncat(s, t, 6);
13	dprint (1, (debugfile, "%s:%d: mutt_mktemp returns \"%s\".\n", src, line, s));	13	dprint (3, (debugfile, "%s:%d: mutt_mktemp returns \"%s\".\n", src, line, s));
14	unlink (s);	14	unlink (s);
15	}	15	}




       {
 	/* signed ? free it! */
 	return (-1);
--- init.h.orig	2009-02-06 13:43:14.000000000 +0100
+++ init.h	2009-02-06 13:46:53.000000000 +0100
@@ -1957,6 +1957,11 @@
   ** not used.
   ** (S/MIME only)
   */
+  { "smime_encrypt_self",	DT_QUAD,	 R_NONE, OPT_SMIMEENCRYPTSELF, 1 },
+  { "smime_encrypt_self",		DT_QUAD,	 R_NONE, OPT_SMIMEENCRYPTSELF, M_YES },
+  /*
+  ** .pp
+  ** Encrypt the message to smime_default_key too.
+  */
   { "smime_encrypt_with",	DT_STR,	 R_NONE, UL &SmimeCryptAlg, 0 },
   /*
   ** .pp
diff -u -d -b -B -r3.18 mutt.h

Lines 69-75 Link Here

(-)./scripts/generate-plist (-1 lines)
69	%%DOCSDIR%%/ABOUT-NLS	69	%%DOCSDIR%%/ABOUT-NLS
70	%%DOCSDIR%%/COPYRIGHT	70	%%DOCSDIR%%/COPYRIGHT
71	%%DOCSDIR%%/ChangeLog	71	%%DOCSDIR%%/ChangeLog
72	%%DOCSDIR%%/ChangeLog.old
73	%%DOCSDIR%%/GPL	72	%%DOCSDIR%%/GPL
74	%%DOCSDIR%%/INSTALL	73	%%DOCSDIR%%/INSTALL
75	%%DOCSDIR%%/NEWS	74	%%DOCSDIR%%/NEWS

Return to bug 131445

Lines 1-21 Link Here

(-)./distinfo (-15 / +15 lines)
1	MD5 (mutt/mutt-1.5.18.tar.gz) = 27c30037120189b9f9c0d3e76361b8f8	1	MD5 (mutt/mutt-1.5.19.tar.gz) = 73b3747bc7f7c805921e8d24ebac693f
2	SHA256 (mutt/mutt-1.5.18.tar.gz) = 8bb6d69ea2c72030b66ec9bb4bd4007ba6d8dc5f60fdfde7b712e2784e08bfb3	2	SHA256 (mutt/mutt-1.5.19.tar.gz) = b160baedf2676a4c2c1a5c74049e2c63f00fccff43ee2594367087a08bfd63c8
3	SIZE (mutt/mutt-1.5.18.tar.gz) = 3602632	3	SIZE (mutt/mutt-1.5.19.tar.gz) = 3558746
4	MD5 (mutt/patch-1.5.18.rr.compressed.gz) = 75abcdfb9f524f4cdc26049918aae265	4	MD5 (mutt/patch-1.5.19.rr.compressed.gz) = 3f0aa26613fc20c7c6f21995730c1fd5
5	SHA256 (mutt/patch-1.5.18.rr.compressed.gz) = c09fbe38d6faaff7ea8164adc12e1a70ba27c33c35a8b6e1fe5db4a4854893e9	5	SHA256 (mutt/patch-1.5.19.rr.compressed.gz) = d04a7c129d11e0e8a71ecf4992986f97df17843777b3f70136a2c88464977533
6	SIZE (mutt/patch-1.5.18.rr.compressed.gz) = 10082	6	SIZE (mutt/patch-1.5.19.rr.compressed.gz) = 10143
7	MD5 (mutt/patch-1.5.18.vvv.nntp.gz) = b642b723363dc2e172d34f63e077831b	7	MD5 (mutt/patch-1.5.19.vvv.nntp.gz) = 1e2ad0cb9b918f8382537752df0c9958
8	SHA256 (mutt/patch-1.5.18.vvv.nntp.gz) = 4dd82e79f9179570e8a2d27c272a1de74a098cdd49eb7d461c76b47e893030cd	8	SHA256 (mutt/patch-1.5.19.vvv.nntp.gz) = 213c944d196eee81fd402e35a1d04b745e01bd63971f4319645b65cf9e61e4ef
9	SIZE (mutt/patch-1.5.18.vvv.nntp.gz) = 55263	9	SIZE (mutt/patch-1.5.19.vvv.nntp.gz) = 55132
10	MD5 (mutt/patch-1.5.4.cd.ifdef.1) = a545036cdb55519154d0b35465f52daa	10	MD5 (mutt/patch-1.5.4.cd.ifdef.1) = a545036cdb55519154d0b35465f52daa
11	SHA256 (mutt/patch-1.5.4.cd.ifdef.1) = 7d11892bcc688bbc82b5996ca0fda2d4446d8e928bec50b2731f8a3a5d9be373	11	SHA256 (mutt/patch-1.5.4.cd.ifdef.1) = 7d11892bcc688bbc82b5996ca0fda2d4446d8e928bec50b2731f8a3a5d9be373
12	SIZE (mutt/patch-1.5.4.cd.ifdef.1) = 3545	12	SIZE (mutt/patch-1.5.4.cd.ifdef.1) = 3545
13	MD5 (mutt/patch-1.5.18.vvv.initials.gz) = a73d9cb673b5976b562c124cb748b98d	13	MD5 (mutt/patch-1.5.19.vvv.initials.gz) = 10fa7e4ccfb121c699ec79157231d4f7
14	SHA256 (mutt/patch-1.5.18.vvv.initials.gz) = d0efc55b7b1cff4770c1e15b7710d11e19cd28a91714155636ad87556318f3f0	14	SHA256 (mutt/patch-1.5.19.vvv.initials.gz) = f803dfb7dd747c2dc749bb4fe1364234c361cb0740e8072063101ab622ffa9e0
15	SIZE (mutt/patch-1.5.18.vvv.initials.gz) = 679	15	SIZE (mutt/patch-1.5.19.vvv.initials.gz) = 685
16	MD5 (mutt/patch-1.5.18.vvv.quote.gz) = 67c3582b272d71612bef6216f028d960	16	MD5 (mutt/patch-1.5.19.vvv.quote.gz) = ce3e7f010058948ed11f5b3daa55829c
17	SHA256 (mutt/patch-1.5.18.vvv.quote.gz) = 9f77848a63e6775a88e84901b9fcad743985f481b5f7a9249df5603d871277a0	17	SHA256 (mutt/patch-1.5.19.vvv.quote.gz) = 2dc24cfe09c98197e0bef8c05aba78aba9348f5dda55c8b167d982ed47bdc683
18	SIZE (mutt/patch-1.5.18.vvv.quote.gz) = 1736	18	SIZE (mutt/patch-1.5.19.vvv.quote.gz) = 1756
19	MD5 (mutt/p0-patch-1.5.18.dw.mbox-hook.1) = ae70a6668e297bdc804b2673221b4727	19	MD5 (mutt/p0-patch-1.5.18.dw.mbox-hook.1) = ae70a6668e297bdc804b2673221b4727
20	SHA256 (mutt/p0-patch-1.5.18.dw.mbox-hook.1) = 12b9f41476850a5e2eed2334be9326e4905e8a6d786740689b6966a5d285070c	20	SHA256 (mutt/p0-patch-1.5.18.dw.mbox-hook.1) = 12b9f41476850a5e2eed2334be9326e4905e8a6d786740689b6966a5d285070c
21	SIZE (mutt/p0-patch-1.5.18.dw.mbox-hook.1) = 6812	21	SIZE (mutt/p0-patch-1.5.18.dw.mbox-hook.1) = 6812

Lines 1-12 Link Here

(-)./files/extra-patch-doc-ref (-5 / +5 lines)
1	--- doc/mutt.man.orig Wed Apr 4 07:37:13 2007	1	--- doc/mutt.man.orig 2009-02-06 13:52:38.000000000 +0100
2	+++ doc/mutt.man Mon Apr 9 15:39:36 2007	2	+++ doc/mutt.man 2009-02-06 13:55:05.000000000 +0100
3	@@ -57,7 +57,8 @@	3	@@ -69,7 +69,8 @@
4	.PP	4	.PP
5	Mutt is a small but very powerful text based program for reading and sending electronic	5	Mutt is a small but very powerful text based program for reading and sending electronic
6	mail under unix operating systems, including support for color terminals, MIME,	6	mail under unix operating systems, including support for color terminals, MIME,
7	-OpenPGP, and a threaded sorting mode.	7	-OpenPGP, and a threaded sorting mode.
8	+OpenPGP, and a threaded sorting mode. Details of how to use all of this is	8	+OpenPGP, and a threaded sorting mode. Details of how to use all of this is
9	+available in \fI${DOCSDIR}\fP.	9	+available in \fI${DOCSDIR}\fP.
10	.SH OPTIONS
11	.PP	10	.PP
12	.IP "-A \fIalias\fP"	11	.I Note:
		12	.IR

Lines 1-6 Link Here

(-)./files/patch-02 (-11 / +10 lines)
1	--- doc/Makefile.am.orig 2008-01-30 05:26:50.000000000 +0100	1	--- doc/Makefile.am.orig 2009-02-06 13:25:21.000000000 +0100
2	+++ doc/Makefile.am 2008-06-13 12:18:37.000000000 +0200	2	+++ doc/Makefile.am 2009-02-06 13:27:06.000000000 +0100
3	@@ -45,7 +46,7 @@	3	@@ -44,7 +44,7 @@
4		4
5	all: makedoc-all	5	all: makedoc-all
6		6
Lines 9-15 Link Here
9		9
10	install-data-local: makedoc-all instdoc	10	install-data-local: makedoc-all instdoc
11	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1	11	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
12	@@ -67,9 +68,6 @@	12	@@ -66,9 +66,6 @@
13	$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \	13	$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
14	done	14	done
15	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)	15	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
Lines 19-33 Link Here
19	$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist	19	$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
20	-if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \	20	-if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
21	mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \	21	mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \
22	@@ -100,10 +98,7 @@	22	@@ -99,9 +96,7 @@
23		23
24	check:	24	check:
25	manual.txt: manual.html db-cleanup.xsl	25	manual.txt: manual.html
26	- -xsltproc --nonet -o manual-txt.html $(srcdir)/db-cleanup.xsl manual.html \|\| cp manual.html manual-txt.html	26	- -LC_ALL=C lynx -dump -nolist -with_backspaces manual.html > $@ \|\| \
27	- -lynx -dump -nolist -with_backspaces manual-txt.html > $@ \|\| \	27	- LC_ALL=C w3m -dump manual.html > $@ \|\| \
28	- w3m -dump manual-txt.html > $@ \|\| \	28	- LC_ALL=C elinks -dump -no-numbering -no-references manual.html \| sed -e 's,\\001, ,g' > $@
29	- elinks -dump -no-numbering -no-references manual-txt.html > $@	29	+ -LC_ALL=C lynx -dump -nolist -with_backspaces manual.html > $@
30	+ -lynx -dump -nolist -with_backspaces manual.html > $@
31		30
32	Muttrc: stamp-doc-rc	31	Muttrc: stamp-doc-rc
33		32

Lines 24-53 Link Here

(-)./files/patch-examples (-34 / +34 lines)
24	done	24	done
25		25
26	uninstall-local:	26	uninstall-local:
27	--- init.h.orig Tue Mar 4 10:28:12 2003	27	--- init.h.orig 2009-02-06 13:27:52.000000000 +0100
28	+++ init.h Wed Mar 26 15:41:19 2003	28	+++ init.h 2009-02-06 13:34:09.000000000 +0100
29	@@ -1455,8 +1455,8 @@	29	@@ -1808,9 +1808,8 @@
30	** .pp	30	** .pp
31	** For examples on how to configure these formats for the various versions	31	** For examples on how to configure these formats for the various versions
32	** of PGP which are floating around, see the pgp*.rc and gpg.rc files in	32	** of PGP which are floating around, see the pgp and gpg sample configuration files in
33	- ** the samples/ subdirectory which has been installed on your system	33	- ** the \fCsamples/\fP subdirectory which has been installed on your system
34	- ** alongside the documentation.	34	- ** alongside the documentation.
35	+ ** the share/examples/mutt subdirectory which has been installed on your	35	- ** (PGP only)
36	+ ** system.	36	+ ** the \fCshare/examples/mutt/\fP subdirectory which has been installed on
37	** (PGP only)	37	+ ** your system. (PGP only)
38	*/	38	*/
39	{ "pgp_getkeys_command", DT_STR, R_NONE, UL &PgpGetkeysCommand, 0},	39	{ "pgp_getkeys_command", DT_STR, R_NONE, UL &PgpGetkeysCommand, 0},
40	@@ -1628,8 +1628,8 @@	40	/*
		41	@@ -2017,9 +2016,8 @@
41	** .de	42	** .de
42	** .pp	43	** .pp
43	** For examples on how to configure these formats, see the smime.rc in	44	** For examples on how to configure these formats, see the \fCsmime.rc\fP in
44	- ** the samples/ subdirectory which has been installed on your system	45	- ** the \fCsamples/\fP subdirectory which has been installed on your system
45	- ** alongside the documentation.	46	- ** alongside the documentation.
46	+ ** the share/examples/mutt subdirectory which has been installed on your	47	- ** (S/MIME only)
47	+ ** system.	48	+ ** the \fCshare/examples/mutt/\fP subdirectory which has been installed on
48	** (S/MIME only)	49	+ ** your system. (S/MIME only)
49	*/	50	*/
50	{ "smime_verify_command", DT_STR, R_NONE, UL &SmimeVerifyCommand, 0},	51	{ "smime_verify_command", DT_STR, R_NONE, UL &SmimeVerifyCommand, 0},
		52	/*
51	--- INSTALL.orig Mon Nov 25 15:16:46 2002	53	--- INSTALL.orig Mon Nov 25 15:16:46 2002
52	+++ INSTALL Wed Mar 26 15:59:57 2003	54	+++ INSTALL Wed Mar 26 15:59:57 2003
53	@@ -225,13 +225,13 @@	55	@@ -225,13 +225,13 @@
Lines 66-74 Link Here
66		68
67	into your system's global Muttrc, which normally resides in /etc or	69	into your system's global Muttrc, which normally resides in /etc or
68	/usr/local/etc.	70	/usr/local/etc.
69	--- doc/manual.txt.orig Thu Nov 1 22:07:09 2007	71	--- doc/manual.txt.orig 2009-01-06 01:37:18.000000000 +0100
70	+++ doc/manual.txt Sun Nov 4 13:55:21 2007	72	+++ doc/manual.txt 2009-02-06 13:32:18.000000000 +0100
71	@@ -2617,9 +2617,10 @@	73	@@ -2982,9 +2982,10 @@
72	shows that arguments can be quoted: the script will receive the expanded string	74	shows that arguments can be quoted: the script will receive the expanded string
73	between the single quotes as the only argument.	75	between the single quotes as the only argument.
74		76
Lines 80-110 Link Here
80	+filter for $status_format to set the current terminal's title, if supported.	82	+filter for $status_format to set the current terminal's title, if supported.
81	+	83	+
82		84
83	Chapter 4. Advanced Usage	85	Chapter 4. Advanced Usage
84		86
85	@@ -6957,9 +6958,9 @@	87	@@ -7576,8 +7577,8 @@
86	One or more key IDs.
87		88
88	For examples on how to configure these formats for the various versions of PGP	89	For examples on how to configure these formats for the various versions of PGP
89	-which are floating around, see the pgp*.rc and gpg.rc files in the samples/	90	which are floating around, see the pgp and gpg sample configuration files in
90	-subdirectory which has been installed on your system alongside the	91	-the samples/ subdirectory which has been installed on your system alongside the
91	-documentation. (PGP only)	92	-documentation. (PGP only)
92	+which are floating around, see the pgp*.rc and gpg.rc files in the	93	+the share/examples/mutt/ subdirectory which has been installed on your system.
93	+share/examples/mutt/ subdirectory which has been installed on your system	94	+(PGP only)
94	+alongside the documentation. (PGP only)	95
95		96	3.170. pgp_getkeys_command
96	3.169. pgp_getkeys_command	97
97		98	@@ -7809,9 +7810,9 @@
98	@@ -7155,9 +7156,9 @@	99	or file, this expands to ?-CApath $smime_ca_location? or ?-CAfile
99	or file, this expands to "-CApath $smime_ca_location" or "-CAfile	100	$smime_ca_location?.
100	$smime_ca_location".
101		101
102	-For examples on how to configure these formats, see the smime.rc in the samples	102	-For examples on how to configure these formats, see the smime.rc in the samples
103	-/ subdirectory which has been installed on your system alongside the	103	-/ subdirectory which has been installed on your system alongside the
104	-documentation. (S/MIME only)	104	-documentation. (S/MIME only)
105	+For examples on how to configure these formats, see the smime.rc in the	105	+For examples on how to configure these formats, see the smime.rc in the
106	+share/examples/mutt/ subdirectory which has been installed on your system	106	+share/examples/mutt/ subdirectory which has been installed on your system.
107	+alongside the documentation. (S/MIME only)	107	+(S/MIME only)
108		108
109	3.188. smime_verify_command	109	3.189. smime_verify_command
110		110

Lines 1-32 Link Here

(-)./files/patch-handler.c (-32 lines)
1	--- handler.c.orig 2008-01-30 05:26:50.000000000 +0100
2	+++ handler.c 2008-10-16 10:56:40.000000000 +0200
3	@@ -1199,11 +1199,12 @@
4
5	if (rc)
6	{
7	+ mutt_error ("One or more parts of this message could not be displayed");
8	dprint (1, (debugfile, "Failed on attachment #%d, type %s/%s.\n", count, TYPE(p), NONULL (p->subtype)));
9	}
10
11	- if (rc \|\| ((s->flags & M_REPLYING)
12	- && (option (OPTINCLUDEONLYFIRST)) && (s->flags & M_FIRSTDONE)))
13	+ if ((s->flags & M_REPLYING)
14	+ && (option (OPTINCLUDEONLYFIRST)) && (s->flags & M_FIRSTDONE))
15	break;
16	}
17
18	@@ -1564,6 +1565,14 @@
19
20	if (!handler)
21	handler = multipart_handler;
22	+
23	+ if (b->encoding != ENC7BIT && b->encoding != ENC8BIT
24	+ && b->encoding != ENCBINARY)
25	+ {
26	+ dprint (1, (debugfile, "Bad encoding type %d for multipart entity, "
27	+ "assuming 7 bit\n", b->encoding));
28	+ b->encoding = ENC7BIT;
29	+ }
30	}
31	else if (WithCrypto && b->type == TYPEAPPLICATION)
32	{

Lines 1-13 Link Here

(-)./files/patch-imap-browse.c (-13 lines)
1	Index: imap/browse.c
2	Obtained from: http://dev.mutt.org/trac/changeset/5401%3Abba92e401440/imap/browse.c?old=5378%3Aac00273b3a88&old_path=imap%2Fbrowse.c
3	Bug description: http://dev.mutt.org/trac/ticket/3057
4	===================================================================
5	--- imap/browse.c
6	+++ imap/browse.c
7	@@ -229,5 +229,5 @@
8	}
9
10	- if (!imap_mxcmp(mx.mbox, idata->mailbox))
11	+ if (idata->ctx && !imap_mxcmp(mx.mbox, idata->mailbox))
12	{
13	state->new = idata->ctx->new;

Lines 22-39 Link Here

(-)./files/patch-smime-self (-7 / +7 lines)
22	{	22	{
23	/* signed ? free it! */	23	/* signed ? free it! */
24	return (-1);	24	return (-1);
25	--- init.h 14 Apr 2003 09:09:53 -0000 3.38	25	--- init.h.orig 2009-02-06 13:43:14.000000000 +0100
26	+++ init.h 7 May 2003 14:57:02 -0000	26	+++ init.h 2009-02-06 13:46:53.000000000 +0100
27	@@ -1585,6 +1585,11 @@	27	@@ -1957,6 +1957,11 @@
28	/*	28	** not used.
		29	** (S/MIME only)
29	*/	30	*/
30		31	+ { "smime_encrypt_self", DT_QUAD, R_NONE, OPT_SMIMEENCRYPTSELF, 1 },
31	+ { "smime_encrypt_self", DT_QUAD, R_NONE, OPT_SMIMEENCRYPTSELF, M_YES },
32	+ /*	32	+ /*
33	+ ** .pp	33	+ ** .pp
34	+ ** Encrypt the message to smime_default_key too.	34	+ ** Encrypt the message to smime_default_key too.
35	+ */	35	+ */
36	{ "smime_timeout", DT_NUM, R_NONE, UL &SmimeTimeout, 300 },	36	{ "smime_encrypt_with", DT_STR, R_NONE, UL &SmimeCryptAlg, 0 },
37	/*	37	/*
38	** .pp	38	** .pp
39	diff -u -d -b -B -r3.18 mutt.h	39	diff -u -d -b -B -r3.18 mutt.h