[asterisk-commits] oej: branch oej/02-labarea r45205 - in
/team/oej/02-labarea: ./ agi/ apps/ bu...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Mon Oct 16 06:05:11 MST 2006
Author: oej
Date: Mon Oct 16 08:05:09 2006
New Revision: 45205
URL: http://svn.digium.com/view/asterisk?rev=45205&view=rev
Log:
Reset automerge
Added:
team/oej/02-labarea/build_tools/strip_nonapi
- copied unchanged from r45177, trunk/build_tools/strip_nonapi
team/oej/02-labarea/channels/chan_gtalk.c
- copied unchanged from r45177, trunk/channels/chan_gtalk.c
team/oej/02-labarea/channels/h323/Makefile.in
- copied unchanged from r45177, trunk/channels/h323/Makefile.in
team/oej/02-labarea/channels/h323/ast_h323.cxx
- copied unchanged from r45177, trunk/channels/h323/ast_h323.cxx
team/oej/02-labarea/channels/h323/caps_h323.cxx
- copied unchanged from r45177, trunk/channels/h323/caps_h323.cxx
team/oej/02-labarea/channels/h323/caps_h323.h
- copied unchanged from r45177, trunk/channels/h323/caps_h323.h
team/oej/02-labarea/channels/h323/cisco-h225.asn
- copied unchanged from r45177, trunk/channels/h323/cisco-h225.asn
team/oej/02-labarea/channels/h323/cisco-h225.cxx
- copied unchanged from r45177, trunk/channels/h323/cisco-h225.cxx
team/oej/02-labarea/channels/h323/cisco-h225.h
- copied unchanged from r45177, trunk/channels/h323/cisco-h225.h
team/oej/02-labarea/channels/h323/compat_h323.cxx
- copied unchanged from r45177, trunk/channels/h323/compat_h323.cxx
team/oej/02-labarea/channels/h323/compat_h323.h
- copied unchanged from r45177, trunk/channels/h323/compat_h323.h
team/oej/02-labarea/channels/h323/noexport.map
- copied unchanged from r45177, trunk/channels/h323/noexport.map
team/oej/02-labarea/configs/gtalk.conf.sample
- copied unchanged from r45177, trunk/configs/gtalk.conf.sample
team/oej/02-labarea/configs/h323.conf.sample
- copied unchanged from r45177, trunk/configs/h323.conf.sample
team/oej/02-labarea/doc/rtp-packetization.txt
- copied unchanged from r45177, trunk/doc/rtp-packetization.txt
team/oej/02-labarea/funcs/func_blacklist.c
- copied unchanged from r45177, trunk/funcs/func_blacklist.c
team/oej/02-labarea/funcs/func_vmcount.c
- copied unchanged from r45177, trunk/funcs/func_vmcount.c
team/oej/02-labarea/include/jitterbuf.h
- copied unchanged from r45177, trunk/include/jitterbuf.h
team/oej/02-labarea/pbx/ael/ael-test/ael-test16/
- copied from r45177, trunk/pbx/ael/ael-test/ael-test16/
team/oej/02-labarea/pbx/ael/ael-test/ael-test16/extensions.ael
- copied unchanged from r45177, trunk/pbx/ael/ael-test/ael-test16/extensions.ael
team/oej/02-labarea/pbx/ael/ael-test/ael-vtest17/
- copied from r45177, trunk/pbx/ael/ael-test/ael-vtest17/
team/oej/02-labarea/pbx/ael/ael-test/ael-vtest17/extensions.ael
- copied unchanged from r45177, trunk/pbx/ael/ael-test/ael-vtest17/extensions.ael
team/oej/02-labarea/pbx/ael/ael-test/ref.ael-test16
- copied unchanged from r45177, trunk/pbx/ael/ael-test/ref.ael-test16
team/oej/02-labarea/pbx/ael/ael-test/ref.ael-vtest17
- copied unchanged from r45177, trunk/pbx/ael/ael-test/ref.ael-vtest17
team/oej/02-labarea/res/res_limit.c
- copied unchanged from r45177, trunk/res/res_limit.c
team/oej/02-labarea/res/res_realtime.c
- copied unchanged from r45177, trunk/res/res_realtime.c
Removed:
team/oej/02-labarea/apps/app_hasnewvoicemail.c
team/oej/02-labarea/apps/app_lookupblacklist.c
team/oej/02-labarea/apps/app_lookupcidname.c
team/oej/02-labarea/apps/app_random.c
team/oej/02-labarea/apps/app_realtime.c
team/oej/02-labarea/apps/app_setcdruserfield.c
team/oej/02-labarea/apps/app_settransfercapability.c
team/oej/02-labarea/channels/h323/Makefile
team/oej/02-labarea/channels/h323/ast_h323.cpp
team/oej/02-labarea/channels/h323/h323.conf.sample
team/oej/02-labarea/doc/linkedlists.txt
team/oej/02-labarea/funcs/func_language.c
team/oej/02-labarea/funcs/func_moh.c
team/oej/02-labarea/main/jitterbuf.h
Modified:
team/oej/02-labarea/ (props changed)
team/oej/02-labarea/.cleancount
team/oej/02-labarea/CHANGES
team/oej/02-labarea/CREDITS
team/oej/02-labarea/Makefile
team/oej/02-labarea/Makefile.moddir_rules
team/oej/02-labarea/Makefile.rules
team/oej/02-labarea/UPGRADE.txt
team/oej/02-labarea/acinclude.m4
team/oej/02-labarea/agi/ (props changed)
team/oej/02-labarea/agi/Makefile
team/oej/02-labarea/apps/app_adsiprog.c
team/oej/02-labarea/apps/app_alarmreceiver.c
team/oej/02-labarea/apps/app_chanspy.c
team/oej/02-labarea/apps/app_db.c
team/oej/02-labarea/apps/app_dial.c
team/oej/02-labarea/apps/app_directed_pickup.c
team/oej/02-labarea/apps/app_directory.c
team/oej/02-labarea/apps/app_disa.c
team/oej/02-labarea/apps/app_dumpchan.c
team/oej/02-labarea/apps/app_externalivr.c
team/oej/02-labarea/apps/app_festival.c
team/oej/02-labarea/apps/app_followme.c
team/oej/02-labarea/apps/app_getcpeid.c
team/oej/02-labarea/apps/app_ices.c
team/oej/02-labarea/apps/app_macro.c
team/oej/02-labarea/apps/app_meetme.c
team/oej/02-labarea/apps/app_mixmonitor.c
team/oej/02-labarea/apps/app_mp3.c
team/oej/02-labarea/apps/app_nbscat.c
team/oej/02-labarea/apps/app_osplookup.c
team/oej/02-labarea/apps/app_playback.c
team/oej/02-labarea/apps/app_privacy.c
team/oej/02-labarea/apps/app_queue.c
team/oej/02-labarea/apps/app_read.c
team/oej/02-labarea/apps/app_record.c
team/oej/02-labarea/apps/app_rpt.c
team/oej/02-labarea/apps/app_setcallerid.c
team/oej/02-labarea/apps/app_speech_utils.c
team/oej/02-labarea/apps/app_stack.c
team/oej/02-labarea/apps/app_talkdetect.c
team/oej/02-labarea/apps/app_test.c
team/oej/02-labarea/apps/app_url.c
team/oej/02-labarea/apps/app_voicemail.c
team/oej/02-labarea/apps/app_waitforring.c
team/oej/02-labarea/apps/app_waitforsilence.c
team/oej/02-labarea/apps/app_zapateller.c
team/oej/02-labarea/apps/app_zapbarge.c
team/oej/02-labarea/apps/app_zapras.c
team/oej/02-labarea/apps/app_zapscan.c
team/oej/02-labarea/bootstrap.sh
team/oej/02-labarea/build_tools/cflags.xml
team/oej/02-labarea/build_tools/embed_modules.xml
team/oej/02-labarea/build_tools/make_version
team/oej/02-labarea/build_tools/menuselect-deps.in
team/oej/02-labarea/build_tools/prep_moduledeps
team/oej/02-labarea/cdr/cdr_csv.c
team/oej/02-labarea/cdr/cdr_odbc.c
team/oej/02-labarea/cdr/cdr_pgsql.c
team/oej/02-labarea/cdr/cdr_radius.c
team/oej/02-labarea/cdr/cdr_tds.c
team/oej/02-labarea/channels/Makefile
team/oej/02-labarea/channels/chan_agent.c
team/oej/02-labarea/channels/chan_alsa.c
team/oej/02-labarea/channels/chan_features.c
team/oej/02-labarea/channels/chan_h323.c
team/oej/02-labarea/channels/chan_iax2.c
team/oej/02-labarea/channels/chan_jingle.c
team/oej/02-labarea/channels/chan_local.c
team/oej/02-labarea/channels/chan_mgcp.c
team/oej/02-labarea/channels/chan_misdn.c
team/oej/02-labarea/channels/chan_nbs.c
team/oej/02-labarea/channels/chan_oss.c
team/oej/02-labarea/channels/chan_phone.c
team/oej/02-labarea/channels/chan_sip.c
team/oej/02-labarea/channels/chan_skinny.c
team/oej/02-labarea/channels/chan_zap.c
team/oej/02-labarea/channels/h323/ (props changed)
team/oej/02-labarea/channels/h323/README
team/oej/02-labarea/channels/h323/TODO
team/oej/02-labarea/channels/h323/ast_h323.h
team/oej/02-labarea/channels/h323/chan_h323.h
team/oej/02-labarea/channels/iax2-provision.c
team/oej/02-labarea/channels/misdn/chan_misdn_config.h
team/oej/02-labarea/channels/misdn/isdn_lib.c
team/oej/02-labarea/channels/misdn/isdn_lib.h
team/oej/02-labarea/channels/misdn/isdn_msg_parser.c
team/oej/02-labarea/channels/misdn_config.c
team/oej/02-labarea/codecs/Makefile
team/oej/02-labarea/codecs/gsm/Makefile
team/oej/02-labarea/codecs/ilbc/Makefile
team/oej/02-labarea/codecs/lpc10/Makefile
team/oej/02-labarea/codecs/lpc10/analys.c
team/oej/02-labarea/codecs/lpc10/bsynz.c
team/oej/02-labarea/codecs/lpc10/chanwr.c
team/oej/02-labarea/codecs/lpc10/dcbias.c
team/oej/02-labarea/codecs/lpc10/decode.c
team/oej/02-labarea/codecs/lpc10/deemp.c
team/oej/02-labarea/codecs/lpc10/difmag.c
team/oej/02-labarea/codecs/lpc10/dyptrk.c
team/oej/02-labarea/codecs/lpc10/encode.c
team/oej/02-labarea/codecs/lpc10/energy.c
team/oej/02-labarea/codecs/lpc10/ham84.c
team/oej/02-labarea/codecs/lpc10/hp100.c
team/oej/02-labarea/codecs/lpc10/invert.c
team/oej/02-labarea/codecs/lpc10/irc2pc.c
team/oej/02-labarea/codecs/lpc10/ivfilt.c
team/oej/02-labarea/codecs/lpc10/lpcdec.c
team/oej/02-labarea/codecs/lpc10/lpcenc.c
team/oej/02-labarea/codecs/lpc10/lpcini.c
team/oej/02-labarea/codecs/lpc10/lpfilt.c
team/oej/02-labarea/codecs/lpc10/median.c
team/oej/02-labarea/codecs/lpc10/mload.c
team/oej/02-labarea/codecs/lpc10/onset.c
team/oej/02-labarea/codecs/lpc10/pitsyn.c
team/oej/02-labarea/codecs/lpc10/placea.c
team/oej/02-labarea/codecs/lpc10/placev.c
team/oej/02-labarea/codecs/lpc10/preemp.c
team/oej/02-labarea/codecs/lpc10/prepro.c
team/oej/02-labarea/codecs/lpc10/random.c
team/oej/02-labarea/codecs/lpc10/rcchk.c
team/oej/02-labarea/codecs/lpc10/synths.c
team/oej/02-labarea/codecs/lpc10/tbdm.c
team/oej/02-labarea/codecs/lpc10/voicin.c
team/oej/02-labarea/codecs/lpc10/vparms.c
team/oej/02-labarea/configs/extensions.ael.sample
team/oej/02-labarea/configs/logger.conf.sample
team/oej/02-labarea/configs/manager.conf.sample
team/oej/02-labarea/configs/misdn.conf.sample
team/oej/02-labarea/configs/muted.conf.sample
team/oej/02-labarea/configs/queues.conf.sample
team/oej/02-labarea/configs/res_odbc.conf.sample
team/oej/02-labarea/configs/sip.conf.sample
team/oej/02-labarea/configs/skinny.conf.sample
team/oej/02-labarea/configs/users.conf.sample
team/oej/02-labarea/configs/zapata.conf.sample
team/oej/02-labarea/configure
team/oej/02-labarea/configure.ac
team/oej/02-labarea/contrib/init.d/rc.redhat.asterisk
team/oej/02-labarea/doc/ael.txt
team/oej/02-labarea/doc/channelvariables.txt
team/oej/02-labarea/doc/ip-tos.txt
team/oej/02-labarea/doc/jingle.txt
team/oej/02-labarea/doc/mp3.txt
team/oej/02-labarea/doc/realtime.txt
team/oej/02-labarea/doc/security.txt
team/oej/02-labarea/formats/format_g723.c
team/oej/02-labarea/formats/format_ogg_vorbis.c
team/oej/02-labarea/formats/format_pcm.c
team/oej/02-labarea/funcs/func_callerid.c
team/oej/02-labarea/funcs/func_db.c
team/oej/02-labarea/funcs/func_logic.c
team/oej/02-labarea/funcs/func_md5.c
team/oej/02-labarea/funcs/func_odbc.c
team/oej/02-labarea/funcs/func_rand.c
team/oej/02-labarea/funcs/func_strings.c
team/oej/02-labarea/funcs/func_timeout.c
team/oej/02-labarea/include/asterisk.h
team/oej/02-labarea/include/asterisk/acl.h
team/oej/02-labarea/include/asterisk/adsi.h
team/oej/02-labarea/include/asterisk/agi.h
team/oej/02-labarea/include/asterisk/autoconfig.h.in
team/oej/02-labarea/include/asterisk/callerid.h
team/oej/02-labarea/include/asterisk/channel.h
team/oej/02-labarea/include/asterisk/cli.h
team/oej/02-labarea/include/asterisk/compat.h
team/oej/02-labarea/include/asterisk/compiler.h
team/oej/02-labarea/include/asterisk/config.h
team/oej/02-labarea/include/asterisk/frame.h
team/oej/02-labarea/include/asterisk/jabber.h
team/oej/02-labarea/include/asterisk/linkedlists.h
team/oej/02-labarea/include/asterisk/lock.h
team/oej/02-labarea/include/asterisk/logger.h
team/oej/02-labarea/include/asterisk/monitor.h
team/oej/02-labarea/include/asterisk/res_odbc.h
team/oej/02-labarea/include/asterisk/rtp.h
team/oej/02-labarea/include/asterisk/threadstorage.h
team/oej/02-labarea/include/asterisk/utils.h
team/oej/02-labarea/main/Makefile
team/oej/02-labarea/main/acl.c
team/oej/02-labarea/main/app.c
team/oej/02-labarea/main/asterisk.c
team/oej/02-labarea/main/astmm.c
team/oej/02-labarea/main/autoservice.c
team/oej/02-labarea/main/callerid.c
team/oej/02-labarea/main/cdr.c
team/oej/02-labarea/main/channel.c
team/oej/02-labarea/main/cli.c
team/oej/02-labarea/main/config.c
team/oej/02-labarea/main/db.c
team/oej/02-labarea/main/db1-ast/Makefile
team/oej/02-labarea/main/devicestate.c
team/oej/02-labarea/main/dns.c
team/oej/02-labarea/main/dnsmgr.c
team/oej/02-labarea/main/dsp.c
team/oej/02-labarea/main/enum.c
team/oej/02-labarea/main/file.c
team/oej/02-labarea/main/frame.c
team/oej/02-labarea/main/http.c
team/oej/02-labarea/main/image.c
team/oej/02-labarea/main/io.c
team/oej/02-labarea/main/loader.c
team/oej/02-labarea/main/logger.c
team/oej/02-labarea/main/manager.c
team/oej/02-labarea/main/netsock.c
team/oej/02-labarea/main/pbx.c
team/oej/02-labarea/main/rtp.c
team/oej/02-labarea/main/say.c
team/oej/02-labarea/main/sched.c
team/oej/02-labarea/main/slinfactory.c
team/oej/02-labarea/main/strcompat.c
team/oej/02-labarea/main/term.c
team/oej/02-labarea/main/translate.c
team/oej/02-labarea/main/udptl.c
team/oej/02-labarea/main/utils.c
team/oej/02-labarea/makeopts.in
team/oej/02-labarea/pbx/Makefile
team/oej/02-labarea/pbx/ael/ael-test/ael-test11/extensions.ael
team/oej/02-labarea/pbx/ael/ael-test/ael-test3/extensions.ael
team/oej/02-labarea/pbx/ael/ael-test/ael-test5/extensions.ael
team/oej/02-labarea/pbx/ael/ael-test/ref.ael-ntest10
team/oej/02-labarea/pbx/ael/ael-test/ref.ael-ntest12
team/oej/02-labarea/pbx/ael/ael-test/ref.ael-ntest9
team/oej/02-labarea/pbx/ael/ael-test/ref.ael-test1
team/oej/02-labarea/pbx/ael/ael-test/ref.ael-test11
team/oej/02-labarea/pbx/ael/ael-test/ref.ael-test14
team/oej/02-labarea/pbx/ael/ael-test/ref.ael-test15
team/oej/02-labarea/pbx/ael/ael-test/ref.ael-test2
team/oej/02-labarea/pbx/ael/ael-test/ref.ael-test3
team/oej/02-labarea/pbx/ael/ael-test/ref.ael-test4
team/oej/02-labarea/pbx/ael/ael-test/ref.ael-test5
team/oej/02-labarea/pbx/ael/ael-test/ref.ael-test6
team/oej/02-labarea/pbx/ael/ael-test/ref.ael-test7
team/oej/02-labarea/pbx/ael/ael-test/ref.ael-test8
team/oej/02-labarea/pbx/ael/ael-test/ref.ael-vtest13
team/oej/02-labarea/pbx/ael/ael.tab.c
team/oej/02-labarea/pbx/ael/ael.y
team/oej/02-labarea/pbx/pbx_ael.c
team/oej/02-labarea/pbx/pbx_config.c
team/oej/02-labarea/pbx/pbx_dundi.c
team/oej/02-labarea/pbx/pbx_spool.c
team/oej/02-labarea/res/Makefile
team/oej/02-labarea/res/res_adsi.c
team/oej/02-labarea/res/res_agi.c
team/oej/02-labarea/res/res_clioriginate.c
team/oej/02-labarea/res/res_config_odbc.c
team/oej/02-labarea/res/res_config_pgsql.c
team/oej/02-labarea/res/res_convert.c
team/oej/02-labarea/res/res_crypto.c
team/oej/02-labarea/res/res_features.c
team/oej/02-labarea/res/res_indications.c
team/oej/02-labarea/res/res_jabber.c
team/oej/02-labarea/res/res_monitor.c
team/oej/02-labarea/res/res_musiconhold.c
team/oej/02-labarea/res/res_odbc.c
team/oej/02-labarea/res/res_smdi.c
team/oej/02-labarea/res/res_snmp.c
team/oej/02-labarea/res/res_speech.c
team/oej/02-labarea/sounds/Makefile
team/oej/02-labarea/utils/ (props changed)
team/oej/02-labarea/utils/Makefile
team/oej/02-labarea/utils/muted.c
Propchange: team/oej/02-labarea/
------------------------------------------------------------------------------
automerge = http://edvina.net/training/
Propchange: team/oej/02-labarea/
('branch-1.2-blocked' removed)
Propchange: team/oej/02-labarea/
('branch-1.2-merged' removed)
Propchange: team/oej/02-labarea/
------------------------------------------------------------------------------
--- branch-1.4-blocked (added)
+++ branch-1.4-blocked Mon Oct 16 08:05:09 2006
@@ -1,0 +1,1 @@
+/branches/1.4:43484,43510,43582,43626,43703,43756,44023,44760
Propchange: team/oej/02-labarea/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/oej/02-labarea/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Oct 16 08:05:09 2006
@@ -1,1 +1,1 @@
-/trunk:1-43175
+/trunk:1-45184
Modified: team/oej/02-labarea/.cleancount
URL: http://svn.digium.com/view/asterisk/team/oej/02-labarea/.cleancount?rev=45205&r1=45204&r2=45205&view=diff
==============================================================================
--- team/oej/02-labarea/.cleancount (original)
+++ team/oej/02-labarea/.cleancount Mon Oct 16 08:05:09 2006
@@ -1,1 +1,1 @@
-23
+25
Modified: team/oej/02-labarea/CHANGES
URL: http://svn.digium.com/view/asterisk/team/oej/02-labarea/CHANGES?rev=45205&r1=45204&r2=45205&view=diff
==============================================================================
--- team/oej/02-labarea/CHANGES (original)
+++ team/oej/02-labarea/CHANGES Mon Oct 16 08:05:09 2006
@@ -1,127 +1,42 @@
-Changes since Asterisk 1.2.0-beta2:
+Changes since Asterisk 1.4-beta was branched:
- * Cygwin build system portability
- * Optional generation of outbound silence during channel recording
-
-Changes since Asterisk 1.2.0-beta1:
-
- * Many, many bug fixes
- * Documentation and sample configuration updates
- * Vastly improved presence/subscription support in the SIP channel driver
- * A new (experimental) mISDN channel driver
- * A new monitoring application (MixMonitor)
- * More portability fixes for non-Linux platforms
- * New dialplan functions replacing old applications
- * Significant deadlock and performance upgrades for the Manager interface
- * An upgrade to the 'new' dialplan expression parser for all users
- * New Zaptel echo cancellers with improved performance
- * Support for the latest OSP toolkit from TransNexus
- * Support user-controlled volume adjustment in MeetMe application
- * More dialplan applications now return status variables instead of priority jumping
- * Much more powerful ENUM support in the dialplan
- * SIP domain support for authentication and virtual hosting
- * Many PRI protocol updates and fixes, including more complete Q.SIG support
- * New applications: Pickup() and Page()
-
-Changes since Asterisk 1.0:
-
-This list currently only containts changes made from the end of November until
-March 26, 2005.
-
- * Add new applications:
- -- AgentMonitorOutgoing
- -- Curl
- -- ExecIf
- -- ExecIfTime
- -- IAX2Provision
- -- MacroExit
- -- MacroIf
- -- PauseQueueMember
- -- ReadFile
- -- SetRDNIS
- -- SIPAddHeader
- -- SIPGetHeader
- -- StartMusicOnHold
- -- StopMusicOnHold
- -- UnpauseQueueMember
- -- WaitForSilence
- -- While / EndWhile
- * app Answer
- -- added delay option
- * app ChanIsAvail
- -- added 's' option
- * app Dial
- -- add option to specify the class for musiconhold with m option
- * app EnumLookup
- -- added "reload enum" for configuration
- * app Goto
- -- added relative priorities
- * app GotoIf
- -- added relative priorities
- * app MeetMe
- -- added 'i' option
- -- added 'r' option
- -- added 'T' option
- -- added 'P' option
- -- added 'c' option
- -- added adminpin to meetme.conf
- -- added reload command
- * app PrivacyManager
- -- add config file privacy.conf
- * app queue
- -- queues.conf
- -- added persistentmembers option to queues.conf
- -- changed music option to musiconhold
- -- added weight option
- -- added note about why agent groups probably shouldn't be used
- -- added timeoutrestart option
- * app Read
- -- added attempts parameter
- -- added timeout parameter
- * app Record
- -- added 'q' option
- * app SendDTMF
- -- add timeout option
- * app SMS
- -- document alternative syntax for queueing messages
- * app Voicemail
- -- add info about VM_CATEGORY
- -- voicemail.conf
- -- added usedirectory option
- -- added VM_CIDNUM and VM_CIDNAME in message config
- * chan IAX2
- -- new jitterbuffer
- -- added setvar option
- -- added regex to iax2 show peers/users
- -- allow multiple bindaddr lines in iax.conf
- -- added reload command
- -- added forcejitterbuffer option
- -- added note about specifying bindport before bindaddr
- -- added trunktimestamps option
- * chan Agent
- -- added agent logoff CLI command
- * chan OSS
- -- added Flash CLI command
- * chan SIP
- -- added setvar option
- -- added compactheaders option
- -- added usereqphone option
- -- added registertimeout option
- -- added externhost option
- -- added sip notify CLI command
- -- added sip_notify.conf
- -- added allowguest option
- * chan Zap
- -- added hanguponplarityswitch option
- -- added sendcalleridafter option
- -- added priresetinterval option
- -- added TON/NPI config options (the ones right above the resetinterval option)
- -- added answeronpolarityswitch option
- -- added "never" for resetinterval
- * extensions
- -- allow '*' when including files (#include "sip-*.conf")
- -- added eswitch
- * General
- -- added #exec syntax for including output from a command
- -- added show features CLI command
- -- added configuration templates for category inheritance
+ * Argument support for Gosub application
+ * MailboxExists converted to dialplan function
+ * Ability to set process limits without restarting Asterisk
+ * SS7 support in chan_zap (via libss7 library)
+ * Proper codec support in chan_skinny.
+ * AEL upgraded to use the Gosub with Arguments instead
+ of Macro application, to hopefully reduce the problems
+ seen with the artificially low stack ceiling that
+ Macro bumps into. Macros can only call other Macros
+ to a depth of 7. Tests run using gosub, show depths
+ limited only by virtual memory. A small test demonstrated
+ recursive call depths of 100,000 without problems.
+ * Ability to use libcap to set high ToS bits when non-root
+ on Linux. If configure is unable to find libcap then you
+ can use --with-cap to specify the path.
+ * H323 remote hold notification support added (by NOTIFY message
+ and/or H.450 supplementary service)
+ * Added keepstats option to queues.conf which will keep queue
+ statistics during a reload.
+ * Added rotatetimestamp option to logger.conf which will use
+ the time to name the logger files instead of sequence number.
+ * The output of CallerID in Manager events is now more consistent.
+ CallerIDNum is used for number and CallerIDName for name.
+ * setinterfacevar option in queues.conf also now sets a variable
+ called MEMBERNAME which contains the member's name.
+ * Added Masquerade manager event for when a masquerade happens between
+ two channels.
+ * Added 'Strategy' field to manager event QueueParams which represents
+ the queue strategy in use.
+ * From the to-do lists: straighten out the app timeout args:
+ Wait() app now really does 0.3 seconds- was truncating arg to an int.
+ WaitExten() same as Wait().
+ Congestion() - Now takes floating pt. argument.
+ Busy() - now takes floating pt. argument.
+ Read() - timeout now can be floating pt.
+ WaitForRing() now takes floating pt timeout arg.
+ SpeechBackground() -- clarified in the docstrings that the timeout is an integer seconds.
+ * Extend CALLERID() function with "pres" and "ton" parameters to
+ fetch string representation of calling number presentation indicator
+ and numeric representation of type of calling number value.
Modified: team/oej/02-labarea/CREDITS
URL: http://svn.digium.com/view/asterisk/team/oej/02-labarea/CREDITS?rev=45205&r1=45204&r2=45205&view=diff
==============================================================================
--- team/oej/02-labarea/CREDITS (original)
+++ team/oej/02-labarea/CREDITS Mon Oct 16 08:05:09 2006
@@ -150,6 +150,8 @@
James Rothenberger - Support for IMAP storage integration added by OneBizTone LLC Work funded by University of Pennsylvania jar at onebiztone.com
+Paul Cadach - Bringing chan_h323 up to date, bug fixes, and more!
+
=== OTHER CONTRIBUTIONS ===
John Todd - Monkey sounds and associated teletorture prompt
Michael Jerris - bug marshaling
Modified: team/oej/02-labarea/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/02-labarea/Makefile?rev=45205&r1=45204&r2=45205&view=diff
==============================================================================
--- team/oej/02-labarea/Makefile (original)
+++ team/oej/02-labarea/Makefile Mon Oct 16 08:05:09 2006
@@ -13,14 +13,44 @@
# All Makefiles use the following variables:
#
-# LDFLAGS - linker flags (not libraries), used for all links
+# ASTCFLAGS - compiler options
+# ASTLDFLAGS - linker flags (not libraries)
+# AST_LIBS - libraries to build binaries XXX
# LIBS - additional libraries, at top-level for all links,
# on a single object just for that object
# SOLINK - linker flags used only for creating shared objects (.so files),
# used for all .so links
#
-
-.EXPORT_ALL_VARIABLES:
+# Default values fo ASTCFLAGS and ASTLDFLAGS can be specified in the
+# environment when running make, as follows:
+#
+# $ ASTCFLAGS="-Werror" make
+
+export ASTTOPDIR
+export ASTERISKVERSION
+export ASTERISKVERSIONNUM
+export INSTALL_PATH
+export ASTETCDIR
+export ASTVARRUNDIR
+export MODULES_DIR
+export ASTSPOOLDIR
+export ASTVARLIBDIR
+export ASTDATADIR
+export ASTLOGDIR
+export AGI_DIR
+export ASTCONFPATH
+export NOISY_BUILD
+export MENUSELECT_CFLAGS
+export CC
+export CXX
+export AR
+export RANLIB
+export HOST_CC
+export STATIC_BUILD
+export INSTALL
+export DESTDIR
+export PROC
+export SOLINK
# 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
@@ -79,7 +109,9 @@
ASTVARLIBDIR=$(localstatedir)/lib/asterisk
endif
endif
-ASTDATADIR?=$(ASTVARLIBDIR)
+ifeq ($(ASTDATADIR),)
+ ASTDATADIR:=$(ASTVARLIBDIR)
+endif
# Asterisk.conf is located in ASTETCDIR or by using the -C flag
# when starting Asterisk
@@ -92,8 +124,6 @@
# Determine by a grep 'ScriptAlias' of your Apache httpd.conf file
HTTP_CGIDIR=/var/www/cgi-bin
-ASTCFLAGS=
-
# Uncomment this to use the older DSP routines
#ASTCFLAGS+=-DOLD_DSP_ROUTINES
@@ -106,8 +136,8 @@
GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
-MOD_SUBDIR_CFLAGS=-I../include -I../main
-OTHER_SUBDIR_CFLAGS=-I../include
+MOD_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
+OTHER_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
ifeq ($(OSARCH),linux-gnu)
ifeq ($(PROC),x86_64)
@@ -142,13 +172,6 @@
endif
endif
-ID=id
-
-ifeq ($(OSARCH),SunOS)
- M4=/usr/local/bin/m4
- ID=/usr/xpg4/bin/id
-endif
-
ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
ifeq ($(AST_DEVMODE),yes)
@@ -156,7 +179,8 @@
endif
ifneq ($(findstring BSD,$(OSARCH)),)
- ASTCFLAGS+=-I/usr/local/include -L/usr/local/lib
+ ASTCFLAGS+=-I/usr/local/include
+ ASTLDFLAGS+=-L/usr/local/lib
endif
ifneq ($(PROC),ultrasparc)
@@ -238,13 +262,15 @@
HAVEDOT=no
endif
-all: cleantest $(SUBDIRS)
+all: _all
@echo " +--------- Asterisk Build Complete ---------+"
@echo " + Asterisk has successfully been built, and +"
@echo " + can be installed by running: +"
@echo " + +"
@echo " + make install +"
@echo " +-------------------------------------------+"
+
+_all: cleantest $(SUBDIRS)
makeopts: configure
@echo "****"
@@ -280,10 +306,10 @@
main: $(filter-out main,$(MOD_SUBDIRS))
$(MOD_SUBDIRS):
- @CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) --no-print-directory -C $@ SUBDIR=$@ all
+ @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AST_LIBS="$(AST_LIBS)" $(MAKE) --no-print-directory -C $@ SUBDIR=$@ all
$(OTHER_SUBDIRS):
- @CFLAGS="$(OTHER_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) --no-print-directory -C $@ SUBDIR=$@ all
+ @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AUDIO_LIBS="$(AUDIO_LIBS)" $(MAKE) --no-print-directory -C $@ SUBDIR=$@ all
defaults.h: makeopts
@build_tools/make_defaults_h > $@.tmp
@@ -336,7 +362,7 @@
rm -rf doc/api
rm -f build_tools/menuselect-deps
-datafiles: all
+datafiles: _all
if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(ASTCFLAGS)" sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
# 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
@@ -370,7 +396,7 @@
NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
-bininstall: all
+bininstall: _all
mkdir -p $(DESTDIR)$(MODULES_DIR)
mkdir -p $(DESTDIR)$(ASTSBINDIR)
mkdir -p $(DESTDIR)$(ASTETCDIR)
@@ -434,7 +460,7 @@
echo " WARNING WARNING WARNING" ;\
fi
-install: all datafiles bininstall $(SUBDIRS_INSTALL)
+install: datafiles bininstall $(SUBDIRS_INSTALL)
@if [ -x /usr/sbin/asterisk-post-install ]; then \
/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
fi
@@ -461,7 +487,7 @@
@echo " +-------------------------------------------+"
@$(MAKE) -s oldmodcheck
-upgrade: all bininstall
+upgrade: bininstall
adsi:
mkdir -p $(DESTDIR)$(ASTETCDIR)
@@ -593,10 +619,10 @@
fi
$(MOD_SUBDIRS_DEPEND):
- @CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) --no-print-directory -C $(@:-depend=) depend
+ @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) --no-print-directory -C $(@:-depend=) depend
$(OTHER_SUBDIRS_DEPEND):
- @CFLAGS="$(OTHER_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) --no-print-directory -C $(@:-depend=) depend
+ @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) --no-print-directory -C $(@:-depend=) depend
depend: include/asterisk/version.h include/asterisk/buildopts.h defaults.h $(SUBDIRS_DEPEND)
@@ -648,7 +674,7 @@
rm -rf $(DESTDIR)$(ASTLOGDIR)
menuselect: menuselect/menuselect menuselect-tree
- - at menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
+ - at menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
menuselect/menuselect: makeopts menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
@unset CC LD AR RANLIB && $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
Modified: team/oej/02-labarea/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/oej/02-labarea/Makefile.moddir_rules?rev=45205&r1=45204&r2=45205&view=diff
==============================================================================
--- team/oej/02-labarea/Makefile.moddir_rules (original)
+++ team/oej/02-labarea/Makefile.moddir_rules Mon Oct 16 08:05:09 2006
@@ -12,11 +12,11 @@
#
ifneq ($(findstring MALLOC_DEBUG,$(MENUSELECT_CFLAGS)),)
- CFLAGS+=-include $(ASTTOPDIR)/include/asterisk/astmm.h
+ ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/astmm.h
endif
ifeq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)
- CFLAGS+=${GC_CFLAGS}
+ ASTCFLAGS+=${GC_CFLAGS}
endif
ifneq ($(findstring STATIC_BUILD,$(MENUSELECT_CFLAGS)),)
@@ -27,35 +27,18 @@
comma:=,
-define module_o_template
-$(2): $(3)
-$(2): CFLAGS+=-DAST_MODULE=\"$(1)\" $$(MENUSELECT_OPTS_$(1):%=-D%) $(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_INCLUDE))
-endef
+$(addsuffix .o,$(C_MODS)): ASTCFLAGS+=-DAST_MODULE=\"$*\" $(MENUSELECT_OPTS_$*:%=-D%) $(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_INCLUDE))
+$(addsuffix .oo,$(CC_MODS)): ASTCFLAGS+=-DAST_MODULE=\"$*\" $(MENUSELECT_OPTS_$*:%=-D%) $(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_INCLUDE))
-define module_so_template
-$(1)=$(1).so
-$(1).so: CFLAGS+=-fpic
-$(1).so: LIBS+=$(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_LIB))
-$(1).so: LDFLAGS+=$(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_LDFLAGS))
-$(1).so: $(2)
-endef
+$(LOADABLE_MODS:%=%.so): ASTCFLAGS+=-fPIC
+$(LOADABLE_MODS:%=%.so): LIBS+=$(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_LIB))
+$(LOADABLE_MODS:%=%.so): ASTLDFLAGS+=$(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_LDFLAGS))
-define module_a_template
-$(1)=modules.link
-modules.link: $(2)
-endef
+$(addsuffix .so,$(filter $(LOADABLE_MODS),$(C_MODS))): %.so: %.o
+$(addsuffix .so,$(filter $(LOADABLE_MODS),$(CC_MODS))): %.so: %.oo
-$(foreach mod,$(C_MODS),$(eval $(call module_o_template,$(mod),$(mod).o,$(mod).c)))
-
-$(foreach mod,$(CC_MODS),$(eval $(call module_o_template,$(mod),$(mod).oo,$(mod).cc)))
-
-$(foreach mod,$(filter-out $(EMBEDDED_MODS),$(C_MODS)),$(eval $(call module_so_template,$(mod),$(mod).o)))
-
-$(foreach mod,$(filter-out $(EMBEDDED_MODS),$(CC_MODS)),$(eval $(call module_so_template,$(mod),$(mod).oo)))
-
-$(foreach mod,$(filter $(EMBEDDED_MODS),$(C_MODS)),$(eval $(call module_a_template,$(mod),$(mod).o)))
-
-$(foreach mod,$(filter $(EMBEDDED_MODS),$(CC_MODS)),$(eval $(call module_a_template,$(mod),$(mod).oo)))
+modules.link: $(addsuffix .o,$(filter $(EMBEDDED_MODS),$(C_MODS)))
+modules.link: $(addsuffix .oo,$(filter $(EMBEDDED_MODS),$(CC_MODS)))
.PHONY: clean clean-depend depend uninstall _all
@@ -81,7 +64,8 @@
modules.link:
@rm -f $@
- @for file in $(patsubst $(ASTTOPDIR)/%,%,$(realpath $^)); do echo "INPUT (../$${file})" >> $@; done
+ @for file in $(patsubst %,$(SUBDIR)/%,$(filter %.o,$^)); do echo "INPUT (../$${file})" >> $@; done
+ @for file in $(patsubst %,$(SUBDIR)/%,$(filter-out %.o,$^)); do echo "INPUT (../$${file})" >> $@; done
clean-depend::
rm -f .depend
@@ -102,4 +86,4 @@
depend: .depend
.depend:
- ../build_tools/mkdep $(CFLAGS) `ls *.c *.cc 2> /dev/null`
+ ../build_tools/mkdep $(ASTCFLAGS) `ls *.c *.cc 2> /dev/null`
Modified: team/oej/02-labarea/Makefile.rules
URL: http://svn.digium.com/view/asterisk/team/oej/02-labarea/Makefile.rules?rev=45205&r1=45204&r2=45205&view=diff
==============================================================================
--- team/oej/02-labarea/Makefile.rules (original)
+++ team/oej/02-labarea/Makefile.rules Mon Oct 16 08:05:09 2006
@@ -33,68 +33,33 @@
#K6OPT=-DK6OPT
OPTIMIZE?=-O6
-CFLAGS+=$(OPTIMIZE)
+ASTCFLAGS+=$(OPTIMIZE)
endif
-define ast_make_o_c
-$(1): $(2)
- $(ECHO_PREFIX) echo " [CC] $$< -> $$@"
- $(CMD_PREFIX) $$(CC) -o $$@ -c $$< $$(CFLAGS)
-endef
+%.o: %.c
+ $(ECHO_PREFIX) echo " [CC] $< -> $@"
+ $(CMD_PREFIX) $(CC) -o $@ -c $< $(ASTCFLAGS)
-define ast_make_oo_cc
-$(1): $(2)
- $(ECHO_PREFIX) echo " [CXX] $$< -> $$@"
- $(CMD_PREFIX) $$(CXX) -o $$@ -c $$< $$(CFLAGS)
-endef
+%.oo: %.cc
+ $(ECHO_PREFIX) echo " [CXX] $< -> $@"
+ $(CMD_PREFIX) $(CXX) -o $@ -c $< $(ASTCFLAGS)
-define ast_make_c_y
-$(1): $(2)
- $(ECHO_PREFIX) echo " [BISON] $$< -> $$@"
- $(CMD_PREFIX) bison -o $$@ -d --name-prefix=ast_yy $$<
-endef
+%.c: %.y
+ $(ECHO_PREFIX) echo " [BISON] $< -> $@"
+ $(CMD_PREFIX) bison -o $@ -d --name-prefix=ast_yy $<
-define ast_make_c_fl
-$(1): $(2)
- $(ECHO_PREFIX) echo " [FLEX] $$< -> $$@"
- $(CMD_PREFIX) flex -o $$@ --full $$<
-endef
+%.c: %.fl
+ $(ECHO_PREFIX) echo " [FLEX] $< -> $@"
+ $(CMD_PREFIX) flex -o $@ --full $<
-define ast_make_so_o
-$(1): $(2)
- $(ECHO_PREFIX) echo " [LD] $$^ -> $$@"
- $(CMD_PREFIX) $$(CC) $$(STATIC_BUILD) -o $$@ $$(LDFLAGS) $$(SOLINK) $$^ $$(LIBS)
-endef
+%.so: %.o
+ $(ECHO_PREFIX) echo " [LD] $^ -> $@"
+ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLDFLAGS) $(SOLINK) $^ $(LIBS)
-define ast_make_so_oo
-$(1): $(2)
- $(ECHO_PREFIX) echo " [LDXX] $$^ -> $$@"
- $(CMD_PREFIX) $$(CXX) $$(STATIC_BUILD) -o $$@ $$(LDFLAGS) $$(SOLINK) $$^ $$(LIBS)
-endef
+%.soo: %.oo
+ $(ECHO_PREFIX) echo " [LDXX] $^ -> $@"
+ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLDFLAGS) $(SOLINK) $^ $(LIBS)
-define ast_make_a_o
-$(1): $(2)
- $(ECHO_PREFIX) echo " [AR] $$^ -> $$@"
- $(CMD_PREFIX) $$(AR) cr $$@ $$^
- $(CMD_PREFIX) $$(RANLIB) $$@
-endef
-
-define ast_make_final
-$(1): $(2)
- $(ECHO_PREFIX) echo " [LD] $$^ -> $$@"
- $(CMD_PREFIX) $$(CXX) $$(STATIC_BUILD) -o $$@ $$(LDFLAGS) $$^ $$(LIBS)
-endef
-
-define ast_make_final_host
-$(1): $(2)
- $(ECHO_PREFIX) echo " [LD] $$^ -> $$@"
- $(CMD_PREFIX) $$(HOST_CC) $$(STATIC_BUILD) -o $$@ $$(CFLAGS) $$(LDFLAGS) $$^ $$(LIBS)
-endef
-
-$(eval $(call ast_make_o_c,%.o,%.c))
-
-$(eval $(call ast_make_oo_cc,%.oo,%.cc))
-
-$(eval $(call ast_make_so_o,%.so,%.o))
-
-$(eval $(call ast_make_final,%,%.o))
+%: %.o
+ $(ECHO_PREFIX) echo " [LD] $^ -> $@"
+ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLDFLAGS) $^ $(LIBS)
Modified: team/oej/02-labarea/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/oej/02-labarea/UPGRADE.txt?rev=45205&r1=45204&r2=45205&view=diff
==============================================================================
--- team/oej/02-labarea/UPGRADE.txt (original)
+++ team/oej/02-labarea/UPGRADE.txt Mon Oct 16 08:05:09 2006
@@ -1,416 +1,8 @@
Information for Upgrading From Previous Asterisk Releases
=========================================================
-Build Process (configure script):
-
-Asterisk now uses an autoconf-generated configuration script to learn how it
-should build itself for your system. As it is a standard script, running:
-
-$ ./configure --help
-
-will show you all the options available. This script can be used to tell the
-build process what libraries you have on your system (if it cannot find them
-automatically), which libraries you wish to have ignored even though they may
-be present, etc.
-
-You must run the configure script before Asterisk will build, although it will
-attempt to automatically run it for you with no options specified; for most
-users, that will result in a similar build to what they would have had before
-the configure script was added to the build process (except for having to run
-'make' again after the configure script is run). Note that the configure script
-does NOT need to be re-run just to rebuild Asterisk; you only need to re-run it
-when your system configuration changes or you wish to build Asterisk with
-different options.
-
-Build Process (module selection):
-
-The Asterisk source tree now includes a basic module selection and build option
-selection tool called 'menuselect'. Run 'make menuselect' to make your choices.
-In this tool, you can disable building of modules that you don't care about,
-turn on/off global options for the build and see which modules will not
-(and cannot) be built because your system does not have the required external
-dependencies installed.
-
-The resulting file from menuselect is called 'menuselect.makeopts'. Note that
-the resulting menuselect.makeopts file generally contains which modules *not*
-to build. The modules listed in this file indicate which modules have unmet
-dependencies, a present conflict, or have been disabled by the user in the
-menuselect interface. Compiler Flags can also be set in the menuselect
-interface. In this case, the resulting file contains which CFLAGS are in use,
[... 65056 lines stripped ...]
More information about the asterisk-commits
mailing list