[Pkg-voip-commits] r5460 - in /asterisk/trunk/debian: ./ patches/ patches/bristuff/
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Thu Apr 3 02:52:37 UTC 2008
Author: paravoid
Date: Thu Apr 3 02:52:37 2008
New Revision: 5460
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5460
Log:
* New upstream release.
- Dropped configure-libc-client, incorporated upstream.
- Adapted bristuff patches uniqueid-10-channel-ops-uniqueid,
uniqueid-30-app-chanspy, zapata-bri+euroisdn.
Added:
asterisk/trunk/debian/patches/allow-tilde-destdir
Removed:
asterisk/trunk/debian/patches/configure-libc-client
Modified:
asterisk/trunk/debian/changelog
asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid
asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy
asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn
asterisk/trunk/debian/patches/h323-no-deps-on-asterisk
asterisk/trunk/debian/patches/series
asterisk/trunk/debian/patches/vpb-driver-4.2.18
asterisk/trunk/debian/rules
Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=5460&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Thu Apr 3 02:52:37 2008
@@ -1,12 +1,15 @@
-asterisk (1:1.4.18.1~dfsg-2) UNRELEASED; urgency=high
-
- * Urgency high because of serious bugfix-only upload.
+asterisk (1:1.4.19~dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ - Dropped configure-libc-client, incorporated upstream.
+ - Adapted bristuff patches uniqueid-10-channel-ops-uniqueid,
+ uniqueid-30-app-chanspy, zapata-bri+euroisdn.
* Build with -O2 instead of the default -O6 (bug introduced in
1.4.18~dfsg-1).
* Fix a bug in the bristuff/zapata-bri+euroisdn patch where a significant
portion of chan_zap code was ignored because of bad block nesting.
- -- Faidon Liambotis <paravoid at debian.org> Thu, 03 Apr 2008 05:12:18 +0300
+ -- Faidon Liambotis <paravoid at debian.org> Thu, 03 Apr 2008 05:51:33 +0300
asterisk (1:1.4.18.1~dfsg-1) unstable; urgency=high
Added: asterisk/trunk/debian/patches/allow-tilde-destdir
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/allow-tilde-destdir?rev=5460&op=file
==============================================================================
--- asterisk/trunk/debian/patches/allow-tilde-destdir (added)
+++ asterisk/trunk/debian/patches/allow-tilde-destdir Thu Apr 3 02:52:37 2008
@@ -1,0 +1,21 @@
+badshell is disallowing tildes (~) in the DESTDIR directory to warn people
+who use a shell that doesn't expand it to $HOMEDIR.
+
+However, we have such a tilde in our directory (~dfsg) that isn't expanded
+to $HOMEDIR nor shouldn't be.
+
+Should be reported upstream.
+
+ -- Faidon Liambotis <paravoid at debian.org>
+
+--- a/Makefile
++++ b/Makefile
+@@ -505,7 +505,7 @@ ifneq ($(findstring ~,$(DESTDIR)),)
+ @exit 1
+ endif
+
+-install: badshell datafiles bininstall $(SUBDIRS_INSTALL)
++install: datafiles bininstall $(SUBDIRS_INSTALL)
+ @if [ -x /usr/sbin/asterisk-post-install ]; then \
+ /usr/sbin/asterisk-post-install $(DESTDIR) . ; \
+ fi
Modified: asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid?rev=5460&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid Thu Apr 3 02:52:37 2008
@@ -273,19 +273,15 @@
{
struct ast_channel *chan;
struct app_tmp *tmp;
-@@ -5164,10 +5168,10 @@ int ast_pbx_outgoing_app(const char *typ
+@@ -5164,7 +5168,7 @@ int ast_pbx_outgoing_app(const char *typ
goto outgoing_app_cleanup;
}
if (sync) {
- chan = __ast_request_and_dial(type, format, data, timeout, reason, cid_num, cid_name, &oh);
+ chan = __ast_request_and_dial(type, format, data, timeout, reason, callingpres, cid_num, cid_name, &oh, uniqueid);
if (chan) {
- if (chan->cdr) { /* check if the channel already has a cdr record, if not give it one */
-- ast_log(LOG_WARNING, "%s already has a call record??\n", chan->name);
-+ ast_log(LOG_WARNING, "%s already has a call detail record??\n", chan->name);
- } else {
+ if (!chan->cdr) { /* check if the channel already has a cdr record, if not give it one */
chan->cdr = ast_cdr_alloc(); /* allocate a cdr for the channel */
- if(!chan->cdr) {
@@ -5248,7 +5252,7 @@ int ast_pbx_outgoing_app(const char *typ
res = -1;
goto outgoing_app_cleanup;
Modified: asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy?rev=5460&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy Thu Apr 3 02:52:37 2008
@@ -36,12 +36,13 @@
static const char *app_ext = "ExtenSpy";
static const char *desc_ext =
" ExtenSpy(exten[@context][|options]): This application is used to listen to the\n"
-@@ -344,7 +366,7 @@ static int channel_spy(struct ast_channe
- }
-
- static struct ast_channel *next_channel(const struct ast_channel *last, const char *spec,
-- const char *exten, const char *context)
-+ const char *exten, const char *context, const char *uniqueid)
+@@ -457,7 +479,8 @@ static struct chanspy_ds *setup_chanspy_
+
+ static struct chanspy_ds *next_channel(struct ast_channel *chan,
+ const struct ast_channel *last, const char *spec,
+- const char *exten, const char *context, struct chanspy_ds *chanspy_ds)
++ const char *exten, const char *context, struct chanspy_ds *chanspy_ds,
++ const char *uniqueid)
{
struct ast_channel *this;
@@ -61,17 +62,19 @@
- const char *exten, const char *context)
+ const char *exten, const char *context, const char *uniqueid)
{
- struct ast_channel *peer, *prev, *next;
char nameprefix[AST_NAME_STRLEN];
-@@ -408,9 +432,9 @@ static int common_exec(struct ast_channe
- peer = prev = next = NULL;
+ char peer_name[AST_NAME_STRLEN + 5];
+@@ -531,11 +556,11 @@ static int common_exec(struct ast_channe
+ waitms = 100;
num_spyed_upon = 0;
-- for (peer = next_channel(peer, spec, exten, context);
-+ for (peer = next_channel(peer, spec, exten, context, NULL);
- peer;
-- prev = peer, peer = next ? next : next_channel(peer, spec, exten, context), next = NULL) {
-+ prev = peer, peer = next ? next : next_channel(peer, spec, exten, context, NULL), next = NULL) {
+- for (peer_chanspy_ds = next_channel(chan, prev, spec, exten, context, &chanspy_ds);
++ for (peer_chanspy_ds = next_channel(chan, prev, spec, exten, context, &chanspy_ds, NULL);
+ peer_chanspy_ds;
+ chanspy_ds_free(peer_chanspy_ds), prev = peer,
+ peer_chanspy_ds = next_chanspy_ds ? next_chanspy_ds :
+- next_channel(chan, prev, spec, exten, context, &chanspy_ds), next_chanspy_ds = NULL) {
++ next_channel(chan, prev, spec, exten, context, &chanspy_ds, NULL), next_chanspy_ds = NULL) {
const char *group;
int igrp = !mygroup;
char *groups[25];
Modified: asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/zapata-bri%2Beuroisdn?rev=5460&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn Thu Apr 3 02:52:37 2008
@@ -492,52 +492,36 @@
if (ast_exists_extension(chan, chan->context, exten, 1, p->cid_num))
timeout = matchdigittimeout;
else
-@@ -6675,18 +6789,44 @@ static int handle_init_event(struct zt_p
+@@ -6697,6 +6811,13 @@ static int handle_init_event(struct zt_p
break;
case ZT_EVENT_NOALARM:
i->inalarm = 0;
+#ifdef HAVE_PRI
-+ if (i->pri) {
-+ if ((i->pri->nodetype == BRI_CPE_PTMP) || (i->pri->nodetype == BRI_CPE)) {
++ if (i->pri &&
++ (i->pri->nodetype == BRI_CPE_PTMP || i->pri->nodetype == BRI_CPE)) {
+ /* dont annoy BRI TE mode users with layer2layer alarms */
-+ } else {
-+ ast_log(LOG_NOTICE, "Alarm cleared on channel %d\n", i->channel);
-+ manager_event(EVENT_FLAG_SYSTEM, "AlarmClear",
-+ "Channel: %d\r\n", i->channel);
-+ }
++ break;
+ }
-+#else
- ast_log(LOG_NOTICE, "Alarm cleared on channel %d\n", i->channel);
- manager_event(EVENT_FLAG_SYSTEM, "AlarmClear",
- "Channel: %d\r\n", i->channel);
+#endif
- break;
- case ZT_EVENT_ALARM:
- i->inalarm = 1;
- res = get_alarms(i);
+ if (!i->unknown_alarm) {
+ ast_log(LOG_NOTICE, "Alarm cleared on channel %d\n", i->channel);
+ manager_event(EVENT_FLAG_SYSTEM, "AlarmClear",
+@@ -6711,6 +6832,14 @@ static int handle_init_event(struct zt_p
+ do {
+ const char *alarm_str = alarm2str(res);
+
+#ifdef HAVE_PRI
-+ if (i->pri) {
-+ if ((i->pri->nodetype == BRI_CPE_PTMP) || (i->pri->nodetype == BRI_CPE)) {
-+ /* dont annoy BRI TE mode users with layer2layer alarms */
-+ } else {
-+ ast_log(LOG_WARNING, "Detected alarm on channel %d: %s\n", i->channel, alarm2str(res));
-+ manager_event(EVENT_FLAG_SYSTEM, "Alarm",
-+ "Alarm: %s\r\n"
-+ "Channel: %d\r\n",
-+ alarm2str(res), i->channel);
-+ }
-+ }
-+#else
- ast_log(LOG_WARNING, "Detected alarm on channel %d: %s\n", i->channel, alarm2str(res));
- manager_event(EVENT_FLAG_SYSTEM, "Alarm",
- "Alarm: %s\r\n"
- "Channel: %d\r\n",
- alarm2str(res), i->channel);
++ if (i->pri &&
++ (i->pri->nodetype == BRI_CPE_PTMP || i->pri->nodetype == BRI_CPE)) {
++ /* dont annoy BRI TE mode users with layer2layer alarms */
++ break;
++ }
++
+#endif
- /* fall thru intentionally */
- case ZT_EVENT_ONHOOK:
- if (i->radio)
-@@ -6730,8 +6870,10 @@ static int handle_init_event(struct zt_p
+ /* hack alert! Zaptel 1.4 now exposes FXO battery as an alarm, but asterisk 1.4
+ * doesn't know what to do with it. Don't confuse users with log messages. */
+ if (!strcasecmp(alarm_str, "No Alarm") || !strcasecmp(alarm_str, "Unknown Alarm")) {
+@@ -6769,8 +6898,10 @@ static int handle_init_event(struct zt_p
zt_set_hook(i->subs[SUB_REAL].zfd, ZT_ONHOOK);
break;
case SIG_PRI:
@@ -652,65 +636,54 @@
if (!c) {
if (principle < 0)
return -1;
-@@ -8032,6 +8199,7 @@ static int pri_fixup_principle(struct zt
- }
+@@ -8077,6 +8233,7 @@ static int pri_fixup_principle(struct zt
/* Fix it all up now */
- pri->pvts[principle]->owner = pri->pvts[x]->owner;
-+ pri->pvts[principle]->outgoing = pri->pvts[x]->outgoing;
- if (pri->pvts[principle]->owner) {
- ast_string_field_build(pri->pvts[principle]->owner, name,
+ new->owner = old->owner;
+ old->owner = NULL;
++ new->outgoing = old->outgoing;
+ if (new->owner) {
+ ast_string_field_build(new->owner, name,
"Zap/%d:%d-%d", pri->trunkgroup,
-@@ -8039,13 +8207,48 @@ static int pri_fixup_principle(struct zt
- pri->pvts[principle]->owner->tech_pvt = pri->pvts[principle];
- pri->pvts[principle]->owner->fds[0] = pri->pvts[principle]->subs[SUB_REAL].zfd;
- pri->pvts[principle]->subs[SUB_REAL].owner = pri->pvts[x]->subs[SUB_REAL].owner;
-- } else
-+ } else {
- ast_log(LOG_WARNING, "Whoa, there's no owner, and we're having to fix up channel %d to channel %d\n", pri->pvts[x]->channel, pri->pvts[principle]->channel);
-+ }
- pri->pvts[principle]->call = pri->pvts[x]->call;
-+ pri->pvts[principle]->dsp = pri->pvts[x]->dsp;
-+ pri->pvts[principle]->alreadyhungup = pri->pvts[x]->alreadyhungup;
-+ pri->pvts[principle]->digital = pri->pvts[x]->digital;
-+ pri->pvts[principle]->faxhandled = pri->pvts[x]->faxhandled;
+@@ -8089,6 +8246,38 @@ static int pri_fixup_principle(struct zt
+ ast_log(LOG_WARNING, "Whoa, there's no owner, and we're having to fix up channel %d to channel %d\n", old->channel, new->channel);
+ new->call = old->call;
+ old->call = NULL;
++ new->dsp = old->dsp;
++ new->alreadyhungup = old->alreadyhungup;
++ new->digital = old->digital;
++ new->faxhandled = old->faxhandled;
+
+ if ((pri->nodetype == BRI_CPE_PTMP) || (pri->nodetype == BRI_CPE)) {
+ /* this might also apply for other pri types! */
-+ pri->pvts[principle]->law = pri->pvts[x]->law;
-+ if (ioctl(pri->pvts[principle]->subs[SUB_REAL].zfd, ZT_AUDIOMODE, &pri->pvts[principle]->law) == -1)
-+ ast_log(LOG_WARNING, "Unable to set audio mode on channel %d to %d\n", pri->pvts[principle]->channel, pri->pvts[principle]->law);
-+ res = zt_setlaw(pri->pvts[principle]->subs[SUB_REAL].zfd, pri->pvts[principle]->law);
++ new->law = old->law;
++ if (ioctl(new->subs[SUB_REAL].zfd, ZT_AUDIOMODE, &pri->pvts[principle]->law) == -1)
++ ast_log(LOG_WARNING, "Unable to set audio mode on channel %d to %d\n", new->channel, pri->pvts[principle]->law);
++ res = zt_setlaw(new->subs[SUB_REAL].zfd, pri->pvts[principle]->law);
+ if (res < 0)
-+ ast_log(LOG_WARNING, "Unable to set law on channel %d\n", pri->pvts[principle]->channel);
-+ if (!pri->pvts[principle]->digital) {
-+ res = set_actual_gain(pri->pvts[principle]->subs[SUB_REAL].zfd, 0, pri->pvts[principle]->rxgain, pri->pvts[principle]->txgain, pri->pvts[principle]->law);
++ ast_log(LOG_WARNING, "Unable to set law on channel %d\n", new->channel);
++ if (!new->digital) {
++ res = set_actual_gain(new->subs[SUB_REAL].zfd, 0, pri->pvts[principle]->rxgain, pri->pvts[principle]->txgain, pri->pvts[principle]->law);
+ } else {
-+ res = set_actual_gain(pri->pvts[principle]->subs[SUB_REAL].zfd, 0, 0, 0, pri->pvts[principle]->law);
++ res = set_actual_gain(new->subs[SUB_REAL].zfd, 0, 0, 0, pri->pvts[principle]->law);
+ }
+ if (res < 0)
-+ ast_log(LOG_WARNING, "Unable to set gains on channel %d\n", pri->pvts[principle]->channel);
-+ zt_confmute(pri->pvts[x], 0);
-+ update_conf(pri->pvts[x]);
-+ reset_conf(pri->pvts[x]);
-+ restore_gains(pri->pvts[x]);
-+ zt_disable_ec(pri->pvts[x]);
-+ zt_setlinear(pri->pvts[x]->subs[SUB_REAL].zfd, 0);
++ ast_log(LOG_WARNING, "Unable to set gains on channel %d\n", new->channel);
++ zt_confmute(old, 0);
++ update_conf(old);
++ reset_conf(old);
++ restore_gains(old);
++ zt_disable_ec(old);
++ zt_setlinear(old->subs[SUB_REAL].zfd, 0);
+ }
+
-+ if (pri->pvts[principle]->owner) {
-+ snprintf(tmpname, sizeof(tmpname), "Zap/%d-1", pri->pvts[principle]->channel);
-+ ast_change_name(pri->pvts[principle]->owner, tmpname);
++ if (new->owner) {
++ snprintf(tmpname, sizeof(tmpname), "Zap/%d-1", new->channel);
++ ast_change_name(new->owner, tmpname);
+ }
-+
- /* Free up the old channel, now not in use */
- pri->pvts[x]->subs[SUB_REAL].owner = NULL;
- pri->pvts[x]->owner = NULL;
- pri->pvts[x]->call = NULL;
-+ pri->pvts[x]->dsp = NULL;
- }
- return principle;
- }
-@@ -8074,7 +8277,9 @@ static int pri_fixup_principle(struct zt
+
+ /* Copy any DSP that may be present */
+ new->dsp = old->dsp;
+@@ -8123,7 +8312,9 @@ static int pri_fixup_principle(struct zt
}
crv = crv->next;
}
@@ -901,7 +874,7 @@
}
if (option_debug)
-@@ -8502,8 +8688,7 @@ static void *pri_dchannel(void *vpri)
+@@ -8502,24 +8674,33 @@ static void *pri_dchannel(void *vpri)
break;
}
} else if (errno != EINTR)
@@ -911,23 +884,50 @@
if (e) {
if (pri->debug)
pri_dump_event(pri->dchans[which], e);
-@@ -8516,32 +8701,86 @@ static void *pri_dchannel(void *vpri)
-
- switch (e->e) {
+
+ if (e->e != PRI_EVENT_DCHAN_DOWN) {
+ if (!(pri->dchanavail[which] & DCHAN_UP)) {
+- if (option_verbose > 1)
+- ast_verbose(VERBOSE_PREFIX_2 "%s D-Channel on span %d up\n", pri_order(which), pri->span);
++ if (pri->nodetype == BRI_NETWORK_PTMP) {
++ if (option_verbose > 3)
++ ast_verbose(VERBOSE_PREFIX_2 "%s D-Channel on span %d up for TEI %d\n", pri_order(which), pri->span, e->gen.tei);
++ } else {
++ if (option_verbose > (pri->nodetype == BRI_CPE_PTMP) ? 3 : 1)
++ ast_verbose(VERBOSE_PREFIX_2 "%s D-Channel on span %d up\n", pri_order(which), pri->span);
++ }
+ }
+ pri->dchanavail[which] |= DCHAN_UP;
+ } else {
+ if (pri->dchanavail[which] & DCHAN_UP) {
+- if (option_verbose > 1)
+- ast_verbose(VERBOSE_PREFIX_2 "%s D-Channel on span %d down\n", pri_order(which), pri->span);
++ if (pri->nodetype == BRI_NETWORK_PTMP) {
++ if (option_verbose > 3)
++ ast_verbose(VERBOSE_PREFIX_2 "%s D-Channel on span %d down for TEI %d\n", pri_order(which), pri->span, e->gen.tei);
++ } else {
++ if (option_verbose > (pri->nodetype == BRI_CPE_PTMP) ? 3 : 1)
++ ast_verbose(VERBOSE_PREFIX_2 "%s D-Channel on span %d down\n", pri_order(which), pri->span);
++ pri->dchanavail[which] &= ~DCHAN_UP;
++ }
+ }
+- pri->dchanavail[which] &= ~DCHAN_UP;
+ }
+
+ if ((e->e != PRI_EVENT_DCHAN_UP) && (e->e != PRI_EVENT_DCHAN_DOWN) && (pri->pri != pri->dchans[which]))
+@@ -8516,24 +8687,63 @@ static void *pri_dchannel(void *vpri)
case PRI_EVENT_DCHAN_UP:
-- if (option_verbose > 1)
-- ast_verbose(VERBOSE_PREFIX_2 "%s D-Channel on span %d up\n", pri_order(which), pri->span);
-- pri->dchanavail[which] |= DCHAN_UP;
-- if (!pri->pri) pri_find_dchan(pri);
+ if (!pri->pri) pri_find_dchan(pri);
+
+- /* Note presense of D-channel */
+- time(&pri->lastreset);
+ if (pri->nodetype == BRI_NETWORK_PTMP) {
-+ if (option_verbose > 3)
-+ ast_verbose(VERBOSE_PREFIX_2 "%s D-Channel on span %d up for TEI %d\n", pri_order(which), pri->span, e->gen.tei);
-+ pri->dchanavail[which] |= DCHAN_UP;
-+ if (!pri->pri) pri_find_dchan(pri);
+
+ /* Note presense of D-channel */
+ time(&pri->lastreset);
-+
+
+- /* Restart in 5 seconds */
+- if (pri->resetinterval > -1) {
+ pri->resetting = 0;
+ /* Take the channels from inalarm condition */
+ for (i=0; i<pri->numchans; i++)
@@ -935,23 +935,9 @@
+ pri->pvts[i]->inalarm = 0;
+ }
+ } else {
-+ if (pri->nodetype == BRI_CPE_PTMP) {
-+ if (option_verbose > 3)
-+ ast_verbose(VERBOSE_PREFIX_2 "%s D-Channel on span %d up\n", pri_order(which), pri->span);
-+ } else {
-+ if (option_verbose > 1)
-+ ast_verbose(VERBOSE_PREFIX_2 "%s D-Channel on span %d up\n", pri_order(which), pri->span);
-+ }
-+ pri->dchanavail[which] |= DCHAN_UP;
-+ if (!pri->pri) pri_find_dchan(pri);
-
-- /* Note presense of D-channel */
-- time(&pri->lastreset);
+ /* Note presense of D-channel */
+ time(&pri->lastreset);
-
-- /* Restart in 5 seconds */
-- if (pri->resetinterval > -1) {
++
+ /* Restart in 5 seconds */
+ if (pri->resetinterval > -1) {
pri->lastreset -= pri->resetinterval;
@@ -970,21 +956,17 @@
+ }
break;
case PRI_EVENT_DCHAN_DOWN:
-- if (option_verbose > 1)
-- ast_verbose(VERBOSE_PREFIX_2 "%s D-Channel on span %d down\n", pri_order(which), pri->span);
-- pri->dchanavail[which] &= ~DCHAN_UP;
- pri_find_dchan(pri);
- if (!pri_is_up(pri)) {
+ if (pri->nodetype == BRI_NETWORK_PTMP) {
-+ if (option_verbose > 3)
-+ ast_verbose(VERBOSE_PREFIX_2 "%s D-Channel on span %d down for TEI %d\n", pri_order(which), pri->span, e->gen.tei);
-+ // PTMP BRIs have N dchans, handled by libpri
-+ if (e->gen.tei == 0) break;
++ /* PTMP BRIs have N dchans, handled by libpri */
++ if (e->gen.tei == 0)
++ break;
++
+ /* Hangup active channels */
+ for (i=0; i<pri->numchans; i++) {
+ struct zt_pvt *p = pri->pvts[i];
+ if (p) {
-+ // ast_log(LOG_NOTICE, "chan %d tei %d\n",i,p->tei);
+ if (p->tei == e->gen.tei) {
+ if (p->call) {
+ if (p->pri && p->pri->pri) {
@@ -1002,14 +984,6 @@
+ }
+ }
+ } else {
-+ if (pri->nodetype == BRI_CPE_PTMP) {
-+ if (option_verbose > 3)
-+ ast_verbose(VERBOSE_PREFIX_2 "%s D-Channel on span %d down\n", pri_order(which), pri->span);
-+ } else {
-+ if (option_verbose > 1)
-+ ast_verbose(VERBOSE_PREFIX_2 "%s D-Channel on span %d down\n", pri_order(which), pri->span);
-+ }
-+ pri->dchanavail[which] &= ~DCHAN_UP;
+ pri_find_dchan(pri);
+ if (!pri_is_up(pri)) {
pri->resetting = 0;
Modified: asterisk/trunk/debian/patches/h323-no-deps-on-asterisk
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/h323-no-deps-on-asterisk?rev=5460&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/h323-no-deps-on-asterisk (original)
+++ asterisk/trunk/debian/patches/h323-no-deps-on-asterisk Thu Apr 3 02:52:37 2008
@@ -32,6 +32,6 @@
-else
- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS)
-endif
- @$(ASTTOPDIR)/build_tools/strip_nonapi $@
+ $(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
clean::
Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=5460&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Thu Apr 3 02:52:37 2008
@@ -1,7 +1,8 @@
# upstream fixes
+allow-tilde-destdir
+
debian-banner
silence-buildsum-warning
-configure-libc-client
hack-multiple-app-voicemail
astvarrundir
make-clean-fixes
Modified: asterisk/trunk/debian/patches/vpb-driver-4.2.18
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/vpb-driver-4.2.18?rev=5460&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/vpb-driver-4.2.18 (original)
+++ asterisk/trunk/debian/patches/vpb-driver-4.2.18 Thu Apr 3 02:52:37 2008
@@ -860,11 +860,3 @@
+;channel=1
+;channel=2
+;channel=3
---- a/channels/Makefile
-+++ b/channels/Makefile
-@@ -123,5 +123,3 @@ misdn_config.o: ASTCFLAGS+=-Imisdn
- misdn/isdn_lib.o: ASTCFLAGS+=-Wno-strict-aliasing
-
- $(if $(filter chan_misdn,$(EMBEDDED_MODS)),modules.link,chan_misdn.so): chan_misdn.o misdn_config.o misdn/isdn_lib.o misdn/isdn_msg_parser.o
--
--chan_vpb.oo: ASTCFLAGS:=$(filter-out -Wdeclaration-after-statement,$(ASTCFLAGS))
Modified: asterisk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/rules?rev=5460&op=diff
==============================================================================
--- asterisk/trunk/debian/rules (original)
+++ asterisk/trunk/debian/rules Thu Apr 3 02:52:37 2008
@@ -80,7 +80,7 @@
--infodir=\$${prefix}/share/info \
--with-cap \
--with-gsm \
- --with-imap=/usr/include \
+ --with-imap=system \
--with-pwlib=/usr/share/pwlib/include/ \
--with-h323=/usr/share/openh323/
More information about the Pkg-voip-commits
mailing list