[Pkg-voip-commits] r4674 - /asterisk-chan-capi/trunk/debian/patches/asterisk_1.4.3.dpatch

[kilian at alioth.debian.org]

Author: kilian
Date: Fri Oct  5 21:39:50 2007
New Revision: 4674

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4674
Log:
patch got merged upstream (at least chan_capi.c)

Modified:
    asterisk-chan-capi/trunk/debian/patches/asterisk_1.4.3.dpatch

Modified: asterisk-chan-capi/trunk/debian/patches/asterisk_1.4.3.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-chan-capi/trunk/debian/patches/asterisk_1.4.3.dpatch?rev=4674&op=diff
==============================================================================
--- asterisk-chan-capi/trunk/debian/patches/asterisk_1.4.3.dpatch (original)
+++ asterisk-chan-capi/trunk/debian/patches/asterisk_1.4.3.dpatch Fri Oct  5 21:39:50 2007
@@ -1,57 +1,8 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 @DPATCH@
-diff -urNad asterisk-chan-capi-1.0.2~/chan_capi.c asterisk-chan-capi-1.0.2/chan_capi.c
---- asterisk-chan-capi-1.0.2~/chan_capi.c	2007-10-05 17:35:55.000000000 +0200
-+++ asterisk-chan-capi-1.0.2/chan_capi.c	2007-10-05 17:36:03.000000000 +0200
-@@ -1728,6 +1728,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);
-@@ -1810,7 +1813,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) {
-@@ -1825,9 +1827,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);
-@@ -1836,6 +1841,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;
- 	i->used = tmp;
- 
 diff -urNad asterisk-chan-capi-1.0.2~/create_config.sh asterisk-chan-capi-1.0.2/create_config.sh
---- asterisk-chan-capi-1.0.2~/create_config.sh	2007-10-05 17:35:55.000000000 +0200
-+++ asterisk-chan-capi-1.0.2/create_config.sh	2007-10-05 17:36:03.000000000 +0200
+--- asterisk-chan-capi-1.0.2~/create_config.sh	2007-09-27 10:09:26.000000000 +0200
++++ asterisk-chan-capi-1.0.2/create_config.sh	2007-10-05 23:35:48.715655978 +0200
 @@ -92,6 +92,15 @@
  fi