Hi, Axel Beckert wrote: > I've prepared an NMU to fix #670681. See the git commit at > http://anonscm.debian.org/gitweb/?p=collab-maint/postgrey.git;a=commitdiff;h=0f28b7d153ea42de08054f542e81deb4c04631e6 > (I pushed it to a newly created "nmu" branch which I'll merge and > remove as soon as the package hits the archive.) [...] > I hope this NMU is ok for you, too. If so, please tell me and I'll > upload it more or less immediately. If I don't hear from you, I'll > upload it to DELAYED/2 -- probably tomorrow.
Uploaded to DELAYED/2 with the attached debdiff. (Should be the same
as the diff linked above, but included for completeness.)
Regards, Axel
--
,''`. | Axel Beckert <a...@debian.org>, http://people.debian.org/~abe/
: :' : | Debian Developer, ftp.ch.debian.org Admin
`. `' | 1024D: F067 EA27 26B9 C3FC 1486 202E C09E 1D89 9593 0EDE
`- | 4096R: 2517 B724 C5F6 CA99 5329 6E61 2FF9 CD59 6126 16B5
diff -u postgrey-1.34/debian/changelog postgrey-1.34/debian/changelog
--- postgrey-1.34/debian/changelog
+++ postgrey-1.34/debian/changelog
@@ -1,3 +1,12 @@
+postgrey (1.34-1.3) unstable; urgency=high
+
+ * Non-maintainer upload in accordance with maintainer.
+ * Fix "stop" action of init script. (Closes: #670681, #630353)
+ + Add preinst script which kills postgrey daemons neither stoppable by
+ the old nor by the new init.d script.
+
+ -- Axel Beckert <a...@debian.org> Thu, 26 Jun 2014 16:03:15 +0200
+
postgrey (1.34-1.2) unstable; urgency=high
* Non-maintainer upload.
diff -u postgrey-1.34/debian/postgrey.init postgrey-1.34/debian/postgrey.init
--- postgrey-1.34/debian/postgrey.init
+++ postgrey-1.34/debian/postgrey.init
@@ -51,7 +51,7 @@
start)
log_daemon_msg "Starting $DESC" "$NAME"
if start-stop-daemon --start --oknodo --quiet \
- --pidfile $PIDFILE --name $NAME \
+ --pidfile $PIDFILE \
--startas $DAEMON -- $POSTGREY_OPTS "$POSTGREY_TEXT_OPT"
then
log_end_msg 0
@@ -63,7 +63,7 @@
stop)
log_daemon_msg "Stopping $DESC" "$NAME"
if start-stop-daemon --stop --oknodo --quiet \
- --pidfile $PIDFILE --name $NAME
+ --pidfile $PIDFILE
then
log_end_msg 0
else
@@ -75,7 +75,7 @@
reload|force-reload)
log_action_begin_msg "Reloading $DESC configuration..."
if start-stop-daemon --stop --signal 1 --quiet \
- --pidfile $PIDFILE --name $NAME
+ --pidfile $PIDFILE
then
log_action_end_msg 0
else
only in patch2:
unchanged:
--- postgrey-1.34.orig/debian/postgrey.preinst
+++ postgrey-1.34/debian/postgrey.preinst
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# preinst script to kill postgrey daemons started by broken init.d
+# script. See https://bugs.debian.org/670681 for details.
+
+set -e
+
+if [ "$1" != "abort-upgrade" ] && dpkg --compare-versions "$2" lt-nl
"1.34-1.3~"; then
+ start-stop-daemon --stop --oknodo --user postgrey
+fi
+
+#DEBHELPER#
signature.asc
Description: Digital signature
