Imported Upstream version 2.5

diff --git a/ChangeLog b/ChangeLog
index e1d26deef0834363ab9e858a9cc580c7cb1b4a41..70a14146a06c83bdc4edbcf99ea07ec086b12681 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2007-09-19 11:32  Jochen Striepe
+
+       * t-prot, t-prot.1: Updated time stamps, released as v2.5.
+
+2007-09-19 11:31  Jochen Striepe
+
+       * t-prot, t-prot.1: New feature, new command line switch: Hide TOFU
+       produced by Novell Groupwise.  Many thanks to Philipp Thomas for
+       testing and suggesting.
+
+2007-05-24 08:22  Jochen Striepe
+
+       * t-prot.1: Update copyright date.
+
 2007-03-09 15:06  Jochen Striepe
 
        * t-prot: Release as v2.4.

diff --git a/t-prot b/t-prot
index 5141512af69382c96f70b10560b16ed89b34ce51..dca0ac338b7c90cd0e9becba192571297f3d2693 100755 (executable)
--- a/t-prot
+++ b/t-prot
@@ -1,13 +1,13 @@
 #!/usr/bin/perl -w
-# $Id: t-prot,v 1.253 2007/03/09 15:06:04 jochen Exp $
+# $Id: t-prot,v 1.255 2007/09/19 11:32:58 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.4';
+use constant VER            => '2.5';
 use constant REV            => '';
-use constant REL            => q$Revision: 1.253 $=~m/(\d+(?:\.\d+)+)/;
+use constant REL            => q$Revision: 1.255 $=~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';
@@ -23,7 +23,7 @@ use constant EX_BOUNCE      => EX_UNAVAILABLE;
 use vars qw(
     $ad $ads $bigqn $bigqx $boun $check $check_ratio $cr $diff $elli
     $footers $ftr_ad $ftr_ml $hdrs $indent $kamm $kdiff $kminl $kmaxl
-    $lax $lsig $maxsig $maxlines $mda $ml $ms $ms_smart $msg_quote
+    $lax $lsig $maxsig $maxlines $mda $ml $gw $ms $ms_smart $msg_quote
     $msg_ratio $mua $nohdr $ofile $pgpshort $pgpmove $pgpmovevrf $sig
     $sigint $sign $spass $spass_prefix $sysl $trad $trsp
 
@@ -101,6 +101,7 @@ sub help {
   -e              force ellipsis for excessive punctuation
   --ftr-ad        enable aggressive ad footer matching; requires -A
   --ftr-ml        enable aggressive mailing list footer matching; req. -L
+  --groupwise     delete Novell Groupwise style TOFU
   -h, --help      show this short help and exit
   -i=INFILE       file to be read; '-' for STDIN (default)
   -k              try to fix \"Kammquotes\"
@@ -695,8 +696,8 @@ sub process_msg {
     if ($kamm) { decomb($lines, \@vrb); }
 
     # Now care about TOFU.
-    # One common mispractice is M$ style TOFU:
-    if ($ms) {
+    # One common mispractice is M$ and Groupwise style TOFU:
+    if ($ms||$gw) {
         # bloat this array if you want more internationalization:
         my @tofu = ('Original Message',
                     'Original-Nachricht',
@@ -714,7 +715,10 @@ sub process_msg {
         DONE: for ($x=0; $x<scalar(@$lines); $x++) { 
             if (!$vrb[$x]) {
                 foreach my $tmp (@tofu) {
-                    if ($$lines[$x] =~ /^-+\s?$tmp\s?-+/) { 
+                    if (($ms && $$lines[$x] =~ /^-+\s?$tmp\s?-+/) ||
+                        ($gw &&
+                            ($$lines[$x] =~ /^>>>[^\<]+<[^\>]+> \d\d?\/\d\d?\/\d\d? \d\d?:\d\d [AP]M >>>/ ||
+                             $$lines[$x] =~ /^>>> On [A-Z][a-z][a-z]?, [A-Z][a-z][a-z]? \d\d?, \d\d\d\d at [ \d]\d:\d\d [AP]M, in message/))) { 
                         $x++;
                         $trad = 0;
                         $bigqn = 0;
@@ -914,16 +918,17 @@ my $locale = $ENV{'LC_ALL'}?$ENV{'LC_ALL'}:
 
 # command line switches
 ($ad, $ads, $bigqn, $bigqx, $check, $cr, $sysl, $diff, $elli, $footers, $lax,
-    $ml, $ms, $ms_smart, $mda, $mua, $hdrs, $kamm, $lsig, $nohdr, $sig, $sigint,
-    $spass, $trad, $trsp) =
+    $ml, $gw, $ms, $ms_smart, $mda, $mua, $hdrs, $kamm, $lsig, $nohdr, $sig,
+    $sigint, $spass, $trad, $trsp) =
     (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
 my $ifile   = '-';    # use STDIN if nothing specified
 
 # get command line params:
 Getopt::Mixed::init('a A=s c d e h i=s k L=s l m M=s o=s P=s p:s r S:i'.
-    ' s t v w bigq:s body check:s debug>d diff ftr-ad ftr-ml help>h'.
-    ' kminl=i kmaxl=i kdiff=i lax-security locale=s max-lines=i ms-smart'.
-    ' mua>M pgp-short pgp-move pgp-move-vrf sigsmax:i spass version>v');
+    ' s t v w bigq:s body check:s debug>d diff ftr-ad ftr-ml groupwise'.
+    ' help>h kminl=i kmaxl=i kdiff=i lax-security locale=s max-lines=i'.
+    ' ms-smart mua>M pgp-short pgp-move pgp-move-vrf sigsmax:i spass'.
+    ' version>v');
 while (my ($opt, $val, $pretty) = nextOption()) {
     if    ($opt eq 'a')     { $ad = 1; }
     elsif ($opt eq 'A')     { $ads = $val; }
@@ -950,6 +955,7 @@ while (my ($opt, $val, $pretty) = nextOption()) {
     elsif ($opt eq 'e')     { $elli = 1; }
     elsif ($opt eq 'ftr-ad') { $ftr_ad = 1; $ad = 1; }
     elsif ($opt eq 'ftr-ml') { $ftr_ml = 1; $ml = 1; }
+    elsif ($opt eq 'groupwise') { $gw = 1; }
     elsif ($opt eq 'i')     { $ifile = $val; }
     elsif ($opt eq 'k')     { $kamm = 1; }
     elsif ($opt eq 'kminl') { $kminl = $val; $kamm = 1; }

diff --git a/t-prot.1 b/t-prot.1
index 6f776d53fdec2ae9a3209bb587e5945aadfb7851..c732e3d6cd67c7e5dec804ff2479e20b4ae79733 100644 (file)
--- a/t-prot.1
+++ b/t-prot.1
@@ -1,6 +1,6 @@
-.\" $Id: t-prot.1,v 1.129 2007/03/09 15:05:35 jochen Exp $
+.\" $Id: t-prot.1,v 1.132 2007/09/19 11:32:59 jochen Exp $
 .\"
-.TH T-PROT "1" "December 2006" "T-PROT"
+.TH T-PROT "1" "September 2007" "T-PROT"
 .SH NAME
 t-prot \- TOFU Protection - Display Filter for RFC 2822 messages
 .SH SYNOPSIS
@@ -143,6 +143,10 @@ Works similar to --ftr-ad, just that it is intended for mailing list footers.
 This requires a directory with footer files to be given with option
 .BR "\-L" =DIRECTORY.
 .TP
+.B "\-\-groupwise"
+"delete Groupwise style TOFU":
+Hides TOFU as produced by Novell Groupwise.
+.TP
 .B "\-h, \-\-help"
 "help":
 Displays a short help text with a summary on all options, and exits.
@@ -551,7 +555,7 @@ Written by Jochen Striepe <t-prot@tolot.escape.de>.
 All of the documentation and software included in the t-prot releases
 is copyrighted by Jochen Striepe (except when explicitely stated otherwise).
 .PP
-Copyright \(co 2001-2006 Jochen Striepe. All rights reserved.                     
+Copyright \(co 2001-2007 Jochen Striepe. All rights reserved.                     
 .PP
 Redistribution and use, with or without modification, are permitted
 provided that the following conditions are met: