From 930803001074c64094176e2219dbef7da2b423f9 Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Wed, 17 Feb 2010 20:24:07 +0100 Subject: [PATCH] Imported Upstream version 1.98 --- ChangeLog | 45 +++++++++++ TODO | 2 +- contrib/README.patches | 7 +- ...utt157.diff => t-prot-r1.225-mutt157.diff} | 43 ++++------ ...-gpg126.diff => t-prot-r1.227-gpg126.diff} | 12 +-- t-prot | 78 +++++++------------ t-prot.1 | 21 +---- 7 files changed, 103 insertions(+), 105 deletions(-) rename contrib/{t-prot-r1.220-mutt157.diff => t-prot-r1.225-mutt157.diff} (76%) rename contrib/{t-prot-r1.222-gpg126.diff => t-prot-r1.227-gpg126.diff} (80%) diff --git a/ChangeLog b/ChangeLog index afef141..490681d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,48 @@ +2005-03-01 15:20 Jochen Striepe + + * t-prot: Release as v1.98. + +2005-03-01 15:20 Jochen Striepe + + * t-prot: Gerfried Fuchs pointed out that some locale maintainers + might avoid quote signs, so we check for "%" too when extracting + some locale strings. This still is not *really* bullet-proof, + because e.g. the percent sign might be protected by an escape. This + possibility should be quite unlikely, though, so we stick with it + for now. + +2005-02-24 23:34 Jochen Striepe + + * t-prot.1: Fix broken URL -- the Learn To Edit Messages Howto is + no longer available at Sven Gucke's old site. + +2005-02-24 22:45 Jochen Striepe + + * t-prot: Make esc() superfluous, use \Q and \E instead. Thanks to + Gerfried Fuchs. + +2005-02-23 13:07 Jochen Striepe + + * t-prot.1: Remove misleading information about locale names. + +2005-02-23 12:39 Jochen Striepe + + * t-prot: Release as v1.97. + +2005-02-23 12:38 Jochen Striepe + + * t-prot: Fix French (and probably many other) locales extraction. + Many thanks to Philippe Berini and Gerfried Fuchs who helped a + great deal with the bug hunt. + +2005-02-14 15:02 Jochen Striepe + + * t-prot.1: Remove unnecessary lines. + +2005-02-14 15:01 Jochen Striepe + + * t-prot.1: Fix copyright time stamp. + 2005-02-14 14:19 Jochen Striepe * t-prot: Release as v1.96. diff --git a/TODO b/TODO index 73a5f44..321512f 100644 --- a/TODO +++ b/TODO @@ -13,7 +13,7 @@ Known Bugs (more severe ones come first) ======================================== * In raw multipart messages we snip MS-like TOFU even if there is no relevant text above -- we will have to detect Boundaries and -Content-Type lines as for "$mua eq mutt" in t-prot, l.1142. +Content-Type lines as for "$mua eq mutt" in t-prot, l.671. Wishlist diff --git a/contrib/README.patches b/contrib/README.patches index 9710a46..7154cd9 100644 --- a/contrib/README.patches +++ b/contrib/README.patches @@ -30,12 +30,13 @@ t-prot-*-mutt15*.diff and t-prot-*-gpg1*.diff You want to be on the bleeding edge, using a developer version of mutt? Your distribution provides just an outdated version of gnupg? -No problem, these patches add the locales needed for them working +No problem, these patches add the locales needed for them to work smoothly. Please send a bug report if there are some great new features in the new mutt or gnupg which break anything inside t-prot. -Please note that this patch will most likely be applied by the t-prot -package maintainer of your distribution, e.g. Debian Testing/Unstable. +Please note that this patches will most likely be applied by the t-prot +package maintainer(s) of your distribution (if the distribution makes +use of said mutt and gnupg versions), e.g. Debian Testing/Unstable. OBSOLETE PATCHES diff --git a/contrib/t-prot-r1.220-mutt157.diff b/contrib/t-prot-r1.225-mutt157.diff similarity index 76% rename from contrib/t-prot-r1.220-mutt157.diff rename to contrib/t-prot-r1.225-mutt157.diff index 46133c6..20c5a3e 100644 --- a/contrib/t-prot-r1.220-mutt157.diff +++ b/contrib/t-prot-r1.225-mutt157.diff @@ -1,5 +1,5 @@ ---- t-prot Mon Feb 14 14:29:31 2005 -+++ t-prot-M157 Fri Feb 11 13:53:28 2005 +--- t-prot Thu Feb 24 23:31:55 2005 ++++ t-prot-M157 Thu Feb 24 23:41:45 2005 @@ -32,7 +32,7 @@ $mutt_attachment $mutt_contenttype $mutt_pgpsigned $mutt_beginsigned @@ -18,25 +18,25 @@ # set the defaults to the C locale $gpg_WARNING = 'WARNING: '; -@@ -332,7 +334,7 @@ +@@ -329,7 +331,7 @@ for (my $x=0; $x '1.96'; +use constant VER => '1.98'; use constant REV => ''; -use constant REL => q$Revision: 1.222 $=~m/(\d+(?:\.\d+)+)/; +use constant REL => q$Revision: 1.227 $=~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'; @@ -143,9 +143,6 @@ sub sigint_handler { $sigint = 1; } -# esc(): escapes a scalar reference for use in perl regexp -sub esc { ${$_[0]} =~ s/([\[\]\(\)\*\.\-\^\$\@])/\\$1/go; } - # remove_footers(): remove any trailing appearance of footers contained # in the given directory. sub remove_footers { @@ -310,11 +307,11 @@ sub pgp { my $ok = 0; while ($X<$Z) { - if ($$L[$X] =~ /^gpg:\s(?:$gpg_WARNING|$gpg_Warning|$gpg_bad|$gpg_Cantcheck|$gpg_expired)/o) + if ($$L[$X] =~ /^gpg:\s(?:\Q$gpg_WARNING\E|\Q$gpg_Warning\E|\Q$gpg_bad\E|\Q$gpg_Cantcheck\E|\Q$gpg_expired\E)/o) { return 0; } - if ($$L[$X] =~ /^gpg:\s$gpg_bug/o) + if ($$L[$X] =~ /^gpg:\s\Q$gpg_bug/o) { return 0; } - if ($$L[$X] =~ /^gpg:\s$gpg_good/o) + if ($$L[$X] =~ /^gpg:\s\Q$gpg_good/o) { $ok = 1; } $X++; } @@ -332,7 +329,7 @@ sub pgp { for (my $x=0; $x1 && - $$L[$i] =~ /^gpg:\s$gpg_aka/o && $$L[$i] !~ /$from/) + $$L[$i] =~ /^gpg:\s\Q$gpg_aka/o && $$L[$i] !~ /\Q$from/) { splice(@$L, $i, 1); splice(@$V, $i, 1); $i--; } - elsif ($$L[$i]=~/^(?:\e.+?\a)?(?:$mutt_pgpoutend)/o) + elsif ($$L[$i]=~/^(?:\e.+?\a)?(?:\Q$mutt_pgpoutend\E)/o) { if ($pgpmove || ($pgpmovevrf && (!$sigint) && verified($L, $x+1, $i))) @@ -374,7 +370,7 @@ sub pgp { } } elsif ($tmp && - $$L[$x]=~/^(?:\e.+?\a)?(?:$mutt_pgpencrypted|$mutt_pgpclearsigned|$mutt_pgpsigned)/o) + $$L[$x]=~/^(?:\e.+?\a)?(?:\Q$mutt_pgpencrypted\E|\Q$mutt_pgpclearsigned\E|\Q$mutt_pgpsigned\E)/o) { splice(@$L, $x+1, 0, @{$tmp[$tmp]}); for (my $i=$x; $i, 2001-2004. -.\" License see below. -.\" -.\" $Id: t-prot.1,v 1.93 2005/02/14 13:26:36 jochen Exp $ +.\" $Id: t-prot.1,v 1.97 2005/02/24 23:34:29 jochen Exp $ .\" .TH T-PROT "1" "Feb 2005" "T-PROT" .SH NAME @@ -228,18 +225,6 @@ is specified, but this may change in future. You need the Perl module .I "Locale::gettext" for this feature. .sp -Valid values for LOCALE are the locale names in the mutt(1) and gpg(1) -po file names. -In mutt-1.3.28 (and newer) these are: -.I ca cs da de el eo es et fr gl hu id it ja ko lt nl pl pt_BR ru sk sv -.IR "tr uk zh_CN zh_TW" . -In mutt-1.4.1 -.I bg -was added. -In gnupg-1.2.5 (and newer) these are: -.I be ca cs da de el eo es et fi fr gl hu id it ja nl pl pt pt_BR ro ru -.IR "sk sv tr zh_CN zh_TW" . -.sp .IR Note : If you use .B mutt @@ -431,7 +416,7 @@ obviously they think that quoted text must not be changed at all. This is quite annoying as it needlessly sends a lot of data even when it is not required. Some editing of messages is desired. Please point these people to the page -.I http://learn.to/edit_messages +.I http://www.river.com/users/share/etiquette/edit.html - thank you! .SH TROUBLESHOOTING .TP @@ -489,7 +474,7 @@ Text coming now is not. .SH AUTHOR AND COPYRIGHT Written by Jochen Striepe . .br -Copyright \(co 2001, 2002, 2003, 2004 Jochen Striepe. +Copyright \(co 2001-2005 Jochen Striepe. .PP This is free software; you may use the source to whatever you like. Just keep in mind to mention the original source of the script and the manpage -- 2.39.2