[svn-commits] oej: branch oej/videocaps r88991 - in /team/oej/videocaps: ./ apps/ build_too...

Tue Nov 6 10:08:02 CST 2007

Author: oej
Date: Tue Nov  6 10:08:00 2007
New Revision: 88991

URL: http://svn.digium.com/view/asterisk?view=rev&rev=88991
Log:
Trying to update and restore this branch

Added:
    team/oej/videocaps/cdr/cdr_adaptive_odbc.c
      - copied unchanged from r74324, trunk/cdr/cdr_adaptive_odbc.c
    team/oej/videocaps/channels/busy.h
      - copied unchanged from r74324, trunk/channels/busy.h
    team/oej/videocaps/channels/ringtone.h
      - copied unchanged from r74324, trunk/channels/ringtone.h
    team/oej/videocaps/configs/cdr_adaptive_odbc.conf.sample
      - copied unchanged from r74324, trunk/configs/cdr_adaptive_odbc.conf.sample
    team/oej/videocaps/doc/India-CID.txt
      - copied unchanged from r74324, trunk/doc/India-CID.txt
    team/oej/videocaps/doc/tex/
      - copied from r74324, trunk/doc/tex/
    team/oej/videocaps/doc/tex/Makefile
      - copied unchanged from r74324, trunk/doc/tex/Makefile
    team/oej/videocaps/doc/tex/README.txt
      - copied unchanged from r74324, trunk/doc/tex/README.txt
    team/oej/videocaps/doc/tex/ael.tex
      - copied unchanged from r74324, trunk/doc/tex/ael.tex
    team/oej/videocaps/doc/tex/ajam.tex
      - copied unchanged from r74324, trunk/doc/tex/ajam.tex
    team/oej/videocaps/doc/tex/app-sms.tex
      - copied unchanged from r74324, trunk/doc/tex/app-sms.tex
    team/oej/videocaps/doc/tex/asterisk-conf.tex
      - copied unchanged from r74324, trunk/doc/tex/asterisk-conf.tex
    team/oej/videocaps/doc/tex/asterisk.tex
      - copied unchanged from r74324, trunk/doc/tex/asterisk.tex
    team/oej/videocaps/doc/tex/billing.tex
      - copied unchanged from r74324, trunk/doc/tex/billing.tex
    team/oej/videocaps/doc/tex/cdrdriver.tex
      - copied unchanged from r74324, trunk/doc/tex/cdrdriver.tex
    team/oej/videocaps/doc/tex/chaniax.tex
      - copied unchanged from r74324, trunk/doc/tex/chaniax.tex
    team/oej/videocaps/doc/tex/channelvariables.tex
      - copied unchanged from r74324, trunk/doc/tex/channelvariables.tex
    team/oej/videocaps/doc/tex/cliprompt.tex
      - copied unchanged from r74324, trunk/doc/tex/cliprompt.tex
    team/oej/videocaps/doc/tex/configuration.tex
      - copied unchanged from r74324, trunk/doc/tex/configuration.tex
    team/oej/videocaps/doc/tex/dundi.tex
      - copied unchanged from r74324, trunk/doc/tex/dundi.tex
    team/oej/videocaps/doc/tex/enum.tex
      - copied unchanged from r74324, trunk/doc/tex/enum.tex
    team/oej/videocaps/doc/tex/extensions.tex
      - copied unchanged from r74324, trunk/doc/tex/extensions.tex
    team/oej/videocaps/doc/tex/freetds.tex
      - copied unchanged from r74324, trunk/doc/tex/freetds.tex
    team/oej/videocaps/doc/tex/hardware.tex
      - copied unchanged from r74324, trunk/doc/tex/hardware.tex
    team/oej/videocaps/doc/tex/ices.tex
      - copied unchanged from r74324, trunk/doc/tex/ices.tex
    team/oej/videocaps/doc/tex/imapstorage.tex
      - copied unchanged from r74324, trunk/doc/tex/imapstorage.tex
    team/oej/videocaps/doc/tex/jitterbuffer.tex
      - copied unchanged from r74324, trunk/doc/tex/jitterbuffer.tex
    team/oej/videocaps/doc/tex/localchannel.tex
      - copied unchanged from r74324, trunk/doc/tex/localchannel.tex
    team/oej/videocaps/doc/tex/manager.tex
      - copied unchanged from r74324, trunk/doc/tex/manager.tex
    team/oej/videocaps/doc/tex/misdn.tex
      - copied unchanged from r74324, trunk/doc/tex/misdn.tex
    team/oej/videocaps/doc/tex/mp3.tex
      - copied unchanged from r74324, trunk/doc/tex/mp3.tex
    team/oej/videocaps/doc/tex/odbcstorage.tex
      - copied unchanged from r74324, trunk/doc/tex/odbcstorage.tex
    team/oej/videocaps/doc/tex/privacy.tex
      - copied unchanged from r74324, trunk/doc/tex/privacy.tex
    team/oej/videocaps/doc/tex/qos.tex
      - copied unchanged from r74324, trunk/doc/tex/qos.tex
    team/oej/videocaps/doc/tex/queuelog.tex
      - copied unchanged from r74324, trunk/doc/tex/queuelog.tex
    team/oej/videocaps/doc/tex/queues-with-callback-members.tex
      - copied unchanged from r74324, trunk/doc/tex/queues-with-callback-members.tex
    team/oej/videocaps/doc/tex/realtime.tex
      - copied unchanged from r74324, trunk/doc/tex/realtime.tex
    team/oej/videocaps/doc/tex/security.tex
      - copied unchanged from r74324, trunk/doc/tex/security.tex
    team/oej/videocaps/doc/tex/sla.tex
      - copied unchanged from r74324, trunk/doc/tex/sla.tex
    team/oej/videocaps/funcs/func_iconv.c
      - copied unchanged from r74324, trunk/funcs/func_iconv.c
    team/oej/videocaps/include/asterisk/aes_internal.h
      - copied unchanged from r74324, trunk/include/asterisk/aes_internal.h
Removed:
    team/oej/videocaps/doc/ael.tex
    team/oej/videocaps/doc/ajam.tex
    team/oej/videocaps/doc/app-sms.tex
    team/oej/videocaps/doc/ast_appdocs.tex
    team/oej/videocaps/doc/asterisk-conf.tex
    team/oej/videocaps/doc/asterisk.tex
    team/oej/videocaps/doc/billing.tex
    team/oej/videocaps/doc/cdrdriver.tex
    team/oej/videocaps/doc/chaniax.tex
    team/oej/videocaps/doc/channelvariables.tex
    team/oej/videocaps/doc/cliprompt.tex
    team/oej/videocaps/doc/configuration.tex
    team/oej/videocaps/doc/dundi.tex
    team/oej/videocaps/doc/enum.tex
    team/oej/videocaps/doc/extensions.tex
    team/oej/videocaps/doc/freetds.tex
    team/oej/videocaps/doc/hardware.tex
    team/oej/videocaps/doc/ices.tex
    team/oej/videocaps/doc/imapstorage.tex
    team/oej/videocaps/doc/jitterbuffer.tex
    team/oej/videocaps/doc/localchannel.tex
    team/oej/videocaps/doc/manager.tex
    team/oej/videocaps/doc/misdn.tex
    team/oej/videocaps/doc/mp3.tex
    team/oej/videocaps/doc/odbcstorage.tex
    team/oej/videocaps/doc/privacy.tex
    team/oej/videocaps/doc/qos.tex
    team/oej/videocaps/doc/queuelog.tex
    team/oej/videocaps/doc/queues-with-callback-members.tex
    team/oej/videocaps/doc/realtime.tex
    team/oej/videocaps/doc/security.tex
    team/oej/videocaps/doc/sla.tex
Modified:
    team/oej/videocaps/   (props changed)
    team/oej/videocaps/.cleancount
    team/oej/videocaps/BUGS
    team/oej/videocaps/CHANGES
    team/oej/videocaps/CREDITS
    team/oej/videocaps/Makefile
    team/oej/videocaps/UPGRADE.txt
    team/oej/videocaps/acinclude.m4
    team/oej/videocaps/apps/app_adsiprog.c
    team/oej/videocaps/apps/app_alarmreceiver.c
    team/oej/videocaps/apps/app_amd.c
    team/oej/videocaps/apps/app_authenticate.c
    team/oej/videocaps/apps/app_chanisavail.c
    team/oej/videocaps/apps/app_channelredirect.c
    team/oej/videocaps/apps/app_chanspy.c
    team/oej/videocaps/apps/app_controlplayback.c
    team/oej/videocaps/apps/app_db.c
    team/oej/videocaps/apps/app_dial.c
    team/oej/videocaps/apps/app_dictate.c
    team/oej/videocaps/apps/app_directed_pickup.c
    team/oej/videocaps/apps/app_directory.c
    team/oej/videocaps/apps/app_disa.c
    team/oej/videocaps/apps/app_externalivr.c
    team/oej/videocaps/apps/app_festival.c
    team/oej/videocaps/apps/app_followme.c
    team/oej/videocaps/apps/app_ices.c
    team/oej/videocaps/apps/app_image.c
    team/oej/videocaps/apps/app_macro.c
    team/oej/videocaps/apps/app_meetme.c
    team/oej/videocaps/apps/app_milliwatt.c
    team/oej/videocaps/apps/app_minivm.c
    team/oej/videocaps/apps/app_mixmonitor.c
    team/oej/videocaps/apps/app_mp3.c
    team/oej/videocaps/apps/app_nbscat.c
    team/oej/videocaps/apps/app_osplookup.c
    team/oej/videocaps/apps/app_page.c
    team/oej/videocaps/apps/app_playback.c
    team/oej/videocaps/apps/app_privacy.c
    team/oej/videocaps/apps/app_queue.c
    team/oej/videocaps/apps/app_readfile.c
    team/oej/videocaps/apps/app_record.c
    team/oej/videocaps/apps/app_rpt.c
    team/oej/videocaps/apps/app_sendtext.c
    team/oej/videocaps/apps/app_skel.c
    team/oej/videocaps/apps/app_sms.c
    team/oej/videocaps/apps/app_speech_utils.c
    team/oej/videocaps/apps/app_stack.c
    team/oej/videocaps/apps/app_system.c
    team/oej/videocaps/apps/app_talkdetect.c
    team/oej/videocaps/apps/app_test.c
    team/oej/videocaps/apps/app_transfer.c
    team/oej/videocaps/apps/app_url.c
    team/oej/videocaps/apps/app_voicemail.c
    team/oej/videocaps/apps/app_waitforsilence.c
    team/oej/videocaps/apps/app_zapbarge.c
    team/oej/videocaps/apps/app_zapras.c
    team/oej/videocaps/apps/app_zapscan.c
    team/oej/videocaps/bootstrap.sh
    team/oej/videocaps/build_tools/cflags.xml
    team/oej/videocaps/build_tools/make_buildopts_h
    team/oej/videocaps/build_tools/make_version
    team/oej/videocaps/build_tools/menuselect-deps.in
    team/oej/videocaps/build_tools/prep_moduledeps
    team/oej/videocaps/build_tools/prep_tarball
    team/oej/videocaps/cdr/cdr_csv.c
    team/oej/videocaps/cdr/cdr_custom.c
    team/oej/videocaps/cdr/cdr_manager.c
    team/oej/videocaps/cdr/cdr_odbc.c
    team/oej/videocaps/cdr/cdr_pgsql.c
    team/oej/videocaps/cdr/cdr_radius.c
    team/oej/videocaps/cdr/cdr_sqlite.c
    team/oej/videocaps/cdr/cdr_tds.c
    team/oej/videocaps/channels/   (props changed)
    team/oej/videocaps/channels/Makefile
    team/oej/videocaps/channels/chan_agent.c
    team/oej/videocaps/channels/chan_alsa.c
    team/oej/videocaps/channels/chan_features.c
    team/oej/videocaps/channels/chan_gtalk.c
    team/oej/videocaps/channels/chan_h323.c
    team/oej/videocaps/channels/chan_iax2.c
    team/oej/videocaps/channels/chan_jingle.c
    team/oej/videocaps/channels/chan_local.c
    team/oej/videocaps/channels/chan_mgcp.c
    team/oej/videocaps/channels/chan_misdn.c
    team/oej/videocaps/channels/chan_nbs.c
    team/oej/videocaps/channels/chan_oss.c
    team/oej/videocaps/channels/chan_phone.c
    team/oej/videocaps/channels/chan_sip.c
    team/oej/videocaps/channels/chan_skinny.c
    team/oej/videocaps/channels/chan_vpb.cc
    team/oej/videocaps/channels/chan_zap.c
    team/oej/videocaps/channels/iax2-parser.c
    team/oej/videocaps/channels/iax2-provision.c
    team/oej/videocaps/channels/misdn/chan_misdn_config.h
    team/oej/videocaps/channels/misdn/ie.c
    team/oej/videocaps/channels/misdn/isdn_lib.c
    team/oej/videocaps/channels/misdn/isdn_lib.h
    team/oej/videocaps/channels/misdn/isdn_msg_parser.c
    team/oej/videocaps/channels/misdn_config.c
    team/oej/videocaps/codecs/codec_ilbc.c
    team/oej/videocaps/codecs/codec_lpc10.c
    team/oej/videocaps/codecs/codec_speex.c
    team/oej/videocaps/codecs/codec_zap.c
    team/oej/videocaps/configs/cdr_manager.conf.sample
    team/oej/videocaps/configs/features.conf.sample
    team/oej/videocaps/configs/func_odbc.conf.sample
    team/oej/videocaps/configs/manager.conf.sample
    team/oej/videocaps/configs/misdn.conf.sample
    team/oej/videocaps/configs/musiconhold.conf.sample
    team/oej/videocaps/configs/sip.conf.sample
    team/oej/videocaps/configs/skinny.conf.sample
    team/oej/videocaps/configs/voicemail.conf.sample
    team/oej/videocaps/configs/zapata.conf.sample
    team/oej/videocaps/configure
    team/oej/videocaps/configure.ac
    team/oej/videocaps/contrib/asterisk-ng-doxygen
    team/oej/videocaps/contrib/init.d/rc.debian.asterisk
    team/oej/videocaps/contrib/init.d/rc.gentoo.asterisk
    team/oej/videocaps/contrib/init.d/rc.mandrake.asterisk
    team/oej/videocaps/contrib/init.d/rc.mandrake.zaptel
    team/oej/videocaps/contrib/init.d/rc.redhat.asterisk
    team/oej/videocaps/contrib/init.d/rc.slackware.asterisk
    team/oej/videocaps/contrib/scripts/ast_grab_core
    team/oej/videocaps/contrib/scripts/safe_asterisk
    team/oej/videocaps/doc/CODING-GUIDELINES
    team/oej/videocaps/doc/asterisk-mib.txt
    team/oej/videocaps/doc/asterisk.8
    team/oej/videocaps/doc/datastores.txt
    team/oej/videocaps/formats/format_g726.c
    team/oej/videocaps/formats/format_ogg_vorbis.c
    team/oej/videocaps/formats/format_pcm.c
    team/oej/videocaps/formats/format_wav.c
    team/oej/videocaps/funcs/func_callerid.c
    team/oej/videocaps/funcs/func_cdr.c
    team/oej/videocaps/funcs/func_channel.c
    team/oej/videocaps/funcs/func_curl.c
    team/oej/videocaps/funcs/func_db.c
    team/oej/videocaps/funcs/func_devstate.c
    team/oej/videocaps/funcs/func_enum.c
    team/oej/videocaps/funcs/func_groupcount.c
    team/oej/videocaps/funcs/func_math.c
    team/oej/videocaps/funcs/func_odbc.c
    team/oej/videocaps/funcs/func_rand.c
    team/oej/videocaps/funcs/func_shell.c
    team/oej/videocaps/funcs/func_strings.c
    team/oej/videocaps/funcs/func_version.c
    team/oej/videocaps/include/asterisk.h
    team/oej/videocaps/include/asterisk/ael_structs.h
    team/oej/videocaps/include/asterisk/aes.h   (contents, props changed)
    team/oej/videocaps/include/asterisk/app.h
    team/oej/videocaps/include/asterisk/ast_expr.h
    team/oej/videocaps/include/asterisk/autoconfig.h.in
    team/oej/videocaps/include/asterisk/callerid.h
    team/oej/videocaps/include/asterisk/cdr.h
    team/oej/videocaps/include/asterisk/channel.h
    team/oej/videocaps/include/asterisk/devicestate.h
    team/oej/videocaps/include/asterisk/doxyref.h
    team/oej/videocaps/include/asterisk/event.h
    team/oej/videocaps/include/asterisk/event_defs.h
    team/oej/videocaps/include/asterisk/features.h
    team/oej/videocaps/include/asterisk/http.h
    team/oej/videocaps/include/asterisk/jabber.h
    team/oej/videocaps/include/asterisk/linkedlists.h
    team/oej/videocaps/include/asterisk/logger.h
    team/oej/videocaps/include/asterisk/manager.h
    team/oej/videocaps/include/asterisk/module.h
    team/oej/videocaps/include/asterisk/monitor.h
    team/oej/videocaps/include/asterisk/options.h
    team/oej/videocaps/include/asterisk/pbx.h
    team/oej/videocaps/include/asterisk/speech.h
    team/oej/videocaps/include/asterisk/stringfields.h
    team/oej/videocaps/include/asterisk/strings.h
    team/oej/videocaps/include/asterisk/time.h
    team/oej/videocaps/include/asterisk/translate.h
    team/oej/videocaps/include/asterisk/utils.h
    team/oej/videocaps/main/Makefile
    team/oej/videocaps/main/acl.c
    team/oej/videocaps/main/adsistub.c
    team/oej/videocaps/main/aescrypt.c
    team/oej/videocaps/main/aeskey.c
    team/oej/videocaps/main/aestab.c
    team/oej/videocaps/main/app.c
    team/oej/videocaps/main/ast_expr2.c
    team/oej/videocaps/main/ast_expr2.fl
    team/oej/videocaps/main/ast_expr2.h
    team/oej/videocaps/main/ast_expr2.y
    team/oej/videocaps/main/ast_expr2f.c
    team/oej/videocaps/main/asterisk.c
    team/oej/videocaps/main/autoservice.c
    team/oej/videocaps/main/callerid.c
    team/oej/videocaps/main/cdr.c
    team/oej/videocaps/main/channel.c
    team/oej/videocaps/main/chanvars.c
    team/oej/videocaps/main/cli.c
    team/oej/videocaps/main/config.c
    team/oej/videocaps/main/cryptostub.c
    team/oej/videocaps/main/db.c
    team/oej/videocaps/main/devicestate.c
    team/oej/videocaps/main/dial.c
    team/oej/videocaps/main/dlfcn.c
    team/oej/videocaps/main/dns.c
    team/oej/videocaps/main/dnsmgr.c
    team/oej/videocaps/main/dsp.c
    team/oej/videocaps/main/enum.c
    team/oej/videocaps/main/event.c
    team/oej/videocaps/main/file.c
    team/oej/videocaps/main/fixedjitterbuf.c
    team/oej/videocaps/main/frame.c
    team/oej/videocaps/main/http.c
    team/oej/videocaps/main/indications.c
    team/oej/videocaps/main/io.c
    team/oej/videocaps/main/jitterbuf.c
    team/oej/videocaps/main/loader.c
    team/oej/videocaps/main/logger.c
    team/oej/videocaps/main/manager.c
    team/oej/videocaps/main/minimime/Makefile
    team/oej/videocaps/main/minimime/mimeparser.h
    team/oej/videocaps/main/minimime/mimeparser.l
    team/oej/videocaps/main/minimime/mimeparser.tab.c
    team/oej/videocaps/main/minimime/mimeparser.tab.h
    team/oej/videocaps/main/minimime/mimeparser.y
    team/oej/videocaps/main/minimime/mimeparser.yy.c
    team/oej/videocaps/main/minimime/mm_contenttype.c
    team/oej/videocaps/main/minimime/mm_context.c
    team/oej/videocaps/main/minimime/mm_envelope.c
    team/oej/videocaps/main/minimime/mm_mimepart.c
    team/oej/videocaps/main/minimime/mm_mimeutil.c
    team/oej/videocaps/main/minimime/mm_param.c
    team/oej/videocaps/main/minimime/mm_parse.c
    team/oej/videocaps/main/netsock.c
    team/oej/videocaps/main/pbx.c
    team/oej/videocaps/main/rtp.c
    team/oej/videocaps/main/say.c
    team/oej/videocaps/main/sched.c
    team/oej/videocaps/main/slinfactory.c
    team/oej/videocaps/main/stdtime/localtime.c
    team/oej/videocaps/main/strcompat.c
    team/oej/videocaps/main/tdd.c
    team/oej/videocaps/main/threadstorage.c
    team/oej/videocaps/main/translate.c
    team/oej/videocaps/main/udptl.c
    team/oej/videocaps/main/utils.c
    team/oej/videocaps/makeopts.in
    team/oej/videocaps/pbx/Makefile
    team/oej/videocaps/pbx/ael/ael.flex
    team/oej/videocaps/pbx/ael/ael.tab.c
    team/oej/videocaps/pbx/ael/ael.tab.h
    team/oej/videocaps/pbx/ael/ael.y
    team/oej/videocaps/pbx/ael/ael_lex.c
    team/oej/videocaps/pbx/pbx_ael.c
    team/oej/videocaps/pbx/pbx_config.c
    team/oej/videocaps/pbx/pbx_dundi.c
    team/oej/videocaps/pbx/pbx_spool.c
    team/oej/videocaps/res/res_adsi.c
    team/oej/videocaps/res/res_agi.c
    team/oej/videocaps/res/res_config_odbc.c
    team/oej/videocaps/res/res_config_pgsql.c
    team/oej/videocaps/res/res_config_sqlite.c
    team/oej/videocaps/res/res_crypto.c
    team/oej/videocaps/res/res_features.c
    team/oej/videocaps/res/res_indications.c
    team/oej/videocaps/res/res_jabber.c
    team/oej/videocaps/res/res_limit.c
    team/oej/videocaps/res/res_monitor.c
    team/oej/videocaps/res/res_musiconhold.c
    team/oej/videocaps/res/res_odbc.c
    team/oej/videocaps/res/res_smdi.c
    team/oej/videocaps/res/res_snmp.c
    team/oej/videocaps/res/res_speech.c
    team/oej/videocaps/res/snmp/agent.c
    team/oej/videocaps/sounds/Makefile
    team/oej/videocaps/utils/Makefile
    team/oej/videocaps/utils/ael_main.c
    team/oej/videocaps/utils/check_expr.c
    team/oej/videocaps/utils/expr2.testinput

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

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

Propchange: team/oej/videocaps/
------------------------------------------------------------------------------

--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Nov  6 10:08:00 2007
@@ -1,1 +1,1 @@
-/trunk:1-65038
+/trunk:1-74352

Modified: team/oej/videocaps/.cleancount
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/.cleancount?view=diff&rev=88991&r1=88990&r2=88991
==============================================================================
--- team/oej/videocaps/.cleancount (original)
+++ team/oej/videocaps/.cleancount Tue Nov  6 10:08:00 2007
@@ -1,1 +1,1 @@
-30
+31

Modified: team/oej/videocaps/BUGS
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/BUGS?view=diff&rev=88991&r1=88990&r2=88991
==============================================================================
--- team/oej/videocaps/BUGS (original)
+++ team/oej/videocaps/BUGS Tue Nov  6 10:08:00 2007
@@ -7,7 +7,7 @@
 	http://bugs.digium.com
 
 For more information on using the bug tracker, or to 
-learn how you can contribute by acting as a bug marshall
+learn how you can contribute by acting as a bug marshal
 please see:
 
 	http://www.asterisk.org/developers/bug-guidelines

Modified: team/oej/videocaps/CHANGES
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/CHANGES?view=diff&rev=88991&r1=88990&r2=88991
==============================================================================
--- team/oej/videocaps/CHANGES (original)
+++ team/oej/videocaps/CHANGES Tue Nov  6 10:08:00 2007
@@ -4,6 +4,7 @@
 
 AMI - The manager (TCP/TLS/HTTP)
 --------------------------------
+  * Added TLS support for the manager interface and HTTP server
   * Added the URI redirect option for the built-in HTTP server
   * The output of CallerID in Manager events is now more consistent.
      CallerIDNum is used for number and CallerIDName for name.
@@ -18,6 +19,8 @@
      and "ChannelDriver" headers.
   * Added a "Bridge" action which allows you to bridge any two channels that
      are currently active on the system.
+  * Added a "ListAllVoicemailUsers" action that allows you to get a list of all
+     the voicemail users setup.
 
 Dialplan functions
 ------------------
@@ -28,6 +31,8 @@
      fetch string representation of calling number presentation indicator
      and numeric representation of type of calling number value.
   * MailboxExists converted to dialplan function
+  * A new option to Dial() for telling IP phones not to count the call
+    as "missed" when dial times out and cancels.
 
 CLI Changes
 -----------
@@ -57,6 +62,10 @@
      required due to the restructuring of how MWI is handled.  See the descriptions 
      in this file of the "pollmailboxes" and "pollfreq" options to voicemail.conf 
      for more information.
+  * Added rtpdest option to CHANNEL() dialplan function.
+  * Added SIPREFERRINGCONTEXT and SIPREFERREDBYHDR variables which are set when a transfer takes place.
+  * SIP now adds a header to the CANCEL if the call was answered by another phone
+    in the same dial command, or if the new c option in dial() is used.
 
 IAX2 changes
 ------------
@@ -82,7 +91,7 @@
   * Added two new dialplan functions, ENUMQUERY and ENUMRESULT.  These
      functions will allow you to initiate an ENUM lookup from the dialplan,
      and Asterisk will cache the results.  ENUMRESULT can be used to access
-	 the results without doing multiple DNS queries.
+     the results without doing multiple DNS queries.
 
 Voicemail Changes
 -----------------
@@ -102,6 +111,10 @@
      IMAP storage.  So, two new options have been added to voicemail.conf
      to account for this: "pollmailboxes" and "pollfreq".  See the sample
      configuration file for details.
+  * Added "tw" language support
+  * Added support for storage of greetings using an IMAP server
+  * Added ability to customize forward, reverse, stop, and pause keys for message playback
+  * SMDI is now enabled in voicemail using the smdienable option.
 
 Queue changes
 -------------
@@ -134,15 +147,18 @@
   * Added a new application, MeetMeChannelAdmin, which is similar to MeetMeAdmin,
      except it does operations on a channel by name, instead of number in a conference.
      This is a very useful feature in combination with the 'X' option to ChanSpy.
-
-Miscellaneous 
--------------
-
-  * Added the bindaddr option to gtalk.conf.
-  * Argument support for Gosub application
-  * Ability to set process limits without restarting Asterisk
-  * SS7 support in chan_zap (via libss7 library)
-  * Proper codec support in chan_skinny.
+  * Added 'C' option to Meetme which causes a caller to continue in the dialplan
+     when kicked out.
+
+Music On Hold Changes
+---------------------
+  * A new option, "digit", has been added for music on hold classes in 
+     musiconhold.conf.  If this is set for a music on hold class, a caller
+     listening to music on hold can press this digit to switch to listening
+     to this music on hold class.
+
+AEL Changes
+-----------
   * AEL upgraded to use the Gosub with Arguments instead
      of Macro application, to hopefully reduce the problems
      seen with the artificially low stack ceiling that 
@@ -150,11 +166,58 @@
      to a depth of 7. Tests run using gosub, show depths
      limited only by virtual memory. A small test demonstrated
      recursive call depths of 100,000 without problems.
+     -- in addition to this, all apps that allowed a macro
+     to be called, as in Dial, queues, etc, are now allowing
+     a gosub call in similar fashion.
+  * AEL now generates LOCAL(argname) declarations when it
+     Set()'s the each arg name to the value of ${ARG1}, ${ARG2),
+     etc. That makes the arguments local in scope. The user
+     can define their own local variables in macros, now,
+     by saying "local myvar=someval;"  or using Set() in this
+     fashion:  Set(LOCAL(myvar)=someval);  ("local" is now
+     an AEL keyword).
+
+Zaptel channel driver (chan_zap) Changes
+----------------------------------------
+  * SS7 support in chan_zap (via libss7 library)
+  * In India, some carriers transmit CID via dtmf. Some code has been added
+    that will handle some situations. The cidstart=polarity_IN choice has been added for
+    those carriers that transmit CID via dtmf after a polarity change.
+  * CID matching information is now shown when doing 'dialplan show'.
+  * Added zap show version CLI command to chan_zap.
+
+H.323 Changes
+-------------
+  * H323 remote hold notification support added (by NOTIFY message
+     and/or H.450 supplementary service)
+
+Call Features (res_features) Changes
+------------------------------------
+  * Added the parkedcalltransfers option to features.conf
+  * The built-in method for doing attended transfers has been updated to
+     include some new options that allow you to have the transferee sent
+     back to the person that did the transfer if the transfer is not successful.
+     See the options "atxferdropcall", "atxferloopdelay", and "atxfercallbackretries"
+     in features.conf.sample.
+  * Added support for configuring named groups of custom call features in
+     features.conf.  This means that features can be written a single time, and
+     then mapped into groups of features for different key mappings or easier
+     access control.
+
+Language Support Changes
+------------------------
+  * Brazilian Portuguese (pt-BR) in VM, and say.c was added
+  * Added support for the Hungarian language for saying numbers, dates, and times.
+
+Miscellaneous 
+-------------
+  * Added the bindaddr option to gtalk.conf.
+  * Argument support for Gosub application
+  * Ability to set process limits without restarting Asterisk
+  * Proper codec support in chan_skinny.
   * Ability to use libcap to set high ToS bits when non-root
      on Linux. If configure is unable to find libcap then you
      can use --with-cap to specify the path.
-  * H323 remote hold notification support added (by NOTIFY message
-     and/or H.450 supplementary service)
   * Added rotatetimestamp option to logger.conf which will use
      the time to name the logger files instead of sequence number.
   * Added Masquerade manager event for when a masquerade happens between
@@ -167,23 +230,17 @@
      Read() - timeout now can be floating pt.
      WaitForRing() now takes floating pt timeout arg.
      SpeechBackground() -- clarified in the docstrings that the timeout is an integer seconds.
-  * Added 'C' option to Meetme which causes a caller to continue in the dialplan
-     when kicked out.
-  * Brazilian Portuguese (pt-BR) in VM, and say.c was added via patch from cfassoni.
-  * CID matching information is now shown when doing 'dialplan show'.
   * Added maxfiles option to options section of asterisk.conf which allows you to specify
      what Asterisk should set as the maximum number of open files when it loads.
   * Added the jittertargetextra configuration option.
   * Added G729 passthrough support to chan_phone for Sigma Designs boards.
-  * Added the parkedcalltransfers option to features.conf
   * Added 's' option to Page application.
   * Added 'E' and 'V' commands to ExternalIVR.
   * Added 'DBDel' and 'DBDelTree' manager commands.
   * Added 'o' and 'X' options to Chanspy.
-  * Added the parkedcallreparking option to features.conf
-  * SMDI is now enabled in voicemail using the smdienable option.
-  * Added zap show version CLI command to chan_zap.
   * Added a new CDR module, cdr_sqlite3_custom.
+  * The cdr_manager module has a [mappings] feature, like cdr_custom,
+    to add fields to the manager event from the CDR variables.
   * Added a new realtime configuration module, res_config_sqlite
   * Added a new dialplan application, Bridge, which allows you to bridge the
      calling channel to any other active channel on the system.
@@ -191,12 +248,6 @@
      configuration files for the IP channel drivers.  The new option is "cos".
      This information is also documented in doc/qos.tex, or the IP Quality of Service
      section of asterisk.pdf.
-  * The built-in method for doing attended transfers has been updated to
-     include some new options that allow you to have the transferee sent
-     back to the person that did the transfer if the transfer is not successful.
-     See the options "atxferdropcall", "atxferloopdelay", and "atxfercallbackretries"
-     in features.conf.sample.
   * The device state functionality in the Local channel driver has been updated
      to indicate INUSE or NOT_INUSE when a Local channel is being used as opposed
      to just UNKNOWN if the extension exists.
-  * Added support for the Hungarian language for saying numbers, dates, and times.

Modified: team/oej/videocaps/CREDITS
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/CREDITS?view=diff&rev=88991&r1=88990&r2=88991
==============================================================================
--- team/oej/videocaps/CREDITS (original)
+++ team/oej/videocaps/CREDITS Tue Nov  6 10:08:00 2007
@@ -135,7 +135,7 @@
 
 Voop AS, Nuvio Inc, Inotel S.A and Foniris Telecom A/S - funding for rewrite of SIP transfers
 
-Philippe Sultan - RADIUS CDR module
+Philippe Sultan - RADIUS CDR module, many fixes to res_jabber and gtalk/jingle channel drivers
 	INRIA, http://www.inria.fr/
 
 John Martin, Aupix - Improved video support in the SIP channel

Modified: team/oej/videocaps/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/Makefile?view=diff&rev=88991&r1=88990&r2=88991
==============================================================================
--- team/oej/videocaps/Makefile (original)
+++ team/oej/videocaps/Makefile Tue Nov  6 10:08:00 2007
@@ -118,8 +118,9 @@
   ASTLOGDIR=$(localstatedir)/log/asterisk
   ASTVARRUNDIR=$(localstatedir)/run
   ASTMANDIR=$(mandir)
-ifeq ($(OSARCH),FreeBSD)
+ifneq ($(findstring BSD,$(OSARCH)),)
   ASTVARLIBDIR=$(prefix)/share/asterisk
+  ASTVARRUNDIR=$(localstatedir)/run/asterisk
 else
   ASTVARLIBDIR=$(localstatedir)/lib/asterisk
 endif
@@ -192,7 +193,7 @@
 ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h
 
 ifeq ($(AST_DEVMODE),yes)
-  ASTCFLAGS+=-Werror -Wunused -Wundef
+  ASTCFLAGS+=-Werror -Wunused -Wundef $(AST_DECLARATION_AFTER_STATEMENT)
 endif
 
 ifneq ($(findstring BSD,$(OSARCH)),)
@@ -687,10 +688,10 @@
 	- at menuselect/gmenuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
 
 menuselect/menuselect: makeopts menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
-	@CC="$(HOST_CC)" LD="" AR="" RANLIB="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
+	@CC="$(HOST_CC)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
 
 menuselect/gmenuselect: makeopts menuselect/menuselect.c menuselect/menuselect_gtk.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
-	@CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" $(MAKE) -C menuselect _gmenuselect CONFIGURE_SILENT="--silent"
+	@CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect _gmenuselect CONFIGURE_SILENT="--silent"
 
 menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml
 	@echo "Generating input for menuselect ..."
@@ -698,22 +699,4 @@
 
 asterisk.pdf: doc/asterisk.pdf
 
-doc/asterisk.pdf: $(wildcard doc/*.tex)
-ifeq ($(findstring rubber,$(RUBBER)),)
-	@echo "**********************************************"
-	@echo "** You must install the \"rubber\" tool      ***"
-	@echo "** to generate the Asterisk reference PDF. ***"
-	@echo "**********************************************"
-else
-	@echo "**********************************************"
-	@echo "** The Asterisk reference PDF will now be  ***"
-	@echo "** generated.  When complete, it will be   ***"
-	@echo "** located at doc/asterisk.pdf.            ***"	
-	@echo "**********************************************"
-	@cp doc/asterisk.tex doc/asterisk.tex.orig
-	@sed -i -e 's/ASTERISKVERSION/$(ASTERISKVERSION)/' doc/asterisk.tex
-	@cd doc && $(RUBBER) --pdf asterisk.tex
-	@mv doc/asterisk.tex.orig doc/asterisk.tex
-endif
-
 .PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) menuselect.makeopts

Modified: team/oej/videocaps/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/UPGRADE.txt?view=diff&rev=88991&r1=88990&r2=88991
==============================================================================
--- team/oej/videocaps/UPGRADE.txt (original)
+++ team/oej/videocaps/UPGRADE.txt Tue Nov  6 10:08:00 2007
@@ -24,6 +24,17 @@
   style' layout introduced in Asterisk 1.4 (and used by the automatic
   sound file installer in the Makefile).
 
+* The ast_expr2 stuff has been modified to handle floating-point numbers.
+  Numbers of the format D.D are now acceptable input for the expr parser, 
+  Where D is a string of base-10 digits. All math is now done in "long double",
+  if it is available on your compiler/architecture. This was half-way between
+  a bug-fix (because the MATH func returns fp by default), and an enhancement.
+  Also, for those counting on, or needing, integer operations, a series of
+  'functions' were also added to the expr language, to allow several styles
+  of rounding/truncation, along with a set of common floating point operations,
+  like sin, cos, tan, log, pow, etc. The ability to call external functions
+  like CDR(), etc. was also added, without having to use the ${...} notation.
+ 
 Voicemail:
 
 * The voicemail configuration values 'maxmessage' and 'minmessage' have
@@ -47,6 +58,9 @@
   performs mostly a 'ChanExists' sort of function.
 * SetCallerPres() has been replaced with the CALLERPRES() dialplan function
   and is now deprecated.
+* DISA()'s fifth argument is now an options argument.  If you have previously
+  used 'NOANSWER' in this argument, you'll need to convert that to the new
+  option 'n'.
 
 CDR:
 

Modified: team/oej/videocaps/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/acinclude.m4?view=diff&rev=88991&r1=88990&r2=88991
==============================================================================
--- team/oej/videocaps/acinclude.m4 (original)
+++ team/oej/videocaps/acinclude.m4 Tue Nov  6 10:08:00 2007
@@ -179,21 +179,22 @@
 [AST_CHECK_PWLIB], [
 PWLIB_INCDIR=
 PWLIB_LIBDIR=
+AC_LANG_PUSH([C++])
 if test "${PWLIBDIR:-unset}" != "unset" ; then
-  AC_CHECK_FILE(${PWLIBDIR}/version.h, HAS_PWLIB=1, )
+  AC_CHECK_HEADER(${PWLIBDIR}/version.h, HAS_PWLIB=1, )
 fi
 if test "${HAS_PWLIB:-unset}" = "unset" ; then
   if test "${OPENH323DIR:-unset}" != "unset"; then
-    AC_CHECK_FILE(${OPENH323DIR}/../pwlib/version.h, HAS_PWLIB=1, )
+    AC_CHECK_HEADER(${OPENH323DIR}/../pwlib/version.h, HAS_PWLIB=1, )
   fi
   if test "${HAS_PWLIB:-unset}" != "unset" ; then
     PWLIBDIR="${OPENH323DIR}/../pwlib"
   else
-    AC_CHECK_FILE(${HOME}/pwlib/include/ptlib.h, HAS_PWLIB=1, )
+    AC_CHECK_HEADER(${HOME}/pwlib/include/ptlib.h, HAS_PWLIB=1, )
     if test "${HAS_PWLIB:-unset}" != "unset" ; then
       PWLIBDIR="${HOME}/pwlib"
     else
-      AC_CHECK_FILE(/usr/local/include/ptlib.h, HAS_PWLIB=1, )
+      AC_CHECK_HEADER(/usr/local/include/ptlib.h, HAS_PWLIB=1, )
       if test "${HAS_PWLIB:-unset}" != "unset" ; then
         AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/local/bin)
         if test "${PTLIB_CONFIG:-unset}" = "unset" ; then
@@ -211,7 +212,7 @@
         PWLIB_LIB=`${PTLIB_CONFIG} --ldflags --libs`
         PWLIB_LIB="-L${PWLIB_LIBDIR} `echo ${PWLIB_LIB}`"
       else
-        AC_CHECK_FILE(/usr/include/ptlib.h, HAS_PWLIB=1, )
+        AC_CHECK_HEADER(/usr/include/ptlib.h, HAS_PWLIB=1, )
         if test "${HAS_PWLIB:-unset}" != "unset" ; then
           AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/share/pwlib/make)
           PWLIB_INCDIR="/usr/include"
@@ -276,6 +277,7 @@
   AC_SUBST([PWLIB_INCDIR])
   AC_SUBST([PWLIB_LIBDIR])
 fi
+  AC_LANG_POP([C++])
 ])
 
 
@@ -370,20 +372,21 @@
 [AST_CHECK_OPENH323], [
 OPENH323_INCDIR=
 OPENH323_LIBDIR=
+AC_LANG_PUSH([C++])
 if test "${OPENH323DIR:-unset}" != "unset" ; then
-  AC_CHECK_FILE(${OPENH323DIR}/version.h, HAS_OPENH323=1, )
+  AC_CHECK_HEADER(${OPENH323DIR}/version.h, HAS_OPENH323=1, )
 fi
 if test "${HAS_OPENH323:-unset}" = "unset" ; then
-  AC_CHECK_FILE(${PWLIBDIR}/../openh323/version.h, OPENH323DIR="${PWLIBDIR}/../openh323"; HAS_OPENH323=1, )
+  AC_CHECK_HEADER(${PWLIBDIR}/../openh323/version.h, OPENH323DIR="${PWLIBDIR}/../openh323"; HAS_OPENH323=1, )
   if test "${HAS_OPENH323:-unset}" != "unset" ; then
     OPENH323DIR="${PWLIBDIR}/../openh323"
-    AC_CHECK_FILE(${OPENH323DIR}/include/h323.h, , OPENH323_INCDIR="${PWLIB_INCDIR}/openh323"; OPENH323_LIBDIR="${PWLIB_LIBDIR}")
+    AC_CHECK_HEADER(${OPENH323DIR}/include/h323.h, , OPENH323_INCDIR="${PWLIB_INCDIR}/openh323"; OPENH323_LIBDIR="${PWLIB_LIBDIR}")
   else
-    AC_CHECK_FILE(${HOME}/openh323/include/h323.h, HAS_OPENH323=1, )
+    AC_CHECK_HEADER(${HOME}/openh323/include/h323.h, HAS_OPENH323=1, )
     if test "${HAS_OPENH323:-unset}" != "unset" ; then
       OPENH323DIR="${HOME}/openh323"
     else
-      AC_CHECK_FILE(/usr/local/include/openh323/h323.h, HAS_OPENH323=1, )
+      AC_CHECK_HEADER(/usr/local/include/openh323/h323.h, HAS_OPENH323=1, )
       if test "${HAS_OPENH323:-unset}" != "unset" ; then
         OPENH323DIR="/usr/local/share/openh323"
         OPENH323_INCDIR="/usr/local/include/openh323"
@@ -393,7 +396,7 @@
           OPENH323_LIBDIR="/usr/local/lib"
         fi
       else
-        AC_CHECK_FILE(/usr/include/openh323/h323.h, HAS_OPENH323=1, )
+        AC_CHECK_HEADER(/usr/include/openh323/h323.h, HAS_OPENH323=1, )
         if test "${HAS_OPENH323:-unset}" != "unset" ; then
           OPENH323DIR="/usr/share/openh323"
           OPENH323_INCDIR="/usr/include/openh323"
@@ -424,6 +427,7 @@
   AC_SUBST([OPENH323_INCDIR])
   AC_SUBST([OPENH323_LIBDIR])
 fi
+  AC_LANG_POP([C++])
 ])
 
 

Modified: team/oej/videocaps/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/apps/app_adsiprog.c?view=diff&rev=88991&r1=88990&r2=88991
==============================================================================
--- team/oej/videocaps/apps/app_adsiprog.c (original)
+++ team/oej/videocaps/apps/app_adsiprog.c Tue Nov  6 10:08:00 2007
@@ -1384,11 +1384,11 @@
 		break;
 	case STATE_INSUB:
 		ast_log(LOG_WARNING, "Missing ENDSUB at end of file %s\n", script);
-		free(scr);
+		ast_free(scr);
 		return NULL;
 	case STATE_INKEY:
 		ast_log(LOG_WARNING, "Missing ENDKEY at end of file %s\n", script);
-		free(scr);
+		ast_free(scr);
 		return NULL;
 	}
 	err = 0;
@@ -1414,7 +1414,7 @@
 	}
 
 	if (err) {
-		free(scr);
+		ast_free(scr);
 		return NULL;
 	}
 	return scr;
@@ -1451,7 +1451,7 @@
 		if (option_verbose > 2)
 			ast_verbose(VERBOSE_PREFIX_3 "User rejected download attempt\n");
 		ast_log(LOG_NOTICE, "User rejected download on channel %s\n", chan->name);
-		free(scr);
+		ast_free(scr);
 		return -1;
 	}
 
@@ -1538,10 +1538,10 @@
 		if (option_verbose > 2)
 			ast_verbose(VERBOSE_PREFIX_3 "Download attempt failed\n");
 		ast_log(LOG_NOTICE, "Download failed on %s\n", chan->name);
-		free(scr);
+		ast_free(scr);
 		return -1;
 	}
-	free(scr);

[... 71337 lines stripped ...]

