From: Gerfried Fuchs Date: Wed, 12 Jul 2006 11:01:43 +0000 (-0500) Subject: Imported Debian patch 2.1.1-1 X-Git-Tag: debian/2.1.1-1 X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=81d503c2c4e705cc134ba7322047db6ee18dc29a;p=pkg%2Ft-prot.git Imported Debian patch 2.1.1-1 --- diff --git a/contrib/foo/t-prot.sl b/contrib/foo/t-prot.sl deleted file mode 100644 index 6d0b3a6..0000000 --- a/contrib/foo/t-prot.sl +++ /dev/null @@ -1,116 +0,0 @@ -% $Id: t-prot.sl,v 1.17 2006/05/16 11:33:32 jochen Exp $ -% Copyright (c) 2003-2005 Jochen Striepe -% -% This file is provided as an example implemention for articles to be -% filtered through t-prot before displayed. They are still filtered if -% you reply to such a message so you will have to deactivate this if -% you want to include quotes of the original article. -% -% Activate this macro by adding -% interpret t-prot.sl -% to your ~/.slrnrc. -% -% If you are not happy with the suggested t-prot default parameters, -% put something like -% variable t_prot_params = "-cemtS"; -% variable t_prot_tmpdir = "$HOME/.tmpdir"; -% variable t_prot_qp = ""; -% into ~/.slrn/t-prot-cfg and add -% interpret .slrn/t-prot-cfg -% to your ~/.slrnrc (after 'interpret t-prot.sl'). If "mimedecode" is -% installed on your system you might want to use -% variable t_prot_qp = "mimedecode"; -% You can get mimedecode at -% http://packages.debian.org/stable/mail/mimedecode.html -% -% However, please keep in mind that the path of the temp directory should -% NOT be readable to other users -- otherwise it might reveal information on -% what you read, and probably even be a security hole. Please see t-prot's -% man page for details on command line parameters. -% -% If you want to toggle t-prot filtering on/off without leaving slrn, -% you may want to add something like -% setkey article register_t_prot "\e6" -% setkey article unregister_t_prot "\e7" -% to your ~/.slrnrc -- press ESC-6 to activate t-prot filtering, and -% ESC-7 to disable it (this will take effect on the next article you -% read, see the package's TODO file). -% -% Requirements/Bugs: tr(1) and rm(1) are POSIX and should be available -% on any Unix-like system, mktemp(1) should be available on any recent -% OpenBSD or Debian Linux system -- you can get the sources there -% if your system happens to lack this program. This macro has been -% tested with slrn-0.9.7.4 to slrn-0.9.8.0 and S-Lang v1.4.5, it might -% fail with other versions (and will definitely fail with S-Lang v2.x). -% As always, bug reports, patches (preferrably in unified diff format), -% comments and suggestions are welcome. -% -% License: This file is part of the t-prot package and therefore -% available under the same conditions. See t-prot's man page for -% details. - - -% these should be reasonable defaults (they work fine for me, SCNR): -variable t_prot_params = "-aceklmtS --diff --bigq -L$HOME/.slrn/mlfooters -A$HOME/.slrn/adfooters"; -variable t_prot_tmpdir = "$HOME/tmp/slrn"; % you better make sure it exists -variable t_prot_qp = "perl -i -p -e '$p=1 if /^Content-Transfer-Encoding: quoted-printable/i; if ($p==1) { s/=([0-9a-f][0-9a-f])/chr(hex($1))/egi; s/=\n//eg; };'"; - -define t_prot () { - variable art, f, fname, line, qp; - art = ""; - - % Keep in mind that the path should NOT be readable to other users -- - % otherwise it might reveal information on what you read, and probably - % even be a security hole: - f = popen ("mktemp -q "+t_prot_tmpdir+"/t-prot.sl.XXXXXX | tr -d '\n'", "r"); - if (f == NULL) return; - if (-1 == fgets (&fname, f)) return; - pclose (f); - - - if (t_prot_qp != "") { qp = t_prot_qp+"|"; } else { qp = ""; } - - f = popen (qp+"t-prot "+t_prot_params+" >"+fname, "w"); - if (f == NULL) { - message ("Unable to filter article to "+fname); - return; - } - () = fputs (article_as_string(), f); - () = pclose (f); - - - f = fopen (fname, "r"); - if (f == NULL) { - message (fname+" could not be opened."); - return; - } - while (-1 != fgets (&line, f)) { - art = art + line; - } - fclose (f); - - if (0 != remove(fname)) message ("Unable to remove "+fname); - - replace_article (art); -} - -define register_t_prot () { - if (1 == register_hook("read_article_hook", "t_prot")) { - message ("t-prot filtering activated"); - } - else { - message ("t-prot filtering NOT activated"); - } -} - -define unregister_t_prot () { - if (1 == unregister_hook("read_article_hook", "t_prot")) { - message ("t-prot filtering deactivated"); - } - else { - message ("t-prot filtering NOT deactivated"); - } -} - -% filtering is enabled by default: -register_hook("read_article_hook", "t_prot"); diff --git a/debian/README.Debian b/debian/README.Debian index 4e50a5e..da6556f 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -6,15 +6,15 @@ not lose temper when receiving mails that are TOFU (see the manual page for an explanation of that abbreviation). I personally think it's really helpful. debconf asks for systemwide inclusion, you can always revert that change with -"dpkg-reconfigure t-prot" or simly remove the symlink /etc/Muttrc.d/t-prot.rc +"dpkg-reconfigure t-prot" or simply remove the symlink /etc/Muttrc.d/t-prot.rc A user who doesn't like it can turn it off in his own ~/.muttrc file with this line: set display_filter="" - Of course if it isn't enabled in the systemwide file the users can the source -line into their .muttrc. :) + Of course if it isn't enabled in the systemwide file the users can source the +line in their .muttrc. :) There is option to enable it with slrn, too. The script is installed next to the other slang macros in /usr/share/slrn/macros/t-prot.sl and can be sourced diff --git a/debian/changelog b/debian/changelog index 5b0d498..3a50dce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +t-prot (2.1.1-1) unstable; urgency=low + + * New upstream release: Doku fixes. + * Fixed some typos in README.Debian noticed by Upstream. Thanks! :) + * Removed some cruft that was lying around from #344479 bugfix. + + -- Gerfried Fuchs Wed, 12 Jul 2006 06:01:43 -0500 + t-prot (2.1-2) unstable; urgency=low * The "t-prot for the masses" release. diff --git a/debian/rules b/debian/rules index e43c585..12fc3de 100755 --- a/debian/rules +++ b/debian/rules @@ -32,7 +32,7 @@ install: build # usr/share/doc/$(PKG)/contrib $(INSTALL_SCRIPT) t-prot $(TMP)/usr/bin patch $(TMP)/usr/bin/t-prot \ - contrib/t-prot-r*-mutt157.diff + contrib/t-prot-r*-mutt15*.diff -rm -f $(TMP)/usr/bin/t-prot.orig $(INSTALL_FILE) t-prot.1 $(TMP)/usr/share/man/man1 $(INSTALL_FILE) debian/Muttrc $(TMP)/etc/t-prot