summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2009-09-12 10:58:18 +0000
committerUlrich Müller <ulm@gentoo.org>2009-09-12 10:58:18 +0000
commitcc4bcc93d65227e5b33adc64f73c075a5c05c289 (patch)
treebb080cac48a7c7cf61c74f16f75370fa4b92cefe /app-emacs/vm
parentAdd ~alpha/~ia64 wrt #280312 (diff)
downloadgentoo-2-cc4bcc93d65227e5b33adc64f73c075a5c05c289.tar.gz
gentoo-2-cc4bcc93d65227e5b33adc64f73c075a5c05c289.tar.bz2
gentoo-2-cc4bcc93d65227e5b33adc64f73c075a5c05c289.zip
Fix mail folder corruption, bug 284668. Remove intermediate revision.
(Portage version: 2.2_rc40/cvs/Linux i686)
Diffstat (limited to 'app-emacs/vm')
-rw-r--r--app-emacs/vm/ChangeLog8
-rw-r--r--app-emacs/vm/files/vm-8.0.12-folder-corruption.patch17
-rw-r--r--app-emacs/vm/vm-8.0.12-r4.ebuild (renamed from app-emacs/vm/vm-8.0.12-r3.ebuild)7
3 files changed, 26 insertions, 6 deletions
diff --git a/app-emacs/vm/ChangeLog b/app-emacs/vm/ChangeLog
index 6e87cd6914b9..e195e677bb21 100644
--- a/app-emacs/vm/ChangeLog
+++ b/app-emacs/vm/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-emacs/vm
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.66 2009/09/10 08:32:36 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.67 2009/09/12 10:58:18 ulm Exp $
+
+*vm-8.0.12-r4 (12 Sep 2009)
+
+ 12 Sep 2009; Ulrich Mueller <ulm@gentoo.org> -vm-8.0.12-r3.ebuild,
+ +vm-8.0.12-r4.ebuild, +files/vm-8.0.12-folder-corruption.patch:
+ Fix mail folder corruption, bug 284668. Remove intermediate revision.
*vm-8.0.12-r3 (10 Sep 2009)
*vm-7.19-r4 (10 Sep 2009)
diff --git a/app-emacs/vm/files/vm-8.0.12-folder-corruption.patch b/app-emacs/vm/files/vm-8.0.12-folder-corruption.patch
new file mode 100644
index 000000000000..c7ba30b68e3e
--- /dev/null
+++ b/app-emacs/vm/files/vm-8.0.12-folder-corruption.patch
@@ -0,0 +1,17 @@
+Fixes (hopefully) a corruption of the message subject cache in X-VM-v5-Data
+http://bugs.gentoo.org/284668
+
+--- vm-8.0.12-orig/lisp/vm-folder.el 2008-11-05 21:04:35.000000000 +0100
++++ vm-8.0.12/lisp/vm-folder.el 2009-09-11 23:22:15.000000000 +0200
+@@ -1806,9 +1806,8 @@
+ (let ((print-escape-newlines t))
+ (prin1-to-string attributes))
+ "\n\t"
+- (vm-mime-encode-words-in-string
+- (let ((print-escape-newlines t))
+- (prin1-to-string cache)))
++ (let ((print-escape-newlines t))
++ (prin1-to-string cache))
+ "\n\t"
+ (let ((print-escape-newlines t))
+ (prin1-to-string (vm-labels-of m)))
diff --git a/app-emacs/vm/vm-8.0.12-r3.ebuild b/app-emacs/vm/vm-8.0.12-r4.ebuild
index fbfb0de26741..6c1a18bdb3e9 100644
--- a/app-emacs/vm/vm-8.0.12-r3.ebuild
+++ b/app-emacs/vm/vm-8.0.12-r4.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-r3.ebuild,v 1.1 2009/09/10 08:32:36 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.0.12-r4.ebuild,v 1.1 2009/09/12 10:58:18 ulm Exp $
inherit elisp eutils
@@ -25,15 +25,12 @@ src_unpack() {
epatch "${FILESDIR}/${P}-autoload-vm-pine.patch" #246185
epatch "${FILESDIR}/${P}-supercite-yank.patch" #256886
+ epatch "${FILESDIR}/${P}-folder-corruption.patch" #284668
if ! use bbdb; then
elog "Excluding vm-pcrisis.el since the \"bbdb\" USE flag is not set."
epatch "${FILESDIR}/vm-8.0-no-pcrisis.patch"
fi
-
- # fix vm-version, bug 235563
- #sed -i -e "/^(defvar vm-version /s/nil/\"${PV}\"/" lisp/vm-version.el \
- # || die "sed failed"
}
src_compile() {