[asterisk-commits] oej: branch oej/videocaps r159768 - in /team/oej/videocaps: ./ agi/ apps/ aut...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Fri Nov 28 10:48:21 CST 2008 

Author: oej
Date: Fri Nov 28 10:48:19 2008
New Revision: 159768

URL: http://svn.digium.com/view/asterisk?view=rev&rev=159768
Log:
Reset automerge. Thanks mvanbaak for the reminder 

Added:
    team/oej/videocaps/UPGRADE-1.6.txt
      - copied unchanged from r159701, trunk/UPGRADE-1.6.txt
    team/oej/videocaps/autoconf/
      - copied from r159701, trunk/autoconf/
    team/oej/videocaps/autoconf/acx_pthread.m4
      - copied unchanged from r159701, trunk/autoconf/acx_pthread.m4
    team/oej/videocaps/autoconf/ast_c_compile_check.m4
      - copied unchanged from r159701, trunk/autoconf/ast_c_compile_check.m4
    team/oej/videocaps/autoconf/ast_c_define_check.m4
      - copied unchanged from r159701, trunk/autoconf/ast_c_define_check.m4
    team/oej/videocaps/autoconf/ast_check_gnu_make.m4
      - copied unchanged from r159701, trunk/autoconf/ast_check_gnu_make.m4
    team/oej/videocaps/autoconf/ast_check_mandatory.m4
      - copied unchanged from r159701, trunk/autoconf/ast_check_mandatory.m4
    team/oej/videocaps/autoconf/ast_check_openh323.m4
      - copied unchanged from r159701, trunk/autoconf/ast_check_openh323.m4
    team/oej/videocaps/autoconf/ast_check_pwlib.m4
      - copied unchanged from r159701, trunk/autoconf/ast_check_pwlib.m4
    team/oej/videocaps/autoconf/ast_ext_lib.m4
      - copied unchanged from r159701, trunk/autoconf/ast_ext_lib.m4
    team/oej/videocaps/autoconf/ast_ext_tool_check.m4
      - copied unchanged from r159701, trunk/autoconf/ast_ext_tool_check.m4
    team/oej/videocaps/autoconf/ast_func_fork.m4
      - copied unchanged from r159701, trunk/autoconf/ast_func_fork.m4
    team/oej/videocaps/autoconf/ast_gcc_attribute.m4
      - copied unchanged from r159701, trunk/autoconf/ast_gcc_attribute.m4
    team/oej/videocaps/autoconf/ast_prog_egrep.m4
      - copied unchanged from r159701, trunk/autoconf/ast_prog_egrep.m4
    team/oej/videocaps/autoconf/ast_prog_ld.m4
      - copied unchanged from r159701, trunk/autoconf/ast_prog_ld.m4
    team/oej/videocaps/autoconf/ast_prog_ld_gnu.m4
      - copied unchanged from r159701, trunk/autoconf/ast_prog_ld_gnu.m4
    team/oej/videocaps/autoconf/ast_prog_sed.m4
      - copied unchanged from r159701, trunk/autoconf/ast_prog_sed.m4
    team/oej/videocaps/build_tools/get_documentation
      - copied unchanged from r159701, trunk/build_tools/get_documentation
    team/oej/videocaps/configs/cli_aliases.conf.sample
      - copied unchanged from r159701, trunk/configs/cli_aliases.conf.sample
    team/oej/videocaps/contrib/init.d/rc.archlinux.asterisk
      - copied unchanged from r159701, trunk/contrib/init.d/rc.archlinux.asterisk
    team/oej/videocaps/contrib/scripts/live_ast
      - copied unchanged from r159701, trunk/contrib/scripts/live_ast
    team/oej/videocaps/doc/appdocsxml.dtd
      - copied unchanged from r159701, trunk/doc/appdocsxml.dtd
    team/oej/videocaps/include/asterisk/buildinfo.h
      - copied unchanged from r159701, trunk/include/asterisk/buildinfo.h
    team/oej/videocaps/include/asterisk/optional_api.h
      - copied unchanged from r159701, trunk/include/asterisk/optional_api.h
    team/oej/videocaps/include/asterisk/xml.h
      - copied unchanged from r159701, trunk/include/asterisk/xml.h
    team/oej/videocaps/include/asterisk/xmldoc.h
      - copied unchanged from r159701, trunk/include/asterisk/xmldoc.h
    team/oej/videocaps/main/xml.c
      - copied unchanged from r159701, trunk/main/xml.c
    team/oej/videocaps/main/xmldoc.c
      - copied unchanged from r159701, trunk/main/xmldoc.c
    team/oej/videocaps/res/res_clialiases.c
      - copied unchanged from r159701, trunk/res/res_clialiases.c
    team/oej/videocaps/res/res_timing_timerfd.c
      - copied unchanged from r159701, trunk/res/res_timing_timerfd.c
Removed:
    team/oej/videocaps/acinclude.m4
Modified:
    team/oej/videocaps/   (props changed)
    team/oej/videocaps/CHANGES
    team/oej/videocaps/Makefile
    team/oej/videocaps/Makefile.moddir_rules
    team/oej/videocaps/Makefile.rules
    team/oej/videocaps/README
    team/oej/videocaps/UPGRADE-1.2.txt
    team/oej/videocaps/UPGRADE-1.4.txt
    team/oej/videocaps/UPGRADE.txt   (contents, props changed)
    team/oej/videocaps/agi/Makefile
    team/oej/videocaps/agi/eagi-sphinx-test.c
    team/oej/videocaps/agi/eagi-test.c
    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_cdr.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_dahdibarge.c
    team/oej/videocaps/apps/app_dahdiras.c
    team/oej/videocaps/apps/app_dahdiscan.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_dumpchan.c
    team/oej/videocaps/apps/app_echo.c
    team/oej/videocaps/apps/app_exec.c
    team/oej/videocaps/apps/app_externalivr.c
    team/oej/videocaps/apps/app_fax.c
    team/oej/videocaps/apps/app_festival.c
    team/oej/videocaps/apps/app_flash.c
    team/oej/videocaps/apps/app_followme.c
    team/oej/videocaps/apps/app_forkcdr.c
    team/oej/videocaps/apps/app_getcpeid.c
    team/oej/videocaps/apps/app_ices.c
    team/oej/videocaps/apps/app_image.c
    team/oej/videocaps/apps/app_ivrdemo.c
    team/oej/videocaps/apps/app_jack.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_morsecode.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_parkandannounce.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_read.c
    team/oej/videocaps/apps/app_readexten.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_sayunixtime.c
    team/oej/videocaps/apps/app_senddtmf.c
    team/oej/videocaps/apps/app_sendtext.c
    team/oej/videocaps/apps/app_setcallerid.c
    team/oej/videocaps/apps/app_skel.c
    team/oej/videocaps/apps/app_sms.c
    team/oej/videocaps/apps/app_softhangup.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_userevent.c
    team/oej/videocaps/apps/app_verbose.c
    team/oej/videocaps/apps/app_voicemail.c
    team/oej/videocaps/apps/app_waitforring.c
    team/oej/videocaps/apps/app_waitforsilence.c
    team/oej/videocaps/apps/app_waituntil.c
    team/oej/videocaps/apps/app_while.c
    team/oej/videocaps/apps/app_zapateller.c
    team/oej/videocaps/bootstrap.sh
    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/cdr/Makefile
    team/oej/videocaps/cdr/cdr_adaptive_odbc.c
    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_sqlite3_custom.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_console.c
    team/oej/videocaps/channels/chan_dahdi.c
    team/oej/videocaps/channels/chan_h323.c
    team/oej/videocaps/channels/chan_iax2.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_oss.c
    team/oej/videocaps/channels/chan_sip.c
    team/oej/videocaps/channels/chan_skinny.c
    team/oej/videocaps/channels/chan_usbradio.c
    team/oej/videocaps/channels/chan_vpb.cc
    team/oej/videocaps/channels/iax2-provision.c
    team/oej/videocaps/channels/misdn/   (props changed)
    team/oej/videocaps/channels/misdn/Makefile
    team/oej/videocaps/channels/misdn/isdn_lib.c
    team/oej/videocaps/channels/misdn/isdn_lib.h
    team/oej/videocaps/channels/misdn/isdn_lib_intern.h
    team/oej/videocaps/channels/misdn_config.c
    team/oej/videocaps/channels/xpmr/xpmr.c
    team/oej/videocaps/codecs/gsm/Makefile
    team/oej/videocaps/codecs/gsm/src/   (props changed)
    team/oej/videocaps/codecs/lpc10/chanwr.c
    team/oej/videocaps/configs/cdr_adaptive_odbc.conf.sample
    team/oej/videocaps/configs/chan_dahdi.conf.sample
    team/oej/videocaps/configs/extensions.conf.sample
    team/oej/videocaps/configs/features.conf.sample
    team/oej/videocaps/configs/func_odbc.conf.sample
    team/oej/videocaps/configs/phoneprov.conf.sample
    team/oej/videocaps/configs/sip.conf.sample
    team/oej/videocaps/configs/voicemail.conf.sample
    team/oej/videocaps/configure
    team/oej/videocaps/configure.ac
    team/oej/videocaps/contrib/asterisk-ng-doxygen
    team/oej/videocaps/contrib/scripts/vmdb.sql
    team/oej/videocaps/doc/   (props changed)
    team/oej/videocaps/doc/tex/asterisk-conf.tex
    team/oej/videocaps/doc/tex/channelvariables.tex
    team/oej/videocaps/doc/valgrind.txt
    team/oej/videocaps/formats/format_gsm.c
    team/oej/videocaps/formats/format_ogg_vorbis.c
    team/oej/videocaps/formats/format_wav.c
    team/oej/videocaps/formats/format_wav_gsm.c
    team/oej/videocaps/funcs/func_base64.c
    team/oej/videocaps/funcs/func_blacklist.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_config.c
    team/oej/videocaps/funcs/func_cut.c
    team/oej/videocaps/funcs/func_db.c
    team/oej/videocaps/funcs/func_devstate.c
    team/oej/videocaps/funcs/func_dialgroup.c
    team/oej/videocaps/funcs/func_dialplan.c
    team/oej/videocaps/funcs/func_enum.c
    team/oej/videocaps/funcs/func_env.c
    team/oej/videocaps/funcs/func_extstate.c
    team/oej/videocaps/funcs/func_global.c
    team/oej/videocaps/funcs/func_groupcount.c
    team/oej/videocaps/funcs/func_iconv.c
    team/oej/videocaps/funcs/func_lock.c
    team/oej/videocaps/funcs/func_logic.c
    team/oej/videocaps/funcs/func_math.c
    team/oej/videocaps/funcs/func_md5.c
    team/oej/videocaps/funcs/func_module.c
    team/oej/videocaps/funcs/func_odbc.c
    team/oej/videocaps/funcs/func_rand.c
    team/oej/videocaps/funcs/func_realtime.c
    team/oej/videocaps/funcs/func_sha1.c
    team/oej/videocaps/funcs/func_shell.c
    team/oej/videocaps/funcs/func_speex.c
    team/oej/videocaps/funcs/func_strings.c
    team/oej/videocaps/funcs/func_timeout.c
    team/oej/videocaps/funcs/func_uri.c
    team/oej/videocaps/funcs/func_version.c
    team/oej/videocaps/funcs/func_vmcount.c
    team/oej/videocaps/funcs/func_volume.c
    team/oej/videocaps/include/asterisk.h
    team/oej/videocaps/include/asterisk/_private.h
    team/oej/videocaps/include/asterisk/agi.h
    team/oej/videocaps/include/asterisk/app.h
    team/oej/videocaps/include/asterisk/astobj2.h
    team/oej/videocaps/include/asterisk/autoconfig.h.in
    team/oej/videocaps/include/asterisk/channel.h
    team/oej/videocaps/include/asterisk/cli.h
    team/oej/videocaps/include/asterisk/compat.h
    team/oej/videocaps/include/asterisk/compiler.h
    team/oej/videocaps/include/asterisk/config.h
    team/oej/videocaps/include/asterisk/devicestate.h
    team/oej/videocaps/include/asterisk/dial.h
    team/oej/videocaps/include/asterisk/dsp.h
    team/oej/videocaps/include/asterisk/extconf.h
    team/oej/videocaps/include/asterisk/features.h
    team/oej/videocaps/include/asterisk/file.h
    team/oej/videocaps/include/asterisk/frame.h
    team/oej/videocaps/include/asterisk/indications.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/pbx.h
    team/oej/videocaps/include/asterisk/sched.h
    team/oej/videocaps/include/asterisk/strings.h
    team/oej/videocaps/include/asterisk/tcptls.h
    team/oej/videocaps/include/asterisk/term.h
    team/oej/videocaps/include/asterisk/timing.h
    team/oej/videocaps/main/Makefile
    team/oej/videocaps/main/app.c
    team/oej/videocaps/main/ast_expr2f.c
    team/oej/videocaps/main/asterisk.c
    team/oej/videocaps/main/astmm.c
    team/oej/videocaps/main/astobj2.c
    team/oej/videocaps/main/buildinfo.c
    team/oej/videocaps/main/cdr.c
    team/oej/videocaps/main/channel.c
    team/oej/videocaps/main/cli.c
    team/oej/videocaps/main/config.c
    team/oej/videocaps/main/db1-ast/Makefile
    team/oej/videocaps/main/db1-ast/btree/   (props changed)
    team/oej/videocaps/main/db1-ast/db/   (props changed)
    team/oej/videocaps/main/db1-ast/hash/   (props changed)
    team/oej/videocaps/main/db1-ast/hash/hash_page.c
    team/oej/videocaps/main/db1-ast/mpool/   (props changed)
    team/oej/videocaps/main/db1-ast/recno/   (props changed)
    team/oej/videocaps/main/devicestate.c
    team/oej/videocaps/main/dial.c
    team/oej/videocaps/main/dnsmgr.c
    team/oej/videocaps/main/dsp.c
    team/oej/videocaps/main/editline/readline.c
    team/oej/videocaps/main/features.c
    team/oej/videocaps/main/file.c
    team/oej/videocaps/main/frame.c
    team/oej/videocaps/main/http.c
    team/oej/videocaps/main/indications.c
    team/oej/videocaps/main/logger.c
    team/oej/videocaps/main/manager.c
    team/oej/videocaps/main/pbx.c
    team/oej/videocaps/main/rtp.c
    team/oej/videocaps/main/stdtime/   (props changed)
    team/oej/videocaps/main/stdtime/Makefile
    team/oej/videocaps/main/taskprocessor.c
    team/oej/videocaps/main/tcptls.c
    team/oej/videocaps/main/term.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/   (props changed)
    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_lua.c
    team/oej/videocaps/pbx/pbx_realtime.c
    team/oej/videocaps/phoneprov/polycom_line.xml
    team/oej/videocaps/res/Makefile
    team/oej/videocaps/res/ael/   (props changed)
    team/oej/videocaps/res/ael/ael.flex
    team/oej/videocaps/res/ael/ael.tab.c
    team/oej/videocaps/res/ael/ael.y
    team/oej/videocaps/res/ael/ael_lex.c
    team/oej/videocaps/res/ael/pval.c
    team/oej/videocaps/res/ais/   (props changed)
    team/oej/videocaps/res/ais/evt.c
    team/oej/videocaps/res/res_agi.c
    team/oej/videocaps/res/res_config_odbc.c
    team/oej/videocaps/res/res_config_sqlite.c
    team/oej/videocaps/res/res_crypto.c
    team/oej/videocaps/res/res_http_post.c
    team/oej/videocaps/res/res_indications.c
    team/oej/videocaps/res/res_jabber.c
    team/oej/videocaps/res/res_musiconhold.c
    team/oej/videocaps/res/res_odbc.c
    team/oej/videocaps/res/res_phoneprov.c
    team/oej/videocaps/res/res_realtime.c
    team/oej/videocaps/res/res_timing_dahdi.c
    team/oej/videocaps/res/res_timing_pthread.c
    team/oej/videocaps/res/snmp/   (props changed)
    team/oej/videocaps/utils/Makefile
    team/oej/videocaps/utils/astcanary.c
    team/oej/videocaps/utils/astman.c
    team/oej/videocaps/utils/extconf.c
    team/oej/videocaps/utils/frame.c
    team/oej/videocaps/utils/muted.c
    team/oej/videocaps/utils/stereorize.c
    team/oej/videocaps/utils/streamplayer.c

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/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

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

Propchange: team/oej/videocaps/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Nov 28 10:48:19 2008
@@ -1,1 +1,1 @@
-/trunk:1-150996
+/trunk:1-159733

Modified: team/oej/videocaps/CHANGES
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/CHANGES?view=diff&rev=159768&r1=159767&r2=159768
==============================================================================
--- team/oej/videocaps/CHANGES (original)
+++ team/oej/videocaps/CHANGES Fri Nov 28 10:48:19 2008
@@ -1,3 +1,13 @@
+======================================================================
+===
+=== 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  -------------
 ------------------------------------------------------------------------------
@@ -9,12 +19,23 @@
    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.
 
 Skinny Changes
 --------------
  * The configuration file now holds seperate 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
 ------------------
@@ -23,6 +44,14 @@
    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.
 
 Applications
 ------------
@@ -30,6 +59,9 @@
    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.
 
 Miscellaneous
 -------------
@@ -43,6 +75,23 @@
      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.
+
+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  -------------
@@ -677,6 +726,7 @@
      WaitForRing() now takes floating pt timeout arg.
      SpeechBackground() -- clarified in the docstrings that the timeout is an integer seconds.
   * Added 's' option to Page application.
+  * Added an optional timeout argument to the Page application.
   * Added 'E', 'V', and 'P' commands to ExternalIVR.
   * Added 'o' and 'X' options to Chanspy.
   * Added a new dialplan application, Bridge, which allows you to bridge the
@@ -763,6 +813,7 @@
      the first one available.
   * Added cli command 'features reload' to reload call features from features.conf
   * Moved into core asterisk binary.
+  * Changed the default setting for featuredigittimeout to 2000 ms from 500 ms.
 
 Language Support Changes
 ------------------------
@@ -912,3 +963,11 @@
     consoles, you may want to try using this option. This option is enabled by default
     on Darwin systems since it is known that the Darwin poll() implementation has
     odd issues.
+
+Timer Changes
+--------------------
+* In addition to timing from DAHDI, there is a new timing module called
+  res_timing_timerfd. In order to use this, you must be running Linux with
+  a kernel version 2.6.25 or newer as well as glibc 2.8 or newer. The configure
+  script will be able to tell if you have the requirements. From menuselect, select
+  res_timing_timerfd from the Resource Modules menu.

Modified: team/oej/videocaps/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/Makefile?view=diff&rev=159768&r1=159767&r2=159768
==============================================================================
--- team/oej/videocaps/Makefile (original)
+++ team/oej/videocaps/Makefile Fri Nov 28 10:48:19 2008
@@ -92,6 +92,7 @@
 export AWK
 export GREP
 export ID
+export MD5
 
 # even though we could use '-include makeopts' here, use a wildcard
 # lookup anyway, so that make won't try to build makeopts if it doesn't
@@ -104,6 +105,9 @@
 # CFLAGS and LDFLAGS in the COPTS and LDOPTS variables.
 ASTCFLAGS+=$(COPTS)
 ASTLDFLAGS+=$(LDOPTS)
+
+# libxml2 cflags
+ASTCFLAGS+=$(LIBXML2_INCLUDE)
 
 #Uncomment this to see all build commands instead of 'quiet' output
 #NOISY_BUILD=yes
@@ -348,7 +352,7 @@
 	@echo " +               $(mK) install               +"  
 	@echo " +-------------------------------------------+"  
 
-_all: cleantest makeopts $(SUBDIRS)
+_all: cleantest makeopts $(SUBDIRS) doc/core-en_US.xml
 
 makeopts: configure
 	@echo "****"
@@ -437,7 +441,9 @@
 $(SUBDIRS_DIST_CLEAN):
 	@$(SUBMAKE) -C $(@:-dist-clean=) dist-clean
 
-clean: $(SUBDIRS_CLEAN)
+clean: $(SUBDIRS_CLEAN) _clean
+
+_clean:
 	rm -f defaults.h
 	rm -f include/asterisk/build.h
 	rm -f main/version.c
@@ -447,7 +453,7 @@
 
 dist-clean: distclean
 
-distclean: $(SUBDIRS_DIST_CLEAN) clean
+distclean: $(SUBDIRS_DIST_CLEAN) _clean
 	@$(MAKE) -C menuselect dist-clean
 	@$(MAKE) -C sounds dist-clean
 	rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
@@ -480,6 +486,29 @@
 	done
 	mkdir -p $(DESTDIR)$(AGI_DIR)
 	$(MAKE) -C sounds install
+
+doc/core-en_US.xml: $(foreach dir,$(MOD_SUBDIRS),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) 
+	@echo -n "Building Documentation For: "
+	@echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > $@
+	@echo "<!DOCTYPE docs SYSTEM \"appdocsxml.dtd\">" >> $@
+	@echo "<docs>" >> $@
+	@for x in $(MOD_SUBDIRS); do \
+		echo -n "$$x " ; \
+		for i in $$x/*.c; do \
+			$(AWK) -f build_tools/get_documentation $$i >> $@ ; \
+		done ; \
+	done
+	@echo
+	@echo "</docs>" >> $@
+
+validate-docs: doc/core-en_US.xml
+ifeq ($(XMLSTARLET),:)
+	@echo "---------------------------------------------------------------"
+	@echo "--- Please install xmlstarlet to validate the documentation ---"
+	@echo "---------------------------------------------------------------"
+else
+	$(XMLSTARLET) val -d doc/appdocsxml.dtd $<
+endif
 
 update: 
 	@if [ -d .svn ]; then \
@@ -529,12 +558,16 @@
 	if [ -n "$(OLDHEADERS)" ]; then \
 		rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
 	fi
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation/thirdparty
 	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
 	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
 	mkdir -p $(DESTDIR)$(ASTDATADIR)/keys
 	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
 	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
 	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
+	$(INSTALL) -m 644 doc/core-*.xml $(DESTDIR)$(ASTDATADIR)/documentation
+	$(INSTALL) -m 644 doc/appdocsxml.dtd $(DESTDIR)$(ASTVARLIBDIR)/documentation
 	$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
 	$(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
 	$(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
@@ -656,7 +689,7 @@
 		echo "astrundir => $(ASTVARRUNDIR)" ; \
 		echo "astlogdir => $(ASTLOGDIR)" ; \
 		echo "" ; \
-		echo ";[options]" ; \
+		echo "[options]" ; \
 		echo ";verbose = 3" ; \
 		echo ";debug = 3" ; \
 		echo ";alwaysfork = yes ; same as -F at startup" ; \
@@ -686,6 +719,7 @@
 		echo ";runuser = asterisk ; The user to run as" ; \
 		echo ";rungroup = asterisk ; The group to run as" ; \
 		echo ";lightbackground = yes ; If your terminal is set for a light-colored background" ; \
+		echo "documentation_language = en_US ; Set the Language you want Documentation displayed in. Value is in the same format as locale names" ; \
 		echo "" ; \
 		echo "; Changing the following lines may compromise your security." ; \
 		echo ";[files]" ; \
@@ -778,6 +812,8 @@
 		elif [ -f /etc/SuSE-release -o -f /etc/novell-release ]; then \
 			$(INSTALL) -m 755 contrib/init.d/rc.suse.asterisk $(DESTDIR)/etc/init.d/asterisk; \
 			if [ -z "$(DESTDIR)" ]; then /sbin/chkconfig --add asterisk; fi; \
+		elif [ -f /etc/arch-release -o -f /etc/arch-release ]; then \
+			$(INSTALL) -m 755 contrib/init.d/rc.archlinux.asterisk $(DESTDIR)/etc/rc.d/asterisk; \
 		elif [ -f /etc/slackware-version ]; then \
 			echo "Slackware is not currently supported, although an init script does exist for it." \
 		else \
@@ -902,7 +938,7 @@
 asterisk.pdf:
 	$(MAKE) -C doc/tex asterisk.pdf
 
-.PHONY: menuselect menuselect.makeopts main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) badshell installdirs
+.PHONY: menuselect menuselect.makeopts main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) badshell installdirs validate-docs _clean
 
 FORCE:
 

Modified: team/oej/videocaps/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/Makefile.moddir_rules?view=diff&rev=159768&r1=159767&r2=159768
==============================================================================
--- team/oej/videocaps/Makefile.moddir_rules (original)
+++ team/oej/videocaps/Makefile.moddir_rules Fri Nov 28 10:48:19 2008
@@ -110,8 +110,8 @@
 	@for file in $(patsubst %,$(SUBDIR)/%,$(filter-out %.eo,$^)); do echo "INPUT (../$${file})" >> $@; done
 
 clean::
-	rm -f *.so *.o *.oo *.eo
-	rm -f .*.o.d .*.oo.d
+	rm -f *.so *.o *.oo *.eo *.i *.ii
+	rm -f .*.d
 	rm -f *.s *.i
 	rm -f modules.link
 

Modified: team/oej/videocaps/Makefile.rules
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/Makefile.rules?view=diff&rev=159768&r1=159767&r2=159768
==============================================================================
--- team/oej/videocaps/Makefile.rules (original)
+++ team/oej/videocaps/Makefile.rules Fri Nov 28 10:48:19 2008
@@ -3,7 +3,7 @@
 # 
 # Makefile rules
 #
-# Copyright (C) 2006, Digium, Inc.
+# Copyright (C) 2006-2008, Digium, Inc.
 #
 # Kevin P. Fleming <kpfleming at digium.com>
 #
@@ -11,7 +11,6 @@
 # the GNU General Public License
 #
 
-# Rules for various build phases.
 # Each command is preceded by a short comment on what to do.
 # Prefixing one or the other with @\# or @ or nothing makes the desired
 # behaviour. ECHO_PREFIX prefixes the comment, CMD_PREFIX prefixes the command.
@@ -20,16 +19,23 @@
 
 .PHONY: dist-clean
 
+# If 'make' decides to create intermediate files to satisfy a build requirement
+# (like producing a .i from a .c), we want to keep them, so tell make to keep
+# all intermediate files
+.SECONDARY:
+
 # extra cflags to build dependencies. Recursively expanded.
-MAKE_DEPS= -MD -MT $@ -MF .$(subst /,_,$@).d -MP
+MAKE_DEPS=-MD -MT $@ -MF .$(subst /,_,$@).d -MP
 
 ifeq ($(NOISY_BUILD),)
     ECHO_PREFIX=@
     CMD_PREFIX=@
 else
-    ECHO_PREFIX=@\#
+    ECHO_PREFIX=@\# 
     CMD_PREFIX=
 endif
+
+OPTIMIZE?=-O6
 
 ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)
     # More GSM codec optimization
@@ -38,30 +44,67 @@
     # ppro's, etc, as well as the AMD K6 and K7.  
     #K6OPT=-DK6OPT
 
-    OPTIMIZE?=-O6
     ASTCFLAGS+=$(OPTIMIZE)
 endif
 
-# build rules for various targets
-%.o: %.c
-	$(ECHO_PREFIX) echo "   [CC] $< -> $@"
-	$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) $(MAKE_DEPS)
+# shortcuts for common combinations of flags; these must be recursively expanded so that
+# per-target settings will be applied
+CC_CFLAGS=$(PTHREAD_CFLAGS) $(ASTCFLAGS)
+CXX_CFLAGS=$(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(AST_DECLARATION_AFTER_STATEMENT),$(ASTCFLAGS))
+CC_LDFLAGS_SO=$(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK)
+CXX_LDFLAGS_SO=$(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK)
+CC_LIBS=$(PTHREAD_LIBS) $(LIBS)
+CXX_LIBS=$(PTHREAD_LIBS) $(LIBS)
+
+# determine whether to double-compile so that the optimizer can report code path problems
+# this is only done when developer mode and DONT_OPTIMIZE are both enabled
+# in that case, we run the preprocessor to produce a .i or .ii file from the source
+# code, then compile once with optimizer enabled (and the output to /dev/null),
+# and if that doesn't fail then compile again with optimizer disabled
+ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS))$(AST_DEVMODE),DONT_OPTIMIZEyes)
+COMPILE_DOUBLE=yes
+endif
+
+%.o: %.s
+	$(ECHO_PREFIX) echo "   [AS] $< -> $@"
+ifeq ($(COMPILE_DOUBLE),yes)
+	$(CMD_PREFIX) $(CC) -o /dev/null -c $< $(CC_CFLAGS) $(OPTIMIZE)
+endif
+	$(CMD_PREFIX) $(CC) -o $@ -c $< $(CC_CFLAGS)
 
 %.o: %.i
 	$(ECHO_PREFIX) echo "   [CCi] $< -> $@"
-	$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) $(MAKE_DEPS)
+ifeq ($(COMPILE_DOUBLE),yes)
+	$(CMD_PREFIX) $(CC) -o /dev/null -c $< $(CC_CFLAGS) $(OPTIMIZE)
+endif
+	$(CMD_PREFIX) $(CC) -o $@ -c $< $(CC_CFLAGS)
+
+ifneq ($(COMPILE_DOUBLE),yes)
+%.o: %.c
+	$(ECHO_PREFIX) echo "   [CC] $< -> $@"
+	$(CMD_PREFIX) $(CC) -o $@ -c $< $(CC_CFLAGS) $(MAKE_DEPS)
+endif
 
 %.i: %.c
 	$(ECHO_PREFIX) echo "   [CPP] $< -> $@"
-	$(CMD_PREFIX) $(CC) -o $@ -E $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) $(MAKE_DEPS)
+	$(CMD_PREFIX) $(CC) -o $@ -E $< $(CC_CFLAGS) $(MAKE_DEPS)
 
-%.o: %.s
-	$(ECHO_PREFIX) echo "   [AS] $< -> $@"
-	$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) $(MAKE_DEPS)
+%.oo: %.ii
+	$(ECHO_PREFIX) echo "   [CXXi] $< -> $@"
+ifeq ($(COMPILE_DOUBLE),yes)
+	$(CMD_PREFIX) $(CXX) -o /dev/null -c $< $(CXX_CFLAGS) $(OPTIMIZE)
+endif
+	$(CMD_PREFIX) $(CXX) -o $@ -c $< $(CXX_CFLAGS)
 
+ifneq ($(COMPILE_DOUBLE),yes)
 %.oo: %.cc
 	$(ECHO_PREFIX) echo "   [CXX] $< -> $@"
-	$(CMD_PREFIX) $(CXX) -o $@ -c $< $(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(AST_DECLARATION_AFTER_STATEMENT),$(ASTCFLAGS)) $(MAKE_DEPS)
+	$(CMD_PREFIX) $(CXX) -o $@ -c $< $(CXX_CFLAGS) $(MAKE_DEPS)
+endif
+
+%.ii: %.cc
+	$(ECHO_PREFIX) echo "   [CPP] $< -> $@"
+	$(CMD_PREFIX) $(CXX) -o $@ -E $< $(CXX_CFLAGS) $(MAKE_DEPS)
 
 %.c: %.y
 	$(ECHO_PREFIX) echo "   [BISON] $< -> $@"
@@ -73,11 +116,11 @@
 
 %.so: %.o
 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
-	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $^ $(PTHREAD_LIBS) $(LIBS)
+	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(CC_LDFLAGS_SO) $^ $(CC_LIBS)
 
 %.so: %.oo
 	$(ECHO_PREFIX) echo "   [LDXX] $^ -> $@"
-	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $^ $(PTHREAD_LIBS) $(LIBS)
+	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(CXX_LDFLAGS_SO) $^ $(CXX_LIBS)
 
 %.eo: %.o
 	$(ECHO_PREFIX) echo "   [EMBED] $< -> $@"
@@ -93,6 +136,6 @@
 
 %: %.o
 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
-	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $^ $(PTHREAD_LIBS) $(LIBS)
+	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $^ $(CXX_LIBS)
 
-dist-clean::
+dist-clean:: clean

Modified: team/oej/videocaps/README
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/README?view=diff&rev=159768&r1=159767&r2=159768
==============================================================================
--- team/oej/videocaps/README (original)
+++ team/oej/videocaps/README Fri Nov 28 10:48:19 2008
@@ -276,7 +276,7 @@
   If this release of Asterisk was downloaded from a tarball, then some
 additional documentation should have been included.
      * doc/tex/asterisk.pdf --- PDF version of the documentation
-	 * doc/tex/asterisk/index.html --- HTML version of the documentation
+     * doc/tex/asterisk/index.html --- HTML version of the documentation
 
   Finally, you may wish to visit the web site and join the mailing list if
 you're interested in getting more information.

Modified: team/oej/videocaps/UPGRADE-1.2.txt
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/UPGRADE-1.2.txt?view=diff&rev=159768&r1=159767&r2=159768
==============================================================================
--- team/oej/videocaps/UPGRADE-1.2.txt (original)
+++ team/oej/videocaps/UPGRADE-1.2.txt Fri Nov 28 10:48:19 2008
@@ -1,10 +1,17 @@
 =========================================================
+===
 === Information for upgrading from Asterisk 1.0 to 1.2
 ===
+=== This file documents all the changes that MUST be taken
+=== into account when upgrading between the Asterisk
+=== versions listed below. These changes may require that
+=== you modify your configuration files, dialplan or (in
+=== some cases) source code if you have your own Asterisk
+=== modules or patches. These files also includes advance
+=== notice of any functionality that has been marked as
+=== 'deprecated' and may be removed in a future release,
+=== along with the suggested replacement functionality.
 ===
-=== UPGRADE-1.2.txt -- Upgrade info for 1.0 to 1.2
-=== UPGRADE-1.4.txt -- Upgrade info for 1.2 to 1.4
-=== UPGRADE.txt     -- Upgrade info for 1.4 to 1.6
 =========================================================
 
 Compiling:

Modified: team/oej/videocaps/UPGRADE-1.4.txt
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/UPGRADE-1.4.txt?view=diff&rev=159768&r1=159767&r2=159768
==============================================================================
--- team/oej/videocaps/UPGRADE-1.4.txt (original)
+++ team/oej/videocaps/UPGRADE-1.4.txt Fri Nov 28 10:48:19 2008
@@ -1,10 +1,19 @@
 =========================================================
+===
 === Information for upgrading from Asterisk 1.2 to 1.4
 ===
+=== These files document all the changes that MUST be taken
+=== into account when upgrading between the Asterisk
+=== versions listed below. These changes may require that
+=== you modify your configuration files, dialplan or (in
+=== some cases) source code if you have your own Asterisk
+=== modules or patches. These files also includes advance
+=== notice of any functionality that has been marked as
+=== 'deprecated' and may be removed in a future release,
+=== along with the suggested replacement functionality.
 ===
 === UPGRADE-1.2.txt -- Upgrade info for 1.0 to 1.2
-=== UPGRADE-1.4.txt -- Upgrade info for 1.2 to 1.4
-=== UPGRADE.txt     -- Upgrade info for 1.4 to 1.6
+===
 =========================================================
 
 Build Process (configure script):

Modified: team/oej/videocaps/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/UPGRADE.txt?view=diff&rev=159768&r1=159767&r2=159768
==============================================================================
--- team/oej/videocaps/UPGRADE.txt (original)
+++ team/oej/videocaps/UPGRADE.txt Fri Nov 28 10:48:19 2008
@@ -1,262 +1,62 @@
-=========================================================
-=== Information for upgrading from Asterisk 1.4 to 1.6
+===========================================================
 ===
+=== Information for upgrading between Asterisk 1.6 versions
+===
+=== These files document all the changes that MUST be taken
+=== into account when upgrading between the Asterisk
+=== versions listed below. These changes may require that
+=== you modify your configuration files, dialplan or (in
+=== some cases) source code if you have your own Asterisk
+=== modules or patches. These files also includes advance
+=== notice of any functionality that has been marked as
+=== 'deprecated' and may be removed in a future release,
+=== along with the suggested replacement functionality.
 ===
 === UPGRADE-1.2.txt -- Upgrade info for 1.0 to 1.2
 === UPGRADE-1.4.txt -- Upgrade info for 1.2 to 1.4
-=== UPGRADE.txt     -- Upgrade info for 1.4 to 1.6
-=========================================================
+=== UPGRADE-1.6.txt -- Upgrade info for 1.4 to 1.6
+===
+===========================================================
 
-AEL:
+From 1.6.0.1 to 1.6.1:
 
-* Macros are now implemented underneath with the Gosub() application.
-  Heaven Help You if you wrote code depending on any aspect of this!
-  Previous to 1.6, macros were implemented with the Macro() app, which
-  provided a nice feature of auto-returning. The compiler will do its
-  best to insert a Return() app call at the end of your macro if you did
-  not include it, but really, you should make sure that all execution
-  paths within your macros end in "return;".

[... 36408 lines stripped ...]

More information about the asterisk-commits mailing list