Partial rewrite of the init script by Jaco Kroon addresses shortcomings identified by Vincent Brillault in bug #445176. Upstream fixes include an astcanary PID mix-up and a necessary reset of the RTP sequence counter when SSRC changes.

(Portage version: 2.1.11.49/cvs/Linux x86_64, signed Manifest commit with key 0xB5058F9A)

3 files changed, 37 insertions, 559 deletions

diff --git a/net-misc/asterisk/files/1.8.0/asterisk.initd b/net-misc/asterisk/files/1.8.0/asterisk.initd
deleted file mode 100644
index 627fa88d3f92..000000000000
--- a/net-misc/asterisk/files/1.8.0/asterisk.initd
+++ /dev/null
@@ -1,273 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/1.8.0/asterisk.initd,v 1.1 2011/09/01 14:09:56 chainsaw Exp $
-
-opts="${opts} forcestop reload"
-
-depend() {
-	need net
-	use nscd dns dahdi mysql postgresql slapd capi
-}
-
-is_running() {
-	if [ -z "`pidof asterisk`" ]; then
-		return 1
-	else
-		PID="`cat /var/run/asterisk/asterisk.pid`"
-		for x in `pidof asterisk`; do
-			if [ "${x}" = "${PID}" ]; then
-				return 0
-			fi	
-		done
-	fi
-
-	return 1
-}
-
-asterisk_run_loop() {
-	local result=0 signal=0
-
-	echo "Initializing asterisk wrapper"
-	OPTS="$*"
-
-	trap "rm /var/run/asterisk/wrapper_loop.pid" EXIT
-	cut -f4 -d' ' < /proc/self/stat > /var/run/asterisk/wrapper_loop.pid
-
-	while :; do
-		if [ -n "${TTY}" ]; then
-			/usr/bin/stty -F ${TTY} sane
-			${NICE} /usr/sbin/asterisk ${OPTS} >${TTY} 2>&1 <${TTY}
-			result=$?
-		else
-			set -o pipefail
-			${NICE} /usr/sbin/asterisk ${OPTS} 2>&1 >/dev/null
-			result=$?
-			set +o pipefail
-		fi		
-
-		if [ $result -eq 0 ]; then
-			echo "Asterisk terminated normally"
-			break
-		else
-			if [ $result -gt 128 ]; then
-				signal=`expr $result - 128`
-				MSG="Asterisk terminated with Signal: $signal"
-
-				CORE_TARGET="core-`date +%Y%m%d-%H%M%S`"
-
-				local CORE_DUMPED=0
-				if [ -f "${ASTERISK_CORE_DIR}/core" ]; then
-					mv "${ASTERISK_CORE_DIR}/core" \
-					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-					CORE_DUMPED=1
-
-				elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then
-					mv "${ASTERISK_CORE_DIR}/core.${PID}" \
-					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-					CORE_DUMPED=1
-
-				fi
-
-				[ $CORE_DUMPED -eq 1 ] && \
-					MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-			else
-				MSG="Asterisk terminated with return code: $result"
-			fi
-
-			# kill left-over tasks
-			for X in ${ASTERISK_CLEANUP_ON_CRASH}; do
-				kill -9 `pidof ${X}`;
-			done
-		fi
-
-		[ -n "${TTY}" ] \
-			&& echo "${MSG}" >${TTY} \
-			|| echo "${MSG}"
-
-
-		if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \
-		   [ -x /usr/sbin/sendmail ]; then
-			echo -e -n "Subject: Asterisk crashed\n\r${MSG}\n\r" |\
-				 /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}"
-		fi
-		sleep "${ASTERISK_RESTART_DELAY}"
-		echo "Restarting Asterisk..."
-	done
-	return 0
-}
-
-start() {
-	local OPTS USER GROUP PID NICE=""
-	local tmp x
-
-	local OPTS ARGS 
-		
-	ebegin "Starting asterisk PBX"
-
-	eindent
-
-	# filter (redundant) arguments
-	OPTS=`echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g"`
-
-	# default options
-	OPTS="${OPTS} -f"  # don't fork / detach breaks wrapper script...
-
-	# mangle yes/no options
-	ASTERISK_CONSOLE="`echo ${ASTERISK_CONSOLE} | tr '[:lower:]' '[:upper:]'`"
-
-	ASTERISK_RESTART_DELAY="`echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/'`"
-	[ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5
-
-	if [ -n "${ASTERISK_CORE_SIZE}" ] &&
-	   [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
-		ulimit -c ${ASTERISK_CORE_SIZE}
-
-		if [ -n "${ASTERISK_CORE_DIR}" ] && \
-		   [ ! -d "${ASTERISK_CORE_DIR}" ]
-		then
-			mkdir -m750 -p "${ASTERISK_CORE_DIR}"
-
-			if [ -n "${ASTERISK_USER}" ]; then
-				chown -R "${ASTERISK_USER}" "${ASTERISK_CORE_DIR}"
-			fi
-		fi
-		ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
-
-		cd "${ASTERISK_CORE_DIR}"
-		einfo "Core dump size            : ${ASTERISK_CORE_SIZE}"
-		einfo "Core dump location        : ${ASTERISK_CORE_DIR}"
-
-		OPTS="${OPTS} -g"
-	fi
-
-	if [ -n "${ASTERISK_MAX_FD}" ]; then
-		ulimit -n ${ASTERISK_MAX_FD}
-		einfo "Max open filedescriptors  : ${ASTERISK_MAX_FD}"
-	fi
-
-	if [ -n "${ASTERISK_NICE}" ]; then
-		if [ ${ASTERISK_NICE} -ge -20 ] && \
-		   [ ${ASTERISK_NICE} -le  19 ]; then 
-			einfo "Nice level                : ${ASTERISK_NICE}"
-			NICE="nice -n ${ASTERISK_NICE} --"
-		else
-			eerror "Nice value must be between -20 and 19"
-			return 1
-		fi
-	fi
-
-	if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
-		if [ -x /usr/sbin/sendmail ]; then
-			einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
-		else
-			ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
-			unset ASTERISK_NOTIFY_EMAIL
-		fi
-	fi
-
-	if [ -n "${ASTERISK_TTY}" ]; then
-		for x in ${ASTERISK_TTY} \
-			 /dev/tty${ASTERISK_TTY} \
-			 /dev/vc/${ASTERISK_TTY}
-		do
-			if [ -c "${x}" ]; then
-				TTY="${x}"
-			fi
-		done
-		[ -n "${TTY}" ] && \
-			einfo "Messages are sent to      : ${TTY}"
-	fi
-
-	if [ "${ASTERISK_CONSOLE}" = "YES" ] && [ -n "${TTY}" ]; then
-		einfo "Starting Asterisk console : ${ASTERISK_CONSOLE}"
-		OPTS="${OPTS} -c"
-	fi
-
-	if [ -n "${ASTERISK_USER}" ]; then
-		USER=`echo $ASTERISK_USER | sed 's/:.*//'`
-		GROUP=`echo $ASTERISK_USER | awk -F: '/.*:.*/ { print $2 }'`
-		if [ -n "${USER}" ]; then
-			OPTS="${OPTS} -U ${USER}"
-		fi
-		if [ -n "${GROUP}" ]; then
-			OPTS="${OPTS} -G ${GROUP}"
-			GROUP=":${GROUP}"	# make it look nice...
-		fi
-		for element in `find /var/{log,run}/asterisk`; do
-			if [ `stat -c %U $element` != "${USER}" ]; then
- 				ewarn "${USER} is not the owner of $element, fixing."
-				chown -R ${USER} /var/{log,run}/asterisk
-				chmod -R u+r /var/{log,run}/asterisk
-				chmod u+x /var/{log,run}/asterisk
-			fi;
-		done;
-		einfo "Starting asterisk as      : ${USER}${GROUP}"
-	else
-		ewarn "Starting asterisk as root is not recommended."
-	fi
-
-	asterisk_run_loop ${OPTS} 2>&1 | logger -t asterisk_wrapper &
-	result=$?
-
-	if [ $result -eq 0 ]; then
-		# 2 seconds should be enough for asterisk to start
-		sleep 2 
-		is_running
-		result=$?
-	fi
-
-	eoutdent
-	eend $result
-}
-
-forcestop() {
-	ebegin "Stopping asterisk PBX"
-	start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid
-	eend $?
-}
-
-stop() {
-	if ! is_running; then
-		eerror "Asterisk is not running!"
-		return 0
-	fi
-
-	if [ -r /var/run/asterisk/wrapper_loop.pid ]; then
-		ebegin "Killing wrapper script"
-		kill `cat /var/run/asterisk/wrapper_loop.pid`
-		eend $?
-	fi
-
-	ebegin "Stopping asterisk PBX gracefully"
-	/usr/sbin/asterisk -r -x "core stop gracefully" &>/dev/null
-	# Now we have to wait until asterisk has _really_ stopped.
-	sleep 1
-	if is_running; then
-		einfon "Waiting for asterisk to shutdown ."
-		local cnt=0
-		while is_running; do
-			cnt=`expr $cnt + 1`
-			if [ $cnt -gt 60 ] ; then
-				# Waited 120 seconds now. Fail.
-				echo
-				eend 1 "Failed."
-				return
-			fi
-			sleep 2
-			echo -n "."
-		done
-		echo
-	fi
-	eend 0
-}
-
-reload() {
-	if is_running; then
-		ebegin "Forcing asterisk to reload configuration"
-		/usr/sbin/asterisk -r -x "module reload" &>/dev/null
-		eend $?
-	else
-		eerror "Asterisk is not running!"
-	fi
-}
diff --git a/net-misc/asterisk/files/1.8.0/asterisk.initd3 b/net-misc/asterisk/files/1.8.0/asterisk.initd3
deleted file mode 100644
index b1b31b4a5408..000000000000
--- a/net-misc/asterisk/files/1.8.0/asterisk.initd3
+++ /dev/null
@@ -1,271 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/1.8.0/asterisk.initd3,v 1.1 2012/09/03 08:37:12 chainsaw Exp $
-
-extra_started_commands="forcestop reload"
-
-depend() {
-	need net
-	use nscd dns dahdi mysql postgresql slapd capi
-}
-
-is_running() {
-	if [ -z "`pidof asterisk`" ]; then
-		return 1
-	else
-		PID="`cat /var/run/asterisk/asterisk.pid`"
-		for x in `pidof asterisk`; do
-			if [ "${x}" = "${PID}" ]; then
-				return 0
-			fi	
-		done
-	fi
-
-	return 1
-}
-
-asterisk_run_loop() {
-	local result=0 signal=0
-
-	echo "Initializing asterisk wrapper"
-	OPTS="$*"
-
-	trap "rm /var/run/asterisk/wrapper_loop.pid" EXIT
-	cut -f4 -d' ' < /proc/self/stat > /var/run/asterisk/wrapper_loop.pid
-
-	while :; do
-		if [ -n "${TTY}" ]; then
-			/usr/bin/stty -F ${TTY} sane
-			${NICE} /usr/sbin/asterisk ${OPTS} >${TTY} 2>&1 <${TTY}
-			result=$?
-		else
-			${NICE} /usr/sbin/asterisk ${OPTS} 2>&1 >/dev/null
-			result=$?
-		fi		
-
-		if [ $result -eq 0 ]; then
-			echo "Asterisk terminated normally"
-			break
-		else
-			if [ $result -gt 128 ]; then
-				signal=`expr $result - 128`
-				MSG="Asterisk terminated with Signal: $signal"
-
-				CORE_TARGET="core-`date +%Y%m%d-%H%M%S`"
-
-				local CORE_DUMPED=0
-				if [ -f "${ASTERISK_CORE_DIR}/core" ]; then
-					mv "${ASTERISK_CORE_DIR}/core" \
-					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-					CORE_DUMPED=1
-
-				elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then
-					mv "${ASTERISK_CORE_DIR}/core.${PID}" \
-					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-					CORE_DUMPED=1
-
-				fi
-
-				[ $CORE_DUMPED -eq 1 ] && \
-					MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-			else
-				MSG="Asterisk terminated with return code: $result"
-			fi
-
-			# kill left-over tasks
-			for X in ${ASTERISK_CLEANUP_ON_CRASH}; do
-				kill -9 `pidof ${X}`;
-			done
-		fi
-
-		[ -n "${TTY}" ] \
-			&& echo "${MSG}" >${TTY} \
-			|| echo "${MSG}"
-
-
-		if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \
-		   [ -x /usr/sbin/sendmail ]; then
-			echo -e -n "Subject: Asterisk crashed\n\r${MSG}\n\r" |\
-				 /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}"
-		fi
-		sleep "${ASTERISK_RESTART_DELAY}"
-		echo "Restarting Asterisk..."
-	done
-	return 0
-}
-
-start() {
-	local OPTS USER GROUP PID NICE=""
-	local tmp x
-
-	local OPTS ARGS 
-		
-	ebegin "Starting asterisk PBX"
-
-	eindent
-
-	# filter (redundant) arguments
-	OPTS=`echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g"`
-
-	# default options
-	OPTS="${OPTS} -f"  # don't fork / detach breaks wrapper script...
-
-	# mangle yes/no options
-	ASTERISK_CONSOLE="`echo ${ASTERISK_CONSOLE} | tr '[:lower:]' '[:upper:]'`"
-
-	ASTERISK_RESTART_DELAY="`echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/'`"
-	[ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5
-
-	if [ -n "${ASTERISK_CORE_SIZE}" ] &&
-	   [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
-		ulimit -c ${ASTERISK_CORE_SIZE}
-
-		if [ -n "${ASTERISK_CORE_DIR}" ] && \
-		   [ ! -d "${ASTERISK_CORE_DIR}" ]
-		then
-			mkdir -m750 -p "${ASTERISK_CORE_DIR}"
-
-			if [ -n "${ASTERISK_USER}" ]; then
-				chown -R "${ASTERISK_USER}" "${ASTERISK_CORE_DIR}"
-			fi
-		fi
-		ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
-
-		cd "${ASTERISK_CORE_DIR}"
-		einfo "Core dump size            : ${ASTERISK_CORE_SIZE}"
-		einfo "Core dump location        : ${ASTERISK_CORE_DIR}"
-
-		OPTS="${OPTS} -g"
-	fi
-
-	if [ -n "${ASTERISK_MAX_FD}" ]; then
-		ulimit -n ${ASTERISK_MAX_FD}
-		einfo "Max open filedescriptors  : ${ASTERISK_MAX_FD}"
-	fi
-
-	if [ -n "${ASTERISK_NICE}" ]; then
-		if [ ${ASTERISK_NICE} -ge -20 ] && \
-		   [ ${ASTERISK_NICE} -le  19 ]; then 
-			einfo "Nice level                : ${ASTERISK_NICE}"
-			NICE="nice -n ${ASTERISK_NICE} --"
-		else
-			eerror "Nice value must be between -20 and 19"
-			return 1
-		fi
-	fi
-
-	if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
-		if [ -x /usr/sbin/sendmail ]; then
-			einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
-		else
-			ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
-			unset ASTERISK_NOTIFY_EMAIL
-		fi
-	fi
-
-	if [ -n "${ASTERISK_TTY}" ]; then
-		for x in ${ASTERISK_TTY} \
-			 /dev/tty${ASTERISK_TTY} \
-			 /dev/vc/${ASTERISK_TTY}
-		do
-			if [ -c "${x}" ]; then
-				TTY="${x}"
-			fi
-		done
-		[ -n "${TTY}" ] && \
-			einfo "Messages are sent to      : ${TTY}"
-	fi
-
-	if [ "${ASTERISK_CONSOLE}" = "YES" ] && [ -n "${TTY}" ]; then
-		einfo "Starting Asterisk console : ${ASTERISK_CONSOLE}"
-		OPTS="${OPTS} -c"
-	fi
-
-	if [ -n "${ASTERISK_USER}" ]; then
-		USER=`echo $ASTERISK_USER | sed 's/:.*//'`
-		GROUP=`echo $ASTERISK_USER | awk -F: '/.*:.*/ { print $2 }'`
-		if [ -n "${USER}" ]; then
-			OPTS="${OPTS} -U ${USER}"
-		fi
-		if [ -n "${GROUP}" ]; then
-			OPTS="${OPTS} -G ${GROUP}"
-			GROUP=":${GROUP}"	# make it look nice...
-		fi
-		for element in `find /var/{log,run}/asterisk`; do
-			if [ `stat -c %U $element` != "${USER}" ]; then
- 				ewarn "${USER} is not the owner of $element, fixing."
-				chown -R ${USER} /var/{log,run}/asterisk
-				chmod -R u+r /var/{log,run}/asterisk
-				chmod u+x /var/{log,run}/asterisk
-			fi;
-		done;
-		einfo "Starting asterisk as      : ${USER}${GROUP}"
-	else
-		ewarn "Starting asterisk as root is not recommended."
-	fi
-
-	asterisk_run_loop ${OPTS} 2>&1 | logger -t asterisk_wrapper &
-	result=$?
-
-	if [ $result -eq 0 ]; then
-		# 2 seconds should be enough for asterisk to start
-		sleep 2 
-		is_running
-		result=$?
-	fi
-
-	eoutdent
-	eend $result
-}
-
-forcestop() {
-	ebegin "Stopping asterisk PBX"
-	start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid
-	eend $?
-}
-
-stop() {
-	if ! is_running; then
-		eerror "Asterisk is not running!"
-		return 0
-	fi
-
-	if [ -r /var/run/asterisk/wrapper_loop.pid ]; then
-		ebegin "Killing wrapper script"
-		kill `cat /var/run/asterisk/wrapper_loop.pid`
-		eend $?
-	fi
-
-	ebegin "Stopping asterisk PBX gracefully"
-	/usr/sbin/asterisk -r -x "core stop gracefully" &>/dev/null
-	# Now we have to wait until asterisk has _really_ stopped.
-	sleep 1
-	if is_running; then
-		einfon "Waiting for asterisk to shutdown ."
-		local cnt=0
-		while is_running; do
-			cnt=`expr $cnt + 1`
-			if [ $cnt -gt 60 ] ; then
-				# Waited 120 seconds now. Fail.
-				echo
-				eend 1 "Failed."
-				return
-			fi
-			sleep 2
-			echo -n "."
-		done
-		echo
-	fi
-	eend 0
-}
-
-reload() {
-	if is_running; then
-		ebegin "Forcing asterisk to reload configuration"
-		/usr/sbin/asterisk -r -x "module reload" &>/dev/null
-		eend $?
-	else
-		eerror "Asterisk is not running!"
-	fi
-}
diff --git a/net-misc/asterisk/files/1.8.0/asterisk.initd2 b/net-misc/asterisk/files/1.8.0/asterisk.initd5
index 8f3ef722f4ea..9f5334e4a010 100644
--- a/net-misc/asterisk/files/1.8.0/asterisk.initd2
+++ b/net-misc/asterisk/files/1.8.0/asterisk.initd5
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/1.8.0/asterisk.initd2,v 1.1 2011/12/17 20:07:52 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/1.8.0/asterisk.initd5,v 1.1 2013/01/24 13:10:46 chainsaw Exp $
 
 extra_started_commands="forcestop reload"
 
@@ -11,11 +11,13 @@ depend() {
 }
 
 is_running() {
-	if [ -z "`pidof asterisk`" ]; then
+	[ -r /var/run/asterisk/asterisk.pid ] || return 1
+	local ast_pid="`pidof asterisk`"
+	if [ -z "${ast_pid}" ]; then
 		return 1
 	else
 		PID="`cat /var/run/asterisk/asterisk.pid`"
-		for x in `pidof asterisk`; do
+		for x in ${ast_pid}; do
 			if [ "${x}" = "${PID}" ]; then
 				return 0
 			fi	
@@ -31,19 +33,17 @@ asterisk_run_loop() {
 	echo "Initializing asterisk wrapper"
 	OPTS="$*"
 
-	trap "rm /var/run/asterisk/wrapper_loop.pid" EXIT
-	cut -f4 -d' ' < /proc/self/stat > /var/run/asterisk/wrapper_loop.pid
+	trap "rm -f /var/run/asterisk/wrapper_loop.running" EXIT
+	touch "/var/run/asterisk/wrapper_loop.running"
 
-	while :; do
+	while [ -r "/var/run/asterisk/wrapper_loop.running" ]; do
 		if [ -n "${TTY}" ]; then
 			/usr/bin/stty -F ${TTY} sane
 			${NICE} /usr/sbin/asterisk ${OPTS} >${TTY} 2>&1 <${TTY}
 			result=$?
 		else
-			set -o pipefail
 			${NICE} /usr/sbin/asterisk ${OPTS} 2>&1 >/dev/null
 			result=$?
-			set +o pipefail
 		fi		
 
 		if [ $result -eq 0 ]; then
@@ -94,6 +94,8 @@ asterisk_run_loop() {
 		sleep "${ASTERISK_RESTART_DELAY}"
 		echo "Restarting Asterisk..."
 	done
+
+	echo "Terminating wrapper loop."
 	return 0
 }
 
@@ -194,6 +196,7 @@ start() {
 			OPTS="${OPTS} -G ${GROUP}"
 			GROUP=":${GROUP}"	# make it look nice...
 		fi
+		checkpath -d -m 0755 -o ${USER}${GROUP} /var/{log,run}/asterisk
 		for element in `find /var/{log,run}/asterisk`; do
 			if [ `stat -c %U $element` != "${USER}" ]; then
  				ewarn "${USER} is not the owner of $element, fixing."
@@ -204,6 +207,7 @@ start() {
 		done;
 		einfo "Starting asterisk as      : ${USER}${GROUP}"
 	else
+		checkpath -d -m 0755 -o root:root /var/{log,run}/asterisk
 		ewarn "Starting asterisk as root is not recommended."
 	fi
 
@@ -221,24 +225,42 @@ start() {
 	eend $result
 }
 
+wrapperstop() {
+	# Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running).
+	if [ -r /var/run/asterisk/wrapper_loop.pid ]; then
+		ebegin "Killing wrapper script"
+		kill `cat /var/run/asterisk/wrapper_loop.pid`
+		eend $?
+	fi
+
+	# The new one (due to "hardened" requirements) uses a simpler
+	# flag to indicate running or shutting down.
+	if [ -r /var/run/asterisk/wrapper_loop.running ]; then
+		ebegin "Signalling wrapper script to terminate"
+		rm /var/run/asterisk/wrapper_loop.running
+		eend $?
+	fi
+
+	return 0
+}
+
 forcestop() {
+	# Just to be sure - when we want to forcestop we should make it all tear down.
+	wrapperstop
+
 	ebegin "Stopping asterisk PBX"
 	start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid
 	eend $?
 }
 
 stop() {
+	wrapperstop
+
 	if ! is_running; then
 		eerror "Asterisk is not running!"
 		return 0
 	fi
 
-	if [ -r /var/run/asterisk/wrapper_loop.pid ]; then
-		ebegin "Killing wrapper script"
-		kill `cat /var/run/asterisk/wrapper_loop.pid`
-		eend $?
-	fi
-
 	ebegin "Stopping asterisk PBX gracefully"
 	/usr/sbin/asterisk -r -x "core stop gracefully" &>/dev/null
 	# Now we have to wait until asterisk has _really_ stopped.