Decode MIME message headers before calling Supercite, bug 256886.

Package-Manager: portage-2.2_rc46/cvs/Linux i686

4 files changed, 39 insertions, 5 deletions

diff --git a/app-emacs/vm/ChangeLog b/app-emacs/vm/ChangeLog
index 58908d7cdac4..183d1ddbbbef 100644
--- a/app-emacs/vm/ChangeLog
+++ b/app-emacs/vm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/vm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.77 2009/10/24 14:29:56 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.78 2009/11/03 07:42:22 ulm Exp $
+
+*vm-8.0.12-r6 (03 Nov 2009)
+
+  03 Nov 2009; Ulrich Mueller <ulm@gentoo.org> -vm-8.0.12-r5.ebuild,
+  +vm-8.0.12-r6.ebuild, +files/vm-8.0.12-supercite-yank-1.patch:
+  Decode MIME message headers before calling Supercite, bug 256886.
 
   24 Oct 2009; Tobias Klausmann <klausman@gentoo.org> vm-8.0.12-r4.ebuild:
   Stable on alpha, bug #288397
diff --git a/app-emacs/vm/Manifest b/app-emacs/vm/Manifest
index 905773bf3720..14b4b89c82ea 100644
--- a/app-emacs/vm/Manifest
+++ b/app-emacs/vm/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50vm-gentoo-7.19.el 584 RMD160 761dc3dc41c81ba23cd3bae2a6c874bbcd639593 SHA1 93a0ac84dd4d184bf46c7cc1fc55bd4665631630 SHA256 dc11350f3d9d3e432b906eab4a87234537cbebfdfecbbb295509726047589703
 AUX 50vm-gentoo-8.0.9.el 171 RMD160 3a35dc335923e6d74e7ad0dac6025f04de3b0c4a SHA1 c5a241bb1b10554faff2ef428172ba651902c23d SHA256 848d61a3d4e9788d9bd9a33659060369bda937139ba915c52829b21d43a51037
 AUX 50vm-gentoo.el 147 RMD160 6c4de171b7cdd46641ad73e89b4b55acce913024 SHA1 edcad107507f8db94c3e4b5169a3ca01ccdaeb9e SHA256 b79981760d6c58e03cd1b57d8e413f2c1b2ebc2d083da03cbe6eac287e89bcad
@@ -9,6 +12,7 @@ AUX vm-8.0.12-autoload-vm-pine.patch 448 RMD160 d9e80c1817d3e64ae7b5ee62c79a3d67
 AUX vm-8.0.12-charset-displayable.patch 921 RMD160 784c0beee5917952e9ed5424260273d4e52689d0 SHA1 d512f20d57b0f3856cc1296cc5fae56110bac587 SHA256 4184115266c2c2250a4f86fcea5276f3a60fea23f03ea1c9143cb7b0427a56d1
 AUX vm-8.0.12-emacs-23.patch 3704 RMD160 ad0a36c08968566d7abac86801c7ea072e8e122f SHA1 b1037b2364517cde8e10fd8edc10581329da766f SHA256 7ef9861270b019303968f5db993cbfef1ab13c69ec094d117da1ce91d9c93f45
 AUX vm-8.0.12-folder-corruption.patch 635 RMD160 1dc3454b6df2bfd9944c63e0e90b23ea18f45b03 SHA1 b11b9fb8de22f879313c5cd203cbf2cf76bd8f64 SHA256 f78007ef176ea9e8dd98ed01e2edec4055b9ef9356b0d85f8e3ca6341198febc
+AUX vm-8.0.12-supercite-yank-1.patch 733 RMD160 0cb7bae7019165d75b0c691aab37745f956053c0 SHA1 cde1312c400a6013739bd52400debcc0b8cfb8cc SHA256 49b3006d7dacbf17e334f4fae97cb35170e1a0c52ad11888d2dd40e7dfff0ac6
 AUX vm-8.0.12-supercite-yank.patch 642 RMD160 9a590b66a7ec907809fff3dedf8f7098c86b02cb SHA1 92ea521824b1f06dacb8cc463dca962c438eed8d SHA256 0b8f8242c31761b5dd0bb6510984e2099eff958acfe376dc16de7d6876bd910c
 AUX vm-info-dir-fix-gentoo.patch 325 RMD160 51f59c36d9c0ae13eca4db61dc76ef1dabdd6d31 SHA1 3a1bce1bd3e91ef3b2403bab54bb47569933e88d SHA256 8320c7ae7c51a5985bb344ec04a153e263af87de3ff2d95a0a55814e2377d276
 DIST vm-7.19.tar.gz 381658 RMD160 7a28c0a096f1f8093cffb9fc621cd270dd67b432 SHA1 0fe9012b8988ebdec7641f48aca0ef365549c590 SHA256 54bdd076bb98cad57a71fb986d131963e97a13cc71f15819d32691e3c0c5bdb0
@@ -17,7 +21,14 @@ DIST vm-8.0.9-544.tgz 538966 RMD160 76a1a11efe519d7f044bea2ae7b2e50161e7b566 SHA
 EBUILD vm-7.19-r4.ebuild 1249 RMD160 cce2daf9056af80464421a39333a165dc5960c91 SHA1 bfcd041bedbf950d2c60d4bd5c0fb97d2852bd33 SHA256 5f95b9365e5081d690ea8f6d9ccd7343405673c0504af55dc856c89339761873
 EBUILD vm-8.0.12-r2.ebuild 1440 RMD160 821595b3fe4b2e9f69ce96b3c2e19178431b0681 SHA1 eeae4b47b20442767878c86f6a2b5dd51fc1a2a9 SHA256 a652c48a4e0dd234fa9b9de0e3c46e7fd12b2cae3a479dae9f37b264e8f0a152
 EBUILD vm-8.0.12-r4.ebuild 1392 RMD160 0218f2c7459f24c06ef4ae66c6ab9c5785cd9991 SHA1 fccfb170ad08aaec02d32e8d819bc14249a7f62b SHA256 80609eae5a1e3ebd8452253a37c7ddeb05a104a21ee97bd9a3a5a1a70e01f119
-EBUILD vm-8.0.12-r5.ebuild 1425 RMD160 61025fc44f6812624261e60c3fbff1cb1e6651a4 SHA1 81c217518777b7b2289962b1b385d3319560c8cd SHA256 fa52650276cfdf83ba93da7a0563991319b8ebfbc3543fb854d294541423a22b
+EBUILD vm-8.0.12-r6.ebuild 1427 RMD160 d07a08634b2d8115eaae28d1aae9bd0e554c73b0 SHA1 e2e2d0531f27be640a9482805c7b997bf5717c2d SHA256 04399e58e2fb92b4b3c419294c13e3bbc80e4fa9573982d263b7eafa16abd0f1
 EBUILD vm-8.0.9.544.ebuild 1398 RMD160 a35b0a2721224439bb69827250abe73447a9b858 SHA1 4973420077123c5f3a2debfedaf5d7814df12338 SHA256 489c89c39e5814f93acfdc47d2fa6ab80f2320797dad10f5bec855fad6b08e76
-MISC ChangeLog 10894 RMD160 d8fe886620d7e54144e9465a15e23ab7c641cc4c SHA1 d7688f9e7d6e1b880e88584acd59a337e8e6d6e1 SHA256 c2158bd0bc48f3f88510f711a3d25450b3d2a46986e21e02599422353121e9e1
+MISC ChangeLog 11121 RMD160 a3690d35fb877a5f3d9fe2a66106082074d874c9 SHA1 d3e3eb9692e6c62282f60708eb67972bb0c362ab SHA256 0225743a3a1aebcdf4c49454a270b91bc8d12947b9b2affdb9c042004ee2cb97
 MISC metadata.xml 616 RMD160 0671bc015f427662d3614403112ee15d0c457125 SHA1 27754651e0a70d9c85c159cb1e6175bc44c85de6 SHA256 9f491a8f5a4adb6bebc5ce9d5177a87d3daff04c7fa9cb3aad9a6a8e4909dec7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.10 (GNU/Linux)
+
+iEYEARECAAYFAkrv33IACgkQOeoy/oIi7uwIsQCgjgbaVM/LYIUIf/7mveRXDq9v
+q1MAoMf0TO4DGErmWDUtLMCUCDQNon7j
+=Mp92
+-----END PGP SIGNATURE-----
diff --git a/app-emacs/vm/files/vm-8.0.12-supercite-yank-1.patch b/app-emacs/vm/files/vm-8.0.12-supercite-yank-1.patch
new file mode 100644
index 000000000000..6a034227e569
--- /dev/null
+++ b/app-emacs/vm/files/vm-8.0.12-supercite-yank-1.patch
@@ -0,0 +1,17 @@
+http://bugs.gentoo.org/256886
+
+--- vm-8.0.12-orig/lisp/vm-reply.el	2008-11-05 21:04:35.000000000 +0100
++++ vm-8.0.12/lisp/vm-reply.el	2009-11-03 08:14:30.000000000 +0100
+@@ -343,6 +343,12 @@
+             (vm-insert-region-from-buffer (vm-buffer-of message)
+                                           (vm-headers-of message)
+                                           (vm-text-end-of message))
++	  (vm-insert-region-from-buffer (vm-buffer-of message)
++					(vm-headers-of message)
++					(vm-text-of message))
++	  (save-excursion
++	    (goto-char (point-min))
++	    (vm-decode-mime-message-headers))
+           (vm-decode-mime-layout layout)
+           (if vm-mime-yank-attachments
+               (vm-decode-postponed-mime-message))))
diff --git a/app-emacs/vm/vm-8.0.12-r5.ebuild b/app-emacs/vm/vm-8.0.12-r6.ebuild
index 7f2a1e926584..941d77d8b81d 100644
--- a/app-emacs/vm/vm-8.0.12-r5.ebuild
+++ b/app-emacs/vm/vm-8.0.12-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/app-emacs/vm/vm-8.0.12-r5.ebuild,v 1.1 2009/10/16 18:29:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.0.12-r6.ebuild,v 1.1 2009/11/03 07:42:22 ulm Exp $
 
 inherit elisp eutils
 
@@ -24,7 +24,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/${P}-autoload-vm-pine.patch" #246185
-	epatch "${FILESDIR}/${P}-supercite-yank.patch" #256886
+	epatch "${FILESDIR}/${P}-supercite-yank-1.patch" #256886
 	epatch "${FILESDIR}/${P}-folder-corruption.patch" #284668
 	epatch "${FILESDIR}/${P}-emacs-23.patch"
 	epatch "${FILESDIR}/${P}-charset-displayable.patch"