[Pkg-voip-commits] r4504 - /asterisk1.2/trunk/debian/patches/ukcid.dpatch

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Sun Sep 16 10:11:33 2007
New Revision: 4504

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4504
Log:
Adjust the ukcid patch not to fail if the Zaptel ukcid patch is missing.

Modified:
    asterisk1.2/trunk/debian/patches/ukcid.dpatch

Modified: asterisk1.2/trunk/debian/patches/ukcid.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk1.2/trunk/debian/patches/ukcid.dpatch?rev=4504&op=diff
==============================================================================
--- asterisk1.2/trunk/debian/patches/ukcid.dpatch (original)
+++ asterisk1.2/trunk/debian/patches/ukcid.dpatch Sun Sep 16 10:11:33 2007
@@ -10,10 +10,11 @@
 diff -urNad asterisk/channels/chan_zap.c /tmp/dpep.KK0kwq/asterisk/channels/chan_zap.c
 --- asterisk/channels/chan_zap.c	2006-01-06 00:40:59.000000000 +0200
 +++ /tmp/dpep.KK0kwq/asterisk/channels/chan_zap.c	2006-01-08 02:17:08.000000000 +0200
-@@ -951,6 +951,14 @@
+@@ -951,6 +951,16 @@
  	return 0;
  }
- 
+
++#ifdef ZT_GET_HISTORY
 +static int zt_get_history(int fd, void *buf, int buf_size)
 +{
 +	struct zt_history hist;
@@ -21,14 +22,16 @@
 +	hist.len=buf_size;
 +	return ioctl(fd, ZT_GET_HISTORY, &hist);
 +}
++#endif /* ifdef ZT_GET_HISTORY */
 +
  static int alloc_sub(struct zt_pvt *p, int x)
  {
  	ZT_BUFFERINFO bi;
-@@ -5787,6 +5795,120 @@
+@@ -5787,6 +5795,122 @@
  			}
  		}
  #endif
++#ifdef ZT_GET_HISTORY 
 +		/* If we're using an X100P in the UK, caller ID needs to be extracted from
 +		 * the history buffer */
 +		if (p->use_callerid && p->cid_start == CID_START_USEHIST) {
@@ -143,10 +146,11 @@
 +#endif	
 +		}
 +
++#endif /* ifndef ZT_GET_HISTORY */
  		/* If we want caller id, we're in a prering state due to a polarity reversal
  		 * and we're set to use a polarity reversal to trigger the start of caller id,
  		 * grab the caller id and wait for ringing to start... */
-@@ -10299,6 +10421,8 @@
+@@ -10299,6 +10421,10 @@
  				chan_conf.cid_start = CID_START_RING;
  			else if (!strcasecmp(v->value, "polarity"))
  				chan_conf.cid_start = CID_START_POLARITY;