From: Gerfried Fuchs <rhonda@debian.at>
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/w?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<scalar(@$L); $x++) {
-         if ($$V[$x]) { next; }
- 
--        if ($$L[$x]=~/^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutstart\E)/o)
-+        if ($$L[$x]=~/^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutstart\E|\Q$mutt_ssloutstart\E)/o)
-         {
-             my $from;
-             for (my $m=0; $m<scalar(@$H); $m++) {
-@@ -368,7 +370,7 @@
-                         $i--;
-                     }
-                 }
--                elsif ($$L[$i]=~/^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutend\E)/o) {
-+                elsif ($$L[$i]=~/^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutend\E|\Q$mutt_ssloutend\E)/o) {
-                     if ($pgpmove ||
-                         ($pgpmovevrf && (!$sigint) && verified($L, $x+1, $i)))
-                     {
-@@ -698,7 +700,7 @@
-                     'Forwarded message',
-                     'Weitergeleitete Nachricht / Forwarded Message');
-         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<scalar(@$lines); $x++) { 
-             if (!$vrb[$x]) {
-@@ -726,9 +728,11 @@
-                     ((!$spass) || index($$lines[$x], $spass_prefix)!=0))
-                 {
-                     if ($mua eq 'mutt' && (!$tmp) &&
--                        $$lines[$x] =~
--                             /^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutstart\E)/o) {
--                        $tmp = 1; 
-+                        ($$lines[$x] =~
-+                             /^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutstart\E)/o ||
-+                         $$lines[$x] =~
-+                             /^(?:\e[^\a]+\a)?(?:\Q$mutt_ssloutstart\E)/o)) {
-+                        $tmp = 1;
-                     } elsif ($mua eq 'mutt' && $tmp && 
-                         ($$lines[$x] =~
-                              /^(?:\e[^\a]+\a)?(?:\Q$mutt_beginsigned\E)/o ||
-@@ -1004,8 +1008,8 @@
-                 Locale::gettext::gettext("[-- Type: %s/%s, Encoding: %s, Size: %s --]\n") =~
-                 m/^([^%]*)/;
-             ($mutt_pgpsigned) =
--                Locale::gettext::gettext("[-- End of signed data --]\n")  =~
--                m/^(.*)\n/m;
-+                Locale::gettext::gettext("\n[-- End of signed data --]\n")  =~
-+                m/^\n*(.*)\n/m;
-             ($mutt_beginsigned) =
-                 Locale::gettext::gettext("[-- The following data is signed --]\n\n") =~
-                 m/^(.*)\n/m;
-@@ -1013,16 +1017,24 @@
-                 Locale::gettext::gettext("[-- END PGP SIGNED MESSAGE --]\n") =~
-                 m/^(.*)\n/m;
-             ($mutt_pgpclearsigstart) =
--                Locale::gettext::gettext("[-- BEGIN PGP SIGNED MESSAGE --]\n") =~
-+                Locale::gettext::gettext("[-- BEGIN PGP SIGNED MESSAGE --]\n\n") =~
-                 m/^(.*)\n/m;
-             ($mutt_pgpencrypted) =
-                 Locale::gettext::gettext("[-- End of PGP/MIME encrypted data --]\n") =~
-                 m/^(.*)\n/m;
-             ($mutt_pgpoutstart) =
--                Locale::gettext::gettext("[-- PGP output follows (current time: %c) --]\n") =~
--                m/^([^%]*)/;
-+                Locale::gettext::gettext("[-- %s output follows%s --]\n") =~
-+                m/^(.*)%s/;
-+            $mutt_pgpoutstart =~ s/%s/PGP/;
-             ($mutt_pgpoutend) =
--                Locale::gettext::gettext("[-- End of PGP output --]\n") =~
-+                Locale::gettext::gettext("[-- End of PGP output --]\n\n") =~
-+                m/^(.*)\n/m;
-+            ($mutt_ssloutstart) =
-+                Locale::gettext::gettext("[-- %s output follows%s --]\n") =~
-+                m/^(.*)%s/;
-+            $mutt_ssloutstart =~ s/%s/OpenSSL/;
-+            ($mutt_ssloutend) =
-+                Locale::gettext::gettext("[-- End of OpenSSL output --]\n\n") =~
-                 m/^(.*)\n/m;
- 
-             Locale::gettext::textdomain('gnupg');
diff --git a/contrib/t-prot-r1.311-mutt1512.diff b/contrib/t-prot-r1.311-mutt1512.diff
new file mode 100644
index 0000000..7035533
--- /dev/null
+++ b/contrib/t-prot-r1.311-mutt1512.diff
@@ -0,0 +1,101 @@
+--- t-prot	2010-10-31 11:13:22.000000000 +0100
++++ t-prot-mutt1520	2010-10-31 11:40:45.000000000 +0100
+@@ -33,6 +33,7 @@
+     $mutt_attachment $mutt_contenttype $mutt_pgpsigned $mutt_beginsigned
+     $mutt_pgpclearsigned $mutt_pgpclearsigstart $mutt_pgpencrypted
+     $mutt_pgpoutstart $mutt_pgpoutend $mutt_pgpcryptend $mutt_pgpcryptstart
++    $mutt_ssloutstart $mutt_ssloutend
+ );
+ 
+ 
+@@ -74,6 +75,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: ';
+@@ -412,7 +415,7 @@
+     for (my $x=0; $x<scalar(@$L); $x++) {
+         if ($$V[$x]) { next; }
+ 
+-        if ($$L[$x]=~/^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutstart\E)/o)
++        if ($$L[$x]=~/^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutstart\E|\Q$mutt_ssloutstart\E)/o)
+         {
+             my $from;
+             for (my $m=0; $m<scalar(@$H); $m++) {
+@@ -438,7 +441,7 @@
+                         $i--;
+                     }
+                 }
+-                elsif ($$L[$i]=~/^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutend\E)/o) {
++                elsif ($$L[$i]=~/^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutend\E|\Q$mutt_ssloutend\E)/o) {
+                     if ($pgpmove ||
+                         ($pgpmovevrf && (!$sigint) && verified($L, $x+1, $i)))
+                     {
+@@ -804,7 +807,7 @@
+                     '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
++        my $tmp = 0;  # flagged if inside PGP or SSL output
+ 
+         DONE: for ($x=0; $x<scalar(@$lines); $x++) { 
+             if (!$vrb[$x]) {
+@@ -832,9 +835,11 @@
+                     ((!$spass) || index($$lines[$x], $spass_prefix)!=0))
+                 {
+                     if ($mua eq 'mutt' && (!$tmp) &&
+-                        $$lines[$x] =~
+-                             /^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutstart\E)/o) {
+-                        $tmp = 1; 
++                        ($$lines[$x] =~
++                             /^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutstart\E)/o ||
++                         $$lines[$x] =~
++                             /^(?:\e[^\a]+\a)?(?:\Q$mutt_ssloutstart\E)/o)) {
++                        $tmp = 1;
+                     } elsif ($mua eq 'mutt' && $tmp && 
+                         ($$lines[$x] =~
+                              /^(?:\e[^\a]+\a)?(?:\Q$mutt_beginsigned\E)/o ||
+@@ -1130,8 +1135,8 @@
+                 Locale::gettext::gettext("[-- Type: %s/%s, Encoding: %s, Size: %s --]\n") =~
+                 m/^([^%]*)/;
+             ($mutt_pgpsigned) =
+-                Locale::gettext::gettext("[-- End of signed data --]\n")  =~
+-                m/^(.*)\n/m;
++                Locale::gettext::gettext("\n[-- End of signed data --]\n")  =~
++                m/^\n*(.*)\n/m;
+             ($mutt_beginsigned) =
+                 Locale::gettext::gettext("[-- The following data is signed --]\n\n") =~
+                 m/^(.*)\n/m;
+@@ -1139,16 +1144,24 @@
+                 Locale::gettext::gettext("[-- END PGP SIGNED MESSAGE --]\n") =~
+                 m/^(.*)\n/m;
+             ($mutt_pgpclearsigstart) =
+-                Locale::gettext::gettext("[-- BEGIN PGP SIGNED MESSAGE --]\n") =~
++                Locale::gettext::gettext("[-- BEGIN PGP SIGNED MESSAGE --]\n\n") =~
+                 m/^(.*)\n/m;
+             ($mutt_pgpencrypted) =
+                 Locale::gettext::gettext("[-- End of PGP/MIME encrypted data --]\n") =~
+                 m/^(.*)\n/m;
+             ($mutt_pgpoutstart) =
+-                Locale::gettext::gettext("[-- PGP output follows (current time: %c) --]\n") =~
+-                m/^([^%]*)/;
++                sprintf(Locale::gettext::gettext("[-- %s output follows%s --]\n"), 'PGP', '%s') =~
++                m/^(.*)%s/;
++            $mutt_pgpoutstart =~ s/%s/PGP/;
+             ($mutt_pgpoutend) =
+-                Locale::gettext::gettext("[-- End of PGP output --]\n") =~
++                Locale::gettext::gettext("[-- End of PGP output --]\n\n") =~
++                m/^(.*)\n/m;
++            ($mutt_ssloutstart) =
++                Locale::gettext::gettext("[-- %s output follows%s --]\n") =~
++                m/^(.*)%s/;
++            $mutt_ssloutstart =~ s/%s/OpenSSL/;
++            ($mutt_ssloutend) =
++                Locale::gettext::gettext("[-- End of OpenSSL output --]\n\n") =~
+                 m/^(.*)\n/m;
+ 
+             Locale::gettext::textdomain('gnupg');
diff --git a/t-prot b/t-prot
index 36dde12..29d23e1 100755
--- 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;