[asterisk-commits] tilghman: branch tilghman/tomcrypt r88672 - in /team/tilghman/tomcrypt: ./ ag...

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Nov  5 12:49:24 2007
New Revision: 88672

URL: http://svn.digium.com/view/asterisk?view=rev&rev=88672
Log:
Merged revisions 87462,87466-87467,87498,87535,87568,87572-87573,87608,87626,87651,87687,87724,87740,87776,87811,87815,87817,87833,87850-87851,87854,87888-87889,87907,87909,87953,87971,88007-88008,88010,88027,88062,88077,88079,88117,88164-88166,88182-88184,88197,88209,88211-88212,88250,88267,88284,88287,88327,88329,88367-88368,88370-88371,88376,88408-88409,88422,88437,88454,88490,88510,88525,88540,88553,88584,88586-88587,88615,88651-88653 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r87462 | kpfleming | 2007-10-29 17:05:17 -0500 (Mon, 29 Oct 2007) | 10 lines

Merged revisions 87460 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r87460 | kpfleming | 2007-10-29 17:04:29 -0500 (Mon, 29 Oct 2007) | 2 lines

don't put '-pipe' into ASTCFLAGS if '-save-temps' is already there (used when debugging preprocessor issues) because the compiler will whine about each compile command

........

................
r87466 | kpfleming | 2007-10-29 17:21:52 -0500 (Mon, 29 Oct 2007) | 2 lines

ignore preprocessor and assembler files if they are present

................
r87467 | kpfleming | 2007-10-29 17:24:44 -0500 (Mon, 29 Oct 2007) | 2 lines

clean up assembler and preprocessor files if they are here too

................
r87498 | kpfleming | 2007-10-29 17:44:49 -0500 (Mon, 29 Oct 2007) | 2 lines

UGH... while trying to fix #10995, I found all kinds of cruft in this Makefile. It should all be gone now, and as a side effect hashtest2 now builds with --enable-dev-mode enabled without a host of errors

................
r87535 | file | 2007-10-30 10:11:09 -0500 (Tue, 30 Oct 2007) | 9 lines

Blocked revisions 87534 via svnmerge

........
r87534 | file | 2007-10-30 12:10:13 -0300 (Tue, 30 Oct 2007) | 2 lines

Return 1.4 to a state where it builds. Changing the arguments to a function and not changing where they are used is bad, mmmk?

........

................
r87568 | qwell | 2007-10-30 10:47:19 -0500 (Tue, 30 Oct 2007) | 13 lines

Merged revisions 87567 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #11113)
........
r87567 | qwell | 2007-10-30 10:45:35 -0500 (Tue, 30 Oct 2007) | 4 lines

Fix build of editline on Solaris.

Issue 11113, patch by snuffy.

........

................
r87572 | file | 2007-10-30 11:15:23 -0500 (Tue, 30 Oct 2007) | 12 lines

Merged revisions 87571 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r87571 | file | 2007-10-30 13:13:39 -0300 (Tue, 30 Oct 2007) | 4 lines

Add two more checks before printing out a warning message about bridging. If either channel has hungup of course the bridge will have failed.
(closes issue #10009)
Reported by: dimas

........

................
r87573 | mmichelson | 2007-10-30 11:36:29 -0500 (Tue, 30 Oct 2007) | 4 lines

Jumped the gun a bit in the RaiseException app. It would always return -1
since it checked for the existence of something that will never exist.


................
r87608 | mmichelson | 2007-10-30 12:07:26 -0500 (Tue, 30 Oct 2007) | 3 lines

The priority gets incremented after raising an exception, so the priority should be set to 0


................
r87626 | qwell | 2007-10-30 13:28:55 -0500 (Tue, 30 Oct 2007) | 4 lines

Update documentation to give an example of how to use the return status of RaiseException

Closes issue #11117, patch by blitzrage (yay blitzrage)

................
r87651 | qwell | 2007-10-30 15:30:35 -0500 (Tue, 30 Oct 2007) | 9 lines

Merged revisions 87650 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r87650 | qwell | 2007-10-30 15:29:41 -0500 (Tue, 30 Oct 2007) | 1 line

Only try to clean out h323/ if the h323/Makefile exists.
........

................
r87687 | russell | 2007-10-30 16:22:48 -0500 (Tue, 30 Oct 2007) | 19 lines

Merged revisions 87686 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r87686 | russell | 2007-10-30 16:19:09 -0500 (Tue, 30 Oct 2007) | 11 lines

Merge the changes from team/russell/iax2_poke_fix and iax2-poke-fix-trunk

There was a race condition related to the handling of POKEing peers.  Essentially, 
a reference to a peer is held by the scheduler when there are pending callbacks, 
but the reference count didn't reflect it.  So, it was possible for a peer to hit
a reference count of zero and have its destructor begin to be called at the same
time that the scheduler thread ran a POKE related callback.  If that happened,
a crash would likely occur.

(closes issue #11082, closes issue #11094)

........

................
r87724 | tilghman | 2007-10-30 17:15:28 -0500 (Tue, 30 Oct 2007) | 5 lines

If no '?' is found in the arguments, don't attempt to continue.
Reported by: blitzrage
Fixed by: tilghman
Closes issue #11111

................
r87740 | tilghman | 2007-10-30 18:08:59 -0500 (Tue, 30 Oct 2007) | 13 lines

Merged revisions 87739 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r87739 | tilghman | 2007-10-30 18:02:22 -0500 (Tue, 30 Oct 2007) | 5 lines

Fix for uninitialized mutexes on *BSD
Reported by: ys
Fixed by: ys
Closes issue #11116

........

................
r87776 | murf | 2007-10-30 23:20:40 -0500 (Tue, 30 Oct 2007) | 9 lines

Merged revisions 87775 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r87775 | murf | 2007-10-30 21:51:52 -0600 (Tue, 30 Oct 2007) | 1 line

Included some verbage in the check_includes func, to inform the user that included contexts that have no match in the AEL, might be OK, as AEL cannot check in the extensions.conf or the in-memory contexts, as they may not be there at the time of the check.
........

................
r87811 | tilghman | 2007-10-31 10:46:41 -0500 (Wed, 31 Oct 2007) | 2 lines

Optimize pbx_substitute_variables

................
r87815 | file | 2007-10-31 11:07:50 -0500 (Wed, 31 Oct 2007) | 2 lines

Remove old whisper remnants from channel.h

................
r87817 | tilghman | 2007-10-31 11:13:40 -0500 (Wed, 31 Oct 2007) | 3 lines

Formatting cleanups, remove obsolete contributions (modules no longer in
Asterisk), and obfuscate email addresses enough to stop most spam harvesters.

................
r87833 | file | 2007-10-31 12:25:16 -0500 (Wed, 31 Oct 2007) | 2 lines

Add volume adjustment to spy audiohook in app_chanspy.

................
r87850 | file | 2007-10-31 12:56:21 -0500 (Wed, 31 Oct 2007) | 2 lines

Restore operation of the option that only writes when the channel is bridged.

................
r87851 | file | 2007-10-31 13:03:17 -0500 (Wed, 31 Oct 2007) | 2 lines

Add volume adjustment in.

................
r87854 | tilghman | 2007-10-31 13:09:52 -0500 (Wed, 31 Oct 2007) | 10 lines

Merged revisions 87852 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r87852 | tilghman | 2007-10-31 13:03:53 -0500 (Wed, 31 Oct 2007) | 2 lines

Create samples for ALL of the available options in asterisk.conf

........

................
r87888 | murf | 2007-10-31 13:53:13 -0500 (Wed, 31 Oct 2007) | 9 lines

Merged revisions 87849 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r87849 | murf | 2007-10-31 11:49:39 -0600 (Wed, 31 Oct 2007) | 1 line

closes issue #11108 -- where the 'dialplan save' cli command saves a file where the semicolon is not escaped. Fixed this; User also wanted comments to be preserved across dialplan save, but this is impossible at this point in time, because comments are not stored in the dialplan. They are 'compiled' out of extensions.conf. The only way to preserve those comments is to use the config file reader/writer that the GUI uses to allow online user edits. extensions.conf is first and foremost, a config file, and is read in by the normal config-file reading routines. Then, it is processed into a dialplan (context/exten structs). (in the case of trunk, tho, no mods needed to be made -- works OK there -- just make sure you use ',' to sep app args!)
........

................
r87889 | qwell | 2007-10-31 14:24:29 -0500 (Wed, 31 Oct 2007) | 38 lines

More changes to change return values from load_module functions.

(issue #11096)
Patches:
      codec_adpcm.c.patch uploaded by moy (license 222)
      codec_alaw.c.patch uploaded by moy (license 222)
      codec_a_mu.c.patch uploaded by moy (license 222)
      codec_g722.c.patch uploaded by moy (license 222)
      codec_g726.c.diff uploaded by moy (license 222)
      codec_gsm.c.patch uploaded by moy (license 222)
      codec_ilbc.c.patch uploaded by moy (license 222)
      codec_lpc10.c.patch uploaded by moy (license 222)
      codec_speex.c.patch uploaded by moy (license 222)
      codec_ulaw.c.patch uploaded by moy (license 222)
      codec_zap.c.patch uploaded by moy (license 222)
      format_g723.c.patch uploaded by moy (license 222)
      format_g726.c.patch uploaded by moy (license 222)
      format_g729.c.patch uploaded by moy (license 222)
      format_gsm.c.patch uploaded by moy (license 222)
      format_h263.c.patch uploaded by moy (license 222)
      format_h264.c.patch uploaded by moy (license 222)
      format_ilbc.c.patch uploaded by moy (license 222)
      format_jpeg.c.patch uploaded by moy (license 222)
      format_ogg_vorbis.c.patch uploaded by moy (license 222)
      format_pcm.c.patch uploaded by moy (license 222)
      format_sln.c.patch uploaded by moy (license 222)
      format_vox.c.patch uploaded by moy (license 222)
      format_wav.c.patch uploaded by moy (license 222)
      format_wav_gsm.c.patch uploaded by moy (license 222)
      res_adsi.c.patch uploaded by eliel (license 64)
      res_ael_share.c.patch uploaded by eliel (license 64)
      res_clioriginate.c.patch uploaded by eliel (license 64)
      res_convert.c.patch uploaded by eliel (license 64)
      res_indications.c.patch uploaded by eliel (license 64)
      res_musiconhold.c.patch uploaded by eliel (license 64)
      res_smdi.c.patch uploaded by eliel (license 64)
      res_speech.c.patch uploaded by eliel (license 64)

................
r87907 | qwell | 2007-10-31 16:18:52 -0500 (Wed, 31 Oct 2007) | 15 lines

Merged revisions 87906 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #11130)
(closes issue #11132)

........
r87906 | qwell | 2007-10-31 16:16:20 -0500 (Wed, 31 Oct 2007) | 4 lines

Don't try to allocate memory that we're just going to re-allocate later anyways.

Issues 11130 and 11132, patch by eliel.

........

................
r87909 | qwell | 2007-10-31 16:23:42 -0500 (Wed, 31 Oct 2007) | 13 lines

Merged revisions 87908 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #11131)
........
r87908 | qwell | 2007-10-31 16:23:11 -0500 (Wed, 31 Oct 2007) | 4 lines

Make sure we free some allocated memory before returning.

Issue 11131, patch by eliel.

........

................
r87953 | file | 2007-10-31 19:04:43 -0500 (Wed, 31 Oct 2007) | 6 lines

Drop any more references to type in the Exception dialplan function.
(closes issue #11134)
Reported by: blitzrage
Patches:
      exception_patch.txt uploaded by blitzrage (license 10)

................
r87971 | file | 2007-10-31 20:55:38 -0500 (Wed, 31 Oct 2007) | 12 lines

Merged revisions 87970 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r87970 | file | 2007-10-31 22:53:55 -0300 (Wed, 31 Oct 2007) | 4 lines

If a Zap channel contains a spy or a spy is added take it out of the conference in kernel space and make it go through Asterisk so the spy gets audio from both sides.
(closes issue #10060)
Reported by: mparker

........

................
r88007 | tilghman | 2007-11-01 00:44:40 -0500 (Thu, 01 Nov 2007) | 5 lines

Fix memory leak
Reported by: eliel
Fixed by: tilghman
Closes issue #11136

................
r88008 | tilghman | 2007-11-01 01:07:18 -0500 (Thu, 01 Nov 2007) | 5 lines

Janitor:  use ast_free to pair calls of ast_malloc and ast_calloc
Reported by: eliel
Patch by: eliel
Closes issue #11135

................
r88010 | tilghman | 2007-11-01 01:12:08 -0500 (Thu, 01 Nov 2007) | 5 lines

Conditionally free lock_info->thread_name to avoid a useless warning
Reported by: snuffy
Patch by: snuffy
Closes issue #11125

................
r88027 | file | 2007-11-01 08:30:28 -0500 (Thu, 01 Nov 2007) | 10 lines

Merged revisions 88026 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r88026 | file | 2007-11-01 10:27:37 -0300 (Thu, 01 Nov 2007) | 2 lines

Fix up commit for my Zap channel with spies in Meetme fix. (thanks Tony Mountifield!)

........

................
r88062 | russell | 2007-11-01 10:18:06 -0500 (Thu, 01 Nov 2007) | 7 lines

Remove another copied source file on "make clean".

(closes issue #11137)
Reported by: IgorG
Patches: 
      addonclean-87971-1.patch uploaded by IgorG (license 20)

................
r88077 | russell | 2007-11-01 10:56:25 -0500 (Thu, 01 Nov 2007) | 8 lines

Change some uses of free() to ast_free().  (No functional differences.)

(closes issue #11138)
Reported by: eliel
Patches: 
      pbx_dundi.c.patch uploaded by eliel (license 64)
	  chan_sip.c.patch uploaded by eliel (license 64)

................
r88079 | qwell | 2007-11-01 11:22:09 -0500 (Thu, 01 Nov 2007) | 12 lines

Merged revisions 88078 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r88078 | qwell | 2007-11-01 11:21:22 -0500 (Thu, 01 Nov 2007) | 4 lines

Make sure we set the poll fds to NULL after free()ing it.

Part of issue 11017, patch by tzafrir.

........

................
r88117 | tilghman | 2007-11-01 12:25:58 -0500 (Thu, 01 Nov 2007) | 10 lines

Merged revisions 88116 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r88116 | tilghman | 2007-11-01 12:17:56 -0500 (Thu, 01 Nov 2007) | 2 lines

Add some notes on using valgrind

........

................
r88164 | qwell | 2007-11-01 17:10:33 -0500 (Thu, 01 Nov 2007) | 4 lines

Switch res_jabber to use openssl rather than gnutls.

Closes issue #9972, patch by phsultan.  Copied from branch at http://svn.digium.com/svn/asterisk/team/phsultan/res_jabber-openssl/

................
r88165 | qwell | 2007-11-01 17:19:56 -0500 (Thu, 01 Nov 2007) | 1 line

Crap, accidentally copied the props.  Thanks for pointing this out mvanbaak.  The odds are quite high that this will break automerge on every team branch.
................
r88166 | murf | 2007-11-01 17:26:51 -0500 (Thu, 01 Nov 2007) | 1 line

This commits the performance mods that give the priority processing engine in the pbx, a 25-30% speed boost. The two updates used, are, first, to merge the ast_exists_extension() and the ast_spawn_extension() where they are called sequentially in a loop in the code, into a slightly upgraded version of ast_spawn_extension(), with a few extra args; and, second, I modified the substitute_variables_helper_full, so it zeroes out the byte after the evaluated string instead of demanding you pre-zero the buffer; I also went thru the code and removed the code that zeroed this buffer before every call to the substitute_variables_helper_full. The first fix provides about a 9% speedup, and the second the rest. These figures come from the 'PIPS' benchmark I describe in blogs, conf. reports, etc.
................
r88182 | tilghman | 2007-11-01 17:43:46 -0500 (Thu, 01 Nov 2007) | 3 lines

Convert cdr_odbc to use res_odbc managed connections
Closes issue #10614

................
r88183 | tilghman | 2007-11-01 18:26:35 -0500 (Thu, 01 Nov 2007) | 3 lines

Modify WaitExten to include an optional dialtone
Closes issue #10783

................
r88184 | qwell | 2007-11-01 18:26:51 -0500 (Thu, 01 Nov 2007) | 1 line

Remove traces of gnutls, since we no longer use/need it.
................
r88197 | file | 2007-11-01 22:09:02 -0500 (Thu, 01 Nov 2007) | 2 lines

Restore building under 64-bit platforms.

................
r88209 | tilghman | 2007-11-02 07:54:31 -0500 (Fri, 02 Nov 2007) | 5 lines

'h' extension doesn't execute past first priority
Reported by: dimas
Patch by: dimas
Closes bug #11146

................
r88211 | tilghman | 2007-11-02 08:10:29 -0500 (Fri, 02 Nov 2007) | 13 lines

Merged revisions 88210 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r88210 | tilghman | 2007-11-02 08:03:03 -0500 (Fri, 02 Nov 2007) | 5 lines

Fix build on Solaris
Reported by: snuffy
Patch by: ys
Closes issue #11143

........

................
r88212 | tilghman | 2007-11-02 08:17:48 -0500 (Fri, 02 Nov 2007) | 5 lines

Don't re-cache the filename, but check to see if it already exists
Reported by: jamesgolovich
Patch by: jamesgolovich
Closes issue #11144

................
r88250 | tilghman | 2007-11-02 10:36:34 -0500 (Fri, 02 Nov 2007) | 5 lines

Add pbx_lua as a method of doing extensions
Reported by: mnicholson
Patch by: mnicholson
Closes issue #11140

................
r88267 | tilghman | 2007-11-02 11:26:31 -0500 (Fri, 02 Nov 2007) | 2 lines

Add a few bytes on LUA

................
r88284 | qwell | 2007-11-02 11:54:11 -0500 (Fri, 02 Nov 2007) | 13 lines

Merged revisions 88283 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #11147)
........
r88283 | qwell | 2007-11-02 11:51:08 -0500 (Fri, 02 Nov 2007) | 4 lines

We need to make sure to specify a language to ast_fileexists, otherwise it may fail for anything besides en

Issue 11147, fix discovered by both citats and myself (independently), with input from Corydon76

........

................
r88287 | tilghman | 2007-11-02 12:34:33 -0500 (Fri, 02 Nov 2007) | 2 lines

Oops, some dev-mode changes for ISO C90

................
r88327 | russell | 2007-11-02 15:13:18 -0500 (Fri, 02 Nov 2007) | 3 lines

Fix replacing the version number when it has a '/' in it, like
  SVN-group-chan_unistim-r88326M-/trunk

................
r88329 | file | 2007-11-02 15:22:40 -0500 (Fri, 02 Nov 2007) | 14 lines

Merged revisions 88328 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r88328 | file | 2007-11-02 17:20:21 -0300 (Fri, 02 Nov 2007) | 6 lines

If an INFO request within a dialog is received with a content length of 0 simply send back a 200 OK. It is valid to do this and the remote side is probably using it to make sure the signalling is still alive.
(closes issue #5747)
Reported by: chandi
Patches:
      infofix-81430-1.patch uploaded by IgorG (license 20)

........

................
r88367 | file | 2007-11-02 15:51:53 -0500 (Fri, 02 Nov 2007) | 12 lines

Merged revisions 88366 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r88366 | file | 2007-11-02 17:49:45 -0300 (Fri, 02 Nov 2007) | 4 lines

Make subscribecontext behave as advertised. It will now look for the presence of a hint in the given context (be it subscribecontext or context).
(closes issue #10702)
Reported by: slavon

........

................
r88368 | russell | 2007-11-02 15:56:12 -0500 (Fri, 02 Nov 2007) | 13 lines

Merge the code from asterisk/team/group/chan_unistim:

This introduces a new channel driver, chan_unistim, that supports the Unistim
VoIP protocol for Nortel phones.  The following models have been confirmed 
to work: i2002, i2004 and i2050.

(closes issue #8864)
Reported by: c_hans
Patches: 
      chan_unistim.patch uploaded by c (license 304)
      ustm_no_conf.diff uploaded by junky (license 177)
Tested by: c_hans, dbowerman, math, junky, loloski

................
r88370 | russell | 2007-11-02 16:25:55 -0500 (Fri, 02 Nov 2007) | 3 lines

Show the channel unique ID in the "show channel concise" output
(closes issue #11148, requested by falves11, patched by me)

................
r88371 | russell | 2007-11-02 16:36:37 -0500 (Fri, 02 Nov 2007) | 2 lines

Don't kill asterisk if extensions.lua is not present.

................
r88376 | russell | 2007-11-02 16:39:36 -0500 (Fri, 02 Nov 2007) | 2 lines

propagate the DECLINE return value back to the loader

................
r88408 | russell | 2007-11-02 17:08:15 -0500 (Fri, 02 Nov 2007) | 2 lines

Convert the CLI commands to the new format

................
r88409 | russell | 2007-11-02 17:36:30 -0500 (Fri, 02 Nov 2007) | 1 line

fix some issues with crashing on unload, when it didn't completely load cleanly
................
r88422 | jamesgolovich | 2007-11-02 23:55:06 -0500 (Fri, 02 Nov 2007) | 4 lines

Set CLI command to the correct name.  Rev 85460 introduced two 'database show' commands when this one 
should have been 'database showkey'


................
r88437 | tilghman | 2007-11-03 09:19:47 -0500 (Sat, 03 Nov 2007) | 2 lines

Revert commit #86119.  Some users intentionally do not want colorized terminals, so this was a misfeature.

................
r88454 | rizzo | 2007-11-04 13:44:31 -0600 (Sun, 04 Nov 2007) | 7 lines

Simplify the implementation and the API for stringfields;
details and examples are in include/asterisk/stringfields.h.

Not applicable to older branches except for 1.4 which will
receive a fix for the routines that free memory pools.


................
r88490 | rizzo | 2007-11-04 16:42:54 -0600 (Sun, 04 Nov 2007) | 1 line

block merging of not-applicable patch
................
r88510 | file | 2007-11-05 07:11:37 -0600 (Mon, 05 Nov 2007) | 6 lines

Fix memory leaks and deadlocks in chan_unistim.
(closes issue #11158)
Reported by: eliel
Patches:
      chan_unistim.c.patch uploaded by eliel (license 64)

................
r88525 | rizzo | 2007-11-05 09:15:22 -0600 (Mon, 05 Nov 2007) | 3 lines

remove a cygwin-specific function remap that does not work.


................
r88540 | tilghman | 2007-11-05 10:30:51 -0600 (Mon, 05 Nov 2007) | 12 lines

Merged revisions 88539 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r88539 | tilghman | 2007-11-05 10:20:13 -0600 (Mon, 05 Nov 2007) | 4 lines

Don't check used pooled connections for connection status, as it will cause issues for prepared queries.
Reported by: Nick Gorham (via -dev list)
Patch by: tilghman

........

................
r88553 | rizzo | 2007-11-05 10:41:39 -0600 (Mon, 05 Nov 2007) | 11 lines

Put extra compiler flags into a variable so they are not repeated
too many times.
On passing, add some comments and fix indentation a bit.

On passing, i suspect that the following pattern is wrong

	%.eoo: %.o

but in case it will be fixed in a later commit.


................
r88584 | kpfleming | 2007-11-05 11:00:07 -0600 (Mon, 05 Nov 2007) | 2 lines

use a variable name that actually indicates what it is for

................
r88586 | qwell | 2007-11-05 11:21:05 -0600 (Mon, 05 Nov 2007) | 13 lines

Merged revisions 88585 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #11163)
........
r88585 | qwell | 2007-11-05 11:19:41 -0600 (Mon, 05 Nov 2007) | 4 lines

Make sure we destroy the config structure on configuration failure.

Issue 11163, patch by eliel.

........

................
r88587 | rizzo | 2007-11-05 11:27:02 -0600 (Mon, 05 Nov 2007) | 4 lines

merge two rules with the same right hand;
document a bit what is done here.


................
r88615 | rizzo | 2007-11-05 11:44:10 -0600 (Mon, 05 Nov 2007) | 4 lines

print messages when entering/leaving a directory so we know where we are
(sometimes it is obvious, sometimes it is not).


................
r88651 | russell | 2007-11-05 11:52:08 -0600 (Mon, 05 Nov 2007) | 13 lines

Merged revisions 88624 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r88624 | russell | 2007-11-05 11:46:02 -0600 (Mon, 05 Nov 2007) | 5 lines

Fix up datastore handling in ast_do_masquerade().  The code is intended to move
any channel datastores from the old channel to the new one.  However, it did
not use the linked list macros properly to accomplish the task.  The existing
code would only work if there was only a single datastore on the old channel.

........

................
r88652 | rizzo | 2007-11-05 12:00:24 -0600 (Mon, 05 Nov 2007) | 3 lines

simplify (hopefully) the printing of $(MAKE) in aligned output.


................
r88653 | tilghman | 2007-11-05 12:22:20 -0600 (Mon, 05 Nov 2007) | 2 lines

Change wording to that suggested by MasterYoda

................

Added:
    team/tilghman/tomcrypt/channels/chan_unistim.c
      - copied unchanged from r88653, trunk/channels/chan_unistim.c
    team/tilghman/tomcrypt/configs/extensions.lua.sample
      - copied unchanged from r88653, trunk/configs/extensions.lua.sample
    team/tilghman/tomcrypt/configs/unistim.conf.sample
      - copied unchanged from r88653, trunk/configs/unistim.conf.sample
    team/tilghman/tomcrypt/doc/unistim.txt
      - copied unchanged from r88653, trunk/doc/unistim.txt
    team/tilghman/tomcrypt/doc/valgrind.txt
      - copied unchanged from r88653, trunk/doc/valgrind.txt
    team/tilghman/tomcrypt/pbx/pbx_lua.c
      - copied unchanged from r88653, trunk/pbx/pbx_lua.c
    team/tilghman/tomcrypt/utils/build-extensions-conf.lua
      - copied unchanged from r88653, trunk/utils/build-extensions-conf.lua
Modified:
    team/tilghman/tomcrypt/   (props changed)
    team/tilghman/tomcrypt/CHANGES
    team/tilghman/tomcrypt/CREDITS
    team/tilghman/tomcrypt/Makefile
    team/tilghman/tomcrypt/Makefile.moddir_rules
    team/tilghman/tomcrypt/Makefile.rules
    team/tilghman/tomcrypt/UPGRADE.txt
    team/tilghman/tomcrypt/agi/   (props changed)
    team/tilghman/tomcrypt/agi/Makefile
    team/tilghman/tomcrypt/apps/   (props changed)
    team/tilghman/tomcrypt/apps/app_chanspy.c
    team/tilghman/tomcrypt/apps/app_dial.c
    team/tilghman/tomcrypt/apps/app_exec.c
    team/tilghman/tomcrypt/apps/app_macro.c
    team/tilghman/tomcrypt/apps/app_meetme.c
    team/tilghman/tomcrypt/apps/app_minivm.c
    team/tilghman/tomcrypt/apps/app_mixmonitor.c
    team/tilghman/tomcrypt/apps/app_playback.c
    team/tilghman/tomcrypt/apps/app_queue.c
    team/tilghman/tomcrypt/apps/app_rpt.c
    team/tilghman/tomcrypt/build_tools/menuselect-deps.in
    team/tilghman/tomcrypt/cdr/   (props changed)
    team/tilghman/tomcrypt/cdr/cdr_adaptive_odbc.c
    team/tilghman/tomcrypt/cdr/cdr_custom.c
    team/tilghman/tomcrypt/cdr/cdr_manager.c
    team/tilghman/tomcrypt/cdr/cdr_odbc.c
    team/tilghman/tomcrypt/cdr/cdr_sqlite3_custom.c
    team/tilghman/tomcrypt/channels/   (props changed)
    team/tilghman/tomcrypt/channels/Makefile
    team/tilghman/tomcrypt/channels/chan_gtalk.c
    team/tilghman/tomcrypt/channels/chan_iax2.c
    team/tilghman/tomcrypt/channels/chan_jingle.c
    team/tilghman/tomcrypt/channels/chan_sip.c
    team/tilghman/tomcrypt/channels/chan_zap.c
    team/tilghman/tomcrypt/codecs/   (props changed)
    team/tilghman/tomcrypt/codecs/codec_a_mu.c
    team/tilghman/tomcrypt/codecs/codec_adpcm.c
    team/tilghman/tomcrypt/codecs/codec_alaw.c
    team/tilghman/tomcrypt/codecs/codec_g722.c
    team/tilghman/tomcrypt/codecs/codec_g726.c
    team/tilghman/tomcrypt/codecs/codec_gsm.c
    team/tilghman/tomcrypt/codecs/codec_ilbc.c
    team/tilghman/tomcrypt/codecs/codec_lpc10.c
    team/tilghman/tomcrypt/codecs/codec_speex.c
    team/tilghman/tomcrypt/codecs/codec_ulaw.c
    team/tilghman/tomcrypt/codecs/codec_zap.c
    team/tilghman/tomcrypt/codecs/g722/   (props changed)
    team/tilghman/tomcrypt/codecs/g722/Makefile
    team/tilghman/tomcrypt/codecs/gsm/   (props changed)
    team/tilghman/tomcrypt/codecs/ilbc/   (props changed)
    team/tilghman/tomcrypt/codecs/ilbc/Makefile
    team/tilghman/tomcrypt/codecs/lpc10/   (props changed)
    team/tilghman/tomcrypt/codecs/lpc10/Makefile
    team/tilghman/tomcrypt/configure
    team/tilghman/tomcrypt/configure.ac
    team/tilghman/tomcrypt/doc/tex/Makefile
    team/tilghman/tomcrypt/formats/   (props changed)
    team/tilghman/tomcrypt/formats/format_g723.c
    team/tilghman/tomcrypt/formats/format_g726.c
    team/tilghman/tomcrypt/formats/format_g729.c
    team/tilghman/tomcrypt/formats/format_gsm.c
    team/tilghman/tomcrypt/formats/format_h263.c
    team/tilghman/tomcrypt/formats/format_h264.c
    team/tilghman/tomcrypt/formats/format_ilbc.c
    team/tilghman/tomcrypt/formats/format_jpeg.c
    team/tilghman/tomcrypt/formats/format_ogg_vorbis.c
    team/tilghman/tomcrypt/formats/format_pcm.c
    team/tilghman/tomcrypt/formats/format_sln.c
    team/tilghman/tomcrypt/formats/format_vox.c
    team/tilghman/tomcrypt/formats/format_wav.c
    team/tilghman/tomcrypt/formats/format_wav_gsm.c
    team/tilghman/tomcrypt/funcs/   (props changed)
    team/tilghman/tomcrypt/funcs/func_cut.c
    team/tilghman/tomcrypt/funcs/func_logic.c
    team/tilghman/tomcrypt/funcs/func_odbc.c
    team/tilghman/tomcrypt/funcs/func_strings.c
    team/tilghman/tomcrypt/include/asterisk/autoconfig.h.in
    team/tilghman/tomcrypt/include/asterisk/channel.h
    team/tilghman/tomcrypt/include/asterisk/jabber.h
    team/tilghman/tomcrypt/include/asterisk/lock.h
    team/tilghman/tomcrypt/include/asterisk/pbx.h
    team/tilghman/tomcrypt/include/asterisk/stringfields.h
    team/tilghman/tomcrypt/main/   (props changed)
    team/tilghman/tomcrypt/main/channel.c
    team/tilghman/tomcrypt/main/cli.c
    team/tilghman/tomcrypt/main/config.c
    team/tilghman/tomcrypt/main/db.c
    team/tilghman/tomcrypt/main/db1-ast/   (props changed)
    team/tilghman/tomcrypt/main/db1-ast/Makefile
    team/tilghman/tomcrypt/main/editline/   (props changed)
    team/tilghman/tomcrypt/main/editline/Makefile.in
    team/tilghman/tomcrypt/main/editline/np/vis.c
    team/tilghman/tomcrypt/main/logger.c
    team/tilghman/tomcrypt/main/minimime/   (props changed)
    team/tilghman/tomcrypt/main/pbx.c
    team/tilghman/tomcrypt/main/say.c
    team/tilghman/tomcrypt/main/term.c
    team/tilghman/tomcrypt/main/utils.c
    team/tilghman/tomcrypt/makeopts.in
    team/tilghman/tomcrypt/pbx/   (props changed)
    team/tilghman/tomcrypt/pbx/pbx_config.c
    team/tilghman/tomcrypt/pbx/pbx_dundi.c
    team/tilghman/tomcrypt/pbx/pbx_loopback.c
    team/tilghman/tomcrypt/pbx/pbx_realtime.c
    team/tilghman/tomcrypt/res/   (props changed)
    team/tilghman/tomcrypt/res/ael/pval.c
    team/tilghman/tomcrypt/res/res_adsi.c
    team/tilghman/tomcrypt/res/res_ael_share.c
    team/tilghman/tomcrypt/res/res_agi.c
    team/tilghman/tomcrypt/res/res_clioriginate.c
    team/tilghman/tomcrypt/res/res_convert.c
    team/tilghman/tomcrypt/res/res_features.c
    team/tilghman/tomcrypt/res/res_indications.c
    team/tilghman/tomcrypt/res/res_jabber.c
    team/tilghman/tomcrypt/res/res_musiconhold.c
    team/tilghman/tomcrypt/res/res_odbc.c
    team/tilghman/tomcrypt/res/res_smdi.c
    team/tilghman/tomcrypt/res/res_speech.c
    team/tilghman/tomcrypt/utils/   (props changed)
    team/tilghman/tomcrypt/utils/Makefile
    team/tilghman/tomcrypt/utils/extconf.c
    team/tilghman/tomcrypt/utils/hashtest2.c

Propchange: team/tilghman/tomcrypt/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/tilghman/tomcrypt/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/tilghman/tomcrypt/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/tilghman/tomcrypt/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Nov  5 12:49:24 2007
@@ -1,1 +1,1 @@
-/trunk:1-87456
+/trunk:1-88653

Modified: team/tilghman/tomcrypt/CHANGES
URL: http://svn.digium.com/view/asterisk/team/tilghman/tomcrypt/CHANGES?view=diff&rev=88672&r1=88671&r2=88672
==============================================================================
--- team/tilghman/tomcrypt/CHANGES (original)
+++ team/tilghman/tomcrypt/CHANGES Mon Nov  5 12:49:24 2007
@@ -303,3 +303,8 @@
      channel in conjunction with the existing 'n' option for local channels.
   * Added support for reading the TOUCH_MONITOR_PREFIX channel variable.
      It allows you to configure a prefix for auto-monitor recordings.
+  * Added support for writing and running your dialplan in lua.  See
+     configs/extensions.lua.sample for examples of how to do this.
+ * Added a new channel driver, chan_unistim.  See doc/unistim.txt and
+    configs/unistim.conf.sample for details.  This new channel driver allows
+	you to use Nortel i2002, i2004, and i2050 phones with Asterisk.

Modified: team/tilghman/tomcrypt/CREDITS
URL: http://svn.digium.com/view/asterisk/team/tilghman/tomcrypt/CREDITS?view=diff&rev=88672&r1=88671&r2=88672
==============================================================================
--- team/tilghman/tomcrypt/CREDITS (original)
+++ team/tilghman/tomcrypt/CREDITS Mon Nov  5 12:49:24 2007
@@ -37,40 +37,37 @@
 Jim Dixon - Zapata Telephony and app_rpt
 	http://www.zapatatelephony.org/app_rpt.html
 
-Russell Bryant - Asterisk 1.0 maintainer and misc. enhancements
-	russelb at clemson.edu
-
-Anthony Minessale II - Countless big and small fixes, and relentless forward push
-	ChanSpy, ForkCDR, ControlPlayback, While/EndWhile, DumpChan, Dictate,
-	MacroIf, ExecIf, ExecIfTime, RetryDial, MixMonitor applications; many realtime
-	concepts and implementation pieces, including res_config_odbc; format_slin;
-	cdr_custom; several features in Dial including L(), G() and enhancements to
-	M() and D(); several CDR enhancements including CDR variables; attended
-	transfer; one touch record; native MOH; manager eventmask; command line '-t'
-	flag to allow recording/voicemail on nfs shares; #exec command and multiline
-	comments in config files; setvar in iax and sip configs.
-	anthmct at yahoo.com              http://www.asterlink.com
+Russell Bryant - Asterisk release manager and countless enhancements and bug
+	fixes.
+	russell(AT)digium.com
+
+Anthony Minessale II - Countless big and small fixes, and relentless forward
+	push. ChanSpy, ForkCDR, ControlPlayback, While/EndWhile, DumpChan, Dictate,
+	MacroIf, ExecIf, ExecIfTime, RetryDial, MixMonitor applications; many
+	realtime concepts and implementation pieces, including res_config_odbc;
+	format_slin; cdr_custom; several features in Dial including L(), G() and
+	enhancements to M() and D(); several CDR enhancements including CDR
+	variables; attended transfer; one touch record; native MOH; manager
+	eventmask; command line '-t' flag to allow recording/voicemail on nfs
+	shares; #exec command and multiline comments in config files; setvar in iax
+	and sip configs.
+	anthmct(AT)yahoo.com              http://www.asterlink.com
 
 James Golovich - Innumerable contributions
 	You can find him and asterisk-perl at http://asterisk.gnuinter.net
 
 Andre Bierwirth - Extension hints and status
 
-Oliver Daudey - ISDN4Linux fixes
-
-Pauline Middelink - ISDN4Linux patches and some general patches.
-	She can be found at http://www.polyware.nl/~middelink/En/
-
 Jean-Denis Girard - Various contributions from the South Pacific Islands
-	jd-girard at esoft.pf             http://www.esoft.pf
+	jd-girard(AT)esoft.pf             http://www.esoft.pf
 
 William Jordan / Vonage - MySQL enhancements to Voicemail
-	wjordan at vonage.com
+	wjordan(AT)vonage.com
 
 Jac Kersing - Various fixes
 
 Steven Critchfield - Seek and Trunc functions for playback and recording
-	critch at basesys.com
+	critch(AT)basesys.com
 
 Jefferson Noxon - app_lookupcidname, app_db, and various other contributions
 
@@ -79,63 +76,65 @@
 Ross Finlayson - Dynamic RTP payload support
 
 Mahmut Fettahlioglu - Audio recording, music-on-hold changes, alaw file
-	format, and various fixes. Can be contacted at mahmut at oa.com.au
+	format, and various fixes. Can be contacted at mahmut(AT)oa.com.au
 
 James Dennis - Cisco SIP compatibility patches to work with SIP service
-	providers. Can be contacted at asterisk at jdennis.net
+	providers. Can be contacted at asterisk(AT)jdennis.net
 
 Tilghman Lesher - ast_localtime(); ast_say_date_with_format(); 
-	GotoIfTime, Random, SayUnixTime, HasNewVoicemail applications;
-	CUT, SORT, EVAL, CURL, FIELDQTY, STRFTIME, QUEUEAGENT* functions;
-	and other innumerable bug fixes. http://asterisk.drunkcoder.com/
+	GotoIfTime, SayUnixTime, HasNewVoicemail applications;
+	CUT, SORT, EVAL, CURL, FIELDQTY, STRFTIME, some QUEUE* functions;
+	func_odbc, cdr_adaptive_odbc, and other innumerable bug fixes.
+	tilghman(AT)digium.com            http://asterisk.drunkcoder.com/
 
 Jayson Vantuyl - Manager protocol changes, various other bugs.
-	jvantuyl at computingedge.net
+	jvantuyl(AT)computingedge.net
 
 Thorsten Lockert - OpenBSD, FreeBSD ports, making MacOS X port run on 10.3,
 	dialplan include verification, route lookup on OpenBSD, SNMP agent
-	support (res_snmp), various other bugs. tholo at sigmasoft.com
-
-Brian West - ODBC support and Bug Marshaling  
-
-Josh Roberson - chan_zap reload support, Advanced Voicemail Features, other misc. patches,
-	and Bug Marshalling. - josh at asteriasgi.com, http://www.asteriasgi.com
-
-William Waites - syslog support, SIP NAT traversal for SIP-UA. ww at styx.org
+	support (res_snmp), various other bugs. tholo(AT)sigmasoft.com
+
+Josh Roberson - chan_zap reload support, Advanced Voicemail Features, & other
+	misc. patches. - josh(AT)asteriasgi.com, http://www.asteriasgi.com
+
+William Waites - syslog support, SIP NAT traversal for SIP-UA. ww(AT)styx.org
 
 Rich Murphey - Porting to FreeBSD, NetBSD, OpenBSD, and Darwin.
-	rich at whiteoaklabs.com  http://whiteoaklabs.com
+	rich(AT)whiteoaklabs.com  http://whiteoaklabs.com
 
 Simon Lockhart - Porting to Solaris (based on work of Logan ???)	
-	simon at slimey.org
-
-Olle E. Johansson - SIP RFC compliance, documentation and testing, testing, testing,
-	- MiniVM - the small voicemail system, many documentation updates/corrections
-	and many bug fixes.
-	oej at edvina.net, http://edvina.net
+	simon(AT)slimey.org
+
+Olle E. Johansson - SIP RFC compliance, documentation and testing, testing,
+	testing; MiniVM - the small voicemail system, many documentation
+	updates/corrections, and many bug fixes.
+	oej(AT)edvina.net, http://edvina.net
 
 Steve Kann - new jitter buffer for IAX2
-	stevek at stevek.com
+	stevek(AT)stevek.com
 
 Constantine Filin - major contributions to the Asterisk Realtime Architecture
 
-Steve Murphy - privacy support, $[ ] parser upgrade, AEL2 parser upgrade
+Steve Murphy - privacy support, $[ ] parser upgrade, AEL2 parser upgrade.
+	murf(AT)digium.com
 
 Claude Patry - bug fixes, feature enhancements, and bug marshalling
-	cpatry at gmail.com
-
-Miroslav Nachev, miro at space-comm.com COSMOS Software Enterprises, Ltd.
+	cpatry(AT)gmail.com
+
+Miroslav Nachev, miro(AT)space-comm.com COSMOS Software Enterprises, Ltd.
 	- for Variable for No Answer Timeout for Attended Transfer
 
 Slav Klenov & Vanheuverzwijn Joachim - development of the generic jitterbuffer
-	Securax Ltd. info at securax.be
+	Securax Ltd. info(AT)securax.be
 
 Roy Sigurd Karlsbakk - providing funding for generic jitterbuffer development
-	roy at karlsbakk.net, Briiz Telecom AS
-
-Voop AS, Nuvio Inc, Inotel S.A and Foniris Telecom A/S - funding for rewrite of SIP transfers
-
-Philippe Sultan - RADIUS CDR module, many fixes to res_jabber and gtalk/jingle channel drivers
+	roy(AT)karlsbakk.net, Briiz Telecom AS
+
+Voop AS, Nuvio Inc, Inotel S.A and Foniris Telecom A/S - funding for rewrite
+	of SIP transfers
+
+Philippe Sultan - RADIUS CDR module, many fixes to res_jabber and gtalk/jingle
+	channel drivers.
 	INRIA, http://www.inria.fr/
 
 John Martin, Aupix - Improved video support in the SIP channel
@@ -143,19 +142,30 @@
 
 Steve Underwood - Provided T.38 pass through support.
 
-George Konstantoulakis - Support for Greek in voicemail added by InAccess Networks (work funded by HOL, www.hol.gr) gkon at inaccessnetworks.com
-

[... 7881 lines stripped ...]