[Pkg-voip-commits] [asterisk] 02/03: drop safe_asterisk-config and safe_asterisk-nobg patches

[Jeremy Lainé]

This is an automated email from the git hooks/post-receive script.

sharky pushed a commit to branch master
in repository asterisk.

commit 1103dd4775098b80e1dc0f8af3dab2b0e95fb92d
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Fri Jul 11 00:24:48 2014 +0200

    drop safe_asterisk-config and safe_asterisk-nobg patches
---
 debian/asterisk.init                |  2 +-
 debian/changelog                    |  2 ++
 debian/patches/safe_asterisk-config | 26 --------------------------
 debian/patches/safe_asterisk-nobg   | 32 --------------------------------
 debian/patches/series               |  2 --
 5 files changed, 3 insertions(+), 61 deletions(-)

diff --git a/debian/asterisk.init b/debian/asterisk.init
index 715b4e9..1462e21 100644
--- a/debian/asterisk.init
+++ b/debian/asterisk.init
@@ -152,11 +152,11 @@ case "$1" in
 			echo "$DESC is already running. Use restart."
 			exit 0
 		fi
-		export SAFE_AST_BACKGROUND=1
 		start-stop-daemon --start --group $GROUP --pidfile "$PIDFILE" \
 			$CHDIR_PARM \
 			--exec $REALDAEMON -- $PARAMS > /dev/null
 	else
+		export ASTSAFE_FOREGROUND=1
 		start-stop-daemon --start --group $GROUP \
 			--background --make-pidfile \
 			$CHDIR_PARM --pidfile "$ASTSAFE_PIDFILE" \
diff --git a/debian/changelog b/debian/changelog
index 5db4145..106fee5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 asterisk (1:11.11.0~dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+    - Drop safe_asterisk-config and safe_asterisk-nobg patches, fixed upstream
+      in bug ASTERISK-23492.
   * Remove svn-upgrade from watch file.
 
  -- Jeremy Lainé <jeremy.laine at m4x.org>  Fri, 11 Jul 2014 00:07:01 +0200
diff --git a/debian/patches/safe_asterisk-config b/debian/patches/safe_asterisk-config
deleted file mode 100644
index f596b1f..0000000
--- a/debian/patches/safe_asterisk-config
+++ /dev/null
@@ -1,26 +0,0 @@
-Subject: Don't use TTY9 by default
-
-Author: Faidon Liambotis <paravoid at debian.org>
-Bug-Debian: http://bugs.debian.org/381786
-Last-Update: 2010-02-14
-
---- a/contrib/scripts/safe_asterisk
-+++ b/contrib/scripts/safe_asterisk
-@@ -109,7 +109,7 @@ ulimit -c unlimited
- # Don't fork when running "safely"
- #
- ASTARGS=""
--if test "x$TTY" != "x" ; then
-+if test "x$TTY" != "xno" ; then
- 	if test -c /dev/tty${TTY} ; then
- 		TTY=tty${TTY}
- 	elif test -c /dev/vc/${TTY} ; then
-@@ -159,7 +159,7 @@ run_asterisk()
- {
- 	while :; do 
- 
--		if test "x$TTY" != "x" ; then
-+		if test "x$TTY" != "xno" ; then
- 			cd "${RUNDIR}"
- 			stty sane < /dev/${TTY}
- 			nice -n $PRIORITY ${ASTSBINDIR}/asterisk -f ${CLIARGS} ${ASTARGS} > /dev/${TTY} 2>&1 < /dev/${TTY}
diff --git a/debian/patches/safe_asterisk-nobg b/debian/patches/safe_asterisk-nobg
deleted file mode 100644
index 668923b..0000000
--- a/debian/patches/safe_asterisk-nobg
+++ /dev/null
@@ -1,32 +0,0 @@
-Subject: Add an option to safe_asterisk so that it won't background.
-Author: Faidon Liambotis <paravoid at debian.org>
-Bug-Debian: http://bugs.debian.org/376514
-Forwarded: not-needed
-Last-Update: 2010-10-21
-
-This is intended to work with start-stop-daemon's --background option which
-results in a correct pidfile since the process doesn't fork.
-
-Needs more work from me to not change behavior for users but only for the
-init script. After that, it can safely go upstream.
-
---- a/contrib/scripts/safe_asterisk
-+++ b/contrib/scripts/safe_asterisk
-@@ -18,6 +18,7 @@ DUMPDROP=${DUMPDROP:-/tmp}
- RUNDIR=${RUNDIR:-/tmp}
- SLEEPSECS=4
- ASTPIDFILE=${ASTVARRUNDIR}/asterisk.pid
-+SAFE_AST_BACKGROUND=0
- 
- # comment this line out to have this script _not_ kill all mpg123 processes when
- # asterisk exits
-@@ -211,4 +212,8 @@ run_asterisk()
- 	done
- }
- 
--run_asterisk &
-+if [ "$SAFE_AST_BACKGROUND" = "1" ]; then
-+	run_asterisk &
-+else
-+	run_asterisk
-+fi
diff --git a/debian/patches/series b/debian/patches/series
index 3307ab7..98a9861 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,8 +4,6 @@ allow-tilde-destdir
 hack-multiple-app-voicemail
 # Not used ATM. See comment in patch:
 #make-clean-fixes
-safe_asterisk-config
-safe_asterisk-nobg
 #
 #h323-no-deps-on-asterisk
 #h323-workaround-openh323-segfault

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/asterisk.git