From: Gerfried Fuchs Date: Sun, 31 Oct 2010 13:40:06 +0000 (+0100) Subject: Imported Upstream version 2.101 X-Git-Tag: upstream/2.101^0 X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=d291c240515f15a9bb267aa00a60cd4b6e2a4634;p=pkg%2Ft-prot.git Imported Upstream version 2.101 --- diff --git a/ChangeLog b/ChangeLog index 17acf0c..d9e67f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2010-10-31 11:18 Jochen Striepe + + * t-prot: Release as v2.101. + +2010-10-31 10:13 Jochen Striepe + + * t-prot: Add just another of mutt's decryption messages to the + list. This seems not to be translated yet, so no gettext() is + inserted this time. + 2010-07-10 19:14 Jochen Striepe * t-prot: Release as v2.100. diff --git a/contrib/t-prot-r1.279-mutt1512.diff b/contrib/t-prot-r1.279-mutt1512.diff deleted file mode 100644 index a1d3d43..0000000 --- a/contrib/t-prot-r1.279-mutt1512.diff +++ /dev/null @@ -1,102 +0,0 @@ ---- t-prot 2010-02-11 11:41:15.000000000 +0100 -+++ t-prot-m1512 2010-02-11 11:48:49.000000000 +0100 -@@ -32,7 +32,7 @@ - - $mutt_attachment $mutt_contenttype $mutt_pgpsigned $mutt_beginsigned - $mutt_pgpclearsigned $mutt_pgpclearsigstart $mutt_pgpencrypted -- $mutt_pgpoutstart $mutt_pgpoutend -+ $mutt_pgpoutstart $mutt_pgpoutend $mutt_ssloutstart $mutt_ssloutend - ); - - -@@ -71,6 +71,8 @@ - $mutt_pgpencrypted = '[-- End of PGP/MIME encrypted data --]'; - $mutt_pgpoutstart = '[-- PGP output follows (current time:'; - $mutt_pgpoutend = '[-- End of PGP output --]'; -+$mutt_ssloutstart = '[-- OpenSSL output follows'; -+$mutt_ssloutend = '[-- End of OpenSSL output --]'; - - # set the defaults to the C locale - $gpg_WARNING = 'WARNING: '; -@@ -342,7 +344,7 @@ - for (my $x=0; $x schrieb:'); + my $k = 0; # any text above? +- my $tmp = 0; # flagged if inside PGP output ++ my $tmp = 0; # flagged if inside PGP or SSL output + + DONE: for ($x=0; $x '2.100'; +use constant VER => '2.101'; use constant REV => ''; -use constant REL => q$Revision: 1.310 $=~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'; @@ -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 ); @@ -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:'; @@ -454,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) @@ -661,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)) { @@ -834,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;