--- echolot-2.1.8.orig/pingd +++ echolot-2.1.8/pingd @@ -1,6 +1,6 @@ #!/usr/bin/perl -w # -# $Id: pingd 685 2005-04-25 00:18:06Z weasel $ +# $Id: pingd 715 2008-05-20 20:19:13Z weasel $ # # This file is part of Echolot - a Pinger for anonymous remailers. # @@ -18,7 +18,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA $| = 1; @@ -321,7 +321,7 @@ =head1 BUGS -Please report them at EURL:http://alioth.debian.org/projects/echolot/ +Please report them at EURL:http://alioth.debian.org/projects/echolot/E =cut --- echolot-2.1.8.orig/LICENSE +++ echolot-2.1.8/LICENSE @@ -14,4 +14,4 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA --- echolot-2.1.8.orig/pingd.conf.sample +++ echolot-2.1.8/pingd.conf.sample @@ -1,4 +1,4 @@ -# $Id: pingd.conf.sample 631 2004-04-28 11:58:25Z weasel $ +# $Id: pingd.conf.sample 695 2005-10-09 21:36:30Z weasel $ # # This file is part of Echolot - a Pinger for anonymous remailers. # @@ -16,7 +16,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # see man pingd.conf(5) for a list of all available configuration options. --- echolot-2.1.8.orig/COPYING +++ echolot-2.1.8/COPYING @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -305,7 +305,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. --- echolot-2.1.8.orig/NEWS +++ echolot-2.1.8/NEWS @@ -1,3 +1,11 @@ +Changes in + * Several debian updates. + * Update FSF address in all files. + * Fix the name of an option in an example in pingd.conf(5). + closes: DebianBug#459938. + * Fix a bashishm in tools/create-distribution. + * Fix a markup typo in the pingd manpage. + Changes in version 2.1.8 - 2005-04-25 * debian: Redirect init script output to /dev/null in logrotate --- echolot-2.1.8.orig/tools/create-distribution +++ echolot-2.1.8/tools/create-distribution @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: create-distribution 642 2004-06-10 13:39:56Z weasel $ +# $Id: create-distribution 724 2012-10-15 14:34:30Z weasel $ # # This file is part of Echolot - a Pinger for anonymous remailers. # @@ -18,7 +18,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # # This script is used after exporting the CVS to build a new @@ -34,7 +34,7 @@ if [ "$dirname" != "echolot-$version" ] ; then echo "WARN: Version $version might be wrong" echo "Enter to continue" - read + read dummy fi cd .. --- echolot-2.1.8.orig/tools/pingctl +++ echolot-2.1.8/tools/pingctl @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: pingctl 631 2004-04-28 11:58:25Z weasel $ +# $Id: pingctl 695 2005-10-09 21:36:30Z weasel $ # # This file is part of Echolot - a Pinger for anonymous remailers. # @@ -19,7 +19,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # # pingcntl: echolot control + wrapper --- echolot-2.1.8.orig/tools/install-perl-modules +++ echolot-2.1.8/tools/install-perl-modules @@ -1,6 +1,6 @@ #! /usr/bin/perl -w # -# $Id: install-perl-modules 631 2004-04-28 11:58:25Z weasel $ +# $Id: install-perl-modules 695 2005-10-09 21:36:30Z weasel $ # # This file is part of Echolot - a Pinger for anonymous remailers. # @@ -18,7 +18,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # # This script installs all perl libraries Echolot needs --- echolot-2.1.8.orig/debian/echolot.postinst +++ echolot-2.1.8/debian/echolot.postinst @@ -9,6 +9,11 @@ db_stop fi fi +if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt "2.1.8-7"; then + if ( dpkg-statoverride --list /var/run/echolot > /dev/null ); then + dpkg-statoverride --remove /var/run/echolot + fi +fi # Make sure the echolot user exists adduser --quiet \ @@ -24,16 +29,12 @@ # Give the echolot user write permissions to /var/log/echolot/echolot.log touch /var/log/echolot/echolot.log -chown echolot.adm /var/log/echolot/echolot.log +chown echolot:adm /var/log/echolot/echolot.log chmod 640 /var/log/echolot/echolot.log # and /var/lib/echolot if ( ! dpkg-statoverride --list /var/lib/echolot > /dev/null ); then dpkg-statoverride --update --add root echolot 02775 /var/lib/echolot fi -# and /var/run/echolot -if ( ! dpkg-statoverride --list /var/run/echolot > /dev/null ); then - dpkg-statoverride --update --add root echolot 02770 /var/run/echolot -fi #DEBHELPER# --- echolot-2.1.8.orig/debian/control +++ echolot-2.1.8/debian/control @@ -2,12 +2,12 @@ Section: mail Priority: extra Maintainer: Peter Palfrader -Build-Depends-Indep: debhelper (>= 4.1.16) -Standards-Version: 3.6.1 +Build-Depends: debhelper (>= 4.1.16) +Standards-Version: 3.7.2 Package: echolot Architecture: all -Depends: ${shlibs:Depends}, debconf (>= 1.2.9), gnupg (>= 1.0.7), postfix | mail-transport-agent, mixmaster, libdigest-md5-perl, libhtml-template-perl, libgnupg-interface-perl (>= 0.33) +Depends: ${shlibs:Depends}, gnupg (>= 1.0.7), postfix | mail-transport-agent, mixmaster, libdigest-md5-perl, libhtml-template-perl, libgnupg-interface-perl (>= 0.33), adduser Description: Pinger for anonymous remailers such as Mixmaster A Pinger in the context of anonymous remailers is a program that regularly sends messages through remailers to determine their status. --- echolot-2.1.8.orig/debian/echolot.postrm +++ echolot-2.1.8/debian/echolot.postrm @@ -4,7 +4,9 @@ case "$1" in purge) - rm -rf /var/lib/echolot/* + rm -rf /var/lib/echolot + rm -rf /var/log/echolot + rm -rf /var/run/echolot rmdir /etc/echolot/templates 2>/dev/null || true rmdir /etc/echolot 2>/dev/null || true dpkg-statoverride --remove /var/run/echolot >/dev/null 2>&1 || true --- echolot-2.1.8.orig/debian/compat +++ echolot-2.1.8/debian/compat @@ -0,0 +1 @@ +4 --- echolot-2.1.8.orig/debian/changelog +++ echolot-2.1.8/debian/changelog @@ -1,3 +1,72 @@ +echolot (2.1.8-8) unstable; urgency=low + + * Really fix the markup typo in the pingd manpage. + + -- Peter Palfrader Mon, 15 Oct 2012 17:01:32 +0200 + +echolot (2.1.8-7) unstable; urgency=low + + * No longer ship /var/run/echolot in the package. Based upon + work by Thomas Goirand (closes: #689889). + * Fix a markup typo in the pingd manpage. + * Fix an error in README.Debian where we say /etc/default/echolot + when we mean /etc/init.d/echolot. + * Fix a spelling mistake in README.Debian (closes: #459926). + * Fix the name of an option in an example in pingd.conf(5) + (closes: #459938). + * Update the address for the remops mailinglist in README.Debian + (closes: #563810). + + -- Peter Palfrader Mon, 15 Oct 2012 16:24:47 +0200 + +echolot (2.1.8-6) unstable; urgency=low + + * In postrm during purge remove (rm -rf) /var/lib/echolot instead of + /var/lib/echolot/*. (This seems cleaner, even tho /var/lib/echolot, the + directory, should be removed a bit later by dpkg anyway since it's part of + the package. Since it is the home directory of the echolot user it quite + possible that some admin action caused dot files to appear in that + directory.) + * Also rm -rf /var/log/echolot in postrm purge (closes: #455105). + * Move DH_COMPAT from the rules file into debian/compat. + * Add LSB tags to init script. + + -- Peter Palfrader Mon, 10 Dec 2007 10:39:41 +0100 + +echolot (2.1.8-5) unstable; urgency=low + + * Increase Standards-Version from 3.6.2 to 3.7.2 without any + additional changes. + * Change the build time dependency on debhelper from a + Build-Depends-Indep to Build-Depends. + + -- Peter Palfrader Sat, 17 Jun 2006 20:51:59 +0200 + +echolot (2.1.8-4) unstable; urgency=low + + * Properly quote arguments to su -c, since its behaviour has changed. + * Update to debhelper compatibility level 4, no other changes required + (we were already build depending on debhelper >= 4.1.16). + + -- Peter Palfrader Mon, 6 Mar 2006 15:54:57 +0100 + +echolot (2.1.8-3) unstable; urgency=low + + * Increase Standards-Version to 3.6.2 from 3.6.1. + * Add dependency on adduser since we need it in postinst. + * Fix format of chown argument from echolot.adm to echolot:adm. + * Update FSF address in debian/copyright. + + -- Peter Palfrader Sun, 9 Oct 2005 23:26:28 +0200 + +echolot (2.1.8-2) unstable; urgency=low + + * Since we removed all the debconf templates in 2.1.7-1 we don't need + to depend on debconf at all. If it is installed however we still + purge our debconf database on upgrades (closes: #331811). + + -- Peter Palfrader Sun, 9 Oct 2005 23:17:48 +0200 + echolot (2.1.8-1) unstable; urgency=low * New upstream version: --- echolot-2.1.8.orig/debian/rules +++ echolot-2.1.8/debian/rules @@ -5,9 +5,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# This is the debhelper compatibility version to use. -export DH_COMPAT=3 - version=`grep 'VERSION =' pingd | sed -e "s/.* '//" -e "s/'.*//"` REMAILERS=`tr '\n' ' ' < debian/remailers` --- echolot-2.1.8.orig/debian/echolot.dirs +++ echolot-2.1.8/debian/echolot.dirs @@ -1,7 +1,6 @@ usr/bin usr/share/perl5 var/lib/echolot -var/run/echolot var/log/echolot etc/echolot etc/default --- echolot-2.1.8.orig/debian/echolot.init +++ echolot-2.1.8/debian/echolot.init @@ -2,6 +2,21 @@ # # pingcntl: echolot control + wrapper # Written by admin@arancio.net, peter@palfrader.org +# +### BEGIN INIT INFO +# Provides: echolot +# Required-Start: $local_fs $remote_fs $time +# Required-Stop: $local_fs $remote_fs +# Should-Start: mail-transport-agent $syslog +# Should-Stop: mail-transport-agent $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Pinger for anonymous remailers +# Description: Echolot is a pinger for anonymous remailers +# such as Mixmaster. As the name implies it +# regularly sends pings to remailers to +# collect performance statistics on each node. +### END INIT INFO set -e @@ -10,7 +25,8 @@ # You probably don't want to mess with stuff below this line ################################################################ -PIDFILE=/var/run/echolot/pingd.pid +RUNDIR=/var/run/echolot +PIDFILE="$RUNDIR/pingd.pid" CHECKULIMIT=1 CHECKUID=1 USER=echolot @@ -26,6 +42,11 @@ # Reads config file (will override defaults above) [ -r /etc/default/echolot ] && . /etc/default/echolot +if [ ! -d ${RUNDIR} ]; then + mkdir "$RUNDIR" + chown root:"$GROUP" "$RUNDIR" + chmod 02770 "$RUNDIR" +fi wait_for_deaddaemon () { PID=$1 @@ -139,14 +160,18 @@ ;; process|add|delete|set|setremailercaps|deleteremailercaps|getkeyconf|sendpings|sendchainpings|buildstats|buildkeys|buildthesaurus|buildfromlines|dumpconf|summary|enable|disable) # Check for right User - SU="" if [ "$CHECKUID" -gt "0" ]; then CUID=`id -u` CUIDNAME=`id -nu` if [ "$CUIDNAME" = "$USER" ]; then - SU="" + "$DAEMON" "$@" elif [ "$CUID" = "0" ]; then - SU="su $USER -c" + command="$DAEMON" + while [ "$#" -gt 0 ]; do + command="$command \"$1\"" + shift + done + su "$USER" -c "$command" else echo "You are neither $USER nor root. Aborting." >&2 exit 1; @@ -154,7 +179,6 @@ fi echo "Running $DESC: $NAME $1..." - $SU $DAEMON "$@" echo "done." ;; *) --- echolot-2.1.8.orig/debian/copyright +++ echolot-2.1.8/debian/copyright @@ -17,8 +17,8 @@ PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA +this program; if not, write to the Free Software Foundation, Inc., 51 Franklin +St, Fifth Floor, Boston, MA 02110-1301 USA On Debian systems you can find a copy of the GNU General Public License in /usr/share/common-licenses/GPL. --- echolot-2.1.8.orig/debian/README.Debian +++ echolot-2.1.8/debian/README.Debian @@ -12,8 +12,8 @@ If you run this pinger please consider publishing the results so that other people benefit from it. Announcing the URL to the remailer operators' list -, the alt.privacy.anon-server Usenet newsgroup -and sending a mail to pingers@palfrader.org would be apprechiated. +, the alt.privacy.anon-server Usenet newsgroup +and sending a mail to pingers@palfrader.org would be appreciated. Since many users installed Echolot without considering its implications the default setup is now to no longer start the pingd in the default installation. @@ -21,6 +21,6 @@ If you want to run a pinger, please configure /etc/echolot/pingd.conf and /etc/default/echolot. Then start echolot using /etc/init.d/echolot start -and add some addresses to it: /etc/default/echolot add remailer@example.com. +and add some addresses to it: /etc/init.d/echolot add remailer@example.com. -- Peter Palfrader , Sun, 14 Nov 2004 23:31:24 +0100 --- echolot-2.1.8.orig/doc/pingd.conf.pod +++ echolot-2.1.8/doc/pingd.conf.pod @@ -1,5 +1,5 @@ # -# $Id: pingd.conf.pod 653 2004-06-17 13:51:44Z weasel $ +# $Id: pingd.conf.pod 726 2012-10-15 15:00:19Z weasel $ # # This file is part of Echolot - a Pinger for anonymous remailers. # @@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # =pod @@ -206,7 +206,7 @@ Also build separate rlists with data from only DSA pings, only RSA pings and only unencrypted pings. - Default: 'separate_realists' => 0, + Default: 'separate_rlists' => 0, Example: 'separate_rlists' => 1, =item B [bool] @@ -905,6 +905,6 @@ =head1 BUGS -Please report them at EURL:http://alioth.debian.org/projects/echolot/ +Please report them at EURL:http://alioth.debian.org/projects/echolot/E =cut --- echolot-2.1.8.orig/doc/pingd.1 +++ echolot-2.1.8/doc/pingd.1 @@ -1,15 +1,7 @@ -.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.14 +.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) .\" .\" Standard preamble: .\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp @@ -25,11 +17,11 @@ .. .\" Set up some character translations and predefined strings. \*(-- will .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. | will give a -.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used to -.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C' -.\" expand to `' in nroff, nothing in troff, for use with C<>. -.tr \(*W-|\(bv\*(Tr +.\" double quote, and \*(R" will give a right double quote. \*(C+ will +.\" give a nicer C++. Capital omega is used to do unbreakable dashes and +.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, +.\" nothing in troff, for use with C<>. +.tr \(*W- .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' .ie n \{\ . ds -- \(*W- @@ -48,22 +40,25 @@ . ds R" '' 'br\} .\" +.\" Escape single quotes in literal strings from groff's Unicode transform. +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" .\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index +.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.if \nF \{\ +.ie \nF \{\ . de IX . tm Index:\\$1\t\\n%\t"\\$2" .. . nr % 0 . rr F .\} -.\" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.hy 0 -.if n .na +.el \{\ +. de IX +.. +.\} .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -129,7 +124,11 @@ .\" ======================================================================== .\" .IX Title "PINGD 1" -.TH PINGD 1 "2005-04-25" "2.1.8" "Echolot" +.TH PINGD 1 "2008-05-20" "2.1.8" "Echolot" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.if n .ad l +.nh .SH "NAME" pingd \- echolot ping daemon .SH "SYNOPSIS" @@ -176,7 +175,7 @@ .PD .SH "DESCRIPTION" .IX Header "DESCRIPTION" -pingd is the heart of echolot. Echolot is a pinger for anonymous remailers. +pingd is the heart of echolot. Echolot is a pinger for anonymous remailers. .PP A Pinger in the context of anonymous remailers is a program that regularily sends messages through remailers to check their reliability. It then calculates @@ -184,7 +183,7 @@ of remailers to use. .PP Additionally it collects configuration parameters and keys of all remailers and -offers them in a format readable by remailer clients. +offers them in a format readable by remailer clients. .PP When called without parameters pingd schedules tasks like sending pings, processing incoming mail and requesting remailer-xxx data and runs them at @@ -234,7 +233,7 @@ either \fBon\fR or \fBoff\fR. .IP "\fBfetch=\fR{\fBon\fR,\fBoff\fR}" 4 .IX Item "fetch={on,off}" -Set \fBfetch\fR (fetch remailer-key and remailer\-conf) for remailer \fIaddress\fR to +Set \fBfetch\fR (fetch remailer-key and remailer-conf) for remailer \fIaddress\fR to either \fBon\fR or \fBoff\fR. .RE .RS 4 @@ -247,8 +246,8 @@ For instance: .Sp .Vb 2 -\& ./pingd setremailercaps '$remailer{"passthru2"} = " mix middle";' -\& ./pingd setremailercaps '$remailer{"lcs"} = " mix klen1000";' +\& ./pingd setremailercaps \*(Aq$remailer{"passthru2"} = " mix middle";\*(Aq +\& ./pingd setremailercaps \*(Aq$remailer{"lcs"} = " mix klen1000";\*(Aq .Ve .IP "\fBdeleteremailercaps\fR \fIaddress\fR" 4 .IX Item "deleteremailercaps address" @@ -343,11 +342,14 @@ .PD 0 .IP "/pingd.conf" 4 .IX Item "/pingd.conf" -.IP "$HOME/echolot/pingd.conf" 4 +.ie n .IP "$HOME/echolot/pingd.conf" 4 +.el .IP "\f(CW$HOME\fR/echolot/pingd.conf" 4 .IX Item "$HOME/echolot/pingd.conf" -.IP "$HOME/pingd.conf" 4 +.ie n .IP "$HOME/pingd.conf" 4 +.el .IP "\f(CW$HOME\fR/pingd.conf" 4 .IX Item "$HOME/pingd.conf" -.IP "$HOME/.pingd.conf" 4 +.ie n .IP "$HOME/.pingd.conf" 4 +.el .IP "\f(CW$HOME\fR/.pingd.conf" 4 .IX Item "$HOME/.pingd.conf" .IP "/etc/echolot/pingd.conf" 4 .IX Item "/etc/echolot/pingd.conf" @@ -378,4 +380,4 @@ Peter Palfrader .SH "BUGS" .IX Header "BUGS" -Please report them at +Please report them at --- echolot-2.1.8.orig/doc/pingd.conf.5 +++ echolot-2.1.8/doc/pingd.conf.5 @@ -1,15 +1,7 @@ -.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.14 +.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) .\" .\" Standard preamble: .\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp @@ -25,11 +17,11 @@ .. .\" Set up some character translations and predefined strings. \*(-- will .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. | will give a -.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used to -.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C' -.\" expand to `' in nroff, nothing in troff, for use with C<>. -.tr \(*W-|\(bv\*(Tr +.\" double quote, and \*(R" will give a right double quote. \*(C+ will +.\" give a nicer C++. Capital omega is used to do unbreakable dashes and +.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, +.\" nothing in troff, for use with C<>. +.tr \(*W- .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' .ie n \{\ . ds -- \(*W- @@ -48,22 +40,25 @@ . ds R" '' 'br\} .\" +.\" Escape single quotes in literal strings from groff's Unicode transform. +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" .\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index +.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.if \nF \{\ +.ie \nF \{\ . de IX . tm Index:\\$1\t\\n%\t"\\$2" .. . nr % 0 . rr F .\} -.\" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.hy 0 -.if n .na +.el \{\ +. de IX +.. +.\} .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -129,7 +124,11 @@ .\" ======================================================================== .\" .IX Title "PINGD.CONF 5" -.TH PINGD.CONF 5 "2004-06-17" "2.1.8" "Echolot" +.TH PINGD.CONF 5 "2012-10-15" "2.1.8" "Echolot" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.if n .ad l +.nh .SH "NAME" pingd.conf \- configuration file for the Echolot ping daemon .SH "DESCRIPTION" @@ -139,7 +138,7 @@ values in the \f(CW$CONFIG\fR hash. .SH "OPTIONS" .IX Header "OPTIONS" -.Sh "\s-1REQUIRED\s0 \s-1OPTIONS\s0" +.SS "\s-1REQUIRED\s0 \s-1OPTIONS\s0" .IX Subsection "REQUIRED OPTIONS" .IP "\fBsitename\fR" 4 .IX Item "sitename" @@ -147,7 +146,7 @@ .Sp .Vb 2 \& Default: none -\& Example: 'sitename' => 'testsite', +\& Example: \*(Aqsitename\*(Aq => \*(Aqtestsite\*(Aq, .Ve .IP "\fBmy_localpart\fR" 4 .IX Item "my_localpart" @@ -157,7 +156,7 @@ .Sp .Vb 2 \& Default: none -\& Example: 'my_localpart' => 'pinger', +\& Example: \*(Aqmy_localpart\*(Aq => \*(Aqpinger\*(Aq, .Ve .IP "\fBmy_domain\fR" 4 .IX Item "my_domain" @@ -167,7 +166,7 @@ .Sp .Vb 2 \& Default: none -\& Example: 'my_domain' => 'remailer.example.com', +\& Example: \*(Aqmy_domain\*(Aq => \*(Aqremailer.example.com\*(Aq, .Ve .IP "\fBoperator_address\fR" 4 .IX Item "operator_address" @@ -175,11 +174,11 @@ .Sp .Vb 2 \& Default: none -\& Example: 'operator_address' => 'remop@example.org', +\& Example: \*(Aqoperator_address\*(Aq => \*(Aqremop@example.org\*(Aq, .Ve .Sp It is used in several templates. -.Sh "\s-1SYSTEM\s0 \s-1SPECIFIC\s0 \s-1OPTIONS\s0" +.SS "\s-1SYSTEM\s0 \s-1SPECIFIC\s0 \s-1OPTIONS\s0" .IX Subsection "SYSTEM SPECIFIC OPTIONS" .IP "\fBrecipient_delimiter\fR" 4 .IX Item "recipient_delimiter" @@ -194,9 +193,9 @@ supports it. .Sp .Vb 3 -\& Default: 'recipient_delimiter' => '+', -\& Example: 'recipient_delimiter' => '\-', -\& 'recipient_delimiter' => '', +\& Default: \*(Aqrecipient_delimiter\*(Aq => \*(Aq+\*(Aq, +\& Example: \*(Aqrecipient_delimiter\*(Aq => \*(Aq\-\*(Aq, +\& \*(Aqrecipient_delimiter\*(Aq => \*(Aq\*(Aq, .Ve .Sp Example addresses: @@ -212,7 +211,7 @@ secret. .Sp .Vb 1 -\& Default: 'dev_random' => '/dev/random', +\& Default: \*(Aqdev_random\*(Aq => \*(Aq/dev/random\*(Aq, .Ve .IP "\fBdev_urandom\fR" 4 .IX Item "dev_urandom" @@ -220,7 +219,7 @@ garbage generation. .Sp .Vb 1 -\& Default: 'dev_urandom' => '/dev/urandom', +\& Default: \*(Aqdev_urandom\*(Aq => \*(Aq/dev/urandom\*(Aq, .Ve .IP "\fBsendmail\fR" 4 .IX Item "sendmail" @@ -228,10 +227,10 @@ parameters. .Sp .Vb 2 -\& Default: 'sendmail' => '/usr/sbin/sendmail', -\& Example: 'sendmail' => '/usr/lib/sendmail', +\& Default: \*(Aqsendmail\*(Aq => \*(Aq/usr/sbin/sendmail\*(Aq, +\& Example: \*(Aqsendmail\*(Aq => \*(Aq/usr/lib/sendmail\*(Aq, .Ve -.Sh "\s-1MAGIC\s0 \s-1NUMBERS\s0" +.SS "\s-1MAGIC\s0 \s-1NUMBERS\s0" .IX Subsection "MAGIC NUMBERS" .IP "\fBhash_len\fR [integer]" 4 .IX Item "hash_len [integer]" @@ -244,8 +243,8 @@ \&\fBhash_len\fR is the number of characters to include in the email address. .Sp .Vb 2 -\& Default: 'hash_len' => 8, -\& Example: 'hash_len' => 4, +\& Default: \*(Aqhash_len\*(Aq => 8, +\& Example: \*(Aqhash_len\*(Aq => 4, .Ve .IP "\fBseconds_per_day\fR [integer]" 4 .IX Item "seconds_per_day [integer]" @@ -255,7 +254,7 @@ but shortening it might come in handy during debugging. .Sp .Vb 1 -\& Default: 'seconds_per_day' => 24*60*60, +\& Default: \*(Aqseconds_per_day\*(Aq => 24*60*60, .Ve .IP "\fBstats_days\fR [integer]" 4 .IX Item "stats_days [integer]" @@ -263,35 +262,35 @@ to have in the stats. This is 12 days. .Sp .Vb 1 -\& Default: 'stats_days' => 12, +\& Default: \*(Aqstats_days\*(Aq => 12, .Ve -.Sh "\s-1NEW\s0 \s-1REMAILERS\s0" +.SS "\s-1NEW\s0 \s-1REMAILERS\s0" .IX Subsection "NEW REMAILERS" .IP "\fBfetch_new\fR [bool]" 4 .IX Item "fetch_new [bool]" Query new remailers for remailer-xxx replies by default. .Sp .Vb 2 -\& Default: 'fetch_new' => 1, -\& Example: 'fetch_new' => 0, +\& Default: \*(Aqfetch_new\*(Aq => 1, +\& Example: \*(Aqfetch_new\*(Aq => 0, .Ve .IP "\fBping_new\fR [bool]" 4 .IX Item "ping_new [bool]" Ping new remailers by default. .Sp .Vb 2 -\& Default: 'ping_new' => 1, -\& Example: 'ping_new' => 0, +\& Default: \*(Aqping_new\*(Aq => 1, +\& Example: \*(Aqping_new\*(Aq => 0, .Ve .IP "\fBshow_new\fR [bool]" 4 .IX Item "show_new [bool]" Show new remailers in public stats by default. .Sp .Vb 2 -\& Default: 'show_new' => 1, -\& Example: 'show_new' => 0, +\& Default: \*(Aqshow_new\*(Aq => 1, +\& Example: \*(Aqshow_new\*(Aq => 0, .Ve -.Sh "\s-1STATISTICS\s0 \s-1GENERATION\s0" +.SS "\s-1STATISTICS\s0 \s-1GENERATION\s0" .IX Subsection "STATISTICS GENERATION" .IP "\fBseparate_rlists\fR [bool]" 4 .IX Item "separate_rlists [bool]" @@ -299,8 +298,8 @@ only unencrypted pings. .Sp .Vb 2 -\& Default: 'separate_realists' => 0, -\& Example: 'separate_rlists' => 1, +\& Default: \*(Aqseparate_rlists\*(Aq => 0, +\& Example: \*(Aqseparate_rlists\*(Aq => 1, .Ve .IP "\fBcombined_list\fR [bool]" 4 .IX Item "combined_list [bool]" @@ -308,16 +307,16 @@ standard format it is nice to read for the human eye. .Sp .Vb 2 -\& Default: 'combined_list' => 0, -\& Example: 'combined_list' => 1, +\& Default: \*(Aqcombined_list\*(Aq => 0, +\& Example: \*(Aqcombined_list\*(Aq => 1, .Ve .IP "\fBthesaurus\fR [bool]" 4 .IX Item "thesaurus [bool]" Collect Thesaurus data and build Thesaurus Index. .Sp .Vb 2 -\& Default: 'thesaurus' => 1, -\& Example: 'thesaurus' => 0, +\& Default: \*(Aqthesaurus\*(Aq => 1, +\& Example: \*(Aqthesaurus\*(Aq => 0, .Ve .IP "\fBfromlines\fR [bool]" 4 .IX Item "fromlines [bool]" @@ -325,8 +324,8 @@ remailers which allow overriding them. .Sp .Vb 2 -\& Default: 'fromlines' => 1, -\& Example: 'fromlines' => 0, +\& Default: \*(Aqfromlines\*(Aq => 1, +\& Example: \*(Aqfromlines\*(Aq => 0, .Ve .IP "\fBstats_sort_by_latency\fR" 4 .IX Item "stats_sort_by_latency" @@ -335,26 +334,26 @@ than nick set this to 1 (\-1 if you want to reverse the order). .Sp .Vb 2 -\& Default: 'stats_sort_by_latency' => 0, -\& Example: 'stats_sort_by_latency' => 1, +\& Default: \*(Aqstats_sort_by_latency\*(Aq => 0, +\& Example: \*(Aqstats_sort_by_latency\*(Aq => 1, .Ve -.Sh "\s-1TIMERS\s0 \s-1AND\s0 \s-1COUNTERS\s0" +.SS "\s-1TIMERS\s0 \s-1AND\s0 \s-1COUNTERS\s0" .IX Subsection "TIMERS AND COUNTERS" .IP "\fBprocessmail\fR [seconds]" 4 .IX Item "processmail [seconds]" How often to process incoming email. .Sp .Vb 2 -\& Default: 'processmail' => 60, # every minute -\& Example: 'processmail' => 5*60, # every 5 minutes +\& Default: \*(Aqprocessmail\*(Aq => 60, # every minute +\& Example: \*(Aqprocessmail\*(Aq => 5*60, # every 5 minutes .Ve .IP "\fBbuildstats\fR [seconds]" 4 .IX Item "buildstats [seconds]" How often to build mlist etc. .Sp .Vb 2 -\& Default: 'buildstats' => 5*60, # every 5 minutes -\& Example: 'buildstats' => 60*60, # hourly +\& Default: \*(Aqbuildstats\*(Aq => 5*60, # every 5 minutes +\& Example: \*(Aqbuildstats\*(Aq => 60*60, # hourly .Ve .IP "\fBchainping_update\fR [seconds]" 4 .IX Item "chainping_update [seconds]" @@ -364,7 +363,7 @@ every time stats are built. .Sp .Vb 2 -\& Default: 'chainping_update' => 4*60*60, # chain stats should never +\& Default: \*(Aqchainping_update\*(Aq => 4*60*60, # chain stats should never \& # be older than 4 hours .Ve .IP "\fBbuildkeys\fR [seconds]" 4 @@ -372,16 +371,16 @@ How often to build keyrings. .Sp .Vb 2 -\& Default: 'buildkeys' => 8*60*60, # every 8 hours -\& Example: 'buildkeys' => 24*60*60, # daily +\& Default: \*(Aqbuildkeys\*(Aq => 8*60*60, # every 8 hours +\& Example: \*(Aqbuildkeys\*(Aq => 24*60*60, # daily .Ve .IP "\fBbuildthesaurus\fR [seconds]" 4 .IX Item "buildthesaurus [seconds]" How often to update thesaurus index page. .Sp .Vb 2 -\& Default: 'buildthesaurus' => 60*60, # hourly -\& Example: 'buildthesaurus' => 24*60*60, # daily +\& Default: \*(Aqbuildthesaurus\*(Aq => 60*60, # hourly +\& Example: \*(Aqbuildthesaurus\*(Aq => 24*60*60, # daily .Ve .IP "\fBcommitprospectives\fR [seconds]" 4 .IX Item "commitprospectives [seconds]" @@ -389,16 +388,16 @@ commit them to the list of remailers. .Sp .Vb 2 -\& Default: 'commitprospectives' => 8*60*60, # every 8 hours -\& Example: 'commitprospectives' => 24*60*60, # daily +\& Default: \*(Aqcommitprospectives\*(Aq => 8*60*60, # every 8 hours +\& Example: \*(Aqcommitprospectives\*(Aq => 24*60*60, # daily .Ve .IP "\fBexpire\fR [seconds]" 4 .IX Item "expire [seconds]" How often to expire old keys, pings and remailers .Sp .Vb 2 -\& Default: 'expire' => 24*60*60, # daily -\& Example: 'expire' => 8*60*60, # every 8 hours +\& Default: \*(Aqexpire\*(Aq => 24*60*60, # daily +\& Example: \*(Aqexpire\*(Aq => 8*60*60, # every 8 hours .Ve .IP "\fBgetkeyconf_interval\fR [seconds]" 4 .IX Item "getkeyconf_interval [seconds]" @@ -407,18 +406,18 @@ .IX Item "getkeyconf_every_nth_time [integer]" .PD How often to query remailers for new keys and configuration data -(remailer\-xxx). Some requests are sent every \fBgetkeyconf_interval\fR +(remailer-xxx). Some requests are sent every \fBgetkeyconf_interval\fR seconds. The same request to the same remailer is sent only every \&\fBgetkeyconf_every_nth_time\fR time. .Sp .Vb 8 -\& Default: 'getkeyconf_interval' => 5*60, # send out requests +\& Default: \*(Aqgetkeyconf_interval\*(Aq => 5*60, # send out requests \& # every 5 minutes -\& 'getkeyconf_every_nth_time' => 24*60/5, # send out the same +\& \*(Aqgetkeyconf_every_nth_time\*(Aq => 24*60/5, # send out the same \& # request to the same \& # remailer once a day -\& Example: 'getkeyconf_interval' => 10*60, -\& 'getkeyconf_every_nth_time' => 2*24*60/10, # new request every +\& Example: \*(Aqgetkeyconf_interval\*(Aq => 10*60, +\& \*(Aqgetkeyconf_every_nth_time\*(Aq => 2*24*60/10, # new request every \& # other day .Ve .IP "\fBcheck_resurrection\fR [seconds]" 4 @@ -426,8 +425,8 @@ How often to check assumed dead remailers for resurrection. .Sp .Vb 2 -\& Default: 'check_resurrection' => 7*24*60*60, # weekly -\& Example: 'check_resurrection' => 14*24*60*60, # every other week +\& Default: \*(Aqcheck_resurrection\*(Aq => 7*24*60*60, # weekly +\& Example: \*(Aqcheck_resurrection\*(Aq => 14*24*60*60, # every other week .Ve .IP "\fBpinger_interval\fR [seconds]" 4 .IX Item "pinger_interval [seconds]" @@ -442,10 +441,10 @@ spikes. .Sp .Vb 4 -\& Default: 'pinger_interval' => 5*60, # send out pings every 5 minutes -\& 'ping_every_nth_time' => 24, # send out pings to the same remailer every 24 calls, i.e. every 2 hours -\& Example: 'pinger_interval' => 60, # send out pings every minute -\& 'ping_every_nth_time' => 60, # send out pings to the same remailer every 60 calls, i.e. every hour +\& Default: \*(Aqpinger_interval\*(Aq => 5*60, # send out pings every 5 minutes +\& \*(Aqping_every_nth_time\*(Aq => 24, # send out pings to the same remailer every 24 calls, i.e. every 2 hours +\& Example: \*(Aqpinger_interval\*(Aq => 60, # send out pings every minute +\& \*(Aqping_every_nth_time\*(Aq => 60, # send out pings to the same remailer every 60 calls, i.e. every hour .Ve .IP "\fBchainpinger_interval\fR [seconds]" 4 .IX Item "chainpinger_interval [seconds]" @@ -464,9 +463,9 @@ every \fBchainping_ic_every_nth_time\fR time chain-pings are sent. .Sp .Vb 3 -\& Default: 'chainpinger_interval' => 5*60, # send out pings every 5 minutes -\& 'chainping_every_nth_time' => 2016, # send out pings to the same chain every 2016 calls, i.e. week -\& 'chainping_ic_every_nth_time' => 288, # send out pings to broken or unknown chains every 288 calls, i.e. daily +\& Default: \*(Aqchainpinger_interval\*(Aq => 5*60, # send out pings every 5 minutes +\& \*(Aqchainping_every_nth_time\*(Aq => 2016, # send out pings to the same chain every 2016 calls, i.e. week +\& \*(Aqchainping_ic_every_nth_time\*(Aq => 288, # send out pings to broken or unknown chains every 288 calls, i.e. daily .Ve .IP "\fBaddresses_default_ttl\fR [integer]" 4 .IX Item "addresses_default_ttl [integer]" @@ -475,8 +474,8 @@ dead. .Sp .Vb 2 -\& Default: 'addresses_default_ttl' => 5, # getkeyconf seconds (days if getkeyconf is 24*60*60, the default) -\& Example: 'addresses_default_ttl' => 7, +\& Default: \*(Aqaddresses_default_ttl\*(Aq => 5, # getkeyconf seconds (days if getkeyconf is 24*60*60, the default) +\& Example: \*(Aqaddresses_default_ttl\*(Aq => 7, .Ve .IP "\fBcheck_resurrection_ttl\fR [integer]" 4 .IX Item "check_resurrection_ttl [integer]" @@ -485,8 +484,8 @@ really considered dead. .Sp .Vb 2 -\& Default: 'check_resurrection_ttl' => 8, # check_resurrection seconds (weeks if check_resurrection is 7*24*60*60, the default) -\& Example: 'check_resurrection_ttl' => 4, +\& Default: \*(Aqcheck_resurrection_ttl\*(Aq => 8, # check_resurrection seconds (weeks if check_resurrection is 7*24*60*60, the default) +\& Example: \*(Aqcheck_resurrection_ttl\*(Aq => 4, .Ve .IP "\fBprospective_addresses_ttl\fR [seconds]" 4 .IX Item "prospective_addresses_ttl [seconds]" @@ -495,8 +494,8 @@ expired after this time. .Sp .Vb 2 -\& Default: 'prospective_addresses_ttl' => 5*24*60*60, # 5 days -\& Example: 'prospective_addresses_ttl' =>14*24*60*60, # 2 weeks +\& Default: \*(Aqprospective_addresses_ttl\*(Aq => 5*24*60*60, # 5 days +\& Example: \*(Aqprospective_addresses_ttl\*(Aq =>14*24*60*60, # 2 weeks .Ve .IP "\fBreliable_auto_add_min\fR [integer]" 4 .IX Item "reliable_auto_add_min [integer]" @@ -504,24 +503,24 @@ reply to get it committed to the list of remailer addresses. .Sp .Vb 2 -\& Default: 'reliable_auto_add_min' => 6, -\& Example: 'reliable_auto_add_min' => 3, +\& Default: \*(Aqreliable_auto_add_min\*(Aq => 6, +\& Example: \*(Aqreliable_auto_add_min\*(Aq => 3, .Ve .IP "\fBexpire_keys\fR [seconds]" 4 .IX Item "expire_keys [seconds]" After how long to expire received keys if they were not updated by remailer-key replies. .Sp .Vb 2 -\& Default: 'expire_keys' => 5*24*60*60, # 5 days -\& Example: 'expire_keys' => 7*24*60*60, # 1 week +\& Default: \*(Aqexpire_keys\*(Aq => 5*24*60*60, # 5 days +\& Example: \*(Aqexpire_keys\*(Aq => 7*24*60*60, # 1 week .Ve .IP "\fBexpire_confs\fR [seconds]" 4 .IX Item "expire_confs [seconds]" After how long to expire received remailer-conf replies. .Sp .Vb 2 -\& Default: 'expire_confs' => 5*24*60*60, # 5 days -\& Example: 'expire_confs' => 7*24*60*60, # 1 week +\& Default: \*(Aqexpire_confs\*(Aq => 5*24*60*60, # 5 days +\& Example: \*(Aqexpire_confs\*(Aq => 7*24*60*60, # 1 week .Ve .IP "\fBexpire_pings\fR [seconds]" 4 .IX Item "expire_pings [seconds]" @@ -530,7 +529,7 @@ not make this smaller than 12 days. .Sp .Vb 1 -\& Default: 'expire_pings' => 12*24*60*60, # 12 days +\& Default: \*(Aqexpire_pings\*(Aq => 12*24*60*60, # 12 days .Ve .IP "\fBexpire_chainpings\fR [seconds]" 4 .IX Item "expire_chainpings [seconds]" @@ -538,23 +537,23 @@ be set to the same as \fBchainping_period\fR. .Sp .Vb 1 -\& Default: 'expire_chainpings' => 12*24*60*60, # 12 days +\& Default: \*(Aqexpire_chainpings\*(Aq => 12*24*60*60, # 12 days .Ve .IP "\fBexpire_thesaurus\fR [seconds]" 4 .IX Item "expire_thesaurus [seconds]" After how long to expire files in the thesaurus directory. .Sp .Vb 2 -\& Default: 'expire_thesaurus' => 21*24*60*60, # 2 weeks -\& Example: 'expire_thesaurus' => 7*24*60*60, # 1 week +\& Default: \*(Aqexpire_thesaurus\*(Aq => 21*24*60*60, # 2 weeks +\& Example: \*(Aqexpire_thesaurus\*(Aq => 7*24*60*60, # 1 week .Ve .IP "\fBexpire_fromlines\fR [seconds]" 4 .IX Item "expire_fromlines [seconds]" After how long to expire header From: lines. .Sp .Vb 2 -\& Default: 'expire_fromlines' => 5*24*60*60, # 5 days -\& Example: 'expire_fromlines' => 7*24*60*60, # 1 week +\& Default: \*(Aqexpire_fromlines\*(Aq => 5*24*60*60, # 5 days +\& Example: \*(Aqexpire_fromlines\*(Aq => 7*24*60*60, # 1 week .Ve .IP "\fBcleanup_tmpdir\fR [seconds]" 4 .IX Item "cleanup_tmpdir [seconds]" @@ -566,26 +565,26 @@ are compressed. .Sp .Vb 2 -\& Default: 'metadata_backup' => 8*60*60, # 8 hours -\& Example: 'metadata_backup' => 24*60*60, # daily +\& Default: \*(Aqmetadata_backup\*(Aq => 8*60*60, # 8 hours +\& Example: \*(Aqmetadata_backup\*(Aq => 24*60*60, # daily .Ve .IP "\fBmetadata_backup_count\fR [integer]" 4 .IX Item "metadata_backup_count [integer]" How many backups of metadata to keep. .Sp .Vb 2 -\& Default: 'metadata_backup_count' => 32, # keep the last 32 backups -\& Example: 'metadata_backup_count' => 4, # keep 4 rotations +\& Default: \*(Aqmetadata_backup_count\*(Aq => 32, # keep the last 32 backups +\& Example: \*(Aqmetadata_backup_count\*(Aq => 4, # keep 4 rotations .Ve .IP "\fBsummary\fR [seconds]" 4 .IX Item "summary [seconds]" How often to print a status summary to the log. .Sp .Vb 2 -\& Default: 'summary' => 24*60*60, # daily -\& Default: 'summary' => 12*60*60, # twice a day +\& Default: \*(Aqsummary\*(Aq => 24*60*60, # daily +\& Default: \*(Aqsummary\*(Aq => 12*60*60, # twice a day .Ve -.Sh "\s-1DIRECTORIES\s0 \s-1AND\s0 \s-1FILES\s0 \s-1AND\s0 \s-1RELATED\s0 \s-1OPTIONS\s0" +.SS "\s-1DIRECTORIES\s0 \s-1AND\s0 \s-1FILES\s0 \s-1AND\s0 \s-1RELATED\s0 \s-1OPTIONS\s0" .IX Subsection "DIRECTORIES AND FILES AND RELATED OPTIONS" .IP "\fBhomedir\fR" 4 .IX Item "homedir" @@ -595,58 +594,58 @@ .Sp .Vb 2 \& Default: The directory in which pingd is. -\& Example: 'homedir' => '/home/pinger/echolot', +\& Example: \*(Aqhomedir\*(Aq => \*(Aq/home/pinger/echolot\*(Aq, .Ve .IP "\fBmailin\fR" 4 .IX Item "mailin" The Maildir directory or Mbox which is searched for new messages. .Sp .Vb 2 -\& Default: 'mailin' => 'mail', -\& Example: 'mailin' => '/var/mail/echolot', +\& Default: \*(Aqmailin\*(Aq => \*(Aqmail\*(Aq, +\& Example: \*(Aqmailin\*(Aq => \*(Aq/var/mail/echolot\*(Aq, .Ve .IP "\fBmailerrordir\fR" 4 .IX Item "mailerrordir" The Maildir directory where messages are put that could not be parsed. .Sp .Vb 1 -\& Default: 'mailerrordir' => 'mail\-errors', +\& Default: \*(Aqmailerrordir\*(Aq => \*(Aqmail\-errors\*(Aq, .Ve .IP "\fBsave_errormails\fR [bool]" 4 .IX Item "save_errormails [bool]" Whether to keep error messages at all .Sp .Vb 2 -\& Default: 'save_errormails' => 0, -\& Example: 'save_errormails' => 1, +\& Default: \*(Aqsave_errormails\*(Aq => 0, +\& Example: \*(Aqsave_errormails\*(Aq => 1, .Ve .IP "\fBresultdir\fR" 4 .IX Item "resultdir" The directory where statistics and keyrings are put. .Sp .Vb 1 -\& Default: 'resultdir' => 'results', +\& Default: \*(Aqresultdir\*(Aq => \*(Aqresults\*(Aq, .Ve .IP "\fBthesaurusdir\fR" 4 .IX Item "thesaurusdir" The directory where Thesaurus data is put. .Sp .Vb 1 -\& Default: 'thesaurusdir' => 'results/thesaurus', +\& Default: \*(Aqthesaurusdir\*(Aq => \*(Aqresults/thesaurus\*(Aq, .Ve .IP "\fBthesaurusindexfile\fR" 4 .IX Item "thesaurusindexfile" The Thesaurus index file. .Sp .Vb 1 -\& Default: 'thesaurusindexfile' => 'results/thesaurus/index', +\& Default: \*(Aqthesaurusindexfile\*(Aq => \*(Aqresults/thesaurus/index\*(Aq, .Ve .IP "\fBfromlinesindexfile\fR" 4 .IX Item "fromlinesindexfile" The From Lines index file. .Sp .Vb 1 -\& Default: 'fromlinesindexfile' => 'results/from', +\& Default: \*(Aqfromlinesindexfile\*(Aq => \*(Aqresults/from\*(Aq, .Ve .IP "\fBprivate_resultdir\fR" 4 .IX Item "private_resultdir" @@ -654,15 +653,15 @@ show set to false are shown here too). .Sp .Vb 1 -\& Default: 'private_resultdir' => 'results.private', +\& Default: \*(Aqprivate_resultdir\*(Aq => \*(Aqresults.private\*(Aq, .Ve .IP "\fBindexfilebasename\fR" 4 .IX Item "indexfilebasename" The file to write the index.html to (relative to the result directory). .Sp .Vb 2 -\& Default: 'indexfilebasename' => 'echolot', -\& Example: 'indexfilebasename' => 'index', +\& Default: \*(Aqindexfilebasename\*(Aq => \*(Aqecholot\*(Aq, +\& Example: \*(Aqindexfilebasename\*(Aq => \*(Aqindex\*(Aq, .Ve .IP "\fBgnupghome\fR" 4 .IX Item "gnupghome" @@ -670,7 +669,7 @@ encryption/decryption actions. .Sp .Vb 1 -\& Default: 'gnupghome' => 'gnupghome', +\& Default: \*(Aqgnupghome\*(Aq => \*(Aqgnupghome\*(Aq, .Ve .IP "\fBgnupg\fR" 4 .IX Item "gnupg" @@ -681,8 +680,8 @@ is used. .Sp .Vb 2 -\& Default: 'gnupg' => '', -\& Example: 'gnupg' => '/home/pinger/bin/myGnuPG', +\& Default: \*(Aqgnupg\*(Aq => \*(Aq\*(Aq, +\& Example: \*(Aqgnupg\*(Aq => \*(Aq/home/pinger/bin/myGnuPG\*(Aq, .Ve .IP "\fBgzip\fR" 4 .IX Item "gzip" @@ -690,7 +689,7 @@ include path information. .Sp .Vb 1 -\& Default: 'gzip' => 'gzip', +\& Default: \*(Aqgzip\*(Aq => \*(Aqgzip\*(Aq, .Ve .IP "\fBmixhome\fR" 4 .IX Item "mixhome" @@ -698,8 +697,8 @@ encryption/decryption actions. .Sp .Vb 2 -\& Default: 'mixhome' => 'mixhome', -\& Example: 'mixhome' => '/home/pinger/Mix', +\& Default: \*(Aqmixhome\*(Aq => \*(Aqmixhome\*(Aq, +\& Example: \*(Aqmixhome\*(Aq => \*(Aq/home/pinger/Mix\*(Aq, .Ve .IP "\fBmixmaster\fR" 4 .IX Item "mixmaster" @@ -707,8 +706,8 @@ include path information. .Sp .Vb 2 -\& Default: 'mixmaster' => 'mix', -\& Example: 'mixmaster' => '/home/pinger/Mix/mix', +\& Default: \*(Aqmixmaster\*(Aq => \*(Aqmix\*(Aq, +\& Example: \*(Aqmixmaster\*(Aq => \*(Aq/home/pinger/Mix/mix\*(Aq, .Ve .IP "\fBtmpdir\fR" 4 .IX Item "tmpdir" @@ -716,7 +715,7 @@ applications. .Sp .Vb 1 -\& Default: 'tmpdir' => 'tmp', +\& Default: \*(Aqtmpdir\*(Aq => \*(Aqtmp\*(Aq, .Ve .IP "\fBcommands_file\fR" 4 .IX Item "commands_file" @@ -725,7 +724,7 @@ to the daemon process which reads and empties the file. .Sp .Vb 1 -\& Default: 'commands_file' => 'commands.txt', +\& Default: \*(Aqcommands_file\*(Aq => \*(Aqcommands.txt\*(Aq, .Ve .IP "\fBpidfile\fR" 4 .IX Item "pidfile" @@ -733,7 +732,7 @@ As long as it exists pingd refuses to start up in daemon mode. .Sp .Vb 1 -\& Default: 'pidfile' => 'pingd.pid', +\& Default: \*(Aqpidfile\*(Aq => \*(Aqpingd.pid\*(Aq, .Ve .IP "\fBbroken1\fR" 4 .IX Item "broken1" @@ -741,7 +740,7 @@ skipped in generated stats. Otherwise its content is copied in verbatim. .Sp .Vb 4 -\& Default: 'broken1' => 'broken1.txt', +\& Default: \*(Aqbroken1\*(Aq => \*(Aqbroken1.txt\*(Aq, \& Example content: \& (havenco cmeclax) \& (frog3 nycrem) @@ -752,7 +751,7 @@ skipped in generated stats. Otherwise its content is copied in verbatim. .Sp .Vb 4 -\& Default: 'broken2' => 'broken2.txt', +\& Default: \*(Aqbroken2\*(Aq => \*(Aqbroken2.txt\*(Aq, \& Example content: \& (freedom lcs) \& (* xganon) @@ -764,20 +763,20 @@ generated stats. Otherwise its content is copied in verbatim. .Sp .Vb 4 -\& Default: 'sameop' => 'sameop.txt', +\& Default: \*(Aqsameop\*(Aq => \*(Aqsameop.txt\*(Aq, \& Example content: \& (xganon2 xganon) \& (cracker redneck) .Ve -.Sh "\s-1LOGGING\s0" +.SS "\s-1LOGGING\s0" .IX Subsection "LOGGING" .IP "\fBlogfile\fR" 4 .IX Item "logfile" File to write logs to. This file is reopened on \s-1SIGHUP\s0. .Sp .Vb 2 -\& Default: 'logfile' => 'pingd.log', -\& Example: 'logfile' => '/var/log/echolot/pingd.log', +\& Default: \*(Aqlogfile\*(Aq => \*(Aqpingd.log\*(Aq, +\& Example: \*(Aqlogfile\*(Aq => \*(Aq/var/log/echolot/pingd.log\*(Aq, .Ve .IP "\fBloglevel\fR" 4 .IX Item "loglevel" @@ -786,10 +785,10 @@ \&\fBemergency\fR. .Sp .Vb 2 -\& Default: 'loglevel' => 'info', -\& Example: 'loglevel' => 'debug', +\& Default: \*(Aqloglevel\*(Aq => \*(Aqinfo\*(Aq, +\& Example: \*(Aqloglevel\*(Aq => \*(Aqdebug\*(Aq, .Ve -.Sh "\s-1MISCELLANEOUS\s0" +.SS "\s-1MISCELLANEOUS\s0" .IX Subsection "MISCELLANEOUS" .IP "\fBwrite_meta_files\fR [bool]" 4 .IX Item "write_meta_files [bool]" @@ -798,14 +797,14 @@ a specific page expires. .Sp .Vb 1 -\& Default: 'write_meta_files' => 1, +\& Default: \*(Aqwrite_meta_files\*(Aq => 1, .Ve .IP "\fBmeta_extension\fR" 4 .IX Item "meta_extension" The extension that such metafiles (see above) should have. .Sp .Vb 1 -\& Default: 'meta_extension' => '.meta', +\& Default: \*(Aqmeta_extension\*(Aq => \*(Aq.meta\*(Aq, .Ve .IP "\fBrandom_garbage\fR [integer]" 4 .IX Item "random_garbage [integer]" @@ -818,9 +817,9 @@ [0, \fBrandom_garbage\fR] .Sp .Vb 1 -\& Default: 'random_garbage' => '8192', +\& Default: \*(Aqrandom_garbage\*(Aq => \*(Aq8192\*(Aq, .Ve -.Sh "\s-1CHAIN\s0 \s-1PINGING\s0" +.SS "\s-1CHAIN\s0 \s-1PINGING\s0" .IX Subsection "CHAIN PINGING" .IP "\fBdo_chainpings\fR [bool]" 4 .IX Item "do_chainpings [bool]" @@ -829,14 +828,14 @@ This produces a non-trivial amount of traffic. .Sp .Vb 1 -\& Default: 'do_chainpings' => 1, +\& Default: \*(Aqdo_chainpings\*(Aq => 1, .Ve .IP "\fBshow_chainpings\fR [bool]" 4 .IX Item "show_chainpings [bool]" Show the results of our chainpinging in public stats. .Sp .Vb 1 -\& Default: 'show_chainpings' => 1, +\& Default: \*(Aqshow_chainpings\*(Aq => 1, .Ve .IP "\fBchainping_fudge\fR" 4 .IX Item "chainping_fudge" @@ -844,7 +843,7 @@ must return before a chain is not declared broken. .Sp .Vb 1 -\& Default: 'chainping_fudge' => 0.3, # if less than 0.3 * rel1 * rel2 make it, the chain is really broken +\& Default: \*(Aqchainping_fudge\*(Aq => 0.3, # if less than 0.3 * rel1 * rel2 make it, the chain is really broken .Ve .IP "\fBchainping_grace\fR" 4 .IX Item "chainping_grace" @@ -852,7 +851,7 @@ derived from one-hop stats before a chain ping is considered lost .Sp .Vb 1 -\& Default: 'chainping_grace' => 1.5, # don't count pings sent no longer than 1.5 * (lat1 + lat2) ago +\& Default: \*(Aqchainping_grace\*(Aq => 1.5, # don\*(Aqt count pings sent no longer than 1.5 * (lat1 + lat2) ago .Ve .IP "\fBchainping_period\fR [seconds]" 4 .IX Item "chainping_period [seconds]" @@ -860,7 +859,7 @@ This should probably be smaller than \fBexpire_chainpings\fR. .Sp .Vb 1 -\& Default: 'chainping_period' => 12*24*60*60, # 12 days +\& Default: \*(Aqchainping_period\*(Aq => 12*24*60*60, # 12 days .Ve .IP "\fBchainping_minsample\fR [seconds]" 4 .IX Item "chainping_minsample [seconds]" @@ -868,7 +867,7 @@ declaring a chain broken. .Sp .Vb 1 -\& Default: 'chainping_minsample' => 3, # have at least sent 3 pings before judging any chain +\& Default: \*(Aqchainping_minsample\*(Aq => 3, # have at least sent 3 pings before judging any chain .Ve .IP "\fBchainping_allbad_factor\fR" 4 .IX Item "chainping_allbad_factor" @@ -878,7 +877,7 @@ .Vb 1 \& Default: chainping_allbad_factor => 0.5, # at least 50% of possible chains (A x) need to fail for (A *) to be listed in broken chains .Ve -.Sh "\s-1PINGING\s0 \s-1TYPES\s0" +.SS "\s-1PINGING\s0 \s-1TYPES\s0" .IX Subsection "PINGING TYPES" .IP "\fBdo_pings\fR" 4 .IX Item "do_pings" @@ -902,11 +901,11 @@ .RS 4 .Sp .Vb 6 -\& Default: 'do_pings' => { -\& 'cpunk\-dsa' => 1, -\& 'cpunk\-rsa' => 1, -\& 'cpunk\-clear' => 1, -\& 'mix' => 1 +\& Default: \*(Aqdo_pings\*(Aq => { +\& \*(Aqcpunk\-dsa\*(Aq => 1, +\& \*(Aqcpunk\-rsa\*(Aq => 1, +\& \*(Aqcpunk\-clear\*(Aq => 1, +\& \*(Aqmix\*(Aq => 1 \& }, .Ve .RE @@ -919,14 +918,14 @@ .Sp .Vb 4 \& Default: which_chainpings => { -\& 'cpunk' => [ qw{cpunk\-dsa cpunk\-rsa cpunk\-clear} ], -\& 'mix' => [ qw{mix} ] +\& \*(Aqcpunk\*(Aq => [ qw{cpunk\-dsa cpunk\-rsa cpunk\-clear} ], +\& \*(Aqmix\*(Aq => [ qw{mix} ] \& }, .Ve .Sp This means that in the case of cpunk chain pings we prefer using cpunk-dsa over cpunk-rsa which in turn we prefer -to cpunk\-clear. For mix there's only mix. +to cpunk-clear. For mix there's only mix. .IP "\fBpings_weight\fR" 4 .IX Item "pings_weight" Not all pings have the same influence on the average reliability @@ -940,7 +939,7 @@ .Vb 1 \& Default: pings_weight => [ qw{0.5 1.0 1.0 1.0 1.0 0.9 0.8 0.5 0.3 0.2 0.2 0.1 } ], .Ve -.Sh "\s-1TEMPLATES\s0" +.SS "\s-1TEMPLATES\s0" .IX Subsection "TEMPLATES" .IP "\fBtemplates\fR" 4 .IX Item "templates" @@ -961,28 +960,28 @@ .Sp The outer hash keys are for language selection. .Sp -.Vb 24 -\& Default: 'templates' => { -\& 'default' => { -\& 'thesaurusindexfile' => 'templates/thesaurusindex.html', -\& 'mlist' => 'templates/mlist.html', -\& 'mlist2' => 'templates/mlist2.html', -\& 'rlist' => 'templates/rlist.html', -\& 'rlist\-rsa' => 'templates/rlist\-rsa.html', -\& 'rlist\-dsa' => 'templates/rlist\-dsa.html', -\& 'rlist\-clear' => 'templates/rlist\-clear.html', -\& 'rlist2' => 'templates/rlist2.html', -\& 'rlist2\-rsa' => 'templates/rlist2\-rsa.html', -\& 'rlist2\-dsa' => 'templates/rlist2\-dsa.html', -\& 'rlist2\-clear' => 'templates/rlist2\-clear.html', -\& 'clist' => 'templates/clist.html', +.Vb 10 +\& Default: \*(Aqtemplates\*(Aq => { +\& \*(Aqdefault\*(Aq => { +\& \*(Aqthesaurusindexfile\*(Aq => \*(Aqtemplates/thesaurusindex.html\*(Aq, +\& \*(Aqmlist\*(Aq => \*(Aqtemplates/mlist.html\*(Aq, +\& \*(Aqmlist2\*(Aq => \*(Aqtemplates/mlist2.html\*(Aq, +\& \*(Aqrlist\*(Aq => \*(Aqtemplates/rlist.html\*(Aq, +\& \*(Aqrlist\-rsa\*(Aq => \*(Aqtemplates/rlist\-rsa.html\*(Aq, +\& \*(Aqrlist\-dsa\*(Aq => \*(Aqtemplates/rlist\-dsa.html\*(Aq, +\& \*(Aqrlist\-clear\*(Aq => \*(Aqtemplates/rlist\-clear.html\*(Aq, +\& \*(Aqrlist2\*(Aq => \*(Aqtemplates/rlist2.html\*(Aq, +\& \*(Aqrlist2\-rsa\*(Aq => \*(Aqtemplates/rlist2\-rsa.html\*(Aq, +\& \*(Aqrlist2\-dsa\*(Aq => \*(Aqtemplates/rlist2\-dsa.html\*(Aq, +\& \*(Aqrlist2\-clear\*(Aq => \*(Aqtemplates/rlist2\-clear.html\*(Aq, +\& \*(Aqclist\*(Aq => \*(Aqtemplates/clist.html\*(Aq, \& }, -\& 'de' => { -\& 'thesaurusindexfile' => 'templates/thesaurusindex.de.html', +\& \*(Aqde\*(Aq => { +\& \*(Aqthesaurusindexfile\*(Aq => \*(Aqtemplates/thesaurusindex.de.html\*(Aq, \& .... \& }, -\& 'pl' => { -\& 'thesaurusindexfile' => 'templates/thesaurusindex.pl.html', +\& \*(Aqpl\*(Aq => { +\& \*(Aqthesaurusindexfile\*(Aq => \*(Aqtemplates/thesaurusindex.pl.html\*(Aq, \& .... \& } \& }; @@ -992,9 +991,9 @@ Location of the \s-1CSS\s0 file. This is copied to resultdir/echolot.css. .Sp .Vb 1 -\& Default: 'echolot_css' => 'templates/echolot.css', +\& Default: \*(Aqecholot_css\*(Aq => \*(Aqtemplates/echolot.css\*(Aq, .Ve -.Sh "\s-1STRINGS\s0" +.SS "\s-1STRINGS\s0" .IX Subsection "STRINGS" .IP "\fBremailerxxxtext\fR" 4 .IX Item "remailerxxxtext" @@ -1002,8 +1001,8 @@ The template variables address and operator_address are substituted for their real values. .Sp -.Vb 13 -\& Default: 'remailerxxxtext' => "Hello,\en". +.Vb 10 +\& Default: \*(Aqremailerxxxtext\*(Aq => "Hello,\en". \& "\en". \& "This message requests remailer configuration data. The pinging software thinks\en". \& " is a remailer. Either it has been told so by the\en". @@ -1022,4 +1021,4 @@ Peter Palfrader .SH "BUGS" .IX Header "BUGS" -Please report them at +Please report them at --- echolot-2.1.8.orig/Echolot/Config.pm +++ echolot-2.1.8/Echolot/Config.pm @@ -1,7 +1,7 @@ package Echolot::Config; # -# $Id: Config.pm 676 2004-11-14 22:54:11Z weasel $ +# $Id: Config.pm 695 2005-10-09 21:36:30Z weasel $ # # This file is part of Echolot - a Pinger for anonymous remailers. # @@ -19,7 +19,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # =pod --- echolot-2.1.8.orig/Echolot/Mailin.pm +++ echolot-2.1.8/Echolot/Mailin.pm @@ -1,7 +1,7 @@ package Echolot::Mailin; # -# $Id: Mailin.pm 631 2004-04-28 11:58:25Z weasel $ +# $Id: Mailin.pm 695 2005-10-09 21:36:30Z weasel $ # # This file is part of Echolot - a Pinger for anonymous remailers. # @@ -19,7 +19,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # =pod --- echolot-2.1.8.orig/Echolot/Report.pm +++ echolot-2.1.8/Echolot/Report.pm @@ -1,7 +1,7 @@ package Echolot::Report; # -# $Id: Report.pm 631 2004-04-28 11:58:25Z weasel $ +# $Id: Report.pm 695 2005-10-09 21:36:30Z weasel $ # # This file is part of Echolot - a Pinger for anonymous remailers. # @@ -19,7 +19,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # =pod --- echolot-2.1.8.orig/Echolot/Scheduler.pm +++ echolot-2.1.8/Echolot/Scheduler.pm @@ -1,7 +1,7 @@ package Echolot::Scheduler; # -# $Id: Scheduler.pm 631 2004-04-28 11:58:25Z weasel $ +# $Id: Scheduler.pm 695 2005-10-09 21:36:30Z weasel $ # # This file is part of Echolot - a Pinger for anonymous remailers. # @@ -19,7 +19,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # =pod --- echolot-2.1.8.orig/Echolot/Log.pm +++ echolot-2.1.8/Echolot/Log.pm @@ -1,7 +1,7 @@ package Echolot::Log; # -# $Id: Log.pm 631 2004-04-28 11:58:25Z weasel $ +# $Id: Log.pm 695 2005-10-09 21:36:30Z weasel $ # # This file is part of Echolot - a Pinger for anonymous remailers. # @@ -19,7 +19,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # =pod --- echolot-2.1.8.orig/Echolot/Chain.pm +++ echolot-2.1.8/Echolot/Chain.pm @@ -1,7 +1,7 @@ package Echolot::Chain; # -# $Id: Chain.pm 631 2004-04-28 11:58:25Z weasel $ +# $Id: Chain.pm 695 2005-10-09 21:36:30Z weasel $ # # This file is part of Echolot - a Pinger for anonymous remailers. # @@ -19,7 +19,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # =pod --- echolot-2.1.8.orig/Echolot/Globals.pm +++ echolot-2.1.8/Echolot/Globals.pm @@ -1,7 +1,7 @@ package Echolot::Globals; # -# $Id: Globals.pm 631 2004-04-28 11:58:25Z weasel $ +# $Id: Globals.pm 695 2005-10-09 21:36:30Z weasel $ # # This file is part of Echolot - a Pinger for anonymous remailers. # @@ -19,7 +19,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # =pod --- echolot-2.1.8.orig/Echolot/Thesaurus.pm +++ echolot-2.1.8/Echolot/Thesaurus.pm @@ -1,7 +1,7 @@ package Echolot::Thesaurus; # -# $Id: Thesaurus.pm 631 2004-04-28 11:58:25Z weasel $ +# $Id: Thesaurus.pm 695 2005-10-09 21:36:30Z weasel $ # # This file is part of Echolot - a Pinger for anonymous remailers. # @@ -19,7 +19,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # =pod --- echolot-2.1.8.orig/Echolot/Pinger.pm +++ echolot-2.1.8/Echolot/Pinger.pm @@ -1,7 +1,7 @@ package Echolot::Pinger; # -# $Id: Pinger.pm 631 2004-04-28 11:58:25Z weasel $ +# $Id: Pinger.pm 695 2005-10-09 21:36:30Z weasel $ # # This file is part of Echolot - a Pinger for anonymous remailers. # @@ -19,7 +19,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # =pod --- echolot-2.1.8.orig/Echolot/Conf.pm +++ echolot-2.1.8/Echolot/Conf.pm @@ -1,7 +1,7 @@ package Echolot::Conf; # -# $Id: Conf.pm 635 2004-05-18 00:41:05Z weasel $ +# $Id: Conf.pm 695 2005-10-09 21:36:30Z weasel $ # # This file is part of Echolot - a Pinger for anonymous remailers. # @@ -19,7 +19,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # =pod --- echolot-2.1.8.orig/Echolot/Fromlines.pm +++ echolot-2.1.8/Echolot/Fromlines.pm @@ -1,7 +1,7 @@ package Echolot::Fromlines; # -# $Id: Fromlines.pm 631 2004-04-28 11:58:25Z weasel $ +# $Id: Fromlines.pm 695 2005-10-09 21:36:30Z weasel $ # # This file is part of Echolot - a Pinger for anonymous remailers. # @@ -19,7 +19,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # =pod --- echolot-2.1.8.orig/Echolot/Stats.pm +++ echolot-2.1.8/Echolot/Stats.pm @@ -1,7 +1,7 @@ package Echolot::Stats; # -# $Id: Stats.pm 631 2004-04-28 11:58:25Z weasel $ +# $Id: Stats.pm 695 2005-10-09 21:36:30Z weasel $ # # This file is part of Echolot - a Pinger for anonymous remailers. # @@ -19,7 +19,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # =pod --- echolot-2.1.8.orig/Echolot/Tools.pm +++ echolot-2.1.8/Echolot/Tools.pm @@ -1,7 +1,7 @@ package Echolot::Tools; # -# $Id: Tools.pm 661 2004-06-27 17:44:25Z weasel $ +# $Id: Tools.pm 695 2005-10-09 21:36:30Z weasel $ # # This file is part of Echolot - a Pinger for anonymous remailers. # @@ -19,7 +19,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # =pod --- echolot-2.1.8.orig/Echolot/Commands.pm +++ echolot-2.1.8/Echolot/Commands.pm @@ -1,7 +1,7 @@ package Echolot::Commands; # -# $Id: Commands.pm 631 2004-04-28 11:58:25Z weasel $ +# $Id: Commands.pm 695 2005-10-09 21:36:30Z weasel $ # # This file is part of Echolot - a Pinger for anonymous remailers. # @@ -19,7 +19,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # =pod --- echolot-2.1.8.orig/Echolot/Pinger/Mix.pm +++ echolot-2.1.8/Echolot/Pinger/Mix.pm @@ -1,7 +1,7 @@ package Echolot::Pinger::Mix; # -# $Id: Mix.pm 649 2004-06-14 13:46:59Z weasel $ +# $Id: Mix.pm 695 2005-10-09 21:36:30Z weasel $ # # This file is part of Echolot - a Pinger for anonymous remailers. # @@ -19,7 +19,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # =pod --- echolot-2.1.8.orig/Echolot/Pinger/CPunk.pm +++ echolot-2.1.8/Echolot/Pinger/CPunk.pm @@ -1,7 +1,7 @@ package Echolot::Pinger::CPunk; # -# $Id: CPunk.pm 631 2004-04-28 11:58:25Z weasel $ +# $Id: CPunk.pm 695 2005-10-09 21:36:30Z weasel $ # # This file is part of Echolot - a Pinger for anonymous remailers. # @@ -19,7 +19,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # =pod --- echolot-2.1.8.orig/Echolot/Storage/File.pm +++ echolot-2.1.8/Echolot/Storage/File.pm @@ -1,7 +1,7 @@ package Echolot::Storage::File; # -# $Id: File.pm 647 2004-06-11 06:48:06Z weasel $ +# $Id: File.pm 695 2005-10-09 21:36:30Z weasel $ # # This file is part of Echolot - a Pinger for anonymous remailers. # @@ -19,7 +19,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # =pod --- echolot-2.1.8.orig/templates/LICENSE +++ echolot-2.1.8/templates/LICENSE @@ -1,4 +1,4 @@ -$Id: LICENSE 631 2004-04-28 11:58:25Z weasel $ +$Id: LICENSE 695 2005-10-09 21:36:30Z weasel $ The files in this directory are part of Echolot. @@ -36,4 +36,4 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA