diff --git a/agc_2-X/trunk/docs/BASE_INSTALL.txt b/agc_2-X/trunk/docs/BASE_INSTALL.txt index 8ab4753d..8ad228da 100644 --- a/agc_2-X/trunk/docs/BASE_INSTALL.txt +++ b/agc_2-X/trunk/docs/BASE_INSTALL.txt @@ -61,10 +61,14 @@ cd ../asterisk-1.2.10 mv amd2.conf /etc/asterisk/amd.conf cd ../ - 1.2 tree) apply the cli delimiter patch + (1.2 tree) apply the cli delimiter patch wget http://www.eflo.net/files/cli_chan_concise_delimiter.patch patch -p1 < ./cli_chan_concise_delimiter.patch - File to patch: cli.c + (1.2.12) - channel.c bug fix - **THERE IS NO FIX FOR ASTERISK 1.2.11** + wget http://www.eflo.net/files/channel.c-42600.patch + patch -p1 < ./channel.c-42600.patch + - File to patch: channel.c make clean make make install diff --git a/agc_2-X/trunk/docs/SCRATCH_INSTALL.txt b/agc_2-X/trunk/docs/SCRATCH_INSTALL.txt index dd7763b4..b6bd092c 100644 --- a/agc_2-X/trunk/docs/SCRATCH_INSTALL.txt +++ b/agc_2-X/trunk/docs/SCRATCH_INSTALL.txt @@ -784,6 +784,11 @@ with the following patch: - wget http://www.eflo.net/files/cli_chan_concise_delimiter.patch - patch -p1 < ./cli_chan_concise_delimiter.patch - File to patch: cli.c + -(1.2.12) - channel.c bug fix - **THERE IS NO FIX FOR ASTERISK 1.2.11** + - wget http://www.eflo.net/files/channel.c-42600.patch + - patch -p1 < ./channel.c-42600.patch + - File to patch: channel.c + - make clean - make - make install diff --git a/agc_2-X/trunk/extras/channel.c-42600.patch b/agc_2-X/trunk/extras/channel.c-42600.patch new file mode 100644 index 00000000..36da290f --- /dev/null +++ b/agc_2-X/trunk/extras/channel.c-42600.patch @@ -0,0 +1,20 @@ +--- ./channel.c 2006-09-11 12:38:00.000000000 -0400 ++++ ./channel.c-42600 2006-09-11 12:29:45.000000000 -0400 +@@ -45,7 +45,7 @@ + + #include "asterisk.h" + +-ASTERISK_FILE_VERSION(__FILE__, "$Revision: 42452 $") ++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 42600 $") + + #include "asterisk/pbx.h" + #include "asterisk/frame.h" +@@ -2385,7 +2385,7 @@ + /* Now we have a good choice for both. */ + ast_mutex_lock(&chan->lock); + +- if ((*rawformat == native) && (*format == fmt)) { ++ if ((*rawformat == native) && (*format == fmt) && ((*rawformat == *format) || (*trans))) { + /* the channel is already in these formats, so nothing to do */ + ast_mutex_unlock(&chan->lock); + return 0;