[Pkg-voip-commits] r5116 - in /asterisk/trunk/debian/patches: bristuff/ast_monitor_start-targetscript bristuff/uniqueid-20-monitor bristuff/zapata-bri+euroisdn bristuff/zapata-gsm configure-libc-client tos-libcap use-libpri-bristuffed
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Fri Dec 21 20:40:18 UTC 2007
Author: paravoid
Date: Fri Dec 21 20:40:18 2007
New Revision: 5116
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5116
Log:
Do a quilt refresh to all patches
Modified:
asterisk/trunk/debian/patches/bristuff/ast_monitor_start-targetscript
asterisk/trunk/debian/patches/bristuff/uniqueid-20-monitor
asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn
asterisk/trunk/debian/patches/bristuff/zapata-gsm
asterisk/trunk/debian/patches/configure-libc-client
asterisk/trunk/debian/patches/tos-libcap
asterisk/trunk/debian/patches/use-libpri-bristuffed
Modified: asterisk/trunk/debian/patches/bristuff/ast_monitor_start-targetscript
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/ast_monitor_start-targetscript?rev=5116&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast_monitor_start-targetscript (original)
+++ asterisk/trunk/debian/patches/bristuff/ast_monitor_start-targetscript Fri Dec 21 20:40:18 2007
@@ -20,7 +20,7 @@
int ast_monitor_stop(struct ast_channel *chan, int need_lock);
--- a/res/res_monitor.c
+++ b/res/res_monitor.c
-@@ -124,7 +124,7 @@ static int ast_monitor_set_state(struct
+@@ -129,7 +129,7 @@ static int ast_monitor_set_state(struct
/* Start monitoring a channel */
int ast_monitor_start( struct ast_channel *chan, const char *format_spec,
@@ -29,7 +29,7 @@
{
int res = 0;
char tmp[256];
-@@ -148,6 +148,11 @@ int ast_monitor_start( struct ast_channe
+@@ -153,6 +153,11 @@ int ast_monitor_start( struct ast_channe
return -1;
}
@@ -41,7 +41,7 @@
/* Determine file names */
if (!ast_strlen_zero(fname_base)) {
int directory = strchr(fname_base, '/') ? 1 : 0;
-@@ -290,6 +295,8 @@ int ast_monitor_stop(struct ast_channel
+@@ -295,6 +300,8 @@ int ast_monitor_stop(struct ast_channel
if (chan->monitor->joinfiles && !ast_strlen_zero(chan->monitor->filename_base)) {
char tmp[1024];
char tmp2[1024];
@@ -50,7 +50,7 @@
const char *format = !strcasecmp(chan->monitor->format,"wav49") ? "WAV" : chan->monitor->format;
char *name = chan->monitor->filename_base;
int directory = strchr(name, '/') ? 1 : 0;
-@@ -313,8 +320,13 @@ int ast_monitor_stop(struct ast_channel
+@@ -322,8 +329,13 @@ int ast_monitor_stop(struct ast_channel
snprintf(tmp2,sizeof(tmp2), "( %s& rm -f \"%s/%s-\"* ) &",tmp, dir ,name); /* remove legs when done mixing */
ast_copy_string(tmp, tmp2, sizeof(tmp));
}
@@ -66,7 +66,7 @@
ast_log(LOG_WARNING, "Execute of %s failed.\n",tmp);
}
-@@ -443,7 +455,7 @@ static int start_monitor_exec(struct ast
+@@ -452,7 +464,7 @@ static int start_monitor_exec(struct ast
return 0;
}
@@ -75,7 +75,7 @@
if (res < 0)
res = ast_monitor_change_fname(chan, fname_base, 1);
ast_monitor_setjoinfiles(chan, joinfiles);
-@@ -482,6 +494,8 @@ static int start_monitor_action(struct m
+@@ -491,6 +503,8 @@ static int start_monitor_action(struct m
const char *fname = astman_get_header(m, "File");
const char *format = astman_get_header(m, "Format");
const char *mix = astman_get_header(m, "Mix");
@@ -84,7 +84,7 @@
char *d;
if (ast_strlen_zero(name)) {
-@@ -506,7 +520,7 @@ static int start_monitor_action(struct m
+@@ -515,7 +529,7 @@ static int start_monitor_action(struct m
*d = '-';
}
Modified: asterisk/trunk/debian/patches/bristuff/uniqueid-20-monitor
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/uniqueid-20-monitor?rev=5116&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-20-monitor (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-20-monitor Fri Dec 21 20:40:18 2007
@@ -1,6 +1,6 @@
--- a/res/res_monitor.c
+++ b/res/res_monitor.c
-@@ -328,6 +328,11 @@ int ast_monitor_stop(struct ast_channel
+@@ -337,6 +337,11 @@ int ast_monitor_stop(struct ast_channel
result = ast_safe_system(tmp);
if (result == -1)
ast_log(LOG_WARNING, "Execute of %s failed.\n",tmp);
@@ -12,7 +12,7 @@
}
free(chan->monitor->format);
-@@ -494,18 +499,28 @@ static int start_monitor_action(struct m
+@@ -503,18 +508,28 @@ static int start_monitor_action(struct m
const char *fname = astman_get_header(m, "File");
const char *format = astman_get_header(m, "Format");
const char *mix = astman_get_header(m, "Mix");
@@ -46,7 +46,7 @@
}
if (ast_strlen_zero(fname)) {
-@@ -546,16 +561,30 @@ static int stop_monitor_action(struct ma
+@@ -555,16 +570,30 @@ static int stop_monitor_action(struct ma
{
struct ast_channel *c = NULL;
const char *name = astman_get_header(m, "Channel");
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=5116&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn Fri Dec 21 20:40:18 2007
@@ -1423,7 +1423,7 @@
/* Get the use_callingpres state */
pri->pvts[chanpos]->callingpres = e->ring.callingpres;
-@@ -8917,17 +9323,34 @@ static void *pri_dchannel(void *vpri)
+@@ -8917,10 +9323,17 @@ static void *pri_dchannel(void *vpri)
/* Set bearer and such */
pri_assign_bearer(crv, pri, pri->pvts[chanpos]);
c = zt_new(crv, AST_STATE_RESERVED, 0, SUB_REAL, law, e->ring.ctype);
@@ -1439,9 +1439,9 @@
+ }
+ zt_enable_ec(pri->pvts[chanpos]); /* XXX rethink */
}
-
+
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
-
+@@ -8928,6 +9341,16 @@ static void *pri_dchannel(void *vpri)
if (!ast_strlen_zero(e->ring.callingsubaddr)) {
pbx_builtin_setvar_helper(c, "CALLINGSUBADDR", e->ring.callingsubaddr);
}
@@ -1458,7 +1458,7 @@
if (e->ring.ani2 >= 0) {
snprintf(ani2str, 5, "%.2d", e->ring.ani2);
pbx_builtin_setvar_helper(c, "ANI2", ani2str);
-@@ -8946,8 +9369,8 @@ static void *pri_dchannel(void *vpri)
+@@ -8951,8 +9374,8 @@ static void *pri_dchannel(void *vpri)
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
if (c && !ast_pthread_create(&threadid, &attr, ss_thread, c)) {
if (option_verbose > 2)
@@ -1469,7 +1469,7 @@
pri->pvts[chanpos]->logicalspan, pri->pvts[chanpos]->prioffset, pri->span);
} else {
ast_log(LOG_WARNING, "Unable to start PBX on channel %d/%d, span %d\n",
-@@ -8955,15 +9378,19 @@ static void *pri_dchannel(void *vpri)
+@@ -8960,15 +9383,19 @@ static void *pri_dchannel(void *vpri)
if (c)
ast_hangup(c);
else {
@@ -1489,10 +1489,10 @@
+ }
if (c) {
char calledtonstr[10];
-
-@@ -8984,26 +9411,43 @@ static void *pri_dchannel(void *vpri)
- ast_mutex_lock(&pri->pvts[chanpos]->lock);
+
+@@ -8995,26 +9422,43 @@ static void *pri_dchannel(void *vpri)
ast_mutex_lock(&pri->lock);
+
if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Accepting call from '%s' to '%s' on channel %d/%d, span %d\n",
- plancallingnum, pri->pvts[chanpos]->exten,
@@ -1517,9 +1517,9 @@
+ pbx_builtin_setvar_helper(c, "UUI", e->ring.useruserinfo);
+ }
} else {
-
+
ast_mutex_lock(&pri->lock);
-
+
ast_log(LOG_WARNING, "Unable to start PBX on channel %d/%d, span %d\n",
pri->pvts[chanpos]->logicalspan, pri->pvts[chanpos]->prioffset, pri->span);
- pri_hangup(pri->pri, e->ring.call, PRI_CAUSE_SWITCH_CONGESTION);
@@ -1538,7 +1538,7 @@
pri->pvts[chanpos]->call = NULL;
pri->pvts[chanpos]->exten[0] = '\0';
}
-@@ -9009,9 +9453,9 @@ static void *pri_dchannel(void *vpri)
+@@ -9023,9 +9467,9 @@ static void *pri_dchannel(void *vpri)
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
} else {
if (e->ring.flexible)
@@ -1550,7 +1550,7 @@
}
break;
case PRI_EVENT_RINGING:
-@@ -9027,7 +9471,7 @@ static void *pri_dchannel(void *vpri)
+@@ -9041,7 +9485,7 @@ static void *pri_dchannel(void *vpri)
} else {
ast_mutex_lock(&pri->pvts[chanpos]->lock);
if (ast_strlen_zero(pri->pvts[chanpos]->dop.dialstr)) {
@@ -1559,7 +1559,7 @@
pri->pvts[chanpos]->subs[SUB_REAL].needringing = 1;
pri->pvts[chanpos]->alerting = 1;
} else
-@@ -9056,9 +9500,16 @@ static void *pri_dchannel(void *vpri)
+@@ -9073,9 +9517,16 @@ static void *pri_dchannel(void *vpri)
}
break;
case PRI_EVENT_PROGRESS:
@@ -1577,7 +1577,7 @@
#ifdef PRI_PROGRESS_MASK
if ((!pri->pvts[chanpos]->progress) || (e->proceeding.progressmask & PRI_PROG_INBAND_AVAILABLE)) {
#else
-@@ -9105,6 +9556,12 @@ static void *pri_dchannel(void *vpri)
+@@ -9122,6 +9573,12 @@ static void *pri_dchannel(void *vpri)
case PRI_EVENT_PROCEEDING:
chanpos = pri_find_principle(pri, e->proceeding.channel);
if (chanpos > -1) {
@@ -1590,7 +1590,7 @@
if (!pri->pvts[chanpos]->proceeding) {
struct ast_frame f = { AST_FRAME_CONTROL, AST_CONTROL_PROCEEDING, };
-@@ -9152,6 +9609,295 @@ static void *pri_dchannel(void *vpri)
+@@ -9169,6 +9626,295 @@ static void *pri_dchannel(void *vpri)
}
}
break;
@@ -1886,7 +1886,7 @@
case PRI_EVENT_ANSWER:
chanpos = pri_find_principle(pri, e->answer.channel);
if (chanpos < 0) {
-@@ -9164,6 +9910,7 @@ static void *pri_dchannel(void *vpri)
+@@ -9181,6 +9927,7 @@ static void *pri_dchannel(void *vpri)
PRI_SPAN(e->answer.channel), PRI_CHANNEL(e->answer.channel), pri->span);
} else {
ast_mutex_lock(&pri->pvts[chanpos]->lock);
@@ -1894,7 +1894,7 @@
/* Now we can do call progress detection */
/* We changed this so it turns on the DSP no matter what... progress or no progress.
-@@ -9193,11 +9940,16 @@ static void *pri_dchannel(void *vpri)
+@@ -9210,11 +9957,16 @@ static void *pri_dchannel(void *vpri)
ast_log(LOG_DEBUG, "Sent deferred digit string: %s\n", pri->pvts[chanpos]->dop.dialstr);
pri->pvts[chanpos]->dop.dialstr[0] = '\0';
} else if (pri->pvts[chanpos]->confirmanswer) {
@@ -1912,7 +1912,7 @@
}
#ifdef SUPPORT_USERUSER
-@@ -9251,20 +10003,29 @@ static void *pri_dchannel(void *vpri)
+@@ -9271,20 +10023,29 @@ static void *pri_dchannel(void *vpri)
ast_verbose(VERBOSE_PREFIX_3 "Channel %d/%d, span %d got hangup, cause %d\n",
pri->pvts[chanpos]->logicalspan, pri->pvts[chanpos]->prioffset, pri->span, e->hangup.cause);
} else {
@@ -1949,7 +1949,7 @@
#ifdef SUPPORT_USERUSER
if (pri->pvts[chanpos]->owner && !ast_strlen_zero(e->hangup.useruserinfo)) {
-@@ -9274,8 +10035,20 @@ static void *pri_dchannel(void *vpri)
+@@ -9297,8 +10058,20 @@ static void *pri_dchannel(void *vpri)
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
} else {
@@ -1972,7 +1972,7 @@
}
}
break;
-@@ -9285,15 +10058,23 @@ static void *pri_dchannel(void *vpri)
+@@ -9308,15 +10081,23 @@ static void *pri_dchannel(void *vpri)
case PRI_EVENT_HANGUP_REQ:
chanpos = pri_find_principle(pri, e->hangup.channel);
if (chanpos < 0) {
@@ -1999,7 +1999,7 @@
pri->pvts[chanpos]->owner->hangupcause = e->hangup.cause;
if (pri->pvts[chanpos]->owner->_state == AST_STATE_UP)
pri->pvts[chanpos]->owner->_softhangup |= AST_SOFTHANGUP_DEV;
-@@ -9320,16 +10101,86 @@ static void *pri_dchannel(void *vpri)
+@@ -9343,16 +10124,86 @@ static void *pri_dchannel(void *vpri)
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Channel %d/%d, span %d received AOC-E charging %d unit%s\n",
pri->pvts[chanpos]->logicalspan, pri->pvts[chanpos]->prioffset, pri->span, (int)e->hangup.aoc_units, (e->hangup.aoc_units == 1) ? "" : "s");
@@ -2090,7 +2090,7 @@
}
#ifdef SUPPORT_USERUSER
-@@ -9340,9 +10191,39 @@ static void *pri_dchannel(void *vpri)
+@@ -9366,9 +10217,39 @@ static void *pri_dchannel(void *vpri)
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
} else {
@@ -2131,7 +2131,7 @@
break;
case PRI_EVENT_HANGUP_ACK:
chanpos = pri_find_principle(pri, e->hangup.channel);
-@@ -9354,6 +10235,7 @@ static void *pri_dchannel(void *vpri)
+@@ -9380,6 +10261,7 @@ static void *pri_dchannel(void *vpri)
if (chanpos > -1) {
ast_mutex_lock(&pri->pvts[chanpos]->lock);
pri->pvts[chanpos]->call = NULL;
@@ -2139,7 +2139,7 @@
pri->pvts[chanpos]->resetting = 0;
if (pri->pvts[chanpos]->owner) {
if (option_verbose > 2)
-@@ -9367,7 +10249,9 @@ static void *pri_dchannel(void *vpri)
+@@ -9396,7 +10278,9 @@ static void *pri_dchannel(void *vpri)
#endif
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
@@ -2149,7 +2149,7 @@
}
break;
case PRI_EVENT_CONFIG_ERR:
-@@ -9457,10 +10341,22 @@ static void *pri_dchannel(void *vpri)
+@@ -9486,10 +10370,22 @@ static void *pri_dchannel(void *vpri)
ast_mutex_lock(&pri->pvts[chanpos]->lock);
switch (e->notify.info) {
case PRI_NOTIFY_REMOTE_HOLD:
@@ -2172,7 +2172,7 @@
f.subclass = AST_CONTROL_UNHOLD;
zap_queue_frame(pri->pvts[chanpos], &f, pri);
break;
-@@ -9468,6 +10364,77 @@ static void *pri_dchannel(void *vpri)
+@@ -9497,6 +10393,77 @@ static void *pri_dchannel(void *vpri)
ast_mutex_unlock(&pri->pvts[chanpos]->lock);
}
break;
@@ -2250,7 +2250,7 @@
default:
ast_log(LOG_DEBUG, "Event: %d\n", e->e);
}
-@@ -9529,7 +10496,7 @@ static int start_pri(struct zt_pri *pri)
+@@ -9558,7 +10525,7 @@ static int start_pri(struct zt_pri *pri)
pri->fds[i] = -1;
return -1;
}
@@ -2259,7 +2259,7 @@
/* Force overlap dial if we're doing GR-303! */
if (pri->switchtype == PRI_SWITCH_GR303_TMC)
pri->overlapdial = 1;
-@@ -9597,39 +10564,77 @@ static char *complete_span_5(const char
+@@ -9626,39 +10593,77 @@ static char *complete_span_5(const char
static int handle_pri_set_debug_file(int fd, int argc, char **argv)
{
@@ -2357,7 +2357,7 @@
}
return RESULT_SUCCESS;
-@@ -9663,6 +10668,7 @@ static int handle_pri_debug(int fd, int
+@@ -9692,6 +10697,7 @@ static int handle_pri_debug(int fd, int
@@ -2365,7 +2365,7 @@
static int handle_pri_no_debug(int fd, int argc, char *argv[])
{
int span;
-@@ -9812,10 +10818,6 @@ static int handle_pri_show_debug(int fd,
+@@ -9841,10 +10847,6 @@ static int handle_pri_show_debug(int fd,
}
}
@@ -2376,7 +2376,7 @@
if (!count)
ast_cli(fd, "No debug set or no PRI running\n");
-@@ -9842,6 +10844,18 @@ static const char pri_show_spans_help[]
+@@ -9871,6 +10873,18 @@ static const char pri_show_spans_help[]
"Usage: pri show spans\n"
" Displays PRI Information\n";
@@ -2395,7 +2395,7 @@
static struct ast_cli_entry zap_pri_cli[] = {
{ { "pri", "debug", "span", NULL },
handle_pri_debug, "Enables PRI debugging on a span",
-@@ -9866,6 +10880,15 @@ static struct ast_cli_entry zap_pri_cli[
+@@ -9895,6 +10909,15 @@ static struct ast_cli_entry zap_pri_cli[
{ { "pri", "show", "debug", NULL },
handle_pri_show_debug, "Displays current PRI debug settings" },
@@ -2411,7 +2411,7 @@
{ { "pri", "set", "debug", "file", NULL },
handle_pri_set_debug_file, "Sends PRI debug output to the specified file" },
-@@ -9873,8 +10896,76 @@ static struct ast_cli_entry zap_pri_cli[
+@@ -9902,8 +10925,76 @@ static struct ast_cli_entry zap_pri_cli[
handle_pri_set_debug_file, "Ends PRI debug output to file" },
};
@@ -2488,7 +2488,7 @@
static int zap_destroy_channel(int fd, int argc, char **argv)
{
int channel;
-@@ -10455,8 +11546,11 @@ static int __unload_module(void)
+@@ -10484,8 +11575,11 @@ static int __unload_module(void)
}
ast_cli_unregister_multiple(zap_pri_cli, sizeof(zap_pri_cli) / sizeof(struct ast_cli_entry));
ast_unregister_application(zap_send_keypad_facility_app);
@@ -2500,7 +2500,7 @@
ast_manager_unregister( "ZapDialOffhook" );
ast_manager_unregister( "ZapHangup" );
ast_manager_unregister( "ZapTransfer" );
-@@ -10958,6 +12052,22 @@ static int process_zap(struct zt_chan_co
+@@ -10987,6 +12081,22 @@ static int process_zap(struct zt_chan_co
confp->chan.sig = SIG_GR303FXSKS;
confp->chan.radio = 0;
confp->pri.nodetype = PRI_CPE;
@@ -2523,7 +2523,7 @@
#endif
} else {
ast_log(LOG_ERROR, "Unknown signalling method '%s'\n", v->value);
-@@ -11070,9 +12180,21 @@ static int process_zap(struct zt_chan_co
+@@ -11099,9 +12209,21 @@ static int process_zap(struct zt_chan_co
confp->chan.priindication_oob = 1;
else if (!strcasecmp(v->value, "inband"))
confp->chan.priindication_oob = 0;
@@ -2546,7 +2546,7 @@
} else if (!strcasecmp(v->name, "priexclusive")) {
confp->chan.priexclusive = ast_true(v->value);
} else if (!strcasecmp(v->name, "internationalprefix")) {
-@@ -11085,6 +12207,10 @@ static int process_zap(struct zt_chan_co
+@@ -11114,6 +12236,10 @@ static int process_zap(struct zt_chan_co
ast_copy_string(confp->pri.privateprefix, v->value, sizeof(confp->pri.privateprefix));
} else if (!strcasecmp(v->name, "unknownprefix")) {
ast_copy_string(confp->pri.unknownprefix, v->value, sizeof(confp->pri.unknownprefix));
@@ -2557,7 +2557,7 @@
} else if (!strcasecmp(v->name, "resetinterval")) {
if (!strcasecmp(v->value, "never"))
confp->pri.resetinterval = -1;
-@@ -11101,6 +12227,8 @@ static int process_zap(struct zt_chan_co
+@@ -11130,6 +12256,8 @@ static int process_zap(struct zt_chan_co
ast_copy_string(confp->pri.idleext, v->value, sizeof(confp->pri.idleext));
} else if (!strcasecmp(v->name, "idledial")) {
ast_copy_string(confp->pri.idledial, v->value, sizeof(confp->pri.idledial));
@@ -2566,7 +2566,7 @@
} else if (!strcasecmp(v->name, "overlapdial")) {
confp->pri.overlapdial = ast_true(v->value);
} else if (!strcasecmp(v->name, "pritimer")) {
-@@ -11402,6 +12530,7 @@ static int setup_zap(int reload)
+@@ -11431,6 +12559,7 @@ static int setup_zap(int reload)
#ifdef HAVE_PRI
if (!reload) {
for (x = 0; x < NUM_SPANS; x++) {
@@ -2574,7 +2574,7 @@
if (pris[x].pvts[0]) {
if (start_pri(pris + x)) {
ast_log(LOG_ERROR, "Unable to start D-channel on span %d\n", x + 1);
-@@ -11449,7 +12578,10 @@ static int load_module(void)
+@@ -11478,7 +12607,10 @@ static int load_module(void)
ast_string_field_init(&inuse, 16);
ast_string_field_set(&inuse, name, "GR-303InUse");
ast_cli_register_multiple(zap_pri_cli, sizeof(zap_pri_cli) / sizeof(struct ast_cli_entry));
@@ -2585,7 +2585,7 @@
ast_cli_register_multiple(zap_cli, sizeof(zap_cli) / sizeof(struct ast_cli_entry));
memset(round_robin, 0, sizeof(round_robin));
-@@ -11483,6 +12615,7 @@ static int zt_sendtext(struct ast_channe
+@@ -11512,6 +12644,7 @@ static int zt_sendtext(struct ast_channe
float scont = 0.0;
int index;
Modified: asterisk/trunk/debian/patches/bristuff/zapata-gsm
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/zapata-gsm?rev=5116&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-gsm (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-gsm Fri Dec 21 20:40:18 2007
@@ -473,7 +473,7 @@
static int pri_check_restart(struct zt_pri *pri)
{
if ((pri->nodetype != PRI_NETWORK) && (pri->nodetype != PRI_CPE)) {
-@@ -10928,6 +11267,243 @@ static int app_zapInband(struct ast_chan
+@@ -10957,6 +11296,243 @@ static int app_zapInband(struct ast_chan
#endif /* HAVE_PRI */
@@ -717,7 +717,7 @@
static int app_zapEC(struct ast_channel *chan, void *data)
{
int res=-1;
-@@ -11549,6 +12125,12 @@ static int __unload_module(void)
+@@ -11578,6 +12154,12 @@ static int __unload_module(void)
ast_unregister_application(zapCD_app);
ast_unregister_application(zapInband_app);
#endif
@@ -730,7 +730,7 @@
ast_cli_unregister_multiple(zap_cli, sizeof(zap_cli) / sizeof(struct ast_cli_entry));
ast_unregister_application(zapEC_app);
ast_manager_unregister( "ZapDialOffhook" );
-@@ -12069,6 +12651,11 @@ static int process_zap(struct zt_chan_co
+@@ -12098,6 +12680,11 @@ static int process_zap(struct zt_chan_co
confp->chan.radio = 0;
confp->pri.nodetype = BRI_CPE;
#endif
@@ -742,7 +742,7 @@
} else {
ast_log(LOG_ERROR, "Unknown signalling method '%s'\n", v->value);
}
-@@ -12211,6 +12798,10 @@ static int process_zap(struct zt_chan_co
+@@ -12240,6 +12827,10 @@ static int process_zap(struct zt_chan_co
ast_copy_string(confp->pri.nocid, v->value, sizeof(confp->pri.nocid));
} else if (!strcasecmp(v->name, "withheldcid")) {
ast_copy_string(confp->pri.withheldcid, v->value, sizeof(confp->pri.withheldcid));
@@ -753,7 +753,7 @@
} else if (!strcasecmp(v->name, "resetinterval")) {
if (!strcasecmp(v->value, "never"))
confp->pri.resetinterval = -1;
-@@ -12565,6 +13156,10 @@ static int load_module(void)
+@@ -12594,6 +13185,10 @@ static int load_module(void)
ast_register_application(zap_send_keypad_facility_app, zap_send_keypad_facility_exec,
zap_send_keypad_facility_synopsis, zap_send_keypad_facility_descrip);
#endif
@@ -764,7 +764,7 @@
res = setup_zap(0);
/* Make sure we can register our Zap channel type */
if (res)
-@@ -12583,6 +13178,12 @@ static int load_module(void)
+@@ -12612,6 +13207,12 @@ static int load_module(void)
#endif
ast_register_application(zapEC_app, app_zapEC, zapEC_synopsis, zapEC_tdesc);
ast_cli_register_multiple(zap_cli, sizeof(zap_cli) / sizeof(struct ast_cli_entry));
@@ -777,7 +777,7 @@
memset(round_robin, 0, sizeof(round_robin));
ast_manager_register( "ZapTransfer", 0, action_transfer, "Transfer Zap Channel" );
-@@ -12596,7 +13197,48 @@ static int load_module(void)
+@@ -12625,7 +13226,48 @@ static int load_module(void)
return res;
}
@@ -829,7 +829,7 @@
#define HEADER_MS 50
--- a/configure.ac
+++ b/configure.ac
-@@ -173,6 +173,7 @@ AST_EXT_LIB_SETUP([CAP], [POSIX 1.e capa
+@@ -178,6 +178,7 @@ AST_EXT_LIB_SETUP([CAP], [POSIX 1.e capa
AST_EXT_LIB_SETUP([CURSES], [curses], [curses])
AST_EXT_LIB_SETUP([GNUTLS], [GNU TLS support (used for iksemel only)], [gnutls])
AST_EXT_LIB_SETUP([GSM], [GSM], [gsm], [, or 'internal'])
@@ -839,7 +839,7 @@
AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
--- a/configure
+++ b/configure
-@@ -25562,6 +25562,188 @@ echo "$as_me: *** without explicitly spe
+@@ -25667,6 +25667,188 @@ echo "$as_me: *** without explicitly spe
fi
fi
Modified: asterisk/trunk/debian/patches/configure-libc-client
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/configure-libc-client?rev=5116&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/configure-libc-client (original)
+++ asterisk/trunk/debian/patches/configure-libc-client Fri Dec 21 20:40:18 2007
@@ -6,7 +6,7 @@
--- a/configure
+++ b/configure
-@@ -18673,7 +18673,7 @@ echo $ECHO_N "checking for UW IMAP Toolk
+@@ -18778,7 +18778,7 @@ echo $ECHO_N "checking for UW IMAP Toolk
imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
fi
CPPFLAGS="${CPPFLAGS} -I${IMAP_TK_DIR}/c-client"
@@ -15,7 +15,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -18865,7 +18865,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -18970,7 +18970,7 @@ rm -f core conftest.err conftest.$ac_obj
if test "${ac_cv_imap_tk}" = "yes"; then
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
@@ -26,7 +26,7 @@
--- a/configure.ac
+++ b/configure.ac
-@@ -483,7 +483,7 @@ if test "${USE_IMAP_TK}" != "no"; then
+@@ -488,7 +488,7 @@ if test "${USE_IMAP_TK}" != "no"; then
imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
fi
CPPFLAGS="${CPPFLAGS} -I${IMAP_TK_DIR}/c-client"
@@ -35,7 +35,7 @@
AC_LINK_IFELSE(
AC_LANG_PROGRAM(
[#include "c-client.h"
-@@ -600,7 +600,7 @@ if test "${USE_IMAP_TK}" != "no"; then
+@@ -605,7 +605,7 @@ if test "${USE_IMAP_TK}" != "no"; then
LIBS="${saved_libs}"
if test "${ac_cv_imap_tk}" = "yes"; then
AC_MSG_RESULT(yes)
Modified: asterisk/trunk/debian/patches/tos-libcap
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/tos-libcap?rev=5116&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/tos-libcap (original)
+++ asterisk/trunk/debian/patches/tos-libcap Fri Dec 21 20:40:18 2007
@@ -9,7 +9,7 @@
--- a/configure
+++ b/configure
-@@ -725,6 +725,10 @@ CURL_LIB
+@@ -726,6 +726,10 @@ CURL_LIB
CURL_INCLUDE
CURL_DIR
PBX_CURL
@@ -20,7 +20,7 @@
CURSES_LIB
CURSES_INCLUDE
CURSES_DIR
-@@ -1507,6 +1511,7 @@ Optional Packages:
+@@ -1508,6 +1512,7 @@ Optional Packages:
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-asound=PATH use Advanced Linux Sound Architecture files in PATH
--with-curl=PATH use cURL files in PATH
@@ -28,7 +28,7 @@
--with-curses=PATH use curses files in PATH
--with-gnutls=PATH use GNU TLS support (used for iksemel only) files in
PATH
-@@ -7693,6 +7698,34 @@ PBX_CURL=0
+@@ -7798,6 +7803,34 @@ PBX_CURL=0
@@ -63,7 +63,7 @@
CURSES_DESCRIP="curses"
CURSES_OPTION="curses"
-@@ -17132,6 +17165,417 @@ echo "$as_me: *** without explicitly spe
+@@ -17237,6 +17270,417 @@ echo "$as_me: *** without explicitly spe
fi
@@ -481,7 +481,7 @@
GSM_INTERNAL="yes"
GSM_SYSTEM="yes"
-@@ -34220,6 +34664,10 @@ CURL_LIB!$CURL_LIB$ac_delim
+@@ -34326,6 +34770,10 @@ CURL_LIB!$CURL_LIB$ac_delim
CURL_INCLUDE!$CURL_INCLUDE$ac_delim
CURL_DIR!$CURL_DIR$ac_delim
PBX_CURL!$PBX_CURL$ac_delim
@@ -492,7 +492,7 @@
CURSES_LIB!$CURSES_LIB$ac_delim
CURSES_INCLUDE!$CURSES_INCLUDE$ac_delim
CURSES_DIR!$CURSES_DIR$ac_delim
-@@ -34305,9 +34753,6 @@ PWLIB_INCLUDE!$PWLIB_INCLUDE$ac_delim
+@@ -34411,9 +34859,6 @@ PWLIB_INCLUDE!$PWLIB_INCLUDE$ac_delim
PWLIB_DIR!$PWLIB_DIR$ac_delim
PBX_PWLIB!$PBX_PWLIB$ac_delim
OPENH323_LIB!$OPENH323_LIB$ac_delim
@@ -502,7 +502,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -34350,6 +34794,9 @@ _ACEOF
+@@ -34455,6 +34900,9 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -512,7 +512,7 @@
QT_LIB!$QT_LIB$ac_delim
QT_INCLUDE!$QT_INCLUDE$ac_delim
QT_DIR!$QT_DIR$ac_delim
-@@ -34443,6 +34891,47 @@ GTK_LIB!$GTK_LIB$ac_delim
+@@ -34549,6 +34997,47 @@ GTK_LIB!$GTK_LIB$ac_delim
PKGCONFIG!$PKGCONFIG$ac_delim
PBX_GTK2!$PBX_GTK2$ac_delim
GTK2_INCLUDE!$GTK2_INCLUDE$ac_delim
@@ -560,7 +560,7 @@
GTK2_LIB!$GTK2_LIB$ac_delim
CURL_CONFIG!$CURL_CONFIG$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
-@@ -34466,8 +34955,8 @@ if test -n "$ac_eof"; then
+@@ -34572,8 +35061,8 @@ if test -n "$ac_eof"; then
fi
cat >>$CONFIG_STATUS <<_ACEOF
@@ -571,7 +571,7 @@
_ACEOF
sed '
s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-@@ -34480,6 +34969,8 @@ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!
+@@ -34586,6 +35075,8 @@ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!
' >>$CONFIG_STATUS <conf$$subs.sed
rm -f conf$$subs.sed
cat >>$CONFIG_STATUS <<_ACEOF
@@ -580,7 +580,7 @@
CEOF$ac_eof
_ACEOF
-@@ -34727,7 +35218,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
+@@ -34833,7 +35324,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
$ac_datarootdir_hack
@@ -591,7 +591,7 @@
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
--- a/configure.ac
+++ b/configure.ac
-@@ -169,6 +169,7 @@ AC_SUBST(AST_DEVMODE)
+@@ -174,6 +174,7 @@ AC_SUBST(AST_DEVMODE)
AST_EXT_LIB_SETUP([ALSA], [Advanced Linux Sound Architecture], [asound])
AST_EXT_LIB_SETUP([CURL], [cURL], [curl])
@@ -599,7 +599,7 @@
AST_EXT_LIB_SETUP([CURSES], [curses], [curses])
AST_EXT_LIB_SETUP([GNUTLS], [GNU TLS support (used for iksemel only)], [gnutls])
AST_EXT_LIB_SETUP([GSM], [GSM], [gsm], [, or 'internal'])
-@@ -394,6 +395,10 @@ AST_EXT_LIB_CHECK([ALSA], [asound], [snd
+@@ -399,6 +400,10 @@ AST_EXT_LIB_CHECK([ALSA], [asound], [snd
AST_EXT_LIB_CHECK([CURSES], [curses], [initscr], [curses.h])
Modified: asterisk/trunk/debian/patches/use-libpri-bristuffed
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/use-libpri-bristuffed?rev=5116&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/use-libpri-bristuffed (original)
+++ asterisk/trunk/debian/patches/use-libpri-bristuffed Fri Dec 21 20:40:18 2007
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -25233,18 +25233,18 @@ fi
+@@ -25338,18 +25338,18 @@ fi
if test "${AST_PRI_FOUND}" = "yes"; then
@@ -25,7 +25,7 @@
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-@@ -25253,8 +25253,8 @@ ac_res=`eval echo '${'$as_ac_Header'}'`
+@@ -25358,8 +25358,8 @@ ac_res=`eval echo '${'$as_ac_Header'}'`
echo "${ECHO_T}$ac_res" >&6; }
else
# Is the header compilable?
@@ -36,7 +36,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25262,7 +25262,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -25367,7 +25367,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -45,7 +45,7 @@
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
-@@ -25294,15 +25294,15 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -25399,15 +25399,15 @@ rm -f core conftest.err conftest.$ac_obj
echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
@@ -64,7 +64,7 @@
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
-@@ -25335,25 +25335,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6;
+@@ -25440,25 +25440,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6;
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
@@ -106,7 +106,7 @@
( cat <<\_ASBOX
## ------------------------------- ##
## Report this to www.asterisk.org ##
-@@ -25362,8 +25362,8 @@ _ASBOX
+@@ -25467,8 +25467,8 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -119,7 +119,7 @@
else
--- a/configure.ac
+++ b/configure.ac
-@@ -819,7 +819,7 @@ fi
+@@ -824,7 +824,7 @@ fi
AST_EXT_LIB_CHECK([POPT], [popt], [poptStrerror], [popt.h])
More information about the Pkg-voip-commits
mailing list