From: Gerfried Fuchs <rhonda@debian.org>
Date: Sat, 18 Feb 2012 16:11:48 +0000 (+0100)
Subject: Add patch t-prot-20120207
X-Git-Tag: debian/2.101-2~2
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=f8bae6a578cdafaa7c7a920059ae2c1539d9c92f;p=pkg%2Ft-prot.git

Add patch t-prot-20120207
---

diff --git a/debian/changelog b/debian/changelog
index d889744..959ae36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ t-prot (2.101-2) unstable; urgency=low
   * Bump Standards-Version to 3.9.2.
   * Add recommended targets build-arch/build-indep to debian/rules.
   * Add quilt handling so we can pull in an upstream pushed change.
+  * Add patch t-prot-20120207 that upstream sent us for fixing eYou Webmail
+    Tofu and text/plain content-type detection with several user agents.
 
  -- 
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9fd34c4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+
+t-prot-20120207
diff --git a/debian/patches/t-prot-20120207 b/debian/patches/t-prot-20120207
new file mode 100644
index 0000000..8358416
--- /dev/null
+++ b/debian/patches/t-prot-20120207
@@ -0,0 +1,52 @@
+Author: Jochen Striepe
+Description: two patches pulled from upstream:
+  * t-prot: Fix eYou Webmail Tofu.
+  * t-prot: Fix text/plain content-type detection with several user
+    agents.
+
+Index: b/t-prot
+===================================================================
+--- a/t-prot
++++ b/t-prot
+@@ -1,5 +1,5 @@
+ #!/usr/bin/perl -w
+-# $Id: t-prot,v 1.312 2010/10/31 11:18:15 jochen Exp $
++# $Id: t-prot,v 1.314 2012/01/19 14:56:16 jochen Exp $
+ 
+ require 5.006;
+ use strict;
+@@ -7,7 +7,7 @@ use Fcntl qw(O_EXCL O_WRONLY O_CREAT);
+ use Getopt::Long qw(:config gnu_getopt no_ignore_case);
+ use constant VER            => '2.101';
+ use constant REV            => '';
+-use constant REL            => q$Revision: 1.312 $=~m/(\d+(?:\.\d+)+)/;
++use constant REL            => q$Revision: 1.314 $=~m/(\d+(?:\.\d+)+)/;
+ # MTA expecting mail on STDIN
+ # (you might have to adjust this if using a different MTA)
+ use constant SENDMAIL       => '/usr/sbin/sendmail -oi';
+@@ -564,7 +564,7 @@ sub process_msg {
+                             }
+                             if ($x>=scalar(@$lines)) { exit(EX_DATAERR); }
+ 
+-                            if ($bar =~ m!^text/plain!) {
++                            if ($bar =~ m!^text/plain!i) {
+                                 my $z;
+                                 for ($z=1; $x+$z<@$lines; $z++) {
+                                     if (index($$lines[$x+$z], '--'.$foo)==0) {
+@@ -659,7 +659,7 @@ sub process_msg {
+                             (?:\e[^\a]+\a)?
+                             (?:\Q$mutt_contenttype\E)
+                             (?:text/plain|application/pgp)
+-                        !ox))) ||
++                        !oxi))) ||
+                 ($$lines[$x] =~ /^
+                     (?:\e[^\a]+\a)?
+                     (?:\Q$mutt_pgpsigned\E     |
+@@ -800,6 +800,7 @@ sub process_msg {
+                     'Ursprungligt meddelande',
+                     'Oorspronkelijk bericht',
+                     'Message d\'origine',
++                    'Origin message',
+                     'Forwarded message',
+                     'Weitergeleitete Nachricht / Forwarded Message',
+                     '[A-Za-z ]+ <(\w[\w.+-]*@(?:[\w.+-]+\.)+[A-Za-z]{2,})> schrieb:');