[asterisk-commits] oej: branch oej/astum r171524 - in /team/oej/astum: ./ agi/ apps/ autoconf/ b...

Tue Jan 27 06:52:58 CST 2009

Author: oej
Date: Tue Jan 27 06:52:57 2009
New Revision: 171524

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=171524
Log:
Reset automerge

Added:
    team/oej/astum/UPGRADE-1.6.txt
      - copied unchanged from r171401, trunk/UPGRADE-1.6.txt
    team/oej/astum/Zaptel-to-DAHDI.txt
      - copied unchanged from r171401, trunk/Zaptel-to-DAHDI.txt
    team/oej/astum/apps/app_originate.c
      - copied unchanged from r171401, trunk/apps/app_originate.c
    team/oej/astum/autoconf/
      - copied from r171401, trunk/autoconf/
    team/oej/astum/autoconf/acx_pthread.m4
      - copied unchanged from r171401, trunk/autoconf/acx_pthread.m4
    team/oej/astum/autoconf/ast_c_compile_check.m4
      - copied unchanged from r171401, trunk/autoconf/ast_c_compile_check.m4
    team/oej/astum/autoconf/ast_c_define_check.m4
      - copied unchanged from r171401, trunk/autoconf/ast_c_define_check.m4
    team/oej/astum/autoconf/ast_check_gnu_make.m4
      - copied unchanged from r171401, trunk/autoconf/ast_check_gnu_make.m4
    team/oej/astum/autoconf/ast_check_mandatory.m4
      - copied unchanged from r171401, trunk/autoconf/ast_check_mandatory.m4
    team/oej/astum/autoconf/ast_check_openh323.m4
      - copied unchanged from r171401, trunk/autoconf/ast_check_openh323.m4
    team/oej/astum/autoconf/ast_check_pwlib.m4
      - copied unchanged from r171401, trunk/autoconf/ast_check_pwlib.m4
    team/oej/astum/autoconf/ast_ext_lib.m4
      - copied unchanged from r171401, trunk/autoconf/ast_ext_lib.m4
    team/oej/astum/autoconf/ast_ext_tool_check.m4
      - copied unchanged from r171401, trunk/autoconf/ast_ext_tool_check.m4
    team/oej/astum/autoconf/ast_func_fork.m4
      - copied unchanged from r171401, trunk/autoconf/ast_func_fork.m4
    team/oej/astum/autoconf/ast_gcc_attribute.m4
      - copied unchanged from r171401, trunk/autoconf/ast_gcc_attribute.m4
    team/oej/astum/autoconf/ast_prog_egrep.m4
      - copied unchanged from r171401, trunk/autoconf/ast_prog_egrep.m4
    team/oej/astum/autoconf/ast_prog_ld.m4
      - copied unchanged from r171401, trunk/autoconf/ast_prog_ld.m4
    team/oej/astum/autoconf/ast_prog_ld_gnu.m4
      - copied unchanged from r171401, trunk/autoconf/ast_prog_ld_gnu.m4
    team/oej/astum/autoconf/ast_prog_sed.m4
      - copied unchanged from r171401, trunk/autoconf/ast_prog_sed.m4
    team/oej/astum/build_tools/get_documentation
      - copied unchanged from r171401, trunk/build_tools/get_documentation
    team/oej/astum/codecs/ex_adpcm.h
      - copied unchanged from r171401, trunk/codecs/ex_adpcm.h
    team/oej/astum/codecs/ex_alaw.h
      - copied unchanged from r171401, trunk/codecs/ex_alaw.h
    team/oej/astum/codecs/ex_g722.h
      - copied unchanged from r171401, trunk/codecs/ex_g722.h
    team/oej/astum/codecs/ex_g726.h
      - copied unchanged from r171401, trunk/codecs/ex_g726.h
    team/oej/astum/codecs/ex_gsm.h
      - copied unchanged from r171401, trunk/codecs/ex_gsm.h
    team/oej/astum/codecs/ex_ilbc.h
      - copied unchanged from r171401, trunk/codecs/ex_ilbc.h
    team/oej/astum/codecs/ex_lpc10.h
      - copied unchanged from r171401, trunk/codecs/ex_lpc10.h
    team/oej/astum/codecs/ex_speex.h
      - copied unchanged from r171401, trunk/codecs/ex_speex.h
    team/oej/astum/codecs/ex_ulaw.h
      - copied unchanged from r171401, trunk/codecs/ex_ulaw.h
    team/oej/astum/configs/cli_aliases.conf.sample
      - copied unchanged from r171401, trunk/configs/cli_aliases.conf.sample
    team/oej/astum/configs/cli_permissions.conf.sample
      - copied unchanged from r171401, trunk/configs/cli_permissions.conf.sample
    team/oej/astum/contrib/init.d/rc.archlinux.asterisk
      - copied unchanged from r171401, trunk/contrib/init.d/rc.archlinux.asterisk
    team/oej/astum/contrib/scripts/live_ast
      - copied unchanged from r171401, trunk/contrib/scripts/live_ast
    team/oej/astum/contrib/scripts/sip_nat_settings
      - copied unchanged from r171401, trunk/contrib/scripts/sip_nat_settings
    team/oej/astum/doc/api-1.6.2-changes.txt
      - copied unchanged from r171401, trunk/doc/api-1.6.2-changes.txt
    team/oej/astum/doc/appdocsxml.dtd
      - copied unchanged from r171401, trunk/doc/appdocsxml.dtd
    team/oej/astum/doc/followme.txt
      - copied unchanged from r171401, trunk/doc/followme.txt
    team/oej/astum/funcs/func_audiohookinherit.c
      - copied unchanged from r171401, trunk/funcs/func_audiohookinherit.c
    team/oej/astum/funcs/func_sprintf.c
      - copied unchanged from r171401, trunk/funcs/func_sprintf.c
    team/oej/astum/include/asterisk/buildinfo.h
      - copied unchanged from r171401, trunk/include/asterisk/buildinfo.h
    team/oej/astum/include/asterisk/optional_api.h
      - copied unchanged from r171401, trunk/include/asterisk/optional_api.h
    team/oej/astum/include/asterisk/slin.h
      - copied unchanged from r171401, trunk/include/asterisk/slin.h
    team/oej/astum/include/asterisk/xml.h
      - copied unchanged from r171401, trunk/include/asterisk/xml.h
    team/oej/astum/include/asterisk/xmldoc.h
      - copied unchanged from r171401, trunk/include/asterisk/xmldoc.h
    team/oej/astum/main/strings.c
      - copied unchanged from r171401, trunk/main/strings.c
    team/oej/astum/main/xml.c
      - copied unchanged from r171401, trunk/main/xml.c
    team/oej/astum/main/xmldoc.c
      - copied unchanged from r171401, trunk/main/xmldoc.c
    team/oej/astum/pbx/ael/ael-test/ael-vtest25/
      - copied from r171401, trunk/pbx/ael/ael-test/ael-vtest25/
    team/oej/astum/pbx/ael/ael-test/ael-vtest25/extensions.ael
      - copied unchanged from r171401, trunk/pbx/ael/ael-test/ael-vtest25/extensions.ael
    team/oej/astum/pbx/ael/ael-test/ref.ael-vtest25
      - copied unchanged from r171401, trunk/pbx/ael/ael-test/ref.ael-vtest25
    team/oej/astum/res/res_clialiases.c
      - copied unchanged from r171401, trunk/res/res_clialiases.c
    team/oej/astum/res/res_timing_timerfd.c
      - copied unchanged from r171401, trunk/res/res_timing_timerfd.c
Removed:
    team/oej/astum/acinclude.m4
    team/oej/astum/codecs/adpcm_slin_ex.h
    team/oej/astum/codecs/g722_slin_ex.h
    team/oej/astum/codecs/g726_slin_ex.h
    team/oej/astum/codecs/gsm_slin_ex.h
    team/oej/astum/codecs/ilbc_slin_ex.h
    team/oej/astum/codecs/lpc10_slin_ex.h
    team/oej/astum/codecs/slin_adpcm_ex.h
    team/oej/astum/codecs/slin_g722_ex.h
    team/oej/astum/codecs/slin_g726_ex.h
    team/oej/astum/codecs/slin_gsm_ex.h
    team/oej/astum/codecs/slin_ilbc_ex.h
    team/oej/astum/codecs/slin_lpc10_ex.h
    team/oej/astum/codecs/slin_resample_ex.h
    team/oej/astum/codecs/slin_speex_ex.h
    team/oej/astum/codecs/slin_ulaw_ex.h
    team/oej/astum/codecs/speex_slin_ex.h
    team/oej/astum/codecs/ulaw_slin_ex.h
    team/oej/astum/redhat/
    team/oej/astum/res/ais/amf.c
    team/oej/astum/res/ais/ckpt.c
    team/oej/astum/res/ais/lck.c
    team/oej/astum/utils/build-extensions-conf.lua
Modified:
    team/oej/astum/   (props changed)
    team/oej/astum/.cleancount
    team/oej/astum/CHANGES
    team/oej/astum/CREDITS
    team/oej/astum/Makefile
    team/oej/astum/Makefile.moddir_rules
    team/oej/astum/Makefile.rules
    team/oej/astum/README
    team/oej/astum/UPGRADE-1.2.txt
    team/oej/astum/UPGRADE-1.4.txt
    team/oej/astum/UPGRADE.txt   (contents, props changed)
    team/oej/astum/agi/Makefile
    team/oej/astum/agi/eagi-sphinx-test.c
    team/oej/astum/agi/eagi-test.c
    team/oej/astum/apps/app_adsiprog.c
    team/oej/astum/apps/app_alarmreceiver.c
    team/oej/astum/apps/app_amd.c
    team/oej/astum/apps/app_authenticate.c
    team/oej/astum/apps/app_cdr.c
    team/oej/astum/apps/app_chanisavail.c
    team/oej/astum/apps/app_channelredirect.c
    team/oej/astum/apps/app_chanspy.c
    team/oej/astum/apps/app_controlplayback.c
    team/oej/astum/apps/app_dahdibarge.c
    team/oej/astum/apps/app_dahdiras.c
    team/oej/astum/apps/app_dahdiscan.c
    team/oej/astum/apps/app_db.c
    team/oej/astum/apps/app_dial.c
    team/oej/astum/apps/app_dictate.c
    team/oej/astum/apps/app_directed_pickup.c
    team/oej/astum/apps/app_directory.c
    team/oej/astum/apps/app_disa.c
    team/oej/astum/apps/app_dumpchan.c
    team/oej/astum/apps/app_echo.c
    team/oej/astum/apps/app_exec.c
    team/oej/astum/apps/app_externalivr.c
    team/oej/astum/apps/app_fax.c
    team/oej/astum/apps/app_festival.c
    team/oej/astum/apps/app_flash.c
    team/oej/astum/apps/app_followme.c
    team/oej/astum/apps/app_forkcdr.c
    team/oej/astum/apps/app_getcpeid.c
    team/oej/astum/apps/app_ices.c
    team/oej/astum/apps/app_image.c
    team/oej/astum/apps/app_ivrdemo.c
    team/oej/astum/apps/app_jack.c
    team/oej/astum/apps/app_macro.c
    team/oej/astum/apps/app_meetme.c
    team/oej/astum/apps/app_milliwatt.c
    team/oej/astum/apps/app_minivm.c
    team/oej/astum/apps/app_mixmonitor.c
    team/oej/astum/apps/app_morsecode.c
    team/oej/astum/apps/app_mp3.c
    team/oej/astum/apps/app_nbscat.c
    team/oej/astum/apps/app_osplookup.c
    team/oej/astum/apps/app_page.c
    team/oej/astum/apps/app_parkandannounce.c
    team/oej/astum/apps/app_playback.c
    team/oej/astum/apps/app_privacy.c
    team/oej/astum/apps/app_queue.c
    team/oej/astum/apps/app_read.c
    team/oej/astum/apps/app_readexten.c
    team/oej/astum/apps/app_readfile.c
    team/oej/astum/apps/app_record.c
    team/oej/astum/apps/app_rpt.c
    team/oej/astum/apps/app_sayunixtime.c
    team/oej/astum/apps/app_senddtmf.c
    team/oej/astum/apps/app_sendtext.c
    team/oej/astum/apps/app_setcallerid.c
    team/oej/astum/apps/app_skel.c
    team/oej/astum/apps/app_sms.c
    team/oej/astum/apps/app_softhangup.c
    team/oej/astum/apps/app_speech_utils.c
    team/oej/astum/apps/app_stack.c
    team/oej/astum/apps/app_system.c
    team/oej/astum/apps/app_talkdetect.c
    team/oej/astum/apps/app_test.c
    team/oej/astum/apps/app_transfer.c
    team/oej/astum/apps/app_url.c
    team/oej/astum/apps/app_userevent.c
    team/oej/astum/apps/app_verbose.c
    team/oej/astum/apps/app_voicemail.c
    team/oej/astum/apps/app_waitforring.c
    team/oej/astum/apps/app_waitforsilence.c
    team/oej/astum/apps/app_waituntil.c
    team/oej/astum/apps/app_while.c
    team/oej/astum/apps/app_zapateller.c
    team/oej/astum/bootstrap.sh
    team/oej/astum/build_tools/cflags-devmode.xml
    team/oej/astum/build_tools/get_makeopts
    team/oej/astum/build_tools/get_moduleinfo
    team/oej/astum/build_tools/make_buildopts_h
    team/oej/astum/build_tools/make_version
    team/oej/astum/build_tools/menuselect-deps.in
    team/oej/astum/build_tools/prep_tarball
    team/oej/astum/cdr/Makefile
    team/oej/astum/cdr/cdr_adaptive_odbc.c
    team/oej/astum/cdr/cdr_csv.c
    team/oej/astum/cdr/cdr_custom.c
    team/oej/astum/cdr/cdr_manager.c
    team/oej/astum/cdr/cdr_odbc.c
    team/oej/astum/cdr/cdr_pgsql.c
    team/oej/astum/cdr/cdr_radius.c
    team/oej/astum/cdr/cdr_sqlite.c
    team/oej/astum/cdr/cdr_sqlite3_custom.c
    team/oej/astum/cdr/cdr_tds.c
    team/oej/astum/channels/   (props changed)
    team/oej/astum/channels/Makefile
    team/oej/astum/channels/chan_agent.c
    team/oej/astum/channels/chan_alsa.c
    team/oej/astum/channels/chan_console.c
    team/oej/astum/channels/chan_dahdi.c
    team/oej/astum/channels/chan_features.c
    team/oej/astum/channels/chan_gtalk.c
    team/oej/astum/channels/chan_h323.c
    team/oej/astum/channels/chan_iax2.c
    team/oej/astum/channels/chan_jingle.c
    team/oej/astum/channels/chan_local.c
    team/oej/astum/channels/chan_mgcp.c
    team/oej/astum/channels/chan_misdn.c
    team/oej/astum/channels/chan_oss.c
    team/oej/astum/channels/chan_phone.c
    team/oej/astum/channels/chan_sip.c
    team/oej/astum/channels/chan_skinny.c
    team/oej/astum/channels/chan_unistim.c
    team/oej/astum/channels/chan_usbradio.c
    team/oej/astum/channels/chan_vpb.cc
    team/oej/astum/channels/console_gui.c
    team/oej/astum/channels/console_video.c
    team/oej/astum/channels/h323/README
    team/oej/astum/channels/h323/ast_h323.cxx
    team/oej/astum/channels/iax2-parser.c
    team/oej/astum/channels/iax2-provision.c
    team/oej/astum/channels/misdn/   (props changed)
    team/oej/astum/channels/misdn/Makefile
    team/oej/astum/channels/misdn/ie.c
    team/oej/astum/channels/misdn/isdn_lib.c
    team/oej/astum/channels/misdn/isdn_lib.h
    team/oej/astum/channels/misdn/isdn_lib_intern.h
    team/oej/astum/channels/misdn_config.c
    team/oej/astum/channels/vcodecs.c
    team/oej/astum/channels/xpmr/xpmr.c
    team/oej/astum/codecs/Makefile
    team/oej/astum/codecs/codec_a_mu.c
    team/oej/astum/codecs/codec_adpcm.c
    team/oej/astum/codecs/codec_alaw.c
    team/oej/astum/codecs/codec_dahdi.c
    team/oej/astum/codecs/codec_g722.c
    team/oej/astum/codecs/codec_g726.c
    team/oej/astum/codecs/codec_gsm.c
    team/oej/astum/codecs/codec_ilbc.c
    team/oej/astum/codecs/codec_lpc10.c
    team/oej/astum/codecs/codec_resample.c
    team/oej/astum/codecs/codec_speex.c
    team/oej/astum/codecs/codec_ulaw.c
    team/oej/astum/codecs/gsm/Makefile
    team/oej/astum/codecs/gsm/src/   (props changed)
    team/oej/astum/codecs/lpc10/chanwr.c
    team/oej/astum/codecs/lpc10/lpcini.c
    team/oej/astum/configs/agents.conf.sample
    team/oej/astum/configs/cdr.conf.sample
    team/oej/astum/configs/cdr_adaptive_odbc.conf.sample
    team/oej/astum/configs/cdr_tds.conf.sample
    team/oej/astum/configs/chan_dahdi.conf.sample
    team/oej/astum/configs/extconfig.conf.sample
    team/oej/astum/configs/extensions.conf.sample
    team/oej/astum/configs/extensions.lua.sample
    team/oej/astum/configs/features.conf.sample
    team/oej/astum/configs/followme.conf.sample
    team/oej/astum/configs/func_odbc.conf.sample
    team/oej/astum/configs/iax.conf.sample
    team/oej/astum/configs/indications.conf.sample
    team/oej/astum/configs/jabber.conf.sample
    team/oej/astum/configs/misdn.conf.sample
    team/oej/astum/configs/modules.conf.sample
    team/oej/astum/configs/musiconhold.conf.sample
    team/oej/astum/configs/phoneprov.conf.sample
    team/oej/astum/configs/queues.conf.sample
    team/oej/astum/configs/res_ldap.conf.sample
    team/oej/astum/configs/rtp.conf.sample
    team/oej/astum/configs/sip.conf.sample
    team/oej/astum/configs/sip_notify.conf.sample
    team/oej/astum/configs/skinny.conf.sample
    team/oej/astum/configs/voicemail.conf.sample
    team/oej/astum/configure
    team/oej/astum/configure.ac
    team/oej/astum/contrib/asterisk-ng-doxygen
    team/oej/astum/contrib/i18n.testsuite.conf
    team/oej/astum/contrib/init.d/rc.debian.asterisk
    team/oej/astum/contrib/init.d/rc.mandriva.asterisk
    team/oej/astum/contrib/init.d/rc.redhat.asterisk
    team/oej/astum/contrib/init.d/rc.suse.asterisk
    team/oej/astum/contrib/scripts/autosupport
    team/oej/astum/contrib/scripts/autosupport.8
    team/oej/astum/contrib/scripts/realtime_pgsql.sql
    team/oej/astum/contrib/scripts/safe_asterisk
    team/oej/astum/contrib/scripts/safe_asterisk_restart
    team/oej/astum/contrib/scripts/sip-friends.sql
    team/oej/astum/contrib/scripts/vmail.cgi
    team/oej/astum/contrib/scripts/vmdb.sql
    team/oej/astum/doc/   (props changed)
    team/oej/astum/doc/CODING-GUIDELINES
    team/oej/astum/doc/asterisk.8
    team/oej/astum/doc/janitor-projects.txt
    team/oej/astum/doc/manager_1_1.txt
    team/oej/astum/doc/realtimetext.txt   (props changed)
    team/oej/astum/doc/sip-retransmit.txt   (props changed)
    team/oej/astum/doc/tex/Makefile
    team/oej/astum/doc/tex/asterisk-conf.tex
    team/oej/astum/doc/tex/asterisk.tex
    team/oej/astum/doc/tex/cdrdriver.tex
    team/oej/astum/doc/tex/channelvariables.tex
    team/oej/astum/doc/tex/extensions.tex
    team/oej/astum/doc/tex/misdn.tex
    team/oej/astum/doc/tex/odbcstorage.tex
    team/oej/astum/doc/tex/phoneprov.tex   (props changed)
    team/oej/astum/doc/tex/privacy.tex
    team/oej/astum/doc/tex/qos.tex
    team/oej/astum/doc/valgrind.txt
    team/oej/astum/formats/format_gsm.c
    team/oej/astum/formats/format_ogg_vorbis.c
    team/oej/astum/formats/format_pcm.c
    team/oej/astum/formats/format_wav.c
    team/oej/astum/formats/format_wav_gsm.c
    team/oej/astum/formats/msgsm.h
    team/oej/astum/funcs/Makefile
    team/oej/astum/funcs/func_base64.c
    team/oej/astum/funcs/func_blacklist.c
    team/oej/astum/funcs/func_callerid.c
    team/oej/astum/funcs/func_cdr.c
    team/oej/astum/funcs/func_config.c
    team/oej/astum/funcs/func_curl.c
    team/oej/astum/funcs/func_cut.c
    team/oej/astum/funcs/func_db.c
    team/oej/astum/funcs/func_devstate.c
    team/oej/astum/funcs/func_dialgroup.c
    team/oej/astum/funcs/func_dialplan.c
    team/oej/astum/funcs/func_enum.c
    team/oej/astum/funcs/func_env.c
    team/oej/astum/funcs/func_extstate.c
    team/oej/astum/funcs/func_global.c
    team/oej/astum/funcs/func_groupcount.c
    team/oej/astum/funcs/func_iconv.c
    team/oej/astum/funcs/func_lock.c
    team/oej/astum/funcs/func_logic.c
    team/oej/astum/funcs/func_math.c
    team/oej/astum/funcs/func_md5.c
    team/oej/astum/funcs/func_module.c
    team/oej/astum/funcs/func_odbc.c
    team/oej/astum/funcs/func_rand.c
    team/oej/astum/funcs/func_realtime.c
    team/oej/astum/funcs/func_sha1.c
    team/oej/astum/funcs/func_shell.c
    team/oej/astum/funcs/func_speex.c
    team/oej/astum/funcs/func_strings.c
    team/oej/astum/funcs/func_timeout.c
    team/oej/astum/funcs/func_uri.c
    team/oej/astum/funcs/func_version.c
    team/oej/astum/funcs/func_vmcount.c
    team/oej/astum/funcs/func_volume.c
    team/oej/astum/include/asterisk.h
    team/oej/astum/include/asterisk/_private.h
    team/oej/astum/include/asterisk/ael_structs.h
    team/oej/astum/include/asterisk/agi.h
    team/oej/astum/include/asterisk/app.h
    team/oej/astum/include/asterisk/astmm.h
    team/oej/astum/include/asterisk/astobj2.h
    team/oej/astum/include/asterisk/audiohook.h
    team/oej/astum/include/asterisk/autoconfig.h.in
    team/oej/astum/include/asterisk/callerid.h
    team/oej/astum/include/asterisk/cdr.h
    team/oej/astum/include/asterisk/channel.h
    team/oej/astum/include/asterisk/chanvars.h
    team/oej/astum/include/asterisk/cli.h
    team/oej/astum/include/asterisk/compat.h
    team/oej/astum/include/asterisk/compiler.h
    team/oej/astum/include/asterisk/config.h
    team/oej/astum/include/asterisk/devicestate.h
    team/oej/astum/include/asterisk/dial.h
    team/oej/astum/include/asterisk/dlinkedlists.h
    team/oej/astum/include/asterisk/doxyref.h
    team/oej/astum/include/asterisk/dsp.h
    team/oej/astum/include/asterisk/dundi.h
    team/oej/astum/include/asterisk/endian.h
    team/oej/astum/include/asterisk/enum.h
    team/oej/astum/include/asterisk/extconf.h
    team/oej/astum/include/asterisk/features.h
    team/oej/astum/include/asterisk/file.h
    team/oej/astum/include/asterisk/frame.h
    team/oej/astum/include/asterisk/hashtab.h
    team/oej/astum/include/asterisk/indications.h
    team/oej/astum/include/asterisk/linkedlists.h
    team/oej/astum/include/asterisk/localtime.h
    team/oej/astum/include/asterisk/lock.h
    team/oej/astum/include/asterisk/logger.h
    team/oej/astum/include/asterisk/manager.h
    team/oej/astum/include/asterisk/module.h
    team/oej/astum/include/asterisk/options.h
    team/oej/astum/include/asterisk/pbx.h
    team/oej/astum/include/asterisk/pval.h
    team/oej/astum/include/asterisk/res_odbc.h
    team/oej/astum/include/asterisk/say.h
    team/oej/astum/include/asterisk/sched.h
    team/oej/astum/include/asterisk/stringfields.h
    team/oej/astum/include/asterisk/strings.h
    team/oej/astum/include/asterisk/tcptls.h
    team/oej/astum/include/asterisk/term.h
    team/oej/astum/include/asterisk/threadstorage.h
    team/oej/astum/include/asterisk/timing.h
    team/oej/astum/include/asterisk/utils.h
    team/oej/astum/include/jitterbuf.h
    team/oej/astum/main/Makefile
    team/oej/astum/main/abstract_jb.c
    team/oej/astum/main/acl.c
    team/oej/astum/main/app.c
    team/oej/astum/main/ast_expr2.c
    team/oej/astum/main/ast_expr2.fl
    team/oej/astum/main/ast_expr2.h
    team/oej/astum/main/ast_expr2.y
    team/oej/astum/main/ast_expr2f.c
    team/oej/astum/main/asterisk.c
    team/oej/astum/main/astmm.c
    team/oej/astum/main/astobj2.c
    team/oej/astum/main/audiohook.c
    team/oej/astum/main/autoservice.c
    team/oej/astum/main/buildinfo.c
    team/oej/astum/main/callerid.c
    team/oej/astum/main/cdr.c
    team/oej/astum/main/channel.c
    team/oej/astum/main/chanvars.c
    team/oej/astum/main/cli.c
    team/oej/astum/main/config.c
    team/oej/astum/main/cryptostub.c
    team/oej/astum/main/db.c
    team/oej/astum/main/db1-ast/Makefile
    team/oej/astum/main/db1-ast/btree/   (props changed)
    team/oej/astum/main/db1-ast/btree/bt_delete.c
    team/oej/astum/main/db1-ast/btree/bt_put.c
    team/oej/astum/main/db1-ast/db/   (props changed)
    team/oej/astum/main/db1-ast/hash/   (props changed)
    team/oej/astum/main/db1-ast/hash/hash_page.c
    team/oej/astum/main/db1-ast/mpool/   (props changed)
    team/oej/astum/main/db1-ast/recno/   (props changed)
    team/oej/astum/main/db1-ast/recno/rec_delete.c
    team/oej/astum/main/db1-ast/recno/rec_put.c
    team/oej/astum/main/devicestate.c
    team/oej/astum/main/dial.c
    team/oej/astum/main/dns.c
    team/oej/astum/main/dnsmgr.c
    team/oej/astum/main/dsp.c
    team/oej/astum/main/editline/read.c
    team/oej/astum/main/editline/readline.c
    team/oej/astum/main/enum.c
    team/oej/astum/main/event.c
    team/oej/astum/main/features.c
    team/oej/astum/main/file.c
    team/oej/astum/main/frame.c
    team/oej/astum/main/hashtab.c
    team/oej/astum/main/http.c
    team/oej/astum/main/indications.c
    team/oej/astum/main/jitterbuf.c
    team/oej/astum/main/loader.c
    team/oej/astum/main/logger.c
    team/oej/astum/main/manager.c
    team/oej/astum/main/pbx.c
    team/oej/astum/main/poll.c
    team/oej/astum/main/rtp.c
    team/oej/astum/main/say.c
    team/oej/astum/main/sched.c
    team/oej/astum/main/srv.c
    team/oej/astum/main/stdtime/   (props changed)
    team/oej/astum/main/stdtime/Makefile
    team/oej/astum/main/stdtime/localtime.c
    team/oej/astum/main/taskprocessor.c
    team/oej/astum/main/tcptls.c
    team/oej/astum/main/tdd.c
    team/oej/astum/main/term.c
    team/oej/astum/main/threadstorage.c
    team/oej/astum/main/translate.c
    team/oej/astum/main/udptl.c
    team/oej/astum/main/utils.c
    team/oej/astum/makeopts.in
    team/oej/astum/pbx/Makefile
    team/oej/astum/pbx/ael/   (props changed)
    team/oej/astum/pbx/ael/ael-test/ref.ael-ntest10
    team/oej/astum/pbx/ael/ael-test/ref.ael-test18
    team/oej/astum/pbx/ael/ael-test/ref.ael-test19
    team/oej/astum/pbx/ael/ael-test/ref.ael-test6
    team/oej/astum/pbx/ael/ael-test/ref.ael-test8
    team/oej/astum/pbx/ael/ael-test/ref.ael-vtest13
    team/oej/astum/pbx/ael/ael-test/ref.ael-vtest17
    team/oej/astum/pbx/dundi-parser.c
    team/oej/astum/pbx/pbx_ael.c
    team/oej/astum/pbx/pbx_config.c
    team/oej/astum/pbx/pbx_dundi.c
    team/oej/astum/pbx/pbx_lua.c
    team/oej/astum/pbx/pbx_realtime.c
    team/oej/astum/pbx/pbx_spool.c
    team/oej/astum/phoneprov/000000000000.cfg
    team/oej/astum/phoneprov/polycom.xml
    team/oej/astum/phoneprov/polycom_line.xml   (contents, props changed)
    team/oej/astum/res/Makefile
    team/oej/astum/res/ael/   (props changed)
    team/oej/astum/res/ael/ael.flex
    team/oej/astum/res/ael/ael.tab.c
    team/oej/astum/res/ael/ael.tab.h
    team/oej/astum/res/ael/ael.y
    team/oej/astum/res/ael/ael_lex.c
    team/oej/astum/res/ael/pval.c
    team/oej/astum/res/ais/   (props changed)
    team/oej/astum/res/ais/clm.c
    team/oej/astum/res/ais/evt.c
    team/oej/astum/res/res_adsi.c
    team/oej/astum/res/res_agi.c
    team/oej/astum/res/res_clioriginate.c
    team/oej/astum/res/res_config_curl.c
    team/oej/astum/res/res_config_ldap.c
    team/oej/astum/res/res_config_odbc.c
    team/oej/astum/res/res_config_pgsql.c
    team/oej/astum/res/res_config_sqlite.c
    team/oej/astum/res/res_convert.c
    team/oej/astum/res/res_crypto.c
    team/oej/astum/res/res_http_post.c   (contents, props changed)
    team/oej/astum/res/res_indications.c
    team/oej/astum/res/res_jabber.c
    team/oej/astum/res/res_limit.c
    team/oej/astum/res/res_monitor.c
    team/oej/astum/res/res_musiconhold.c
    team/oej/astum/res/res_odbc.c
    team/oej/astum/res/res_phoneprov.c   (contents, props changed)
    team/oej/astum/res/res_realtime.c
    team/oej/astum/res/res_smdi.c
    team/oej/astum/res/res_snmp.c
    team/oej/astum/res/res_timing_dahdi.c
    team/oej/astum/res/res_timing_pthread.c
    team/oej/astum/res/snmp/   (props changed)
    team/oej/astum/res/snmp/agent.c
    team/oej/astum/sounds/Makefile
    team/oej/astum/sounds/sounds.xml
    team/oej/astum/utils/   (props changed)
    team/oej/astum/utils/Makefile
    team/oej/astum/utils/ael_main.c
    team/oej/astum/utils/astcanary.c
    team/oej/astum/utils/astman.c
    team/oej/astum/utils/check_expr.c
    team/oej/astum/utils/conf2ael.c
    team/oej/astum/utils/extconf.c
    team/oej/astum/utils/frame.c
    team/oej/astum/utils/hashtest.c
    team/oej/astum/utils/hashtest2.c
    team/oej/astum/utils/muted.c
    team/oej/astum/utils/refcounter.c
    team/oej/astum/utils/smsq.c
    team/oej/astum/utils/stereorize.c
    team/oej/astum/utils/streamplayer.c

Propchange: team/oej/astum/
------------------------------------------------------------------------------
    automerge = http://www.codename-pineapple.org/

Propchange: team/oej/astum/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/oej/astum/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/oej/astum/
------------------------------------------------------------------------------
    reviewboard:url = http://reviewboard.digium.com

Propchange: team/oej/astum/
------------------------------------------------------------------------------

--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jan 27 06:52:57 2009
@@ -1,1 +1,1 @@
-/trunk:1-135996
+/trunk:1-171438

Modified: team/oej/astum/.cleancount
URL: http://svn.digium.com/svn-view/asterisk/team/oej/astum/.cleancount?view=diff&rev=171524&r1=171523&r2=171524
==============================================================================
--- team/oej/astum/.cleancount (original)
+++ team/oej/astum/.cleancount Tue Jan 27 06:52:57 2009
@@ -1,1 +1,1 @@
-35
+36

Modified: team/oej/astum/CHANGES
URL: http://svn.digium.com/svn-view/asterisk/team/oej/astum/CHANGES?view=diff&rev=171524&r1=171523&r2=171524
==============================================================================
--- team/oej/astum/CHANGES (original)
+++ team/oej/astum/CHANGES Tue Jan 27 06:52:57 2009
@@ -1,3 +1,143 @@
+======================================================================
+===
+=== This file documents the new and/or enhanced functionality added in
+=== the Asterisk versions listed below. This file does NOT include
+=== changes in behavior that would not be backwards compatible with
+=== previous versions; for that information see the UPGRADE.txt file
+=== and the other UPGRADE files for older releases.
+===
+======================================================================
+
+------------------------------------------------------------------------------
+--- Functionality changes from Asterisk 1.6.1 to Asterisk 1.6.2  -------------
+------------------------------------------------------------------------------
+
+SIP Changes
+-----------
+ * Added support for SUBSCRIBE/NOTIFY with dialog-info based call pickups.
+   Snom phones use this for call pickup of extensions that the phone is
+   subscribed to.
+ * Added support for subscribing to a voice mailbox on a remote server and
+   making the new/old message count available to local devices.
+ * Added support for setting the domain in the URI for caller of an
+   outbound call by using the SIPFROMDOMAIN channel variable.
+ * Added a new configuration option "remotesecret" for authentication to
+   remote services. For backwards compatibility, "secret" still has the
+   same function as before, but now you can configure both a remote secret and a
+   local secret for mutual authentication.
+ * Added a new 'faxdetect=yes|no' configuration option to sip.conf.  When this
+   option is enabled, a SIP channel will go to the fax extension (if it exists)
+   after T38 is negotiated.  This option is disabled by default.
+ * If ATTENDED_TRANSFER_COMPLETE_SOUND is set, the sound will be played to the
+   target of an attended transfer
+ * Added two new configuration options, "qualifygap" and "qualifypeers", which allow
+   finer control over how many peers Asterisk will qualify and the gap between them
+   when all peers need to be qualified at the same time.
+ * Added a new 'ignoresdpversion' option to sip.conf.  When this is enabled
+   (either globally or for a specific peer), chan_sip will treat any SDP data
+   it receives as new data and update the media stream accordingly.  By
+   default, Asterisk will only modify the media stream if the SDP session
+   version received is different from the current SDP session version.  This
+   option is required to interoperate with devices that have non-standard SDP
+   session version implementations (observed with Microsoft OCS).  This option
+   is disabled by default.
+ * The parsing of register => lines in sip.conf has been modified to allow a port
+   to be present in the "user" portion. Please see the sip.conf.sample file for more
+   information
+ * Added a function to remove SIP headers added in the dialplan before the
+   first INVITE is generated - SIPRemoveHeader()
+
+Skinny Changes
+--------------
+ * The configuration file now holds separate sections for devices and lines.
+   Please have a look at configs/skinny.conf.sample and change your skinny.conf
+   accordingly.
+
+DAHDI Changes
+-------------
+ * The UK option waitfordialtone has been added for use with BT analog
+   lines.
+
+Dialplan Functions
+------------------
+ * Added a new dialplan function, CURLOPT, which permits setting various
+   options that may be useful with the CURL dialplan function, such as
+   cookies, proxies, connection timeouts, passwords, etc.
+ * Permit the syntax and synopsis fields of the corresponding dialplan
+   functions to be individually set from func_odbc.conf.
+ * Added debugging CLI functions to func_odbc, 'odbc read' and 'odbc write'.
+ * func_odbc now may specify an insert query to execute, when the write query
+   affects 0 rows (usually indicating that no such row exists).
+ * Added a new dialplan function, LISTFILTER, which permits removing elements
+   from a set list, by name.  Uses the same general syntax as the existing CUT
+   and FIELDQTY dialplan functions, which also manage lists.
+ * Added REALTIME_FIELD and REALTIME_HASH, which should aid users in better
+   obtaining realtime data from the dialplan.
+ * Added LOCAL_PEEK, which I have no idea how to use, but Leif Madsen wanted it.
+   Russell says it's, like, a scope resolution function for LOCAL variables.
+   Totally.  Hopefully, that means more to you than it does to me.
+ * Added AUDIOHOOK_INHERIT. For information on its use, please see the output
+   of "core show function AUDIOHOOK_INHERIT" from the CLI
+
+Applications
+------------
+ * DAHDISendCallreroutingFacility parameters are now comma-separated,
+   instead of the old pipe.
+ * Scheduled meetme conferences may now have their end times extended by
+   using MeetMeAdmin.
+ * app_authenticate now gives the ability to select a prompt other than
+   the default.
+ * app_directory now pays attention to the searchcontexts setting in
+   voicemail.conf and will look through all contexts, if no context is
+   specified in the initial argument.
+ * A new application, Originate, has been introduced, that allows asynchronous
+   call origination from the dialplan.
+
+Miscellaneous
+-------------
+ * The Asterisk CLI has a new command, "channel redirect", which is similar in
+   operation to the AMI Redirect action.
+ * res_jabber: autoprune has been disabled by default, to avoid misconfiguration 
+   that would end up being interpreted as a bug once Asterisk started removing 
+   the contacts from a user list.
+ * extensions.conf now allows you to use keyword "same" to define an extension
+   without actually specifying an extension.  It uses exactly the same pattern
+   as previously used on the last "exten" line.  For example:
+     exten => 123,1,NoOp(something)
+     same  =>     n,SomethingElse()
+ * musiconhold.conf classes of type 'files' can now use relative directory paths,
+   which are interpreted as relative to the astvarlibdir setting in asterisk.conf.
+ * All deprecated CLI commands are removed from the sourcecode. They are now handled
+   by the new clialiases module. See cli_aliases.conf.sample file.
+ * Times within timespecs are now accurate down to the minute.  This is a change
+   from historical Asterisk, which only provided timespecs rounded to the nearest
+   even (read: evenly divisible by 2) minute mark.
+ * The realtime switch now supports an option flag, 'p', which disables searches for
+   pattern matches.
+ * In addition to a time range and date range, timespecs now accept a 5th optional
+   argument, timezone.  This allows you to perform time checks on alternate
+   timezones, especially if those daylight savings time ranges vary from your
+   machine's native timezone.  See GotoIfTime, ExecIfTime, IFTIME(), and timed
+   includes.
+ * The contrib/scripts/ directory now has a script called sip_nat_settings that will
+   give you the correct output for an asterisk box behind nat. It will give you the
+   externhost and localnet settings.
+
+Asterisk Manager Interface
+--------------------------
+ * When using the AMI over HTTP, you can now include a 'SuppressEvents' header (with
+   a non-empty value) in your request. If you do this, any pending AMI events will
+   *not* be included in the response to your request as they would normally, but
+   will be left in the event queue for the next request you make to retrieve. For
+   some applications, this will allow you to guarantee that you will only see
+   events in responses to 'WaitEvent' actions, and can better know when to expect them.
+   To know whether the Asterisk server supports this header or not, your client can
+   inspect the first response back from the server to see if it includes this header:
+
+   Pragma: SuppressEvents
+
+   If this is included, the server supports event suppression.
+
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 1.6.0 to Asterisk 1.6.1  -------------
 ------------------------------------------------------------------------------
@@ -88,6 +228,8 @@
  * ExternalIVR now takes several options that affect the way it performs, as
    well as having several new commands.  Please see doc/externalivr.txt for the
    complete documentation.
+ * Added ability to communicate over a TCP socket instead of forking a child process for the 
+   ExternalIVR application.
  * ChanIsAvail has a new option, 'a', which will return all available channels instead
    of just the first one if you give the function more then one channel to check.
  * PrivacyManager now takes an option where you can specify a context where the 
@@ -106,6 +248,9 @@
    status variable SENDIMAGESTATUS to one of 'SUCCESS', 'FAILURE', or
    'UNSUPPORTED'.  This change makes SendImage() more consistent with other
    applications.
+ * Park has a new option, 's', which silences the announcement of the parking space number.
+ * A non-numeric, zero, or negative timeout specified to Dial() will now be interpreted as
+   invalid input and will be assumed to mean that no timeout is desired.
 
 SIP Changes
 -----------
@@ -167,6 +312,7 @@
 --------------------------------
   * The Status command now takes an optional list of variables to display
     along with channel status.
+  * The QueueEntry event now also includes the channel's uniqueid
 
 ODBC Changes
 ------------
@@ -203,6 +349,11 @@
     operator.  This is most helpful when working with long SQL queries in
     func_odbc.conf, as the queries no longer need to be specified on a single
     line.
+  * CDR config file, cdr.conf, has an added option, "initiatedseconds", 
+    which will add a second to the billsec when the ending
+    time is set, if the number in the microseconds field of the end time is 
+    greater than the number of microseconds in the answer time. This allows
+    users to count the 'initiated' seconds in their billing records. 
 
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 1.4.X to Asterisk 1.6.0  -------------
@@ -260,6 +411,8 @@
   * Originate now accepts codec settings with "Codecs: alaw, ulaw, h264" 
   * New command: Atxfer. See doc/manager_1_1.txt for more details or 
     manager show command Atxfer from the CLI
+  * New command: IAXregistry. See doc/manager_1_1.txt for more details or
+    manager show command IAXregistry from the CLI
 
 Dialplan functions
 ------------------
@@ -294,6 +447,12 @@
 
 CLI Changes
 -----------
+  * Added CLI permissions, config file: cli_permissions.conf
+     default is to allow all commands for every local user/group.
+     Also this new feature added three new CLI commands:
+      - cli check permissions {<username>|@<groupname>|<username>@<groupname>} [<command>]
+      - cli reload permissions
+      - cli show permissions
   * New CLI command "core show hint" (usage: core show hint <exten>)
   * New CLI command "core show settings"
   * Added 'core show channels count' CLI command.
@@ -313,6 +472,9 @@
     sorted into the different possible callbacks, with the number of entries
     currently scheduled for each. Gives you a feel for how busy the sip channel
     driver is.
+  * Added 'skinny show lines verbose' CLI command. This will show the subs for every channel.
+  * Cleanup another bunch of CLI commands. Now all modules follow the same schema.
+    (Done by lmadsen, junky and mvanbaak during the devcon 2008)
 
 SIP changes
 -----------
@@ -423,8 +585,8 @@
 ----------------------
   * The ackcall and endcall options are now supplemented with options acceptdtmf
     and enddtmf. These allow for the DTMF keypress to be configurable. The options
-	default to their old hard-coded values ('#' and '*' respectively) so this should
-	not break any existing agent installations.
+    default to their old hard-coded values ('#' and '*' respectively) so this should
+    not break any existing agent installations.
 
 DAHDI channel driver (chan_dahdi) Changes
 ----------------------------------------
@@ -567,6 +729,14 @@
     when a realtime queue member is removed. Since there is no calling channel associated
     with these events, the string "REALTIME" is placed where the channel's unique id
     is typically placed.
+  * The configuration method for the "joinempty" and "leavewhenempty" options has
+    changed to a comma-separated list of methods of determining member availability
+    instead of vague terms such as "yes," "loose," "no," and "strict." These old four
+    values are still accepted for backwards-compatibility, though.
+  * The average talktime is now calculated on queues. This information is reported via the
+    CLI commands "queue show" and "queues show"; through the AMI events AgentComplete, QueueSummary,
+    and QueueParams; and through the channelvariable QUEUETALKTIME if setinterfacevar=yes is set for
+    the queue.
 
 MeetMe Changes
 --------------

[... 114756 lines stripped ...]

