Your message dated Fri, 27 Oct 2006 07:02:12 -0700
with message-id <[EMAIL PROTECTED]>
and subject line Bug#385877: fixed in rsync 2.6.9~pre3-1
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--- Begin Message ---
Package: rsync
Version: 2.6.8-2
Severity: minor
Tags: patch
Hi,
the attached patch changes the rsync init.d script(s) to use lsb
logging functions.
Regards,
David
--
David Härdeman
diff -ur ./rsync-2.6.8.orig/debian/control ./rsync-2.6.8/debian/control
--- ./rsync-2.6.8.orig/debian/control 2006-09-03 18:12:58.000000000 +0200
+++ ./rsync-2.6.8/debian/control 2006-09-03 18:21:16.000000000 +0200
@@ -7,7 +7,7 @@
Package: rsync
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, lsb-base (>= 3.0-10)
Suggests: openssh-client, openssh-server
Description: fast remote file copy program (like rcp)
rsync is a program that allows files to be copied to and from remote
diff -ur ./rsync-2.6.8.orig/debian/init.d ./rsync-2.6.8/debian/init.d
--- ./rsync-2.6.8.orig/debian/init.d 2006-09-03 18:12:58.000000000 +0200
+++ ./rsync-2.6.8/debian/init.d 2006-09-03 18:20:31.000000000 +0200
@@ -11,6 +11,7 @@
RSYNC_NICE_PARM=''
test -x $DAEMON || exit 0
+. /lib/lsb/init-functions
if [ -s $RSYNC_DEFAULTS_FILE ]; then
. $RSYNC_DEFAULTS_FILE
@@ -18,8 +19,7 @@
xtrue|xfalse) ;;
xinetd) exit 0
;;
- *) echo "Value of RSYNC_ENABLE in $RSYNC_DEFAULTS_FILE
must be either 'true' or 'false';"
- echo "not starting rsync daemon."
+ *) log_warning_msg "Value of RSYNC_ENABLE in
$RSYNC_DEFAULTS_FILE must be either 'true' or 'false'; not starting rsync
daemon."
exit 1
;;
esac
@@ -27,8 +27,7 @@
x[0-9]) RSYNC_NICE_PARM="--nicelevel $RSYNC_NICE";;
x[1-9][0-9]) RSYNC_NICE_PARM="--nicelevel $RSYNC_NICE";;
x) ;;
- *) echo "Value of RSYNC_NICE in $RSYNC_DEFAULTS_FILE must
be a value"
- echo "between 0 and 19 (inclusive); ignoring
RSYNC_NICE now."
+ *) log_warning_msg "Value of RSYNC_NICE in
$RSYNC_DEFAULTS_FILE must be a value between 0 and 19 (inclusive); ignoring
RSYNC_NICE now."
;;
esac
fi
@@ -38,42 +37,40 @@
case "$1" in
start)
if "$RSYNC_ENABLE"; then
- echo -n "Starting rsync daemon: rsync"
+ log_daemon_msg "Starting rsync daemon" "rsync"
if [ -s /var/run/rsync.pid ] && kill -0 $(cat /var/run/rsync.pid)
>/dev/null 2>&1; then
- echo " apparently already running."
- exit 0
+ log_progress_msg "apparently already running"
+ log_end_msg 0
fi
if [ ! -s "$RSYNC_CONFIG_FILE" ]; then
- echo " missing or empty config file $RSYNC_CONFIG_FILE"
- exit 1
+ log_progress_msg "missing or empty config file
$RSYNC_CONFIG_FILE"
+ log_end_msg 1
fi
start-stop-daemon --start --quiet --background \
--pidfile /var/run/rsync.pid --make-pidfile \
$RSYNC_NICE_PARM --exec /usr/bin/rsync \
-- --no-detach --daemon --config "$RSYNC_CONFIG_FILE"
$RSYNC_OPTS
- echo "."
+ log_end_msg 0
else
if [ -s "$RSYNC_CONFIG_FILE" ]; then
- echo "rsync daemon not enabled in /etc/default/rsync"
+ [ "$VERBOSE" != "no" ] && log_warning_msg "rsync daemon not
enabled in /etc/default/rsync"
fi
fi
;;
stop)
- echo -n "Stopping rsync daemon: rsync"
+ log_daemon_msg "Stopping rsync daemon" "rsync"
start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/rsync.pid
rm -f /var/run/rsync.pid
- echo "."
+ log_end_msg 0
;;
reload|force-reload)
- echo "Reloading rsync daemon: not needed, as the daemon"
- echo "re-reads the config file whenever a client connects."
;;
restart)
set +e
if $RSYNC_ENABLE; then
- echo -n "Restarting rsync daemon: rsync"
+ log_daemon_msg "Restarting rsync daemon" "rsync"
if [ -s /var/run/rsync.pid ] && kill -0 $(cat /var/run/rsync.pid)
>/dev/null 2>&1; then
start-stop-daemon --stop --quiet --oknodo --pidfile
/var/run/rsync.pid || true
sleep 1
@@ -85,12 +82,12 @@
$RSYNC_NICE_PARM --exec /usr/bin/rsync \
-- --no-detach --daemon --config "$RSYNC_CONFIG_FILE"
$RSYNC_OPTS
then
- echo "start failed?"
+ log_end_msg 1
rm -f /var/run/rsync.pid
fi
- echo "."
+ log_end_msg 0
else
- echo "rsync daemon not enabled in /etc/default/rsync"
+ [ "$VERBOSE" != "no" ] && log_warning_msg "rsync daemon not enabled
in /etc/default/rsync"
fi
;;
--- End Message ---
--- Begin Message ---
Source: rsync
Source-Version: 2.6.9~pre3-1
We believe that the bug you reported is fixed in the latest version of
rsync, which is due to be installed in the Debian FTP archive:
rsync_2.6.9~pre3-1.diff.gz
to pool/main/r/rsync/rsync_2.6.9~pre3-1.diff.gz
rsync_2.6.9~pre3-1.dsc
to pool/main/r/rsync/rsync_2.6.9~pre3-1.dsc
rsync_2.6.9~pre3-1_amd64.deb
to pool/main/r/rsync/rsync_2.6.9~pre3-1_amd64.deb
rsync_2.6.9~pre3.orig.tar.gz
to pool/main/r/rsync/rsync_2.6.9~pre3.orig.tar.gz
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Paul Slootman <[EMAIL PROTECTED]> (supplier of updated rsync package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Fri, 27 Oct 2006 12:27:45 +0200
Source: rsync
Binary: rsync
Architecture: source amd64
Version: 2.6.9~pre3-1
Distribution: experimental
Urgency: low
Maintainer: Paul Slootman <[EMAIL PROTECTED]>
Changed-By: Paul Slootman <[EMAIL PROTECTED]>
Description:
rsync - fast remote file copy program (like rcp)
Closes: 375985 385877
Changes:
rsync (2.6.9~pre3-1) experimental; urgency=low
.
* 2.6.9-pre3
* Applied a mix of the patches from Martin Pitt and David Härdeman for
LSBfying init script.
closes:#375985,#385877
* Updated policy version from 3.6.2 to 3.7.2; no changes needed
* Applied ACL patch. Please test :-)
Files:
ea0be0fba8b496c30918617b2683bfbe 571 net optional rsync_2.6.9~pre3-1.dsc
bbabe676fd7b48b492a4867102e24fdd 798035 net optional
rsync_2.6.9~pre3.orig.tar.gz
96a173351cab2936fa1fa40386e1df10 34881 net optional rsync_2.6.9~pre3-1.diff.gz
dff83a36201ca625585c0018723046eb 273198 net optional
rsync_2.6.9~pre3-1_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
iD8DBQFFQgx5utvvqbTW3hMRAs2TAKCNzD4nV8CxbSDCRkXmqPUcT1aNUACggiEH
nfokNMlcILMWad3D6X8hKdI=
=2s/d
-----END PGP SIGNATURE-----
--- End Message ---
