[asterisk-commits] irroot: branch irroot/distrotech-customers-trunk r329099 - in /team/irroot/di...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Thu Jul 21 04:52:08 CDT 2011 

Author: irroot
Date: Thu Jul 21 04:51:59 2011
New Revision: 329099

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=329099
Log:
Sync and enable automerge

Modified:
    team/irroot/distrotech-customers-trunk/   (props changed)
    team/irroot/distrotech-customers-trunk/BUGS
    team/irroot/distrotech-customers-trunk/CHANGES
    team/irroot/distrotech-customers-trunk/Makefile
    team/irroot/distrotech-customers-trunk/Makefile.moddir_rules
    team/irroot/distrotech-customers-trunk/UPGRADE-1.8.txt
    team/irroot/distrotech-customers-trunk/UPGRADE.txt
    team/irroot/distrotech-customers-trunk/addons/app_mysql.c
    team/irroot/distrotech-customers-trunk/addons/app_saycountpl.c
    team/irroot/distrotech-customers-trunk/addons/cdr_mysql.c
    team/irroot/distrotech-customers-trunk/addons/chan_mobile.c
    team/irroot/distrotech-customers-trunk/addons/chan_ooh323.c
    team/irroot/distrotech-customers-trunk/addons/format_mp3.c
    team/irroot/distrotech-customers-trunk/addons/ooh323c/src/ooGkClient.c
    team/irroot/distrotech-customers-trunk/addons/res_config_mysql.c
    team/irroot/distrotech-customers-trunk/agi/eagi-test.c
    team/irroot/distrotech-customers-trunk/apps/app_adsiprog.c
    team/irroot/distrotech-customers-trunk/apps/app_alarmreceiver.c
    team/irroot/distrotech-customers-trunk/apps/app_amd.c
    team/irroot/distrotech-customers-trunk/apps/app_authenticate.c
    team/irroot/distrotech-customers-trunk/apps/app_cdr.c
    team/irroot/distrotech-customers-trunk/apps/app_chanisavail.c
    team/irroot/distrotech-customers-trunk/apps/app_channelredirect.c
    team/irroot/distrotech-customers-trunk/apps/app_chanspy.c
    team/irroot/distrotech-customers-trunk/apps/app_confbridge.c
    team/irroot/distrotech-customers-trunk/apps/app_controlplayback.c
    team/irroot/distrotech-customers-trunk/apps/app_dahdibarge.c
    team/irroot/distrotech-customers-trunk/apps/app_dahdiras.c
    team/irroot/distrotech-customers-trunk/apps/app_db.c
    team/irroot/distrotech-customers-trunk/apps/app_dial.c
    team/irroot/distrotech-customers-trunk/apps/app_dictate.c
    team/irroot/distrotech-customers-trunk/apps/app_directed_pickup.c
    team/irroot/distrotech-customers-trunk/apps/app_directory.c
    team/irroot/distrotech-customers-trunk/apps/app_disa.c
    team/irroot/distrotech-customers-trunk/apps/app_dumpchan.c
    team/irroot/distrotech-customers-trunk/apps/app_echo.c
    team/irroot/distrotech-customers-trunk/apps/app_exec.c
    team/irroot/distrotech-customers-trunk/apps/app_externalivr.c
    team/irroot/distrotech-customers-trunk/apps/app_fax.c
    team/irroot/distrotech-customers-trunk/apps/app_festival.c
    team/irroot/distrotech-customers-trunk/apps/app_flash.c
    team/irroot/distrotech-customers-trunk/apps/app_followme.c
    team/irroot/distrotech-customers-trunk/apps/app_forkcdr.c
    team/irroot/distrotech-customers-trunk/apps/app_getcpeid.c
    team/irroot/distrotech-customers-trunk/apps/app_ices.c
    team/irroot/distrotech-customers-trunk/apps/app_image.c
    team/irroot/distrotech-customers-trunk/apps/app_ivrdemo.c
    team/irroot/distrotech-customers-trunk/apps/app_jack.c
    team/irroot/distrotech-customers-trunk/apps/app_macro.c
    team/irroot/distrotech-customers-trunk/apps/app_meetme.c
    team/irroot/distrotech-customers-trunk/apps/app_milliwatt.c
    team/irroot/distrotech-customers-trunk/apps/app_minivm.c
    team/irroot/distrotech-customers-trunk/apps/app_mixmonitor.c
    team/irroot/distrotech-customers-trunk/apps/app_morsecode.c
    team/irroot/distrotech-customers-trunk/apps/app_mp3.c
    team/irroot/distrotech-customers-trunk/apps/app_nbscat.c
    team/irroot/distrotech-customers-trunk/apps/app_originate.c
    team/irroot/distrotech-customers-trunk/apps/app_osplookup.c
    team/irroot/distrotech-customers-trunk/apps/app_page.c
    team/irroot/distrotech-customers-trunk/apps/app_parkandannounce.c
    team/irroot/distrotech-customers-trunk/apps/app_playback.c
    team/irroot/distrotech-customers-trunk/apps/app_playtones.c
    team/irroot/distrotech-customers-trunk/apps/app_privacy.c
    team/irroot/distrotech-customers-trunk/apps/app_queue.c
    team/irroot/distrotech-customers-trunk/apps/app_read.c
    team/irroot/distrotech-customers-trunk/apps/app_readexten.c
    team/irroot/distrotech-customers-trunk/apps/app_readfile.c
    team/irroot/distrotech-customers-trunk/apps/app_record.c
    team/irroot/distrotech-customers-trunk/apps/app_rpt.c
    team/irroot/distrotech-customers-trunk/apps/app_saycounted.c
    team/irroot/distrotech-customers-trunk/apps/app_sayunixtime.c
    team/irroot/distrotech-customers-trunk/apps/app_senddtmf.c
    team/irroot/distrotech-customers-trunk/apps/app_sendtext.c
    team/irroot/distrotech-customers-trunk/apps/app_setcallerid.c
    team/irroot/distrotech-customers-trunk/apps/app_skel.c
    team/irroot/distrotech-customers-trunk/apps/app_sms.c
    team/irroot/distrotech-customers-trunk/apps/app_softhangup.c
    team/irroot/distrotech-customers-trunk/apps/app_speech_utils.c
    team/irroot/distrotech-customers-trunk/apps/app_stack.c
    team/irroot/distrotech-customers-trunk/apps/app_talkdetect.c
    team/irroot/distrotech-customers-trunk/apps/app_test.c
    team/irroot/distrotech-customers-trunk/apps/app_transfer.c
    team/irroot/distrotech-customers-trunk/apps/app_url.c
    team/irroot/distrotech-customers-trunk/apps/app_userevent.c
    team/irroot/distrotech-customers-trunk/apps/app_verbose.c
    team/irroot/distrotech-customers-trunk/apps/app_voicemail.c
    team/irroot/distrotech-customers-trunk/apps/app_waitforring.c
    team/irroot/distrotech-customers-trunk/apps/app_waitforsilence.c
    team/irroot/distrotech-customers-trunk/apps/app_waituntil.c
    team/irroot/distrotech-customers-trunk/apps/app_while.c
    team/irroot/distrotech-customers-trunk/apps/app_zapateller.c
    team/irroot/distrotech-customers-trunk/cdr/cdr_adaptive_odbc.c
    team/irroot/distrotech-customers-trunk/cdr/cdr_csv.c
    team/irroot/distrotech-customers-trunk/cdr/cdr_custom.c
    team/irroot/distrotech-customers-trunk/cdr/cdr_manager.c
    team/irroot/distrotech-customers-trunk/cdr/cdr_odbc.c
    team/irroot/distrotech-customers-trunk/cdr/cdr_pgsql.c
    team/irroot/distrotech-customers-trunk/cdr/cdr_radius.c
    team/irroot/distrotech-customers-trunk/cdr/cdr_sqlite.c
    team/irroot/distrotech-customers-trunk/cdr/cdr_sqlite3_custom.c
    team/irroot/distrotech-customers-trunk/cdr/cdr_syslog.c
    team/irroot/distrotech-customers-trunk/cdr/cdr_tds.c
    team/irroot/distrotech-customers-trunk/cel/cel_custom.c
    team/irroot/distrotech-customers-trunk/cel/cel_manager.c
    team/irroot/distrotech-customers-trunk/cel/cel_odbc.c   (contents, props changed)
    team/irroot/distrotech-customers-trunk/cel/cel_pgsql.c
    team/irroot/distrotech-customers-trunk/cel/cel_radius.c
    team/irroot/distrotech-customers-trunk/cel/cel_sqlite3_custom.c
    team/irroot/distrotech-customers-trunk/cel/cel_tds.c
    team/irroot/distrotech-customers-trunk/channels/chan_alsa.c
    team/irroot/distrotech-customers-trunk/channels/chan_bridge.c
    team/irroot/distrotech-customers-trunk/channels/chan_gtalk.c
    team/irroot/distrotech-customers-trunk/channels/chan_local.c
    team/irroot/distrotech-customers-trunk/channels/chan_mgcp.c
    team/irroot/distrotech-customers-trunk/channels/chan_misdn.c
    team/irroot/distrotech-customers-trunk/channels/chan_multicast_rtp.c
    team/irroot/distrotech-customers-trunk/channels/chan_nbs.c
    team/irroot/distrotech-customers-trunk/channels/chan_oss.c
    team/irroot/distrotech-customers-trunk/channels/chan_sip.c
    team/irroot/distrotech-customers-trunk/channels/chan_skinny.c
    team/irroot/distrotech-customers-trunk/channels/chan_unistim.c
    team/irroot/distrotech-customers-trunk/codecs/codec_a_mu.c
    team/irroot/distrotech-customers-trunk/codecs/codec_adpcm.c
    team/irroot/distrotech-customers-trunk/codecs/codec_alaw.c
    team/irroot/distrotech-customers-trunk/codecs/codec_g722.c
    team/irroot/distrotech-customers-trunk/codecs/codec_g726.c
    team/irroot/distrotech-customers-trunk/codecs/codec_gsm.c
    team/irroot/distrotech-customers-trunk/codecs/codec_ilbc.c
    team/irroot/distrotech-customers-trunk/codecs/codec_lpc10.c
    team/irroot/distrotech-customers-trunk/codecs/codec_resample.c
    team/irroot/distrotech-customers-trunk/codecs/codec_speex.c
    team/irroot/distrotech-customers-trunk/codecs/codec_ulaw.c
    team/irroot/distrotech-customers-trunk/configs/cel_odbc.conf.sample   (props changed)
    team/irroot/distrotech-customers-trunk/configs/features.conf.sample
    team/irroot/distrotech-customers-trunk/formats/format_g719.c
    team/irroot/distrotech-customers-trunk/formats/format_g723.c
    team/irroot/distrotech-customers-trunk/formats/format_g726.c
    team/irroot/distrotech-customers-trunk/formats/format_g729.c
    team/irroot/distrotech-customers-trunk/formats/format_gsm.c
    team/irroot/distrotech-customers-trunk/formats/format_h263.c
    team/irroot/distrotech-customers-trunk/formats/format_h264.c
    team/irroot/distrotech-customers-trunk/formats/format_ilbc.c
    team/irroot/distrotech-customers-trunk/formats/format_jpeg.c
    team/irroot/distrotech-customers-trunk/formats/format_ogg_vorbis.c
    team/irroot/distrotech-customers-trunk/formats/format_pcm.c
    team/irroot/distrotech-customers-trunk/formats/format_siren14.c
    team/irroot/distrotech-customers-trunk/formats/format_siren7.c
    team/irroot/distrotech-customers-trunk/formats/format_sln.c
    team/irroot/distrotech-customers-trunk/formats/format_vox.c
    team/irroot/distrotech-customers-trunk/formats/format_wav.c
    team/irroot/distrotech-customers-trunk/formats/format_wav_gsm.c
    team/irroot/distrotech-customers-trunk/funcs/func_aes.c
    team/irroot/distrotech-customers-trunk/funcs/func_audiohookinherit.c
    team/irroot/distrotech-customers-trunk/funcs/func_base64.c
    team/irroot/distrotech-customers-trunk/funcs/func_blacklist.c
    team/irroot/distrotech-customers-trunk/funcs/func_callcompletion.c
    team/irroot/distrotech-customers-trunk/funcs/func_callerid.c
    team/irroot/distrotech-customers-trunk/funcs/func_cdr.c
    team/irroot/distrotech-customers-trunk/funcs/func_channel.c
    team/irroot/distrotech-customers-trunk/funcs/func_config.c
    team/irroot/distrotech-customers-trunk/funcs/func_curl.c
    team/irroot/distrotech-customers-trunk/funcs/func_cut.c
    team/irroot/distrotech-customers-trunk/funcs/func_db.c
    team/irroot/distrotech-customers-trunk/funcs/func_devstate.c
    team/irroot/distrotech-customers-trunk/funcs/func_dialgroup.c
    team/irroot/distrotech-customers-trunk/funcs/func_dialplan.c
    team/irroot/distrotech-customers-trunk/funcs/func_enum.c
    team/irroot/distrotech-customers-trunk/funcs/func_env.c
    team/irroot/distrotech-customers-trunk/funcs/func_extstate.c
    team/irroot/distrotech-customers-trunk/funcs/func_frame_trace.c
    team/irroot/distrotech-customers-trunk/funcs/func_global.c
    team/irroot/distrotech-customers-trunk/funcs/func_groupcount.c
    team/irroot/distrotech-customers-trunk/funcs/func_iconv.c
    team/irroot/distrotech-customers-trunk/funcs/func_lock.c
    team/irroot/distrotech-customers-trunk/funcs/func_logic.c
    team/irroot/distrotech-customers-trunk/funcs/func_math.c
    team/irroot/distrotech-customers-trunk/funcs/func_md5.c
    team/irroot/distrotech-customers-trunk/funcs/func_module.c
    team/irroot/distrotech-customers-trunk/funcs/func_odbc.c
    team/irroot/distrotech-customers-trunk/funcs/func_pitchshift.c
    team/irroot/distrotech-customers-trunk/funcs/func_rand.c
    team/irroot/distrotech-customers-trunk/funcs/func_sha1.c
    team/irroot/distrotech-customers-trunk/funcs/func_shell.c
    team/irroot/distrotech-customers-trunk/funcs/func_speex.c
    team/irroot/distrotech-customers-trunk/funcs/func_sprintf.c
    team/irroot/distrotech-customers-trunk/funcs/func_srv.c
    team/irroot/distrotech-customers-trunk/funcs/func_strings.c
    team/irroot/distrotech-customers-trunk/funcs/func_sysinfo.c
    team/irroot/distrotech-customers-trunk/funcs/func_timeout.c
    team/irroot/distrotech-customers-trunk/funcs/func_uri.c
    team/irroot/distrotech-customers-trunk/funcs/func_version.c
    team/irroot/distrotech-customers-trunk/funcs/func_vmcount.c
    team/irroot/distrotech-customers-trunk/funcs/func_volume.c
    team/irroot/distrotech-customers-trunk/include/asterisk/dsp.h
    team/irroot/distrotech-customers-trunk/include/asterisk/extconf.h
    team/irroot/distrotech-customers-trunk/include/asterisk/linkedlists.h
    team/irroot/distrotech-customers-trunk/include/asterisk/pbx.h
    team/irroot/distrotech-customers-trunk/include/asterisk/rtp_engine.h
    team/irroot/distrotech-customers-trunk/main/asterisk.c
    team/irroot/distrotech-customers-trunk/main/dsp.c
    team/irroot/distrotech-customers-trunk/main/features.c
    team/irroot/distrotech-customers-trunk/main/http.c
    team/irroot/distrotech-customers-trunk/main/manager.c
    team/irroot/distrotech-customers-trunk/main/rtp_engine.c
    team/irroot/distrotech-customers-trunk/res/res_adsi.c
    team/irroot/distrotech-customers-trunk/res/res_ael_share.c
    team/irroot/distrotech-customers-trunk/res/res_agi.c
    team/irroot/distrotech-customers-trunk/res/res_ais.c
    team/irroot/distrotech-customers-trunk/res/res_calendar.c
    team/irroot/distrotech-customers-trunk/res/res_calendar_caldav.c
    team/irroot/distrotech-customers-trunk/res/res_calendar_ews.c
    team/irroot/distrotech-customers-trunk/res/res_calendar_exchange.c
    team/irroot/distrotech-customers-trunk/res/res_calendar_icalendar.c
    team/irroot/distrotech-customers-trunk/res/res_clialiases.c
    team/irroot/distrotech-customers-trunk/res/res_clioriginate.c
    team/irroot/distrotech-customers-trunk/res/res_config_curl.c
    team/irroot/distrotech-customers-trunk/res/res_config_ldap.c
    team/irroot/distrotech-customers-trunk/res/res_config_odbc.c
    team/irroot/distrotech-customers-trunk/res/res_config_pgsql.c
    team/irroot/distrotech-customers-trunk/res/res_config_sqlite.c
    team/irroot/distrotech-customers-trunk/res/res_convert.c
    team/irroot/distrotech-customers-trunk/res/res_crypto.c
    team/irroot/distrotech-customers-trunk/res/res_fax.c
    team/irroot/distrotech-customers-trunk/res/res_fax_spandsp.c
    team/irroot/distrotech-customers-trunk/res/res_http_post.c
    team/irroot/distrotech-customers-trunk/res/res_jabber.c
    team/irroot/distrotech-customers-trunk/res/res_limit.c
    team/irroot/distrotech-customers-trunk/res/res_monitor.c
    team/irroot/distrotech-customers-trunk/res/res_musiconhold.c
    team/irroot/distrotech-customers-trunk/res/res_mutestream.c
    team/irroot/distrotech-customers-trunk/res/res_odbc.c
    team/irroot/distrotech-customers-trunk/res/res_phoneprov.c
    team/irroot/distrotech-customers-trunk/res/res_pktccops.c
    team/irroot/distrotech-customers-trunk/res/res_realtime.c
    team/irroot/distrotech-customers-trunk/res/res_rtp_asterisk.c
    team/irroot/distrotech-customers-trunk/res/res_rtp_multicast.c
    team/irroot/distrotech-customers-trunk/res/res_security_log.c
    team/irroot/distrotech-customers-trunk/res/res_smdi.c
    team/irroot/distrotech-customers-trunk/res/res_snmp.c
    team/irroot/distrotech-customers-trunk/res/res_speech.c
    team/irroot/distrotech-customers-trunk/res/res_srtp.c
    team/irroot/distrotech-customers-trunk/res/res_stun_monitor.c
    team/irroot/distrotech-customers-trunk/res/res_timing_dahdi.c
    team/irroot/distrotech-customers-trunk/res/res_timing_kqueue.c
    team/irroot/distrotech-customers-trunk/res/res_timing_pthread.c
    team/irroot/distrotech-customers-trunk/res/res_timing_timerfd.c
    team/irroot/distrotech-customers-trunk/sounds/Makefile   (contents, props changed)
    team/irroot/distrotech-customers-trunk/tests/test_acl.c
    team/irroot/distrotech-customers-trunk/tests/test_amihooks.c
    team/irroot/distrotech-customers-trunk/tests/test_aoc.c
    team/irroot/distrotech-customers-trunk/tests/test_app.c
    team/irroot/distrotech-customers-trunk/tests/test_ast_format_str_reduce.c
    team/irroot/distrotech-customers-trunk/tests/test_astobj2.c
    team/irroot/distrotech-customers-trunk/tests/test_devicestate.c
    team/irroot/distrotech-customers-trunk/tests/test_dlinklists.c
    team/irroot/distrotech-customers-trunk/tests/test_event.c
    team/irroot/distrotech-customers-trunk/tests/test_expr.c
    team/irroot/distrotech-customers-trunk/tests/test_func_file.c
    team/irroot/distrotech-customers-trunk/tests/test_gosub.c
    team/irroot/distrotech-customers-trunk/tests/test_heap.c
    team/irroot/distrotech-customers-trunk/tests/test_locale.c
    team/irroot/distrotech-customers-trunk/tests/test_logger.c
    team/irroot/distrotech-customers-trunk/tests/test_pbx.c
    team/irroot/distrotech-customers-trunk/tests/test_poll.c
    team/irroot/distrotech-customers-trunk/tests/test_sched.c
    team/irroot/distrotech-customers-trunk/tests/test_security_events.c
    team/irroot/distrotech-customers-trunk/tests/test_skel.c
    team/irroot/distrotech-customers-trunk/tests/test_stringfields.c
    team/irroot/distrotech-customers-trunk/tests/test_strings.c
    team/irroot/distrotech-customers-trunk/tests/test_substitution.c
    team/irroot/distrotech-customers-trunk/tests/test_time.c
    team/irroot/distrotech-customers-trunk/tests/test_utils.c
    team/irroot/distrotech-customers-trunk/utils/ael_main.c
    team/irroot/distrotech-customers-trunk/utils/astcanary.c
    team/irroot/distrotech-customers-trunk/utils/astman.c
    team/irroot/distrotech-customers-trunk/utils/check_expr.c
    team/irroot/distrotech-customers-trunk/utils/conf2ael.c
    team/irroot/distrotech-customers-trunk/utils/extconf.c
    team/irroot/distrotech-customers-trunk/utils/hashtest.c
    team/irroot/distrotech-customers-trunk/utils/hashtest2.c
    team/irroot/distrotech-customers-trunk/utils/muted.c
    team/irroot/distrotech-customers-trunk/utils/refcounter.c
    team/irroot/distrotech-customers-trunk/utils/smsq.c
    team/irroot/distrotech-customers-trunk/utils/stereorize.c
    team/irroot/distrotech-customers-trunk/utils/streamplayer.c

Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/irroot/distrotech-customers-trunk/
            ('branch-1.8-blocked' removed)

Propchange: team/irroot/distrotech-customers-trunk/
            ('branch-1.8-merged' removed)

Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
    branch-2.0-blocked = /branches/2.0:

Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
--- branch-2.0-merged (added)
+++ branch-2.0-merged Thu Jul 21 04:51:59 2011
@@ -1,0 +1,1 @@
+/branches/2.0:1-328075,328120,328162,328207,328247,328317,328329,328428-328429,328448,328451,328541,328609,328611,328664,328717,328771,328824,328879,328936,328992,329055

Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
    svnmerge-integrated = /trunk:1-329072

Modified: team/irroot/distrotech-customers-trunk/BUGS
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/BUGS?view=diff&rev=329099&r1=329098&r2=329099
==============================================================================
--- team/irroot/distrotech-customers-trunk/BUGS (original)
+++ team/irroot/distrotech-customers-trunk/BUGS Thu Jul 21 04:51:59 2011
@@ -4,7 +4,7 @@
 To learn about and report Asterisk bugs, please visit 
 the official Asterisk Bug Tracker at:
 
-	https://issues.asterisk.org
+	https://issues.asterisk.org/jira
 
 For more information on using the bug tracker, or to 
 learn how you can contribute by acting as a bug marshal

Modified: team/irroot/distrotech-customers-trunk/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/CHANGES?view=diff&rev=329099&r1=329098&r2=329099
==============================================================================
--- team/irroot/distrotech-customers-trunk/CHANGES (original)
+++ team/irroot/distrotech-customers-trunk/CHANGES Thu Jul 21 04:51:59 2011
@@ -176,8 +176,6 @@
 SIP Changes
 -----------
  * Add T38 support for REJECTED state where T.38 Negotiation is explicitly rejected.
- * Enable Optional SRTP by setting encryption=try
- * Add option encryption_taglen to set auth taglen only 32 and 80 are supported currently.
 
 Queue changes
 -------------
@@ -205,6 +203,11 @@
    utility in the UTILS section of menuselect. If an existing astdb is found and no
    astdb.sqlite3 exists, astdb2sqlite3 will be compiled automatically. Asterisk will
    convert an existing astdb to the SQLite3 version automatically at runtime.
+
+Asterisk Modules
+----------------
+ * Modules marked as deprecated are no longer marked as building by default. Enabling
+   these modules is still available via menuselect.
 
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 1.6.2 to Asterisk 1.8 ----------------

Modified: team/irroot/distrotech-customers-trunk/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/Makefile?view=diff&rev=329099&r1=329098&r2=329099
==============================================================================
--- team/irroot/distrotech-customers-trunk/Makefile (original)
+++ team/irroot/distrotech-customers-trunk/Makefile Thu Jul 21 04:51:59 2011
@@ -467,9 +467,9 @@
 # improved a lot.  I'll put it here for now.
 
 	for x in static-http/*; do \
-		$(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/static-http" ; \
+		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
 	done
-	$(INSTALL) -m 644 doc/core-en_US.xml "$(DESTDIR)$(ASTDATADIR)/static-http";
+	$(INSTALL) -m 644 doc/core-en_US.xml $(DESTDIR)$(ASTDATADIR)/static-http;
 	if [ -d doc/tex/asterisk ] ; then \
 		$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \
 		for n in doc/tex/asterisk/* ; do \
@@ -477,7 +477,7 @@
 		done \
 	fi
 	for x in images/*.jpg; do \
-		$(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/images" ; \
+		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
 	done
 	$(MAKE) -C sounds install
 
@@ -576,21 +576,21 @@
 		rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
 	fi
 
-	$(INSTALL) -m 644 doc/core-*.xml "$(DESTDIR)$(ASTDATADIR)/documentation"
-	$(INSTALL) -m 644 doc/appdocsxml.dtd "$(DESTDIR)$(ASTDATADIR)/documentation"
-	$(INSTALL) -m 644 doc/asterisk.8 "$(DESTDIR)$(ASTMANDIR)/man8"
-	$(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 doc/core-*.xml $(DESTDIR)$(ASTDATADIR)/documentation
+	$(INSTALL) -m 644 doc/appdocsxml.dtd $(DESTDIR)$(ASTDATADIR)/documentation
+	$(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
+	$(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
 	if [ -f contrib/firmware/iax/iaxy.bin ] ; then \
-		$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin "$(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin"; \
+		$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
 	fi
 
 $(SUBDIRS_INSTALL):
 	+ at DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install 
 
 NEWMODS:=$(foreach d,$(MOD_SUBDIRS),$(notdir $(wildcard $(d)/*.so)))
-OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard "$(DESTDIR)$(MODULES_DIR)/*.so")))
+OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
 
 oldmodcheck:
 	@if [ -n "$(OLDMODS)" ]; then \
@@ -698,33 +698,33 @@
 		rm -f $(DESTDIR)$(ASTCONFPATH).tmp ; \
 	fi ; \
 	$(INSTALL) -d $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
-	build_tools/make_sample_voicemail "$(DESTDIR)$(ASTDATADIR)" "$(DESTDIR)$(ASTSPOOLDIR)"
+	build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR)
 
 	@for x in phoneprov/*; do \
 		dst="$(DESTDIR)$(ASTDATADIR)/$$x" ;	\
-		if [ -f "$${dst}" ]; then \
+		if [ -f $${dst} ]; then \
 			if [ "$(OVERWRITE)" = "y" ]; then \
-				if cmp -s "$${dst}" $$x ; then \
+				if cmp -s $${dst} $$x ; then \
 					echo "Config file $$x is unchanged"; \
 					continue; \
 				fi ; \
-				mv -f "$${dst}" "$${dst}.old" ; \
+				mv -f $${dst} $${dst}.old ; \
 			else \
 				echo "Skipping config file $$x"; \
 				continue; \
 			fi ;\
 		fi ; \
 		echo "Installing file $$x"; \
-		$(INSTALL) -m 644 $$x "$${dst}" ;\
+		$(INSTALL) -m 644 $$x $${dst} ;\
 	done
 
 webvmail:
 	@[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
 	@[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
-	$(INSTALL) -m 4755 contrib/scripts/vmail.cgi "$(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi"
+	$(INSTALL) -m 4755 contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi
 	$(INSTALL) -d $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
 	for x in images/*.gif; do \
-		$(INSTALL) -m 644 $$x "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/"; \
+		$(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
 	done
 	@echo " +--------- Asterisk Web Voicemail ----------+"  
 	@echo " +                                           +"
@@ -844,12 +844,12 @@
 	+@$(SUBMAKE) -C $(@:-uninstall=) uninstall
 
 _uninstall: $(SUBDIRS_UNINSTALL)
-	rm -f "$(DESTDIR)$(MODULES_DIR)/*"
+	rm -f $(DESTDIR)$(MODULES_DIR)/*
 	rm -f $(DESTDIR)$(ASTSBINDIR)/*asterisk*
 	rm -f $(DESTDIR)$(ASTSBINDIR)/astgenkey
 	rm -f $(DESTDIR)$(ASTSBINDIR)/autosupport
 	rm -rf $(DESTDIR)$(ASTHEADERDIR)
-	rm -rf "$(DESTDIR)$(ASTDATADIR)/firmware"
+	rm -rf $(DESTDIR)$(ASTDATADIR)/firmware
 	rm -f $(DESTDIR)$(ASTMANDIR)/man8/asterisk.8
 	rm -f $(DESTDIR)$(ASTMANDIR)/man8/astgenkey.8
 	rm -f $(DESTDIR)$(ASTMANDIR)/man8/autosupport.8
@@ -871,12 +871,12 @@
 	@echo " +-------------------------------------------+"  
 
 uninstall-all: _uninstall
-	rm -rf "$(DESTDIR)$(ASTLIBDIR)"
-	rm -rf "$(DESTDIR)$(ASTVARLIBDIR)"
-	rm -rf "$(DESTDIR)$(ASTDATADIR)"
-	rm -rf "$(DESTDIR)$(ASTSPOOLDIR)"
-	rm -rf "$(DESTDIR)$(ASTETCDIR)"
-	rm -rf "$(DESTDIR)$(ASTLOGDIR)"
+	rm -rf $(DESTDIR)$(ASTLIBDIR)
+	rm -rf $(DESTDIR)$(ASTVARLIBDIR)
+	rm -rf $(DESTDIR)$(ASTDATADIR)
+	rm -rf $(DESTDIR)$(ASTSPOOLDIR)
+	rm -rf $(DESTDIR)$(ASTETCDIR)
+	rm -rf $(DESTDIR)$(ASTLOGDIR)
 
 menuconfig: menuselect
 

Modified: team/irroot/distrotech-customers-trunk/Makefile.moddir_rules
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/Makefile.moddir_rules?view=diff&rev=329099&r1=329098&r2=329099
==============================================================================
--- team/irroot/distrotech-customers-trunk/Makefile.moddir_rules (original)
+++ team/irroot/distrotech-customers-trunk/Makefile.moddir_rules Thu Jul 21 04:51:59 2011
@@ -122,7 +122,7 @@
 
 install:: all
 	@echo "Installing modules from `basename $(CURDIR)`..."
-	@for x in $(LOADABLE_MODS:%=%.so); do $(INSTALL) -m 755 $$x "$(DESTDIR)$(MODULES_DIR)" ; done
+	@for x in $(LOADABLE_MODS:%=%.so); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
 
 uninstall::
 

Modified: team/irroot/distrotech-customers-trunk/UPGRADE-1.8.txt
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/UPGRADE-1.8.txt?view=diff&rev=329099&r1=329098&r2=329099
==============================================================================
--- team/irroot/distrotech-customers-trunk/UPGRADE-1.8.txt (original)
+++ team/irroot/distrotech-customers-trunk/UPGRADE-1.8.txt Thu Jul 21 04:51:59 2011
@@ -20,6 +20,8 @@
 
 From 1.6.2 to 1.8:
 
+* Asterisk now requires libpri 1.4.11+ for PRI support.
+
 * A couple of CLI commands in res_ais were changed back to their original form:
     "ais show clm members" --> "ais clm show members"
     "ais show evt event channels" --> "ais evt show event channels"

Modified: team/irroot/distrotech-customers-trunk/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/UPGRADE.txt?view=diff&rev=329099&r1=329098&r2=329099
==============================================================================
--- team/irroot/distrotech-customers-trunk/UPGRADE.txt (original)
+++ team/irroot/distrotech-customers-trunk/UPGRADE.txt Thu Jul 21 04:51:59 2011
@@ -16,8 +16,13 @@
 === UPGRADE-1.4.txt -- Upgrade info for 1.2 to 1.4
 === UPGRADE-1.6.txt -- Upgrade info for 1.4 to 1.6
 === UPGRADE-1.8.txt -- Upgrade info for 1.6 to 1.8
+=== UPGRADE-1.10.txt -- Upgrade info for 1.8 to 1.10
 ===
 ===========================================================
+
+From 1.10 to 1.12:
+
+* No significant changes as of yet.
 
 From 1.8 to 1.10:
 
@@ -60,12 +65,22 @@
  - Mark QUEUE_MEMBER_PENALTY Deprecated it never worked for realtime members
  - QUEUE_MEMBER is now R/W supporting setting paused, ignorebusy and penalty.
 
- Asterisk Database:
+Asterisk Database:
  - The internal Asterisk database has been switched from Berkeley DB 1.86 to
    SQLite 3. An existing Berkeley astdb file can be converted with the astdb2sqlite3
    utility in the UTILS section of menuselect. If an existing astdb is found and no
    astdb.sqlite3 exists, astdb2sqlite3 will be compiled automatically. Asterisk will
    convert an existing astdb to the SQLite3 version automatically at runtime.
 
+Module Support Level
+ - All modules in the addons, apps, bridge, cdr, cel, channels, codecs, 
+   formats, funcs, pbx, and res have been updated to include MODULEINFO data
+   that includes <support_level> tags with a value of core, extended, or deprecated.
+   More information is available on the Asterisk wiki at 
+   https://wiki.asterisk.org/wiki/display/AST/Asterisk+Module+Support+States
+
+   Deprecated modules are now marked to not build by default and must be explicitly
+   enabled in menuselect.
+
 ===========================================================
 ===========================================================

Modified: team/irroot/distrotech-customers-trunk/addons/app_mysql.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/addons/app_mysql.c?view=diff&rev=329099&r1=329098&r2=329099
==============================================================================
--- team/irroot/distrotech-customers-trunk/addons/app_mysql.c (original)
+++ team/irroot/distrotech-customers-trunk/addons/app_mysql.c Thu Jul 21 04:51:59 2011
@@ -26,6 +26,8 @@
 /*** MODULEINFO
 	<depend>mysqlclient</depend>
 	<defaultenabled>no</defaultenabled>
+	<support_level>deprecated</support_level>
+	<replacement>func_odbc</replacement>
  ***/
 
 #include "asterisk.h"

Modified: team/irroot/distrotech-customers-trunk/addons/app_saycountpl.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/addons/app_saycountpl.c?view=diff&rev=329099&r1=329098&r2=329099
==============================================================================
--- team/irroot/distrotech-customers-trunk/addons/app_saycountpl.c (original)
+++ team/irroot/distrotech-customers-trunk/addons/app_saycountpl.c Thu Jul 21 04:51:59 2011
@@ -22,6 +22,8 @@
 
 /*** MODULEINFO
 	<defaultenabled>no</defaultenabled>
+	<support_level>deprecated</support_level>
+	<replacement>say.conf</replacement>
  ***/
 
 #include "asterisk.h"

Modified: team/irroot/distrotech-customers-trunk/addons/cdr_mysql.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/addons/cdr_mysql.c?view=diff&rev=329099&r1=329098&r2=329099
==============================================================================
--- team/irroot/distrotech-customers-trunk/addons/cdr_mysql.c (original)
+++ team/irroot/distrotech-customers-trunk/addons/cdr_mysql.c Thu Jul 21 04:51:59 2011
@@ -36,6 +36,8 @@
 /*** MODULEINFO
 	<depend>mysqlclient</depend>
 	<defaultenabled>no</defaultenabled>
+	<support_level>deprecated</support_level>
+	<replacement>cdr_adaptive_odbc</replacement>
  ***/
 
 #include "asterisk.h"

Modified: team/irroot/distrotech-customers-trunk/addons/chan_mobile.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/addons/chan_mobile.c?view=diff&rev=329099&r1=329098&r2=329099
==============================================================================
--- team/irroot/distrotech-customers-trunk/addons/chan_mobile.c (original)
+++ team/irroot/distrotech-customers-trunk/addons/chan_mobile.c Thu Jul 21 04:51:59 2011
@@ -28,6 +28,7 @@
 /*** MODULEINFO
 	<depend>bluetooth</depend>
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"

Modified: team/irroot/distrotech-customers-trunk/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/addons/chan_ooh323.c?view=diff&rev=329099&r1=329098&r2=329099
==============================================================================
--- team/irroot/distrotech-customers-trunk/addons/chan_ooh323.c (original)
+++ team/irroot/distrotech-customers-trunk/addons/chan_ooh323.c Thu Jul 21 04:51:59 2011
@@ -19,6 +19,7 @@
 
 /*** MODULEINFO
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
  ***/
 
 #include "chan_ooh323.h"

Modified: team/irroot/distrotech-customers-trunk/addons/format_mp3.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/addons/format_mp3.c?view=diff&rev=329099&r1=329098&r2=329099
==============================================================================
--- team/irroot/distrotech-customers-trunk/addons/format_mp3.c (original)
+++ team/irroot/distrotech-customers-trunk/addons/format_mp3.c Thu Jul 21 04:51:59 2011
@@ -29,6 +29,7 @@
 
 /*** MODULEINFO
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"

Modified: team/irroot/distrotech-customers-trunk/addons/ooh323c/src/ooGkClient.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/addons/ooh323c/src/ooGkClient.c?view=diff&rev=329099&r1=329098&r2=329099
==============================================================================
--- team/irroot/distrotech-customers-trunk/addons/ooh323c/src/ooGkClient.c (original)
+++ team/irroot/distrotech-customers-trunk/addons/ooh323c/src/ooGkClient.c Thu Jul 21 04:51:59 2011
@@ -1211,8 +1211,11 @@
 
       if(pGkClient->regTimeout > DEFAULT_TTL_OFFSET)
          regTTL = pGkClient->regTimeout - DEFAULT_TTL_OFFSET;
-      else
-         regTTL = pGkClient->regTimeout;
+      else {
+         regTTL = pGkClient->regTimeout - 1; /* -1 due to some ops expire us few earlier */
+	 if (regTTL <= 0)
+		regTTL = 1;
+      }
 
       cbData = (ooGkClientTimerCb*) memAlloc
                                 (&pGkClient->ctxt, sizeof(ooGkClientTimerCb));
@@ -1260,7 +1263,6 @@
          memFreePtr(&pGkClient->ctxt, pTimer->cbData);
          ooTimerDelete(&pGkClient->ctxt, &pGkClient->timerList, pTimer);
          OOTRACEDBGA1("Deleted RRQ Timer.\n");
-         break;
       }
    }
    pGkClient->state = GkClientRegistered;
@@ -1505,8 +1507,10 @@
 int ooGkClientHandleUnregistrationRequest
    (ooGkClient *pGkClient, H225UnregistrationRequest * punregistrationRequest)
 {
-   int iRet=0;
-
+   int iRet=0, x;
+   OOTimer *pTimer = NULL;
+   DListNode *pNode = NULL;
+ 
    /* Lets first send unregistration confirm message back to gatekeeper*/
    ooGkClientSendUnregistrationConfirm(pGkClient, 
                                       punregistrationRequest->requestSeqNum);
@@ -1527,6 +1531,24 @@
       OOTRACEINFO1("Sending fresh RRQ - as unregistration request received\n");
       pGkClient->rrqRetries = 0;
       pGkClient->state = GkClientDiscovered;
+
+
+      /* delete the corresponding RRQ & REG timers */
+	pNode = NULL;
+	for(x=0; x<pGkClient->timerList.count; x++) {
+		pNode =  dListFindByIndex(&pGkClient->timerList, x);
+		pTimer = (OOTimer*)pNode->data;
+		if(((ooGkClientTimerCb*)pTimer->cbData)->timerType & OO_RRQ_TIMER) {
+         		memFreePtr(&pGkClient->ctxt, pTimer->cbData);
+         		ooTimerDelete(&pGkClient->ctxt, &pGkClient->timerList, pTimer);
+         		OOTRACEDBGA1("Deleted RRQ Timer.\n");
+      		}
+		if(((ooGkClientTimerCb*)pTimer->cbData)->timerType & OO_REG_TIMER) {
+         		memFreePtr(&pGkClient->ctxt, pTimer->cbData);
+         		ooTimerDelete(&pGkClient->ctxt, &pGkClient->timerList, pTimer);
+         		OOTRACEDBGA1("Deleted REG Timer.\n");
+      		}
+ 	}
 
       iRet = ooGkClientSendRRQ(pGkClient, 0); 
       if(iRet != OO_OK)

Modified: team/irroot/distrotech-customers-trunk/addons/res_config_mysql.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/addons/res_config_mysql.c?view=diff&rev=329099&r1=329098&r2=329099
==============================================================================
--- team/irroot/distrotech-customers-trunk/addons/res_config_mysql.c (original)
+++ team/irroot/distrotech-customers-trunk/addons/res_config_mysql.c Thu Jul 21 04:51:59 2011
@@ -25,6 +25,7 @@
 /*** MODULEINFO
 	<depend>mysqlclient</depend>
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"

Modified: team/irroot/distrotech-customers-trunk/agi/eagi-test.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/agi/eagi-test.c?view=diff&rev=329099&r1=329098&r2=329099
==============================================================================
--- team/irroot/distrotech-customers-trunk/agi/eagi-test.c (original)
+++ team/irroot/distrotech-customers-trunk/agi/eagi-test.c Thu Jul 21 04:51:59 2011
@@ -4,6 +4,10 @@
  * This code is released into the public domain
  * with no warranty of any kind
  */
+
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
 
 #include "asterisk.h"
 

Modified: team/irroot/distrotech-customers-trunk/apps/app_adsiprog.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/apps/app_adsiprog.c?view=diff&rev=329099&r1=329098&r2=329099
==============================================================================
--- team/irroot/distrotech-customers-trunk/apps/app_adsiprog.c (original)
+++ team/irroot/distrotech-customers-trunk/apps/app_adsiprog.c Thu Jul 21 04:51:59 2011
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<depend>res_adsi</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"

Modified: team/irroot/distrotech-customers-trunk/apps/app_alarmreceiver.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/apps/app_alarmreceiver.c?view=diff&rev=329099&r1=329098&r2=329099
==============================================================================
--- team/irroot/distrotech-customers-trunk/apps/app_alarmreceiver.c (original)
+++ team/irroot/distrotech-customers-trunk/apps/app_alarmreceiver.c Thu Jul 21 04:51:59 2011
@@ -28,6 +28,10 @@
  *
  * \ingroup applications
  */
+
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
 
 #include "asterisk.h"
 

Modified: team/irroot/distrotech-customers-trunk/apps/app_amd.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/apps/app_amd.c?view=diff&rev=329099&r1=329098&r2=329099
==============================================================================

[... 6870 lines stripped ...]

More information about the asterisk-commits mailing list