From: Axel Beckert Date: Mon, 22 Sep 2014 20:51:39 +0000 (+0200) Subject: Imported Upstream version 3.3 X-Git-Tag: upstream/3.3^0 X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=91043633d978aeaab80d03be26fadc0b20d4fcfb;p=pkg%2Ft-prot.git Imported Upstream version 3.3 --- diff --git a/ChangeLog b/ChangeLog index 6a1678f..58c1610 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2014-09-22 16:27 Jochen Striepe + + * t-prot: Release as version 3.3. + +2014-09-22 12:39 Jochen Striepe + + * t-prot: Removed trailing whitespace. + +2014-09-22 11:21 Jochen Striepe + + * t-prot: Small speedup: Run --pgp-short specific code only with + --pgp-short. + +2014-09-22 11:05 Jochen Striepe + + * t-prot: Fixed a bug with -Mmutt and pgp signed and encrypted + MIME/Multipart messages. Thanks to Axel Beckert for reporting! + 2014-08-22 10:58 Jochen Striepe * t-prot: Release as version 3.2. diff --git a/t-prot b/t-prot index 46b2749..dee0e4f 100755 --- a/t-prot +++ b/t-prot @@ -1,13 +1,13 @@ #!/usr/bin/perl -w -# $Id: t-prot,v 1.324 2014/08/22 08:58:19 jochen Exp $ +# $Id: t-prot,v 1.328 2014/09/22 14:27:35 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 => '3.2'; +use constant VER => '3.3'; use constant REV => ''; -use constant REL => q$Revision: 1.324 $=~m/(\d+(?:\.\d+)+)/; +use constant REL => q$Revision: 1.328 $=~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'; @@ -418,16 +418,21 @@ sub pgp { if ($$L[$x]=~/^(?:\e[^\a]+\a)? (?:\Q$mutt_pgpoutstart\E|\Q$mutt_ssloutstart\E)/ox) { my $from; - for (my $m=0; $m1 && index($$L[$i], $from)<0) { + if (!defined($from) || + ($uid>1 && index($$L[$i], $from)<0)) { splice(@$L, $i, 1); splice(@$V, $i, 1); $i--;