Version in base suite: 6.3.9~rc2-4+lenny1 Version in overlay suite: (not present) Base version: fetchmail_6.3.9~rc2-4+lenny1 Target version: fetchmail_6.3.9~rc2-4+lenny2 Base file: /org/ftp.debian.org/ftp/pool/main/f/fetchmail/fetchmail_6.3.9~rc2-4+lenny1.dsc Target file: /org/ftp.debian.org/queue/p-u-new/fetchmail_6.3.9~rc2-4+lenny2.dsc changelog | 9 +++++++++ init | 24 ++++++++++++++---------- 2 files changed, 23 insertions(+), 10 deletions(-) diff -u fetchmail-6.3.9~rc2/debian/init fetchmail-6.3.9~rc2/debian/init --- fetchmail-6.3.9~rc2/debian/init +++ fetchmail-6.3.9~rc2/debian/init @@ -5,7 +5,7 @@ # ### BEGIN INIT INFO # Provides: fetchmail -# Required-Start: $network $local_fs $remote_fs +# Required-Start: $network $local_fs $remote_fs $syslog # Required-Stop: # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 @@ -30,13 +30,13 @@ CONFFILE="/etc/fetchmailrc" PIDFILE="/var/run/fetchmail/fetchmail.pid" UIDL="/var/lib/fetchmail/.fetchmail-UIDL-cache" +START_DAEMON="no" -if [ ! -e $CONFFILE ]; then - exit 0 -fi +. /lib/lsb/init-functions -test -f /etc/default/fetchmail || exit 0 -. /etc/default/fetchmail +if [ -r /etc/default/fetchmail ]; then + . /etc/default/fetchmail +fi OPTIONS="$OPTIONS -f $CONFFILE --pidfile $PIDFILE" @@ -45,14 +45,18 @@ exit 0 fi -test -f $DAEMON || exit 0 +if [ ! -e $CONFFILE ]; then + log_failure_msg "$CONFFILE not found." + log_failure_msg "can not start fetchmail daemon... consider disabling the script" + exit 0 +fi -. /lib/lsb/init-functions + +test -f $DAEMON || exit 0 if [ "$1" = "start" ]; then if [ ! -r $CONFFILE ] ; then - log_failure_msg "$CONFFILE not found." - log_failure_msg "can not start fetchmail daemon... consider disabling the script" + log_failure_msg "$CONFFILE found but not readable." exit 0 fi fi diff -u fetchmail-6.3.9~rc2/debian/changelog fetchmail-6.3.9~rc2/debian/changelog --- fetchmail-6.3.9~rc2/debian/changelog +++ fetchmail-6.3.9~rc2/debian/changelog @@ -1,3 +1,12 @@ +fetchmail (6.3.9~rc2-4+lenny2) stable; urgency=low + + * Do not complain about missing config file when daemon shouldn't + start at all (Closes: #540533). + * Depend on $syslog in init script (Closes: #541394). + * Fix some inconsistencies in init script. + + -- Nico Golde Mon, 31 Aug 2009 18:53:14 +0000 + fetchmail (6.3.9~rc2-4+lenny1) stable-security; urgency=high * Non-maintainer upload by the Security Team.