[svn-commits] russell: branch russell/bindings r138205 - in /team/russell/bindings: ./ apps...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Fri Aug 15 15:34:04 CDT 2008
Author: russell
Date: Fri Aug 15 15:34:02 2008
New Revision: 138205
URL: http://svn.digium.com/view/asterisk?view=rev&rev=138205
Log:
resolve, reset
Added:
team/russell/bindings/Zaptel-to-DAHDI.txt
- copied unchanged from r138155, trunk/Zaptel-to-DAHDI.txt
team/russell/bindings/contrib/init.d/rc.mandriva.asterisk
- copied unchanged from r138155, trunk/contrib/init.d/rc.mandriva.asterisk
team/russell/bindings/contrib/init.d/rc.mandriva.zaptel
- copied unchanged from r138155, trunk/contrib/init.d/rc.mandriva.zaptel
team/russell/bindings/contrib/scripts/asterisk.logrotate
- copied unchanged from r138155, trunk/contrib/scripts/asterisk.logrotate
team/russell/bindings/doc/hoard.txt
- copied unchanged from r138155, trunk/doc/hoard.txt
team/russell/bindings/doc/realtimetext.txt
- copied unchanged from r138155, trunk/doc/realtimetext.txt
team/russell/bindings/doc/sip-retransmit.txt
- copied unchanged from r138155, trunk/doc/sip-retransmit.txt
team/russell/bindings/include/asterisk/datastore.h
- copied unchanged from r138155, trunk/include/asterisk/datastore.h
team/russell/bindings/include/asterisk/fskmodem_float.h
- copied unchanged from r138155, trunk/include/asterisk/fskmodem_float.h
team/russell/bindings/include/asterisk/fskmodem_int.h
- copied unchanged from r138155, trunk/include/asterisk/fskmodem_int.h
team/russell/bindings/main/datastore.c
- copied unchanged from r138155, trunk/main/datastore.c
team/russell/bindings/main/editline/makelist.in
- copied unchanged from r138155, trunk/main/editline/makelist.in
team/russell/bindings/main/fskmodem_float.c
- copied unchanged from r138155, trunk/main/fskmodem_float.c
team/russell/bindings/main/fskmodem_int.c
- copied unchanged from r138155, trunk/main/fskmodem_int.c
Removed:
team/russell/bindings/contrib/init.d/rc.mandrake.asterisk
team/russell/bindings/contrib/init.d/rc.mandrake.zaptel
team/russell/bindings/include/asterisk/dlfcn-compat.h
team/russell/bindings/include/asterisk/libresample.h
team/russell/bindings/main/dlfcn.c
team/russell/bindings/main/editline/makelist
team/russell/bindings/main/libresample/
Modified:
team/russell/bindings/ (props changed)
team/russell/bindings/CHANGES
team/russell/bindings/LICENSE
team/russell/bindings/Makefile
team/russell/bindings/UPGRADE.txt
team/russell/bindings/acinclude.m4
team/russell/bindings/apps/Makefile
team/russell/bindings/apps/app_adsiprog.c
team/russell/bindings/apps/app_chanspy.c
team/russell/bindings/apps/app_dahdibarge.c
team/russell/bindings/apps/app_dahdiras.c
team/russell/bindings/apps/app_dahdiscan.c
team/russell/bindings/apps/app_dial.c
team/russell/bindings/apps/app_directory.c
team/russell/bindings/apps/app_disa.c
team/russell/bindings/apps/app_fax.c
team/russell/bindings/apps/app_festival.c
team/russell/bindings/apps/app_forkcdr.c
team/russell/bindings/apps/app_ices.c
team/russell/bindings/apps/app_image.c
team/russell/bindings/apps/app_jack.c
team/russell/bindings/apps/app_macro.c
team/russell/bindings/apps/app_meetme.c
team/russell/bindings/apps/app_milliwatt.c
team/russell/bindings/apps/app_minivm.c
team/russell/bindings/apps/app_osplookup.c
team/russell/bindings/apps/app_parkandannounce.c
team/russell/bindings/apps/app_playback.c
team/russell/bindings/apps/app_queue.c
team/russell/bindings/apps/app_record.c
team/russell/bindings/apps/app_rpt.c
team/russell/bindings/apps/app_senddtmf.c
team/russell/bindings/apps/app_sendtext.c
team/russell/bindings/apps/app_sms.c
team/russell/bindings/apps/app_speech_utils.c
team/russell/bindings/apps/app_stack.c
team/russell/bindings/apps/app_voicemail.c
team/russell/bindings/apps/app_waituntil.c
team/russell/bindings/apps/app_while.c
team/russell/bindings/build_tools/cflags.xml
team/russell/bindings/build_tools/make_version
team/russell/bindings/build_tools/menuselect-deps.in
team/russell/bindings/build_tools/prep_tarball
team/russell/bindings/cdr/cdr_adaptive_odbc.c
team/russell/bindings/cdr/cdr_csv.c
team/russell/bindings/cdr/cdr_pgsql.c
team/russell/bindings/cdr/cdr_radius.c
team/russell/bindings/cdr/cdr_sqlite3_custom.c
team/russell/bindings/cdr/cdr_tds.c
team/russell/bindings/channels/chan_agent.c
team/russell/bindings/channels/chan_alsa.c
team/russell/bindings/channels/chan_console.c
team/russell/bindings/channels/chan_dahdi.c
team/russell/bindings/channels/chan_features.c
team/russell/bindings/channels/chan_gtalk.c
team/russell/bindings/channels/chan_iax2.c
team/russell/bindings/channels/chan_jingle.c
team/russell/bindings/channels/chan_mgcp.c
team/russell/bindings/channels/chan_misdn.c
team/russell/bindings/channels/chan_phone.c
team/russell/bindings/channels/chan_sip.c
team/russell/bindings/channels/chan_skinny.c
team/russell/bindings/channels/chan_unistim.c
team/russell/bindings/channels/console_video.c
team/russell/bindings/channels/h323/ast_h323.cxx
team/russell/bindings/channels/iax2-parser.c
team/russell/bindings/channels/iax2-provision.c
team/russell/bindings/channels/iax2.h
team/russell/bindings/channels/misdn/isdn_lib.c
team/russell/bindings/channels/misdn_config.c
team/russell/bindings/channels/vgrabbers.c
team/russell/bindings/channels/xpmr/xpmr.c
team/russell/bindings/codecs/Makefile
team/russell/bindings/codecs/codec_dahdi.c
team/russell/bindings/codecs/codec_g722.c
team/russell/bindings/codecs/codec_resample.c
team/russell/bindings/configs/agents.conf.sample
team/russell/bindings/configs/chan_dahdi.conf.sample
team/russell/bindings/configs/extensions.conf.sample
team/russell/bindings/configs/features.conf.sample
team/russell/bindings/configs/gtalk.conf.sample
team/russell/bindings/configs/iax.conf.sample
team/russell/bindings/configs/jingle.conf.sample
team/russell/bindings/configs/manager.conf.sample
team/russell/bindings/configs/misdn.conf.sample
team/russell/bindings/configs/queues.conf.sample
team/russell/bindings/configs/sip.conf.sample
team/russell/bindings/configs/skinny.conf.sample
team/russell/bindings/configs/voicemail.conf.sample
team/russell/bindings/configure
team/russell/bindings/configure.ac
team/russell/bindings/contrib/init.d/rc.redhat.asterisk
team/russell/bindings/contrib/scripts/asterisk.ldap-schema
team/russell/bindings/contrib/scripts/asterisk.ldif
team/russell/bindings/contrib/scripts/autosupport
team/russell/bindings/contrib/scripts/safe_asterisk
team/russell/bindings/contrib/utils/zones2indications.c
team/russell/bindings/doc/CODING-GUIDELINES
team/russell/bindings/doc/janitor-projects.txt
team/russell/bindings/doc/lang/hebrew.ods
team/russell/bindings/doc/osp.txt
team/russell/bindings/doc/ss7.txt
team/russell/bindings/doc/tex/Makefile
team/russell/bindings/doc/tex/app-sms.tex
team/russell/bindings/doc/tex/asterisk.tex
team/russell/bindings/doc/tex/cdrdriver.tex
team/russell/bindings/doc/tex/cliprompt.tex
team/russell/bindings/doc/tex/extensions.tex
team/russell/bindings/doc/tex/queuelog.tex
team/russell/bindings/formats/format_pcm.c
team/russell/bindings/formats/msgsm.h
team/russell/bindings/funcs/func_config.c
team/russell/bindings/funcs/func_curl.c
team/russell/bindings/funcs/func_devstate.c
team/russell/bindings/funcs/func_dialgroup.c
team/russell/bindings/funcs/func_enum.c
team/russell/bindings/funcs/func_global.c
team/russell/bindings/funcs/func_lock.c
team/russell/bindings/funcs/func_odbc.c
team/russell/bindings/funcs/func_speex.c
team/russell/bindings/funcs/func_strings.c
team/russell/bindings/funcs/func_sysinfo.c
team/russell/bindings/funcs/func_timeout.c
team/russell/bindings/funcs/func_volume.c
team/russell/bindings/images/kpad2.jpg
team/russell/bindings/include/asterisk/abstract_jb.h
team/russell/bindings/include/asterisk/ael_structs.h
team/russell/bindings/include/asterisk/app.h
team/russell/bindings/include/asterisk/astobj.h
team/russell/bindings/include/asterisk/astobj2.h
team/russell/bindings/include/asterisk/autoconfig.h.in
team/russell/bindings/include/asterisk/callerid.h
team/russell/bindings/include/asterisk/causes.h
team/russell/bindings/include/asterisk/cdr.h
team/russell/bindings/include/asterisk/channel.h
team/russell/bindings/include/asterisk/compat.h
team/russell/bindings/include/asterisk/config.h
team/russell/bindings/include/asterisk/devicestate.h
team/russell/bindings/include/asterisk/dnsmgr.h
team/russell/bindings/include/asterisk/doxyref.h
team/russell/bindings/include/asterisk/fskmodem.h
team/russell/bindings/include/asterisk/http.h
team/russell/bindings/include/asterisk/lock.h
team/russell/bindings/include/asterisk/logger.h
team/russell/bindings/include/asterisk/manager.h
team/russell/bindings/include/asterisk/module.h
team/russell/bindings/include/asterisk/options.h
team/russell/bindings/include/asterisk/pbx.h
team/russell/bindings/include/asterisk/res_odbc.h
team/russell/bindings/include/asterisk/rtp.h
team/russell/bindings/include/asterisk/sched.h
team/russell/bindings/include/asterisk/slinfactory.h
team/russell/bindings/include/asterisk/stringfields.h
team/russell/bindings/include/asterisk/strings.h
team/russell/bindings/include/asterisk/threadstorage.h
team/russell/bindings/include/asterisk/time.h
team/russell/bindings/include/asterisk/timing.h
team/russell/bindings/include/asterisk/utils.h
team/russell/bindings/main/Makefile
team/russell/bindings/main/abstract_jb.c
team/russell/bindings/main/acl.c
team/russell/bindings/main/app.c
team/russell/bindings/main/asterisk.c
team/russell/bindings/main/astmm.c
team/russell/bindings/main/astobj2.c
team/russell/bindings/main/audiohook.c
team/russell/bindings/main/autoservice.c
team/russell/bindings/main/callerid.c
team/russell/bindings/main/cdr.c
team/russell/bindings/main/channel.c
team/russell/bindings/main/cli.c
team/russell/bindings/main/config.c
team/russell/bindings/main/db1-ast/btree/bt_delete.c
team/russell/bindings/main/db1-ast/btree/bt_put.c
team/russell/bindings/main/db1-ast/recno/rec_delete.c
team/russell/bindings/main/db1-ast/recno/rec_put.c
team/russell/bindings/main/devicestate.c
team/russell/bindings/main/dns.c
team/russell/bindings/main/dnsmgr.c
team/russell/bindings/main/dsp.c
team/russell/bindings/main/editline/ (props changed)
team/russell/bindings/main/editline/Makefile.in
team/russell/bindings/main/editline/configure
team/russell/bindings/main/editline/configure.in
team/russell/bindings/main/editline/np/vis.c
team/russell/bindings/main/event.c
team/russell/bindings/main/features.c
team/russell/bindings/main/file.c
team/russell/bindings/main/fixedjitterbuf.h
team/russell/bindings/main/frame.c
team/russell/bindings/main/fskmodem.c
team/russell/bindings/main/hashtab.c
team/russell/bindings/main/http.c
team/russell/bindings/main/indications.c
team/russell/bindings/main/jitterbuf.c
team/russell/bindings/main/loader.c
team/russell/bindings/main/logger.c
team/russell/bindings/main/manager.c
team/russell/bindings/main/pbx.c
team/russell/bindings/main/rtp.c
team/russell/bindings/main/say.c
team/russell/bindings/main/sched.c
team/russell/bindings/main/srv.c
team/russell/bindings/main/taskprocessor.c
team/russell/bindings/main/tdd.c
team/russell/bindings/main/threadstorage.c
team/russell/bindings/main/translate.c
team/russell/bindings/main/udptl.c
team/russell/bindings/main/utils.c
team/russell/bindings/makeopts.in
team/russell/bindings/pbx/ael/ael-test/ref.ael-ntest10
team/russell/bindings/pbx/ael/ael-test/ref.ael-test18
team/russell/bindings/pbx/ael/ael-test/ref.ael-test19
team/russell/bindings/pbx/ael/ael-test/ref.ael-test8
team/russell/bindings/pbx/ael/ael-test/ref.ael-vtest13
team/russell/bindings/pbx/dundi-parser.c
team/russell/bindings/pbx/pbx_config.c
team/russell/bindings/pbx/pbx_dundi.c
team/russell/bindings/pbx/pbx_lua.c
team/russell/bindings/res/Makefile
team/russell/bindings/res/ael/ael.flex
team/russell/bindings/res/ael/ael_lex.c
team/russell/bindings/res/ael/pval.c
team/russell/bindings/res/ais/ais.h
team/russell/bindings/res/res_adsi.c
team/russell/bindings/res/res_agi.c
team/russell/bindings/res/res_ais.c
team/russell/bindings/res/res_config_ldap.c
team/russell/bindings/res/res_config_odbc.c
team/russell/bindings/res/res_config_pgsql.c
team/russell/bindings/res/res_config_sqlite.c
team/russell/bindings/res/res_http_post.c
team/russell/bindings/res/res_jabber.c
team/russell/bindings/res/res_limit.c
team/russell/bindings/res/res_musiconhold.c
team/russell/bindings/res/res_odbc.c
team/russell/bindings/res/res_phoneprov.c
team/russell/bindings/res/res_smdi.c
team/russell/bindings/res/res_timing_pthread.c
team/russell/bindings/sample.call
team/russell/bindings/sounds/Makefile
team/russell/bindings/utils/astman.c
team/russell/bindings/utils/extconf.c
team/russell/bindings/utils/frame.c
team/russell/bindings/utils/muted.c
team/russell/bindings/utils/smsq.c
Propchange: team/russell/bindings/
------------------------------------------------------------------------------
automerge = *
Propchange: team/russell/bindings/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/russell/bindings/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/russell/bindings/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Aug 15 15:34:02 2008
@@ -1,1 +1,1 @@
-/trunk:1-126981
+/trunk:1-138185
Modified: team/russell/bindings/CHANGES
URL: http://svn.digium.com/view/asterisk/team/russell/bindings/CHANGES?view=diff&rev=138205&r1=138204&r2=138205
==============================================================================
--- team/russell/bindings/CHANGES (original)
+++ team/russell/bindings/CHANGES Fri Aug 15 15:34:02 2008
@@ -1,3 +1,9 @@
+------------------------------------------------------------------------------
+--- Functionality changes from Asterisk 1.6.1 to Asterisk 1.6.2 -------------
+------------------------------------------------------------------------------
+
+* Nothing, yet!
+
------------------------------------------------------------------------------
--- Functionality changes from Asterisk 1.6.0 to Asterisk 1.6.1 -------------
------------------------------------------------------------------------------
@@ -35,9 +41,9 @@
* CHANNEL() now has options for the maximum, minimum, and standard or normal
deviation of jitter, rtt, and loss for a call using chan_sip.
-Zaptel channel driver (chan_zap) Changes
+DAHDI channel driver (chan_dahdi) Changes
----------------------------------------
- * Channels can now be configured using named sections in zapata.conf, just
+ * Channels can now be configured using named sections in chan_dahdi.conf, just
like other channel drivers, including the use of templates.
* The default for pridialplan has changed from 'national' to 'unknown'.
@@ -102,11 +108,13 @@
* The Dial() application no longer copies the language used by the caller to the callee's
channel. If you desire for the caller's channel's language to be used for file playback
to the callee, then the file specified may be prepended with "${CHANNEL(language)}/" .
+ * SendImage() no longer hangs up the channel on error; instead, it sets the
+ status variable SENDIMAGESTATUS to one of 'SUCCESS', 'FAILURE', or
+ 'UNSUPPORTED'. This change makes SendImage() more consistent with other
+ applications.
SIP Changes
-----------
- * The ATTENDED_TRANSFER_COMPLETE_SOUND can now be set using setvar to cause a given
- audio file to be played upon completion of an attended transfer.
* Added DNS manager support to registrations for peers referencing peer entries.
DNS manager runs in the background which allows DNS lookups to be run asynchronously
as well as periodically updating the IP address. These properties allow for
@@ -127,10 +135,18 @@
* 'sip show peers' and 'sip show users' display their entries sorted in
alphabetical order, as opposed to the order they were in, in the config
file or database.
+ * Videosupport now supports an additional option, "always", which always sets
+ up video RTP ports, even on clients that don't support it. This helps with
+ callfiles and certain transfers to ensure that if two video phones are
+ connected, they will always share video feeds.
IAX Changes
-----------
* Existing DNS manager lookups extended to check for SRV records.
+ * IAX2 encryption support has been improved to support periodic key rotation
+ within a call for enhanced security. The option "keyrotate" has been
+ provided to disable this functionality to preserve backwards compatibility
+ with older versions of IAX2 that do not support key rotation.
CLI Changes
-----------
@@ -142,6 +158,11 @@
A new API call was added so trunk will now have to be compiled against
a versions of libpri and libss7 that have them or it will not know that
these libraries exist.
+ * The commands "core show globals", "core set global" and "core set chanvar" has
+ been deprecated in favor of the more semanticly correct "dialplan show globals",
+ "dialplan set chanvar" and "dialplan set global".
+ * New CLI command "dialplan show chanvar" to list all variables associated
+ with a given channel.
DNS manager changes
-------------------
@@ -163,6 +184,31 @@
-------------
* The TRANSFER queue log entry now includes the the caller's original
position in the transferred-from queue.
+ * A new configuration option, "timeoutpriority" has been added. Please see the section labeled
+ "QUEUE TIMING OPTIONS" in configs/queues.conf.sample for a detailed explanation of the option
+ as well as an explanation about timeout options in general
+
+Realtime changes
+----------------
+ * Several (ODBC, Postgres, MySQL, SQLite) realtime drivers have been given
+ adaptive capabilities. What this means in practical terms is that if your
+ realtime table lacks critical fields, Asterisk will now emit warnings to
+ that effect. Also, some of the realtime drivers have the ability (if
+ configured) to automatically add those columns to the table with the
+ correct type and length.
+
+Miscellaneous
+-------------
+ * The channel variable ATTENDED_TRANSFER_COMPLETE_SOUND can now be set using
+ the 'setvar' option to cause a given audio file to be played upon completion
+ of an attended transfer. Currently it works for DAHDI, IAX2, SIP, and
+ Skinny channels only.
+ * You can now compile Asterisk against the Hoard Memory Allocator, see doc/hoard.txt
+ for more information.
+ * Config file variables may now be appended to, by using the '+=' append
+ operator. This is most helpful when working with long SQL queries in
+ func_odbc.conf, as the queries no longer need to be specified on a single
+ line.
------------------------------------------------------------------------------
--- Functionality changes from Asterisk 1.4.X to Asterisk 1.6.0 -------------
@@ -379,28 +425,35 @@
that is behind it when queried. This is useful for transfer scenarios as the
actual channel will be transferred, not the Local channel.
-Zaptel channel driver (chan_zap) Changes
+Agent channel changes
+----------------------
+ * The ackcall and endcall options are now supplemented with options acceptdtmf
+ and enddtmf. These allow for the DTMF keypress to be configurable. The options
+ default to their old hard-coded values ('#' and '*' respectively) so this should
+ not break any existing agent installations.
+
+DAHDI channel driver (chan_dahdi) Changes
----------------------------------------
- * SS7 support in chan_zap (via libss7 library)
+ * SS7 support (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.
- * Added setvar support to zapata.conf channel entries.
+ * Added dahdi show version CLI command.
+ * Added setvar support to chan_dahdi.conf channel entries.
* Added two new options: mwimonitor and mwimonitornotify. These options allow
you to enable MWI monitoring on FXO lines. When the MWI state changes,
the script specified in the mwimonitornotify option is executed. An internal
event indicating the new state of the mailbox is also generated, so that
the normal MWI facilities in Asterisk work as usual.
* Added signalling type 'auto', which attempts to use the same signalling type
- for a channel as configured in Zaptel. This is primarily designed for analog
+ for a channel as configured in DAHDI. This is primarily designed for analog
ports, but will also work for digital ports that are configured for FXS or FXO
- signalling types. This mode is also the default now, so if your zapata.conf
+ signalling types. This mode is also the default now, so if your chan_dahdi.conf
does not specify signalling for a channel (which is unlikely as the sample
configuration file has always recommended specifying it for every channel) then
the 'auto' mode will be used for that channel if possible.
- * Added a 'zap set dnd' command to allow CLI control of the Do-Not-Disturb
+ * Added a 'dahdi set dnd' command to allow CLI control of the Do-Not-Disturb
state for a channel; also ensured that the DNDState Manager event is
emitted no matter how the DND state is set or cleared.
@@ -795,3 +848,9 @@
as a backtrace of the stack which led to the lock calls.
* users.conf now sports an optional alternateexts property, which permits
allocation of additional extensions which will reach the specified user.
+ * A new option for the configure script, --enable-internal-poll, has been added
+ for use with systems which may have a buggy implementation of the poll system
+ call. If you notice odd behavior such as the CLI being unresponsive on remote
+ 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.
Modified: team/russell/bindings/LICENSE
URL: http://svn.digium.com/view/asterisk/team/russell/bindings/LICENSE?view=diff&rev=138205&r1=138204&r2=138205
==============================================================================
--- team/russell/bindings/LICENSE (original)
+++ team/russell/bindings/LICENSE Fri Aug 15 15:34:02 2008
@@ -31,8 +31,8 @@
GPL'd products (although if you've written a module for Asterisk we
would strongly encourage you to make the same exception that we do).
-Specific permission is also granted to link Asterisk with OpenSSL and
-OpenH323 and distribute the resulting binary files.
+Specific permission is also granted to link Asterisk with OpenSSL, OpenH323
+and/or the UW IMAP Toolkit and distribute the resulting binary files.
In addition, Asterisk implements two management/control protocols: the
Asterisk Manager Interface (AMI) and the Asterisk Gateway Interface
@@ -60,7 +60,7 @@
+1.877.344.4861 (via telephone in the USA)
+1.256.428.6000 (via telephone outside the USA)
+1.256.864.0464 (via FAX inside or outside the USA)
-IAX2/misery.digium.com/6000 (via IAX2)
+IAX2/pbx.digium.com (via IAX2)
licensing at digium.com (via email)
Digium, Inc.
Modified: team/russell/bindings/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/bindings/Makefile?view=diff&rev=138205&r1=138204&r2=138205
==============================================================================
--- team/russell/bindings/Makefile (original)
+++ team/russell/bindings/Makefile Fri Aug 15 15:34:02 2008
@@ -224,10 +224,16 @@
endif
ifeq ($(findstring -save-temps,$(ASTCFLAGS)),)
-ASTCFLAGS+=-pipe
-endif
-
-ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
+ ifeq ($(findstring -pipe,$(ASTCFLAGS)),)
+ ASTCFLAGS+=-pipe
+ endif
+endif
+
+ifeq ($(findstring -Wall,$(ASTCFLAGS)),)
+ ASTCFLAGS+=-Wall
+endif
+
+ASTCFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h
@@ -240,8 +246,10 @@
ASTLDFLAGS+=-L/usr/local/lib
endif
-ifneq ($(PROC),ultrasparc)
- ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
+ifeq ($(findstring -march,$(ASTCFLAGS)),)
+ ifneq ($(PROC),ultrasparc)
+ ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
+ endif
endif
ifeq ($(PROC),ppc)
@@ -307,7 +315,7 @@
endif
ifeq ($(OSARCH),SunOS)
- SOLINK=-shared -fpic -L/usr/local/ssl/lib
+ SOLINK=-shared -fpic -L/usr/local/ssl/lib -lrt
endif
# comment to print directories during submakes
@@ -315,7 +323,7 @@
SILENTMAKE:=$(MAKE) --quiet --no-print-directory
ifneq ($(PRINT_DIR)$(NOISY_BUILD),)
-SUBMAKE:=$(MAKE) --quiet
+SUBMAKE:=$(MAKE)
else
SUBMAKE:=$(MAKE) --quiet --no-print-directory
endif
@@ -372,9 +380,9 @@
makeopts.embed_rules: menuselect.makeopts
@echo "Generating embedded module rules ..."
@rm -f $@
- @$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LDSCRIPT)
- @$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LDFLAGS)
- @$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LIBS)
+ @$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDSCRIPT)
+ @$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDFLAGS)
+ @$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LIBS)
$(SUBDIRS): main/version.c include/asterisk/version.h include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
@@ -397,22 +405,22 @@
endif
$(MOD_SUBDIRS):
- @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) $(PRINT_DIR) --no-builtin-rules -C $@ SUBDIR=$@ all
+ @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
$(OTHER_SUBDIRS):
- @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) $(PRINT_DIR) --no-builtin-rules -C $@ SUBDIR=$@ all
+ @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
defaults.h: makeopts
@build_tools/make_defaults_h > $@.tmp
@cmp -s $@.tmp $@ || mv $@.tmp $@
@rm -f $@.tmp
-main/version.c:
+main/version.c: FORCE
@build_tools/make_version_c > $@.tmp
@cmp -s $@.tmp $@ || mv $@.tmp $@
@rm -f $@.tmp
-include/asterisk/version.h:
+include/asterisk/version.h: FORCE
@build_tools/make_version_h > $@.tmp
@cmp -s $@.tmp $@ || mv $@.tmp $@
@rm -f $@.tmp
@@ -428,10 +436,10 @@
@rm -f $@.tmp
$(SUBDIRS_CLEAN):
- @$(MAKE) $(PRINT_DIR) -C $(@:-clean=) clean
+ @$(SUBMAKE) -C $(@:-clean=) clean
$(SUBDIRS_DIST_CLEAN):
- @$(MAKE) $(PRINT_DIR) -C $(@:-dist-clean=) dist-clean
+ @$(SUBMAKE) -C $(@:-dist-clean=) dist-clean
clean: $(SUBDIRS_CLEAN)
rm -f defaults.h
@@ -460,10 +468,6 @@
# Should static HTTP be installed during make samples or even with its own target ala
# webvoicemail? There are portions here that *could* be customized but might also be
# improved a lot. I'll put it here for now.
- mkdir -p $(DESTDIR)$(ASTDATADIR)/phoneprov
- for x in phoneprov/*; do \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/phoneprov ; \
- done
mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http
for x in static-http/*; do \
$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
@@ -547,7 +551,7 @@
fi
$(SUBDIRS_INSTALL):
- @DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(MAKE) --quiet $(PRINT_DIR) -C $(@:-install=) install
+ @DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install
NEWMODS:=$(foreach d,$(MOD_SUBDIRS),$(notdir $(wildcard $(d)/*.so)))
OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
@@ -684,7 +688,7 @@
echo ";transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of directly" ; \
echo ";runuser = asterisk ; The user to run as" ; \
echo ";rungroup = asterisk ; The group to run as" ; \
- echo "dahdichanname = yes" ; Set channel name as DAHDI\
+ echo "dahdichanname = yes ; Set channel name as DAHDI" ; \
echo "" ; \
echo "; Changing the following lines may compromise your security." ; \
echo ";[files]" ; \
@@ -703,6 +707,24 @@
fi
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR)
+ @mkdir -p $(DESTDIR)$(ASTDATADIR)/phoneprov
+ @for x in phoneprov/*; do \
+ dst="$(DESTDIR)$(ASTDATADIR)/$$x" ; \
+ if [ -f $${dst} ]; then \
+ if [ "$(OVERWRITE)" = "y" ]; then \
+ if cmp -s $${dst} $$x ; then \
+ echo "Config file $$x is unchanged"; \
+ continue; \
+ fi ; \
+ mv -f $${dst} $${dst}.old ; \
+ else \
+ echo "Skipping config file $$x"; \
+ continue; \
+ fi ;\
+ fi ; \
+ echo "Installing file $$x"; \
+ $(INSTALL) -m 644 $$x $${dst} ;\
+ done
webvmail:
@[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
@@ -747,6 +769,14 @@
progdocs:
(cat contrib/asterisk-ng-doxygen; echo "HAVE_DOT=$(HAVEDOT)"; \
echo "PROJECT_NUMBER=$(ASTERISKVERSION)") | doxygen -
+
+install-logrotate:
+ if [ ! -d $(ASTETCDIR)/../logrotate.d ]; then \
+ mkdir $(ASTETCDIR)/../logrotate.d ; \
+ fi
+ sed 's#__LOGDIR__#$(ASTLOGDIR)#g' < contrib/scripts/asterisk.logrotate | sed 's#__SBINDIR__#$(ASTSBINDIR)#g' > contrib/scripts/asterisk.logrotate.tmp
+ install -m 0644 contrib/scripts/asterisk.logrotate.tmp $(ASTETCDIR)/../logrotate.d/asterisk
+ rm -f contrib/scripts/asterisk.logrotate.tmp
config:
@if [ "${OSARCH}" = "linux-gnu" ]; then \
@@ -760,7 +790,7 @@
$(INSTALL) -m 755 contrib/init.d/rc.gentoo.asterisk $(DESTDIR)/etc/init.d/asterisk; \
if [ -z "$(DESTDIR)" ]; then /sbin/rc-update add asterisk default; fi; \
elif [ -f /etc/mandrake-release -o -f /etc/mandriva-release ]; then \
- $(INSTALL) -m 755 contrib/init.d/rc.mandrake.asterisk $(DESTDIR)/etc/rc.d/init.d/asterisk; \
+ $(INSTALL) -m 755 contrib/init.d/rc.mandriva.asterisk $(DESTDIR)/etc/rc.d/init.d/asterisk; \
if [ -z "$(DESTDIR)" ]; then /sbin/chkconfig --add asterisk; fi; \
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; \
@@ -785,7 +815,7 @@
@cmp -s .cleancount .lastclean || $(MAKE) clean
$(SUBDIRS_UNINSTALL):
- @$(MAKE) $(PRINT_DIR) -C $(@:-uninstall=) uninstall
+ @$(SUBMAKE) -C $(@:-uninstall=) uninstall
_uninstall: $(SUBDIRS_UNINSTALL)
rm -f $(DESTDIR)$(MODULES_DIR)/*
@@ -889,4 +919,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 main/version.c include/asterisk/version.h 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
+
+FORCE:
+
Modified: team/russell/bindings/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/russell/bindings/UPGRADE.txt?view=diff&rev=138205&r1=138204&r2=138205
==============================================================================
--- team/russell/bindings/UPGRADE.txt (original)
+++ team/russell/bindings/UPGRADE.txt Fri Aug 15 15:34:02 2008
@@ -63,6 +63,11 @@
* The concise versions of various CLI commands are now deprecated. We recommend
using the manager interface (AMI) for application integration with Asterisk.
+* The following core commands dealing with dialplan has been deprecated: 'core
+ show globals', 'core set global' and 'core set chanvar'. Use the equivalent
+ 'dialplan show globals', 'dialplan set global' and 'dialplan set chanvar'
+ instead.
+
* The silencethreshold used for various applications is now settable via a
centralized config option in dsp.conf.
@@ -79,6 +84,7 @@
to make them more distinguishable from 'maxmsgs', which sets folder
size. The old variables will continue to work in this version, albeit
with a deprecation warning.
+
* If you use any interface for modifying voicemail aside from the built in
dialplan applications, then the option "pollmailboxes" *must* be set in
voicemail.conf for message waiting indication (MWI) to work properly. This
@@ -87,22 +93,35 @@
checking mailboxes for changes so that they can send MWI information to users.
Examples of situations that would require this option are web interfaces to
voicemail or an email client in the case of using IMAP storage.
+
* The externnotify script should accept an additional (last) parameter
containing the number of urgent messages in the INBOX.
Applications:
+
+* SendImage() no longer hangs up the channel on transmission error or on
+ another type of error; in those cases, a FAILURE status is stored in
+ SENDIMAGESTATUS and dialplan execution continues. The possible return values
+ stored in SENDIMAGESTATUS are: SUCCESS, FAILURE, and UNSUPPORTED. ('OK' has
+ been replaced with 'SUCCESS', and 'NOSUPPORT' has been replaced with
+ 'UNSUPPORTED'). This change makes the SendImage application more consistent
+ with other applications.
* ChanIsAvail() now has a 't' option, which allows the specified device
to be queried for state without consulting the channel drivers. This
performs mostly a 'ChanExists' sort of function.
+
* ChannelRedirect() will not terminate the channel that fails to do a
channelredirect as it has done previously. Instead CHANNELREDIRECT_STATUS
will reflect if the attempt was successful of not.
+
* 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'.
+
* Macro() is now deprecated. If you need subroutines, you should use the
Gosub()/Return() applications. To replace MacroExclusive(), we have
introduced dialplan functions LOCK(), TRYLOCK(), and UNLOCK(). You may use
@@ -113,20 +132,28 @@
sake of backwards compatibility it will not be removed . It is also worth
noting that using both Macro() and GoSub() at the same time is _heavily_
discouraged.
+
* Read() now sets a READSTATUS variable on exit. It does NOT automatically
return -1 (and hangup) anymore on error. If you want to hangup on error,
you need to do so explicitly in your dialplan.
+
* Privacy() no longer uses privacy.conf, so any options must be specified
directly in the application arguments.
+
* MusicOnHold application now has duration parameter which allows specifying
timeout in seconds.
+
* WaitMusicOnHold application is now deprecated in favor of extended MusicOnHold.
+
* SetMusicOnHold is now deprecated. You should use Set(CHANNEL(musicclass)=...)
instead.
+
* While app_directory has always relied on having a voicemail.conf or users.conf file
correctly set up, it now is dependent on app_voicemail being compiled as well.
+
* The arguments in ExecIf changed a bit, to be more like other applications.
The syntax is now ExecIf(<cond>?appiftrue(args):appiffalse(args)).
+
* The behavior of the Set application now depends upon a compatibility option,
set in asterisk.conf. To use the old 1.4 behavior, which allowed Set to take
multiple key/value pairs, set app_set=1.4 in [compat] in asterisk.conf. To
@@ -156,7 +183,8 @@
systemname was too long, the uniqueid would have been truncated.
* The cdr_tds module now supports all versions of FreeTDS that contain
- the db-lib frontend.
+ the db-lib frontend. It will also now log the userfield variable if
+ the target database table contains a column for it.
Formats:
@@ -175,15 +203,18 @@
file names and formats are all controlled via the normal mechanisms. If the
user has not configured the automon feature, the normal "415 Unsupported media type"
is returned, and nothing is done.
+
* SIP: The "call-limit" option is marked as deprecated. It still works in this version of
Asterisk, but will be removed in the following version. Please use the groupcount functions
in the dialplan to enforce call limits. The "limitonpeer" configuration option is
now renamed to "counteronpeer".
+
* SIP: The "username" option is now renamed to "defaultuser" to match "defaultip".
These are used only before registration to call a peer with the uri
sip:defaultuser at defaultip
The "username" setting still work, but is deprecated and will not work in
the next version of Asterisk.
+
* SIP: All of the functionality in SIPCHANINFO() has been implemented in CHANNEL(),
and you should start using that function instead for retrieving information about
the channel in a technology-agnostic way.
@@ -191,6 +222,7 @@
* chan_local.c: the comma delimiter inside the channel name has been changed to a
semicolon, in order to make the Local channel driver compatible with the comma
delimiter change in applications.
+
* H323: The "tos" setting has changed name to "tos_audio" and "cos" to "cos_audio"
to be compatible with settings in sip.conf. The "tos" and "cos" configuration
is deprecated and will stop working in the next release of Asterisk.
@@ -202,7 +234,12 @@
to modify modules.conf to add another "noload" line to ensure that only one of
these three modules gets loaded.
-* Zap: The "msdstrip" option has been deprecated, as it provides no value over
+* DAHDI: The chan_zap module that supported PSTN interfaces using
+ Zaptel has been renamed to chan_dahdi, and only supports the DAHDI
+ telephony driver package for PSTN interfaces. See the
+ Zaptel-to-DAHDI.txt file for more details on this transition.
+
+* DAHDI: The "msdstrip" option has been deprecated, as it provides no value over
the method of stripping digits in the dialplan using variable substring syntax.
Configuration:
@@ -213,6 +250,13 @@
* queues.conf: the queue-lessthan sound file option is no longer available, and the
queue-round-seconds option no longer takes '1' as a valid parameter.
+
[... 46589 lines stripped ...]
More information about the svn-commits
mailing list