Add patch from Debian to fix upstream ticket 3337: mutt disclosing bcc header to mta

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 116 insertions, 14 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index 5102d61350fd..a45a4363645a 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/mutt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.156 2009/09/15 23:49:30 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.157 2009/09/21 11:00:45 grobian Exp $
+
+*mutt-1.5.20-r6 (21 Sep 2009)
+
+  21 Sep 2009; Fabian Groffen <grobian@gentoo.org> -mutt-1.5.20-r5.ebuild,
+  +mutt-1.5.20-r6.ebuild, +files/mutt-1.5.20-dont-reveal-bbc.patch:
+  Add patch from Debian to fix upstream ticket 3337: mutt disclosing bcc
+  header to mta
 
   15 Sep 2009; Joseph Jezak <josejx@gentoo.org> mutt-1.5.20-r4.ebuild:
   Marked ppc stable for bug #275703.
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 165983ec209d..6e8b8f44d6b8 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX Muttrc 667 RMD160 0405e73c6a4122869ce9a9bd408068d316740b71 SHA1 e30c96e6f21a30fe576abcb3be65a34accf4e11f SHA256 932940db69c951caaa87a17ee98a8e2262aeadf1e978f6d671b642184c5d545f
 AUX Muttrc.mbox 486 RMD160 0f692c9d3a7591f3a0611529616aa94a5c62a641 SHA1 9e231303fe9fb2fe80542115ceefb972c7b11d5a SHA256 10b251f88ccc5d4c95c96ab17b6ab6a30a16d6590ab896a60037f869fc4d44a0
 AUX mutt-1.5.13-prefix-mailcap.patch 821 RMD160 c8c7c6b97eee2a1435c160b782efec430131a415 SHA1 c60cd4eca864102940e66ac1ce550d39d85e5fb9 SHA256 76c88cab053ca6f5292554270a8e337420c177c1eccaab1610bfcf67c6e89764
@@ -12,6 +9,7 @@ AUX mutt-1.5.19-libgnutls-test-15c662a95b91.patch 9187 RMD160 b5d981c5aeb66f9fc1
 AUX mutt-1.5.19-mutt-gnutls-7d0583e0315d-0b13183e40e0.patch 12414 RMD160 6759b26ee028fc9d5a0f5d6b7d56fd4c1c879a04 SHA1 819146a1650035ee2a9016f01f0e2d11b8c11896 SHA256 92033adfb057818a7dcae8b02b91df8a62e7d52c339268caa4a38149ac28bc45
 AUX mutt-1.5.19-mutt_ssl-3af7e8af1983-dc9ec900c657.patch 6968 RMD160 ea63c5149d78d2790bfbfbb9a5d2499e179c8ae1 SHA1 d23cab55003763d79475ef4eb95c10504dad323f SHA256 54da63a9ce41c3704a3b96288de7b8d24ef1305a9b27306c8178e900a81f196b
 AUX mutt-1.5.20-display-unsigned-pgp-7f37d0a57d83.patch 1197 RMD160 59f3df7d7f299e90e4c0080d1cc98dcc3a82abfb SHA1 8deb3b88ff64f31ed1ce027de74e76be5a485147 SHA256 4790449de5476f570e95ebdec9db59afd50dd7507485d22d3848ad7bd1327b20
+AUX mutt-1.5.20-dont-reveal-bbc.patch 4027 RMD160 0295eb2ed6ae7d3b39c5b101d519d13f45d64c80 SHA1 c7ac97ec879c070eb3a24184ce41b199eec89840 SHA256 88b313f8baea81eec814d03acbe9aa5cf4a249de120426608893c1c53a8a3596
 AUX mutt-1.5.20-fix-mh-parsing-14bb498c6a1c.patch 484 RMD160 444125b0ec6c56a90bd23586ffd28b96108c0b28 SHA1 0f1fb90b5cfa0d29e04bdd00273de7c90d425241 SHA256 9cf9b6d5410e82d83b650c9568cf9c2428ae580001b512e12c5a3482468c86fb
 AUX mutt-1.5.20-gpgme-1.2.0.patch 623 RMD160 0387025c571723f9ebde284789c65464cf0c2da4 SHA1 230af7e00e06a41f0024b8c6e19bd9d5b208511c SHA256 9e69e53cb3013a379f85e6dcea0550c4ec8582ea1f36a83c6a0ad95828164551
 AUX mutt-1.5.20-gpgme-keys-d41e043fa775.patch 589 RMD160 99b4b44459952afa55db43c5e30f204b3cae797e SHA1 432938b1876fdb95c1bfbd0ab79f6ae8430fe5e9 SHA256 9ea0850343eb54be14f58532bf4bf2a6e5ad970c43ece56e185d693eb50966e8
@@ -43,13 +41,6 @@ DIST patch-1.5.20.sidebar.20090619.txt 53335 RMD160 4c693b100a320d11ea94aedb75cf
 EBUILD mutt-1.5.16.ebuild 4989 RMD160 2a9ae3ece8f56692e0077b7b3940e607c79f2a14 SHA1 a79646fbfce1e85ecc2f8aaa4728e3c7303185f0 SHA256 55a70c2bb8f144549e6a12a4ba6bcb8796202d4f7be25fb809fefa2848615368
 EBUILD mutt-1.5.19-r1.ebuild 5933 RMD160 67a206bce8e2c652216cab13b619adfa2924f624 SHA1 07f6fc64eed63a635dc92f56f53687c66b8def13 SHA256 13c9eb5b1e3d933a4ede446d4779202f47ec6695dc4ecbd7fef31f78c67e8dfc
 EBUILD mutt-1.5.20-r4.ebuild 8442 RMD160 b8e5a90fa48cb236f31e69dddb63ba7078f2dd5d SHA1 88f66d53c60f431173ac86c7c1ca5888879e9e7c SHA256 ddfda6ec2a6649f05b36e492b5237feaf64546c758e1c8bfd0a600af8b25ee80
-EBUILD mutt-1.5.20-r5.ebuild 8672 RMD160 e6637abe65926a657647430f839f6441e82578dd SHA1 b294c377d5926da98b4dfb8625d96fedb6582558 SHA256 b7f016d8657da1b1733c4fd66084c670538c62e275d08457865f600723aa19ae
-MISC ChangeLog 35285 RMD160 feae0f4f12411e96687570d24d97514ad4447488 SHA1 a30b02cdd950aefbdf415770fa79664a753a5397 SHA256 1e18d5435ce7cd34d10568891b5943ec71ac3052fc773bfd3dfeb9dbd2e5ba35
+EBUILD mutt-1.5.20-r6.ebuild 8728 RMD160 54ae3dbf2fce219cf77826002f85d614e81db523 SHA1 c164288853e994aea95b5cd3bcb3b57e9effe4aa SHA256 28135f6a2e462e95f7d85f3a2f9ca17903f70d0534a9b57a15f03d49316e8e0c
+MISC ChangeLog 35550 RMD160 5e53ff8936b84c78b0e0984183eb554d73b9a29d SHA1 82d914c85413e3dce6fb3d502d7eb35491706f2f SHA256 4eebb523390f6d3d16658c18491b5f36c0f614fa4cabb256d424634b7c6c57e9
 MISC metadata.xml 627 RMD160 e3a3709dcc01a6b9db15ac7836c75f8dbe3456ea SHA1 92be48491c090c3e6968812b58dde85961af3b8f SHA256 c30f8f2126be6b11b3e0d0e2f6413ce7ab2ca2613856f558bec7689e5a9ada0b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqwJ8gACgkQcsIHjyDViGT0kgCfV5yRUmjPFg+hx4HG/w6WKz5u
-ebIAniz/uGSgQo7BKBGu6LmywIIC0wZx
-=Jx8E
------END PGP SIGNATURE-----
diff --git a/mail-client/mutt/files/mutt-1.5.20-dont-reveal-bbc.patch b/mail-client/mutt/files/mutt-1.5.20-dont-reveal-bbc.patch
new file mode 100644
index 000000000000..2404f9b56945
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.20-dont-reveal-bbc.patch
@@ -0,0 +1,103 @@
+original patch:
+http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=28;filename=write_bcc.patch.1.5.20-2;att=1;bug=467432
+
+adapted for Gentoo
+
+additional information:
+http://dev.mutt.org/trac/ticket/3337
+http://bugs.debian.org/467432
+
+
+Index: mutt/headers.c
+===================================================================
+--- mutt.orig/headers.c	2009-06-30 17:51:05.276042945 +0200
++++ mutt/headers.c	2009-06-30 17:53:33.055007250 +0200
+@@ -52,7 +52,7 @@
+   }
+   
+   mutt_env_to_local (msg->env);
+-  mutt_write_rfc822_header (ofp, msg->env, NULL, 1, 0);
++  mutt_write_rfc822_header (ofp, msg->env, NULL, 1, 0, 1);
+   fputc ('\n', ofp);	/* tie off the header. */
+ 
+   /* now copy the body of the message. */
+Index: mutt/init.h
+===================================================================
+--- mutt.orig/init.h	2009-06-30 17:53:32.683367849 +0200
++++ mutt/init.h	2009-06-30 17:53:33.075058388 +0200
+@@ -3365,11 +3365,9 @@
+   { "write_bcc",	DT_BOOL, R_NONE, OPTWRITEBCC, 1},
+   /*
+   ** .pp
+-  ** Controls whether mutt writes out the ``Bcc:'' header when preparing
+-  ** messages to be sent.  Exim users may wish to unset this. If mutt
+-  ** is set to deliver directly via SMTP (see $$smtp_url), this
+-  ** option does nothing: mutt will never write out the ``Bcc:'' header
+-  ** in this case.
++  ** Controls whether mutt writes out the Bcc header when saving
++  ** messages to FCC. Bcc headers will never be written to a message
++  ** when sending it.
+   */
+   { "write_inc",	DT_NUM,	 R_NONE, UL &WriteInc, 10 },
+   /*
+Index: mutt/protos.h
+===================================================================
+--- mutt.orig/protos.h	2009-06-30 17:51:05.437001183 +0200
++++ mutt/protos.h	2009-06-30 17:53:33.079080252 +0200
+@@ -372,7 +372,7 @@
+ int mutt_write_mime_body (BODY *, FILE *);
+ int mutt_write_mime_header (BODY *, FILE *);
+ int mutt_write_one_header (FILE *fp, const char *tag, const char *value, const char *pfx, int wraplen, int flags);
+-int mutt_write_rfc822_header (FILE *, ENVELOPE *, BODY *, int, int);
++int mutt_write_rfc822_header (FILE *, ENVELOPE *, BODY *, int, int, int);
+ void mutt_write_references (LIST *, FILE *, int);
+ int mutt_yesorno (const char *, int);
+ void mutt_set_header_color(CONTEXT *, HEADER *);
+Index: mutt/send.c
+===================================================================
+--- mutt.orig/send.c	2009-06-30 17:51:05.517523685 +0200
++++ mutt/send.c	2009-06-30 17:53:33.087100946 +0200
+@@ -994,10 +994,10 @@
+     unset_option (OPTWRITEBCC);
+ #endif
+ #ifdef MIXMASTER
+-  mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0, msg->chain ? 1 : 0);
++  mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0, msg->chain ? 1 : 0, 0);
+ #endif
+ #ifndef MIXMASTER
+-  mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0, 0);
++  mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0, 0, 0);
+ #endif
+ #ifdef USE_SMTP
+   if (old_write_bcc)
+Index: mutt/sendlib.c
+===================================================================
+--- mutt.orig/sendlib.c	2009-06-30 17:51:05.610742969 +0200
++++ mutt/sendlib.c	2009-06-30 17:53:33.095126896 +0200
+@@ -1835,7 +1835,7 @@
+ 
+ 
+ int mutt_write_rfc822_header (FILE *fp, ENVELOPE *env, BODY *attach,
+-			      int mode, int privacy)
++			      int mode, int privacy, int should_write_bcc)
+ {
+   char buffer[LONG_STRING];
+   char *p, *q;
+@@ -1878,7 +1878,7 @@
+   else if (mode > 0)
+     fputs ("Cc: \n", fp);
+ 
+-  if (env->bcc)
++  if (env->bcc && should_write_bcc)
+   {
+     if(mode != 0 || option(OPTWRITEBCC))
+     {
+@@ -2616,7 +2616,7 @@
+   /* post == 1 => postpone message. Set mode = -1 in mutt_write_rfc822_header()
+    * post == 0 => Normal mode. Set mode = 0 in mutt_write_rfc822_header()
+    * */
+-  mutt_write_rfc822_header (msg->fp, hdr->env, hdr->content, post ? -post : 0, 0);
++  mutt_write_rfc822_header (msg->fp, hdr->env, hdr->content, post ? -post : 0, 0, 1);
+ 
+   /* (postponment) if this was a reply of some sort, <msgid> contians the
+    * Message-ID: of message replied to.  Save it using a special X-Mutt-
diff --git a/mail-client/mutt/mutt-1.5.20-r5.ebuild b/mail-client/mutt/mutt-1.5.20-r6.ebuild
index 7e252baeb265..919d0c149c71 100644
--- a/mail-client/mutt/mutt-1.5.20-r5.ebuild
+++ b/mail-client/mutt/mutt-1.5.20-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r5.ebuild,v 1.1 2009/09/07 19:12:25 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r6.ebuild,v 1.1 2009/09/21 11:00:45 grobian Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -95,6 +95,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/mutt-1.5.20-fix-mh-parsing-14bb498c6a1c.patch
 	epatch "${FILESDIR}"/mutt-1.5.20-search-pattern-crash-053ef7bbaa72.patch
 	epatch "${FILESDIR}"/mutt-1.5.20-next-invalid-pattern-crash-6a08a5244d60.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-dont-reveal-bbc.patch
 
 	# patch version string for bug reports
 	sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \