[Pkg-voip-commits] r5188 - in /asterisk/trunk/debian/patches: ./ bristuff/
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Thu Feb 7 22:49:30 UTC 2008
Author: paravoid
Date: Thu Feb 7 22:49:30 2008
New Revision: 5188
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5188
Log:
Do a quilt refresh on all patches to reduce offsets
Modified:
asterisk/trunk/debian/patches/astvarrundir
asterisk/trunk/debian/patches/bristuff/answer-before-say
asterisk/trunk/debian/patches/bristuff/app-dial-R-noinband
asterisk/trunk/debian/patches/bristuff/app-dial-c-callback
asterisk/trunk/debian/patches/bristuff/app-dial-etc
asterisk/trunk/debian/patches/bristuff/app-dial-priority-202
asterisk/trunk/debian/patches/bristuff/ast-send-message
asterisk/trunk/debian/patches/bristuff/ast_monitor_start-targetscript
asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause
asterisk/trunk/debian/patches/bristuff/feature-autoanswer
asterisk/trunk/debian/patches/bristuff/feature-holdedcalls
asterisk/trunk/debian/patches/bristuff/uniqueid-01-use-pid-on-uniqueid-generation
asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid
asterisk/trunk/debian/patches/bristuff/uniqueid-20-monitor
asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy
asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager
asterisk/trunk/debian/patches/bristuff/zapata-gsm
asterisk/trunk/debian/patches/bristuff/zapata_euroisdn_holded
asterisk/trunk/debian/patches/configure-libc-client
asterisk/trunk/debian/patches/debian-banner
asterisk/trunk/debian/patches/h323-no-deps-on-asterisk
asterisk/trunk/debian/patches/make-clean-fixes
asterisk/trunk/debian/patches/pubkey_jnctn
asterisk/trunk/debian/patches/use-libpri-bristuffed
Modified: asterisk/trunk/debian/patches/astvarrundir
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/astvarrundir?rev=5188&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/astvarrundir (original)
+++ asterisk/trunk/debian/patches/astvarrundir Thu Feb 7 22:49:30 2008
@@ -7,7 +7,7 @@
--- a/Makefile
+++ b/Makefile
-@@ -123,7 +123,7 @@ else
+@@ -125,7 +125,7 @@ else
ASTSBINDIR=$(sbindir)
ASTSPOOLDIR=$(localstatedir)/spool/asterisk
ASTLOGDIR=$(localstatedir)/log/asterisk
Modified: asterisk/trunk/debian/patches/bristuff/answer-before-say
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/answer-before-say?rev=5188&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/answer-before-say (original)
+++ asterisk/trunk/debian/patches/bristuff/answer-before-say Thu Feb 7 22:49:30 2008
@@ -3,7 +3,7 @@
--- a/main/pbx.c
+++ b/main/pbx.c
-@@ -6060,6 +6060,9 @@ static int pbx_builtin_saynumber(struct
+@@ -6065,6 +6065,9 @@ static int pbx_builtin_saynumber(struct
return -1;
}
}
@@ -13,7 +13,7 @@
return ast_say_number(chan, atoi(tmp), "", chan->language, options);
}
-@@ -6067,8 +6070,12 @@ static int pbx_builtin_saydigits(struct
+@@ -6072,8 +6075,12 @@ static int pbx_builtin_saydigits(struct
{
int res = 0;
@@ -27,7 +27,7 @@
return res;
}
-@@ -6076,8 +6083,12 @@ static int pbx_builtin_saycharacters(str
+@@ -6081,8 +6088,12 @@ static int pbx_builtin_saycharacters(str
{
int res = 0;
@@ -41,7 +41,7 @@
return res;
}
-@@ -6085,8 +6096,12 @@ static int pbx_builtin_sayphonetic(struc
+@@ -6090,8 +6101,12 @@ static int pbx_builtin_sayphonetic(struc
{
int res = 0;
Modified: asterisk/trunk/debian/patches/bristuff/app-dial-R-noinband
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/app-dial-R-noinband?rev=5188&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/app-dial-R-noinband (original)
+++ asterisk/trunk/debian/patches/bristuff/app-dial-R-noinband Thu Feb 7 22:49:30 2008
@@ -1,6 +1,6 @@
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
-@@ -193,6 +193,8 @@ static char *descrip =
+@@ -198,6 +198,8 @@ static char *descrip =
" family/key is not specified.\n"
" r - Indicate ringing to the calling party. Pass no audio to the calling\n"
" party until the called channel has answered.\n"
@@ -9,7 +9,7 @@
" S(x) - Hang up the call after 'x' seconds *after* the called party has\n"
" answered the call.\n"
" t - Allow the called party to transfer the calling party by sending the\n"
-@@ -249,6 +251,7 @@ enum {
+@@ -254,6 +256,7 @@ enum {
OPT_CALLEE_PARK = (1 << 25),
OPT_CALLER_PARK = (1 << 26),
OPT_IGNORE_FORWARDING = (1 << 27),
@@ -17,7 +17,7 @@
} dial_exec_option_flags;
#define DIAL_STILLGOING (1 << 30)
-@@ -292,6 +295,7 @@ AST_APP_OPTIONS(dial_exec_options, {
+@@ -297,6 +300,7 @@ AST_APP_OPTIONS(dial_exec_options, {
AST_APP_OPTION('p', OPT_SCREENING),
AST_APP_OPTION_ARG('P', OPT_PRIVACY, OPT_ARG_PRIVACY),
AST_APP_OPTION('r', OPT_RINGBACK),
@@ -25,7 +25,7 @@
AST_APP_OPTION_ARG('S', OPT_DURATION_STOP, OPT_ARG_DURATION_STOP),
AST_APP_OPTION('t', OPT_CALLEE_TRANSFER),
AST_APP_OPTION('T', OPT_CALLER_TRANSFER),
-@@ -407,7 +411,7 @@ static struct ast_channel *wait_for_answ
+@@ -412,7 +416,7 @@ static struct ast_channel *wait_for_answ
int orig = *to;
struct ast_channel *peer = NULL;
/* single is set if only one destination is enabled */
@@ -34,7 +34,7 @@
if (single) {
/* Turn off hold music, etc */
-@@ -628,7 +632,7 @@ static struct ast_channel *wait_for_answ
+@@ -633,7 +637,7 @@ static struct ast_channel *wait_for_answ
/* Setup early media if appropriate */
if (single && CAN_EARLY_BRIDGE(peerflags))
ast_rtp_early_bridge(in, c);
@@ -43,7 +43,7 @@
ast_indicate(in, AST_CONTROL_PROGRESS);
break;
case AST_CONTROL_VIDUPDATE:
-@@ -641,7 +645,7 @@ static struct ast_channel *wait_for_answ
+@@ -646,7 +650,7 @@ static struct ast_channel *wait_for_answ
ast_verbose (VERBOSE_PREFIX_3 "%s is proceeding passing it to %s\n", c->name, in->name);
if (single && CAN_EARLY_BRIDGE(peerflags))
ast_rtp_early_bridge(in, c);
@@ -52,7 +52,7 @@
ast_indicate(in, AST_CONTROL_PROCEEDING);
break;
case AST_CONTROL_HOLD:
-@@ -659,7 +663,7 @@ static struct ast_channel *wait_for_answ
+@@ -664,7 +668,7 @@ static struct ast_channel *wait_for_answ
/* Ignore going off hook and flash */
break;
case -1:
@@ -61,7 +61,7 @@
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "%s stopped sounds\n", c->name);
ast_indicate(in, -1);
-@@ -1099,7 +1103,7 @@ static int dial_exec_full(struct ast_cha
+@@ -1104,7 +1108,7 @@ static int dial_exec_full(struct ast_cha
outbound_group = pbx_builtin_getvar_helper(chan, "OUTBOUND_GROUP");
}
@@ -70,7 +70,7 @@
/* loop through the list of dial destinations */
rest = args.peers;
while ((cur = strsep(&rest, "&")) ) {
-@@ -1124,7 +1128,7 @@ static int dial_exec_full(struct ast_cha
+@@ -1129,7 +1133,7 @@ static int dial_exec_full(struct ast_cha
OPT_CALLEE_HANGUP | OPT_CALLER_HANGUP |
OPT_CALLEE_MONITOR | OPT_CALLER_MONITOR |
OPT_CALLEE_PARK | OPT_CALLER_PARK |
@@ -79,7 +79,7 @@
ast_set2_flag(tmp, args.url, DIAL_NOFORWARDHTML);
}
ast_copy_string(numsubst, number, sizeof(numsubst));
-@@ -1327,7 +1331,7 @@ static int dial_exec_full(struct ast_cha
+@@ -1332,7 +1336,7 @@ static int dial_exec_full(struct ast_cha
ast_moh_start(chan, NULL, NULL);
}
ast_indicate(chan, AST_CONTROL_PROGRESS);
@@ -88,7 +88,7 @@
ast_indicate(chan, AST_CONTROL_RINGING);
sentringing++;
}
-@@ -1444,7 +1448,7 @@ static int dial_exec_full(struct ast_cha
+@@ -1449,7 +1453,7 @@ static int dial_exec_full(struct ast_cha
if (ast_test_flag(&opts, OPT_MUSICBACK)) {
ast_moh_stop(chan);
Modified: asterisk/trunk/debian/patches/bristuff/app-dial-c-callback
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/app-dial-c-callback?rev=5188&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/app-dial-c-callback (original)
+++ asterisk/trunk/debian/patches/bristuff/app-dial-c-callback Thu Feb 7 22:49:30 2008
@@ -1,6 +1,6 @@
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
-@@ -196,7 +196,8 @@ static char *descrip =
+@@ -201,7 +201,8 @@ static char *descrip =
" R - indicate ringing to the calling party when the called party indicates\n"
" ringing, pass no audio until answered.\n"
" S(x) - Hang up the call after 'x' seconds *after* the called party has\n"
@@ -10,7 +10,7 @@
" t - Allow the called party to transfer the calling party by sending the\n"
" DTMF sequence defined in features.conf.\n"
" T - Allow the calling party to transfer the called party by sending the\n"
-@@ -252,6 +253,7 @@ enum {
+@@ -257,6 +258,7 @@ enum {
OPT_CALLER_PARK = (1 << 26),
OPT_IGNORE_FORWARDING = (1 << 27),
OPT_NOINBAND = (1 << 28),
@@ -18,7 +18,7 @@
} dial_exec_option_flags;
#define DIAL_STILLGOING (1 << 30)
-@@ -296,6 +298,7 @@ AST_APP_OPTIONS(dial_exec_options, {
+@@ -301,6 +303,7 @@ AST_APP_OPTIONS(dial_exec_options, {
AST_APP_OPTION_ARG('P', OPT_PRIVACY, OPT_ARG_PRIVACY),
AST_APP_OPTION('r', OPT_RINGBACK),
AST_APP_OPTION('R', OPT_NOINBAND),
@@ -26,7 +26,7 @@
AST_APP_OPTION_ARG('S', OPT_DURATION_STOP, OPT_ARG_DURATION_STOP),
AST_APP_OPTION('t', OPT_CALLEE_TRANSFER),
AST_APP_OPTION('T', OPT_CALLER_TRANSFER),
-@@ -616,14 +619,20 @@ static struct ast_channel *wait_for_answ
+@@ -621,14 +624,20 @@ static struct ast_channel *wait_for_answ
HANDLE_CAUSE(AST_CAUSE_CONGESTION, in);
break;
case AST_CONTROL_RINGING:
@@ -51,7 +51,7 @@
}
break;
case AST_CONTROL_PROGRESS:
-@@ -1103,7 +1112,7 @@ static int dial_exec_full(struct ast_cha
+@@ -1108,7 +1117,7 @@ static int dial_exec_full(struct ast_cha
outbound_group = pbx_builtin_getvar_helper(chan, "OUTBOUND_GROUP");
}
Modified: asterisk/trunk/debian/patches/bristuff/app-dial-etc
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/app-dial-etc?rev=5188&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/app-dial-etc (original)
+++ asterisk/trunk/debian/patches/bristuff/app-dial-etc Thu Feb 7 22:49:30 2008
@@ -1,6 +1,6 @@
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
-@@ -66,6 +66,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
+@@ -71,6 +71,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
#include "asterisk/privacy.h"
#include "asterisk/stringfields.h"
#include "asterisk/global_datastores.h"
@@ -8,7 +8,7 @@
static char *app = "Dial";
-@@ -1654,23 +1655,25 @@ static int dial_exec_full(struct ast_cha
+@@ -1659,23 +1660,25 @@ static int dial_exec_full(struct ast_cha
ast_set_flag(&(config.features_caller), AST_FEATURE_PLAY_WARNING);
if (play_to_callee)
ast_set_flag(&(config.features_callee), AST_FEATURE_PLAY_WARNING);
Modified: asterisk/trunk/debian/patches/bristuff/app-dial-priority-202
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/app-dial-priority-202?rev=5188&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/app-dial-priority-202 (original)
+++ asterisk/trunk/debian/patches/bristuff/app-dial-priority-202 Thu Feb 7 22:49:30 2008
@@ -11,7 +11,7 @@
* This program is free software, distributed under the terms of
* the GNU General Public License Version 2. See the LICENSE file
* at the top of the source tree.
-@@ -125,7 +129,8 @@ static char *descrip =
+@@ -130,7 +134,8 @@ static char *descrip =
" H - Allow the calling party to hang up by hitting the '*' DTMF digit.\n"
" i - Asterisk will ignore any forwarding requests it may receive on this\n"
" dial attempt.\n"
@@ -21,7 +21,7 @@
" k - Allow the called party to enable parking of the call by sending\n"
" the DTMF sequence defined for call parking in features.conf.\n"
" K - Allow the calling party to enable parking of the call by sending\n"
-@@ -1300,14 +1305,16 @@ static int dial_exec_full(struct ast_cha
+@@ -1305,14 +1310,16 @@ static int dial_exec_full(struct ast_cha
}
if (!outgoing) {
Modified: asterisk/trunk/debian/patches/bristuff/ast-send-message
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/ast-send-message?rev=5188&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast-send-message (original)
+++ asterisk/trunk/debian/patches/bristuff/ast-send-message Thu Feb 7 22:49:30 2008
@@ -3,7 +3,7 @@
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
-@@ -227,7 +227,7 @@ struct ast_channel_tech {
+@@ -230,7 +230,7 @@ struct ast_channel_tech {
int (* const write)(struct ast_channel *chan, struct ast_frame *frame);
/*! \brief Display or transmit text */
@@ -12,7 +12,7 @@
/*! \brief Display or send an image */
int (* const send_image)(struct ast_channel *chan, struct ast_frame *frame);
-@@ -672,6 +672,16 @@ struct ast_channel *ast_request_and_dial
+@@ -674,6 +674,16 @@ struct ast_channel *ast_request_and_dial
struct ast_channel *__ast_request_and_dial(const char *type, int format, void *data, int timeout, int *reason, const char *cidnum, const char *cidname, struct outgoing_helper *oh);
@@ -29,7 +29,7 @@
/*!\brief Register a channel technology (a new channel driver)
* Called by a channel module to register the kind of channels it supports.
* \param tech Structure defining channel technology or "type"
-@@ -888,10 +898,12 @@ int ast_set_write_format(struct ast_chan
+@@ -890,10 +900,12 @@ int ast_set_write_format(struct ast_chan
/*! \brief Sends text to a channel
* Write text to a display on a channel
* \param chan channel to act upon
@@ -45,7 +45,7 @@
* \param chan channel to act upon
--- a/main/channel.c
+++ b/main/channel.c
-@@ -2694,7 +2694,7 @@ char *ast_recvtext(struct ast_channel *c
+@@ -2414,7 +2414,7 @@ char *ast_recvtext(struct ast_channel *c
return buf;
}
@@ -54,7 +54,7 @@
{
int res = 0;
/* Stop if we're a zombie or need a soft hangup */
-@@ -2702,7 +2702,7 @@ int ast_sendtext(struct ast_channel *cha
+@@ -2422,7 +2422,7 @@ int ast_sendtext(struct ast_channel *cha
return -1;
CHECK_BLOCKING(chan);
if (chan->tech->send_text)
@@ -63,7 +63,7 @@
ast_clear_flag(chan, AST_FLAG_BLOCKING);
return res;
}
-@@ -2881,7 +2881,7 @@ int ast_write(struct ast_channel *chan,
+@@ -2613,7 +2613,7 @@ int ast_write(struct ast_channel *chan,
break;
case AST_FRAME_TEXT:
res = (chan->tech->send_text == NULL) ? 0 :
@@ -72,7 +72,7 @@
break;
case AST_FRAME_HTML:
res = (chan->tech->send_html == NULL) ? 0 :
-@@ -4908,6 +4908,25 @@ void ast_channel_stop_silence_generator(
+@@ -4450,6 +4450,25 @@ void ast_channel_stop_silence_generator(
}
@@ -122,7 +122,7 @@
}
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
-@@ -246,7 +246,7 @@ static int agent_answer(struct ast_chann
+@@ -249,7 +249,7 @@ static int agent_answer(struct ast_chann
static struct ast_frame *agent_read(struct ast_channel *ast);
static int agent_write(struct ast_channel *ast, struct ast_frame *f);
static int agent_sendhtml(struct ast_channel *ast, int subclass, const char *data, int datalen);
@@ -131,7 +131,7 @@
static int agent_indicate(struct ast_channel *ast, int condition, const void *data, size_t datalen);
static int agent_fixup(struct ast_channel *oldchan, struct ast_channel *newchan);
static struct ast_channel *agent_bridgedchannel(struct ast_channel *chan, struct ast_channel *bridge);
-@@ -555,13 +555,13 @@ static int agent_sendhtml(struct ast_cha
+@@ -558,13 +558,13 @@ static int agent_sendhtml(struct ast_cha
return res;
}
@@ -178,7 +178,7 @@
static int local_devicestate(void *data);
/* PBX interface structure for channel registration */
-@@ -390,7 +390,7 @@ static int local_digit_end(struct ast_ch
+@@ -400,7 +400,7 @@ static int local_digit_end(struct ast_ch
return res;
}
@@ -229,7 +229,7 @@
return phone_write_buf(ast->tech_pvt, text, length, length, 0) ==
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
-@@ -1215,7 +1215,7 @@ static struct ast_config *notify_types;
+@@ -1218,7 +1218,7 @@ static struct ast_config *notify_types;
/*--- PBX interface functions */
static struct ast_channel *sip_request_call(const char *type, int format, void *data, int *cause);
static int sip_devicestate(void *data);
@@ -238,7 +238,7 @@
static int sip_call(struct ast_channel *ast, char *dest, int timeout);
static int sip_hangup(struct ast_channel *ast);
static int sip_answer(struct ast_channel *ast);
-@@ -2347,7 +2347,7 @@ static char *get_in_brackets(char *tmp)
+@@ -2350,7 +2350,7 @@ static char *get_in_brackets(char *tmp)
/*! \brief Send SIP MESSAGE text within a call
Called from PBX core sendtext() application */
@@ -258,7 +258,7 @@
static int iax2_setoption(struct ast_channel *c, int option, void *data, int datalen);
static int iax2_transfer(struct ast_channel *c, const char *dest);
static int iax2_write(struct ast_channel *c, struct ast_frame *f);
-@@ -2642,7 +2642,7 @@ static int iax2_digit_end(struct ast_cha
+@@ -2624,7 +2624,7 @@ static int iax2_digit_end(struct ast_cha
return send_command_locked(PTR_TO_CALLNO(c->tech_pvt), AST_FRAME_DTMF_END, digit, 0, NULL, 0, -1);
}
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=5188&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast_monitor_start-targetscript (original)
+++ asterisk/trunk/debian/patches/bristuff/ast_monitor_start-targetscript Thu Feb 7 22:49:30 2008
@@ -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
-@@ -129,7 +129,7 @@ static int ast_monitor_set_state(struct
+@@ -130,7 +130,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];
-@@ -153,6 +153,11 @@ int ast_monitor_start( struct ast_channe
+@@ -154,6 +154,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;
-@@ -295,6 +300,8 @@ int ast_monitor_stop(struct ast_channel
+@@ -297,6 +302,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,8 +50,8 @@
const char *format = !strcasecmp(chan->monitor->format,"wav49") ? "WAV" : chan->monitor->format;
char *name = chan->monitor->filename_base;
int directory = strchr(name, '/') ? 1 : 0;
-@@ -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 */
+@@ -325,8 +332,13 @@ int ast_monitor_stop(struct ast_channel
+ snprintf(tmp2,sizeof(tmp2), "( %s& rm -f \"%s%s%s-\"* ) &",tmp, dir, absolute, name); /* remove legs when done mixing */
ast_copy_string(tmp, tmp2, sizeof(tmp));
}
- ast_log(LOG_DEBUG,"monitor executing %s\n",tmp);
@@ -66,7 +66,7 @@
ast_log(LOG_WARNING, "Execute of %s failed.\n",tmp);
}
-@@ -452,7 +464,7 @@ static int start_monitor_exec(struct ast
+@@ -467,7 +479,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);
-@@ -491,6 +503,8 @@ static int start_monitor_action(struct m
+@@ -506,6 +518,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)) {
-@@ -515,7 +529,7 @@ static int start_monitor_action(struct m
+@@ -530,7 +544,7 @@ static int start_monitor_action(struct m
*d = '-';
}
@@ -95,7 +95,7 @@
ast_channel_unlock(c);
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
-@@ -2804,13 +2804,13 @@ static int try_calling(struct queue_ent
+@@ -2901,13 +2901,13 @@ static int try_calling(struct queue_ent
else
which = peer;
if (monitorfilename)
@@ -114,7 +114,7 @@
ast_monitor_setjoinfiles(which, 1);
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
-@@ -416,7 +416,7 @@ static int __agent_start_monitoring(stru
+@@ -419,7 +419,7 @@ static int __agent_start_monitoring(stru
if ((pointer = strchr(filename, '.')))
*pointer = '-';
snprintf(tmp, sizeof(tmp), "%s%s", savecallsin, filename);
Modified: asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause?rev=5188&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause (original)
+++ asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause Thu Feb 7 22:49:30 2008
@@ -10,7 +10,7 @@
* This program is free software, distributed under the terms of
* the GNU General Public License Version 2. See the LICENSE file
* at the top of the source tree.
-@@ -3240,7 +3243,7 @@ static int iax2_hangup(struct ast_channe
+@@ -3235,7 +3238,7 @@ static int iax2_hangup(struct ast_channe
ast_mutex_lock(&iaxsl[callno]);
if (callno && iaxs[callno]) {
if (option_debug)
@@ -19,7 +19,7 @@
alreadygone = ast_test_flag(iaxs[callno], IAX_ALREADYGONE);
/* Send the hangup unless we have had a transmission error or are already gone */
iax_ie_append_byte(&ied, IAX_IE_CAUSECODE, (unsigned char)c->hangupcause);
-@@ -3294,7 +3297,8 @@ static int iax2_setoption(struct ast_cha
+@@ -3289,7 +3292,8 @@ static int iax2_setoption(struct ast_cha
static struct ast_frame *iax2_read(struct ast_channel *c)
{
Modified: asterisk/trunk/debian/patches/bristuff/feature-autoanswer
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/feature-autoanswer?rev=5188&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/feature-autoanswer (original)
+++ asterisk/trunk/debian/patches/bristuff/feature-autoanswer Thu Feb 7 22:49:30 2008
@@ -22,7 +22,7 @@
* This program is free software, distributed under the terms of
* the GNU General Public License Version 2. See the LICENSE file
* at the top of the source tree.
-@@ -128,6 +132,20 @@ static char *descrip2 = "Park():"
+@@ -132,6 +136,20 @@ static char *descrip2 = "Park():"
"it already exists. In that case, execution will continue at next\n"
"priority.\n" ;
@@ -43,7 +43,7 @@
static struct ast_app *monitor_app = NULL;
static int monitor_ok = 1;
-@@ -146,6 +164,23 @@ struct parkeduser {
+@@ -150,6 +168,23 @@ struct parkeduser {
struct parkeduser *next;
};
@@ -67,7 +67,7 @@
static struct parkeduser *parkinglot;
AST_MUTEX_DEFINE_STATIC(parking_lock); /*!< protects all static variables above */
-@@ -401,11 +436,13 @@ static int park_call_full(struct ast_cha
+@@ -405,11 +440,13 @@ static int park_call_full(struct ast_cha
"From: %s\r\n"
"Timeout: %ld\r\n"
"CallerID: %s\r\n"
@@ -83,7 +83,7 @@
);
if (peer && adsipark && ast_adsi_available(peer)) {
-@@ -1628,11 +1665,13 @@ static void post_manager_event(const cha
+@@ -1636,11 +1673,13 @@ static void post_manager_event(const cha
"Exten: %s\r\n"
"Channel: %s\r\n"
"CallerID: %s\r\n"
@@ -99,7 +99,7 @@
);
}
-@@ -1887,10 +1926,12 @@ static int park_exec(struct ast_channel
+@@ -1908,10 +1947,12 @@ static int park_exec(struct ast_channel
"Channel: %s\r\n"
"From: %s\r\n"
"CallerID: %s\r\n"
@@ -114,7 +114,7 @@
);
free(pu);
-@@ -2044,15 +2085,10 @@ static struct ast_cli_entry cli_show_fea
+@@ -2065,15 +2106,10 @@ static struct ast_cli_entry cli_show_fea
handle_showfeatures, NULL,
NULL };
@@ -133,7 +133,7 @@
/*! \brief Dump lot status */
static int manager_parking_status( struct mansession *s, const struct message *m)
-@@ -2076,12 +2112,13 @@ static int manager_parking_status( struc
+@@ -2097,12 +2133,13 @@ static int manager_parking_status( struc
"Timeout: %ld\r\n"
"CallerID: %s\r\n"
"CallerIDName: %s\r\n"
@@ -148,7 +148,7 @@
idText);
}
-@@ -2156,6 +2193,427 @@ static int manager_park(struct mansessio
+@@ -2177,6 +2214,427 @@ static int manager_park(struct mansessio
return 0;
}
@@ -576,7 +576,7 @@
int ast_pickup_call(struct ast_channel *chan)
{
-@@ -2419,6 +2877,7 @@ static int load_config(void)
+@@ -2440,6 +2898,7 @@ static int load_config(void)
static int reload(void)
{
@@ -584,7 +584,7 @@
return load_config();
}
-@@ -2442,6 +2901,12 @@ static int load_module(void)
+@@ -2463,6 +2922,12 @@ static int load_module(void)
"Park a channel", mandescr_park);
}
@@ -597,7 +597,7 @@
res |= ast_devstate_prov_add("Park", metermaidstate);
return res;
-@@ -2456,6 +2921,8 @@ static int unload_module(void)
+@@ -2477,6 +2942,8 @@ static int unload_module(void)
ast_manager_unregister("Park");
ast_cli_unregister_multiple(cli_features, sizeof(cli_features) / sizeof(struct ast_cli_entry));
ast_unregister_application(parkcall);
Modified: asterisk/trunk/debian/patches/bristuff/feature-holdedcalls
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/feature-holdedcalls?rev=5188&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/feature-holdedcalls (original)
+++ asterisk/trunk/debian/patches/bristuff/feature-holdedcalls Thu Feb 7 22:49:30 2008
@@ -15,7 +15,7 @@
call parking help */
--- a/res/res_features.c
+++ b/res/res_features.c
-@@ -62,6 +62,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
+@@ -66,6 +66,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
#include "asterisk/adsi.h"
#include "asterisk/devicestate.h"
#include "asterisk/monitor.h"
@@ -23,7 +23,7 @@
#define DEFAULT_PARK_TIME 45000
#define DEFAULT_TRANSFER_DIGIT_TIMEOUT 3000
-@@ -80,6 +81,7 @@ enum {
+@@ -84,6 +85,7 @@ enum {
};
static char *parkedcall = "ParkedCall";
@@ -31,7 +31,7 @@
static int parkaddhints = 0; /*!< Add parking hints automatically */
static int parkingtime = DEFAULT_PARK_TIME; /*!< No more than 45 seconds parked before you do something with them */
-@@ -164,6 +166,22 @@ struct parkeduser {
+@@ -168,6 +170,22 @@ struct parkeduser {
struct parkeduser *next;
};
@@ -54,7 +54,7 @@
/* auto answer user */
struct aauser {
struct ast_channel *chan;
-@@ -183,10 +201,16 @@ static pthread_t autoanswer_thread;
+@@ -187,10 +205,16 @@ static pthread_t autoanswer_thread;
static struct parkeduser *parkinglot;
@@ -71,7 +71,7 @@
char *ast_parking_ext(void)
{
return parking_ext;
-@@ -2011,6 +2035,282 @@ static int park_exec(struct ast_channel
+@@ -2032,6 +2056,282 @@ static int park_exec(struct ast_channel
return res;
}
@@ -354,7 +354,7 @@
static int handle_showfeatures(int fd, int argc, char *argv[])
{
int i;
-@@ -2892,6 +3192,7 @@ static int load_module(void)
+@@ -2913,6 +3213,7 @@ static int load_module(void)
return res;
ast_cli_register_multiple(cli_features, sizeof(cli_features) / sizeof(struct ast_cli_entry));
ast_pthread_create(&parking_thread, NULL, do_parking_thread, NULL);
@@ -362,7 +362,7 @@
res = ast_register_application(parkedcall, park_exec, synopsis, descrip);
if (!res)
res = ast_register_application(parkcall, park_call_exec, synopsis2, descrip2);
-@@ -2901,6 +3202,7 @@ static int load_module(void)
+@@ -2922,6 +3223,7 @@ static int load_module(void)
"Park a channel", mandescr_park);
}
@@ -370,7 +370,7 @@
ast_pthread_create(&autoanswer_thread, NULL, do_autoanswer_thread, NULL);
if (!res)
res |= ast_register_application(autoanswerlogin, autoanswer_login_exec, synopsis3, descrip3);
-@@ -2923,6 +3225,7 @@ static int unload_module(void)
+@@ -2944,6 +3246,7 @@ static int unload_module(void)
ast_unregister_application(parkcall);
ast_unregister_application(autoanswer);
ast_unregister_application(autoanswerlogin);
Modified: asterisk/trunk/debian/patches/bristuff/uniqueid-01-use-pid-on-uniqueid-generation
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/uniqueid-01-use-pid-on-uniqueid-generation?rev=5188&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-01-use-pid-on-uniqueid-generation (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-01-use-pid-on-uniqueid-generation Thu Feb 7 22:49:30 2008
@@ -2,7 +2,7 @@
--- a/main/channel.c
+++ b/main/channel.c
-@@ -808,10 +808,10 @@ struct ast_channel *ast_channel_alloc(in
+@@ -790,10 +790,10 @@ struct ast_channel *ast_channel_alloc(in
tmp->fout = global_fout;
if (ast_strlen_zero(ast_config_AST_SYSTEM_NAME)) {
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=5188&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid Thu Feb 7 22:49:30 2008
@@ -2,7 +2,7 @@
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
-@@ -660,6 +660,18 @@ void ast_channel_free(struct ast_channe
+@@ -662,6 +662,18 @@ void ast_channel_free(struct ast_channe
*/
struct ast_channel *ast_request(const char *type, int format, void *data, int *status);
@@ -21,7 +21,7 @@
/*!
* \brief Request a channel of a given type, with data as optional information used
* by the low level module and attempt to place a call on it
-@@ -673,9 +685,9 @@ struct ast_channel *ast_request(const ch
+@@ -675,9 +687,9 @@ struct ast_channel *ast_request(const ch
* \return Returns an ast_channel on success or no answer, NULL on failure. Check the value of chan->_state
* to know if the call was answered or not.
*/
@@ -33,7 +33,7 @@
/*! \brief "Requests" a channel for sending a message
* \param type type of channel to request
-@@ -960,6 +972,8 @@ struct ast_channel *ast_get_channel_by_e
+@@ -962,6 +974,8 @@ struct ast_channel *ast_get_channel_by_e
/*! \brief Get next channel by exten (and optionally context) and lock it */
struct ast_channel *ast_walk_channel_by_exten_locked(const struct ast_channel *chan, const char *exten,
const char *context);
@@ -44,7 +44,7 @@
* \param c channel to wait for a digit on
--- a/main/channel.c
+++ b/main/channel.c
-@@ -1035,7 +1035,7 @@ void ast_channel_undefer_dtmf(struct ast
+@@ -1017,7 +1017,7 @@ void ast_channel_undefer_dtmf(struct ast
*/
static struct ast_channel *channel_find_locked(const struct ast_channel *prev,
const char *name, const int namelen,
@@ -53,7 +53,7 @@
{
const char *msg = prev ? "deadlock" : "initial deadlock";
int retries;
-@@ -1063,7 +1063,10 @@ static struct ast_channel *channel_find_
+@@ -1045,7 +1045,10 @@ static struct ast_channel *channel_find_
* XXX Need a better explanation for this ...
*/
}
@@ -65,7 +65,7 @@
if ((!namelen && strcasecmp(c->name, name)) ||
(namelen && strncasecmp(c->name, name, namelen)))
continue; /* name match failed */
-@@ -1118,39 +1121,44 @@ static struct ast_channel *channel_find_
+@@ -1100,39 +1103,44 @@ static struct ast_channel *channel_find_
/*! \brief Browse channels in use */
struct ast_channel *ast_channel_walk_locked(const struct ast_channel *prev)
{
@@ -116,7 +116,7 @@
}
/*! \brief Wait, look for hangups and condition arg */
-@@ -1220,8 +1228,10 @@ void ast_channel_free(struct ast_channel
+@@ -1202,8 +1210,10 @@ void ast_channel_free(struct ast_channel
free(chan->tech_pvt);
}
@@ -129,7 +129,7 @@
ast_copy_string(name, chan->name, sizeof(name));
-@@ -3106,7 +3116,7 @@ char *ast_channel_reason2str(int reason)
+@@ -2800,7 +2810,7 @@ char *ast_channel_reason2str(int reason)
}
}
@@ -138,7 +138,7 @@
{
int dummy_outstate;
int cause = 0;
-@@ -3118,7 +3128,7 @@ struct ast_channel *__ast_request_and_di
+@@ -2813,7 +2823,7 @@ struct ast_channel *__ast_request_and_di
else
outstate = &dummy_outstate; /* make outstate always a valid pointer */
@@ -147,7 +147,7 @@
if (!chan) {
ast_log(LOG_NOTICE, "Unable to request channel %s/%s\n", type, (char *)data);
/* compute error and return */
-@@ -3141,7 +3151,7 @@ struct ast_channel *__ast_request_and_di
+@@ -2836,7 +2846,7 @@ struct ast_channel *__ast_request_and_di
ast_cdr_setaccount(chan, oh->account);
}
ast_set_callerid(chan, cid_num, cid_name, cid_num);
@@ -156,7 +156,7 @@
if (!chan->cdr) { /* up till now, this insertion hasn't been done. Therefore,
-@@ -3230,12 +3240,12 @@ struct ast_channel *__ast_request_and_di
+@@ -2928,12 +2938,12 @@ struct ast_channel *__ast_request_and_di
return chan;
}
@@ -172,7 +172,7 @@
{
struct chanlist *chan;
struct ast_channel *c;
-@@ -3285,6 +3295,11 @@ struct ast_channel *ast_request(const ch
+@@ -2983,6 +2993,11 @@ struct ast_channel *ast_request(const ch
return NULL;
}
@@ -184,7 +184,7 @@
int ast_call(struct ast_channel *chan, char *addr, int timeout)
{
/* Place an outgoing call, but don't wait any longer than timeout ms before returning.
-@@ -3672,7 +3687,7 @@ int ast_do_masquerade(struct ast_channel
+@@ -3368,7 +3383,7 @@ int ast_do_masquerade(struct ast_channel
ast_string_field_set(clone, name, masqn);
/* Notify any managers of the change, first the masq then the other */
@@ -226,7 +226,7 @@
*
--- a/main/pbx.c
+++ b/main/pbx.c
-@@ -4985,7 +4985,7 @@ static int ast_pbx_outgoing_cdr_failed(v
+@@ -4986,7 +4986,7 @@ static int ast_pbx_outgoing_cdr_failed(v
return 0; /* success */
}
@@ -235,7 +235,7 @@
{
struct ast_channel *chan;
struct async_stat *as;
-@@ -4995,7 +4995,7 @@ int ast_pbx_outgoing_exten(const char *t
+@@ -4996,7 +4996,7 @@ int ast_pbx_outgoing_exten(const char *t
if (sync) {
LOAD_OH(oh);
@@ -244,7 +244,7 @@
if (channel) {
*channel = chan;
if (chan)
-@@ -5080,7 +5080,7 @@ int ast_pbx_outgoing_exten(const char *t
+@@ -5081,7 +5081,7 @@ int ast_pbx_outgoing_exten(const char *t
res = -1;
goto outgoing_exten_cleanup;
}
@@ -253,7 +253,7 @@
if (channel) {
*channel = chan;
if (chan)
-@@ -5120,6 +5120,10 @@ outgoing_exten_cleanup:
+@@ -5121,6 +5121,10 @@ outgoing_exten_cleanup:
return res;
}
@@ -264,7 +264,7 @@
struct app_tmp {
char app[256];
char data[256];
-@@ -5144,7 +5148,7 @@ static void *ast_pbx_run_app(void *data)
+@@ -5145,7 +5149,7 @@ static void *ast_pbx_run_app(void *data)
return NULL;
}
@@ -273,7 +273,7 @@
{
struct ast_channel *chan;
struct app_tmp *tmp;
-@@ -5163,10 +5167,10 @@ int ast_pbx_outgoing_app(const char *typ
+@@ -5164,10 +5168,10 @@ int ast_pbx_outgoing_app(const char *typ
goto outgoing_app_cleanup;
}
if (sync) {
@@ -286,7 +286,7 @@
} else {
chan->cdr = ast_cdr_alloc(); /* allocate a cdr for the channel */
if(!chan->cdr) {
-@@ -5247,7 +5251,7 @@ int ast_pbx_outgoing_app(const char *typ
+@@ -5248,7 +5252,7 @@ int ast_pbx_outgoing_app(const char *typ
res = -1;
goto outgoing_app_cleanup;
}
@@ -295,7 +295,7 @@
if (!chan) {
free(as);
res = -1;
-@@ -5287,6 +5291,10 @@ outgoing_app_cleanup:
+@@ -5288,6 +5292,10 @@ outgoing_app_cleanup:
return res;
}
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=5188&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-20-monitor (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-20-monitor Thu Feb 7 22:49:30 2008
@@ -1,6 +1,6 @@
--- a/res/res_monitor.c
+++ b/res/res_monitor.c
-@@ -337,6 +337,11 @@ int ast_monitor_stop(struct ast_channel
+@@ -340,6 +340,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);
-@@ -503,18 +508,28 @@ static int start_monitor_action(struct m
+@@ -518,18 +523,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)) {
-@@ -555,16 +570,30 @@ static int stop_monitor_action(struct ma
+@@ -570,16 +585,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/uniqueid-30-app-chanspy
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy?rev=5188&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy Thu Feb 7 22:49:30 2008
@@ -36,7 +36,7 @@
static const char *app_ext = "ExtenSpy";
static const char *desc_ext =
" ExtenSpy(exten[@context][|options]): This application is used to listen to the\n"
-@@ -404,7 +426,7 @@ static int channel_spy(struct ast_channe
+@@ -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,
@@ -45,7 +45,7 @@
{
struct ast_channel *this;
-@@ -413,6 +435,8 @@ static struct ast_channel *next_channel(
+@@ -353,6 +375,8 @@ static struct ast_channel *next_channel(
this = ast_walk_channel_by_name_prefix_locked(last, spec, strlen(spec));
else if (exten)
this = ast_walk_channel_by_exten_locked(last, exten, context);
@@ -54,7 +54,7 @@
else
this = ast_channel_walk_locked(last);
-@@ -427,7 +451,7 @@ static struct ast_channel *next_channel(
+@@ -367,7 +391,7 @@ static struct ast_channel *next_channel(
static int common_exec(struct ast_channel *chan, const struct ast_flags *flags,
int volfactor, const int fd, const char *mygroup, const char *spec,
@@ -63,9 +63,9 @@
{
struct ast_channel *peer, *prev, *next;
char nameprefix[AST_NAME_STRLEN];
-@@ -466,9 +490,9 @@ static int common_exec(struct ast_channe
- waitms = 100;
+@@ -408,9 +432,9 @@ static int common_exec(struct ast_channe
peer = prev = next = NULL;
+ num_spyed_upon = 0;
- for (peer = next_channel(peer, spec, exten, context);
+ for (peer = next_channel(peer, spec, exten, context, NULL);
@@ -75,7 +75,7 @@
const char *group;
int igrp = !mygroup;
char *groups[25];
-@@ -625,7 +649,7 @@ static int chanspy_exec(struct ast_chann
+@@ -568,7 +592,7 @@ static int chanspy_exec(struct ast_chann
}
}
@@ -84,7 +84,7 @@
if (fd)
close(fd);
-@@ -710,7 +734,92 @@ static int extenspy_exec(struct ast_chan
+@@ -653,7 +677,92 @@ static int extenspy_exec(struct ast_chan
}
}
@@ -178,7 +178,7 @@
if (fd)
close(fd);
-@@ -723,14 +832,15 @@ static int extenspy_exec(struct ast_chan
+@@ -666,14 +775,15 @@ static int extenspy_exec(struct ast_chan
return res;
}
@@ -195,7 +195,7 @@
return res;
}
-@@ -741,6 +851,7 @@ static int load_module(void)
+@@ -684,6 +794,7 @@ static int load_module(void)
res |= ast_register_application(app_chan, chanspy_exec, tdesc, desc_chan);
res |= ast_register_application(app_ext, extenspy_exec, tdesc, desc_ext);
Modified: asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager?rev=5188&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager Thu Feb 7 22:49:30 2008
@@ -193,7 +193,7 @@
#include <unistd.h>
#ifdef POLLCOMPAT
#include "asterisk/poll-compat.h"
-@@ -1005,6 +1008,8 @@ int ast_waitfordigit_full(struct ast_cha
+@@ -1007,6 +1010,8 @@ int ast_waitfordigit_full(struct ast_cha
int ast_readstring(struct ast_channel *c, char *s, int len, int timeout, int rtimeout, char *enders);
int ast_readstring_full(struct ast_channel *c, char *s, int len, int timeout, int rtimeout, char *enders, int audiofd, int ctrlfd);
@@ -204,7 +204,7 @@
/*! \brief Report DTMF on channel 1 */
--- a/main/channel.c
+++ b/main/channel.c
-@@ -724,6 +724,15 @@ static const struct ast_channel_tech nul
+@@ -706,6 +706,15 @@ static const struct ast_channel_tech nul
.description = "Null channel (should not see this)",
};
Modified: asterisk/trunk/debian/patches/bristuff/zapata-gsm
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/zapata-gsm?rev=5188&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-gsm (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-gsm Thu Feb 7 22:49:30 2008
@@ -2,7 +2,7 @@
+++ b/channels/chan_zap.c
@@ -77,6 +77,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
#ifdef HAVE_PRI
- #include <libpri.h>
+ #include <bristuffed/libpri.h>
#endif
+#ifdef HAVE_GSMAT
+#include <libgsmat.h>
@@ -839,7 +839,7 @@
AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
--- a/configure
+++ b/configure
-@@ -25667,6 +25667,188 @@ echo "$as_me: *** without explicitly spe
+@@ -25666,6 +25666,188 @@ echo "$as_me: *** without explicitly spe
fi
fi
Modified: asterisk/trunk/debian/patches/bristuff/zapata_euroisdn_holded
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/zapata_euroisdn_holded?rev=5188&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata_euroisdn_holded (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata_euroisdn_holded Thu Feb 7 22:49:30 2008
@@ -1,6 +1,6 @@
--- a/main/pbx.c
+++ b/main/pbx.c
-@@ -5132,7 +5132,7 @@ struct app_tmp {
+@@ -5133,7 +5133,7 @@ struct app_tmp {
};
/*! \brief run the application and free the descriptor once done */
Modified: asterisk/trunk/debian/patches/configure-libc-client
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/configure-libc-client?rev=5188&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/configure-libc-client (original)
+++ asterisk/trunk/debian/patches/configure-libc-client Thu Feb 7 22:49:30 2008
@@ -6,7 +6,7 @@
--- a/configure
+++ b/configure
-@@ -18778,7 +18778,7 @@ echo $ECHO_N "checking for UW IMAP Toolk
+@@ -19221,7 +19221,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
-@@ -18970,7 +18970,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -19413,7 +19413,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
-@@ -488,7 +488,7 @@ if test "${USE_IMAP_TK}" != "no"; then
+@@ -493,7 +493,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"
-@@ -605,7 +605,7 @@ if test "${USE_IMAP_TK}" != "no"; then
+@@ -610,7 +610,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/debian-banner
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/debian-banner?rev=5188&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/debian-banner (original)
+++ asterisk/trunk/debian/patches/debian-banner Thu Feb 7 22:49:30 2008
@@ -3,7 +3,7 @@
--- a/main/asterisk.c
+++ b/main/asterisk.c
-@@ -146,6 +146,9 @@ int daemon(int, int); /* defined in lib
+@@ -145,6 +145,9 @@ int daemon(int, int); /* defined in lib
ast_verbose("This is free software, with components licensed under the GNU General Public\n"); \
ast_verbose("License version 2 and other licenses; you are welcome to redistribute it under\n"); \
ast_verbose("certain conditions. Type 'core show license' for details.\n"); \
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=5188&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/h323-no-deps-on-asterisk (original)
+++ asterisk/trunk/debian/patches/h323-no-deps-on-asterisk Thu Feb 7 22:49:30 2008
@@ -9,7 +9,7 @@
--- a/main/Makefile
+++ b/main/Makefile
-@@ -122,13 +122,6 @@ AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED
+@@ -126,13 +126,6 @@ AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED
AST_EMBED_LIBS:=$(foreach dep,$(EMBED_LIBS),$(value $(dep)))
OBJS:=$(sort $(OBJS))
@@ -23,7 +23,7 @@
asterisk: $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
@$(ASTTOPDIR)/build_tools/make_build_h > $(ASTTOPDIR)/include/asterisk/build.h.tmp
@if cmp -s $(ASTTOPDIR)/include/asterisk/build.h.tmp $(ASTTOPDIR)/include/asterisk/build.h ; then echo ; else \
-@@ -137,11 +130,7 @@ asterisk: $(OBJS) editline/libedit.a db1
+@@ -141,11 +134,7 @@ asterisk: $(OBJS) editline/libedit.a db1
@rm -f $(ASTTOPDIR)/include/asterisk/build.h.tmp
@$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
Modified: asterisk/trunk/debian/patches/make-clean-fixes
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/make-clean-fixes?rev=5188&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/make-clean-fixes (original)
+++ asterisk/trunk/debian/patches/make-clean-fixes Thu Feb 7 22:49:30 2008
@@ -5,7 +5,7 @@
--- a/Makefile
+++ b/Makefile
-@@ -387,7 +387,6 @@ dist-clean: distclean
+@@ -389,7 +389,6 @@ dist-clean: distclean
distclean: $(SUBDIRS_DIST_CLEAN) clean
@$(MAKE) -C menuselect dist-clean
@@ -13,7 +13,7 @@
rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
rm -f makeopts.embed_rules
rm -f config.log config.status
-@@ -397,6 +396,10 @@ distclean: $(SUBDIRS_DIST_CLEAN) clean
+@@ -399,6 +398,10 @@ distclean: $(SUBDIRS_DIST_CLEAN) clean
rm -rf doc/api
rm -f build_tools/menuselect-deps
Modified: asterisk/trunk/debian/patches/pubkey_jnctn
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/pubkey_jnctn?rev=5188&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/pubkey_jnctn (original)
+++ asterisk/trunk/debian/patches/pubkey_jnctn Thu Feb 7 22:49:30 2008
@@ -23,7 +23,7 @@
+-----END PUBLIC KEY-----
--- a/Makefile
+++ b/Makefile
-@@ -465,8 +465,7 @@ bininstall: _all
+@@ -467,8 +467,7 @@ bininstall: _all
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
Modified: asterisk/trunk/debian/patches/use-libpri-bristuffed
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/use-libpri-bristuffed?rev=5188&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/use-libpri-bristuffed (original)
+++ asterisk/trunk/debian/patches/use-libpri-bristuffed Thu Feb 7 22:49:30 2008
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -25338,18 +25338,18 @@ fi
+@@ -25337,18 +25337,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
-@@ -25358,8 +25358,8 @@ ac_res=`eval echo '${'$as_ac_Header'}'`
+@@ -25357,8 +25357,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
-@@ -25367,7 +25367,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -25366,7 +25366,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"
-@@ -25399,15 +25399,15 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -25398,15 +25398,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
-@@ -25440,25 +25440,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6;
+@@ -25439,25 +25439,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 ##
-@@ -25467,8 +25467,8 @@ _ASBOX
+@@ -25466,8 +25466,8 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
More information about the Pkg-voip-commits
mailing list