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

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7330 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/build_tools/make_svn_branch_name b/build_tools/make_svn_branch_name
index 484bef5853f80852b6c6747fdbe40da124aec7f9..b3af1492a1cd4cf2031679e5adb48be27172e1e8 100755 (executable)
--- a/build_tools/make_svn_branch_name
+++ b/build_tools/make_svn_branch_name
@@ -4,7 +4,7 @@ PARTS=`LANG=C svn info | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/asteris
 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

diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index e95704a888ef6befb0f282b16f2b7b274278d25a..4d279aa9cc305da61dbf372e5228c4dd52589dfc 100644 (file)
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -148,7 +148,7 @@ srvlookup=yes                       ; Enable DNS SRV lookups on outbound calls
 ;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 ------------------------

diff --git a/contrib/init.d/rc.debian.asterisk b/contrib/init.d/rc.debian.asterisk
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/contrib/init.d/rc.gentoo.asterisk b/contrib/init.d/rc.gentoo.asterisk
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/contrib/init.d/rc.mandrake.asterisk b/contrib/init.d/rc.mandrake.asterisk
old mode 100644 (file)
new mode 100755 (executable)
index 5452fdd..702de53
--- a/contrib/init.d/rc.mandrake.asterisk
+++ b/contrib/init.d/rc.mandrake.asterisk
@@ -15,7 +15,12 @@ CONSOLE=yes          # Whether or not you want a console
 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 @@ ulimit -c unlimited
 #{
 #}
 
-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 @@ run_asterisk()
                        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." | \

diff --git a/contrib/init.d/rc.mandrake.zaptel b/contrib/init.d/rc.mandrake.zaptel
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/contrib/init.d/rc.redhat.asterisk b/contrib/init.d/rc.redhat.asterisk
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/contrib/init.d/rc.slackware.asterisk b/contrib/init.d/rc.slackware.asterisk
old mode 100644 (file)
new mode 100755 (executable)