X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=t-prot;h=29d23e1688a24c0044b79d0e111ec0483708b57d;hb=3fe5e7f962ef62e203d7e3ed33fe09fd455931b6;hp=fb3029f287a707371ac2981c89ff2b8563e416dc;hpb=3f6084cfee0dca0a8fe8d82a85ba07575f884ea4;p=pkg%2Ft-prot.git diff --git a/t-prot b/t-prot index fb3029f..29d23e1 100755 --- a/t-prot +++ b/t-prot @@ -1,13 +1,13 @@ #!/usr/bin/perl -w -# $Id: t-prot,v 1.300 2010/04/09 06:47:11 jochen Exp $ +# $Id: t-prot,v 1.312 2010/10/31 11:18:15 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.98'; +use constant VER => '2.101'; use constant REV => ''; -use constant REL => q$Revision: 1.300 $=~m/(\d+(?:\.\d+)+)/; +use constant REL => q$Revision: 1.312 $=~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'; @@ -22,7 +22,7 @@ use constant EX_IOERR => 74; use constant EX_BOUNCE => EX_UNAVAILABLE; use vars qw( $ad $ads $bigqn $bigqx $boun $check $check_ratio $cr $crshrink $diff $elli - $footers $ftr_ad $ftr_ml $hdrs $indent $kamm $kdiff $kminl $kmaxl + $fixind $footers $ftr_ad $ftr_ml $hdrs $indent $kamm $kdiff $kminl $kmaxl $lax $lsig $maxsig $maxlines $mda $ml $gw $ms $ms_smart $msg_quote $msg_ratio $mua $nohdr $ofile $pgpshort $pgpmove $pgpmovevrf $reply $sani $sig $sigint $sign $spass $spass_prefix $sysl $trad $trsp @@ -32,7 +32,7 @@ use vars qw( $mutt_attachment $mutt_contenttype $mutt_pgpsigned $mutt_beginsigned $mutt_pgpclearsigned $mutt_pgpclearsigstart $mutt_pgpencrypted - $mutt_pgpoutstart $mutt_pgpoutend + $mutt_pgpoutstart $mutt_pgpoutend $mutt_pgpcryptend $mutt_pgpcryptstart ); @@ -43,7 +43,7 @@ $0 =~ s!^.*/!!; $maxsig = 4; # max. valid signature length $maxlines = undef; # no limit of message lines $crshrink = 2; # multiple blank lines are shrunk to $crshrink lines -$indent = '>'; # Indent string, regexp to identify a quoted line +$indent = '>'; # Indent string to identify a quoted line $kminl = 65; # see decomb() for details $kmaxl = 80; $kdiff = 20; @@ -68,6 +68,8 @@ $mutt_contenttype = '[-- Type: '; $mutt_pgpsigned = '[-- End of signed data --]'; $mutt_beginsigned = '[-- The following data is signed --]'; $mutt_pgpclearsigstart = '[-- BEGIN PGP SIGNED MESSAGE --]'; +$mutt_pgpcryptend = '[-- END PGP MESSAGE --]'; +$mutt_pgpcryptstart = '[-- BEGIN PGP MESSAGE --]'; $mutt_pgpclearsigned = '[-- END PGP SIGNED MESSAGE --]'; $mutt_pgpencrypted = '[-- End of PGP/MIME encrypted data --]'; $mutt_pgpoutstart = '[-- PGP output follows (current time:'; @@ -89,45 +91,46 @@ $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 --diff tolerate diffs -e force ellipsis for excessive punctuation + --fixind fix quotes to adhere to RFC 3676 --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) + -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! --locale=LOCALE internationalization; currently only used with -Mmutt -M, --mua=MUA turn on special treatment for some mail user agents - -m delete MS style TOFU; careful: might be too agressive + -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] supress 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 @@ -341,7 +344,7 @@ sub decomb { } # debigq(): Finds big quotes (more than $n lines quoted) and deletes all -# but $x lines of them. +# but the last $x lines of them. sub debigq { my $L = shift; # array of message lines my $V = shift; # array with verbatim list @@ -453,6 +456,7 @@ sub pgp { $$L[$x] =~ /^ (?:\e[^\a]+\a)? (?:\Q$mutt_pgpencrypted\E | + \Q$mutt_pgpcryptend\E| \Q$mutt_pgpclearsigned\E| \Q$mutt_pgpsigned\E) /ox) @@ -660,6 +664,7 @@ sub process_msg { (?:\e[^\a]+\a)? (?:\Q$mutt_pgpsigned\E | \Q$mutt_pgpclearsigned\E| + \Q$mutt_pgpcryptend\E| \Q$mutt_pgpencrypted\E) /ox)) { @@ -760,6 +765,25 @@ sub process_msg { } } + # Fix quote markers to adhere to RFC 3676, this changes "> >" to ">> " (if + # the default $indent is used). The space after ">" is not mandatory by RFC + # but makes the result more readable. + if ($fixind) { + for ($x=0; $x schrieb:'); my $k = 0; # any text above? my $tmp = 0; # flagged if inside PGP output @@ -813,6 +838,8 @@ sub process_msg { } elsif ($mua eq 'mutt' && $tmp && ($$lines[$x] =~ /^(?:\e[^\a]+\a)?(?:\Q$mutt_beginsigned\E)/o || + $$lines[$x] =~ + /^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpcryptstart\E)/o || $$lines[$x] =~ /^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpclearsigstart\E)/o)) { $tmp = 0; @@ -872,7 +899,7 @@ sub process_msg { for (my $i=$#$lines; $i>=0; $i--) { if ($vrb[$i]) { last; } - if ($$lines[$i] =~ /^$indent/o) { + if (index($$lines[$i], $indent)==0) { $j++; $k = $i; } @@ -951,6 +978,14 @@ sub process_msg { # earlier -- the way it is done right now would screw up the verbatim # list) if ($cr) { + # When handling regular TOFU above we move the last empty line from + # the body to the signature. This prevents the correct removal of + # empty lines before a signature (one line less is removed than it + # should) when -c and -t are used. This fixes it. + if (scalar(@sig) && $sig[0] =~ /^\s*$/) { + push(@$lines, shift(@sig)); + } + my $t = 0; for ($x=scalar(@$lines)-1; $x>=0; $x--) { if ((!$vrb[$x]) && @@ -992,10 +1027,10 @@ my $locale = $ENV{'LC_ALL'}?$ENV{'LC_ALL'}: ($ENV{'LC_MESSAGES'}?$ENV{'LC_MESSAGES'}:$ENV{'LANG'}); # command line switches -($ad, $ads, $bigqn, $bigqx, $check, $cr, $sysl, $diff, $elli, $footers, $lax, +($ad, $ads, $bigqn, $bigqx, $check, $cr, $sysl, $diff, $elli, $fixind, $footers, $lax, $ml, $gw, $ms, $ms_smart, $mda, $mua, $hdrs, $kamm, $lsig, $nohdr, $reply, $sani, $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, 0, 0); + (0, 0, 0, 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 # temp vals: @@ -1013,6 +1048,7 @@ if (!Getopt::Long::GetOptions( 'debug|d' => \$sysl, 'diff' => \$diff, 'e' => \$elli, + 'fixind' => \$fixind, 'ftr-ad' => \$ftr_ad, 'ftr-ml' => \$ftr_ml, 'groupwise' => \$gw,