[asterisk-commits] oej: branch oej/callpickup r54138 - in
/team/oej/callpickup: ./ agi/ apps/ bu...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Mon Feb 12 12:59:51 MST 2007
Author: oej
Date: Mon Feb 12 13:59:47 2007
New Revision: 54138
URL: http://svn.digium.com/view/asterisk?view=rev&rev=54138
Log:
Cleaning up properties, updating
Added:
team/oej/callpickup/build_tools/prep_tarball
- copied unchanged from r46650, trunk/build_tools/prep_tarball
team/oej/callpickup/channels/chan_gtalk.c
- copied unchanged from r46650, trunk/channels/chan_gtalk.c
team/oej/callpickup/configs/gtalk.conf.sample
- copied unchanged from r46650, trunk/configs/gtalk.conf.sample
team/oej/callpickup/configs/h323.conf.sample
- copied unchanged from r46650, trunk/configs/h323.conf.sample
team/oej/callpickup/configs/users.conf.sample
- copied unchanged from r46650, trunk/configs/users.conf.sample
team/oej/callpickup/doc/rtp-packetization.txt
- copied unchanged from r46650, trunk/doc/rtp-packetization.txt
team/oej/callpickup/funcs/func_blacklist.c
- copied unchanged from r46650, trunk/funcs/func_blacklist.c
team/oej/callpickup/funcs/func_module.c
- copied unchanged from r46650, trunk/funcs/func_module.c
team/oej/callpickup/funcs/func_version.c
- copied unchanged from r46650, trunk/funcs/func_version.c
team/oej/callpickup/funcs/func_vmcount.c
- copied unchanged from r46650, trunk/funcs/func_vmcount.c
team/oej/callpickup/include/jitterbuf.h
- copied unchanged from r46650, trunk/include/jitterbuf.h
team/oej/callpickup/pbx/ael/ael-test/ael-vtest17/
- copied from r46650, trunk/pbx/ael/ael-test/ael-vtest17/
team/oej/callpickup/pbx/ael/ael-test/ael-vtest17/extensions.ael
- copied unchanged from r46650, trunk/pbx/ael/ael-test/ael-vtest17/extensions.ael
team/oej/callpickup/pbx/ael/ael-test/ref.ael-vtest17
- copied unchanged from r46650, trunk/pbx/ael/ael-test/ref.ael-vtest17
team/oej/callpickup/res/res_limit.c
- copied unchanged from r46650, trunk/res/res_limit.c
team/oej/callpickup/res/res_realtime.c
- copied unchanged from r46650, trunk/res/res_realtime.c
Removed:
team/oej/callpickup/apps/app_hasnewvoicemail.c
team/oej/callpickup/apps/app_lookupblacklist.c
team/oej/callpickup/apps/app_lookupcidname.c
team/oej/callpickup/apps/app_random.c
team/oej/callpickup/apps/app_realtime.c
team/oej/callpickup/apps/app_setcdruserfield.c
team/oej/callpickup/apps/app_settransfercapability.c
team/oej/callpickup/doc/linkedlists.txt
team/oej/callpickup/funcs/func_language.c
team/oej/callpickup/funcs/func_moh.c
team/oej/callpickup/main/jitterbuf.h
Modified:
team/oej/callpickup/ (props changed)
team/oej/callpickup/.cleancount
team/oej/callpickup/CHANGES
team/oej/callpickup/CREDITS
team/oej/callpickup/LICENSE
team/oej/callpickup/Makefile
team/oej/callpickup/Makefile.moddir_rules
team/oej/callpickup/Makefile.rules
team/oej/callpickup/README
team/oej/callpickup/UPGRADE.txt
team/oej/callpickup/acinclude.m4
team/oej/callpickup/agi/ (props changed)
team/oej/callpickup/agi/Makefile
team/oej/callpickup/apps/Makefile
team/oej/callpickup/apps/app_adsiprog.c
team/oej/callpickup/apps/app_alarmreceiver.c
team/oej/callpickup/apps/app_amd.c
team/oej/callpickup/apps/app_authenticate.c
team/oej/callpickup/apps/app_cdr.c
team/oej/callpickup/apps/app_chanspy.c
team/oej/callpickup/apps/app_db.c
team/oej/callpickup/apps/app_dial.c
team/oej/callpickup/apps/app_directed_pickup.c
team/oej/callpickup/apps/app_directory.c
team/oej/callpickup/apps/app_disa.c
team/oej/callpickup/apps/app_dumpchan.c
team/oej/callpickup/apps/app_echo.c
team/oej/callpickup/apps/app_externalivr.c
team/oej/callpickup/apps/app_festival.c
team/oej/callpickup/apps/app_followme.c
team/oej/callpickup/apps/app_getcpeid.c
team/oej/callpickup/apps/app_ices.c
team/oej/callpickup/apps/app_macro.c
team/oej/callpickup/apps/app_meetme.c
team/oej/callpickup/apps/app_milliwatt.c
team/oej/callpickup/apps/app_mixmonitor.c
team/oej/callpickup/apps/app_mp3.c
team/oej/callpickup/apps/app_nbscat.c
team/oej/callpickup/apps/app_osplookup.c
team/oej/callpickup/apps/app_page.c
team/oej/callpickup/apps/app_parkandannounce.c
team/oej/callpickup/apps/app_playback.c
team/oej/callpickup/apps/app_privacy.c
team/oej/callpickup/apps/app_queue.c
team/oej/callpickup/apps/app_read.c
team/oej/callpickup/apps/app_record.c
team/oej/callpickup/apps/app_rpt.c
team/oej/callpickup/apps/app_setcallerid.c
team/oej/callpickup/apps/app_sms.c
team/oej/callpickup/apps/app_softhangup.c
team/oej/callpickup/apps/app_speech_utils.c
team/oej/callpickup/apps/app_stack.c
team/oej/callpickup/apps/app_talkdetect.c
team/oej/callpickup/apps/app_test.c
team/oej/callpickup/apps/app_url.c
team/oej/callpickup/apps/app_voicemail.c
team/oej/callpickup/apps/app_waitforring.c
team/oej/callpickup/apps/app_waitforsilence.c
team/oej/callpickup/apps/app_zapateller.c
team/oej/callpickup/apps/app_zapbarge.c
team/oej/callpickup/apps/app_zapras.c
team/oej/callpickup/apps/app_zapscan.c
team/oej/callpickup/cdr/Makefile
team/oej/callpickup/cdr/cdr_csv.c
team/oej/callpickup/cdr/cdr_custom.c
team/oej/callpickup/cdr/cdr_manager.c
team/oej/callpickup/cdr/cdr_odbc.c
team/oej/callpickup/cdr/cdr_pgsql.c
team/oej/callpickup/cdr/cdr_radius.c
team/oej/callpickup/cdr/cdr_tds.c
team/oej/callpickup/channels/Makefile
team/oej/callpickup/channels/chan_agent.c
team/oej/callpickup/channels/chan_alsa.c
team/oej/callpickup/channels/chan_features.c
team/oej/callpickup/channels/chan_h323.c
team/oej/callpickup/channels/chan_iax2.c
team/oej/callpickup/channels/chan_mgcp.c
team/oej/callpickup/channels/chan_misdn.c
team/oej/callpickup/channels/chan_nbs.c
team/oej/callpickup/channels/chan_oss.c
team/oej/callpickup/channels/chan_phone.c
team/oej/callpickup/channels/chan_sip.c
team/oej/callpickup/channels/chan_skinny.c
team/oej/callpickup/channels/chan_zap.c
team/oej/callpickup/channels/iax2-parser.c
team/oej/callpickup/channels/iax2-provision.c
team/oej/callpickup/channels/misdn/chan_misdn_config.h
team/oej/callpickup/channels/misdn/isdn_lib.c
team/oej/callpickup/channels/misdn/isdn_lib.h
team/oej/callpickup/channels/misdn/isdn_msg_parser.c
team/oej/callpickup/channels/misdn_config.c
team/oej/callpickup/codecs/Makefile
team/oej/callpickup/codecs/codec_gsm.c
team/oej/callpickup/codecs/codec_ilbc.c
team/oej/callpickup/codecs/codec_lpc10.c
team/oej/callpickup/codecs/codec_speex.c
team/oej/callpickup/codecs/codec_zap.c
team/oej/callpickup/codecs/gsm/Makefile
team/oej/callpickup/codecs/ilbc/Makefile
team/oej/callpickup/codecs/lpc10/Makefile
team/oej/callpickup/codecs/lpc10/analys.c
team/oej/callpickup/codecs/lpc10/bsynz.c
team/oej/callpickup/codecs/lpc10/chanwr.c
team/oej/callpickup/codecs/lpc10/dcbias.c
team/oej/callpickup/codecs/lpc10/decode.c
team/oej/callpickup/codecs/lpc10/deemp.c
team/oej/callpickup/codecs/lpc10/difmag.c
team/oej/callpickup/codecs/lpc10/dyptrk.c
team/oej/callpickup/codecs/lpc10/encode.c
team/oej/callpickup/codecs/lpc10/energy.c
team/oej/callpickup/codecs/lpc10/ham84.c
team/oej/callpickup/codecs/lpc10/hp100.c
team/oej/callpickup/codecs/lpc10/invert.c
team/oej/callpickup/codecs/lpc10/irc2pc.c
team/oej/callpickup/codecs/lpc10/ivfilt.c
team/oej/callpickup/codecs/lpc10/lpcdec.c
team/oej/callpickup/codecs/lpc10/lpcenc.c
team/oej/callpickup/codecs/lpc10/lpcini.c
team/oej/callpickup/codecs/lpc10/lpfilt.c
team/oej/callpickup/codecs/lpc10/median.c
team/oej/callpickup/codecs/lpc10/mload.c
team/oej/callpickup/codecs/lpc10/onset.c
team/oej/callpickup/codecs/lpc10/pitsyn.c
team/oej/callpickup/codecs/lpc10/placea.c
team/oej/callpickup/codecs/lpc10/placev.c
team/oej/callpickup/codecs/lpc10/preemp.c
team/oej/callpickup/codecs/lpc10/prepro.c
team/oej/callpickup/codecs/lpc10/random.c
team/oej/callpickup/codecs/lpc10/rcchk.c
team/oej/callpickup/codecs/lpc10/synths.c
team/oej/callpickup/codecs/lpc10/tbdm.c
team/oej/callpickup/codecs/lpc10/voicin.c
team/oej/callpickup/codecs/lpc10/vparms.c
team/oej/callpickup/configs/alsa.conf.sample
team/oej/callpickup/configs/cdr.conf.sample
team/oej/callpickup/configs/dundi.conf.sample
team/oej/callpickup/configs/enum.conf.sample
team/oej/callpickup/configs/extensions.ael.sample
team/oej/callpickup/configs/extensions.conf.sample
team/oej/callpickup/configs/features.conf.sample
team/oej/callpickup/configs/func_odbc.conf.sample
team/oej/callpickup/configs/http.conf.sample
team/oej/callpickup/configs/iax.conf.sample
team/oej/callpickup/configs/indications.conf.sample
team/oej/callpickup/configs/logger.conf.sample
team/oej/callpickup/configs/manager.conf.sample
team/oej/callpickup/configs/mgcp.conf.sample
team/oej/callpickup/configs/misdn.conf.sample
team/oej/callpickup/configs/modules.conf.sample
team/oej/callpickup/configs/muted.conf.sample
team/oej/callpickup/configs/osp.conf.sample
team/oej/callpickup/configs/oss.conf.sample
team/oej/callpickup/configs/phone.conf.sample
team/oej/callpickup/configs/queues.conf.sample
team/oej/callpickup/configs/res_odbc.conf.sample
team/oej/callpickup/configs/sip.conf.sample
team/oej/callpickup/configs/sip_notify.conf.sample
team/oej/callpickup/configs/skinny.conf.sample
team/oej/callpickup/configs/smdi.conf.sample
team/oej/callpickup/configs/voicemail.conf.sample
team/oej/callpickup/configs/vpb.conf.sample
team/oej/callpickup/configs/zapata.conf.sample
team/oej/callpickup/configure
team/oej/callpickup/configure.ac
team/oej/callpickup/contrib/asterisk-ng-doxygen
team/oej/callpickup/contrib/init.d/rc.redhat.asterisk
team/oej/callpickup/contrib/scripts/astgenkey.8
team/oej/callpickup/doc/CODING-GUIDELINES
team/oej/callpickup/doc/ael.txt
team/oej/callpickup/doc/app-sms.txt
team/oej/callpickup/doc/asterisk-conf.txt
team/oej/callpickup/doc/backtrace.txt
team/oej/callpickup/doc/billing.txt
team/oej/callpickup/doc/callfiles.txt
team/oej/callpickup/doc/chaniax.txt
team/oej/callpickup/doc/channelvariables.txt
team/oej/callpickup/doc/configuration.txt
team/oej/callpickup/doc/cygwin.txt
team/oej/callpickup/doc/dundi.txt
team/oej/callpickup/doc/enum.txt
team/oej/callpickup/doc/extensions.txt
team/oej/callpickup/doc/imapstorage.txt
team/oej/callpickup/doc/ip-tos.txt
team/oej/callpickup/doc/jabber.txt
team/oej/callpickup/doc/jingle.txt
team/oej/callpickup/doc/manager.txt
team/oej/callpickup/doc/misdn.txt
team/oej/callpickup/doc/mp3.txt
team/oej/callpickup/doc/osp.txt
team/oej/callpickup/doc/queues-with-callback-members.txt
team/oej/callpickup/doc/realtime.txt
team/oej/callpickup/doc/security.txt
team/oej/callpickup/doc/sms.txt
team/oej/callpickup/doc/speechrec.txt
team/oej/callpickup/formats/Makefile
team/oej/callpickup/formats/format_g723.c
team/oej/callpickup/formats/format_ogg_vorbis.c
team/oej/callpickup/formats/format_pcm.c
team/oej/callpickup/funcs/Makefile
team/oej/callpickup/funcs/func_callerid.c
team/oej/callpickup/funcs/func_curl.c
team/oej/callpickup/funcs/func_db.c
team/oej/callpickup/funcs/func_enum.c
team/oej/callpickup/funcs/func_logic.c
team/oej/callpickup/funcs/func_md5.c
team/oej/callpickup/funcs/func_odbc.c
team/oej/callpickup/funcs/func_rand.c
team/oej/callpickup/funcs/func_strings.c
team/oej/callpickup/funcs/func_timeout.c
team/oej/callpickup/include/asterisk.h
team/oej/callpickup/include/asterisk/acl.h
team/oej/callpickup/include/asterisk/adsi.h
team/oej/callpickup/include/asterisk/agi.h
team/oej/callpickup/include/asterisk/autoconfig.h.in
team/oej/callpickup/include/asterisk/callerid.h
team/oej/callpickup/include/asterisk/channel.h
team/oej/callpickup/include/asterisk/chanspy.h
team/oej/callpickup/include/asterisk/cli.h
team/oej/callpickup/include/asterisk/compat.h
team/oej/callpickup/include/asterisk/compiler.h
team/oej/callpickup/include/asterisk/config.h
team/oej/callpickup/include/asterisk/doxyref.h
team/oej/callpickup/include/asterisk/enum.h
team/oej/callpickup/include/asterisk/features.h
team/oej/callpickup/include/asterisk/file.h
team/oej/callpickup/include/asterisk/frame.h
team/oej/callpickup/include/asterisk/jabber.h
team/oej/callpickup/include/asterisk/linkedlists.h
team/oej/callpickup/include/asterisk/lock.h
team/oej/callpickup/include/asterisk/logger.h
team/oej/callpickup/include/asterisk/manager.h
team/oej/callpickup/include/asterisk/module.h
team/oej/callpickup/include/asterisk/monitor.h
team/oej/callpickup/include/asterisk/paths.h
team/oej/callpickup/include/asterisk/pbx.h
team/oej/callpickup/include/asterisk/res_odbc.h
team/oej/callpickup/include/asterisk/rtp.h
team/oej/callpickup/include/asterisk/slinfactory.h
team/oej/callpickup/include/asterisk/stringfields.h
team/oej/callpickup/include/asterisk/strings.h
team/oej/callpickup/include/asterisk/threadstorage.h
team/oej/callpickup/include/asterisk/translate.h
team/oej/callpickup/include/asterisk/utils.h
team/oej/callpickup/main/Makefile
team/oej/callpickup/main/abstract_jb.c
team/oej/callpickup/main/acl.c
team/oej/callpickup/main/app.c
team/oej/callpickup/main/ast_expr2.c
team/oej/callpickup/main/ast_expr2f.c
team/oej/callpickup/main/asterisk.c
team/oej/callpickup/main/astmm.c
team/oej/callpickup/main/autoservice.c
team/oej/callpickup/main/callerid.c
team/oej/callpickup/main/cdr.c
team/oej/callpickup/main/channel.c
team/oej/callpickup/main/cli.c
team/oej/callpickup/main/config.c
team/oej/callpickup/main/db.c
team/oej/callpickup/main/db1-ast/Makefile
team/oej/callpickup/main/devicestate.c
team/oej/callpickup/main/dns.c
team/oej/callpickup/main/dnsmgr.c
team/oej/callpickup/main/dsp.c
team/oej/callpickup/main/enum.c
team/oej/callpickup/main/file.c
team/oej/callpickup/main/frame.c
team/oej/callpickup/main/http.c
team/oej/callpickup/main/image.c
team/oej/callpickup/main/io.c
team/oej/callpickup/main/loader.c
team/oej/callpickup/main/logger.c
team/oej/callpickup/main/manager.c
team/oej/callpickup/main/netsock.c
team/oej/callpickup/main/pbx.c
team/oej/callpickup/main/rtp.c
team/oej/callpickup/main/say.c
team/oej/callpickup/main/sched.c
team/oej/callpickup/main/slinfactory.c
team/oej/callpickup/main/strcompat.c
team/oej/callpickup/main/term.c
team/oej/callpickup/main/translate.c
team/oej/callpickup/main/udptl.c
team/oej/callpickup/main/utils.c
team/oej/callpickup/makeopts.in
team/oej/callpickup/pbx/ael/ael-test/ref.ael-test3
team/oej/callpickup/pbx/dundi-parser.c
team/oej/callpickup/pbx/pbx_ael.c
team/oej/callpickup/pbx/pbx_dundi.c
team/oej/callpickup/pbx/pbx_realtime.c
team/oej/callpickup/pbx/pbx_spool.c
team/oej/callpickup/res/Makefile
team/oej/callpickup/res/res_adsi.c
team/oej/callpickup/res/res_agi.c
team/oej/callpickup/res/res_clioriginate.c
team/oej/callpickup/res/res_config_odbc.c
team/oej/callpickup/res/res_config_pgsql.c
team/oej/callpickup/res/res_convert.c
team/oej/callpickup/res/res_crypto.c
team/oej/callpickup/res/res_features.c
team/oej/callpickup/res/res_indications.c
team/oej/callpickup/res/res_jabber.c
team/oej/callpickup/res/res_monitor.c
team/oej/callpickup/res/res_musiconhold.c
team/oej/callpickup/res/res_odbc.c
team/oej/callpickup/res/res_smdi.c
team/oej/callpickup/res/res_snmp.c
team/oej/callpickup/res/res_speech.c
team/oej/callpickup/sounds/Makefile
team/oej/callpickup/sounds/sounds.xml
team/oej/callpickup/utils/ (props changed)
team/oej/callpickup/utils/Makefile
team/oej/callpickup/utils/ael_main.c
team/oej/callpickup/utils/astman.c
team/oej/callpickup/utils/muted.c
team/oej/callpickup/utils/smsq.c
Propchange: team/oej/callpickup/
------------------------------------------------------------------------------
automerge = http://edvina.net/training/
Propchange: team/oej/callpickup/
('branch-1.2-blocked' removed)
Propchange: team/oej/callpickup/
('branch-1.2-merged' removed)
Propchange: team/oej/callpickup/
------------------------------------------------------------------------------
--- branch-1.4-blocked (added)
+++ branch-1.4-blocked Mon Feb 12 13:59:47 2007
@@ -1,0 +1,1 @@
+/branches/1.4:43484,43510,43582,43626,43703,43756,44023,44760,45246,45313-45314,45381,46165,46214,46253,46255,46401,46431,46583
Propchange: team/oej/callpickup/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/oej/callpickup/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 12 13:59:47 2007
@@ -21,5 +21,4 @@
config.log
menuselect-tree
autom4te.cache
-muted
makeopts.embed_rules
Propchange: team/oej/callpickup/
('svnmerge-integrated' removed)
Modified: team/oej/callpickup/.cleancount
URL: http://svn.digium.com/view/asterisk/team/oej/callpickup/.cleancount?view=diff&rev=54138&r1=54137&r2=54138
==============================================================================
--- team/oej/callpickup/.cleancount (original)
+++ team/oej/callpickup/.cleancount Mon Feb 12 13:59:47 2007
@@ -1,1 +1,1 @@
-22
+25
Modified: team/oej/callpickup/CHANGES
URL: http://svn.digium.com/view/asterisk/team/oej/callpickup/CHANGES?view=diff&rev=54138&r1=54137&r2=54138
==============================================================================
--- team/oej/callpickup/CHANGES (original)
+++ team/oej/callpickup/CHANGES Mon Feb 12 13:59:47 2007
@@ -1,127 +1,56 @@
-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 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.
Modified: team/oej/callpickup/CREDITS
URL: http://svn.digium.com/view/asterisk/team/oej/callpickup/CREDITS?view=diff&rev=54138&r1=54137&r2=54138
==============================================================================
--- team/oej/callpickup/CREDITS (original)
+++ team/oej/callpickup/CREDITS Mon Feb 12 13:59:47 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/callpickup/LICENSE
URL: http://svn.digium.com/view/asterisk/team/oej/callpickup/LICENSE?view=diff&rev=54138&r1=54137&r2=54138
==============================================================================
--- team/oej/callpickup/LICENSE (original)
+++ team/oej/callpickup/LICENSE Mon Feb 12 13:59:47 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/callpickup/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/callpickup/Makefile?view=diff&rev=54138&r1=54137&r2=54138
==============================================================================
--- team/oej/callpickup/Makefile (original)
+++ team/oej/callpickup/Makefile Mon Feb 12 13:59:47 2007
@@ -13,16 +13,51 @@
# 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:
-
-include makeopts
+# 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
+# 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
@@ -74,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
@@ -87,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
@@ -101,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)
@@ -137,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)
@@ -151,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)
@@ -163,7 +192,8 @@
endif
ifeq ($(OSARCH),FreeBSD)
- BSDVERSION=$(shell $(MAKE) -V OSVERSION -f /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
@@ -232,14 +262,15 @@
HAVEDOT=no
endif
-all: cleantest $(SUBDIRS)
+all: _all
@echo " +--------- Asterisk Build Complete ---------+"
- @echo " + Asterisk has successfully been built, but +"
- @echo " + cannot be run before being installed by +"
- @echo " + running: +"
+ @echo " + Asterisk has successfully been built, and +"
+ @echo " + can be installed by running: +"
@echo " + +"
@echo " + make install +"
@echo " +-------------------------------------------+"
+
+_all: cleantest $(SUBDIRS)
makeopts: configure
@echo "****"
@@ -275,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
@@ -296,6 +327,13 @@
include/asterisk/buildopts.h: menuselect.makeopts
@build_tools/make_buildopts_h > $@.tmp
+ @if cmp -s $@.tmp $@ ; then : ; else \
+ mv $@.tmp $@ ; \
+ fi
+ @rm -f $@.tmp
+
+include/asterisk/build.h:
+ @build_tools/make_build_h > $@.tmp
@if cmp -s $@.tmp $@ ; then : ; else \
mv $@.tmp $@ ; \
fi
@@ -315,6 +353,7 @@
rm -f include/asterisk/version.h
rm -f .depend
@$(MAKE) -C menuselect clean
+ cp -f .cleancount .lastclean
dist-clean: distclean
@@ -330,8 +369,8 @@
rm -rf doc/api
rm -f build_tools/menuselect-deps
-datafiles: all
- if [ x`$(ID) -un` = xroot ]; then sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+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
# improved a lot. I'll put it here for now.
@@ -364,7 +403,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)
@@ -402,10 +441,12 @@
$(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
$(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
$(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
+ if [ -f contrib/firmware/iax/iaxy.bin ] ; then \
+ $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
+ fi
$(SUBDIRS_INSTALL):
- @$(MAKE) -C $(@:-install=) install
+ @DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(MAKE) -C $(@:-install=) install
NEWMODS=$(notdir $(wildcard */*.so))
OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
@@ -428,7 +469,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
@@ -455,7 +496,7 @@
@echo " +-------------------------------------------+"
@$(MAKE) -s oldmodcheck
-upgrade: all bininstall
+upgrade: bininstall
adsi:
mkdir -p $(DESTDIR)$(ASTETCDIR)
@@ -587,12 +628,12 @@
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
-
-depend: include/asterisk/version.h include/asterisk/buildopts.h defaults.h $(SUBDIRS_DEPEND)
+ @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) --no-print-directory -C $(@:-depend=) depend
+
+depend: include/asterisk/version.h include/asterisk/buildopts.h include/asterisk/build.h defaults.h $(SUBDIRS_DEPEND)
sounds:
$(MAKE) -C sounds all
@@ -603,8 +644,7 @@
cleantest:
@if ! cmp -s .cleancount .lastclean ; then \
- $(MAKE) clean; cp -f .cleancount .lastclean;\
- $(MAKE) defaults.h;\
+ $(MAKE) clean;\
fi
$(SUBDIRS_UNINSTALL):
@@ -643,10 +683,10 @@
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
- @CFLAGS="-include $(ASTTOPDIR)/include/asterisk/autoconfig.h -I$(ASTTOPDIR)/include" PARENTSRC="$(ASTTOPDIR)" $(MAKE) -C menuselect CC="$(HOST_CC)"
+ @unset CC LD AR RANLIB && $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml
@echo "Generating input for menuselect ..."
Modified: team/oej/callpickup/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/oej/callpickup/Makefile.moddir_rules?view=diff&rev=54138&r1=54137&r2=54138
==============================================================================
--- team/oej/callpickup/Makefile.moddir_rules (original)
+++ team/oej/callpickup/Makefile.moddir_rules Mon Feb 12 13:59:47 2007
@@ -12,7 +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)),)
+ ASTCFLAGS+=${GC_CFLAGS}
endif
ifneq ($(findstring STATIC_BUILD,$(MENUSELECT_CFLAGS)),)
@@ -23,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
[... 73278 lines stripped ...]
More information about the asterisk-commits
mailing list