Add patch for bug #323613, needs to be taken upstream, works for me to resolve the crash.

Package-Manager: portage-2.2.00.15842-prefix/cvs/Darwin powerpc

4 files changed, 47 insertions, 20 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index 5560574a23df..3fea2f4748c1 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/mutt
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.185 2010/06/06 10:39:12 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.186 2010/06/12 09:15:16 grobian Exp $
+
+  12 Jun 2010; Fabian Groffen <grobian@gentoo.org> mutt-1.5.20-r15.ebuild,
+  +files/mutt-1.5.20-crash-on-invalid-limit-pattern.patch:
+  Add patch for bug #323613, needs to be taken upstream, works for me to
+  resolve the crash.  Reorganise src_prepare such that we don't patch
+  anything other than what is strictly necessary with USE=vanilla.
 
 *mutt-1.5.20-r15 (06 Jun 2010)
 
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 7ccbc24dc841..61331e4c2d07 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -5,6 +5,7 @@ AUX mutt-1.5.16-parallel-make.patch 936 RMD160 f6a216d9ff06ae55d9569e05632b60332
 AUX mutt-1.5.18-bdb-prefix.patch 956 RMD160 510a65fba0d17bd9184b23730dd18e64c7d2a163 SHA1 f7ec35f6b3049949f4ca98b46401d85c6fc271a1 SHA256 b9dc46feab0b10f03dec44e1ff4ecf023d3bd06e4d509d9a35590779220f6995
 AUX mutt-1.5.18-interix.patch 663 RMD160 7fe8c230167f9635d08873be5de9189f38e13183 SHA1 3d3532255df8eef9f6b4ea21f2664c139933956f SHA256 0d82f617a4d354451469c7afdb23e4626ed008879dbb0aec1077a93703730065
 AUX mutt-1.5.18-solaris-ncurses-chars.patch 1926 RMD160 dc8c17c88f66d4ed94d885ba67517bbfd566d78d SHA1 2d977d180e434aee9a15be44187d96056da203ca SHA256 1f141c49c2c9f10654fc7453991d8017954358bfee80d93c98af57870258351b
+AUX mutt-1.5.20-crash-on-invalid-limit-pattern.patch 346 RMD160 511e1f1900e64970c9d756ae4809c821fc157d3a SHA1 fbca0ac0f1e71ebfc21f366d901b6491fbf5d6c2 SHA256 a9cf5242546cf883763106b66c8a668d4ae72db51c461fade3100167c139f40d
 AUX mutt-1.5.20-dont-reveal-bbc.patch 4027 RMD160 0295eb2ed6ae7d3b39c5b101d519d13f45d64c80 SHA1 c7ac97ec879c070eb3a24184ce41b199eec89840 SHA256 88b313f8baea81eec814d03acbe9aa5cf4a249de120426608893c1c53a8a3596
 AUX mutt-1.5.20-gpgme-1.2.0.patch 623 RMD160 0387025c571723f9ebde284789c65464cf0c2da4 SHA1 230af7e00e06a41f0024b8c6e19bd9d5b208511c SHA256 9e69e53cb3013a379f85e6dcea0550c4ec8582ea1f36a83c6a0ad95828164551
 AUX mutt-1.5.20-realpath-slowness.patch 676 RMD160 7e658134eabeec3f67c4de161bd9996e0096f240 SHA1 e189eb03f2488ad158bdd8ec93fed0f7e6762746 SHA256 a8d15cb9e5fb130b6fc28d9b323afe62e2dbe33f1b86f707de20053f2b9a9a3a
@@ -14,7 +15,7 @@ DIST mutt-1.5.20.tar.gz 3635047 RMD160 df582f79364b9fd70a0001e76a119d8f78275ebb
 DIST patch-1.5.20.sidebar.20090619.txt 53335 RMD160 4c693b100a320d11ea94aedb75cff63d9f6cfb3f SHA1 d72355e39674bb4f892e4af3b84fe49c94415487 SHA256 6e925319adbfa0ba7f120f0ef4ddc62f99b1dc8f6a8b5bdc31dd8a0040aded1b
 EBUILD mutt-1.5.20-r10.ebuild 7958 RMD160 c185ac0ab4fa7cafc2f1e645b5d445c133db59bb SHA1 a87fd09bac2321e30748439b2bbc717254076f54 SHA256 d93b2daf5926e01ba4906720fb86f7285cfa29b7877a32f1aeaababb00e35837
 EBUILD mutt-1.5.20-r13.ebuild 7710 RMD160 1a0685395beda44ab9954552a1cb12b670cb2184 SHA1 ad9e3c4643f3be5ad1bc3eaff7742bf68607a3fc SHA256 0171a87a7d880de9f276c97452655ddd87ba6ae5c81c2dbe61dc10ec1c2363cc
-EBUILD mutt-1.5.20-r15.ebuild 7766 RMD160 3c76f756eb6f0ca136684fb5f74aa63b840b21cb SHA1 076a64683484a57618bd7c67a0dd561912cc6cad SHA256 8abe581370f2a565ab7809527552ce96508f59a7a276b09aed3ce68ee0b4b706
+EBUILD mutt-1.5.20-r15.ebuild 8119 RMD160 6661797c49e62c9a7fde4ebace79025670fd9b52 SHA1 5a3fdc5bba6680e4420a70f73a68318a9feda254 SHA256 ebbc1c09486a702c5da0c33ba3c760653f46e4b81d42bc0b8047fb56cf973d66
 EBUILD mutt-1.5.20-r6.ebuild 7280 RMD160 db5a40d2e845def3f4819de2d8272049215da0f1 SHA1 86e2c567618d1e6753806790072efb2811515348 SHA256 4999238ee8c6d875179d49f1b2b32e82c50b6179b8b4f0f6f97948910f55de11
-MISC ChangeLog 43316 RMD160 8a8d7c57cae2cffcf89d4dbb8e52d0b9f89228c1 SHA1 61a04b22c910c261922168b11a7d4e6603c8946c SHA256 a55a5bcec2cc9b132d858f5091754f85f43cc3e2cba38de7e94faf25f9b393b4
+MISC ChangeLog 43661 RMD160 c0d1b6682909c4ccebe47e4867266d15fea1d2f0 SHA1 5adc704f3da95796bc76c71e0e30fdd60c7dbedc SHA256 577825e5e6882b8fad2216d88cb5fcb4d5bf648f26a7a69cc758840991dcc821
 MISC metadata.xml 650 RMD160 499b30bbf757e578b8546c72c9d22e033bad1fd0 SHA1 0ad0c9dc1d2a2a1b9da1e32d2f3e056e5b0e6d98 SHA256 b7ca8aa383b947a5e90eafab3839a9ed2a8c4f36f4890fec19636d774ccf5320
diff --git a/mail-client/mutt/files/mutt-1.5.20-crash-on-invalid-limit-pattern.patch b/mail-client/mutt/files/mutt-1.5.20-crash-on-invalid-limit-pattern.patch
new file mode 100644
index 000000000000..ec37824344a3
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.20-crash-on-invalid-limit-pattern.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/show_bug.cgi?id=323613
+
+--- pattern.c
++++ pattern.c
+@@ -1310,6 +1310,7 @@
+   simple = safe_strdup (buf);
+   mutt_check_simple (buf, sizeof (buf), NONULL (SimpleSearch));
+ 
++  memset(&err, 0, sizeof(err));
+   err.data = error;
+   err.dsize = sizeof (error);
+   if ((pat = mutt_pattern_comp (buf, M_FULL_MSG, &err)) == NULL)
diff --git a/mail-client/mutt/mutt-1.5.20-r15.ebuild b/mail-client/mutt/mutt-1.5.20-r15.ebuild
index 26a3fe3cd3a0..49766cc6b92a 100644
--- a/mail-client/mutt/mutt-1.5.20-r15.ebuild
+++ b/mail-client/mutt/mutt-1.5.20-r15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r15.ebuild,v 1.1 2010/06/06 10:39:12 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r15.ebuild,v 1.2 2010/06/12 09:15:16 grobian Exp $
 
 EAPI="3"
 
@@ -76,30 +76,38 @@ src_prepare() {
 	# different from the one used by the mailbase ebuild
 	use prefix && epatch "${FILESDIR}"/mutt-1.5.13-prefix-mailcap.patch
 
+	# must haves to compile or behave correctly
 	epatch "${FILESDIR}"/mutt-1.5.18-bdb-prefix.patch # fix bdb detection
 	epatch "${FILESDIR}"/mutt-1.5.18-interix.patch
 	built_with_use sys-libs/ncurses unicode && \
 		epatch "${FILESDIR}"/mutt-1.5.18-solaris-ncurses-chars.patch
 	epatch "${FILESDIR}"/mutt-1.5.20-gpgme-1.2.0.patch
-	epatch "${FILESDIR}"/mutt-1.5.20-dont-reveal-bbc.patch
-	epatch "${FILESDIR}"/mutt-1.5.20-realpath-slowness.patch
 
-	# post-release hot-fixes
-	for rev in $(eval echo {0..${PR#r}}) ; do
-		local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
-		[[ -e ${revpatch} ]] && \
-			epatch "${revpatch}"
-	done
+	if use !vanilla ; then
+		# fixes that are not yet upstream, or that upstream doesn't like
+		epatch "${FILESDIR}"/mutt-1.5.20-dont-reveal-bbc.patch
+		epatch "${FILESDIR}"/mutt-1.5.20-realpath-slowness.patch
+		epatch "${FILESDIR}"/mutt-1.5.20-crash-on-invalid-limit-pattern.patch
 
-	# patch version string for bug reports
-	sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \
-		muttlib.c || die "failed patching in Gentoo version"
-
-	if use !vanilla && use !sidebar ; then
-		use nntp || rm "${PATCHDIR}"/06-nntp.patch
-		for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
-			epatch "${p}"
+		# post-release hot-fixes grabbed from HG
+		for rev in $(eval echo {0..${PR#r}}) ; do
+			local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
+			[[ -e ${revpatch} ]] && \
+				epatch "${revpatch}"
 		done
+
+		# patch version string for bug reports
+		sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \
+			muttlib.c || die "failed patching in Gentoo version"
+
+		# the big feature patches that upstream doesn't want to include, but
+		# nearly every distro has due to their usefulness
+		if use !sidebar ; then
+			use nntp || rm "${PATCHDIR}"/06-nntp.patch
+			for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
+				epatch "${p}"
+			done
+		fi
 	fi
 
 	if use sidebar ; then