[Pkg-voip-commits] r3661 - in asterisk-chan-capi/trunk/debian: . patches

[lmamane at alioth.debian.org]

Author: lmamane
Date: 2007-06-14 16:29:43 +0000 (Thu, 14 Jun 2007)
New Revision: 3661

Added:
   asterisk-chan-capi/trunk/debian/patches/asterisk_1.4.3.dpatch
Modified:
   asterisk-chan-capi/trunk/debian/changelog
   asterisk-chan-capi/trunk/debian/patches/00list
Log:
Compatibility with Asterisk 1.4.3, release

Modified: asterisk-chan-capi/trunk/debian/changelog
===================================================================
--- asterisk-chan-capi/trunk/debian/changelog	2007-06-14 13:47:48 UTC (rev 3660)
+++ asterisk-chan-capi/trunk/debian/changelog	2007-06-14 16:29:43 UTC (rev 3661)
@@ -1,9 +1,9 @@
-asterisk-chan-capi (1.0.1-1) UNRELEASED; urgency=low
+asterisk-chan-capi (1.0.1-1) unstable; urgency=low
 
-  * (NOT RELEASED YET) New upstream release
-    - New upstream version: 1.0.0 (Closes: #412131)
+  * New upstream release 1.0.1 (Closes: #412131)
+  * Backport patch from trunk for compatibility with Asterisk 1.4.3
 
- -- Mark Purcell <msp at debian.org>  Sat, 02 Jun 2007 11:36:38 +0100
+ -- Lionel Elie Mamane <lmamane at debian.org>  Thu, 14 Jun 2007 18:27:50 +0200
 
 asterisk-chan-capi (1.0.0-1) unstable; urgency=low
 

Modified: asterisk-chan-capi/trunk/debian/patches/00list
===================================================================
--- asterisk-chan-capi/trunk/debian/patches/00list	2007-06-14 13:47:48 UTC (rev 3660)
+++ asterisk-chan-capi/trunk/debian/patches/00list	2007-06-14 16:29:43 UTC (rev 3661)
@@ -1,3 +1,4 @@
 01_debian-patch
 02_capi-cmsg2str-mutex
 asterisk.h
+asterisk_1.4.3

Added: asterisk-chan-capi/trunk/debian/patches/asterisk_1.4.3.dpatch
===================================================================
--- asterisk-chan-capi/trunk/debian/patches/asterisk_1.4.3.dpatch	                        (rev 0)
+++ asterisk-chan-capi/trunk/debian/patches/asterisk_1.4.3.dpatch	2007-06-14 16:29:43 UTC (rev 3661)
@@ -0,0 +1,72 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+ at DPATCH@
+Index: chan_capi.c
+===================================================================
+--- orig/chan_capi.c	(revision 455)
++++ mod/chan_capi.c	(revision 456)
+@@ -1817,6 +1817,9 @@
+ 
+ #ifdef CC_AST_HAS_EXT_CHAN_ALLOC
+ 	tmp = ast_channel_alloc(0, state, i->cid, NULL,
++#ifdef CC_AST_HAS_EXT2_CHAN_ALLOC
++		i->accountcode, i->dnid, i->context, i->amaflags,
++#endif
+ 		"CAPI/%s/%s-%x", i->vname, i->dnid, capi_counter++);
+ #else
+ 	tmp = ast_channel_alloc(0);
+@@ -1908,7 +1911,6 @@
+ 		ast_getformatname_multiple(alloca(80), 80,
+ 		tmp->nativeformats),
+ 		(i->rtp) ? " (RTP)" : "");
+-	cc_copy_string(tmp->context, i->context, sizeof(tmp->context));
+ 
+ 	if (!ast_strlen_zero(i->cid)) {
+ 		if (tmp->cid.cid_num) {
+@@ -1923,9 +1925,12 @@
+ 		tmp->cid.cid_dnid = strdup(i->dnid);
+ 	}
+ 	tmp->cid.cid_ton = i->cid_ton;
++
++#ifndef CC_AST_HAS_EXT2_CHAN_ALLOC
+ 	if (i->amaflags)
+ 		tmp->amaflags = i->amaflags;
+ 	
++	cc_copy_string(tmp->context, i->context, sizeof(tmp->context));
+ 	cc_copy_string(tmp->exten, i->dnid, sizeof(tmp->exten));
+ #ifdef CC_AST_HAS_STRINGFIELD_IN_CHANNEL
+ 	ast_string_field_set(tmp, accountcode, i->accountcode);
+@@ -1934,6 +1939,14 @@
+ 	cc_copy_string(tmp->accountcode, i->accountcode, sizeof(tmp->accountcode));
+ 	cc_copy_string(tmp->language, i->language, sizeof(tmp->language));
+ #endif
++#endif
++
++#ifdef CC_AST_HAS_STRINGFIELD_IN_CHANNEL
++	ast_string_field_set(tmp, language, i->language);
++#else
++	cc_copy_string(tmp->language, i->language, sizeof(tmp->language));
++#endif
++
+ 	i->owner = tmp;
+ 
+ #ifdef CC_AST_HAS_VERSION_1_4
+Index: create_config.sh
+===================================================================
+--- orig/create_config.sh	(revision 455)
++++ mod/create_config.sh	(revision 456)
+@@ -83,6 +83,15 @@
+ 	echo " * no extended ast_channel_alloc"
+ fi
+ 
++if grep -q "ast_channel_alloc.*amaflag" $INCLUDEDIR/channel.h; then
++	echo "#define CC_AST_HAS_EXT2_CHAN_ALLOC" >>$CONFIGFILE
++	echo " * found second extended ast_channel_alloc"
++else
++	echo "#undef CC_AST_HAS_EXT2_CHAN_ALLOC" >>$CONFIGFILE
++	echo " * no second extended ast_channel_alloc"
++fi
++
++
+ if grep -q "send_digit_end.*duration" $INCLUDEDIR/channel.h; then
+ 	echo "#define CC_AST_HAS_SEND_DIGIT_END_DURATION" >>$CONFIGFILE
+ 	echo " * found send_digit_end with duration"