From 6d554681996aae75c4d005762ea5b243e404a282 Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Sun, 11 Jul 2010 22:53:24 +0200 Subject: [PATCH] Imported Upstream version 2.100 --- ChangeLog | 19 +++++++++++++++++++ t-prot | 25 +++++++++++++------------ t-prot.1 | 24 ++++++++++++------------ 3 files changed, 44 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index c83c003..17acf0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2010-07-10 19:14 Jochen Striepe + + * t-prot: Release as v2.100. + +2010-07-10 12:59 Jochen Striepe + + * t-prot: Add line to make -m filter Lotus Domino Webserver + produced TOFU. + +2010-07-02 15:52 Jochen Striepe + + * t-prot: Use uniform syntax notation for parameters in command + line options. + +2010-07-02 15:48 Jochen Striepe + + * t-prot.1: Use uniform syntax notation for parameters in command + line options. + 2010-07-01 16:02 Jochen Striepe * t-prot: Release as v2.99. diff --git a/t-prot b/t-prot index 876b5ff..36dde12 100755 --- a/t-prot +++ b/t-prot @@ -1,13 +1,13 @@ #!/usr/bin/perl -w -# $Id: t-prot,v 1.307 2010/07/01 16:02:56 jochen Exp $ +# $Id: t-prot,v 1.310 2010/07/10 19:14:36 jochen Exp $ require 5.006; use strict; use Fcntl qw(O_EXCL O_WRONLY O_CREAT); use Getopt::Long qw(:config gnu_getopt no_ignore_case); -use constant VER => '2.99'; +use constant VER => '2.100'; use constant REV => ''; -use constant REL => q$Revision: 1.307 $=~m/(\d+(?:\.\d+)+)/; +use constant REL => q$Revision: 1.310 $=~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'; @@ -89,13 +89,13 @@ $gpg_bug = '... this is a bug ('; # help(): print help text and exit with appropriate exit code sub help { print "Usage: $0 [options] - -A DIRECTORY ad footer directory, treat ad footers as signature + -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; multipart messages will not be detected - -c[n] merge multiple blank lines to n lines (default is 2) + -c[=n] merge multiple blank lines to n lines (default is 2) --check[=FLAGS] check various criteria, print error message and quit; see man page for details -d, --debug print notice to syslog when bouncing; requires -p @@ -106,12 +106,12 @@ sub help { --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) + -i=INFILE file to be read; '-' for STDIN (default) -k try to fix \"Kammquotes\" --kdiff=n max. length difference between wrapped lines; req. -k --kmaxl=n max. line length for wrapped line; requires -k --kminl=n min. line length for wrapped line; requires -k - -L DIRECTORY mailing list footer directory, treat mailing list + -L=DIRECTORY mailing list footer directory, treat mailing list footers as signature -l delete mailing list footer; requires -L --lax-security use unsafe writing method; USE ON YOUR OWN RISK! @@ -120,15 +120,15 @@ sub help { -m delete MS style TOFU; careful: might be too aggressive --max-lines=x maximum number of message lines --ms-smart try to be smart with MS style TOFU; req. -Mmutt and -m - -o OUTFILE file to be written to; '-' for STDOUT (default) - -P MESSAGE user defined bounce message; requires -p - -p[ADDRESS] redirect to ADDRESS if no TOFU was found + -o=OUTFILE file to be written to; '-' for STDOUT (default) + -P=MESSAGE user defined bounce message; requires -p + -p[=ADDRESS] redirect to ADDRESS if no TOFU was found --pgp-move move pgp verification output to bottom; requires -Mmutt --pgp-move-vrf move pgp output if verified and good; requires -Mmutt --pgp-short hide non-relevant pgp key uids; requires -Mmutt -r delete mail header lines --reply squeeze multiple reply prefixes in subject line - -S[n] suppress signatures with more than n lines (default $maxsig) + -S[=n] suppress signatures with more than n lines (default $maxsig) -s delete signature --sani sanitize some header fields --sigsmax[=n] max number of sigs tolerated, no value for unlimited @@ -797,7 +797,8 @@ sub process_msg { 'Oorspronkelijk bericht', 'Message d\'origine', 'Forwarded message', - 'Weitergeleitete Nachricht / Forwarded Message'); + 'Weitergeleitete Nachricht / Forwarded Message', + '[A-Za-z ]+ <(\w[\w.+-]*@(?:[\w.+-]+\.)+[A-Za-z]{2,})> schrieb:'); my $k = 0; # any text above? my $tmp = 0; # flagged if inside PGP output diff --git a/t-prot.1 b/t-prot.1 index 2be9fab..4c2d767 100644 --- a/t-prot.1 +++ b/t-prot.1 @@ -1,4 +1,4 @@ -.\" $Id: t-prot.1,v 1.184 2010/07/01 15:58:23 jochen Exp $ +.\" $Id: t-prot.1,v 1.185 2010/07/02 15:48:33 jochen Exp $ .\" .TH T-PROT "1" "July 2010" "T-PROT" .SH NAME @@ -52,10 +52,10 @@ then have a peek at the Detection Options section. You may accept or reject/bounce messages depending on t\-prot's result. .SH INPUT/OUTPUT OPTIONS .TP -.BR "\-i" " FILE" +.BR "\-i" "=FILE" Defines an input file; default is '\-' i.e. STDIN. .TP -.BR "\-o" " FILE" +.BR "\-o" "=FILE" Defines the output file; default is STDOUT. .TP .B "\-\-body" @@ -118,9 +118,9 @@ little *too* greedy. .sp .IR NOTE : This requires a directory with footer files to be given with option -.BR "\-A" " DIRECTORY". +.BR "\-A" "=DIRECTORY". .TP -.BR "\-A" " DIRECTORY" +.BR "\-A" "=DIRECTORY" "ad footer directory": Defines the directory which contains the advertisement list footers (one footer per file) which are to be tested when removing them with options @@ -143,7 +143,7 @@ option. .sp .IR NOTE : This requires a directory with footer files to be given with option -.BR "\-L" " DIRECTORY". +.BR "\-L" "=DIRECTORY". .B \-l is not needed if .B \-\-ftr\-ml @@ -159,9 +159,9 @@ Works similar to \-\-ftr\-ad, just that it is intended for mailing list footers. .sp .IR NOTE : This requires a directory with footer files to be given with option -.BR "\-L" " DIRECTORY". +.BR "\-L" "=DIRECTORY". .TP -.BR "\-L" " DIRECTORY" +.BR "\-L" "=DIRECTORY" "list footer directory": Defines the directory which contains the mailing list footers (one footer per file) which are to be tested when removing them with the options @@ -182,7 +182,7 @@ or Blocks of quotes with more than n lines will be shrunk to x lines. Defaults are 30 for n and 10 for x. .TP -.BR "\-c" " [n]" +.BR "\-c" "[=n]" "compress": Squeezes a sequence of blank lines to just n blank lines. n defaults to 2. .TP @@ -360,7 +360,7 @@ Hides all mail header lines. Subject lines with multiple reply prefixes (Re: and translations into other languages) get squeezed to only one prefix. .TP -.BR "\-S" " [n]" +.BR "\-S" "[=n]" "supression of overlong signatures": Signatures are to be n lines (not including the one containing dash-dash-space) or less. If there are more, it is probably not that spirited after all. @@ -418,13 +418,13 @@ CAVEAT: This may lead to interesting effects with crossposts between mailing lists or with undetected signature attempts. .SH DETECTION OPTIONS .TP -.BR "\-P" " MESSAGE" +.BR "\-P" "=MESSAGE" "user defined bounce message for picky delivery": 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. See .BR "\-p" . .TP -.BR "\-p" " [ADDRESS]" +.BR "\-p" "[=ADDRESS]" "picky delivery": If we really find some TOFU, abort with exit code .IR EX_UNAVAILABLE . -- 2.39.2