[Pkg-voip-commits] r2362 - in asterisk/trunk/debian: . patches

[Tzafrir Cohen]

Author: tzafrir-guest
Date: 2006-09-10 00:00:39 +0000 (Sun, 10 Sep 2006)
New Revision: 2362

Modified:
   asterisk/trunk/debian/changelog
   asterisk/trunk/debian/patches/00list
   asterisk/trunk/debian/patches/bristuff.dpatch
Log:
* asterisk 1.2.12
* bristuff.dpatch: version adapted.
* apprecord_sprintf.dpatch removed: already applied.


Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog	2006-09-09 23:56:19 UTC (rev 2361)
+++ asterisk/trunk/debian/changelog	2006-09-10 00:00:39 UTC (rev 2362)
@@ -1,8 +1,11 @@
-asterisk (1:1.2.11.dfsg-2) UNRELEASED; urgency=low
+asterisk (1:1.2.12.dfsg-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * New upstream release
+  * bristuff.dpatch: version adapted.
+  * apprecord_sprintf.dpatch removed: already applied.
 
- -- Mark Purcell <msp at debian.org>  Sat,  2 Sep 2006 20:00:22 +0100
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sun, 10 Sep 2006 01:13:08 +0300
 
 asterisk (1:1.2.11.dfsg-1) unstable; urgency=high
 

Modified: asterisk/trunk/debian/patches/00list
===================================================================
--- asterisk/trunk/debian/patches/00list	2006-09-09 23:56:19 UTC (rev 2361)
+++ asterisk/trunk/debian/patches/00list	2006-09-10 00:00:39 UTC (rev 2362)
@@ -17,4 +17,3 @@
 correct_pid_display
 zap_restart
 backport_playdtmf
-apprecord_sprintf

Modified: asterisk/trunk/debian/patches/bristuff.dpatch
===================================================================
--- asterisk/trunk/debian/patches/bristuff.dpatch	2006-09-09 23:56:19 UTC (rev 2361)
+++ asterisk/trunk/debian/patches/bristuff.dpatch	2006-09-10 00:00:39 UTC (rev 2362)
@@ -10,8 +10,8 @@
 --- asterisk-1.2.10.orig/.version	2006-07-14 23:29:33.000000000 +0200
 +++ asterisk-1.2.10/.version	2006-07-31 14:13:27.000000000 +0200
 @@ -1 +1 @@
--1.2.11
-+1.2.11-BRIstuffed-0.3.0-PRE-1s
+-1.2.12
++1.2.12-BRIstuffed-0.3.0-PRE-1s
 diff -urN asterisk-1.2.10.orig/HARDWARE asterisk-1.2.10/HARDWARE
 --- asterisk-1.2.10.orig/HARDWARE	2005-11-29 19:24:39.000000000 +0100
 +++ asterisk-1.2.10/HARDWARE	2006-07-31 14:13:08.000000000 +0200
@@ -8533,7 +8533,7 @@
  					/* Make sure extension exists (or in overlap dial mode, can exist) */
  					if ((pri->overlapdial && ast_canmatch_extension(NULL, pri->pvts[chanpos]->context, pri->pvts[chanpos]->exten, 1, pri->pvts[chanpos]->cid_num)) ||
  						ast_exists_extension(NULL, pri->pvts[chanpos]->context, pri->pvts[chanpos]->exten, 1, pri->pvts[chanpos]->cid_num)) {
-@@ -8464,22 +9293,38 @@
+@@ -8464,23 +9293,39 @@
  						res = zt_setlaw(pri->pvts[chanpos]->subs[SUB_REAL].zfd, law);
  						if (res < 0) 
  							ast_log(LOG_WARNING, "Unable to set law on channel %d\n", pri->pvts[chanpos]->channel);
@@ -8545,12 +8545,13 @@
 + 						}
  						if (res < 0)
  							ast_log(LOG_WARNING, "Unable to set gains on channel %d\n", pri->pvts[chanpos]->channel);
--						if (e->ring.complete || !pri->overlapdial)
+-						if (e->ring.complete || !pri->overlapdial) {
 + 						if ((pri->nodetype != BRI_NETWORK_PTMP) && (pri->nodetype != BRI_NETWORK)) {
 +  						    if (e->ring.complete || !pri->overlapdial) {
  							/* Just announce proceeding */
+							pri->pvts[chanpos]->proceeding = 1;
  							pri_proceeding(pri->pri, e->ring.call, PVT_TO_CHANNEL(pri->pvts[chanpos]), 0);
--						else  {
+-						} else  {
 + 						//	pri->pvts[chanpos]->ignoredtmf = 0;
 + 						    } else  {
  							if (pri->switchtype != PRI_SWITCH_GR303_TMC) 
@@ -13429,7 +13430,7 @@
  	int pid;
          char *stringp;
  	AGI agi;
-@@ -2041,15 +2117,18 @@
+@@ -2041,16 +2117,19 @@
  		}
  	}
  #endif
@@ -13442,7 +13443,8 @@
 +		agi.audio_out = efd;
 +		agi.audio_in = efd2;
  		res = run_agi(chan, argv[0], &agi, pid, dead);
- 		close(fds[1]);
+		if (fds[1] != fds[0])
+			close(fds[1]);
  		if (efd > -1)
  			close(efd);
 +		if (efd2 > -1)