← Back to branch summary

~ubuntu-branches/ubuntu/quantal/asterisk/quantal

« back to all changes in this revision

Viewing changes to debian/patches/safe_asterisk-config

  • Committer: Bazaar Package Importer
  • Author(s): Jean-Michel Dault
  • Date: 2010-02-16 14:08:54 UTC
  • mfrom: (1.2.5 upstream) (8.3.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100216140854-rb2godspb9lduazl
Tags: 1:1.6.2.2-1ubuntu1
* Merge from Debian: security update
  * Changes:
  - debian/control: Change Maintainer
  - debian/control: Removed Uploaders field.
  - debian/control: Removed Debian Vcs-Svn entry and replaced with
      ubuntu-voip Vcs-Bzr, to reflect divergence in packages.
  - debian/asterisk.init : chown /dev/dahdi
  - debian/backports/hardy : add file
  - debian/backports/asterisk.init.hardy : add file

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/safe_asterisk-config
 
1
Subject: use /etc/default/settings for configuring safe_asterisk (vendor specific)
 
2
Author: Faidon Liambotis <paravoid@debian.org>
 
3
Bug-Debian: http://bugs.debian.org/381786
 
4
Last-Update: 2009-12-19
 
5
 
1
6
Use ASTSAFE_TTY and ASTSAFE_CONSOLE from /etc/default/asterisk to configure
2
7
safe_asterisk.
3
8
 
4
 
Closes: #381786
5
 
 
6
 
 -- Faidon Liambotis <paravoid@debian.org>
7
 
 
8
9
--- a/contrib/scripts/safe_asterisk
9
10
+++ b/contrib/scripts/safe_asterisk
10
11
@@ -1,9 +1,13 @@
23
24
 #NOTIFY=ben@alkaloid.net       # Who to notify about crashes
24
25
 #EXEC=/path/to/somescript      # Run this command if Asterisk crashes
25
26
 #LOGFILE=/path/to/logfile      # Where to place the normal logfile (disabled if blank)
26
 
@@ -112,7 +116,7 @@
 
27
@@ -112,7 +116,7 @@ ulimit -c unlimited
27
28
 # Don't fork when running "safely"
28
29
 #
29
30
 ASTARGS=""
32
33
        if [ -c /dev/tty${TTY} ]; then
33
34
                TTY=tty${TTY}
34
35
        elif [ -c /dev/vc/${TTY} ]; then
35
 
@@ -152,7 +156,7 @@
 
36
@@ -152,7 +156,7 @@ run_asterisk()
36
37
 {
37
38
        while :; do 
38
39