summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-emacs/vm')
-rw-r--r--app-emacs/vm/ChangeLog8
-rw-r--r--app-emacs/vm/Manifest11
-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
4 files changed, 32 insertions, 11 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/Manifest b/app-emacs/vm/Manifest
index 28b5a922c47d..3e440a1f4cf4 100644
--- a/app-emacs/vm/Manifest
+++ b/app-emacs/vm/Manifest
@@ -10,6 +10,7 @@ AUX vm-7.19-gcc4.patch 1194 RMD160 74c8421cfc845fb0ce7807f9ea74b980ae11877b SHA1
AUX vm-7.19-install-info.patch 412 RMD160 1fc5a5c5e20c1bb18acd013904812c5fed1f550f SHA1 299c51bbcd5e3e0ac2ba7a6c0b50a33edb54f2b2 SHA256 c8b998e29bed776fa75405fc432cd493fd8d9e01fb35935ceb5b96a58945730c
AUX vm-8.0-no-pcrisis.patch 620 RMD160 9615e5574f955718ae8fe375afb6bc91dded4d54 SHA1 ea87f99aec9d6b03318e58b6197412745fafee4f SHA256 2c343d31649a152791f31bf14e8ee3d7a849e5645ba028661ab84309f73a5886
AUX vm-8.0.12-autoload-vm-pine.patch 448 RMD160 d9e80c1817d3e64ae7b5ee62c79a3d67eddf0134 SHA1 1913d786c728af81bd9bf52d2087e5a28650f665 SHA256 2693ac867ae356e0ee0aec6bc900e27517910b66c10e17edefa36ab2a1e50c8b
+AUX vm-8.0.12-folder-corruption.patch 635 RMD160 1dc3454b6df2bfd9944c63e0e90b23ea18f45b03 SHA1 b11b9fb8de22f879313c5cd203cbf2cf76bd8f64 SHA256 f78007ef176ea9e8dd98ed01e2edec4055b9ef9356b0d85f8e3ca6341198febc
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
@@ -18,14 +19,14 @@ DIST vm-8.0.9-544.tgz 538966 RMD160 76a1a11efe519d7f044bea2ae7b2e50161e7b566 SHA
EBUILD vm-7.19-r3.ebuild 1195 RMD160 7a1929a2e8998a83c0ef1e984f87b6cb8ec7de60 SHA1 1449b34c9eb73d97af9344bdc4556e7ff8eb600a SHA256 b1a99245cdd552e2e9f6a263e42d4e41430894e5044ac00e7801ff2b49ef32dc
EBUILD vm-7.19-r4.ebuild 1251 RMD160 fd1508212700dd0a0472599ee11301b0b8b06039 SHA1 0e664d361c0aff5853f4f73b719d65edb2358da1 SHA256 5cb3188bade8c2bbda76ec2e1280bdd843d1ac3c4d9c57ec451814f4ad9b073c
EBUILD vm-8.0.12-r2.ebuild 1440 RMD160 821595b3fe4b2e9f69ce96b3c2e19178431b0681 SHA1 eeae4b47b20442767878c86f6a2b5dd51fc1a2a9 SHA256 a652c48a4e0dd234fa9b9de0e3c46e7fd12b2cae3a479dae9f37b264e8f0a152
-EBUILD vm-8.0.12-r3.ebuild 1418 RMD160 387d47bc53b37c50d644f68585783c7097409b7f SHA1 4d85ab55074932cc4a23bb3a2f531f0496c5d597 SHA256 7cdeef0ff58d6dc3404b6409629049802a24a27f0fbd9c2b836ff22c602bc66f
+EBUILD vm-8.0.12-r4.ebuild 1349 RMD160 88e7ecfc83ec5a7d09a750f207beffea4395da7f SHA1 5a3609b45865d78fc3a89e30ca4c18ebb755c646 SHA256 63c80a1cce7dc2f22e4584d65ef15812fe744746c1a83437850d938d46fe7f33
EBUILD vm-8.0.9.544.ebuild 1398 RMD160 a35b0a2721224439bb69827250abe73447a9b858 SHA1 4973420077123c5f3a2debfedaf5d7814df12338 SHA256 489c89c39e5814f93acfdc47d2fa6ab80f2320797dad10f5bec855fad6b08e76
-MISC ChangeLog 9528 RMD160 4b0531a97ba3eb94c9e726e3226e871f58db43da SHA1 76dfd652282641574cba5eec2cfe2f4401162db5 SHA256 81533357cde8ba5c3743660e209ec864b37c9698489b163a2cbb742cf6cbd440
+MISC ChangeLog 9765 RMD160 481c681aae1bff62c6511f1a4ff5c5be0c0b77fa SHA1 110278490525606f75d92bf06367cf884f2927a4 SHA256 11d8f943ecf073cda8578117e639986c287dcff015553802ec1cdf5ae7bd5d34
MISC metadata.xml 616 RMD160 0671bc015f427662d3614403112ee15d0c457125 SHA1 27754651e0a70d9c85c159cb1e6175bc44c85de6 SHA256 9f491a8f5a4adb6bebc5ce9d5177a87d3daff04c7fa9cb3aad9a6a8e4909dec7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
-iEYEARECAAYFAkqouioACgkQOeoy/oIi7uyBkQCfRsPo6KxmjJreFDbjTsSoM/z3
-H5MAn1QSMK0K5m4WXTpInhRoFzNzdsdK
-=w9T8
+iEYEARECAAYFAkqrf00ACgkQOeoy/oIi7uyBbgCfcZZcdfWnvSYo2o8snlA+p0TF
+SlAAoNyQFqjO78h04IPW8xlKIxmT6Hz2
+=e8ow
-----END PGP SIGNATURE-----
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() {