Fixed crash when archiving an empty maildir with python 2.5.

(Portage version: 2.2_rc1/cvs/Linux 2.6.24-tuxonice-r9 i686)

3 files changed, 55 insertions, 2 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/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)
+