[asterisk-commits] oej: branch oej/strictrouting r56622 - in /team/oej/strictrouting: ./ agi/ ap...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Sat Feb 24 10:30:35 MST 2007


Author: oej
Date: Sat Feb 24 11:30:31 2007
New Revision: 56622

URL: http://svn.digium.com/view/asterisk?view=rev&rev=56622
Log:
Reset automerge

Added:
    team/oej/strictrouting/build_tools/embed_modules.xml
      - copied unchanged from r48019, trunk/build_tools/embed_modules.xml
    team/oej/strictrouting/build_tools/prep_tarball
      - copied unchanged from r48019, trunk/build_tools/prep_tarball
    team/oej/strictrouting/build_tools/strip_nonapi
      - copied unchanged from r48019, trunk/build_tools/strip_nonapi
    team/oej/strictrouting/channels/chan_gtalk.c
      - copied unchanged from r48019, trunk/channels/chan_gtalk.c
    team/oej/strictrouting/channels/h323/Makefile.in
      - copied unchanged from r48019, trunk/channels/h323/Makefile.in
    team/oej/strictrouting/channels/h323/ast_h323.cxx
      - copied unchanged from r48019, trunk/channels/h323/ast_h323.cxx
    team/oej/strictrouting/channels/h323/caps_h323.cxx
      - copied unchanged from r48019, trunk/channels/h323/caps_h323.cxx
    team/oej/strictrouting/channels/h323/caps_h323.h
      - copied unchanged from r48019, trunk/channels/h323/caps_h323.h
    team/oej/strictrouting/channels/h323/cisco-h225.asn
      - copied unchanged from r48019, trunk/channels/h323/cisco-h225.asn
    team/oej/strictrouting/channels/h323/cisco-h225.cxx
      - copied unchanged from r48019, trunk/channels/h323/cisco-h225.cxx
    team/oej/strictrouting/channels/h323/cisco-h225.h
      - copied unchanged from r48019, trunk/channels/h323/cisco-h225.h
    team/oej/strictrouting/channels/h323/compat_h323.cxx
      - copied unchanged from r48019, trunk/channels/h323/compat_h323.cxx
    team/oej/strictrouting/channels/h323/compat_h323.h
      - copied unchanged from r48019, trunk/channels/h323/compat_h323.h
    team/oej/strictrouting/channels/h323/noexport.map
      - copied unchanged from r48019, trunk/channels/h323/noexport.map
    team/oej/strictrouting/doc/asterisk.8
      - copied unchanged from r48019, trunk/doc/asterisk.8
    team/oej/strictrouting/doc/asterisk.sgml
      - copied unchanged from r48019, trunk/doc/asterisk.sgml
    team/oej/strictrouting/doc/rtp-packetization.txt
      - copied unchanged from r48019, trunk/doc/rtp-packetization.txt
    team/oej/strictrouting/funcs/func_blacklist.c
      - copied unchanged from r48019, trunk/funcs/func_blacklist.c
    team/oej/strictrouting/funcs/func_module.c
      - copied unchanged from r48019, trunk/funcs/func_module.c
    team/oej/strictrouting/funcs/func_version.c
      - copied unchanged from r48019, trunk/funcs/func_version.c
    team/oej/strictrouting/funcs/func_vmcount.c
      - copied unchanged from r48019, trunk/funcs/func_vmcount.c
    team/oej/strictrouting/include/jitterbuf.h
      - copied unchanged from r48019, trunk/include/jitterbuf.h
    team/oej/strictrouting/pbx/ael/ael-test/ael-test14/
      - copied from r48019, trunk/pbx/ael/ael-test/ael-test14/
    team/oej/strictrouting/pbx/ael/ael-test/ael-test14/extensions.ael
      - copied unchanged from r48019, trunk/pbx/ael/ael-test/ael-test14/extensions.ael
    team/oej/strictrouting/pbx/ael/ael-test/ael-test15/
      - copied from r48019, trunk/pbx/ael/ael-test/ael-test15/
    team/oej/strictrouting/pbx/ael/ael-test/ael-test15/extensions.ael
      - copied unchanged from r48019, trunk/pbx/ael/ael-test/ael-test15/extensions.ael
    team/oej/strictrouting/pbx/ael/ael-test/ael-test16/
      - copied from r48019, trunk/pbx/ael/ael-test/ael-test16/
    team/oej/strictrouting/pbx/ael/ael-test/ael-test16/extensions.ael
      - copied unchanged from r48019, trunk/pbx/ael/ael-test/ael-test16/extensions.ael
    team/oej/strictrouting/pbx/ael/ael-test/ael-test3/telemarket_torture.ael2
      - copied unchanged from r48019, trunk/pbx/ael/ael-test/ael-test3/telemarket_torture.ael2
    team/oej/strictrouting/pbx/ael/ael-test/ael-vtest17/
      - copied from r48019, trunk/pbx/ael/ael-test/ael-vtest17/
    team/oej/strictrouting/pbx/ael/ael-test/ael-vtest17/extensions.ael
      - copied unchanged from r48019, trunk/pbx/ael/ael-test/ael-vtest17/extensions.ael
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-test14
      - copied unchanged from r48019, trunk/pbx/ael/ael-test/ref.ael-test14
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-test15
      - copied unchanged from r48019, trunk/pbx/ael/ael-test/ref.ael-test15
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-test16
      - copied unchanged from r48019, trunk/pbx/ael/ael-test/ref.ael-test16
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-vtest17
      - copied unchanged from r48019, trunk/pbx/ael/ael-test/ref.ael-vtest17
Removed:
    team/oej/strictrouting/abstract_jb.c
    team/oej/strictrouting/acl.c
    team/oej/strictrouting/aclocal.m4
    team/oej/strictrouting/aescrypt.c
    team/oej/strictrouting/aeskey.c
    team/oej/strictrouting/aesopt.h
    team/oej/strictrouting/aestab.c
    team/oej/strictrouting/alaw.c
    team/oej/strictrouting/app.c
    team/oej/strictrouting/apps/app_hasnewvoicemail.c
    team/oej/strictrouting/apps/app_lookupblacklist.c
    team/oej/strictrouting/apps/app_lookupcidname.c
    team/oej/strictrouting/apps/app_random.c
    team/oej/strictrouting/apps/app_realtime.c
    team/oej/strictrouting/apps/app_setcdruserfield.c
    team/oej/strictrouting/apps/app_settransfercapability.c
    team/oej/strictrouting/ast_expr2.c
    team/oej/strictrouting/ast_expr2.fl
    team/oej/strictrouting/ast_expr2.h
    team/oej/strictrouting/ast_expr2.y
    team/oej/strictrouting/ast_expr2f.c
    team/oej/strictrouting/asterisk.8
    team/oej/strictrouting/asterisk.c
    team/oej/strictrouting/asterisk.sgml
    team/oej/strictrouting/astmm.c
    team/oej/strictrouting/autoservice.c
    team/oej/strictrouting/buildinfo.c
    team/oej/strictrouting/callerid.c
    team/oej/strictrouting/cdr.c
    team/oej/strictrouting/channel.c
    team/oej/strictrouting/channels/h323/Makefile
    team/oej/strictrouting/channels/h323/ast_h323.cpp
    team/oej/strictrouting/channels/h323/h323.conf.sample
    team/oej/strictrouting/chanvars.c
    team/oej/strictrouting/cli.c
    team/oej/strictrouting/coef_in.h
    team/oej/strictrouting/coef_out.h
    team/oej/strictrouting/config.c
    team/oej/strictrouting/cryptostub.c
    team/oej/strictrouting/cygwin/
    team/oej/strictrouting/db.c
    team/oej/strictrouting/db1-ast/
    team/oej/strictrouting/devicestate.c
    team/oej/strictrouting/dlfcn.c
    team/oej/strictrouting/dns.c
    team/oej/strictrouting/dnsmgr.c
    team/oej/strictrouting/doc/linkedlists.txt
    team/oej/strictrouting/dsp.c
    team/oej/strictrouting/ecdisa.h
    team/oej/strictrouting/editline/
    team/oej/strictrouting/enum.c
    team/oej/strictrouting/file.c
    team/oej/strictrouting/fixedjitterbuf.c
    team/oej/strictrouting/fixedjitterbuf.h
    team/oej/strictrouting/frame.c
    team/oej/strictrouting/fskmodem.c
    team/oej/strictrouting/funcs/func_language.c
    team/oej/strictrouting/funcs/func_moh.c
    team/oej/strictrouting/http.c
    team/oej/strictrouting/image.c
    team/oej/strictrouting/indications.c
    team/oej/strictrouting/io.c
    team/oej/strictrouting/jitterbuf.c
    team/oej/strictrouting/jitterbuf.h
    team/oej/strictrouting/loader.c
    team/oej/strictrouting/logger.c
    team/oej/strictrouting/manager.c
    team/oej/strictrouting/md5.c
    team/oej/strictrouting/muted.c
    team/oej/strictrouting/netsock.c
    team/oej/strictrouting/pbx.c
    team/oej/strictrouting/plc.c
    team/oej/strictrouting/poll.c
    team/oej/strictrouting/privacy.c
    team/oej/strictrouting/rtp.c
    team/oej/strictrouting/say.c
    team/oej/strictrouting/sched.c
    team/oej/strictrouting/sha1.c
    team/oej/strictrouting/slinfactory.c
    team/oej/strictrouting/sounds.txt
    team/oej/strictrouting/srv.c
    team/oej/strictrouting/stdtime/
    team/oej/strictrouting/strcompat.c
    team/oej/strictrouting/tdd.c
    team/oej/strictrouting/term.c
    team/oej/strictrouting/translate.c
    team/oej/strictrouting/udptl.c
    team/oej/strictrouting/ulaw.c
    team/oej/strictrouting/utils.c
Modified:
    team/oej/strictrouting/   (props changed)
    team/oej/strictrouting/CHANGES
    team/oej/strictrouting/CREDITS
    team/oej/strictrouting/LICENSE
    team/oej/strictrouting/Makefile
    team/oej/strictrouting/UPGRADE.txt
    team/oej/strictrouting/agi/   (props changed)
    team/oej/strictrouting/agi/Makefile
    team/oej/strictrouting/apps/   (props changed)
    team/oej/strictrouting/apps/Makefile
    team/oej/strictrouting/apps/app_adsiprog.c
    team/oej/strictrouting/apps/app_alarmreceiver.c
    team/oej/strictrouting/apps/app_amd.c
    team/oej/strictrouting/apps/app_authenticate.c
    team/oej/strictrouting/apps/app_cdr.c
    team/oej/strictrouting/apps/app_chanisavail.c
    team/oej/strictrouting/apps/app_channelredirect.c
    team/oej/strictrouting/apps/app_chanspy.c
    team/oej/strictrouting/apps/app_controlplayback.c
    team/oej/strictrouting/apps/app_db.c
    team/oej/strictrouting/apps/app_dial.c
    team/oej/strictrouting/apps/app_dictate.c
    team/oej/strictrouting/apps/app_directed_pickup.c
    team/oej/strictrouting/apps/app_directory.c
    team/oej/strictrouting/apps/app_disa.c
    team/oej/strictrouting/apps/app_dumpchan.c
    team/oej/strictrouting/apps/app_echo.c
    team/oej/strictrouting/apps/app_exec.c
    team/oej/strictrouting/apps/app_externalivr.c
    team/oej/strictrouting/apps/app_festival.c
    team/oej/strictrouting/apps/app_flash.c
    team/oej/strictrouting/apps/app_followme.c
    team/oej/strictrouting/apps/app_forkcdr.c
    team/oej/strictrouting/apps/app_getcpeid.c
    team/oej/strictrouting/apps/app_ices.c
    team/oej/strictrouting/apps/app_image.c
    team/oej/strictrouting/apps/app_ivrdemo.c
    team/oej/strictrouting/apps/app_macro.c
    team/oej/strictrouting/apps/app_meetme.c
    team/oej/strictrouting/apps/app_milliwatt.c
    team/oej/strictrouting/apps/app_mixmonitor.c
    team/oej/strictrouting/apps/app_morsecode.c
    team/oej/strictrouting/apps/app_mp3.c
    team/oej/strictrouting/apps/app_nbscat.c
    team/oej/strictrouting/apps/app_osplookup.c
    team/oej/strictrouting/apps/app_page.c
    team/oej/strictrouting/apps/app_parkandannounce.c
    team/oej/strictrouting/apps/app_playback.c
    team/oej/strictrouting/apps/app_privacy.c
    team/oej/strictrouting/apps/app_queue.c
    team/oej/strictrouting/apps/app_read.c
    team/oej/strictrouting/apps/app_readfile.c
    team/oej/strictrouting/apps/app_record.c
    team/oej/strictrouting/apps/app_rpt.c
    team/oej/strictrouting/apps/app_sayunixtime.c
    team/oej/strictrouting/apps/app_senddtmf.c
    team/oej/strictrouting/apps/app_sendtext.c
    team/oej/strictrouting/apps/app_setcallerid.c
    team/oej/strictrouting/apps/app_skel.c
    team/oej/strictrouting/apps/app_sms.c
    team/oej/strictrouting/apps/app_softhangup.c
    team/oej/strictrouting/apps/app_speech_utils.c
    team/oej/strictrouting/apps/app_stack.c
    team/oej/strictrouting/apps/app_system.c
    team/oej/strictrouting/apps/app_talkdetect.c
    team/oej/strictrouting/apps/app_test.c
    team/oej/strictrouting/apps/app_transfer.c
    team/oej/strictrouting/apps/app_url.c
    team/oej/strictrouting/apps/app_userevent.c
    team/oej/strictrouting/apps/app_verbose.c
    team/oej/strictrouting/apps/app_voicemail.c
    team/oej/strictrouting/apps/app_waitforring.c
    team/oej/strictrouting/apps/app_waitforsilence.c
    team/oej/strictrouting/apps/app_while.c
    team/oej/strictrouting/apps/app_zapateller.c
    team/oej/strictrouting/apps/app_zapbarge.c
    team/oej/strictrouting/apps/app_zapras.c
    team/oej/strictrouting/apps/app_zapscan.c
    team/oej/strictrouting/bootstrap.sh
    team/oej/strictrouting/build_tools/cflags.xml
    team/oej/strictrouting/build_tools/make_buildopts_h
    team/oej/strictrouting/build_tools/make_version
    team/oej/strictrouting/build_tools/menuselect-deps.in
    team/oej/strictrouting/build_tools/mkpkgconfig
    team/oej/strictrouting/build_tools/prep_moduledeps
    team/oej/strictrouting/channels/   (props changed)
    team/oej/strictrouting/channels/Makefile
    team/oej/strictrouting/channels/chan_agent.c
    team/oej/strictrouting/channels/chan_alsa.c
    team/oej/strictrouting/channels/chan_features.c
    team/oej/strictrouting/channels/chan_h323.c
    team/oej/strictrouting/channels/chan_iax2.c
    team/oej/strictrouting/channels/chan_jingle.c
    team/oej/strictrouting/channels/chan_local.c
    team/oej/strictrouting/channels/chan_mgcp.c
    team/oej/strictrouting/channels/chan_misdn.c
    team/oej/strictrouting/channels/chan_nbs.c
    team/oej/strictrouting/channels/chan_oss.c
    team/oej/strictrouting/channels/chan_phone.c
    team/oej/strictrouting/channels/chan_sip.c
    team/oej/strictrouting/channels/chan_skinny.c
    team/oej/strictrouting/channels/chan_vpb.cc
    team/oej/strictrouting/channels/chan_zap.c
    team/oej/strictrouting/channels/h323/   (props changed)
    team/oej/strictrouting/channels/h323/README
    team/oej/strictrouting/channels/h323/TODO
    team/oej/strictrouting/channels/h323/ast_h323.h
    team/oej/strictrouting/channels/h323/chan_h323.h
    team/oej/strictrouting/channels/iax2-parser.c
    team/oej/strictrouting/channels/iax2-parser.h
    team/oej/strictrouting/channels/iax2-provision.c
    team/oej/strictrouting/channels/misdn/Makefile
    team/oej/strictrouting/channels/misdn/chan_misdn_config.h
    team/oej/strictrouting/channels/misdn/ie.c
    team/oej/strictrouting/channels/misdn/isdn_lib.c
    team/oej/strictrouting/channels/misdn/isdn_lib.h
    team/oej/strictrouting/channels/misdn/isdn_lib_intern.h
    team/oej/strictrouting/channels/misdn/isdn_msg_parser.c
    team/oej/strictrouting/channels/misdn_config.c
    team/oej/strictrouting/configure
    team/oej/strictrouting/configure.ac
    team/oej/strictrouting/doc/CODING-GUIDELINES
    team/oej/strictrouting/doc/ael.txt
    team/oej/strictrouting/doc/app-sms.txt
    team/oej/strictrouting/doc/asterisk-conf.txt
    team/oej/strictrouting/doc/backtrace.txt
    team/oej/strictrouting/doc/billing.txt
    team/oej/strictrouting/doc/callfiles.txt
    team/oej/strictrouting/doc/chaniax.txt
    team/oej/strictrouting/doc/channelvariables.txt
    team/oej/strictrouting/doc/configuration.txt
    team/oej/strictrouting/doc/cygwin.txt
    team/oej/strictrouting/doc/dundi.txt
    team/oej/strictrouting/doc/enum.txt
    team/oej/strictrouting/doc/extensions.txt
    team/oej/strictrouting/doc/imapstorage.txt
    team/oej/strictrouting/doc/ip-tos.txt
    team/oej/strictrouting/doc/jabber.txt
    team/oej/strictrouting/doc/jingle.txt
    team/oej/strictrouting/doc/manager.txt
    team/oej/strictrouting/doc/misdn.txt
    team/oej/strictrouting/doc/mp3.txt
    team/oej/strictrouting/doc/osp.txt
    team/oej/strictrouting/doc/queues-with-callback-members.txt
    team/oej/strictrouting/doc/realtime.txt
    team/oej/strictrouting/doc/security.txt
    team/oej/strictrouting/doc/sms.txt
    team/oej/strictrouting/doc/speechrec.txt
    team/oej/strictrouting/funcs/   (props changed)
    team/oej/strictrouting/funcs/Makefile
    team/oej/strictrouting/funcs/func_base64.c
    team/oej/strictrouting/funcs/func_callerid.c
    team/oej/strictrouting/funcs/func_cdr.c
    team/oej/strictrouting/funcs/func_channel.c
    team/oej/strictrouting/funcs/func_curl.c
    team/oej/strictrouting/funcs/func_cut.c
    team/oej/strictrouting/funcs/func_db.c
    team/oej/strictrouting/funcs/func_enum.c
    team/oej/strictrouting/funcs/func_env.c
    team/oej/strictrouting/funcs/func_global.c
    team/oej/strictrouting/funcs/func_groupcount.c
    team/oej/strictrouting/funcs/func_logic.c
    team/oej/strictrouting/funcs/func_math.c
    team/oej/strictrouting/funcs/func_md5.c
    team/oej/strictrouting/funcs/func_odbc.c
    team/oej/strictrouting/funcs/func_rand.c
    team/oej/strictrouting/funcs/func_realtime.c
    team/oej/strictrouting/funcs/func_sha1.c
    team/oej/strictrouting/funcs/func_strings.c
    team/oej/strictrouting/funcs/func_timeout.c
    team/oej/strictrouting/funcs/func_uri.c
    team/oej/strictrouting/include/asterisk/cdr.h
    team/oej/strictrouting/include/asterisk/channel.h
    team/oej/strictrouting/include/asterisk/chanspy.h
    team/oej/strictrouting/include/asterisk/config.h
    team/oej/strictrouting/include/asterisk/features.h
    team/oej/strictrouting/include/asterisk/manager.h
    team/oej/strictrouting/include/asterisk/res_odbc.h
    team/oej/strictrouting/include/asterisk/term.h
    team/oej/strictrouting/include/asterisk/utils.h
    team/oej/strictrouting/pbx/   (props changed)
    team/oej/strictrouting/pbx/Makefile
    team/oej/strictrouting/pbx/ael/ael-test/ael-test11/extensions.ael
    team/oej/strictrouting/pbx/ael/ael-test/ael-test3/extensions.ael
    team/oej/strictrouting/pbx/ael/ael-test/ael-test5/extensions.ael
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-ntest10
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-ntest12
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-ntest9
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-test1
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-test11
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-test2
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-test3
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-test4
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-test5
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-test6
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-test7
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-test8
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-vtest13
    team/oej/strictrouting/pbx/ael/ael.flex
    team/oej/strictrouting/pbx/ael/ael.tab.c
    team/oej/strictrouting/pbx/ael/ael.y
    team/oej/strictrouting/pbx/ael/ael_lex.c
    team/oej/strictrouting/pbx/dundi-parser.c
    team/oej/strictrouting/pbx/pbx_ael.c
    team/oej/strictrouting/pbx/pbx_config.c
    team/oej/strictrouting/pbx/pbx_dundi.c
    team/oej/strictrouting/pbx/pbx_loopback.c
    team/oej/strictrouting/pbx/pbx_realtime.c
    team/oej/strictrouting/pbx/pbx_spool.c
    team/oej/strictrouting/sounds/Makefile
    team/oej/strictrouting/sounds/sounds.xml

Propchange: team/oej/strictrouting/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Modified: team/oej/strictrouting/CHANGES
URL: http://svn.digium.com/view/asterisk/team/oej/strictrouting/CHANGES?view=diff&rev=56622&r1=56621&r2=56622
==============================================================================
--- team/oej/strictrouting/CHANGES (original)
+++ team/oej/strictrouting/CHANGES Sat Feb 24 11:30:31 2007
@@ -1,127 +1,65 @@
-Changes since Asterisk 1.2.0-beta2:
-
-   * 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
+Changes since Asterisk 1.4-beta was branched:
+  * Added the bindaddr option to gtalk.conf.
+  * Added the ability to specify arguments to the Dial application when using
+    the DUNDi switch in the dialplan.
+  * Added the ability to customize which sound files are used for some of the
+    prompts within the Voicemail application by changing them in voicemail.conf
+  * enable https support for builtin web server.
+     See configs/http.conf.sample for details.
+  * add a new option, match_auth_username, to sip.conf,
+     to improve the matching of incoming requests.
+     If set, and the incoming request carries authentication info,
+     the username to match in the users list is taken from there
+     rather than from the From: field.
+  * 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.
+  * Added 'C' option to Meetme which causes a caller to continue in the dialplan
+     when kicked out.
+  * Added option to run macro when a queue member is connected to a caller, 
+     see queues.conf.sample for details.
+  * Added QUEUE_VARIABLES function to set queue variables added setqueuevar and 
+    setqueueentryvar options for each queue, see queues.conf.sample for details.
+  * Brazilian Portuguese (pt-BR) in VM, and say.c was added via patch from cfassoni.
+  * CID matching information is now shown when doing 'dialplan show'.
+  * app_queue now has a 'loose' option which is almost exactly like 'strict' except it
+     does not count paused queue members as unavailable.
+  * Added maxfiles option to options section of asterisk.conf which allows you to specify
+     what Asterisk should set as the maximum number of open files when it loads.

Modified: team/oej/strictrouting/CREDITS
URL: http://svn.digium.com/view/asterisk/team/oej/strictrouting/CREDITS?view=diff&rev=56622&r1=56621&r2=56622
==============================================================================
--- team/oej/strictrouting/CREDITS (original)
+++ team/oej/strictrouting/CREDITS Sat Feb 24 11:30:31 2007
@@ -131,7 +131,7 @@
 Roy Sigurd Karlsbakk - providing funding for generic jitterbuffer development
 	roy at karlsbakk.net, Briiz Telecom AS
 
-Voop A/S, Nuvio Inc and Foniris Telecom A/S - funding for rewrite of SIP transfers
+Voop AS, Nuvio Inc, Inotel S.A and Foniris Telecom A/S - funding for rewrite of SIP transfers
 
 Philippe Sultan - RADIUS CDR module
 	INRIA, http://www.inria.fr/
@@ -149,6 +149,10 @@
 Bartosz Supczinski - Support for Polish added by DIR (www.dir.pl) Bartosz.Supczinski at dir.pl
 
 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!
+
+Voop AS - Financial support for a lot of work with the SIP driver and the IAX trunk MTU patch
 
 === OTHER CONTRIBUTIONS ===
 John Todd - Monkey sounds and associated teletorture prompt

Modified: team/oej/strictrouting/LICENSE
URL: http://svn.digium.com/view/asterisk/team/oej/strictrouting/LICENSE?view=diff&rev=56622&r1=56621&r2=56622
==============================================================================
--- team/oej/strictrouting/LICENSE (original)
+++ team/oej/strictrouting/LICENSE Sat Feb 24 11:30:31 2007
@@ -4,6 +4,18 @@
 applies to all loadable Asterisk modules used on your system as well,
 except as defined below. The GPL (version 2) is included in this
 source tree in the file COPYING.
+
+This package also includes various components that are not part of
+Asterisk itself; these components are in the 'contrib' directory
+and its subdirectories. Most of these components are also
+distributed under the GPL version 2 as well, except for the following:
+
+contrib/firmware/iax/iaxy.bin:
+	This file is Copyright (C) Digium, Inc. and is licensed for
+	use with Digium IAXy hardware devices only. It can be
+	distributed freely as long as the distribution is in the
+	original form present in this package (not reformatted or
+	modified).
 
 Digium, Inc. (formerly Linux Support Services) holds copyright
 and/or sufficient licenses to all components of the Asterisk
@@ -38,7 +50,8 @@
 wish to use these trademarks for purposes other than simple
 redistribution of Asterisk source code obtained from Digium, you
 should contact our licensing department to determine the necessary
-steps you must take.
+steps you must take. For more information on this policy, please read
+http://www.digium.com/en/company/profile/trademarkpolicy.php
 
 If you have any questions regarding our licensing policy, please
 contact us:

Modified: team/oej/strictrouting/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/strictrouting/Makefile?view=diff&rev=56622&r1=56621&r2=56622
==============================================================================
--- team/oej/strictrouting/Makefile (original)
+++ team/oej/strictrouting/Makefile Sat Feb 24 11:30:31 2007
@@ -13,14 +13,52 @@
 
 # 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
+export STRIP
+
+# 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
+# exist (other rules will force it to be built if needed)
+ifneq ($(wildcard makeopts),)
+  include makeopts
+endif
 
 #Uncomment this to see all build commands instead of 'quiet' output
 #NOISY_BUILD=yes
@@ -28,26 +66,7 @@
 # Create OPTIONS variable
 OPTIONS=
 
-# If cross compiling, define these to suit
-#CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
-#CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
-#CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target
-#CROSS_ARCH=Linux
-#CROSS_PROC=arm
-#SUB_PROC=xscale # or maverick
-
-ifeq ($(CROSS_COMPILE),)
-  OSARCH:=$(shell uname -s)
-  PROC?:=$(shell uname -m)
-else
-  OSARCH=$(CROSS_ARCH)
-  PROC=$(CROSS_PROC)
-endif
-
 ASTTOPDIR:=$(shell pwd)
-
-# Remember the MAKELEVEL at the top
-MAKETOPLEVEL?=$(MAKELEVEL)
 
 # Overwite config files on "make samples"
 OVERWRITE=y
@@ -60,20 +79,7 @@
 # For example, make DESTDIR=/tmp/asterisk woud put things in
 # /tmp/asterisk/etc/asterisk
 # !!! Watch out, put no spaces or comments after the value !!!
-DESTDIR?=
 #DESTDIR?=/tmp/asterisk
-
-# Original busydetect routine
-#BUSYDETECT = -DBUSYDETECT
-
-# Improved busydetect routine, comment the previous one if you use this one
-#BUSYDETECT+= -DBUSYDETECT_MARTIN 
-# Detect the busy signal looking only at tone lengths
-# For example if you have 3 beeps 100ms tone, 100ms silence separated by 500 ms of silence
-#BUSYDETECT+= -DBUSYDETECT_TONEONLY
-# Enforce the detection of busy signal (get rid of false hangups)
-# Don't use together with -DBUSYDETECT_TONEONLY
-#BUSYDETECT+= -DBUSYDETECT_COMPARE_TONE_AND_SILENCE
 
 # Define standard directories for various platforms
 # These apply if they are not redefined in asterisk.conf 
@@ -104,7 +110,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
@@ -117,8 +125,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
 
@@ -131,59 +137,10 @@
 GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
 USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
 
-ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
- ifneq ($(wildcard menuselect.makeopts),)
-  include menuselect.makeopts
-  include menuselect.makedeps
- endif
-endif
-
-ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
- ifneq ($(wildcard makeopts),)
-  include makeopts
- endif
-endif
-
-TOPDIR_CFLAGS=-Iinclude
-MOD_SUBDIR_CFLAGS=-I../include -I..
-OTHER_SUBDIR_CFLAGS=-I../include -I..
-
-ifeq ($(origin MENUSELECT_CFLAGS),undefined)
-  MENUSELECT_CFLAGS:=$(shell grep MENUSELECT_CFLAGS $(USER_MAKEOPTS) .)
-  ifeq ($(MENUSELECT_CFLAGS),)
-    MENUSELECT_CFLAGS:=$(shell grep MENUSELECT_CFLAGS $(GLOBAL_MAKEOPTS) .)
-  endif
-  ifneq ($(MENUSELECT_CFLAGS),)
-    MENUSELECT_CFLAGS:=$(shell echo $(MENUSELECT_CFLAGS) | cut -f2 -d'=')
-  endif
-endif
-
-ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),$(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)))
-# More GSM codec optimization
-# Uncomment to enable MMXTM optimizations for x86 architecture CPU's
-# which support MMX instructions.  This should be newer pentiums,
-# ppro's, etc, as well as the AMD K6 and K7.  
-#K6OPT  = -DK6OPT
-
-# Tell gcc to optimize the code
-OPTIMIZE+=-O6
-else
-  # Stack backtraces, while useful for debugging, are incompatible with optimizations
-  ifeq ($(OSARCH),Linux)
-    CFLAGS+=-DSTACK_BACKTRACES
-  endif
-endif
-
-#   *CLI> show memory allocations [filename]
-#   *CLI> show memory summary [filename]
-ifneq ($(findstring MALLOC_DEBUG,$(MENUSELECT_CFLAGS)),)
-  TOPDIR_CFLAGS+=-include include/asterisk/astmm.h
-  MOD_SUBDIR_CFLAGS+=-include ../include/asterisk/astmm.h
-endif
-
-MOD_SUBDIR_CFLAGS+=-fPIC
-
-ifeq ($(OSARCH),Linux)
+MOD_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
+OTHER_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
+
+ifeq ($(OSARCH),linux-gnu)
   ifeq ($(PROC),x86_64)
     # You must have GCC 3.4 to use k8, otherwise use athlon
     PROC=k8
@@ -216,28 +173,15 @@
   endif
 endif
 
-GREP=grep
-ID=id
-
-ifeq ($(OSARCH),SunOS)
-  GREP=/usr/xpg4/bin/grep
-  M4=/usr/local/bin/m4
-  ID=/usr/xpg4/bin/id
-endif
-
 ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
-ifneq ($(OPTIMIZE),)
-ASTCFLAGS+=$(OPTIMIZE)
-endif
 
 ifeq ($(AST_DEVMODE),yes)
   ASTCFLAGS+=-Werror -Wunused
 endif
 
-ASTOBJ=-o asterisk
-
-ifeq ($(findstring BSD,$(OSARCH)),BSD)
-  ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
+ifneq ($(findstring BSD,$(OSARCH)),)
+  ASTCFLAGS+=-I/usr/local/include
+  ASTLDFLAGS+=-L/usr/local/lib
 endif
 
 ifneq ($(PROC),ultrasparc)
@@ -249,13 +193,14 @@
 endif
 
 ifeq ($(OSARCH),FreeBSD)
-  BSDVERSION=$(shell make -V OSVERSION -f $(CROSS_COMPILE_TARGET)/usr/share/mk/bsd.port.subdir.mk)
+  # -V is understood by BSD Make, not by GNU make.
+  BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
   ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
   AST_LIBS+=$(shell if test  $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
-endif # FreeBSD
+endif
 
 ifeq ($(OSARCH),NetBSD)
-  AST_CFLAGS+=-pthread -I$(CROSS_COMPILE_TARGET)/usr/pkg/include
+  ASTCFLAGS+=-pthread -I/usr/pkg/include
 endif
 
 ifeq ($(OSARCH),OpenBSD)
@@ -263,10 +208,8 @@
 endif
 
 ifeq ($(OSARCH),SunOS)
-  ASTCFLAGS+=-Wcast-align -DSOLARIS -Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)/opt/ssl/include -I$(CROSS_COMPILE_TARGET)/usr/local/ssl/include
-endif
-
-LIBEDIT=editline/libedit.a
+  ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include
+endif
 
 ASTERISKVERSION:=$(shell build_tools/make_version .)
 
@@ -283,93 +226,34 @@
 
 ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS)
 
-MOD_SUBDIRS:=res channels pbx apps codecs formats cdr funcs
+MOD_SUBDIRS:=res channels pbx apps codecs formats cdr funcs main
 OTHER_SUBDIRS:=utils agi
-SUBDIRS:=$(MOD_SUBDIRS) $(OTHER_SUBDIRS)
+SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
 SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
 SUBDIRS_CLEAN:=$(SUBDIRS:%=%-clean)
 SUBDIRS_CLEAN_DEPEND:=$(SUBDIRS:%=%-clean-depend)
 MOD_SUBDIRS_DEPEND:=$(MOD_SUBDIRS:%=%-depend)
 OTHER_SUBDIRS_DEPEND:=$(OTHER_SUBDIRS:%=%-depend)
-SUBDIRS_DEPEND:=$(MOD_SUBDIRS_DEPEND) $(OTHER_SUBDIRS_DEPEND)
+SUBDIRS_DEPEND:=$(OTHER_SUBDIRS_DEPEND) $(MOD_SUBDIRS_DEPEND)
 SUBDIRS_UNINSTALL:=$(SUBDIRS:%=%-uninstall)
-
-OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
-	translate.o file.o pbx.o cli.o md5.o term.o \
-	ulaw.o alaw.o callerid.o fskmodem.o image.o app.o \
-	cdr.o tdd.o acl.o rtp.o udptl.o manager.o asterisk.o \
-	dsp.o chanvars.o indications.o autoservice.o db.o privacy.o \
-	astmm.o enum.o srv.o dns.o aescrypt.o aestab.o aeskey.o \
-	utils.o plc.o jitterbuf.o dnsmgr.o devicestate.o \
-	netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \
-	cryptostub.o sha1.o http.o fixedjitterbuf.o abstract_jb.o
-
-# we need to link in the objects statically, not as a library, because
-# otherwise modules will not have them available if none of the static
-# objects use it.
-OBJS+=stdtime/localtime.o
-
-# At the moment say.o is an optional component which can be overridden
-# by a module.
-OBJS+=say.o
-
-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sys/poll.h),)
-  OBJS+= poll.o
-  ASTCFLAGS+=-DPOLLCOMPAT
-endif
-
-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/dlfcn.h),)
-  OBJS+= dlfcn.o
-  ASTCFLAGS+=-DDLFCNCOMPAT
-endif
-
-ifeq ($(OSARCH),Linux)
-  AST_LIBS+=-ldl -lpthread $(EDITLINE_LIB) -lm -lresolv  #-lnjamd
-else
-  AST_LIBS+=$(EDITLINE_LIB) -lm
-endif
-
-ifeq ($(OSARCH),Darwin)
-  AST_LIBS+=-lresolv
+MOD_SUBDIRS_EMBED_LDSCRIPT:=$(MOD_SUBDIRS:%=%-embed-ldscript)
+MOD_SUBDIRS_EMBED_LDFLAGS:=$(MOD_SUBDIRS:%=%-embed-ldflags)
+MOD_SUBDIRS_EMBED_LIBS:=$(MOD_SUBDIRS:%=%-embed-libs)
+
+ifneq ($(findstring darwin,$(OSARCH)),)
   ASTCFLAGS+=-D__Darwin__
   AUDIO_LIBS=-framework CoreAudio
-  ASTLINK=-Wl,-dynamic
   SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace

[... 91830 lines stripped ...]


More information about the asterisk-commits mailing list