From 5393e2a685831a44164165cfbf473b2548c69a88 Mon Sep 17 00:00:00 2001
From: Gerfried Fuchs <rhonda@debian.at>
Date: Wed, 17 Feb 2010 20:47:30 +0100
Subject: [PATCH] Imported Upstream version 2.1.1

---
 ChangeLog                                     | 16 +++++++++
 ...tt157.diff => t-prot-r1.246-mutt1511.diff} | 12 +++----
 t-prot.1                                      | 35 +++++++++++++------
 3 files changed, 47 insertions(+), 16 deletions(-)
 rename contrib/{t-prot-r1.244-mutt157.diff => t-prot-r1.246-mutt1511.diff} (96%)

diff --git a/ChangeLog b/ChangeLog
index 61e9b52..b474caf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2006-07-11 14:05  Jochen Striepe
+
+	* t-prot.1: Updated time stamp.
+
+2006-07-10 10:01  Jochen Striepe
+
+	* t-prot.1: Fix spelling and grammar.
+
+2006-06-23 17:28  Jochen Striepe
+
+	* t-prot.1: Fix capitalization of "pgp".
+
+2006-06-23 17:25  Jochen Striepe
+
+	* t-prot.1: Add section about performance issues.
+
 2006-06-17 22:45  Jochen Striepe
 
 	* t-prot: Release as v2.1.
diff --git a/contrib/t-prot-r1.244-mutt157.diff b/contrib/t-prot-r1.246-mutt1511.diff
similarity index 96%
rename from contrib/t-prot-r1.244-mutt157.diff
rename to contrib/t-prot-r1.246-mutt1511.diff
index 7e4b297..0277ba8 100644
--- a/contrib/t-prot-r1.244-mutt157.diff
+++ b/contrib/t-prot-r1.246-mutt1511.diff
@@ -1,5 +1,5 @@
---- t-prot	2006-05-16 14:07:58.000000000 +0200
-+++ t-prot-M157	2006-05-22 18:25:04.000000000 +0200
+--- t-prot	2006-06-18 00:45:55.000000000 +0200
++++ t-prot-M1511	2006-07-11 14:22:56.000000000 +0200
 @@ -32,7 +32,7 @@
  
      $mutt_attachment $mutt_contenttype $mutt_pgpsigned $mutt_beginsigned
@@ -36,7 +36,7 @@
                  {
                      if ($pgpmove ||
                          ($pgpmovevrf && (!$sigint) && verified($L, $x+1, $i)))
-@@ -685,7 +687,7 @@
+@@ -693,7 +695,7 @@
                      'Forwarded message',
                      'Weitergeleitete Nachricht / Forwarded Message');
          my $k = 0;    # any text above?
@@ -45,7 +45,7 @@
  
          DONE: for ($x=0; $x<scalar(@$lines); $x++) { 
              if (!$vrb[$x]) {
-@@ -708,9 +710,11 @@
+@@ -716,9 +718,11 @@
                      ((!$spass) || index($$lines[$x], $spass_prefix)!=0))
                  {
                      if ($mua eq 'mutt' && (!$tmp) &&
@@ -60,7 +60,7 @@
                      } elsif ($mua eq 'mutt' && $tmp && 
                          ($$lines[$x] =~
                               /^(?:\e[^\a]+\a)?(?:\Q$mutt_beginsigned\E)/o ||
-@@ -981,8 +985,8 @@
+@@ -989,8 +993,8 @@
                  Locale::gettext::gettext("[-- Type: %s/%s, Encoding: %s, Size: %s --]\n") =~
                  m/^([^%]*)/;
              ($mutt_pgpsigned) =
@@ -71,7 +71,7 @@
              ($mutt_beginsigned) =
                  Locale::gettext::gettext("[-- The following data is signed --]\n\n") =~
                  m/^(.*)\n/m;
-@@ -990,16 +994,24 @@
+@@ -998,16 +1002,24 @@
                  Locale::gettext::gettext("[-- END PGP SIGNED MESSAGE --]\n") =~
                  m/^(.*)\n/m;
              ($mutt_pgpclearsigstart) =
diff --git a/t-prot.1 b/t-prot.1
index 35b1d34..a26c798 100644
--- a/t-prot.1
+++ b/t-prot.1
@@ -1,14 +1,14 @@
-.\" $Id: t-prot.1,v 1.121 2006/06/17 12:34:54 jochen Exp $
+.\" $Id: t-prot.1,v 1.125 2006/07/11 14:05:53 jochen Exp $
 .\"
-.TH T-PROT "1" "June 2006" "T-PROT"
+.TH T-PROT "1" "July 2006" "T-PROT"
 .SH NAME
 t-prot \- TOFU Protection - Display Filter for RFC 2822 messages
 .SH SYNOPSIS
 .BI "t-prot [" OPTIONS "]..."
 .SH DESCRIPTION
 .PP
-This program is a filter which shall improve the readability for
-messages (emails and usenet postings) by *hiding* some annoying parts,
+This program is a filter to improve the readability of
+messages (emails and usenet posts) by *hiding* some annoying parts,
 e.g. mailing list footers, signatures, and TOFU (see definition below),
 as well as squeezing sequences of blank lines or punctuation.
 .br
@@ -63,7 +63,7 @@ is specified.
 .TP
 .BR "\-\-bigq" [=n[,x]]
 "shrink big quotes":
-Blocks of quotes with more than n lines will be shrinked to x lines.
+Blocks of quotes with more than n lines will be shrunk to x lines.
 Defaults are 30 for n and 10 for x.
 .TP
 .B "\-\-body"
@@ -114,7 +114,7 @@ to only three dots or marks, respectively.
 .TP
 .B "\-\-ftr\-ad"
 "enable aggressive ad footer matching":
-With this option enabled t-prot makes footer detection really greedy: We
+With this option enabled, t-prot makes footer detection really greedy: We
 assume that commercial email providers aren't even frightened to append
 changing texts *under* their ads which are appended to the message body.
 Because these texts even have changing lengths we simply detect the
@@ -342,13 +342,13 @@ You may specify your own bounce message to be returned when we try to deliver
 an email and bounce it because there is TOFU inside.
 .TP
 .B \-\-pgp\-move
-Move pgp verification output to bottom; requires
+Move PGP verification output to bottom; requires
 .BR "\-Mmutt" .
 .TP
 .B \-\-pgp\-move\-vrf
-Move pgp verification outout to bottom only if verification shows a good signature
+Move PGP verification outout to bottom only if verification shows a good signature
 and the signature could be verified as authentic (using a trust path). If there is
-any problem with the signature, the pgp output should not be moved so the user is
+any problem with the signature, the PGP output should not be moved so the user is
 more likely to notice. Requires
 .BR "\-Mmutt" .
 .sp
@@ -359,7 +359,7 @@ we cannot always detect if the check was interrupted. Though t-prot tries
 to be smart, there will be false positives.
 .TP
 .B \-\-pgp\-short
-Hide non-relevant pgp key uids; requires
+Hide non-relevant PGP key uids; requires
 .BR "\-Mmutt" .
 .TP
 .B "\-r"
@@ -471,6 +471,21 @@ even when it is not required. Some editing of messages is desired.
 Please point these people to the page 
 .I http://www.river.com/users/share/etiquette/edit.html
 - thank you!
+.SH PERFORMANCE
+There are several ways to fine-tune t-prot's performance:
+.PP
+Some command line options are quite grave a performance hit -- do not
+use -k and especially --ms-smart if you are content without them.
+.PP
+Checking for special footers is very costly as well. Put as few footer
+files as absolutely needed in any footer directory.
+.PP
+All PGP related options are eating up lots of CPU time. Try to avoid them
+on unsigned and unencrypted messages.
+.PP
+When calling t-prot from within mutt, you might use mutt's folder-hook
+and message-hook facilities to turn options on only when needed, e.g. to
+set up a different footer directory for each mailing list folder.
 .SH TROUBLESHOOTING
 .TP
 .IR Q :
-- 
2.39.2