[asterisk-commits] branch kpfleming/test-for-merging - r7397 in
/team/kpfleming/test-for-merging...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Thu Dec 8 16:59:27 CST 2005
Author: kpfleming
Date: Thu Dec 8 16:59:08 2005
New Revision: 7397
URL: http://svn.digium.com/view/asterisk?rev=7397&view=rev
Log:
Merged revisions 7285,7299,7310,7329,7335,7337,7340,7345-7347,7349,7351,7382,7386 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
........
r7335 | russell | 2005-12-04 18:01:17 -0600 (Sun, 04 Dec 2005) | 2 lines
fix the order of arguments to an error message (issue #5927)
........
r7337 | russell | 2005-12-04 18:09:12 -0600 (Sun, 04 Dec 2005) | 2 lines
don't delete dynamic queue members when reloading the static members from a realtime database (issue #5922)
........
r7340 | russell | 2005-12-05 00:47:51 -0600 (Mon, 05 Dec 2005) | 2 lines
remove ASTERISKVERSIONNUM from the version string given to doxygen
........
r7345 | kpfleming | 2005-12-05 18:02:08 -0600 (Mon, 05 Dec 2005) | 2 lines
set this file to binary mode, so it won't be mangled on export/checkout
........
r7346 | kpfleming | 2005-12-05 18:07:48 -0600 (Mon, 05 Dec 2005) | 2 lines
don't try to expand keywords in this file
........
r7347 | kpfleming | 2005-12-05 18:08:19 -0600 (Mon, 05 Dec 2005) | 2 lines
_really_ don't mess with line endings
........
r7349 | kpfleming | 2005-12-05 18:19:17 -0600 (Mon, 05 Dec 2005) | 2 lines
replace with unmodified file
........
r7351 | kpfleming | 2005-12-05 18:23:05 -0600 (Mon, 05 Dec 2005) | 2 lines
ensure that sound/music files are handled as binary
........
r7382 | kpfleming | 2005-12-07 14:46:55 -0600 (Wed, 07 Dec 2005) | 2 lines
ensure that hints are allowed to use global variable references
........
r7386 | kpfleming | 2005-12-07 19:05:43 -0600 (Wed, 07 Dec 2005) | 2 lines
initialize the buffer before using it...
........
Modified:
team/kpfleming/test-for-merging/ (props changed)
team/kpfleming/test-for-merging/Makefile
team/kpfleming/test-for-merging/apps/app_queue.c
team/kpfleming/test-for-merging/apps/app_voicemail.c
team/kpfleming/test-for-merging/build_tools/make_svn_branch_name
team/kpfleming/test-for-merging/channels/chan_sip.c
team/kpfleming/test-for-merging/configs/sip.conf.sample
team/kpfleming/test-for-merging/contrib/firmware/iax/iaxy.bin (contents, props changed)
team/kpfleming/test-for-merging/contrib/init.d/rc.debian.asterisk (props changed)
team/kpfleming/test-for-merging/contrib/init.d/rc.gentoo.asterisk (props changed)
team/kpfleming/test-for-merging/contrib/init.d/rc.mandrake.asterisk (contents, props changed)
team/kpfleming/test-for-merging/contrib/init.d/rc.mandrake.zaptel (props changed)
team/kpfleming/test-for-merging/contrib/init.d/rc.redhat.asterisk (props changed)
team/kpfleming/test-for-merging/contrib/init.d/rc.slackware.asterisk (props changed)
team/kpfleming/test-for-merging/pbx.c
team/kpfleming/test-for-merging/sounds/agent-alreadyon.gsm (props changed)
team/kpfleming/test-for-merging/sounds/agent-incorrect.gsm (props changed)
team/kpfleming/test-for-merging/sounds/agent-loggedoff.gsm (props changed)
team/kpfleming/test-for-merging/sounds/agent-loginok.gsm (props changed)
team/kpfleming/test-for-merging/sounds/agent-newlocation.gsm (props changed)
team/kpfleming/test-for-merging/sounds/agent-pass.gsm (props changed)
team/kpfleming/test-for-merging/sounds/agent-user.gsm (props changed)
team/kpfleming/test-for-merging/sounds/auth-incorrect.gsm (props changed)
team/kpfleming/test-for-merging/sounds/auth-thankyou.gsm (props changed)
team/kpfleming/test-for-merging/sounds/beep.gsm (props changed)
team/kpfleming/test-for-merging/sounds/beeperr.gsm (props changed)
team/kpfleming/test-for-merging/sounds/conf-adminmenu.gsm (props changed)
team/kpfleming/test-for-merging/sounds/conf-enteringno.gsm (props changed)
team/kpfleming/test-for-merging/sounds/conf-errormenu.gsm (props changed)
team/kpfleming/test-for-merging/sounds/conf-getchannel.gsm (props changed)
team/kpfleming/test-for-merging/sounds/conf-getconfno.gsm (props changed)
team/kpfleming/test-for-merging/sounds/conf-getpin.gsm (props changed)
team/kpfleming/test-for-merging/sounds/conf-hasjoin.gsm (props changed)
team/kpfleming/test-for-merging/sounds/conf-hasleft.gsm (props changed)
team/kpfleming/test-for-merging/sounds/conf-invalid.gsm (props changed)
team/kpfleming/test-for-merging/sounds/conf-invalidpin.gsm (props changed)
team/kpfleming/test-for-merging/sounds/conf-kicked.gsm (props changed)
team/kpfleming/test-for-merging/sounds/conf-leaderhasleft.gsm (props changed)
team/kpfleming/test-for-merging/sounds/conf-locked.gsm (props changed)
team/kpfleming/test-for-merging/sounds/conf-lockednow.gsm (props changed)
team/kpfleming/test-for-merging/sounds/conf-muted.gsm (props changed)
team/kpfleming/test-for-merging/sounds/conf-noempty.gsm (props changed)
team/kpfleming/test-for-merging/sounds/conf-onlyone.gsm (props changed)
team/kpfleming/test-for-merging/sounds/conf-onlyperson.gsm (props changed)
team/kpfleming/test-for-merging/sounds/conf-otherinparty.gsm (props changed)
team/kpfleming/test-for-merging/sounds/conf-placeintoconf.gsm (props changed)
team/kpfleming/test-for-merging/sounds/conf-thereare.gsm (props changed)
team/kpfleming/test-for-merging/sounds/conf-unlockednow.gsm (props changed)
team/kpfleming/test-for-merging/sounds/conf-unmuted.gsm (props changed)
team/kpfleming/test-for-merging/sounds/conf-usermenu.gsm (props changed)
team/kpfleming/test-for-merging/sounds/conf-userswilljoin.gsm (props changed)
team/kpfleming/test-for-merging/sounds/conf-userwilljoin.gsm (props changed)
team/kpfleming/test-for-merging/sounds/conf-waitforleader.gsm (props changed)
team/kpfleming/test-for-merging/sounds/demo-abouttotry.gsm (props changed)
team/kpfleming/test-for-merging/sounds/demo-congrats.gsm (props changed)
team/kpfleming/test-for-merging/sounds/demo-echodone.gsm (props changed)
team/kpfleming/test-for-merging/sounds/demo-echotest.gsm (props changed)
team/kpfleming/test-for-merging/sounds/demo-enterkeywords.gsm (props changed)
team/kpfleming/test-for-merging/sounds/demo-instruct.gsm (props changed)
team/kpfleming/test-for-merging/sounds/demo-moreinfo.gsm (props changed)
team/kpfleming/test-for-merging/sounds/demo-nogo.gsm (props changed)
team/kpfleming/test-for-merging/sounds/demo-nomatch.gsm (props changed)
team/kpfleming/test-for-merging/sounds/demo-thanks.gsm (props changed)
team/kpfleming/test-for-merging/sounds/dictate/both_help.gsm (props changed)
team/kpfleming/test-for-merging/sounds/dictate/enter_filename.gsm (props changed)
team/kpfleming/test-for-merging/sounds/dictate/forhelp.gsm (props changed)
team/kpfleming/test-for-merging/sounds/dictate/pause.gsm (props changed)
team/kpfleming/test-for-merging/sounds/dictate/paused.gsm (props changed)
team/kpfleming/test-for-merging/sounds/dictate/play_help.gsm (props changed)
team/kpfleming/test-for-merging/sounds/dictate/playback.gsm (props changed)
team/kpfleming/test-for-merging/sounds/dictate/playback_mode.gsm (props changed)
team/kpfleming/test-for-merging/sounds/dictate/record.gsm (props changed)
team/kpfleming/test-for-merging/sounds/dictate/record_help.gsm (props changed)
team/kpfleming/test-for-merging/sounds/dictate/record_mode.gsm (props changed)
team/kpfleming/test-for-merging/sounds/dictate/truncating_audio.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/0.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/1.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/10.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/11.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/12.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/13.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/14.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/15.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/16.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/17.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/18.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/19.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/2.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/20.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/3.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/30.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/4.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/40.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/5.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/50.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/6.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/60.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/7.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/70.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/8.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/80.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/9.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/90.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/a-m.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/at.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/day-0.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/day-1.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/day-2.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/day-3.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/day-4.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/day-5.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/day-6.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/dollars.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/h-1.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/h-10.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/h-11.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/h-12.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/h-13.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/h-14.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/h-15.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/h-16.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/h-17.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/h-18.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/h-19.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/h-2.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/h-20.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/h-3.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/h-30.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/h-4.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/h-5.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/h-6.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/h-7.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/h-8.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/h-9.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/hundred.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/million.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/minus.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/mon-0.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/mon-1.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/mon-10.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/mon-11.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/mon-2.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/mon-3.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/mon-4.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/mon-5.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/mon-6.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/mon-7.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/mon-8.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/mon-9.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/oclock.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/oh.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/p-m.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/pound.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/star.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/thousand.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/today.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/tomorrow.gsm (props changed)
team/kpfleming/test-for-merging/sounds/digits/yesterday.gsm (props changed)
team/kpfleming/test-for-merging/sounds/dir-instr.gsm (props changed)
team/kpfleming/test-for-merging/sounds/dir-intro-fn.gsm (props changed)
team/kpfleming/test-for-merging/sounds/dir-intro.gsm (props changed)
team/kpfleming/test-for-merging/sounds/dir-nomatch.gsm (props changed)
team/kpfleming/test-for-merging/sounds/dir-nomore.gsm (props changed)
team/kpfleming/test-for-merging/sounds/fpm-calm-river.mp3 (props changed)
team/kpfleming/test-for-merging/sounds/fpm-sunshine.mp3 (props changed)
team/kpfleming/test-for-merging/sounds/fpm-world-mix.mp3 (props changed)
team/kpfleming/test-for-merging/sounds/hello-world.gsm (props changed)
team/kpfleming/test-for-merging/sounds/hours.gsm (props changed)
team/kpfleming/test-for-merging/sounds/invalid.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/a.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/at.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/b.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/c.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/d.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/dash.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/dollar.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/dot.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/e.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/equals.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/exclaimation-point.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/f.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/g.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/h.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/i.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/j.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/k.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/l.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/m.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/n.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/o.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/p.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/plus.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/q.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/r.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/s.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/slash.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/space.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/t.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/u.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/v.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/w.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/x.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/y.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/z.gsm (props changed)
team/kpfleming/test-for-merging/sounds/letters/zed.gsm (props changed)
team/kpfleming/test-for-merging/sounds/minutes.gsm (props changed)
team/kpfleming/test-for-merging/sounds/pbx-invalid.gsm (props changed)
team/kpfleming/test-for-merging/sounds/pbx-invalidpark.gsm (props changed)
team/kpfleming/test-for-merging/sounds/pbx-transfer.gsm (props changed)
team/kpfleming/test-for-merging/sounds/phonetic/9_p.gsm (props changed)
team/kpfleming/test-for-merging/sounds/phonetic/a_p.gsm (props changed)
team/kpfleming/test-for-merging/sounds/phonetic/b_p.gsm (props changed)
team/kpfleming/test-for-merging/sounds/phonetic/c_p.gsm (props changed)
team/kpfleming/test-for-merging/sounds/phonetic/d_p.gsm (props changed)
team/kpfleming/test-for-merging/sounds/phonetic/e_p.gsm (props changed)
team/kpfleming/test-for-merging/sounds/phonetic/f_p.gsm (props changed)
team/kpfleming/test-for-merging/sounds/phonetic/g_p.gsm (props changed)
team/kpfleming/test-for-merging/sounds/phonetic/h_p.gsm (props changed)
team/kpfleming/test-for-merging/sounds/phonetic/i_p.gsm (props changed)
team/kpfleming/test-for-merging/sounds/phonetic/j_p.gsm (props changed)
team/kpfleming/test-for-merging/sounds/phonetic/k_p.gsm (props changed)
team/kpfleming/test-for-merging/sounds/phonetic/l_p.gsm (props changed)
team/kpfleming/test-for-merging/sounds/phonetic/m_p.gsm (props changed)
team/kpfleming/test-for-merging/sounds/phonetic/n_p.gsm (props changed)
team/kpfleming/test-for-merging/sounds/phonetic/o_p.gsm (props changed)
team/kpfleming/test-for-merging/sounds/phonetic/p_p.gsm (props changed)
team/kpfleming/test-for-merging/sounds/phonetic/q_p.gsm (props changed)
team/kpfleming/test-for-merging/sounds/phonetic/r_p.gsm (props changed)
team/kpfleming/test-for-merging/sounds/phonetic/s_p.gsm (props changed)
team/kpfleming/test-for-merging/sounds/phonetic/t_p.gsm (props changed)
team/kpfleming/test-for-merging/sounds/phonetic/u_p.gsm (props changed)
team/kpfleming/test-for-merging/sounds/phonetic/v_p.gsm (props changed)
team/kpfleming/test-for-merging/sounds/phonetic/w_p.gsm (props changed)
team/kpfleming/test-for-merging/sounds/phonetic/x_p.gsm (props changed)
team/kpfleming/test-for-merging/sounds/phonetic/y_p.gsm (props changed)
team/kpfleming/test-for-merging/sounds/phonetic/z_p.gsm (props changed)
team/kpfleming/test-for-merging/sounds/priv-callee-options.gsm (props changed)
team/kpfleming/test-for-merging/sounds/priv-callpending.gsm (props changed)
team/kpfleming/test-for-merging/sounds/priv-introsaved.gsm (props changed)
team/kpfleming/test-for-merging/sounds/priv-recordintro.gsm (props changed)
team/kpfleming/test-for-merging/sounds/privacy-incorrect.gsm (props changed)
team/kpfleming/test-for-merging/sounds/privacy-prompt.gsm (props changed)
team/kpfleming/test-for-merging/sounds/privacy-thankyou.gsm (props changed)
team/kpfleming/test-for-merging/sounds/privacy-unident.gsm (props changed)
team/kpfleming/test-for-merging/sounds/queue-callswaiting.gsm (props changed)
team/kpfleming/test-for-merging/sounds/queue-holdtime.gsm (props changed)
team/kpfleming/test-for-merging/sounds/queue-less-than.gsm (props changed)
team/kpfleming/test-for-merging/sounds/queue-minutes.gsm (props changed)
team/kpfleming/test-for-merging/sounds/queue-periodic-announce.gsm (props changed)
team/kpfleming/test-for-merging/sounds/queue-reporthold.gsm (props changed)
team/kpfleming/test-for-merging/sounds/queue-seconds.gsm (props changed)
team/kpfleming/test-for-merging/sounds/queue-thankyou.gsm (props changed)
team/kpfleming/test-for-merging/sounds/queue-thereare.gsm (props changed)
team/kpfleming/test-for-merging/sounds/queue-youarenext.gsm (props changed)
team/kpfleming/test-for-merging/sounds/screen-callee-options.gsm (props changed)
team/kpfleming/test-for-merging/sounds/seconds.gsm (props changed)
team/kpfleming/test-for-merging/sounds/spy-agent.gsm (props changed)
team/kpfleming/test-for-merging/sounds/spy-h323.gsm (props changed)
team/kpfleming/test-for-merging/sounds/spy-iax.gsm (props changed)
team/kpfleming/test-for-merging/sounds/spy-iax2.gsm (props changed)
team/kpfleming/test-for-merging/sounds/spy-mgcp.gsm (props changed)
team/kpfleming/test-for-merging/sounds/spy-sip.gsm (props changed)
team/kpfleming/test-for-merging/sounds/spy-skinny.gsm (props changed)
team/kpfleming/test-for-merging/sounds/spy-zap.gsm (props changed)
team/kpfleming/test-for-merging/sounds/ss-noservice.gsm (props changed)
team/kpfleming/test-for-merging/sounds/transfer.gsm (props changed)
team/kpfleming/test-for-merging/sounds/tt-allbusy.gsm (props changed)
team/kpfleming/test-for-merging/sounds/tt-monkeys.gsm (props changed)
team/kpfleming/test-for-merging/sounds/tt-monkeysintro.gsm (props changed)
team/kpfleming/test-for-merging/sounds/tt-somethingwrong.gsm (props changed)
team/kpfleming/test-for-merging/sounds/tt-weasels.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-Cust1.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-Cust2.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-Cust3.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-Cust4.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-Cust5.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-Family.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-Friends.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-INBOX.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-Old.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-Work.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-advopts.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-and.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-calldiffnum.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-changeto.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-delete.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-deleted.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-dialout.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-enter-num-to-call.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-extension.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-first.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-for.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-forward.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-forwardoptions.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-from-extension.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-from-phonenumber.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-from.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-goodbye.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-helpexit.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-incorrect-mailbox.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-incorrect.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-instructions.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-intro.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-isonphone.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-isunavail.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-last.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-leavemsg.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-login.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-mailboxfull.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-message.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-messages.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-minutes.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-mismatch.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-msginstruct.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-msgsaved.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-newpassword.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-newuser.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-next.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-no.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-nobodyavail.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-nobox.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-nomore.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-nonumber.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-num-i-have.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-onefor.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-options.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-opts.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-passchanged.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-password.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-press.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-prev.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-reachoper.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-rec-busy.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-rec-name.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-rec-temp.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-rec-unv.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-received.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-reenterpassword.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-repeat.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-review.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-saved.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-savedto.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-savefolder.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-savemessage.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-saveoper.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-sorry.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-star-cancel.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-starmain.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-tempgreeting.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-tempgreeting2.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-tempremoved.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-then-pound.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-theperson.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-tocallback.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-tocallnum.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-tocancel.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-tocancelmsg.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-toenternumber.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-toforward.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-tohearenv.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-tomakecall.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-tooshort.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-toreply.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-torerecord.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-undelete.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-undeleted.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-unknown-caller.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-whichbox.gsm (props changed)
team/kpfleming/test-for-merging/sounds/vm-youhave.gsm (props changed)
Propchange: team/kpfleming/test-for-merging/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Dec 8 16:59:08 2005
@@ -1,1 +1,1 @@
-/branches/1.2:1-7283
+/branches/1.2:1-7396
Modified: team/kpfleming/test-for-merging/Makefile
URL: http://svn.digium.com/view/asterisk/team/kpfleming/test-for-merging/Makefile?rev=7397&r1=7396&r2=7397&view=diff
==============================================================================
--- team/kpfleming/test-for-merging/Makefile (original)
+++ team/kpfleming/test-for-merging/Makefile Thu Dec 8 16:59:08 2005
@@ -829,7 +829,7 @@
progdocs:
(cat contrib/asterisk-ng-doxygen; echo "HAVE_DOT=$(HAVEDOT)"; \
- echo "PROJECT_NUMBER=$(ASTERISKVERSION) - $(ASTERISKVERSIONNUM)") | doxygen -
+ echo "PROJECT_NUMBER=$(ASTERISKVERSION)") | doxygen -
mpg123:
@wget -V >/dev/null || (echo "You need wget" ; false )
Modified: team/kpfleming/test-for-merging/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/test-for-merging/apps/app_queue.c?rev=7397&r1=7396&r2=7397&view=diff
==============================================================================
--- team/kpfleming/test-for-merging/apps/app_queue.c (original)
+++ team/kpfleming/test-for-merging/apps/app_queue.c Thu Dec 8 16:59:08 2005
@@ -850,10 +850,11 @@
v = v->next;
}
- /* Temporarily set members dead so we can detect deleted ones. */
+ /* Temporarily set non-dynamic members dead so we can detect deleted ones. */
m = q->members;
while (m) {
- m->dead = 1;
+ if (!m->dynamic)
+ m->dead = 1;
m = m->next;
}
Modified: team/kpfleming/test-for-merging/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/test-for-merging/apps/app_voicemail.c?rev=7397&r1=7396&r2=7397&view=diff
==============================================================================
--- team/kpfleming/test-for-merging/apps/app_voicemail.c (original)
+++ team/kpfleming/test-for-merging/apps/app_voicemail.c Thu Dec 8 16:59:08 2005
@@ -3674,7 +3674,7 @@
/* Strip off caller ID number from name */
ast_log(LOG_DEBUG, "VM-CID: composite caller ID received: %s, context: %s\n", cid, context);
ast_callerid_parse(cid, &name, &callerid);
- if ((!res)&&(!ast_strlen_zero(callerid))){
+ if ((!ast_strlen_zero(callerid)) && strcmp(callerid, "Unknown")) {
/* Check for internal contexts and only */
/* say extension when the call didn't come from an internal context in the list */
for (i = 0 ; i < MAX_NUM_CID_CONTEXTS ; i++){
@@ -3714,9 +3714,8 @@
} else {
/* Number unknown */
ast_log(LOG_DEBUG, "VM-CID: From an unknown number\n");
- if (!res)
- /* BB: Say "from an unknown caller" as one phrase - it is already recorded by "the voice" anyhow */
- res = wait_file2(chan, vms, "vm-unknown-caller");
+ /* Say "from an unknown caller" as one phrase - it is already recorded by "the voice" anyhow */
+ res = wait_file2(chan, vms, "vm-unknown-caller");
}
return res;
}
Modified: team/kpfleming/test-for-merging/build_tools/make_svn_branch_name
URL: http://svn.digium.com/view/asterisk/team/kpfleming/test-for-merging/build_tools/make_svn_branch_name?rev=7397&r1=7396&r2=7397&view=diff
==============================================================================
--- team/kpfleming/test-for-merging/build_tools/make_svn_branch_name (original)
+++ team/kpfleming/test-for-merging/build_tools/make_svn_branch_name Thu Dec 8 16:59:08 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: team/kpfleming/test-for-merging/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/test-for-merging/channels/chan_sip.c?rev=7397&r1=7396&r2=7397&view=diff
==============================================================================
--- team/kpfleming/test-for-merging/channels/chan_sip.c (original)
+++ team/kpfleming/test-for-merging/channels/chan_sip.c Thu Dec 8 16:59:08 2005
@@ -1061,7 +1061,7 @@
res=sendto(sipsock, data, len, 0, (struct sockaddr *)&p->sa, sizeof(struct sockaddr_in));
if (res != len) {
- ast_log(LOG_WARNING, "sip_xmit of %p (len %d) to %s:%d returned %d: %s\n", data, len, ast_inet_ntoa(iabuf, sizeof(iabuf), p->sa.sin_addr), res, ntohs(p->sa.sin_port), strerror(errno));
+ ast_log(LOG_WARNING, "sip_xmit of %p (len %d) to %s:%d returned %d: %s\n", data, len, ast_inet_ntoa(iabuf, sizeof(iabuf), p->sa.sin_addr), ntohs(p->sa.sin_port), res, strerror(errno));
}
return res;
}
Modified: team/kpfleming/test-for-merging/configs/sip.conf.sample
URL: http://svn.digium.com/view/asterisk/team/kpfleming/test-for-merging/configs/sip.conf.sample?rev=7397&r1=7396&r2=7397&view=diff
==============================================================================
--- team/kpfleming/test-for-merging/configs/sip.conf.sample (original)
+++ team/kpfleming/test-for-merging/configs/sip.conf.sample Thu Dec 8 16:59:08 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 ------------------------
Modified: team/kpfleming/test-for-merging/contrib/firmware/iax/iaxy.bin
URL: http://svn.digium.com/view/asterisk/team/kpfleming/test-for-merging/contrib/firmware/iax/iaxy.bin?rev=7397&r1=7396&r2=7397&view=diff
==============================================================================
Binary files - no diff available.
Propchange: team/kpfleming/test-for-merging/contrib/firmware/iax/iaxy.bin
('svn:eol-style' removed)
Propchange: team/kpfleming/test-for-merging/contrib/firmware/iax/iaxy.bin
('svn:keywords' removed)
Propchange: team/kpfleming/test-for-merging/contrib/firmware/iax/iaxy.bin
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: team/kpfleming/test-for-merging/contrib/firmware/iax/iaxy.bin
------------------------------------------------------------------------------
svn:needs-lock = *
Propchange: team/kpfleming/test-for-merging/contrib/init.d/rc.debian.asterisk
------------------------------------------------------------------------------
svn:executable = *
Propchange: team/kpfleming/test-for-merging/contrib/init.d/rc.gentoo.asterisk
------------------------------------------------------------------------------
svn:executable = *
Modified: team/kpfleming/test-for-merging/contrib/init.d/rc.mandrake.asterisk
URL: http://svn.digium.com/view/asterisk/team/kpfleming/test-for-merging/contrib/init.d/rc.mandrake.asterisk?rev=7397&r1=7396&r2=7397&view=diff
==============================================================================
--- team/kpfleming/test-for-merging/contrib/init.d/rc.mandrake.asterisk (original)
+++ team/kpfleming/test-for-merging/contrib/init.d/rc.mandrake.asterisk Thu Dec 8 16:59:08 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: team/kpfleming/test-for-merging/contrib/init.d/rc.mandrake.asterisk
------------------------------------------------------------------------------
svn:executable = *
Propchange: team/kpfleming/test-for-merging/contrib/init.d/rc.mandrake.zaptel
[... 1820 lines stripped ...]
More information about the asterisk-commits
mailing list