diff -pruN asterisk-1.2.14~dfsg/debian/asterisk.default asterisk-1.2.14~dfsg-4ubuntu1/debian/asterisk.default --- asterisk-1.2.14~dfsg/debian/asterisk.default 2007-01-28 00:39:09.000000000 +0100 +++ asterisk-1.2.14~dfsg-4ubuntu1/debian/asterisk.default 2007-01-15 23:30:51.000000000 +0100 @@ -17,7 +17,7 @@ RUNASTERISK=no # *not**intended**for**production**use*. # When you give -G *only* that group will be used, # else all groups of the asterisk user. -#PARAMS="-D -g -vvv" +#PARAMS="-d -g -vvv" # # # RUNASTSAFE: run safe_asterisk rather than asterisk (will auto-restart upon diff -pruN asterisk-1.2.14~dfsg/debian/asterisk.init asterisk-1.2.14~dfsg-4ubuntu1/debian/asterisk.init --- asterisk-1.2.14~dfsg/debian/asterisk.init 2007-01-28 00:39:09.000000000 +0100 +++ asterisk-1.2.14~dfsg-4ubuntu1/debian/asterisk.init 2007-01-28 01:05:06.000000000 +0100 @@ -69,6 +69,11 @@ test -x $DAEMON || exit 0 set -e +if [ ! -e `dirname $PIDFILE` ];then + mkdir `dirname $PIDFILE` + chown $USER.$GROUP `dirname $PIDFILE` +fi + status() { plist=`ps auxw | grep "$DAEMON" | grep -v grep | awk '{print $2}' | tr '\012' ' '` if [ "$plist" = "" ]; then @@ -107,9 +112,9 @@ case "$1" in start-stop-daemon --start --group $GROUP --pidfile "$PIDFILE" \ --exec $REALDAEMON -- $PARAMS else - start-stop-daemon --start --group $GROUP --make-pidfile \ - --pidfile "$ASTSAFE_PIDFILE" \ + start-stop-daemon --start --group $GROUP \ --exec $REALDAEMON -- $PARAMS + echo `ps aux | grep safe_asterisk | awk '{print $2}' | head -1` > "$ASTSAFE_PIDFILE" fi diff -pruN asterisk-1.2.14~dfsg/debian/changelog asterisk-1.2.14~dfsg-4ubuntu1/debian/changelog --- asterisk-1.2.14~dfsg/debian/changelog 2007-01-28 00:39:09.000000000 +0100 +++ asterisk-1.2.14~dfsg-4ubuntu1/debian/changelog 2007-01-28 00:49:48.000000000 +0100 @@ -1,3 +1,14 @@ +asterisk (1:1.2.14~dfsg-4ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/asterisk.init: + + create /var/run/ directory if necessary and set proper permissions + - debian/asterisk.default - fix -D/-d typo in PARAMS (Closes LP#68169) + - debian/patches/ubuntu_safe_asterisk - remove bashism (Closes LP#68742) + * debian/asterisk.init - fixed stopping stop while RUNASTSAFE=yes + + -- Lionel Porcheron Sun, 28 Jan 2007 01:08:48 +0100 + asterisk (1:1.2.14~dfsg-4) unstable; urgency=high * Add missing "fi" to asterisk_fix. (Closes: #406961) @@ -31,6 +42,26 @@ asterisk (1:1.2.14~dfsg-1) unstable; urg -- Kilian Krause Wed, 3 Jan 2007 21:03:19 +0100 +asterisk (1:1.2.13~dfsg-2ubuntu2) feisty; urgency=low + + * debian/asterisk.init - fixed starting/stoping while RUNASTSAFE=yes (Closes + LP#39767, LP#46688) + * debian/patches/ubuntu_safe_asterisk - remove bashism (Closes LP#68742) + * debian/asterisk.default - fix -D/-d typo in PARAMS (Closes LP#68169) + + -- Ante Karamatic Sun, 17 Dec 2006 11:52:43 +0100 + +asterisk (1:1.2.13~dfsg-2ubuntu1) feisty; urgency=low + + * Merge from debian unstable + * Reverse Ubuntu changes: + - debian/asterisk.init: + + create /var/run/ directory if necessary and set proper permissions + - debian/patches/ubuntu_compiler.h.dpatch + + Remove dependency on linux/compiler.h + + -- Ante Karamatic Fri, 10 Nov 2006 13:13:34 +0000 + asterisk (1:1.2.13~dfsg-2) unstable; urgency=low [ Tzafrir Cohen ] @@ -44,6 +75,15 @@ asterisk (1:1.2.13~dfsg-2) unstable; urg -- Mark Purcell Mon, 6 Nov 2006 06:33:19 +0000 +asterisk (1:1.2.13~dfsg-1ubuntu1) feisty; urgency=low + + * Merge from debian unstable + - debian/asterisk.init: + + create /var/run/ directory if necessary and set proper permissions + - Remove dependency on linux/compiler.h + + -- Christian Bjälevik Sun, 29 Oct 2006 02:30:25 +0200 + asterisk (1:1.2.13~dfsg-1) unstable; urgency=high [ Kilian Krause ] @@ -74,6 +114,15 @@ asterisk (1:1.2.13~dfsg-1) unstable; urg -- Mark Purcell Wed, 25 Oct 2006 06:46:52 +0100 +asterisk (1:1.2.12.1.dfsg-1ubuntu1) edgy; urgency=low + + * Merge from Debian sid. + * debian/asterisk.init: + - create /var/run/ directory if necessary and set proper permissions + * Remove dependency on linux/compiler.h + + -- Soren Hansen Thu, 28 Sep 2006 18:15:25 +0200 + asterisk (1:1.2.12.1.dfsg-1) unstable; urgency=low [ Tzafrir Cohen ] @@ -105,6 +154,13 @@ asterisk (1:1.2.11.dfsg-1) unstable; urg -- Mark Purcell Sat, 2 Sep 2006 13:01:02 +0100 +asterisk (1:1.2.10.dfsg-3ubuntu1) edgy; urgency=low + + * Merge from debian sid. + * Same changes as 1:1.2.10.dfsg-1ubuntu1 + + -- Soren Hansen Wed, 23 Aug 2006 01:23:02 +0200 + asterisk (1:1.2.10.dfsg-3) unstable; urgency=low [ Kilian Krause ] @@ -133,6 +189,15 @@ asterisk (1:1.2.10.dfsg-2) unstable; urg -- Mark Purcell Thu, 27 Jul 2006 08:09:47 +0100 +asterisk (1:1.2.10.dfsg-1ubuntu1) edgy; urgency=low + + * Resynchronized with Debian unstable + * debian/asterisk.init: + - create /var/run/ directory if necessary and set proper permissions + * Remove dependency on linux/compiler.h + + -- Soren Hansen Mon, 24 Jul 2006 14:27:25 +0200 + asterisk (1:1.2.10.dfsg-1) unstable; urgency=low [ Tzafrir Cohen ] @@ -186,6 +251,30 @@ asterisk (1:1.2.7.1.dfsg-3) unstable; ur -- Mark Purcell Tue, 13 Jun 2006 05:11:44 +0100 +asterisk (1:1.2.7.1.dfsg-2ubuntu3) dapper; urgency=low + + * debian/*.init: + - Change the ownership of the pid file again. + (Closes: Malone ##45952). + + -- Chuck Short Thu, 25 May 2006 20:27:00 -0400 + +asterisk (1:1.2.7.1.dfsg-2ubuntu2) dapper; urgency=low + + * debian/*.init + - Change the ownership of the pid file. + (Closes: Malone #45952). + + -- Chuck Short Mon, 22 May 2006 14:00:27 -0400 + +asterisk (1:1.2.7.1.dfsg-2ubuntu1) dapper; urgency=low + + * Resynchronized with Debian, only Ubuntu changes: + - debian/*.init: + - create /var/run/ directory if necessary. + + -- Daniel Holbach Thu, 18 May 2006 10:21:06 +0200 + asterisk (1:1.2.7.1.dfsg-2) unstable; urgency=high [ Kilian Krause ] diff -pruN asterisk-1.2.14~dfsg/debian/patches/00list asterisk-1.2.14~dfsg-4ubuntu1/debian/patches/00list --- asterisk-1.2.14~dfsg/debian/patches/00list 2007-01-28 00:39:09.000000000 +0100 +++ asterisk-1.2.14~dfsg-4ubuntu1/debian/patches/00list 2007-01-27 23:47:42.000000000 +0100 @@ -21,3 +21,4 @@ cdr_sqlite3_custom less_docs Makefile_hostcc Makefile_clean +ubuntu_safe_asterisk diff -pruN asterisk-1.2.14~dfsg/debian/patches/ubuntu_safe_asterisk.dpatch asterisk-1.2.14~dfsg-4ubuntu1/debian/patches/ubuntu_safe_asterisk.dpatch --- asterisk-1.2.14~dfsg/debian/patches/ubuntu_safe_asterisk.dpatch 1970-01-01 01:00:00.000000000 +0100 +++ asterisk-1.2.14~dfsg-4ubuntu1/debian/patches/ubuntu_safe_asterisk.dpatch 2007-01-27 23:45:54.000000000 +0100 @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## ubuntu_safe_asterisk.dpatch by Ante Karamatic +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad asterisk-1.2.13~dfsg~/contrib/scripts/safe_asterisk asterisk-1.2.13~dfsg/contrib/scripts/safe_asterisk +--- asterisk-1.2.13~dfsg~/contrib/scripts/safe_asterisk 2006-04-19 23:10:41.000000000 +0200 ++++ asterisk-1.2.13~dfsg/contrib/scripts/safe_asterisk 2006-12-17 11:52:09.000000000 +0100 +@@ -53,7 +53,7 @@ + if [ "$TTY" != "" ]; then + cd /tmp + stty sane < /dev/${TTY} +- ${ASTSBINDIR}/asterisk ${CLIARGS} ${ASTARGS} >& /dev/${TTY} < /dev/${TTY} ++ ${ASTSBINDIR}/asterisk ${CLIARGS} ${ASTARGS} > /dev/${TTY} 2>&1 < /dev/${TTY} + else + cd /tmp + ${ASTSBINDIR}/asterisk ${CLIARGS} ${ASTARGS}