summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail-filter/maildrop/ChangeLog6
-rw-r--r--mail-filter/maildrop/files/maildrop-2.5.4-reformime.patch15
2 files changed, 17 insertions, 4 deletions
diff --git a/mail-filter/maildrop/ChangeLog b/mail-filter/maildrop/ChangeLog
index e81dd9b9111f..b944f69c85fc 100644
--- a/mail-filter/maildrop/ChangeLog
+++ b/mail-filter/maildrop/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for mail-filter/maildrop
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.117 2011/08/31 16:30:32 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.118 2011/09/05 18:41:45 eras Exp $
+
+ 05 Sep 2011; Eray Aslan <eras@gentoo.org>
+ files/maildrop-2.5.4-reformime.patch:
+ Revized patch for bug #379101
31 Aug 2011; Eray Aslan <eras@gentoo.org>
files/maildrop-2.5.4-reformime.patch:
diff --git a/mail-filter/maildrop/files/maildrop-2.5.4-reformime.patch b/mail-filter/maildrop/files/maildrop-2.5.4-reformime.patch
index 6e5544399870..eea8ad9e372a 100644
--- a/mail-filter/maildrop/files/maildrop-2.5.4-reformime.patch
+++ b/mail-filter/maildrop/files/maildrop-2.5.4-reformime.patch
@@ -1,4 +1,4 @@
-some arches put argv into readonly memory - bug #379101
+Fixes segfault on some arches - bug #379101
Index: rfc2045/reformime.c
===================================================================
--- rfc2045/reformime.c (revision 102)
@@ -14,9 +14,9 @@ Index: rfc2045/reformime.c
doinfo=1;
Index: rfc2045/reformime.c
===================================================================
---- rfc2045/reformime.c (revision 137)
+--- rfc2045/reformime.c (revision 141)
+++ rfc2045/reformime.c (working copy)
-@@ -1150,7 +1150,7 @@
+@@ -1150,14 +1150,15 @@
if (doinfo)
{
@@ -25,3 +25,12 @@ Index: rfc2045/reformime.c
do {
print_info(p, mimesection);
if (do_extract)
+ extract_section(p, mimesection,
+ extract_filename, argc-argn,
+ argv+argn, do_extract);
+- mimesection = strtok(NULL,",");
++ if (mimesection)
++ mimesection = strtok(NULL,",");
+ } while (mimesection != NULL);
+ }
+ else if (dodecode)