Gentoo Archives: gentoo-commits

From: "Eray Aslan (eras)" <eras@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in mail-filter/maildrop/files: maildrop-2.5.4-reformime.patch
Date: Mon, 05 Sep 2011 18:41:56
Message-Id: 20110905184146.0FEA020051@flycatcher.gentoo.org
1 eras 11/09/05 18:41:46
2
3 Modified: maildrop-2.5.4-reformime.patch
4 Log:
5 Revized patch for bug #379101
6
7 (Portage version: 2.1.10.13/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.3 mail-filter/maildrop/files/maildrop-2.5.4-reformime.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/maildrop/files/maildrop-2.5.4-reformime.patch?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/maildrop/files/maildrop-2.5.4-reformime.patch?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/maildrop/files/maildrop-2.5.4-reformime.patch?r1=1.2&r2=1.3
15
16 Index: maildrop-2.5.4-reformime.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/mail-filter/maildrop/files/maildrop-2.5.4-reformime.patch,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- maildrop-2.5.4-reformime.patch 31 Aug 2011 16:30:32 -0000 1.2
23 +++ maildrop-2.5.4-reformime.patch 5 Sep 2011 18:41:45 -0000 1.3
24 @@ -1,4 +1,4 @@
25 -some arches put argv into readonly memory - bug #379101
26 +Fixes segfault on some arches - bug #379101
27 Index: rfc2045/reformime.c
28 ===================================================================
29 --- rfc2045/reformime.c (revision 102)
30 @@ -14,9 +14,9 @@
31 doinfo=1;
32 Index: rfc2045/reformime.c
33 ===================================================================
34 ---- rfc2045/reformime.c (revision 137)
35 +--- rfc2045/reformime.c (revision 141)
36 +++ rfc2045/reformime.c (working copy)
37 -@@ -1150,7 +1150,7 @@
38 +@@ -1150,14 +1150,15 @@
39
40 if (doinfo)
41 {
42 @@ -25,3 +25,12 @@
43 do {
44 print_info(p, mimesection);
45 if (do_extract)
46 + extract_section(p, mimesection,
47 + extract_filename, argc-argn,
48 + argv+argn, do_extract);
49 +- mimesection = strtok(NULL,",");
50 ++ if (mimesection)
51 ++ mimesection = strtok(NULL,",");
52 + } while (mimesection != NULL);
53 + }
54 + else if (dodecode)