[Pkg-voip-commits] r5014 - in /asterisk/trunk/debian: asterisk.default changelog patches/safe_asterisk-config patches/safe_asterisk-nobg patches/series

[paravoid at alioth.debian.org]

Author: paravoid
Date: Mon Dec  3 20:55:15 2007
New Revision: 5014

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5014
Log:
* Provide options in /etc/default/asterisk for configuring safe_asterisk.
  (Closes: #381786)

Added:
    asterisk/trunk/debian/patches/safe_asterisk-config
Modified:
    asterisk/trunk/debian/asterisk.default
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/safe_asterisk-nobg
    asterisk/trunk/debian/patches/series

Modified: asterisk/trunk/debian/asterisk.default
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/asterisk.default?rev=5014&op=diff
==============================================================================
--- asterisk/trunk/debian/asterisk.default (original)
+++ asterisk/trunk/debian/asterisk.default Mon Dec  3 20:55:15 2007
@@ -26,6 +26,11 @@
 #             with properly starting and stopping Asterisk.
 #RUNASTSAFE=yes
 #
+# ASTSAFE_CONSOLE: whether you want safe_asterisk to spawn a console for Asterisk.
+#ASTSAFE_CONSOLE=yes
+#
+# ASTSAFE_TTY: tty for Asterisk to run on (only for safe_asterisk)
+#ASTSAFE_TTY=9
 #
 # MAXFILES: Set this to the number of open file handles the Asterisk 
 #           process can have. Useful if you get "Too many open files" error.

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=5014&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Mon Dec  3 20:55:15 2007
@@ -31,12 +31,14 @@
   * News entries were added but we never shipped the file; ship NEWS.Debian.
   * Add an entry to NEWS.Debian warning users about app_voicemail_*.so
     (Closes: #452596)
+  * Provide options in /etc/default/asterisk for configuring safe_asterisk.
+    (Closes: #381786)
 
   [ Tzafrir Cohen ]
   * Provide a custom sounds directory under /var/lib - user-modifieble at
     runtime and hence not under /usr. (Closes: #337209)
 
- -- Faidon Liambotis <paravoid at debian.org>  Mon, 03 Dec 2007 20:16:53 +0200
+ -- Faidon Liambotis <paravoid at debian.org>  Mon, 03 Dec 2007 22:54:35 +0200
 
 asterisk (1:1.4.13~dfsg-1) unstable; urgency=low
 

Added: asterisk/trunk/debian/patches/safe_asterisk-config
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/safe_asterisk-config?rev=5014&op=file
==============================================================================
--- asterisk/trunk/debian/patches/safe_asterisk-config (added)
+++ asterisk/trunk/debian/patches/safe_asterisk-config Mon Dec  3 20:55:15 2007
@@ -1,0 +1,43 @@
+Use ASTSAFE_TTY and ASTSAFE_CONSOLE from /etc/default/asterisk to configure
+safe_asterisk.
+
+Closes: #381786
+
+ -- Faidon Liambotis <paravoid at debian.org>
+
+--- a/contrib/scripts/safe_asterisk
++++ b/contrib/scripts/safe_asterisk
+@@ -1,9 +1,13 @@
+ #!/bin/bash
+ # vim:textwidth=80:tabstop=4:shiftwidth=4:smartindent:autoindent
+ 
++if [ -f /etc/default/asterisk ]; then
++	. /etc/default/asterisk;
++fi
++
+ CLIARGS="$*"				# Grab any args passed to safe_asterisk
+-TTY=9						# TTY (if you want one) for Asterisk to run on
+-CONSOLE=yes					# Whether or not you want a console
++TTY=${ASTSAFE_TTY:-9}                   	# TTY (if you want one) for Asterisk to run on
++CONSOLE=${ASTSAFE_CONSOLE:-yes}         	# Whether or not you want a console
+ #NOTIFY=ben at alkaloid.net	# Who to notify about crashes
+ #EXEC=/path/to/somescript	# Run this command if Asterisk crashes
+ MACHINE=`hostname`			# To specify which machine has crashed when getting the mail
+@@ -77,7 +81,7 @@ ulimit -c unlimited
+ # Don't fork when running "safely"
+ #
+ ASTARGS=""
+-if [ "$TTY" != "" ]; then
++if [ "$TTY" != "no" ]; then
+ 	if [ -c /dev/tty${TTY} ]; then
+ 		TTY=tty${TTY}
+ 	elif [ -c /dev/vc/${TTY} ]; then
+@@ -117,7 +121,7 @@ run_asterisk()
+ {
+ 	while :; do 
+ 
+-		if [ "$TTY" != "" ]; then
++		if [ "$TTY" != "no" ]; then
+ 			cd /tmp
+ 			stty sane < /dev/${TTY}
+ 			nice -n $PRIORITY ${ASTSBINDIR}/asterisk -f ${CLIARGS} ${ASTARGS} >& /dev/${TTY} < /dev/${TTY}

Modified: asterisk/trunk/debian/patches/safe_asterisk-nobg
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/safe_asterisk-nobg?rev=5014&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/safe_asterisk-nobg (original)
+++ asterisk/trunk/debian/patches/safe_asterisk-nobg Mon Dec  3 20:55:15 2007
@@ -12,7 +12,7 @@
 
 --- a/contrib/scripts/safe_asterisk
 +++ b/contrib/scripts/safe_asterisk
-@@ -11,6 +11,7 @@ DUMPDROP=/tmp
+@@ -15,6 +15,7 @@ DUMPDROP=/tmp
  SLEEPSECS=4
  ASTSBINDIR=__ASTERISK_SBIN_DIR__
  ASTPIDFILE=__ASTERISK_VARRUN_DIR__/asterisk.pid
@@ -20,7 +20,7 @@
  
  # comment this line out to have this script _not_ kill all mpg123 processes when
  # asterisk exits
-@@ -172,4 +173,8 @@ run_asterisk()
+@@ -176,4 +177,8 @@ run_asterisk()
  	done
  }
  

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=5014&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Mon Dec  3 20:55:15 2007
@@ -5,6 +5,7 @@
 hack-multiple-app-voicemail
 astvarrundir
 make-clean-fixes
+safe_asterisk-config
 safe_asterisk-nobg
 h323-no-deps-on-asterisk
 h323-workaround-openh323-segfault