Bug#690566: unblock: echolot/2.1.8-8
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: freeze-exception
Please unblock package echolot
unblock echolot/2.1.8-8
Version 2.1.8-7 fixes RC #689889 - service fails to start when
/var/run is a tmpfs, because it relies on /var/run/echolot to exist.
This directory is shipped with the package.
The fix is to create the directory in the init script, no longer do
the permissions stuff in postinst (but instead clean up old
statoverrides in postinst now).
The upload also adds a bunch of minor documentation fixes that have
been pending for years.
Attached is a (manually trimmed) diff between the version in
stable/testing and 2.1.8-8.
Cheers,
weasel
diff -u echolot-2.1.8/debian/changelog echolot-2.1.8/debian/changelog
--- echolot-2.1.8/debian/changelog
+++ echolot-2.1.8/debian/changelog
@@ -1,3 +1,24 @@
+echolot (2.1.8-8) unstable; urgency=low
+
+ * Really fix the markup typo in the pingd manpage.
+
+ -- Peter Palfrader <weasel@debian.org> 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 <weasel@debian.org> 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
diff -u echolot-2.1.8/debian/echolot.init echolot-2.1.8/debian/echolot.init
--- echolot-2.1.8/debian/echolot.init
+++ echolot-2.1.8/debian/echolot.init
@@ -25,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
@@ -41,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
diff -u echolot-2.1.8/debian/echolot.postinst echolot-2.1.8/debian/echolot.postinst
--- echolot-2.1.8/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 \
@@ -30,10 +35,6 @@
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#
diff -u echolot-2.1.8/debian/echolot.postrm echolot-2.1.8/debian/echolot.postrm
--- echolot-2.1.8/debian/echolot.postrm
+++ echolot-2.1.8/debian/echolot.postrm
@@ -6,6 +6,7 @@
purge)
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
only in patch2:
unchanged:
--- 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
diff -u echolot-2.1.8/tools/create-distribution echolot-2.1.8/tools/create-distribution
--- echolot-2.1.8/tools/create-distribution
+++ echolot-2.1.8/tools/create-distribution
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: create-distribution 695 2005-10-09 21:36:30Z weasel $
+# $Id: create-distribution 724 2012-10-15 14:34:30Z weasel $
#
# This file is part of Echolot - a Pinger for anonymous remailers.
#
@@ -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 ..
diff -u echolot-2.1.8/doc/pingd.conf.pod echolot-2.1.8/doc/pingd.conf.pod
--- echolot-2.1.8/doc/pingd.conf.pod
+++ echolot-2.1.8/doc/pingd.conf.pod
@@ -1,5 +1,5 @@
#
-# $Id: pingd.conf.pod 695 2005-10-09 21:36:30Z weasel $
+# $Id: pingd.conf.pod 726 2012-10-15 15:00:19Z weasel $
#
# This file is part of Echolot - a Pinger for anonymous remailers.
#
@@ -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<combined_list> [bool]
@@ -906,5 +906,5 @@
=head1 BUGS
-Please report them at E<lt>URL:http://alioth.debian.org/projects/echolot/<gt>
+Please report them at E<lt>URL:http://alioth.debian.org/projects/echolot/E<gt>
=cut
echolot-2.1.8/doc/pingd.1 | 54 ++--
echolot-2.1.8/doc/pingd.conf.5 | 365 +++++++++++++++-----------------
[ pod noise cut.]
diff -u echolot-2.1.8/pingd echolot-2.1.8/pingd
--- echolot-2.1.8/pingd
+++ echolot-2.1.8/pingd
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w
#
-# $Id: pingd 695 2005-10-09 21:36:30Z weasel $
+# $Id: pingd 715 2008-05-20 20:19:13Z weasel $
#
# This file is part of Echolot - a Pinger for anonymous remailers.
#
@@ -321,7 +321,7 @@
=head1 BUGS
-Please report them at E<lt>URL:http://alioth.debian.org/projects/echolot/<gt>
+Please report them at E<lt>URL:http://alioth.debian.org/projects/echolot/E<gt>
=cut
diff -u echolot-2.1.8/NEWS echolot-2.1.8/NEWS
--- echolot-2.1.8/NEWS
+++ echolot-2.1.8/NEWS
@@ -1,6 +1,10 @@
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
only in patch2:
unchanged:
--- 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
-<remops@freedom.gmsociety.org>, the alt.privacy.anon-server Usenet newsgroup
-and sending a mail to pingers@palfrader.org would be apprechiated.
+<remops@lists.mixmin.net>, 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 <weasel@debian.org>, Sun, 14 Nov 2004 23:31:24 +0100
Reply to: