2 Description: two patches pulled from upstream:
3 * t-prot: Fix eYou Webmail Tofu.
4 * t-prot: Fix text/plain content-type detection with several user
8 ===================================================================
13 -# $Id: t-prot,v 1.312 2010/10/31 11:18:15 jochen Exp $
14 +# $Id: t-prot,v 1.314 2012/01/19 14:56:16 jochen Exp $
18 @@ -7,7 +7,7 @@ use Fcntl qw(O_EXCL O_WRONLY O_CREAT);
19 use Getopt::Long qw(:config gnu_getopt no_ignore_case);
20 use constant VER => '2.101';
21 use constant REV => '';
22 -use constant REL => q$Revision: 1.312 $=~m/(\d+(?:\.\d+)+)/;
23 +use constant REL => q$Revision: 1.314 $=~m/(\d+(?:\.\d+)+)/;
24 # MTA expecting mail on STDIN
25 # (you might have to adjust this if using a different MTA)
26 use constant SENDMAIL => '/usr/sbin/sendmail -oi';
27 @@ -564,7 +564,7 @@ sub process_msg {
29 if ($x>=scalar(@$lines)) { exit(EX_DATAERR); }
31 - if ($bar =~ m!^text/plain!) {
32 + if ($bar =~ m!^text/plain!i) {
34 for ($z=1; $x+$z<@$lines; $z++) {
35 if (index($$lines[$x+$z], '--'.$foo)==0) {
36 @@ -659,7 +659,7 @@ sub process_msg {
38 (?:\Q$mutt_contenttype\E)
39 (?:text/plain|application/pgp)
44 (?:\Q$mutt_pgpsigned\E |
45 @@ -800,6 +800,7 @@ sub process_msg {
46 'Ursprungligt meddelande',
47 'Oorspronkelijk bericht',
51 'Weitergeleitete Nachricht / Forwarded Message',
52 '[A-Za-z ]+ <(\w[\w.+-]*@(?:[\w.+-]+\.)+[A-Za-z]{2,})> schrieb:');