retitle 704227 pu: freebsd-utils/9.0+ds1-11~deb7u1
tags 704227 - unblock + wheezy pu
thanks
Hi,
> "Adam D. Barratt" <a...@adam-barratt.org.uk> writes:
>> The version needs to be lower than that in testing, so either -10+deb7u1
>> or -11~deb7u1.
I think we'll go with the latter; that should be more descriptive as it
is a trivial backport of -11 from sid/jessie.
Attached is an updated debdiff; only the version number and target
suite has changed.
On 20/05/13 12:16, Christoph Egger wrote:
> How's this going? Do you need someone to upload? Just trying to make
> sure this doesn't become last minute for no reason ;-)
We still need an ACK from the release team. If/when that happens please
upload from the wheezy branch where this has already been staged as r4468:
svn://svn.debian.org/svn/glibc-bsd/branches/wheezy/freebsd-utils
Thanks!
Regards,
--
Steven Chamberlain
ste...@pyro.eu.org
diff -Nru freebsd-utils-9.0+ds1/debian/changelog
freebsd-utils-9.0+ds1/debian/changelog
--- freebsd-utils-9.0+ds1/debian/changelog 2013-03-18 10:58:29.000000000
+0000
+++ freebsd-utils-9.0+ds1/debian/changelog 2013-05-20 16:55:32.000000000
+0100
@@ -1,3 +1,13 @@
+freebsd-utils (9.0+ds1-11~deb7u1) stable; urgency=low
+
+ * Don't use --pidfile when starting/stopping daemons that don't create one:
+ - Prevents trying to start nfsd, rpc.lockd, rpc.statd more than once
+ (Closes: #700245)
+ - Fixes a 30-second delay as each service is stopped (Closes: #700249)
+ * Stop nfsd with the correct signal USR1, since it ignores TERM
+
+ -- Steven Chamberlain <ste...@pyro.eu.org> Wed, 27 Mar 2013 13:16:03 +0000
+
freebsd-utils (9.0+ds1-10) unstable; urgency=low
* Import patch by Steven Chamberlain to make rpc.lockd start without
diff -Nru freebsd-utils-9.0+ds1/debian/freebsd-nfs-common.rpc.lockd.init
freebsd-utils-9.0+ds1/debian/freebsd-nfs-common.rpc.lockd.init
--- freebsd-utils-9.0+ds1/debian/freebsd-nfs-common.rpc.lockd.init
2013-03-18 10:32:55.000000000 +0000
+++ freebsd-utils-9.0+ds1/debian/freebsd-nfs-common.rpc.lockd.init
2013-05-20 16:50:30.000000000 +0100
@@ -38,9 +38,9 @@
# 0 if daemon has been started
# 1 if daemon was already running
# 2 if daemon could not be started
- start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON
--test > /dev/null \
+ start-stop-daemon --start --quiet --exec $DAEMON --test > /dev/null \
|| return 1
- start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
+ start-stop-daemon --start --quiet --exec $DAEMON -- \
$DAEMON_ARGS \
|| return 2
# Add code here, if necessary, that waits for the process to be ready
@@ -58,7 +58,7 @@
# 1 if daemon was already stopped
# 2 if daemon could not be stopped
# other if a failure occurred
- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile
$PIDFILE --name $NAME
+ start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --name $NAME
RETVAL="$?"
[ "$RETVAL" = 2 ] && return 2
# Wait for children to finish too if this is a daemon that forks
diff -Nru freebsd-utils-9.0+ds1/debian/freebsd-nfs-common.rpc.statd.init
freebsd-utils-9.0+ds1/debian/freebsd-nfs-common.rpc.statd.init
--- freebsd-utils-9.0+ds1/debian/freebsd-nfs-common.rpc.statd.init
2013-03-18 10:32:55.000000000 +0000
+++ freebsd-utils-9.0+ds1/debian/freebsd-nfs-common.rpc.statd.init
2013-05-20 16:50:30.000000000 +0100
@@ -40,9 +40,9 @@
# 0 if daemon has been started
# 1 if daemon was already running
# 2 if daemon could not be started
- start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON
--test > /dev/null \
+ start-stop-daemon --start --quiet --exec $DAEMON --test > /dev/null \
|| return 1
- start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
+ start-stop-daemon --start --quiet --exec $DAEMON -- \
$DAEMON_ARGS \
|| return 2
# Add code here, if necessary, that waits for the process to be ready
@@ -60,7 +60,7 @@
# 1 if daemon was already stopped
# 2 if daemon could not be stopped
# other if a failure occurred
- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile
$PIDFILE --name $NAME
+ start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --name $NAME
RETVAL="$?"
[ "$RETVAL" = 2 ] && return 2
# Wait for children to finish too if this is a daemon that forks
diff -Nru freebsd-utils-9.0+ds1/debian/freebsd-nfs-server.nfsd.init
freebsd-utils-9.0+ds1/debian/freebsd-nfs-server.nfsd.init
--- freebsd-utils-9.0+ds1/debian/freebsd-nfs-server.nfsd.init 2013-03-18
10:32:55.000000000 +0000
+++ freebsd-utils-9.0+ds1/debian/freebsd-nfs-server.nfsd.init 2013-05-20
16:50:30.000000000 +0100
@@ -44,9 +44,9 @@
# 0 if daemon has been started
# 1 if daemon was already running
# 2 if daemon could not be started
- start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON
--test > /dev/null \
+ start-stop-daemon --start --quiet --exec $DAEMON --test > /dev/null \
|| return 1
- start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
+ start-stop-daemon --start --quiet --exec $DAEMON -- \
$DAEMON_ARGS \
|| return 2
# Add code here, if necessary, that waits for the process to be ready
@@ -64,7 +64,7 @@
# 1 if daemon was already stopped
# 2 if daemon could not be stopped
# other if a failure occurred
- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile
$PIDFILE --name $NAME
+ start-stop-daemon --stop --quiet --retry=USR1/30/KILL/5 --name $NAME
RETVAL="$?"
[ "$RETVAL" = 2 ] && return 2
# Wait for children to finish too if this is a daemon that forks
