[asterisk-commits] oej: branch group/res_config_ldap r47738 - in /team/group/res_config_ldap: ./...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Thu Nov 16 08:30:16 MST 2006 

Author: oej
Date: Thu Nov 16 09:30:12 2006
New Revision: 47738

URL: http://svn.digium.com/view/asterisk?view=rev&rev=47738
Log:
Update to current automerge. Tried to resolve conflicts in configure and autoconfig - please check.


Added:
    team/group/res_config_ldap/build_tools/prep_tarball
      - copied unchanged from r47727, trunk/build_tools/prep_tarball
    team/group/res_config_ldap/build_tools/strip_nonapi
      - copied unchanged from r47727, trunk/build_tools/strip_nonapi
    team/group/res_config_ldap/channels/chan_gtalk.c
      - copied unchanged from r47727, trunk/channels/chan_gtalk.c
    team/group/res_config_ldap/channels/h323/Makefile.in
      - copied unchanged from r47727, trunk/channels/h323/Makefile.in
    team/group/res_config_ldap/channels/h323/ast_h323.cxx
      - copied unchanged from r47727, trunk/channels/h323/ast_h323.cxx
    team/group/res_config_ldap/channels/h323/caps_h323.cxx
      - copied unchanged from r47727, trunk/channels/h323/caps_h323.cxx
    team/group/res_config_ldap/channels/h323/caps_h323.h
      - copied unchanged from r47727, trunk/channels/h323/caps_h323.h
    team/group/res_config_ldap/channels/h323/cisco-h225.asn
      - copied unchanged from r47727, trunk/channels/h323/cisco-h225.asn
    team/group/res_config_ldap/channels/h323/cisco-h225.cxx
      - copied unchanged from r47727, trunk/channels/h323/cisco-h225.cxx
    team/group/res_config_ldap/channels/h323/cisco-h225.h
      - copied unchanged from r47727, trunk/channels/h323/cisco-h225.h
    team/group/res_config_ldap/channels/h323/compat_h323.cxx
      - copied unchanged from r47727, trunk/channels/h323/compat_h323.cxx
    team/group/res_config_ldap/channels/h323/compat_h323.h
      - copied unchanged from r47727, trunk/channels/h323/compat_h323.h
    team/group/res_config_ldap/channels/h323/noexport.map
      - copied unchanged from r47727, trunk/channels/h323/noexport.map
    team/group/res_config_ldap/configs/gtalk.conf.sample
      - copied unchanged from r47727, trunk/configs/gtalk.conf.sample
    team/group/res_config_ldap/configs/h323.conf.sample
      - copied unchanged from r47727, trunk/configs/h323.conf.sample
    team/group/res_config_ldap/configs/users.conf.sample
      - copied unchanged from r47727, trunk/configs/users.conf.sample
    team/group/res_config_ldap/doc/rtp-packetization.txt
      - copied unchanged from r47727, trunk/doc/rtp-packetization.txt
    team/group/res_config_ldap/funcs/func_blacklist.c
      - copied unchanged from r47727, trunk/funcs/func_blacklist.c
    team/group/res_config_ldap/funcs/func_module.c
      - copied unchanged from r47727, trunk/funcs/func_module.c
    team/group/res_config_ldap/funcs/func_version.c
      - copied unchanged from r47727, trunk/funcs/func_version.c
    team/group/res_config_ldap/funcs/func_vmcount.c
      - copied unchanged from r47727, trunk/funcs/func_vmcount.c
    team/group/res_config_ldap/include/jitterbuf.h
      - copied unchanged from r47727, trunk/include/jitterbuf.h
    team/group/res_config_ldap/pbx/ael/ael-test/ael-test14/
      - copied from r47727, trunk/pbx/ael/ael-test/ael-test14/
    team/group/res_config_ldap/pbx/ael/ael-test/ael-test14/extensions.ael
      - copied unchanged from r47727, trunk/pbx/ael/ael-test/ael-test14/extensions.ael
    team/group/res_config_ldap/pbx/ael/ael-test/ael-test15/
      - copied from r47727, trunk/pbx/ael/ael-test/ael-test15/
    team/group/res_config_ldap/pbx/ael/ael-test/ael-test15/extensions.ael
      - copied unchanged from r47727, trunk/pbx/ael/ael-test/ael-test15/extensions.ael
    team/group/res_config_ldap/pbx/ael/ael-test/ael-test16/
      - copied from r47727, trunk/pbx/ael/ael-test/ael-test16/
    team/group/res_config_ldap/pbx/ael/ael-test/ael-test16/extensions.ael
      - copied unchanged from r47727, trunk/pbx/ael/ael-test/ael-test16/extensions.ael
    team/group/res_config_ldap/pbx/ael/ael-test/ael-test3/telemarket_torture.ael2
      - copied unchanged from r47727, trunk/pbx/ael/ael-test/ael-test3/telemarket_torture.ael2
    team/group/res_config_ldap/pbx/ael/ael-test/ael-vtest17/
      - copied from r47727, trunk/pbx/ael/ael-test/ael-vtest17/
    team/group/res_config_ldap/pbx/ael/ael-test/ael-vtest17/extensions.ael
      - copied unchanged from r47727, trunk/pbx/ael/ael-test/ael-vtest17/extensions.ael
    team/group/res_config_ldap/pbx/ael/ael-test/ref.ael-test14
      - copied unchanged from r47727, trunk/pbx/ael/ael-test/ref.ael-test14
    team/group/res_config_ldap/pbx/ael/ael-test/ref.ael-test15
      - copied unchanged from r47727, trunk/pbx/ael/ael-test/ref.ael-test15
    team/group/res_config_ldap/pbx/ael/ael-test/ref.ael-test16
      - copied unchanged from r47727, trunk/pbx/ael/ael-test/ref.ael-test16
    team/group/res_config_ldap/pbx/ael/ael-test/ref.ael-vtest17
      - copied unchanged from r47727, trunk/pbx/ael/ael-test/ref.ael-vtest17
    team/group/res_config_ldap/res/res_limit.c
      - copied unchanged from r47727, trunk/res/res_limit.c
    team/group/res_config_ldap/res/res_realtime.c
      - copied unchanged from r47727, trunk/res/res_realtime.c
Removed:
    team/group/res_config_ldap/aclocal.m4
    team/group/res_config_ldap/apps/app_hasnewvoicemail.c
    team/group/res_config_ldap/apps/app_lookupblacklist.c
    team/group/res_config_ldap/apps/app_lookupcidname.c
    team/group/res_config_ldap/apps/app_random.c
    team/group/res_config_ldap/apps/app_realtime.c
    team/group/res_config_ldap/apps/app_setcdruserfield.c
    team/group/res_config_ldap/apps/app_settransfercapability.c
    team/group/res_config_ldap/channels/h323/Makefile
    team/group/res_config_ldap/channels/h323/ast_h323.cpp
    team/group/res_config_ldap/channels/h323/h323.conf.sample
    team/group/res_config_ldap/doc/linkedlists.txt
    team/group/res_config_ldap/funcs/func_language.c
    team/group/res_config_ldap/funcs/func_moh.c
    team/group/res_config_ldap/main/jitterbuf.h
Modified:
    team/group/res_config_ldap/   (props changed)
    team/group/res_config_ldap/.cleancount
    team/group/res_config_ldap/CHANGES
    team/group/res_config_ldap/CREDITS
    team/group/res_config_ldap/LICENSE
    team/group/res_config_ldap/Makefile
    team/group/res_config_ldap/Makefile.moddir_rules
    team/group/res_config_ldap/Makefile.rules
    team/group/res_config_ldap/README
    team/group/res_config_ldap/UPGRADE.txt
    team/group/res_config_ldap/acinclude.m4
    team/group/res_config_ldap/agi/   (props changed)
    team/group/res_config_ldap/agi/Makefile
    team/group/res_config_ldap/apps/Makefile
    team/group/res_config_ldap/apps/app_adsiprog.c
    team/group/res_config_ldap/apps/app_alarmreceiver.c
    team/group/res_config_ldap/apps/app_amd.c
    team/group/res_config_ldap/apps/app_authenticate.c
    team/group/res_config_ldap/apps/app_cdr.c
    team/group/res_config_ldap/apps/app_chanspy.c
    team/group/res_config_ldap/apps/app_db.c
    team/group/res_config_ldap/apps/app_dial.c
    team/group/res_config_ldap/apps/app_directed_pickup.c
    team/group/res_config_ldap/apps/app_directory.c
    team/group/res_config_ldap/apps/app_disa.c
    team/group/res_config_ldap/apps/app_dumpchan.c
    team/group/res_config_ldap/apps/app_echo.c
    team/group/res_config_ldap/apps/app_externalivr.c
    team/group/res_config_ldap/apps/app_festival.c
    team/group/res_config_ldap/apps/app_followme.c
    team/group/res_config_ldap/apps/app_getcpeid.c
    team/group/res_config_ldap/apps/app_ices.c
    team/group/res_config_ldap/apps/app_macro.c
    team/group/res_config_ldap/apps/app_meetme.c
    team/group/res_config_ldap/apps/app_milliwatt.c
    team/group/res_config_ldap/apps/app_mixmonitor.c
    team/group/res_config_ldap/apps/app_mp3.c
    team/group/res_config_ldap/apps/app_nbscat.c
    team/group/res_config_ldap/apps/app_osplookup.c
    team/group/res_config_ldap/apps/app_page.c
    team/group/res_config_ldap/apps/app_parkandannounce.c
    team/group/res_config_ldap/apps/app_playback.c
    team/group/res_config_ldap/apps/app_privacy.c
    team/group/res_config_ldap/apps/app_queue.c
    team/group/res_config_ldap/apps/app_read.c
    team/group/res_config_ldap/apps/app_record.c
    team/group/res_config_ldap/apps/app_rpt.c
    team/group/res_config_ldap/apps/app_setcallerid.c
    team/group/res_config_ldap/apps/app_sms.c
    team/group/res_config_ldap/apps/app_softhangup.c
    team/group/res_config_ldap/apps/app_speech_utils.c
    team/group/res_config_ldap/apps/app_stack.c
    team/group/res_config_ldap/apps/app_talkdetect.c
    team/group/res_config_ldap/apps/app_test.c
    team/group/res_config_ldap/apps/app_url.c
    team/group/res_config_ldap/apps/app_voicemail.c
    team/group/res_config_ldap/apps/app_waitforring.c
    team/group/res_config_ldap/apps/app_waitforsilence.c
    team/group/res_config_ldap/apps/app_zapateller.c
    team/group/res_config_ldap/apps/app_zapbarge.c
    team/group/res_config_ldap/apps/app_zapras.c
    team/group/res_config_ldap/apps/app_zapscan.c
    team/group/res_config_ldap/bootstrap.sh
    team/group/res_config_ldap/build_tools/cflags.xml
    team/group/res_config_ldap/build_tools/embed_modules.xml
    team/group/res_config_ldap/build_tools/make_buildopts_h
    team/group/res_config_ldap/build_tools/make_version
    team/group/res_config_ldap/build_tools/menuselect-deps.in
    team/group/res_config_ldap/build_tools/prep_moduledeps
    team/group/res_config_ldap/cdr/Makefile
    team/group/res_config_ldap/cdr/cdr_csv.c
    team/group/res_config_ldap/cdr/cdr_custom.c
    team/group/res_config_ldap/cdr/cdr_manager.c
    team/group/res_config_ldap/cdr/cdr_odbc.c
    team/group/res_config_ldap/cdr/cdr_pgsql.c
    team/group/res_config_ldap/cdr/cdr_radius.c
    team/group/res_config_ldap/cdr/cdr_tds.c
    team/group/res_config_ldap/channels/Makefile
    team/group/res_config_ldap/channels/chan_agent.c
    team/group/res_config_ldap/channels/chan_alsa.c
    team/group/res_config_ldap/channels/chan_features.c
    team/group/res_config_ldap/channels/chan_h323.c
    team/group/res_config_ldap/channels/chan_iax2.c
    team/group/res_config_ldap/channels/chan_jingle.c
    team/group/res_config_ldap/channels/chan_local.c
    team/group/res_config_ldap/channels/chan_mgcp.c
    team/group/res_config_ldap/channels/chan_misdn.c
    team/group/res_config_ldap/channels/chan_nbs.c
    team/group/res_config_ldap/channels/chan_oss.c
    team/group/res_config_ldap/channels/chan_phone.c
    team/group/res_config_ldap/channels/chan_sip.c
    team/group/res_config_ldap/channels/chan_skinny.c
    team/group/res_config_ldap/channels/chan_vpb.cc
    team/group/res_config_ldap/channels/chan_zap.c
    team/group/res_config_ldap/channels/h323/   (props changed)
    team/group/res_config_ldap/channels/h323/README
    team/group/res_config_ldap/channels/h323/TODO
    team/group/res_config_ldap/channels/h323/ast_h323.h
    team/group/res_config_ldap/channels/h323/chan_h323.h
    team/group/res_config_ldap/channels/iax2-parser.c
    team/group/res_config_ldap/channels/iax2-parser.h
    team/group/res_config_ldap/channels/iax2-provision.c
    team/group/res_config_ldap/channels/misdn/chan_misdn_config.h
    team/group/res_config_ldap/channels/misdn/isdn_lib.c
    team/group/res_config_ldap/channels/misdn/isdn_lib.h
    team/group/res_config_ldap/channels/misdn/isdn_msg_parser.c
    team/group/res_config_ldap/channels/misdn_config.c
    team/group/res_config_ldap/codecs/Makefile
    team/group/res_config_ldap/codecs/codec_gsm.c
    team/group/res_config_ldap/codecs/codec_ilbc.c
    team/group/res_config_ldap/codecs/codec_lpc10.c
    team/group/res_config_ldap/codecs/codec_speex.c
    team/group/res_config_ldap/codecs/codec_zap.c
    team/group/res_config_ldap/codecs/gsm/Makefile
    team/group/res_config_ldap/codecs/ilbc/Makefile
    team/group/res_config_ldap/codecs/lpc10/Makefile
    team/group/res_config_ldap/codecs/lpc10/analys.c
    team/group/res_config_ldap/codecs/lpc10/bsynz.c
    team/group/res_config_ldap/codecs/lpc10/chanwr.c
    team/group/res_config_ldap/codecs/lpc10/dcbias.c
    team/group/res_config_ldap/codecs/lpc10/decode.c
    team/group/res_config_ldap/codecs/lpc10/deemp.c
    team/group/res_config_ldap/codecs/lpc10/difmag.c
    team/group/res_config_ldap/codecs/lpc10/dyptrk.c
    team/group/res_config_ldap/codecs/lpc10/encode.c
    team/group/res_config_ldap/codecs/lpc10/energy.c
    team/group/res_config_ldap/codecs/lpc10/ham84.c
    team/group/res_config_ldap/codecs/lpc10/hp100.c
    team/group/res_config_ldap/codecs/lpc10/invert.c
    team/group/res_config_ldap/codecs/lpc10/irc2pc.c
    team/group/res_config_ldap/codecs/lpc10/ivfilt.c
    team/group/res_config_ldap/codecs/lpc10/lpcdec.c
    team/group/res_config_ldap/codecs/lpc10/lpcenc.c
    team/group/res_config_ldap/codecs/lpc10/lpcini.c
    team/group/res_config_ldap/codecs/lpc10/lpfilt.c
    team/group/res_config_ldap/codecs/lpc10/median.c
    team/group/res_config_ldap/codecs/lpc10/mload.c
    team/group/res_config_ldap/codecs/lpc10/onset.c
    team/group/res_config_ldap/codecs/lpc10/pitsyn.c
    team/group/res_config_ldap/codecs/lpc10/placea.c
    team/group/res_config_ldap/codecs/lpc10/placev.c
    team/group/res_config_ldap/codecs/lpc10/preemp.c
    team/group/res_config_ldap/codecs/lpc10/prepro.c
    team/group/res_config_ldap/codecs/lpc10/random.c
    team/group/res_config_ldap/codecs/lpc10/rcchk.c
    team/group/res_config_ldap/codecs/lpc10/synths.c
    team/group/res_config_ldap/codecs/lpc10/tbdm.c
    team/group/res_config_ldap/codecs/lpc10/voicin.c
    team/group/res_config_ldap/codecs/lpc10/vparms.c
    team/group/res_config_ldap/configs/alsa.conf.sample
    team/group/res_config_ldap/configs/cdr.conf.sample
    team/group/res_config_ldap/configs/dundi.conf.sample
    team/group/res_config_ldap/configs/enum.conf.sample
    team/group/res_config_ldap/configs/extensions.ael.sample
    team/group/res_config_ldap/configs/extensions.conf.sample
    team/group/res_config_ldap/configs/features.conf.sample
    team/group/res_config_ldap/configs/func_odbc.conf.sample
    team/group/res_config_ldap/configs/http.conf.sample
    team/group/res_config_ldap/configs/iax.conf.sample
    team/group/res_config_ldap/configs/indications.conf.sample
    team/group/res_config_ldap/configs/logger.conf.sample
    team/group/res_config_ldap/configs/manager.conf.sample
    team/group/res_config_ldap/configs/mgcp.conf.sample
    team/group/res_config_ldap/configs/misdn.conf.sample
    team/group/res_config_ldap/configs/modules.conf.sample
    team/group/res_config_ldap/configs/musiconhold.conf.sample
    team/group/res_config_ldap/configs/muted.conf.sample
    team/group/res_config_ldap/configs/osp.conf.sample
    team/group/res_config_ldap/configs/oss.conf.sample
    team/group/res_config_ldap/configs/phone.conf.sample
    team/group/res_config_ldap/configs/queues.conf.sample
    team/group/res_config_ldap/configs/res_odbc.conf.sample
    team/group/res_config_ldap/configs/sip.conf.sample
    team/group/res_config_ldap/configs/sip_notify.conf.sample
    team/group/res_config_ldap/configs/skinny.conf.sample
    team/group/res_config_ldap/configs/smdi.conf.sample
    team/group/res_config_ldap/configs/voicemail.conf.sample
    team/group/res_config_ldap/configs/vpb.conf.sample
    team/group/res_config_ldap/configs/zapata.conf.sample
    team/group/res_config_ldap/configure
    team/group/res_config_ldap/configure.ac
    team/group/res_config_ldap/contrib/asterisk-ng-doxygen
    team/group/res_config_ldap/contrib/init.d/rc.redhat.asterisk
    team/group/res_config_ldap/contrib/scripts/astgenkey.8
    team/group/res_config_ldap/doc/CODING-GUIDELINES
    team/group/res_config_ldap/doc/ael.txt
    team/group/res_config_ldap/doc/app-sms.txt
    team/group/res_config_ldap/doc/asterisk-conf.txt
    team/group/res_config_ldap/doc/backtrace.txt
    team/group/res_config_ldap/doc/billing.txt
    team/group/res_config_ldap/doc/callfiles.txt
    team/group/res_config_ldap/doc/chaniax.txt
    team/group/res_config_ldap/doc/channelvariables.txt
    team/group/res_config_ldap/doc/configuration.txt
    team/group/res_config_ldap/doc/cygwin.txt
    team/group/res_config_ldap/doc/dundi.txt
    team/group/res_config_ldap/doc/enum.txt
    team/group/res_config_ldap/doc/extensions.txt
    team/group/res_config_ldap/doc/imapstorage.txt
    team/group/res_config_ldap/doc/ip-tos.txt
    team/group/res_config_ldap/doc/jabber.txt
    team/group/res_config_ldap/doc/jingle.txt
    team/group/res_config_ldap/doc/manager.txt
    team/group/res_config_ldap/doc/misdn.txt
    team/group/res_config_ldap/doc/mp3.txt
    team/group/res_config_ldap/doc/osp.txt
    team/group/res_config_ldap/doc/queues-with-callback-members.txt
    team/group/res_config_ldap/doc/realtime.txt
    team/group/res_config_ldap/doc/security.txt
    team/group/res_config_ldap/doc/sms.txt
    team/group/res_config_ldap/doc/speechrec.txt
    team/group/res_config_ldap/formats/Makefile
    team/group/res_config_ldap/formats/format_g723.c
    team/group/res_config_ldap/formats/format_ogg_vorbis.c
    team/group/res_config_ldap/formats/format_pcm.c
    team/group/res_config_ldap/funcs/Makefile
    team/group/res_config_ldap/funcs/func_callerid.c
    team/group/res_config_ldap/funcs/func_channel.c
    team/group/res_config_ldap/funcs/func_curl.c
    team/group/res_config_ldap/funcs/func_db.c
    team/group/res_config_ldap/funcs/func_enum.c
    team/group/res_config_ldap/funcs/func_logic.c
    team/group/res_config_ldap/funcs/func_md5.c
    team/group/res_config_ldap/funcs/func_odbc.c
    team/group/res_config_ldap/funcs/func_rand.c
    team/group/res_config_ldap/funcs/func_strings.c
    team/group/res_config_ldap/funcs/func_timeout.c
    team/group/res_config_ldap/funcs/func_uri.c
    team/group/res_config_ldap/include/asterisk.h
    team/group/res_config_ldap/include/asterisk/acl.h
    team/group/res_config_ldap/include/asterisk/adsi.h
    team/group/res_config_ldap/include/asterisk/agi.h
    team/group/res_config_ldap/include/asterisk/app.h
    team/group/res_config_ldap/include/asterisk/astosp.h
    team/group/res_config_ldap/include/asterisk/autoconfig.h.in
    team/group/res_config_ldap/include/asterisk/callerid.h
    team/group/res_config_ldap/include/asterisk/channel.h
    team/group/res_config_ldap/include/asterisk/chanspy.h
    team/group/res_config_ldap/include/asterisk/cli.h
    team/group/res_config_ldap/include/asterisk/compat.h
    team/group/res_config_ldap/include/asterisk/compiler.h
    team/group/res_config_ldap/include/asterisk/config.h
    team/group/res_config_ldap/include/asterisk/doxyref.h
    team/group/res_config_ldap/include/asterisk/enum.h
    team/group/res_config_ldap/include/asterisk/features.h
    team/group/res_config_ldap/include/asterisk/file.h
    team/group/res_config_ldap/include/asterisk/frame.h
    team/group/res_config_ldap/include/asterisk/jabber.h
    team/group/res_config_ldap/include/asterisk/linkedlists.h
    team/group/res_config_ldap/include/asterisk/lock.h
    team/group/res_config_ldap/include/asterisk/logger.h
    team/group/res_config_ldap/include/asterisk/manager.h
    team/group/res_config_ldap/include/asterisk/module.h
    team/group/res_config_ldap/include/asterisk/monitor.h
    team/group/res_config_ldap/include/asterisk/pbx.h
    team/group/res_config_ldap/include/asterisk/res_odbc.h
    team/group/res_config_ldap/include/asterisk/rtp.h
    team/group/res_config_ldap/include/asterisk/slinfactory.h
    team/group/res_config_ldap/include/asterisk/stringfields.h
    team/group/res_config_ldap/include/asterisk/strings.h
    team/group/res_config_ldap/include/asterisk/term.h
    team/group/res_config_ldap/include/asterisk/threadstorage.h
    team/group/res_config_ldap/include/asterisk/translate.h
    team/group/res_config_ldap/include/asterisk/utils.h
    team/group/res_config_ldap/main/Makefile
    team/group/res_config_ldap/main/abstract_jb.c
    team/group/res_config_ldap/main/acl.c
    team/group/res_config_ldap/main/app.c
    team/group/res_config_ldap/main/ast_expr2.c
    team/group/res_config_ldap/main/ast_expr2f.c
    team/group/res_config_ldap/main/asterisk.c
    team/group/res_config_ldap/main/astmm.c
    team/group/res_config_ldap/main/autoservice.c
    team/group/res_config_ldap/main/callerid.c
    team/group/res_config_ldap/main/cdr.c
    team/group/res_config_ldap/main/channel.c
    team/group/res_config_ldap/main/cli.c
    team/group/res_config_ldap/main/config.c
    team/group/res_config_ldap/main/db.c
    team/group/res_config_ldap/main/db1-ast/Makefile
    team/group/res_config_ldap/main/devicestate.c
    team/group/res_config_ldap/main/dns.c
    team/group/res_config_ldap/main/dnsmgr.c
    team/group/res_config_ldap/main/dsp.c
    team/group/res_config_ldap/main/enum.c
    team/group/res_config_ldap/main/file.c
    team/group/res_config_ldap/main/frame.c
    team/group/res_config_ldap/main/http.c
    team/group/res_config_ldap/main/image.c
    team/group/res_config_ldap/main/io.c
    team/group/res_config_ldap/main/loader.c
    team/group/res_config_ldap/main/logger.c
    team/group/res_config_ldap/main/manager.c
    team/group/res_config_ldap/main/netsock.c
    team/group/res_config_ldap/main/pbx.c
    team/group/res_config_ldap/main/rtp.c
    team/group/res_config_ldap/main/say.c
    team/group/res_config_ldap/main/sched.c
    team/group/res_config_ldap/main/slinfactory.c
    team/group/res_config_ldap/main/strcompat.c
    team/group/res_config_ldap/main/term.c
    team/group/res_config_ldap/main/translate.c
    team/group/res_config_ldap/main/udptl.c
    team/group/res_config_ldap/main/utils.c
    team/group/res_config_ldap/makeopts.in
    team/group/res_config_ldap/pbx/Makefile
    team/group/res_config_ldap/pbx/ael/ael-test/ael-test11/extensions.ael
    team/group/res_config_ldap/pbx/ael/ael-test/ael-test3/extensions.ael
    team/group/res_config_ldap/pbx/ael/ael-test/ael-test5/extensions.ael
    team/group/res_config_ldap/pbx/ael/ael-test/ref.ael-ntest10
    team/group/res_config_ldap/pbx/ael/ael-test/ref.ael-ntest12
    team/group/res_config_ldap/pbx/ael/ael-test/ref.ael-ntest9
    team/group/res_config_ldap/pbx/ael/ael-test/ref.ael-test1
    team/group/res_config_ldap/pbx/ael/ael-test/ref.ael-test11
    team/group/res_config_ldap/pbx/ael/ael-test/ref.ael-test2
    team/group/res_config_ldap/pbx/ael/ael-test/ref.ael-test3
    team/group/res_config_ldap/pbx/ael/ael-test/ref.ael-test4
    team/group/res_config_ldap/pbx/ael/ael-test/ref.ael-test5
    team/group/res_config_ldap/pbx/ael/ael-test/ref.ael-test6
    team/group/res_config_ldap/pbx/ael/ael-test/ref.ael-test7
    team/group/res_config_ldap/pbx/ael/ael-test/ref.ael-test8
    team/group/res_config_ldap/pbx/ael/ael-test/ref.ael-vtest13
    team/group/res_config_ldap/pbx/ael/ael.flex
    team/group/res_config_ldap/pbx/ael/ael.tab.c
    team/group/res_config_ldap/pbx/ael/ael.y
    team/group/res_config_ldap/pbx/ael/ael_lex.c
    team/group/res_config_ldap/pbx/dundi-parser.c
    team/group/res_config_ldap/pbx/pbx_ael.c
    team/group/res_config_ldap/pbx/pbx_config.c
    team/group/res_config_ldap/pbx/pbx_dundi.c
    team/group/res_config_ldap/pbx/pbx_realtime.c
    team/group/res_config_ldap/pbx/pbx_spool.c
    team/group/res_config_ldap/res/Makefile
    team/group/res_config_ldap/res/res_adsi.c
    team/group/res_config_ldap/res/res_agi.c
    team/group/res_config_ldap/res/res_clioriginate.c
    team/group/res_config_ldap/res/res_config_odbc.c
    team/group/res_config_ldap/res/res_config_pgsql.c
    team/group/res_config_ldap/res/res_convert.c
    team/group/res_config_ldap/res/res_crypto.c
    team/group/res_config_ldap/res/res_features.c
    team/group/res_config_ldap/res/res_indications.c
    team/group/res_config_ldap/res/res_jabber.c
    team/group/res_config_ldap/res/res_monitor.c
    team/group/res_config_ldap/res/res_musiconhold.c
    team/group/res_config_ldap/res/res_odbc.c
    team/group/res_config_ldap/res/res_smdi.c
    team/group/res_config_ldap/res/res_snmp.c
    team/group/res_config_ldap/res/res_speech.c
    team/group/res_config_ldap/sounds/Makefile
    team/group/res_config_ldap/sounds/sounds.xml
    team/group/res_config_ldap/utils/   (props changed)
    team/group/res_config_ldap/utils/Makefile
    team/group/res_config_ldap/utils/ael_main.c
    team/group/res_config_ldap/utils/astman.c
    team/group/res_config_ldap/utils/check_expr.c
    team/group/res_config_ldap/utils/muted.c
    team/group/res_config_ldap/utils/smsq.c
    team/group/res_config_ldap/utils/streamplayer.c

Propchange: team/group/res_config_ldap/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/group/res_config_ldap/
            ('branch-1.2-blocked' removed)

Propchange: team/group/res_config_ldap/
            ('branch-1.2-merged' removed)

Propchange: team/group/res_config_ldap/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/group/res_config_ldap/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/group/res_config_ldap/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Thu Nov 16 09:30:12 2006
@@ -1,1 +1,1 @@
-menuselect	http://svn.digium.com/svn/menuselect/branches/1.0
+menuselect	https://origsvn.digium.com/svn/menuselect/branches/1.0

Propchange: team/group/res_config_ldap/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Nov 16 09:30:12 2006
@@ -22,3 +22,4 @@
 menuselect-tree
 autom4te.cache
 makeopts.embed_rules
+aclocal.m4

Propchange: team/group/res_config_ldap/
------------------------------------------------------------------------------
    svnmerge-blocked = /branches/1.2:47648

Propchange: team/group/res_config_ldap/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Nov 16 09:30:12 2006
@@ -1,1 +1,1 @@
-/trunk:1-41025
+/trunk:1-47727

Modified: team/group/res_config_ldap/.cleancount
URL: http://svn.digium.com/view/asterisk/team/group/res_config_ldap/.cleancount?view=diff&rev=47738&r1=47737&r2=47738
==============================================================================
--- team/group/res_config_ldap/.cleancount (original)
+++ team/group/res_config_ldap/.cleancount Thu Nov 16 09:30:12 2006
@@ -1,1 +1,1 @@
-22
+25

Modified: team/group/res_config_ldap/CHANGES
URL: http://svn.digium.com/view/asterisk/team/group/res_config_ldap/CHANGES?view=diff&rev=47738&r1=47737&r2=47738
==============================================================================
--- team/group/res_config_ldap/CHANGES (original)
+++ team/group/res_config_ldap/CHANGES Thu Nov 16 09:30:12 2006
@@ -1,127 +1,63 @@
-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.

Modified: team/group/res_config_ldap/CREDITS
URL: http://svn.digium.com/view/asterisk/team/group/res_config_ldap/CREDITS?view=diff&rev=47738&r1=47737&r2=47738
==============================================================================
--- team/group/res_config_ldap/CREDITS (original)
+++ team/group/res_config_ldap/CREDITS Thu Nov 16 09:30:12 2006
@@ -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/group/res_config_ldap/LICENSE
URL: http://svn.digium.com/view/asterisk/team/group/res_config_ldap/LICENSE?view=diff&rev=47738&r1=47737&r2=47738
==============================================================================
--- team/group/res_config_ldap/LICENSE (original)
+++ team/group/res_config_ldap/LICENSE Thu Nov 16 09:30:12 2006
@@ -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/group/res_config_ldap/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/res_config_ldap/Makefile?view=diff&rev=47738&r1=47737&r2=47738
==============================================================================
--- team/group/res_config_ldap/Makefile (original)
+++ team/group/res_config_ldap/Makefile Thu Nov 16 09:30:12 2006
@@ -13,16 +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:
-
-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
+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
@@ -74,7 +110,9 @@

[... 111197 lines stripped ...]

More information about the asterisk-commits mailing list