diff --git a/build_tools/make_svn_branch_name b/build_tools/make_svn_branch_name index 484bef5853..b3af1492a1 100755 --- 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 e95704a888..4d279aa9cc 100644 --- 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 new mode 100755 diff --git a/contrib/init.d/rc.gentoo.asterisk b/contrib/init.d/rc.gentoo.asterisk old mode 100644 new mode 100755 diff --git a/contrib/init.d/rc.mandrake.asterisk b/contrib/init.d/rc.mandrake.asterisk old mode 100644 new mode 100755 index 5452fdda78..702de53dc6 --- 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 new mode 100755 diff --git a/contrib/init.d/rc.redhat.asterisk b/contrib/init.d/rc.redhat.asterisk old mode 100644 new mode 100755 diff --git a/contrib/init.d/rc.slackware.asterisk b/contrib/init.d/rc.slackware.asterisk old mode 100644 new mode 100755