[svn-commits] trunk - r7330 in /trunk: ./ build_tools/ configs/ contrib/init.d/

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Sun Dec  4 12:12:52 2005
New Revision: 7330

URL: http://svn.digium.com/view/asterisk?rev=7330&view=rev
Log:
Merged revisions 7285,7299,7310,7329 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r7285 | tilghman | 2005-12-02 15:12:05 -0600 (Fri, 02 Dec 2005) | 2 lines

Turn on executable bits for startup scripts, and fix bash var interpolation for Mandrake

........
r7299 | oej | 2005-12-02 19:24:40 -0600 (Fri, 02 Dec 2005) | 2 lines

Documenting the default registerattempts setting as 0, continue hammering the server for ever and ever ;-)

........
r7310 | tilghman | 2005-12-03 13:55:05 -0600 (Sat, 03 Dec 2005) | 3 lines

Bug 5925: check for "Unknown", as that's what app_voicemail puts into the field for Unknown callerid
Also, remove useless res checks (initialized to 0; never set)

........
r7329 | kpfleming | 2005-12-04 12:03:07 -0600 (Sun, 04 Dec 2005) | 2 lines

use a more efficient way to get the revision number, that will also report if the working copy contains uncommitted modifications

........

Modified:
    trunk/   (props changed)
    trunk/build_tools/make_svn_branch_name
    trunk/configs/sip.conf.sample
    trunk/contrib/init.d/rc.debian.asterisk   (props changed)
    trunk/contrib/init.d/rc.gentoo.asterisk   (props changed)
    trunk/contrib/init.d/rc.mandrake.asterisk   (contents, props changed)
    trunk/contrib/init.d/rc.mandrake.zaptel   (props changed)
    trunk/contrib/init.d/rc.redhat.asterisk   (props changed)
    trunk/contrib/init.d/rc.slackware.asterisk   (props changed)

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Dec  4 12:12:52 2005
@@ -1,1 +1,1 @@
-/branches/1.2:1-7275
+/branches/1.2:1-7329

Modified: trunk/build_tools/make_svn_branch_name
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/make_svn_branch_name?rev=7330&r1=7329&r2=7330&view=diff
==============================================================================
--- trunk/build_tools/make_svn_branch_name (original)
+++ trunk/build_tools/make_svn_branch_name Sun Dec  4 12:12:52 2005
@@ -4,7 +4,7 @@
 BRANCH=0
 TEAM=0
 
-REV=`LANG=C svn info | grep -e 'Last Changed Rev' | awk '{print $4;}'`
+REV=`svnversion -c . | cut -d: -f2`
 
 if [ "${PARTS}" = "trunk" ]
 then

Modified: trunk/configs/sip.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/sip.conf.sample?rev=7330&r1=7329&r2=7330&view=diff
==============================================================================
--- trunk/configs/sip.conf.sample (original)
+++ trunk/configs/sip.conf.sample Sun Dec  4 12:12:52 2005
@@ -148,7 +148,7 @@
 ;registerattempts=10		; Number of registration attempts before we give up
 				; 0 = continue forever, hammering the other server until it 
 				; accepts the registration
-				; Default is 10 tries
+				; Default is 0 tries, continue forever
 ;callevents=no			; generate manager events when sip ua performs events (e.g. hold)
 
 ;----------------------------------------- NAT SUPPORT ------------------------

Propchange: trunk/contrib/init.d/rc.debian.asterisk
------------------------------------------------------------------------------
    svn:executable = *

Propchange: trunk/contrib/init.d/rc.gentoo.asterisk
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/contrib/init.d/rc.mandrake.asterisk
URL: http://svn.digium.com/view/asterisk/trunk/contrib/init.d/rc.mandrake.asterisk?rev=7330&r1=7329&r2=7330&view=diff
==============================================================================
--- trunk/contrib/init.d/rc.mandrake.asterisk (original)
+++ trunk/contrib/init.d/rc.mandrake.asterisk Sun Dec  4 12:12:52 2005
@@ -15,7 +15,12 @@
 NOTIFY=root		# Who to notify about crashes
 DUMPDROP=/tmp
 HOSTNAME=`hostname`
-CONFIGFILE=/etc/sysconfig/`basename $0`
+if [ 0`readlink $0` = "0" ]; then
+	CONFIGFILE=/etc/sysconfig/`basename $0`
+else
+	CONFIG0=`readlink $0`
+	CONFIGFILE=/etc/sysconfig/`basename $CONFIG0`
+fi
 
 # Setup environment
 cd /usr/src
@@ -68,7 +73,7 @@
 #{
 #}
 
-SIGMSG=("Hangup" "Interrupt" "Quit" "Illegal instruction" "Trace trap" "IOT Trap" "Bus Error" "Floating-point exception" "Killed" "User-defined signal 1" "Segmentation violation" "User-defined signal 2" "Broken pipe" "Alarm clock" "Termination" "Stack fault")
+SIGMSG=("None", "Hangup" "Interrupt" "Quit" "Illegal instruction" "Trace trap" "IOT Trap" "Bus Error" "Floating-point exception" "Killed" "User-defined signal 1" "Segmentation violation" "User-defined signal 2" "Broken pipe" "Alarm clock" "Termination" "Stack fault")
 
 run_asterisk()
 {
@@ -90,7 +95,7 @@
 			exit 0
 		elif [ $EXITSTATUS -gt 128 ]; then
 			EXITSIGNAL=$(($EXITSTATUS - 128))
-			EXITMSG=$SIGMSG[$EXITSIGNAL]
+			EXITMSG=${SIGMSG[$EXITSIGNAL]}
 			echo "Asterisk exited on signal $EXITSIGNAL - $EXITMSG."
 			if [ "$NOTIFY" != "" ]; then
 				echo "Asterisk exited on signal $EXITSIGNAL - $EXITMSG.  Might want to take a peek." | \

Propchange: trunk/contrib/init.d/rc.mandrake.asterisk
------------------------------------------------------------------------------
    svn:executable = *

Propchange: trunk/contrib/init.d/rc.mandrake.zaptel
------------------------------------------------------------------------------
    svn:executable = *

Propchange: trunk/contrib/init.d/rc.redhat.asterisk
------------------------------------------------------------------------------
    svn:executable = *

Propchange: trunk/contrib/init.d/rc.slackware.asterisk
------------------------------------------------------------------------------
    svn:executable = *