SOURCES: asterisk-r150557.patch (NEW) - fix from upstream

arekm arekm at pld-linux.org
Sat Nov 22 20:37:30 CET 2008


Author: arekm                        Date: Sat Nov 22 19:37:30 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix from upstream

---- Files affected:
SOURCES:
   asterisk-r150557.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/asterisk-r150557.patch
diff -u /dev/null SOURCES/asterisk-r150557.patch:1.1
--- /dev/null	Sat Nov 22 20:37:31 2008
+++ SOURCES/asterisk-r150557.patch	Sat Nov 22 20:37:24 2008
@@ -0,0 +1,20 @@
+--- branches/1.4/channels/chan_dahdi.c	2008/10/08 22:22:09	147681
++++ branches/1.4/channels/chan_dahdi.c	2008/10/17 15:31:35	150557
+@@ -3668,7 +3668,7 @@
+ {
+ 	int res;
+ 	struct dahdi_spaninfo zi;
+-#if defined(HAVE_DAHDI) || defined(HAVE_ZAPTEL_CHANALARMS)
++#if !defined(HAVE_ZAPTEL) || defined(HAVE_ZAPTEL_CHANALARMS)
+ 	/*
+ 	 * The conditional compilation is needed only in asterisk-1.4 for
+ 	 * backward compatibility with old zaptel drivers that don't have
+@@ -3687,7 +3687,7 @@
+ 	}
+ 	if (zi.alarms != DAHDI_ALARM_NONE)
+ 		return zi.alarms;
+-#if defined(HAVE_DAHDI) || defined(HAVE_ZAPTEL_CHANALARMS)
++#if !defined(HAVE_ZAPTEL) || defined(HAVE_ZAPTEL_CHANALARMS)
+ 	/* No alarms on the span. Check for channel alarms. */
+ 	if ((res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_GET_PARAMS, &params)) >= 0)
+ 		return params.chan_alarms;
================================================================


More information about the pld-cvs-commit mailing list