Imported Upstream version 2.3

diff --git a/ChangeLog b/ChangeLog
index 45b6bc8a23cdb4791a3e4ca6de12bc223ed3068f..b3dc7e9f436c87763dee8ff144a727f390f556a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-12-19 13:13  Jochen Striepe
+
+       * t-prot: Release as v2.3.
+
+2006-12-19 12:30  Jochen Striepe
+
+       * t-prot.1: Fix grammar, update time stamp.
+
+2006-12-19 12:04  Jochen Striepe
+
+       * t-prot: Sync the order of options in the man page and "t-prot
+       -h".
+
 2006-11-30 14:06  Jochen Striepe
 
        * t-prot: Release as v2.2.

diff --git a/TODO b/TODO
index f384c55483f3dcd1a1984ec7589533a665c2e83d..b5575d5710c3553ca327c865a37eb932eb761be3 100644 (file)
--- a/TODO
+++ b/TODO
@@ -16,18 +16,22 @@ Known Bugs (more severe ones come first)
 
 Wishlist
 --------
-    * Better heuristics for M$ style TOFU. The actual algorithm still
-is just too greedy (actually, it simply snips most things down to the
-signature). User ignorance makes it tricky to detect gold inside the
-crap, though. As always, comments and ideas are welcome.
-
-    * New option to block-align lines of text. Should be especially
-pleasing when used together with -k (you could re-align a whole para-
-graph using these both).
+    * Support for gpg2. Please send an email to <t-prot@tolot.escape.de>
+if you want this feature in vanilla t-prot.
 
 
 Rejected issues
 ---------------
+    * Improving heuristics for M$ style TOFU is way tricky. In the end,
+it's just plain guessing what is newly added text and what is quoted,
+in particular with most "modern" MUAs disgustingly trying to invent some
+new way of (not machine-parseable, of course) quoting that makes guessing
+even harder.
+
+    * Block-align lines of text. Same problem as above: It's really hard
+guesswork to figure out what is intentional formatting and what is just
+user laziness. Patches solving this issue are greatly welcome, of course.
+
     * If you set mutt's display_filter to "tee foo" when viewing a pgp
 signed message and attach the resulting file to a pgp signed message,
 the result is confusion when displaying this new message with t-prot.

diff --git a/t-prot b/t-prot
index ff9d8115c7415d857a3ef25d8c8b8894ff259e75..20f3119f5b4e607e4af69bb62321b66258aaac26 100755 (executable)
--- a/t-prot
+++ b/t-prot
@@ -1,13 +1,13 @@
 #!/usr/bin/perl -w
-# $Id: t-prot,v 1.248 2006/11/30 14:06:27 jochen Exp $
+# $Id: t-prot,v 1.250 2006/12/19 13:13:57 jochen Exp $
 
 require 5.006;
 use strict;
 use Fcntl qw(O_EXCL O_WRONLY O_CREAT);
 use Getopt::Mixed qw(nextOption);
-use constant VER            => '2.2';
+use constant VER            => '2.3';
 use constant REV            => '';
-use constant REL            => q$Revision: 1.248 $=~m/(\d+(?:\.\d+)+)/;
+use constant REL            => q$Revision: 1.250 $=~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';
@@ -86,8 +86,8 @@ $gpg_bug                = '... this is a bug (';
 # help(): print help text and exit with appropriate exit code
 sub help {
     print "Usage: $0 [options] 
-  -a              remove ad footers; requires -A
   -A=DIRECTORY    ad footer directory, treat ad footers as signature
+  -a              remove ad footers; requires -A
   --bigq[=n[,x]]  remove all but x lines of quotes with more than n
                   lines; default is n=30 and x=10
   --body          input has no headers; does not work with --pgp-short;

diff --git a/t-prot.1 b/t-prot.1
index d73bda5745896f08dd72b8639d57eddbaa1f2abe..5133f904521384f2c95347f57c63f930918382b2 100644 (file)
--- a/t-prot.1
+++ b/t-prot.1
@@ -1,6 +1,6 @@
-.\" $Id: t-prot.1,v 1.127 2006/09/25 14:42:18 jochen Exp $
+.\" $Id: t-prot.1,v 1.128 2006/12/19 12:30:47 jochen Exp $
 .\"
-.TH T-PROT "1" "July 2006" "T-PROT"
+.TH T-PROT "1" "December 2006" "T-PROT"
 .SH NAME
 t-prot \- TOFU Protection - Display Filter for RFC 2822 messages
 .SH SYNOPSIS
@@ -423,7 +423,7 @@ between mailing lists or with undetected signature attempts.
 .TP
 .B "\-v, \-\-version"
 "version info":
-Prints the current version number and release date, and exit.
+Prints the current version number and release date, and exits.
 .SH ENVIRONMENT
 The environment variables
 .IR LC_ALL ,