[Pkg-voip-commits] r7251 - in /asterisk/trunk/debian: changelog patches/safe_asterisk_bashism patches/series

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Sat May 23 16:13:19 2009
New Revision: 7251

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7251
Log:
Patch safe_asterisk_bashism: fixes that bashism (Closes: #530047).

Added:
    asterisk/trunk/debian/patches/safe_asterisk_bashism
Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/series

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=7251&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Sat May 23 16:13:19 2009
@@ -2,7 +2,10 @@
 
   * NOT RELEASED YET
 
- -- Mark Purcell <msp at debian.org>  Wed, 20 May 2009 08:22:53 +1000
+  [ Tzafrir Cohen ]
+  * Patch safe_asterisk_bashism: fixes that bashism (Closes: #530047).
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sat, 23 May 2009 18:50:54 +0300
 
 asterisk (1:1.6.1.0~dfsg-1) unstable; urgency=low
 

Added: asterisk/trunk/debian/patches/safe_asterisk_bashism
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/safe_asterisk_bashism?rev=7251&op=file
==============================================================================
--- asterisk/trunk/debian/patches/safe_asterisk_bashism (added)
+++ asterisk/trunk/debian/patches/safe_asterisk_bashism Sat May 23 16:13:19 2009
@@ -1,0 +1,43 @@
+Fix some remaining bashism issues is safe_asterisk.
+Fixes, or mostly fixes, #530047.
+
+Upstream issue: https://issues.asterisk.org/view.php?id=10812
+
+--- a/contrib/scripts/safe_asterisk
++++ b/contrib/scripts/safe_asterisk
+@@ -62,7 +62,7 @@ then
+ 	PRIORITY=0
+ 	message "safe_asterisk was started by `id -n` (uid `id -u`)."
+ else
+-	if `echo $OSTYPE | grep linux 2>&1 > /dev/null `
++	if `uname -s | grep Linux 2>&1 > /dev/null `
+ 	then
+ 		# maximum number of open files is set to the system maximum divided by two if
+ 		# MAXFILES is not set.
+@@ -75,7 +75,7 @@ else
+ 			fi
+ 		fi
+ 		SYSCTL_MAXFILES="fs.file-max"
+-	elif `echo $OSTYPE | grep darwin 2>&1 > /dev/null `
++	elif `uname -s | grep Darwin 2>&1 > /dev/null `
+ 	then
+ 		SYSCTL_MAXFILES="kern.maxfiles"
+ 	fi
+@@ -143,7 +143,7 @@ trap '' PIPE
+ if [ -d /etc/asterisk/startup.d ]; then
+ 	for script in /etc/asterisk/startup.d/*.sh; do
+ 		if [ -x ${script} ]; then
+-			source ${script}
++			. ${script}
+ 		fi
+ 	done
+ fi
+@@ -167,7 +167,7 @@ run_asterisk()
+ 			message "Asterisk shutdown normally."
+ 			exit 0
+ 		elif [ $EXITSTATUS -gt 128 ]; then
+-			let EXITSIGNAL=EXITSTATUS-128
++			EXITSIGNAL=EXITSTATUS-128
+ 			echo "Asterisk exited on signal $EXITSIGNAL."
+ 			if [ "$NOTIFY" != "" ]; then
+ 				echo "Asterisk on $MACHINE exited on signal $EXITSIGNAL.  Might want to take a peek." | \

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=7251&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Sat May 23 16:13:19 2009
@@ -7,6 +7,7 @@
 make-clean-fixes
 safe_asterisk-config
 safe_asterisk-nobg
+safe_asterisk_bashism
 # Remed-out for now. Should be fixed later on:
 #h323-no-deps-on-asterisk
 #h323-workaround-openh323-segfault