add patch to Asterisk for 1.2.12 bug

add patching instructions for Asterisk release 1.2.12 to docs git-svn-id: svn://192.168.202.10@269 3d104415-ff17-0410-8863-d5cf3c621b8a
2006-09-11 17:02:28 +00:00
parent 1ab5c42e7e
commit d5b879621f
3 changed files with 30 additions and 1 deletions
@@ -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
@@ -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
@@ -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;