[Pkg-voip-commits] r9039 - /asterisk/branches/lenny/debian/patches/AST-2011-010

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Fri Jun 24 15:34:36 2011
New Revision: 9039

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9039
Log:
Refresh patch

Modified:
    asterisk/branches/lenny/debian/patches/AST-2011-010

Modified: asterisk/branches/lenny/debian/patches/AST-2011-010
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/lenny/debian/patches/AST-2011-010?rev=9039&op=diff
==============================================================================
--- asterisk/branches/lenny/debian/patches/AST-2011-010 (original)
+++ asterisk/branches/lenny/debian/patches/AST-2011-010 Fri Jun 24 15:34:36 2011
@@ -13,11 +13,9 @@
  res/res_features.c   |   15 ++++++++++++---
  2 files changed, 25 insertions(+), 4 deletions(-)
 
-diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
-index b81a511..1f82e8d 100644
 --- a/channels/chan_iax2.c
 +++ b/channels/chan_iax2.c
-@@ -4652,7 +4652,14 @@ static int iax2_setoption(struct ast_channel *c, int option, void *data, int dat
+@@ -3433,7 +3433,14 @@ static int iax2_setoption(struct ast_cha
  		/* these two cannot be sent, because they require a result */
  		errno = ENOSYS;
  		return -1;
@@ -33,7 +31,7 @@
  		if (!(h = ast_malloc(datalen + sizeof(*h))))
  			return -1;
  
-@@ -4680,7 +4687,12 @@ static int iax2_setoption(struct ast_channel *c, int option, void *data, int dat
+@@ -3445,7 +3452,12 @@ static int iax2_setoption(struct ast_cha
  					  datalen + sizeof(*h), -1);
  		free(h);
  		return res;
@@ -46,11 +44,9 @@
  }
  
  static struct ast_frame *iax2_read(struct ast_channel *c) 
-diff --git a/res/res_features.c b/res/res_features.c
-index 6585225..fa73dcd 100644
 --- a/res/res_features.c
 +++ b/res/res_features.c
-@@ -2381,10 +2381,19 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
+@@ -1590,10 +1590,19 @@ int ast_bridge_call(struct ast_channel *
  				break;
  			case AST_CONTROL_OPTION:
  				aoh = f->data;
@@ -73,6 +69,3 @@
  				}
  				break;
  			}
--- 
-1.7.5.4
-