Bump Standards-Version to 3.9.1

[pkg/t-prot.git] / t-prot

diff --git a/t-prot b/t-prot
index 36dde12bd8ce7abac002f35bfdd361de9c4f3bce..29d23e1688a24c0044b79d0e111ec0483708b57d 100755 (executable)
--- a/t-prot
+++ b/t-prot
@@ -1,13 +1,13 @@
 #!/usr/bin/perl -w
-# $Id: t-prot,v 1.310 2010/07/10 19:14:36 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.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;