Fixed crash when archiving an empty maildir with python 2.5.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.24-tuxonice-r9 i686

4 files changed, 68 insertions, 3 deletions

diff --git a/net-mail/archivemail/ChangeLog b/net-mail/archivemail/ChangeLog
index 5b4845cca5af..91867645c08f 100644
--- a/net-mail/archivemail/ChangeLog
+++ b/net-mail/archivemail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/archivemail
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/archivemail/ChangeLog,v 1.11 2007/11/21 19:38:55 tove Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/archivemail/ChangeLog,v 1.12 2008/07/08 12:04:18 tove Exp $
+
+*archivemail-0.7.2-r1 (08 Jul 2008)
+
+  08 Jul 2008; Torsten Veller <tove@gentoo.org>
+  +files/0.7.2-empty_maildir-r266.patch, +archivemail-0.7.2-r1.ebuild:
+  Fixed crash when archiving an empty maildir with python 2.5.
 
 *archivemail-0.7.2 (21 Nov 2007)
 
diff --git a/net-mail/archivemail/Manifest b/net-mail/archivemail/Manifest
index 940a3256b277..386f00da76cb 100644
--- a/net-mail/archivemail/Manifest
+++ b/net-mail/archivemail/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0.7.2-empty_maildir-r266.patch 593 RMD160 23461245c502722ee28a0952450404406ce5ad08 SHA1 4ab3329527f6f6ea6a251d300440982f41330212 SHA256 f5a9a3dc0af87262d8fe43682aa664e8167aac10a1f1c9b0db410522d38e2118
 AUX archivemail-0.7.0-fpname.patch 3305 RMD160 17308cee43d9e08d81fe16094e5de3cf75146c61 SHA1 607cb3224adf67cf7d0c4d06eec586e6e6787936 SHA256 b4d0c1fb2042241e8c52ba010ece70a0b8870ab84044d5b9fd0c84c1b0c2caf0
 AUX archivemail.1 10303 RMD160 916f25e4024fcc561a6f1092aa6a3a9f6eb8c3c0 SHA1 1021ea88eb10593bcd496e5e59846c9dc7f234c2 SHA256 9bc8effd2a9996a5a1b65a28e40d972cd1d00f60df1eff3fd772ff8df2f75494
 DIST archivemail-0.6.1.tar.gz 34874 RMD160 a2ac69e628753bd88041c03550860b3300887c82 SHA1 bc39a4192cf6dc375ce6274527a88a88563a3820 SHA256 a2f7fa9cf021ca266850f9ef2700fe7d8d01550f17930f479d17e304b94c610a
@@ -8,6 +12,14 @@ EBUILD archivemail-0.6.1-r1.ebuild 785 RMD160 cbcb6117a19076b3464cc3ff1701050824
 EBUILD archivemail-0.6.2.ebuild 711 RMD160 6e952c12375d25621b4b71a574c3c8359a398f30 SHA1 ceeb459ed54c24f9d6786c0cf8a49d113993395f SHA256 f60d36ed59f7a26f5591cd4f7581e9b62465d1ddee7fb6dde5ecd512aa38be68
 EBUILD archivemail-0.7.0-r1.ebuild 930 RMD160 3ff213f3b7f7b633d075b588f4b70bb965f35912 SHA1 a39379191eab443d9990b0b55718b22e24bf5e07 SHA256 afdcfa7114f74551c5b266966a1201d56c0d1183f2c0d821a071b7cd1be052d8
 EBUILD archivemail-0.7.0.ebuild 912 RMD160 1b0c57c25a5229a7d69806ee03e6bb57ff09c993 SHA1 a0196dc6e07be8e257fd4ae328a2a485adcc1967 SHA256 0be9aa7f318a8f41a38ca40845000bfb7dc74523b7190a607fc08e0ec729d813
+EBUILD archivemail-0.7.2-r1.ebuild 898 RMD160 2567dfd99df99c7efcf8e29c9a056a3a5b506a53 SHA1 bd84f8d0da6bef4f9a91e0395142c06408c1e551 SHA256 117177952385290ef4f83d9da080a7d7c7bd2d094e24f3f5f6491f9d9616a999
 EBUILD archivemail-0.7.2.ebuild 795 RMD160 9f463da4fedf21b1cd1f6fa38a0d626f9f61322e SHA1 7ad60cb600e7f2bbd7c65a7377a47d5d56f1fd2c SHA256 d5a28d79d59c2d69c9015cd4523fa4c662fa89f16c8afef27aec553b5eba65b6
-MISC ChangeLog 1743 RMD160 64206a298d142caa46e21a94bad4c25db6ef780e SHA1 49e408af06a9ac9a8ce474db2bba688fc8158939 SHA256 b784af82de2e0a1805e3c054883e95719bcdbfd132fdefb762dfccdea61e6067
+MISC ChangeLog 1963 RMD160 90b6951f46f36ce44af96b269d23dd9f7fe2effe SHA1 bae7c79246f43fcba0958240815a96692226fdbb SHA256 e1d1276f260d47f607efbbfb9809a8a8503ddbf22d4a6f4376d393a2d69409e7
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhzV8kACgkQV3J2n04EauypnACg3eSos+XWIzlJ8JmJzi3fZ4EQ
+a/IAoLVhrLBqCKratv+vn3FutPOEVUhS
+=d34B
+-----END PGP SIGNATURE-----
diff --git a/net-mail/archivemail/archivemail-0.7.2-r1.ebuild b/net-mail/archivemail/archivemail-0.7.2-r1.ebuild
new file mode 100644
index 000000000000..a1672120f18b
--- /dev/null
+++ b/net-mail/archivemail/archivemail-0.7.2-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/archivemail/archivemail-0.7.2-r1.ebuild,v 1.1 2008/07/08 12:04:18 tove Exp $
+
+inherit distutils eutils
+
+DESCRIPTION="Tool written in Python for archiving and compressing old email in mailboxes."
+HOMEPAGE="http://archivemail.sourceforge.net/"
+SRC_URI="mirror://sourceforge/archivemail/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+DEPEND=">=dev-lang/python-2.3"
+
+DOCS="examples/* FAQ"
+
+src_unpack() {
+	distutils_src_unpack
+	epatch "${FILESDIR}/0.7.2-empty_maildir-r266.patch"
+}
+
+src_test() {
+	echo ">>> Test phase: ${CATEGORY}/${PF}"
+	ln -sf "${S}"/archivemail "${S}"/archivemail.py
+	"${S}"/test_archivemail.py || die "test_archivemail.py failed"
+}
+
+src_install() {
+	distutils_src_install --install-data=/usr/share
+}
diff --git a/net-mail/archivemail/files/0.7.2-empty_maildir-r266.patch b/net-mail/archivemail/files/0.7.2-empty_maildir-r266.patch
new file mode 100644
index 000000000000..4af2366b7433
--- /dev/null
+++ b/net-mail/archivemail/files/0.7.2-empty_maildir-r266.patch
@@ -0,0 +1,15 @@
+http://archivemail.svn.sourceforge.net/viewvc/archivemail?view=rev&revision=266
+Fixed crash when archiving an empty maildir with python 2.5.  
+The incompatible changes in mailbox.Maildir triggered an assertion in
+_archive_dir(); removing that assertion since it looks not useful anyway.
+
+--- trunk/archivemail	2008/03/15 15:59:05	265
++++ trunk/archivemail	2008/03/15 18:42:56	266
+@@ -1287,7 +1287,6 @@
+         original = mailbox.MHMailbox(mailbox_name)
+     else:
+         unexpected_error("unknown type: %s" % type)        
+-    assert(original)
+ 
+     cache = IdentityCache(mailbox_name)
+