diff -Nru bro-2.2/debian/bro.init bro-2.2/debian/bro.init --- bro-2.2/debian/bro.init 2014-02-11 14:34:22.000000000 +0000 +++ bro-2.2/debian/bro.init 2014-05-14 13:55:39.000000000 +0000 @@ -70,17 +70,9 @@ # 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 + $CONTROL stop RETVAL="$?" [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON - [ "$?" = 2 ] && return 2 # Many daemons don't delete their pidfiles when they exit. rm -f $PIDFILE return "$RETVAL" @@ -160,8 +152,7 @@ esac ;; *) - #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 + echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 exit 3 ;; esac diff -Nru bro-2.2/debian/changelog bro-2.2/debian/changelog --- bro-2.2/debian/changelog 2014-02-11 14:35:29.000000000 +0000 +++ bro-2.2/debian/changelog 2014-05-14 14:10:51.000000000 +0000 @@ -1,3 +1,9 @@ +bro (2.2-hl4~precise) precise; urgency=medium + + * Fixed init script to run broctl stop in the do_stop function to avoid a crash. + + -- Brian T Glenn Wed, 14 May 2014 10:10:42 -0400 + bro (2.2-hl3~precise) precise; urgency=low * Fixed init script to run broctl install if broctl-config.sh file is missing.