[asterisk-commits] seanbright: branch group/bindings r168378 - in /team/group/bindings: ./ agi/ ...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Sat Jan 10 09:37:15 CST 2009
Author: seanbright
Date: Sat Jan 10 09:37:11 2009
New Revision: 168378
URL: http://svn.digium.com/view/asterisk?view=rev&rev=168378
Log:
Bring back up to date and renable automerge. Doesn't compile yet, but I need it on another machine, so here goes.
Added:
team/group/bindings/UPGRADE-1.6.txt
- copied unchanged from r168334, trunk/UPGRADE-1.6.txt
team/group/bindings/apps/app_originate.c
- copied unchanged from r168334, trunk/apps/app_originate.c
team/group/bindings/configs/cli_aliases.conf.sample
- copied unchanged from r168334, trunk/configs/cli_aliases.conf.sample
team/group/bindings/configs/cli_permissions.conf.sample
- copied unchanged from r168334, trunk/configs/cli_permissions.conf.sample
team/group/bindings/contrib/init.d/rc.archlinux.asterisk
- copied unchanged from r168334, trunk/contrib/init.d/rc.archlinux.asterisk
team/group/bindings/contrib/scripts/sip_nat_settings
- copied unchanged from r168334, trunk/contrib/scripts/sip_nat_settings
team/group/bindings/doc/api-1.6.2-changes.txt
- copied unchanged from r168334, trunk/doc/api-1.6.2-changes.txt
team/group/bindings/funcs/func_audiohookinherit.c
- copied unchanged from r168334, trunk/funcs/func_audiohookinherit.c
team/group/bindings/funcs/func_sprintf.c
- copied unchanged from r168334, trunk/funcs/func_sprintf.c
team/group/bindings/include/asterisk/optional_api.h
- copied unchanged from r168334, trunk/include/asterisk/optional_api.h
team/group/bindings/include/asterisk/xmldoc.h
- copied unchanged from r168334, trunk/include/asterisk/xmldoc.h
team/group/bindings/main/strings.c
- copied unchanged from r168334, trunk/main/strings.c
team/group/bindings/main/xmldoc.c
- copied unchanged from r168334, trunk/main/xmldoc.c
team/group/bindings/res/res_clialiases.c
- copied unchanged from r168334, trunk/res/res_clialiases.c
team/group/bindings/res/res_timing_timerfd.c
- copied unchanged from r168334, trunk/res/res_timing_timerfd.c
Modified:
team/group/bindings/ (props changed)
team/group/bindings/.cleancount
team/group/bindings/CHANGES
team/group/bindings/Makefile
team/group/bindings/Makefile.moddir_rules
team/group/bindings/Makefile.rules
team/group/bindings/README
team/group/bindings/UPGRADE-1.2.txt
team/group/bindings/UPGRADE-1.4.txt
team/group/bindings/UPGRADE.txt (contents, props changed)
team/group/bindings/agi/Makefile
team/group/bindings/agi/eagi-sphinx-test.c
team/group/bindings/agi/eagi-test.c
team/group/bindings/apps/app_adsiprog.c
team/group/bindings/apps/app_alarmreceiver.c
team/group/bindings/apps/app_amd.c
team/group/bindings/apps/app_authenticate.c
team/group/bindings/apps/app_chanisavail.c
team/group/bindings/apps/app_chanspy.c
team/group/bindings/apps/app_db.c
team/group/bindings/apps/app_dial.c
team/group/bindings/apps/app_directed_pickup.c
team/group/bindings/apps/app_directory.c
team/group/bindings/apps/app_disa.c
team/group/bindings/apps/app_dumpchan.c
team/group/bindings/apps/app_externalivr.c
team/group/bindings/apps/app_fax.c
team/group/bindings/apps/app_festival.c
team/group/bindings/apps/app_followme.c
team/group/bindings/apps/app_forkcdr.c
team/group/bindings/apps/app_image.c
team/group/bindings/apps/app_ivrdemo.c
team/group/bindings/apps/app_jack.c
team/group/bindings/apps/app_macro.c
team/group/bindings/apps/app_meetme.c
team/group/bindings/apps/app_minivm.c
team/group/bindings/apps/app_mixmonitor.c
team/group/bindings/apps/app_morsecode.c
team/group/bindings/apps/app_osplookup.c
team/group/bindings/apps/app_page.c
team/group/bindings/apps/app_parkandannounce.c
team/group/bindings/apps/app_playback.c
team/group/bindings/apps/app_privacy.c
team/group/bindings/apps/app_queue.c
team/group/bindings/apps/app_read.c
team/group/bindings/apps/app_readexten.c
team/group/bindings/apps/app_readfile.c
team/group/bindings/apps/app_record.c
team/group/bindings/apps/app_rpt.c
team/group/bindings/apps/app_sayunixtime.c
team/group/bindings/apps/app_senddtmf.c
team/group/bindings/apps/app_sendtext.c
team/group/bindings/apps/app_sms.c
team/group/bindings/apps/app_speech_utils.c
team/group/bindings/apps/app_stack.c
team/group/bindings/apps/app_test.c
team/group/bindings/apps/app_url.c
team/group/bindings/apps/app_voicemail.c
team/group/bindings/apps/app_waitforring.c
team/group/bindings/apps/app_waitforsilence.c
team/group/bindings/apps/app_while.c
team/group/bindings/autoconf/ast_ext_lib.m4
team/group/bindings/autoconf/ast_gcc_attribute.m4
team/group/bindings/bindings/ast_cdr_base.i
team/group/bindings/build_tools/cflags-devmode.xml
team/group/bindings/build_tools/make_buildopts_h
team/group/bindings/build_tools/make_version
team/group/bindings/build_tools/menuselect-deps.in
team/group/bindings/cdr/Makefile
team/group/bindings/cdr/cdr_adaptive_odbc.c
team/group/bindings/cdr/cdr_csv.c
team/group/bindings/cdr/cdr_custom.c
team/group/bindings/cdr/cdr_manager.c
team/group/bindings/cdr/cdr_odbc.c
team/group/bindings/cdr/cdr_pgsql.c
team/group/bindings/cdr/cdr_radius.c
team/group/bindings/cdr/cdr_sqlite.c
team/group/bindings/cdr/cdr_sqlite3_custom.c
team/group/bindings/cdr/cdr_tds.c
team/group/bindings/channels/ (props changed)
team/group/bindings/channels/chan_agent.c
team/group/bindings/channels/chan_alsa.c
team/group/bindings/channels/chan_console.c
team/group/bindings/channels/chan_dahdi.c
team/group/bindings/channels/chan_features.c
team/group/bindings/channels/chan_h323.c
team/group/bindings/channels/chan_iax2.c
team/group/bindings/channels/chan_local.c
team/group/bindings/channels/chan_mgcp.c
team/group/bindings/channels/chan_misdn.c
team/group/bindings/channels/chan_oss.c
team/group/bindings/channels/chan_phone.c
team/group/bindings/channels/chan_sip.c
team/group/bindings/channels/chan_skinny.c
team/group/bindings/channels/chan_usbradio.c
team/group/bindings/channels/chan_vpb.cc
team/group/bindings/channels/h323/README
team/group/bindings/channels/h323/ast_h323.cxx
team/group/bindings/channels/iax2-parser.c
team/group/bindings/channels/iax2-provision.c
team/group/bindings/channels/misdn/ (props changed)
team/group/bindings/channels/misdn/Makefile
team/group/bindings/channels/misdn/ie.c
team/group/bindings/channels/misdn_config.c
team/group/bindings/channels/xpmr/xpmr.c
team/group/bindings/codecs/gsm/Makefile
team/group/bindings/codecs/gsm/src/ (props changed)
team/group/bindings/configs/cdr_adaptive_odbc.conf.sample
team/group/bindings/configs/chan_dahdi.conf.sample
team/group/bindings/configs/extconfig.conf.sample
team/group/bindings/configs/extensions.conf.sample
team/group/bindings/configs/phoneprov.conf.sample
team/group/bindings/configs/queues.conf.sample
team/group/bindings/configs/sip.conf.sample
team/group/bindings/configs/voicemail.conf.sample
team/group/bindings/configure
team/group/bindings/configure.ac
team/group/bindings/contrib/asterisk-ng-doxygen
team/group/bindings/contrib/scripts/autosupport
team/group/bindings/contrib/scripts/autosupport.8
team/group/bindings/contrib/scripts/safe_asterisk
team/group/bindings/contrib/scripts/sip-friends.sql
team/group/bindings/doc/CODING-GUIDELINES
team/group/bindings/doc/appdocsxml.dtd
team/group/bindings/doc/janitor-projects.txt
team/group/bindings/doc/realtimetext.txt (props changed)
team/group/bindings/doc/sip-retransmit.txt (props changed)
team/group/bindings/doc/tex/cdrdriver.tex
team/group/bindings/doc/tex/misdn.tex
team/group/bindings/doc/tex/odbcstorage.tex
team/group/bindings/doc/tex/phoneprov.tex (props changed)
team/group/bindings/doc/tex/qos.tex
team/group/bindings/doc/valgrind.txt
team/group/bindings/formats/format_gsm.c
team/group/bindings/formats/format_ogg_vorbis.c
team/group/bindings/formats/format_pcm.c
team/group/bindings/formats/format_wav.c
team/group/bindings/formats/format_wav_gsm.c
team/group/bindings/funcs/Makefile
team/group/bindings/funcs/func_blacklist.c
team/group/bindings/funcs/func_callerid.c
team/group/bindings/funcs/func_curl.c
team/group/bindings/funcs/func_cut.c
team/group/bindings/funcs/func_db.c
team/group/bindings/funcs/func_devstate.c
team/group/bindings/funcs/func_logic.c
team/group/bindings/funcs/func_odbc.c
team/group/bindings/funcs/func_realtime.c
team/group/bindings/funcs/func_strings.c
team/group/bindings/funcs/func_timeout.c
team/group/bindings/include/asterisk.h
team/group/bindings/include/asterisk/_private.h
team/group/bindings/include/asterisk/agi.h
team/group/bindings/include/asterisk/app.h
team/group/bindings/include/asterisk/astmm.h
team/group/bindings/include/asterisk/astobj2.h
team/group/bindings/include/asterisk/audiohook.h
team/group/bindings/include/asterisk/autoconfig.h.in
team/group/bindings/include/asterisk/cdr.h
team/group/bindings/include/asterisk/channel.h
team/group/bindings/include/asterisk/cli.h
team/group/bindings/include/asterisk/compat.h
team/group/bindings/include/asterisk/compiler.h
team/group/bindings/include/asterisk/config.h
team/group/bindings/include/asterisk/devicestate.h
team/group/bindings/include/asterisk/dlinkedlists.h
team/group/bindings/include/asterisk/doxyref.h
team/group/bindings/include/asterisk/dsp.h
team/group/bindings/include/asterisk/dundi.h
team/group/bindings/include/asterisk/enum.h
team/group/bindings/include/asterisk/features.h
team/group/bindings/include/asterisk/file.h
team/group/bindings/include/asterisk/frame.h
team/group/bindings/include/asterisk/indications.h
team/group/bindings/include/asterisk/linkedlists.h
team/group/bindings/include/asterisk/lock.h
team/group/bindings/include/asterisk/logger.h
team/group/bindings/include/asterisk/manager.h
team/group/bindings/include/asterisk/module.h
team/group/bindings/include/asterisk/pbx.h
team/group/bindings/include/asterisk/pval.h
team/group/bindings/include/asterisk/res_odbc.h
team/group/bindings/include/asterisk/stringfields.h
team/group/bindings/include/asterisk/strings.h
team/group/bindings/include/asterisk/tcptls.h
team/group/bindings/include/asterisk/term.h
team/group/bindings/include/asterisk/threadstorage.h
team/group/bindings/include/asterisk/utils.h
team/group/bindings/include/asterisk/xml.h
team/group/bindings/include/jitterbuf.h
team/group/bindings/main/Makefile
team/group/bindings/main/app.c
team/group/bindings/main/ast_expr2.c
team/group/bindings/main/ast_expr2f.c
team/group/bindings/main/asterisk.c
team/group/bindings/main/astmm.c
team/group/bindings/main/astobj2.c
team/group/bindings/main/audiohook.c
team/group/bindings/main/autoservice.c
team/group/bindings/main/callerid.c
team/group/bindings/main/cdr.c
team/group/bindings/main/channel.c
team/group/bindings/main/cli.c
team/group/bindings/main/config.c
team/group/bindings/main/db.c
team/group/bindings/main/db1-ast/Makefile
team/group/bindings/main/db1-ast/btree/ (props changed)
team/group/bindings/main/db1-ast/db/ (props changed)
team/group/bindings/main/db1-ast/hash/ (props changed)
team/group/bindings/main/db1-ast/hash/hash_page.c
team/group/bindings/main/db1-ast/mpool/ (props changed)
team/group/bindings/main/db1-ast/recno/ (props changed)
team/group/bindings/main/devicestate.c
team/group/bindings/main/dns.c
team/group/bindings/main/dnsmgr.c
team/group/bindings/main/dsp.c
team/group/bindings/main/editline/read.c
team/group/bindings/main/editline/readline.c
team/group/bindings/main/event.c
team/group/bindings/main/features.c
team/group/bindings/main/file.c
team/group/bindings/main/frame.c
team/group/bindings/main/http.c
team/group/bindings/main/indications.c
team/group/bindings/main/logger.c
team/group/bindings/main/manager.c
team/group/bindings/main/pbx.c
team/group/bindings/main/rtp.c
team/group/bindings/main/srv.c
team/group/bindings/main/stdtime/ (props changed)
team/group/bindings/main/stdtime/Makefile
team/group/bindings/main/taskprocessor.c
team/group/bindings/main/tcptls.c
team/group/bindings/main/threadstorage.c
team/group/bindings/main/translate.c
team/group/bindings/main/udptl.c
team/group/bindings/main/utils.c
team/group/bindings/makeopts.in
team/group/bindings/pbx/Makefile
team/group/bindings/pbx/ael/ (props changed)
team/group/bindings/pbx/ael/ael-test/ref.ael-vtest13
team/group/bindings/pbx/ael/ael-test/ref.ael-vtest17
team/group/bindings/pbx/pbx_ael.c
team/group/bindings/pbx/pbx_config.c
team/group/bindings/pbx/pbx_dundi.c
team/group/bindings/pbx/pbx_lua.c
team/group/bindings/pbx/pbx_realtime.c
team/group/bindings/pbx/pbx_spool.c
team/group/bindings/phoneprov/polycom_line.xml (contents, props changed)
team/group/bindings/res/Makefile
team/group/bindings/res/ael/ (props changed)
team/group/bindings/res/ael/ael.flex
team/group/bindings/res/ael/ael.tab.c
team/group/bindings/res/ael/ael.y
team/group/bindings/res/ael/ael_lex.c
team/group/bindings/res/ael/pval.c
team/group/bindings/res/ais/ (props changed)
team/group/bindings/res/ais/evt.c
team/group/bindings/res/res_agi.c
team/group/bindings/res/res_clioriginate.c
team/group/bindings/res/res_config_curl.c
team/group/bindings/res/res_config_ldap.c
team/group/bindings/res/res_config_odbc.c
team/group/bindings/res/res_config_pgsql.c
team/group/bindings/res/res_config_sqlite.c
team/group/bindings/res/res_convert.c
team/group/bindings/res/res_crypto.c
team/group/bindings/res/res_http_post.c (contents, props changed)
team/group/bindings/res/res_indications.c
team/group/bindings/res/res_jabber.c
team/group/bindings/res/res_monitor.c
team/group/bindings/res/res_musiconhold.c
team/group/bindings/res/res_odbc.c
team/group/bindings/res/res_phoneprov.c (contents, props changed)
team/group/bindings/res/res_realtime.c
team/group/bindings/res/res_timing_dahdi.c
team/group/bindings/res/res_timing_pthread.c
team/group/bindings/res/snmp/ (props changed)
team/group/bindings/res/snmp/agent.c
team/group/bindings/sounds/Makefile
team/group/bindings/utils/ (props changed)
team/group/bindings/utils/Makefile
team/group/bindings/utils/ael_main.c
team/group/bindings/utils/astcanary.c
team/group/bindings/utils/astman.c
team/group/bindings/utils/check_expr.c
team/group/bindings/utils/conf2ael.c
team/group/bindings/utils/extconf.c
team/group/bindings/utils/frame.c
team/group/bindings/utils/hashtest.c
team/group/bindings/utils/hashtest2.c
team/group/bindings/utils/muted.c
team/group/bindings/utils/refcounter.c
team/group/bindings/utils/smsq.c
team/group/bindings/utils/stereorize.c
team/group/bindings/utils/streamplayer.c
Propchange: team/group/bindings/
------------------------------------------------------------------------------
automerge = *
Propchange: team/group/bindings/
------------------------------------------------------------------------------
--- automerge-email (original)
+++ automerge-email Sat Jan 10 09:37:11 2009
@@ -1,1 +1,1 @@
-russell at digium.com
+russell at digium.com,sean.bright at gmail.com
Propchange: team/group/bindings/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/group/bindings/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/group/bindings/
------------------------------------------------------------------------------
reviewboard:url = http://reviewboard.digium.com
Propchange: team/group/bindings/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Jan 10 09:37:11 2009
@@ -1,1 +1,1 @@
-/trunk:1-153569
+/trunk:1-168377
Modified: team/group/bindings/.cleancount
URL: http://svn.digium.com/view/asterisk/team/group/bindings/.cleancount?view=diff&rev=168378&r1=168377&r2=168378
==============================================================================
--- team/group/bindings/.cleancount (original)
+++ team/group/bindings/.cleancount Sat Jan 10 09:37:11 2009
@@ -1,1 +1,1 @@
-35
+36
Modified: team/group/bindings/CHANGES
URL: http://svn.digium.com/view/asterisk/team/group/bindings/CHANGES?view=diff&rev=168378&r1=168377&r2=168378
==============================================================================
--- team/group/bindings/CHANGES (original)
+++ team/group/bindings/CHANGES Sat Jan 10 09:37:11 2009
@@ -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 -------------
------------------------------------------------------------------------------
@@ -11,12 +21,37 @@
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 diabled by default.
Skinny Changes
--------------
- * The configuration file now holds seperate sections for devices and lines.
+ * 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
------------------
@@ -28,9 +63,21 @@
* 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
@@ -38,9 +85,13 @@
* 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.
@@ -51,6 +102,36 @@
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 -------------
@@ -361,6 +442,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.
@@ -639,8 +726,12 @@
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.
+ 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
--------------
@@ -922,3 +1013,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/group/bindings/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/bindings/Makefile?view=diff&rev=168378&r1=168377&r2=168378
==============================================================================
--- team/group/bindings/Makefile (original)
+++ team/group/bindings/Makefile Sat Jan 10 09:37:11 2009
@@ -93,6 +93,7 @@
export AWK
export GREP
export ID
+export MD5
export SWIG
# even though we could use '-include makeopts' here, use a wildcard
@@ -239,7 +240,13 @@
ASTCFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
ifeq ($(AST_DEVMODE),yes)
- ASTCFLAGS+=-Werror -Wunused -Wundef $(AST_DECLARATION_AFTER_STATEMENT) -Wmissing-format-attribute -Wformat-security #-Wformat=2
+ ASTCFLAGS+=-Werror
+ ASTCFLAGS+=-Wunused
+ ASTCFLAGS+=$(AST_DECLARATION_AFTER_STATEMENT)
+ ASTCFLAGS+=$(AST_FORTIFY_SOURCE)
+ ASTCFLAGS+=-Wundef
+ ASTCFLAGS+=-Wmissing-format-attribute
+ ASTCFLAGS+=-Wformat=2
endif
ifneq ($(findstring BSD,$(OSARCH)),)
@@ -354,7 +361,7 @@
@echo " + $(mK) install +"
@echo " +-------------------------------------------+"
-_all: cleantest makeopts $(SUBDIRS)
+_all: cleantest makeopts $(SUBDIRS) doc/core-en_US.xml
makeopts: configure
@echo "****"
@@ -443,7 +450,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
@@ -453,7 +462,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
@@ -488,19 +497,28 @@
mkdir -p $(DESTDIR)$(PYTHON_DIR)
$(MAKE) -C sounds install
-documentation:
+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\"?>" > doc/core-en_US.xml
- @echo "<!DOCTYPE docs SYSTEM \"appdocsxml.dtd\">" >> doc/core-en_US.xml
- @echo "<docs>" >> doc/core-en_US.xml
+ @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 >> doc/core-en_US.xml ; \
+ $(AWK) -f build_tools/get_documentation $$i >> $@ ; \
done ; \
done
- @echo "</docs>" >> doc/core-en_US.xml
- @echo -e "\ndoc/core-en_US.xml --> $(ASTDATADIR)/documentation/core-en_US.xml"
+ @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 \
@@ -558,8 +576,8 @@
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
- $(INSTALL) -m 644 doc/core-*.xml $(ASTDATADIR)/documentation
- $(INSTALL) -m 644 doc/appdocsxml.dtd $(ASTVARLIBDIR)/documentation
+ $(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
@@ -601,7 +619,7 @@
@exit 1
endif
-install: badshell datafiles documentation bininstall
+install: badshell datafiles bininstall
@if [ -x /usr/sbin/asterisk-post-install ]; then \
/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
fi
@@ -804,6 +822,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 \
@@ -928,7 +948,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/group/bindings/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/group/bindings/Makefile.moddir_rules?view=diff&rev=168378&r1=168377&r2=168378
==============================================================================
--- team/group/bindings/Makefile.moddir_rules (original)
+++ team/group/bindings/Makefile.moddir_rules Sat Jan 10 09:37:11 2009
@@ -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/group/bindings/Makefile.rules
URL: http://svn.digium.com/view/asterisk/team/group/bindings/Makefile.rules?view=diff&rev=168378&r1=168377&r2=168378
==============================================================================
--- team/group/bindings/Makefile.rules (original)
+++ team/group/bindings/Makefile.rules Sat Jan 10 09:37:11 2009
@@ -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/group/bindings/README
URL: http://svn.digium.com/view/asterisk/team/group/bindings/README?view=diff&rev=168378&r1=168377&r2=168378
==============================================================================
--- team/group/bindings/README (original)
+++ team/group/bindings/README Sat Jan 10 09:37:11 2009
@@ -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/group/bindings/UPGRADE-1.2.txt
URL: http://svn.digium.com/view/asterisk/team/group/bindings/UPGRADE-1.2.txt?view=diff&rev=168378&r1=168377&r2=168378
==============================================================================
--- team/group/bindings/UPGRADE-1.2.txt (original)
+++ team/group/bindings/UPGRADE-1.2.txt Sat Jan 10 09:37:11 2009
@@ -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/group/bindings/UPGRADE-1.4.txt
[... 43844 lines stripped ...]
More information about the asterisk-commits
mailing list