[Pkg-voip-commits] r5010 - in /asterisk/trunk/debian/patches: ./ bristuff/
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Mon Dec 3 18:42:38 UTC 2007
Author: paravoid
Date: Mon Dec 3 18:42:37 2007
New Revision: 5010
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5010
Log:
Use -p ab with quilt to make the refreshes more readable
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/app-meetme-avoid-overflows
asterisk/trunk/debian/patches/bristuff/app-zapras-fix-audiomode
asterisk/trunk/debian/patches/bristuff/ast-device-state-CID
asterisk/trunk/debian/patches/bristuff/ast-send-message
asterisk/trunk/debian/patches/bristuff/ast-send-message-users
asterisk/trunk/debian/patches/bristuff/ast_channel_masquerade_locked
asterisk/trunk/debian/patches/bristuff/ast_monitor_start-targetscript
asterisk/trunk/debian/patches/bristuff/bristuff-notice
asterisk/trunk/debian/patches/bristuff/chan-capi
asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause
asterisk/trunk/debian/patches/bristuff/configurable-AST_SYSTEM_NAME
asterisk/trunk/debian/patches/bristuff/feature-autoanswer
asterisk/trunk/debian/patches/bristuff/feature-holdedcalls
asterisk/trunk/debian/patches/bristuff/feature-parking_con
asterisk/trunk/debian/patches/bristuff/find-feature
asterisk/trunk/debian/patches/bristuff/misc-app-devstate
asterisk/trunk/debian/patches/bristuff/misc-app-pickup
asterisk/trunk/debian/patches/bristuff/misc-app-segfault
asterisk/trunk/debian/patches/bristuff/misc-manager-dbdel
asterisk/trunk/debian/patches/bristuff/misc-res-esel
asterisk/trunk/debian/patches/bristuff/misc-res-watchdog
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/xagi
asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn
asterisk/trunk/debian/patches/bristuff/zapata-device-state
asterisk/trunk/debian/patches/bristuff/zapata-gsm
asterisk/trunk/debian/patches/configure-libc-client
asterisk/trunk/debian/patches/debian-banner
asterisk/trunk/debian/patches/disable-build-sum
asterisk/trunk/debian/patches/func_devstate
asterisk/trunk/debian/patches/h323-no-deps-on-asterisk
asterisk/trunk/debian/patches/h323-workaround-openh323-segfault
asterisk/trunk/debian/patches/hack-multiple-app-voicemail
asterisk/trunk/debian/patches/make-clean-fixes
asterisk/trunk/debian/patches/pubkey_jnctn
asterisk/trunk/debian/patches/safe_asterisk-nobg
asterisk/trunk/debian/patches/tos-libcap
asterisk/trunk/debian/patches/use-libpri-bristuffed
asterisk/trunk/debian/patches/vpb-driver-4.2.18
asterisk/trunk/debian/patches/vpb-handle-nocards
Modified: asterisk/trunk/debian/patches/astvarrundir
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/astvarrundir?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/astvarrundir (original)
+++ asterisk/trunk/debian/patches/astvarrundir Mon Dec 3 18:42:37 2007
@@ -5,8 +5,8 @@
-- Mark Purcell <msp at debian.org>
---- asterisk-1.4.9~dfsg.orig/Makefile
-+++ asterisk-1.4.9~dfsg/Makefile
+--- a/Makefile
++++ b/Makefile
@@ -115,7 +115,7 @@ else
ASTSBINDIR=$(sbindir)
ASTSPOOLDIR=$(localstatedir)/spool/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=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/answer-before-say (original)
+++ asterisk/trunk/debian/patches/bristuff/answer-before-say Mon Dec 3 18:42:37 2007
@@ -1,8 +1,8 @@
Answer the channel before saying things (SayNumber, SayDigits,
SayCharacters, SayPhonetic).
---- asterisk-1.4.8~dfsg.orig/main/pbx.c
-+++ asterisk-1.4.8~dfsg/main/pbx.c
+--- a/main/pbx.c
++++ b/main/pbx.c
@@ -6002,6 +6002,9 @@ static int pbx_builtin_saynumber(struct
return -1;
}
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=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/app-dial-R-noinband (original)
+++ asterisk/trunk/debian/patches/bristuff/app-dial-R-noinband Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
---- asterisk-1.4.8~dfsg.orig/apps/app_dial.c
-+++ asterisk-1.4.8~dfsg/apps/app_dial.c
+--- a/apps/app_dial.c
++++ b/apps/app_dial.c
@@ -187,6 +187,8 @@ static char *descrip =
" family/key is not specified.\n"
" r - Indicate ringing to the calling party. Pass no audio to the calling\n"
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=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/app-dial-c-callback (original)
+++ asterisk/trunk/debian/patches/bristuff/app-dial-c-callback Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
---- asterisk-1.4.8~dfsg.orig/apps/app_dial.c
-+++ asterisk-1.4.8~dfsg/apps/app_dial.c
+--- a/apps/app_dial.c
++++ b/apps/app_dial.c
@@ -190,7 +190,8 @@ static char *descrip =
" R - indicate ringing to the calling party when the called party indicates\n"
" ringing, pass no audio until answered.\n"
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=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/app-dial-etc (original)
+++ asterisk/trunk/debian/patches/bristuff/app-dial-etc Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
---- asterisk-1.4.8~dfsg.orig/apps/app_dial.c
-+++ asterisk-1.4.8~dfsg/apps/app_dial.c
+--- a/apps/app_dial.c
++++ b/apps/app_dial.c
@@ -64,6 +64,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
#include "asterisk/manager.h"
#include "asterisk/privacy.h"
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=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/app-dial-priority-202 (original)
+++ asterisk/trunk/debian/patches/bristuff/app-dial-priority-202 Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
---- asterisk-1.4.12.orig/apps/app_dial.c
-+++ asterisk-1.4.12/apps/app_dial.c
+--- a/apps/app_dial.c
++++ b/apps/app_dial.c
@@ -11,6 +11,10 @@
* the project provides a web site, mailing lists and IRC
* channels for your use.
Modified: asterisk/trunk/debian/patches/bristuff/app-meetme-avoid-overflows
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/app-meetme-avoid-overflows?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/app-meetme-avoid-overflows (original)
+++ asterisk/trunk/debian/patches/bristuff/app-meetme-avoid-overflows Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
---- asterisk-1.4.10.1~dfsg.orig/apps/app_meetme.c
-+++ asterisk-1.4.10.1~dfsg/apps/app_meetme.c
+--- a/apps/app_meetme.c
++++ b/apps/app_meetme.c
@@ -1397,8 +1397,9 @@ static int conf_run(struct ast_channel *
char members[10] = "";
int dtmf, opt_waitmarked_timeout = 0;
Modified: asterisk/trunk/debian/patches/bristuff/app-zapras-fix-audiomode
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/app-zapras-fix-audiomode?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/app-zapras-fix-audiomode (original)
+++ asterisk/trunk/debian/patches/bristuff/app-zapras-fix-audiomode Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
---- asterisk-1.4.8~dfsg.orig/apps/app_zapras.c
-+++ asterisk-1.4.8~dfsg/apps/app_zapras.c
+--- a/apps/app_zapras.c
++++ b/apps/app_zapras.c
@@ -183,7 +183,7 @@ static void run_ras(struct ast_channel *
}
}
Modified: asterisk/trunk/debian/patches/bristuff/ast-device-state-CID
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/ast-device-state-CID?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast-device-state-CID (original)
+++ asterisk/trunk/debian/patches/bristuff/ast-device-state-CID Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
---- asterisk-1.4.10.1~dfsg.orig/include/asterisk/devicestate.h
-+++ asterisk-1.4.10.1~dfsg/include/asterisk/devicestate.h
+--- a/include/asterisk/devicestate.h
++++ b/include/asterisk/devicestate.h
@@ -47,7 +47,7 @@ extern "C" {
#define AST_DEVICE_ONHOLD 8
@@ -18,8 +18,8 @@
/*! \brief Registers a device state change callback
* \param callback Callback
---- asterisk-1.4.10.1~dfsg.orig/main/devicestate.c
-+++ asterisk-1.4.10.1~dfsg/main/devicestate.c
+--- a/main/devicestate.c
++++ b/main/devicestate.c
@@ -78,6 +78,8 @@ static AST_LIST_HEAD_STATIC(devstate_cbs
struct state_change {
@@ -111,8 +111,8 @@
free(cur);
AST_LIST_LOCK(&state_changes);
} else {
---- asterisk-1.4.10.1~dfsg.orig/include/asterisk/channel.h
-+++ asterisk-1.4.10.1~dfsg/include/asterisk/channel.h
+--- a/include/asterisk/channel.h
++++ b/include/asterisk/channel.h
@@ -572,8 +572,13 @@ int ast_channel_datastore_remove(struct
/*! \brief Find a datastore on a channel */
struct ast_datastore *ast_channel_datastore_find(struct ast_channel *chan, const struct ast_datastore_info *info, char *uid);
@@ -128,8 +128,8 @@
/*! \brief Create a channel structure
\return Returns NULL on failure to allocate.
---- asterisk-1.4.10.1~dfsg.orig/main/channel.c
-+++ asterisk-1.4.10.1~dfsg/main/channel.c
+--- a/main/channel.c
++++ b/main/channel.c
@@ -1269,7 +1269,7 @@ void ast_channel_free(struct ast_channel
free(chan);
AST_LIST_UNLOCK(&channels);
@@ -169,8 +169,8 @@
/*! \brief Find bridged channel */
struct ast_channel *ast_bridged_channel(struct ast_channel *chan)
{
---- asterisk-1.4.10.1~dfsg.orig/include/asterisk/pbx.h
-+++ asterisk-1.4.10.1~dfsg/include/asterisk/pbx.h
+--- a/include/asterisk/pbx.h
++++ b/include/asterisk/pbx.h
@@ -63,7 +63,7 @@ struct ast_ignorepat;
struct ast_sw;
@@ -189,8 +189,8 @@
#if defined(__cplusplus) || defined(c_plusplus)
}
---- asterisk-1.4.10.1~dfsg.orig/main/pbx.c
-+++ asterisk-1.4.10.1~dfsg/main/pbx.c
+--- a/main/pbx.c
++++ b/main/pbx.c
@@ -1993,7 +1993,7 @@ int ast_extension_state(struct ast_chann
return ast_extension_state2(e); /* Check all devices in the hint */
}
@@ -232,8 +232,8 @@
free(prevcb);
}
} else {
---- asterisk-1.4.10.1~dfsg.orig/channels/chan_sip.c
-+++ asterisk-1.4.10.1~dfsg/channels/chan_sip.c
+--- a/channels/chan_sip.c
++++ b/channels/chan_sip.c
@@ -1328,7 +1328,7 @@ static void ast_quiet_chan(struct ast_ch
static int attempt_transfer(struct sip_dual *transferer, struct sip_dual *target);
@@ -252,8 +252,8 @@
{
struct sip_pvt *p = data;
---- asterisk-1.4.10.1~dfsg.orig/apps/app_queue.c
-+++ asterisk-1.4.10.1~dfsg/apps/app_queue.c
+--- a/apps/app_queue.c
++++ b/apps/app_queue.c
@@ -594,7 +594,7 @@ static void *changethread(void *data)
return NULL;
}
@@ -263,8 +263,8 @@
{
/* Avoid potential for deadlocks by spawning a new thread to handle
the event */
---- asterisk-1.4.10.1~dfsg.orig/include/asterisk/manager.h
-+++ asterisk-1.4.10.1~dfsg/include/asterisk/manager.h
+--- a/include/asterisk/manager.h
++++ b/include/asterisk/manager.h
@@ -55,6 +55,7 @@
#define EVENT_FLAG_AGENT (1 << 5) /* Ability to read/set agent info */
#define EVENT_FLAG_USER (1 << 6) /* Ability to read/set user info */
@@ -273,8 +273,8 @@
/* Export manager structures */
#define AST_MAX_MANHEADERS 128
---- asterisk-1.4.10.1~dfsg.orig/main/manager.c
-+++ asterisk-1.4.10.1~dfsg/main/manager.c
+--- a/main/manager.c
++++ b/main/manager.c
@@ -128,6 +128,7 @@ static struct permalias {
{ EVENT_FLAG_AGENT, "agent" },
{ EVENT_FLAG_USER, "user" },
@@ -298,8 +298,8 @@
return 0;
}
---- asterisk-1.4.10.1~dfsg.orig/apps/app_devstate.c
-+++ asterisk-1.4.10.1~dfsg/apps/app_devstate.c
+--- a/apps/app_devstate.c
++++ b/apps/app_devstate.c
@@ -50,7 +50,7 @@ static struct ast_cli_entry cli_dev_sta
static int devstate_cli(int fd, int argc, char *argv[])
{
@@ -353,8 +353,8 @@
astman_append(s, "Response: Success\r\n%s\r\n", idText);
} else {
ast_log(LOG_DEBUG, "ast_db_put failed\n");
---- asterisk-1.4.10.1~dfsg.orig/res/res_esel.c
-+++ asterisk-1.4.10.1~dfsg/res/res_esel.c
+--- a/res/res_esel.c
++++ b/res/res_esel.c
@@ -51,6 +51,8 @@ typedef struct esel_extension_state {
char context[AST_MAX_EXTENSION];
char exten[AST_MAX_EXTENSION];
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=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast-send-message (original)
+++ asterisk/trunk/debian/patches/bristuff/ast-send-message Mon Dec 3 18:42:37 2007
@@ -1,8 +1,8 @@
Change the API of ast_sendtext and chan->sendtext to add dest and ispdu
parameters, used by ast_send_message which is also introduced by this patch.
---- asterisk-1.4.10.1~dfsg.orig/include/asterisk/channel.h
-+++ asterisk-1.4.10.1~dfsg/include/asterisk/channel.h
+--- a/include/asterisk/channel.h
++++ b/include/asterisk/channel.h
@@ -223,7 +223,7 @@ struct ast_channel_tech {
int (* const write)(struct ast_channel *chan, struct ast_frame *frame);
@@ -43,8 +43,8 @@
/*! \brief Receives a text character from a channel
* \param chan channel to act upon
---- asterisk-1.4.10.1~dfsg.orig/main/channel.c
-+++ asterisk-1.4.10.1~dfsg/main/channel.c
+--- a/main/channel.c
++++ b/main/channel.c
@@ -2655,7 +2655,7 @@ char *ast_recvtext(struct ast_channel *c
return buf;
}
@@ -98,8 +98,8 @@
/*! \ brief Convert channel reloadreason (ENUM) to text string for manager event */
const char *channelreloadreason2txt(enum channelreloadreason reason)
{
---- asterisk-1.4.10.1~dfsg.orig/apps/app_sendtext.c
-+++ asterisk-1.4.10.1~dfsg/apps/app_sendtext.c
+--- a/apps/app_sendtext.c
++++ b/apps/app_sendtext.c
@@ -103,7 +103,7 @@ static int sendtext_exec(struct ast_chan
}
status = "FAILURE";
@@ -109,8 +109,8 @@
if (!res)
status = "SUCCESS";
pbx_builtin_setvar_helper(chan, "SENDTEXTSTATUS", status);
---- asterisk-1.4.10.1~dfsg.orig/res/res_agi.c
-+++ asterisk-1.4.10.1~dfsg/res/res_agi.c
+--- a/res/res_agi.c
++++ b/res/res_agi.c
@@ -483,7 +483,7 @@ static int handle_sendtext(struct ast_ch
would probably be to strip off the trailing newline before
parsing, then here, add a newline at the end of the string
@@ -120,8 +120,8 @@
fdprintf(agi->fd, "200 result=%d\n", res);
return (res >= 0) ? RESULT_SUCCESS : RESULT_FAILURE;
}
---- asterisk-1.4.10.1~dfsg.orig/channels/chan_agent.c
-+++ asterisk-1.4.10.1~dfsg/channels/chan_agent.c
+--- a/channels/chan_agent.c
++++ b/channels/chan_agent.c
@@ -246,7 +246,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);
@@ -147,8 +147,8 @@
ast_mutex_unlock(&p->lock);
return res;
}
---- asterisk-1.4.10.1~dfsg.orig/channels/chan_alsa.c
-+++ asterisk-1.4.10.1~dfsg/channels/chan_alsa.c
+--- a/channels/chan_alsa.c
++++ b/channels/chan_alsa.c
@@ -186,7 +186,7 @@ static int nosound = 0;
/* ZZ */
static struct ast_channel *alsa_request(const char *type, int format, void *data, int *cause);
@@ -167,8 +167,8 @@
{
ast_mutex_lock(&alsalock);
ast_verbose(" << Console Received text %s >> \n", text);
---- asterisk-1.4.10.1~dfsg.orig/channels/chan_local.c
-+++ asterisk-1.4.10.1~dfsg/channels/chan_local.c
+--- a/channels/chan_local.c
++++ b/channels/chan_local.c
@@ -77,7 +77,7 @@ static int local_write(struct ast_channe
static int local_indicate(struct ast_channel *ast, int condition, const void *data, size_t datalen);
static int local_fixup(struct ast_channel *oldchan, struct ast_channel *newchan);
@@ -187,8 +187,8 @@
{
struct local_pvt *p = ast->tech_pvt;
int res = -1;
---- asterisk-1.4.10.1~dfsg.orig/channels/chan_oss.c
-+++ asterisk-1.4.10.1~dfsg/channels/chan_oss.c
+--- a/channels/chan_oss.c
++++ b/channels/chan_oss.c
@@ -405,7 +405,7 @@ static struct ast_channel *oss_request(c
, int *cause);
static int oss_digit_begin(struct ast_channel *c, char digit);
@@ -207,8 +207,8 @@
{
/* print received messages */
ast_verbose(" << Console Received text %s >> \n", text);
---- asterisk-1.4.10.1~dfsg.orig/channels/chan_phone.c
-+++ asterisk-1.4.10.1~dfsg/channels/chan_phone.c
+--- a/channels/chan_phone.c
++++ b/channels/chan_phone.c
@@ -166,7 +166,7 @@ static int phone_answer(struct ast_chann
static struct ast_frame *phone_read(struct ast_channel *ast);
static int phone_write(struct ast_channel *ast, struct ast_frame *frame);
@@ -227,8 +227,8 @@
{
int length = strlen(text);
return phone_write_buf(ast->tech_pvt, text, length, length, 0) ==
---- asterisk-1.4.10.1~dfsg.orig/channels/chan_sip.c
-+++ asterisk-1.4.10.1~dfsg/channels/chan_sip.c
+--- a/channels/chan_sip.c
++++ b/channels/chan_sip.c
@@ -1204,7 +1204,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);
@@ -247,8 +247,8 @@
{
struct sip_pvt *p = ast->tech_pvt;
int debug = sip_debug_test_pvt(p);
---- asterisk-1.4.10.1~dfsg.orig/channels/chan_iax2.c
-+++ asterisk-1.4.10.1~dfsg/channels/chan_iax2.c
+--- a/channels/chan_iax2.c
++++ b/channels/chan_iax2.c
@@ -817,7 +817,7 @@ static int iax2_provision(struct sockadd
static int iax2_send(struct chan_iax2_pvt *pvt, struct ast_frame *f, unsigned int ts, int seqno, int now, int transfer, int final);
static int iax2_sendhtml(struct ast_channel *c, int subclass, const char *data, int datalen);
Modified: asterisk/trunk/debian/patches/bristuff/ast-send-message-users
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/ast-send-message-users?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast-send-message-users (original)
+++ asterisk/trunk/debian/patches/bristuff/ast-send-message-users Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
---- asterisk-1.4.8~dfsg.orig/main/manager.c
-+++ asterisk-1.4.8~dfsg/main/manager.c
+--- a/main/manager.c
++++ b/main/manager.c
@@ -11,6 +11,9 @@
* the project provides a web site, mailing lists and IRC
* channels for your use.
@@ -68,8 +68,8 @@
ast_manager_register("Status", EVENT_FLAG_CALL, action_status, "Lists channel status" );
ast_manager_register2("Setvar", EVENT_FLAG_CALL, action_setvar, "Set Channel Variable", mandescr_setvar );
ast_manager_register2("Getvar", EVENT_FLAG_CALL, action_getvar, "Gets a Channel Variable", mandescr_getvar );
---- asterisk-1.4.8~dfsg.orig/pbx/pbx_spool.c
-+++ asterisk-1.4.8~dfsg/pbx/pbx_spool.c
+--- a/pbx/pbx_spool.c
++++ b/pbx/pbx_spool.c
@@ -87,6 +87,10 @@ struct outgoing {
char app[256];
char data[256];
Modified: asterisk/trunk/debian/patches/bristuff/ast_channel_masquerade_locked
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/ast_channel_masquerade_locked?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast_channel_masquerade_locked (original)
+++ asterisk/trunk/debian/patches/bristuff/ast_channel_masquerade_locked Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
---- asterisk-1.4.8~dfsg-OK.orig/main/channel.c
-+++ asterisk-1.4.8~dfsg-OK/main/channel.c
+--- a/main/channel.c
++++ b/main/channel.c
@@ -3448,6 +3448,29 @@ int ast_channel_masquerade(struct ast_ch
return res;
}
@@ -30,8 +30,8 @@
void ast_change_name(struct ast_channel *chan, char *newname)
{
manager_event(EVENT_FLAG_CALL, "Rename", "Oldname: %s\r\nNewname: %s\r\nUniqueid: %s\r\n", chan->name, newname, chan->uniqueid);
---- asterisk-1.4.8~dfsg-OK.orig/include/asterisk/channel.h
-+++ asterisk-1.4.8~dfsg-OK/include/asterisk/channel.h
+--- a/include/asterisk/channel.h
++++ b/include/asterisk/channel.h
@@ -1033,6 +1033,7 @@ int ast_channel_bridge(struct ast_channe
p->owner pointer) that is affected by the change. The physical layer of the original
channel is hung up. */
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=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast_monitor_start-targetscript (original)
+++ asterisk/trunk/debian/patches/bristuff/ast_monitor_start-targetscript Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
---- asterisk-1.4.10.1~dfsg.orig/include/asterisk/monitor.h
-+++ asterisk-1.4.10.1~dfsg/include/asterisk/monitor.h
+--- a/include/asterisk/monitor.h
++++ b/include/asterisk/monitor.h
@@ -38,6 +38,8 @@ struct ast_channel_monitor {
char write_filename[FILENAME_MAX];
char filename_base[FILENAME_MAX];
@@ -18,8 +18,8 @@
/* Stop monitoring a channel */
int ast_monitor_stop(struct ast_channel *chan, int need_lock);
---- asterisk-1.4.10.1~dfsg.orig/res/res_monitor.c
-+++ asterisk-1.4.10.1~dfsg/res/res_monitor.c
+--- a/res/res_monitor.c
++++ b/res/res_monitor.c
@@ -124,7 +124,7 @@ static int ast_monitor_set_state(struct
/* Start monitoring a channel */
@@ -93,8 +93,8 @@
if (ast_monitor_change_fname(c, fname, 1)) {
astman_send_error(s, m, "Could not start monitoring channel");
ast_channel_unlock(c);
---- asterisk-1.4.10.1~dfsg.orig/apps/app_queue.c
-+++ asterisk-1.4.10.1~dfsg/apps/app_queue.c
+--- a/apps/app_queue.c
++++ b/apps/app_queue.c
@@ -2583,13 +2583,13 @@ static int try_calling(struct queue_ent
else
which = peer;
@@ -112,8 +112,8 @@
}
if (qe->parent->monjoin)
ast_monitor_setjoinfiles(which, 1);
---- asterisk-1.4.10.1~dfsg.orig/channels/chan_agent.c
-+++ asterisk-1.4.10.1~dfsg/channels/chan_agent.c
+--- a/channels/chan_agent.c
++++ b/channels/chan_agent.c
@@ -412,7 +412,7 @@ static int __agent_start_monitoring(stru
if ((pointer = strchr(filename, '.')))
*pointer = '-';
Modified: asterisk/trunk/debian/patches/bristuff/bristuff-notice
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/bristuff-notice?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/bristuff-notice (original)
+++ asterisk/trunk/debian/patches/bristuff/bristuff-notice Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
---- asterisk-1.4.12.orig/README
-+++ asterisk-1.4.12/README
+--- a/README
++++ b/README
@@ -4,6 +4,8 @@ and the Asterisk.org developer community
Copyright (C) 2001-2006 Digium, Inc.
@@ -9,8 +9,8 @@
================================================================
* SECURITY
---- asterisk-1.4.12.orig/LICENSE
-+++ asterisk-1.4.12/LICENSE
+--- a/LICENSE
++++ b/LICENSE
@@ -1,7 +1,7 @@
-Asterisk is distributed under the GNU General Public License version 2
-and is also available under alternative licenses negotiated directly
@@ -23,8 +23,8 @@
except as defined below. The GPL (version 2) is included in this
source tree in the file COPYING.
---- asterisk-1.4.12.orig/doc/hardware.txt
-+++ asterisk-1.4.12/doc/hardware.txt
+--- a/doc/hardware.txt
++++ b/doc/hardware.txt
@@ -31,6 +31,19 @@ Zaptel compatible hardware
* Wildcard TE410P - Quad T1/E1 switchable interface. Supports PRI and
RBS signalling, as well as PPP, FR, and HDLC data modes.
Modified: asterisk/trunk/debian/patches/bristuff/chan-capi
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/chan-capi?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/chan-capi (original)
+++ asterisk/trunk/debian/patches/bristuff/chan-capi Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
--- /dev/null
-+++ asterisk-1.4.8~dfsg/apps/app_capiCD.c
++++ b/apps/app_capiCD.c
@@ -0,0 +1,164 @@
+/*
+ * (CAPI*)
@@ -166,7 +166,7 @@
+
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, tdesc);
--- /dev/null
-+++ asterisk-1.4.8~dfsg/apps/app_capiECT.c
++++ b/apps/app_capiECT.c
@@ -0,0 +1,214 @@
+/*
+ * (CAPI*)
@@ -383,7 +383,7 @@
+ return ASTERISK_GPL_KEY;
+}
--- /dev/null
-+++ asterisk-1.4.8~dfsg/apps/app_capiNoES.c
++++ b/apps/app_capiNoES.c
@@ -0,0 +1,100 @@
+/*
+ * (CAPI*)
@@ -485,8 +485,8 @@
+{
+ return ASTERISK_GPL_KEY;
+}
---- asterisk-1.4.8~dfsg.orig/build_tools/menuselect-deps.in
-+++ asterisk-1.4.8~dfsg/build_tools/menuselect-deps.in
+--- a/build_tools/menuselect-deps.in
++++ b/build_tools/menuselect-deps.in
@@ -1,4 +1,5 @@
ASOUND=@PBX_ALSA@
+CAPI=@PBX_CAPI@
@@ -494,7 +494,7 @@
FREETDS=@PBX_FREETDS@
GSM=@PBX_GSM@
--- /dev/null
-+++ asterisk-1.4.8~dfsg/channels/chan_capi.c
++++ b/channels/chan_capi.c
@@ -0,0 +1,2888 @@
+/*
+ * (CAPI*)
@@ -3385,7 +3385,7 @@
+ .unload = unload_module,
+);
--- /dev/null
-+++ asterisk-1.4.8~dfsg/configs/capi.conf.sample
++++ b/configs/capi.conf.sample
@@ -0,0 +1,44 @@
+;
+; CAPI config
@@ -3432,7 +3432,7 @@
+;controller=2
+;devices => 30
--- /dev/null
-+++ asterisk-1.4.8~dfsg/doc/README.chan_capi
++++ b/doc/README.chan_capi
@@ -0,0 +1,146 @@
+(CAPI*) chan_capi a Common ISDN API 2.0 implementation for Asterisk
+(C) 2002, 2003, 2004, 2005 Junghanns.NET GmbH
@@ -3581,7 +3581,7 @@
+
+
--- /dev/null
-+++ asterisk-1.4.8~dfsg/include/asterisk/chan_capi_app.h
++++ b/include/asterisk/chan_capi_app.h
@@ -0,0 +1,30 @@
+/*
+ * (CAPI*)
@@ -3614,7 +3614,7 @@
+
+#endif
--- /dev/null
-+++ asterisk-1.4.8~dfsg/include/asterisk/chan_capi.h
++++ b/include/asterisk/chan_capi.h
@@ -0,0 +1,276 @@
+/*
+ * (CAPI*)
@@ -3893,7 +3893,7 @@
+
+#endif
--- /dev/null
-+++ asterisk-1.4.8~dfsg/include/asterisk/xlaw.h
++++ b/include/asterisk/xlaw.h
@@ -0,0 +1,1665 @@
+#ifndef _ASTERISK_XLAW_H
+#define _ASTERISK_XLAW_H
@@ -5560,8 +5560,8 @@
+#endif // CAPI_ULAW
+#endif
+
---- asterisk-1.4.8~dfsg.orig/configure.ac
-+++ asterisk-1.4.8~dfsg/configure.ac
+--- a/configure.ac
++++ b/configure.ac
@@ -171,6 +171,7 @@ AC_SUBST(AST_DEVMODE)
# by the --with option name, to make things easier for the users :-)
@@ -5579,8 +5579,8 @@
AST_EXT_LIB_CHECK([CURSES], [curses], [initscr], [curses.h])
GSM_INTERNAL="yes"
---- asterisk-1.4.8~dfsg.orig/configure
-+++ asterisk-1.4.8~dfsg/configure
+--- a/configure
++++ b/configure
@@ -720,6 +720,9 @@ ALSA_LIB
ALSA_INCLUDE
ALSA_DIR
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=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause (original)
+++ asterisk/trunk/debian/patches/bristuff/chan-iax2-hangup-cause Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
---- asterisk-1.4.10.1~dfsg.orig/channels/chan_iax2.c
-+++ asterisk-1.4.10.1~dfsg/channels/chan_iax2.c
+--- a/channels/chan_iax2.c
++++ b/channels/chan_iax2.c
@@ -11,6 +11,9 @@
* the project provides a web site, mailing lists and IRC
* channels for your use.
Modified: asterisk/trunk/debian/patches/bristuff/configurable-AST_SYSTEM_NAME
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/configurable-AST_SYSTEM_NAME?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/configurable-AST_SYSTEM_NAME (original)
+++ asterisk/trunk/debian/patches/bristuff/configurable-AST_SYSTEM_NAME Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
---- asterisk-1.4.8~dfsg.orig/build_tools/make_defaults_h
-+++ asterisk-1.4.8~dfsg/build_tools/make_defaults_h
+--- a/build_tools/make_defaults_h
++++ b/build_tools/make_defaults_h
@@ -17,6 +17,7 @@ cat << END
#define AST_KEY_DIR "${INSTALL_PATH}${ASTVARLIBDIR}/keys"
#define AST_DB "${INSTALL_PATH}${ASTVARLIBDIR}/astdb"
@@ -8,8 +8,8 @@
#define AST_CONFIG_FILE "${INSTALL_PATH}${ASTCONFPATH}"
---- asterisk-1.4.8~dfsg.orig/main/asterisk.c
-+++ asterisk-1.4.8~dfsg/main/asterisk.c
+--- a/main/asterisk.c
++++ b/main/asterisk.c
@@ -2368,6 +2368,7 @@ static void ast_readconfig(void)
ast_copy_string(ast_config_AST_PID, AST_PID, sizeof(ast_config_AST_PID));
ast_copy_string(ast_config_AST_SOCKET, AST_SOCKET, sizeof(ast_config_AST_SOCKET));
Modified: asterisk/trunk/debian/patches/bristuff/feature-autoanswer
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/feature-autoanswer?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/feature-autoanswer (original)
+++ asterisk/trunk/debian/patches/bristuff/feature-autoanswer Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
---- asterisk-1.4.10.1~dfsg.orig/include/asterisk/features.h
-+++ asterisk-1.4.10.1~dfsg/include/asterisk/features.h
+--- a/include/asterisk/features.h
++++ b/include/asterisk/features.h
@@ -47,6 +47,8 @@ struct ast_call_feature {
};
@@ -9,8 +9,8 @@
/*! \brief Park a call and read back parked location
* \param chan the channel to actually be parked
---- asterisk-1.4.10.1~dfsg.orig/res/res_features.c
-+++ asterisk-1.4.10.1~dfsg/res/res_features.c
+--- a/res/res_features.c
++++ b/res/res_features.c
@@ -11,6 +11,10 @@
* the project provides a web site, mailing lists and IRC
* channels for your use.
Modified: asterisk/trunk/debian/patches/bristuff/feature-holdedcalls
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/feature-holdedcalls?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/feature-holdedcalls (original)
+++ asterisk/trunk/debian/patches/bristuff/feature-holdedcalls Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
---- asterisk-1.4.10.1~dfsg.orig/include/asterisk/features.h
-+++ asterisk-1.4.10.1~dfsg/include/asterisk/features.h
+--- a/include/asterisk/features.h
++++ b/include/asterisk/features.h
@@ -72,6 +72,12 @@ int ast_park_call(struct ast_channel *ch
*/
int ast_masq_park_call(struct ast_channel *rchan, struct ast_channel *host, int timeout, int *extout);
@@ -13,8 +13,8 @@
/*! \brief Determine system parking extension
* Returns the call parking extension for drivers that provide special
call parking help */
---- asterisk-1.4.10.1~dfsg.orig/res/res_features.c
-+++ asterisk-1.4.10.1~dfsg/res/res_features.c
+--- a/res/res_features.c
++++ b/res/res_features.c
@@ -62,6 +62,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
#include "asterisk/adsi.h"
#include "asterisk/devicestate.h"
Modified: asterisk/trunk/debian/patches/bristuff/feature-parking_con
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/feature-parking_con?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/feature-parking_con (original)
+++ asterisk/trunk/debian/patches/bristuff/feature-parking_con Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
---- asterisk-1.4.8~dfsg-OK.orig/include/asterisk/features.h
-+++ asterisk-1.4.8~dfsg-OK/include/asterisk/features.h
+--- a/include/asterisk/features.h
++++ b/include/asterisk/features.h
@@ -86,6 +86,8 @@ char *ast_parking_ext(void);
/*! \brief Determine system call pickup extension */
char *ast_pickup_ext(void);
@@ -9,8 +9,8 @@
/*! \brief Bridge a call, optionally allowing redirection */
int ast_bridge_call(struct ast_channel *chan, struct ast_channel *peer,struct ast_bridge_config *config);
---- asterisk-1.4.8~dfsg-OK.orig/res/res_features.c
-+++ asterisk-1.4.8~dfsg-OK/res/res_features.c
+--- a/res/res_features.c
++++ b/res/res_features.c
@@ -216,6 +216,12 @@ char *ast_parking_ext(void)
return parking_ext;
}
Modified: asterisk/trunk/debian/patches/bristuff/find-feature
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/find-feature?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/find-feature (original)
+++ asterisk/trunk/debian/patches/bristuff/find-feature Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
---- asterisk-1.4.8~dfsg-OK.orig/include/asterisk/features.h
-+++ asterisk-1.4.8~dfsg-OK/include/asterisk/features.h
+--- a/include/asterisk/features.h
++++ b/include/asterisk/features.h
@@ -102,4 +102,12 @@ void ast_register_feature(struct ast_cal
\param feature the ast_call_feature object which was registered before*/
void ast_unregister_feature(struct ast_call_feature *feature);
@@ -13,8 +13,8 @@
+extern struct ast_call_feature *ast_find_builtin_feature(char *name);
+
#endif /* _AST_FEATURES_H */
---- asterisk-1.4.8~dfsg-OK.orig/res/res_features.c
-+++ asterisk-1.4.8~dfsg-OK/res/res_features.c
+--- a/res/res_features.c
++++ b/res/res_features.c
@@ -1008,6 +1008,18 @@ static struct ast_call_feature *find_dyn
return tmp;
}
Modified: asterisk/trunk/debian/patches/bristuff/misc-app-devstate
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/misc-app-devstate?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/misc-app-devstate (original)
+++ asterisk/trunk/debian/patches/bristuff/misc-app-devstate Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
--- /dev/null
-+++ asterisk-1.4.8~dfsg/apps/app_devstate.c
++++ b/apps/app_devstate.c
@@ -0,0 +1,202 @@
+/*
+ * Devstate application
Modified: asterisk/trunk/debian/patches/bristuff/misc-app-pickup
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/misc-app-pickup?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/misc-app-pickup (original)
+++ asterisk/trunk/debian/patches/bristuff/misc-app-pickup Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
---- asterisk-1.4.8~dfsg-OK.orig/apps/app_directed_pickup.c
-+++ asterisk-1.4.8~dfsg-OK/apps/app_directed_pickup.c
+--- a/apps/app_directed_pickup.c
++++ b/apps/app_directed_pickup.c
@@ -45,7 +45,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
#define PICKUPMARK "PICKUPMARK"
@@ -10,7 +10,7 @@
static const char *descrip =
" Pickup(extension[@context][&extension2 at context...]): This application can pickup any ringing channel\n"
--- /dev/null
-+++ asterisk-1.4.8~dfsg-OK/apps/app_pickup.c
++++ b/apps/app_pickup.c
@@ -0,0 +1,300 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
Modified: asterisk/trunk/debian/patches/bristuff/misc-app-segfault
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/misc-app-segfault?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/misc-app-segfault (original)
+++ asterisk/trunk/debian/patches/bristuff/misc-app-segfault Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
--- /dev/null
-+++ asterisk-1.4.8~dfsg/apps/app_segfault.c
++++ b/apps/app_segfault.c
@@ -0,0 +1,55 @@
+/*
+ * Segfault application
Modified: asterisk/trunk/debian/patches/bristuff/misc-manager-dbdel
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/misc-manager-dbdel?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/misc-manager-dbdel (original)
+++ asterisk/trunk/debian/patches/bristuff/misc-manager-dbdel Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
---- asterisk-1.4.8~dfsg.orig/main/db.c
-+++ asterisk-1.4.8~dfsg/main/db.c
+--- a/main/db.c
++++ b/main/db.c
@@ -573,7 +573,7 @@ static int manager_dbget(struct mansessi
astman_append(s, "Event: DBGetResponse\r\n"
"Family: %s\r\n"
Modified: asterisk/trunk/debian/patches/bristuff/misc-res-esel
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/misc-res-esel?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/misc-res-esel (original)
+++ asterisk/trunk/debian/patches/bristuff/misc-res-esel Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
--- /dev/null
-+++ asterisk-1.4.8~dfsg/configs/esel.conf.sample
++++ b/configs/esel.conf.sample
@@ -0,0 +1,12 @@
+;
+; Configuration file for res_esel
@@ -14,7 +14,7 @@
+; export the extension snom in context phones to DS/100
+;export => snom at phones,100
--- /dev/null
-+++ asterisk-1.4.8~dfsg/res/res_esel.c
++++ b/res/res_esel.c
@@ -0,0 +1,384 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
Modified: asterisk/trunk/debian/patches/bristuff/misc-res-watchdog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/misc-res-watchdog?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/misc-res-watchdog (original)
+++ asterisk/trunk/debian/patches/bristuff/misc-res-watchdog Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
--- /dev/null
-+++ asterisk-1.4.8~dfsg/configs/watchdog.conf.sample
++++ b/configs/watchdog.conf.sample
@@ -0,0 +1,22 @@
+;
+; Configuration file for res_watchdog
@@ -24,7 +24,7 @@
+;interval = 100
+
--- /dev/null
-+++ asterisk-1.4.8~dfsg/res/res_watchdog.c
++++ b/res/res_watchdog.c
@@ -0,0 +1,137 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
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=5010&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 Mon Dec 3 18:42:37 2007
@@ -1,7 +1,7 @@
Use Asterisk's process ID when building the unique ID.
---- asterisk-1.4.8~dfsg.orig/main/channel.c
-+++ asterisk-1.4.8~dfsg/main/channel.c
+--- a/main/channel.c
++++ b/main/channel.c
@@ -803,10 +803,10 @@ struct ast_channel *ast_channel_alloc(in
tmp->fout = global_fout;
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=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid Mon Dec 3 18:42:37 2007
@@ -1,7 +1,7 @@
Add or convert channel operations so they can use the unique ID.
---- asterisk-1.4.10.1~dfsg.orig/include/asterisk/channel.h
-+++ asterisk-1.4.10.1~dfsg/include/asterisk/channel.h
+--- a/include/asterisk/channel.h
++++ b/include/asterisk/channel.h
@@ -641,6 +641,18 @@ void ast_channel_free(struct ast_channe
*/
struct ast_channel *ast_request(const char *type, int format, void *data, int *status);
@@ -42,8 +42,8 @@
/*! ! \brief Waits for a digit
* \param c channel to wait for a digit on
---- asterisk-1.4.10.1~dfsg.orig/main/channel.c
-+++ asterisk-1.4.10.1~dfsg/main/channel.c
+--- a/main/channel.c
++++ b/main/channel.c
@@ -1027,7 +1027,7 @@ void ast_channel_undefer_dtmf(struct ast
*/
static struct ast_channel *channel_find_locked(const struct ast_channel *prev,
@@ -193,8 +193,8 @@
manager_event(EVENT_FLAG_CALL, "Rename", "Oldname: %s\r\nNewname: %s\r\nUniqueid: %s\r\n", orig, newn, original->uniqueid);
/* Swap the technologies */
---- asterisk-1.4.10.1~dfsg.orig/apps/app_parkandannounce.c
-+++ asterisk-1.4.10.1~dfsg/apps/app_parkandannounce.c
+--- a/apps/app_parkandannounce.c
++++ b/apps/app_parkandannounce.c
@@ -182,7 +182,7 @@ static int parkandannounce_exec(struct a
memset(&oh, 0, sizeof(oh));
oh.parent_channel = chan;
@@ -204,8 +204,8 @@
if(dchan) {
if(dchan->_state == AST_STATE_UP) {
---- asterisk-1.4.10.1~dfsg.orig/include/asterisk/pbx.h
-+++ asterisk-1.4.10.1~dfsg/include/asterisk/pbx.h
+--- a/include/asterisk/pbx.h
++++ b/include/asterisk/pbx.h
@@ -715,9 +715,17 @@ int ast_async_goto_by_name(const char *c
int ast_pbx_outgoing_exten(const char *type, int format, void *data, int timeout, const char *context, const char *exten, int priority, int *reason, int sync, const char *cid_num, const char *cid_name, struct ast_variable *vars, const char *account, struct ast_channel **locked_channel);
@@ -224,8 +224,8 @@
/*!
* \brief Evaluate a condition
*
---- asterisk-1.4.10.1~dfsg.orig/main/pbx.c
-+++ asterisk-1.4.10.1~dfsg/main/pbx.c
+--- a/main/pbx.c
++++ b/main/pbx.c
@@ -4957,7 +4957,7 @@ static int ast_pbx_outgoing_cdr_failed(v
return 0; /* success */
}
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=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-20-monitor (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-20-monitor Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
---- asterisk-1.4.8~dfsg.orig/res/res_monitor.c
-+++ asterisk-1.4.8~dfsg/res/res_monitor.c
+--- a/res/res_monitor.c
++++ b/res/res_monitor.c
@@ -328,6 +328,11 @@ int ast_monitor_stop(struct ast_channel
result = ast_safe_system(tmp);
if (result == -1)
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=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
---- asterisk-1.4.8~dfsg.orig/apps/app_chanspy.c
-+++ asterisk-1.4.8~dfsg/apps/app_chanspy.c
+--- a/apps/app_chanspy.c
++++ b/apps/app_chanspy.c
@@ -55,6 +55,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
static const char *tdesc = "Listen to a channel, and optionally whisper into it";
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=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
---- asterisk-1.4.8~dfsg.orig/main/manager.c
-+++ asterisk-1.4.8~dfsg/main/manager.c
+--- a/main/manager.c
++++ b/main/manager.c
@@ -86,6 +86,8 @@ struct fast_originate_helper {
char idtext[AST_MAX_EXTENSION];
char account[AST_MAX_ACCOUNT_CODE];
@@ -181,8 +181,8 @@
return 0;
}
---- asterisk-1.4.8~dfsg.orig/include/asterisk/channel.h
-+++ asterisk-1.4.8~dfsg/include/asterisk/channel.h
+--- a/include/asterisk/channel.h
++++ b/include/asterisk/channel.h
@@ -89,6 +89,9 @@
#include "asterisk/abstract_jb.h"
@@ -202,8 +202,8 @@
/*! \brief Report DTMF on channel 0 */
#define AST_BRIDGE_DTMF_CHANNEL_0 (1 << 0)
/*! \brief Report DTMF on channel 1 */
---- asterisk-1.4.8~dfsg.orig/main/channel.c
-+++ asterisk-1.4.8~dfsg/main/channel.c
+--- a/main/channel.c
++++ b/main/channel.c
@@ -724,6 +724,15 @@ static const struct ast_channel_tech nul
.description = "Null channel (should not see this)",
};
Modified: asterisk/trunk/debian/patches/bristuff/xagi
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/xagi?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/xagi (original)
+++ asterisk/trunk/debian/patches/bristuff/xagi Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
---- asterisk-1.4.12.orig/include/asterisk/agi.h
-+++ asterisk-1.4.12/include/asterisk/agi.h
+--- a/include/asterisk/agi.h
++++ b/include/asterisk/agi.h
@@ -29,7 +29,8 @@ extern "C" {
typedef struct agi_state {
@@ -10,8 +10,8 @@
int ctrl; /* FD for input control */
unsigned int fast:1; /* flag for fast agi or not */
} AGI;
---- asterisk-1.4.12.orig/res/res_agi.c
-+++ asterisk-1.4.12/res/res_agi.c
+--- a/res/res_agi.c
++++ b/res/res_agi.c
@@ -11,6 +11,9 @@
* the project provides a web site, mailing lists and IRC
* channels for your use.
@@ -393,7 +393,7 @@
}
--- /dev/null
-+++ asterisk-1.4.12/agi/xagi-test.c
++++ b/agi/xagi-test.c
@@ -0,0 +1,175 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
@@ -570,8 +570,8 @@
+ return -1;
+ exit(0);
+}
---- asterisk-1.4.12.orig/agi/Makefile
-+++ asterisk-1.4.12/agi/Makefile
+--- a/agi/Makefile
++++ b/agi/Makefile
@@ -13,7 +13,7 @@
.PHONY: clean all uninstall
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=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn Mon Dec 3 18:42:37 2007
@@ -1,7 +1,7 @@
Index: asterisk-1.4.14~dfsg/include/asterisk/channel.h
===================================================================
---- asterisk-1.4.14~dfsg.orig/include/asterisk/channel.h 2007-11-19 12:33:35.000000000 +0200
-+++ asterisk-1.4.14~dfsg/include/asterisk/channel.h 2007-11-19 12:33:35.000000000 +0200
+--- a/include/asterisk/channel.h 2007-11-19 12:33:35.000000000 +0200
++++ b/include/asterisk/channel.h 2007-11-19 12:33:35.000000000 +0200
@@ -420,6 +420,7 @@
unsigned int flags; /*!< channel flags of AST_FLAG_ type */
unsigned short transfercapability; /*!< ISDN Transfer Capbility - AST_FLAG_DIGITAL is not enough */
@@ -12,8 +12,8 @@
int nativeformats; /*!< Kinds of data this channel can natively handle */
Index: asterisk-1.4.14~dfsg/main/pbx.c
===================================================================
---- asterisk-1.4.14~dfsg.orig/main/pbx.c 2007-11-19 12:33:34.000000000 +0200
-+++ asterisk-1.4.14~dfsg/main/pbx.c 2007-11-19 12:33:35.000000000 +0200
+--- a/main/pbx.c 2007-11-19 12:33:34.000000000 +0200
++++ b/main/pbx.c 2007-11-19 12:33:35.000000000 +0200
@@ -5109,7 +5109,7 @@
};
@@ -25,8 +25,8 @@
struct ast_app *app;
Index: asterisk-1.4.14~dfsg/include/asterisk/pbx.h
===================================================================
---- asterisk-1.4.14~dfsg.orig/include/asterisk/pbx.h 2007-11-19 12:33:34.000000000 +0200
-+++ asterisk-1.4.14~dfsg/include/asterisk/pbx.h 2007-11-19 12:33:35.000000000 +0200
+--- a/include/asterisk/pbx.h 2007-11-19 12:33:34.000000000 +0200
++++ b/include/asterisk/pbx.h 2007-11-19 12:33:35.000000000 +0200
@@ -145,6 +145,8 @@
*/
struct ast_app *pbx_findapp(const char *app);
@@ -38,8 +38,8 @@
*
Index: asterisk-1.4.14~dfsg/channels/chan_zap.c
===================================================================
---- asterisk-1.4.14~dfsg.orig/channels/chan_zap.c 2007-11-19 12:31:59.000000000 +0200
-+++ asterisk-1.4.14~dfsg/channels/chan_zap.c 2007-11-19 12:48:21.000000000 +0200
+--- a/channels/chan_zap.c 2007-11-19 12:31:59.000000000 +0200
++++ b/channels/chan_zap.c 2007-11-19 12:48:21.000000000 +0200
@@ -11,6 +11,10 @@
* the project provides a web site, mailing lists and IRC
* channels for your use.
@@ -2588,8 +2588,8 @@
ast_log(LOG_WARNING, "Huh? I don't exist?\n");
Index: asterisk-1.4.14~dfsg/configs/zapata.conf.sample
===================================================================
---- asterisk-1.4.14~dfsg.orig/configs/zapata.conf.sample 2007-11-19 12:31:59.000000000 +0200
-+++ asterisk-1.4.14~dfsg/configs/zapata.conf.sample 2007-11-19 12:33:36.000000000 +0200
+--- a/configs/zapata.conf.sample 2007-11-19 12:31:59.000000000 +0200
++++ b/configs/zapata.conf.sample 2007-11-19 12:33:36.000000000 +0200
@@ -123,9 +123,20 @@
;
; outofband: Signal Busy/Congestion out of band with RELEASE/DISCONNECT
@@ -2613,8 +2613,8 @@
; priexclusive = yes
Index: asterisk-1.4.14~dfsg/main/channel.c
===================================================================
---- asterisk-1.4.14~dfsg.orig/main/channel.c 2007-11-19 12:33:35.000000000 +0200
-+++ asterisk-1.4.14~dfsg/main/channel.c 2007-11-19 12:33:36.000000000 +0200
+--- a/main/channel.c 2007-11-19 12:33:35.000000000 +0200
++++ b/main/channel.c 2007-11-19 12:33:36.000000000 +0200
@@ -4173,6 +4173,10 @@
c1->name, c1->_bridge->name);
return -1;
Modified: asterisk/trunk/debian/patches/bristuff/zapata-device-state
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/zapata-device-state?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-device-state (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-device-state Mon Dec 3 18:42:37 2007
@@ -1,7 +1,7 @@
Index: asterisk-1.4.14~dfsg/channels/chan_zap.c
===================================================================
---- asterisk-1.4.14~dfsg.orig/channels/chan_zap.c 2007-11-19 12:31:59.000000000 +0200
-+++ asterisk-1.4.14~dfsg/channels/chan_zap.c 2007-11-19 12:48:21.000000000 +0200
+--- a/channels/chan_zap.c 2007-11-19 12:31:59.000000000 +0200
++++ b/channels/chan_zap.c 2007-11-19 12:48:21.000000000 +0200
@@ -103,6 +107,8 @@
#include "asterisk/abstract_jb.h"
#include "asterisk/smdi.h"
Modified: asterisk/trunk/debian/patches/bristuff/zapata-gsm
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/zapata-gsm?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-gsm (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-gsm Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
---- asterisk-1.4.10.1~dfsg.orig/channels/chan_zap.c
-+++ asterisk-1.4.10.1~dfsg/channels/chan_zap.c
+--- a/channels/chan_zap.c
++++ b/channels/chan_zap.c
@@ -76,6 +76,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
#ifdef HAVE_PRI
#include <libpri.h>
@@ -827,8 +827,8 @@
{
#define END_SILENCE_LEN 400
#define HEADER_MS 50
---- asterisk-1.4.10.1~dfsg.orig/configure.ac
-+++ asterisk-1.4.10.1~dfsg/configure.ac
+--- a/configure.ac
++++ b/configure.ac
@@ -175,6 +175,7 @@ AST_EXT_LIB_SETUP([CURL], [cURL], [curl]
AST_EXT_LIB_SETUP([CURSES], [curses], [curses])
AST_EXT_LIB_SETUP([GNUTLS], [GNU TLS support (used for iksemel only)], [gnutls])
@@ -837,8 +837,8 @@
AST_EXT_LIB_SETUP([IKSEMEL], [Iksemel Jabber Library], [iksemel])
AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap])
AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
---- asterisk-1.4.10.1~dfsg.orig/configure
-+++ asterisk-1.4.10.1~dfsg/configure
+--- a/configure
++++ b/configure
@@ -24745,6 +24745,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=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/configure-libc-client (original)
+++ asterisk/trunk/debian/patches/configure-libc-client Mon Dec 3 18:42:37 2007
@@ -4,8 +4,8 @@
-- Faidon Liambotis <paravoid at debian.org>
---- asterisk-1.4.11~dfsg.orig/configure
-+++ asterisk-1.4.11~dfsg/configure
+--- a/configure
++++ b/configure
@@ -18435,7 +18435,7 @@ echo $ECHO_N "checking for UW IMAP Toolk
imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
fi
@@ -24,8 +24,8 @@
IMAP_TK_INCLUDE="-I${IMAP_TK_DIR}/c-client"
PBX_IMAP_TK=1
---- asterisk-1.4.11~dfsg.orig/configure.ac
-+++ asterisk-1.4.11~dfsg/configure.ac
+--- a/configure.ac
++++ b/configure.ac
@@ -484,7 +484,7 @@ if test "${USE_IMAP_TK}" != "no"; then
imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
fi
Modified: asterisk/trunk/debian/patches/debian-banner
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/debian-banner?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/debian-banner (original)
+++ asterisk/trunk/debian/patches/debian-banner Mon Dec 3 18:42:37 2007
@@ -1,8 +1,8 @@
-- Faidon Liambotis <paravoid at debian.org>
---- asterisk-1.4.15~dfsg.orig/main/asterisk.c
-+++ asterisk-1.4.15~dfsg/main/asterisk.c
+--- a/main/asterisk.c
++++ b/main/asterisk.c
@@ -146,6 +146,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"); \
Modified: asterisk/trunk/debian/patches/disable-build-sum
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/disable-build-sum?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/disable-build-sum (original)
+++ asterisk/trunk/debian/patches/disable-build-sum Mon Dec 3 18:42:37 2007
@@ -6,8 +6,8 @@
-- Faidon Liambotis <paravoid at debian.org>
---- asterisk-1.4.15~dfsg.orig/main/loader.c
-+++ asterisk-1.4.15~dfsg/main/loader.c
+--- a/main/loader.c
++++ b/main/loader.c
@@ -76,8 +76,6 @@ static unsigned char expected_key[] =
{ 0x87, 0x76, 0x79, 0x35, 0x23, 0xea, 0x3a, 0xd3,
0x25, 0x2a, 0xbb, 0x35, 0x87, 0xe4, 0x22, 0x24 };
Modified: asterisk/trunk/debian/patches/func_devstate
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/func_devstate?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/func_devstate (original)
+++ asterisk/trunk/debian/patches/func_devstate Mon Dec 3 18:42:37 2007
@@ -17,7 +17,7 @@
-- Faidon Liambotis <paravoid at debian.org>
--- /dev/null
-+++ asterisk-1.4.11~dfsg/funcs/func_devstate.c
++++ b/funcs/func_devstate.c
@@ -0,0 +1,228 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
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=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/h323-no-deps-on-asterisk (original)
+++ asterisk/trunk/debian/patches/h323-no-deps-on-asterisk Mon Dec 3 18:42:37 2007
@@ -7,8 +7,8 @@
-- Faidon Liambotis <paravoid at debian.org>
---- asterisk-1.4.12.orig/main/Makefile
-+++ asterisk-1.4.12/main/Makefile
+--- a/main/Makefile
++++ b/main/Makefile
@@ -120,13 +120,6 @@ AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED
AST_EMBED_LIBS:=$(foreach dep,$(EMBED_LIBS),$(value $(dep)))
OBJS:=$(sort $(OBJS))
Modified: asterisk/trunk/debian/patches/h323-workaround-openh323-segfault
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/h323-workaround-openh323-segfault?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/h323-workaround-openh323-segfault (original)
+++ asterisk/trunk/debian/patches/h323-workaround-openh323-segfault Mon Dec 3 18:42:37 2007
@@ -13,8 +13,8 @@
-- Faidon Liambotis <paravoid at debian.org>
---- asterisk-1.4.11~dfsg.orig/main/loader.c
-+++ asterisk-1.4.11~dfsg/main/loader.c
+--- a/main/loader.c
++++ b/main/loader.c
@@ -356,6 +356,12 @@ static struct ast_module *load_dynamic_m
strcpy(resource_being_loaded->resource, resource);
Modified: asterisk/trunk/debian/patches/hack-multiple-app-voicemail
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/hack-multiple-app-voicemail?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/hack-multiple-app-voicemail (original)
+++ asterisk/trunk/debian/patches/hack-multiple-app-voicemail Mon Dec 3 18:42:37 2007
@@ -12,8 +12,8 @@
-- Faidon Liambotis <paravoid at debian.org>
---- asterisk-1.4.12~dfsg.orig/apps/Makefile
-+++ asterisk-1.4.12~dfsg/apps/Makefile
+--- a/apps/Makefile
++++ b/apps/Makefile
@@ -12,6 +12,16 @@
-include ../menuselect.makeopts ../menuselect.makedeps
Modified: asterisk/trunk/debian/patches/make-clean-fixes
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/make-clean-fixes?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/make-clean-fixes (original)
+++ asterisk/trunk/debian/patches/make-clean-fixes Mon Dec 3 18:42:37 2007
@@ -3,8 +3,8 @@
-- Faidon Liambotis <paravoid at debian.org>
---- asterisk-1.4.10.1~dfsg.orig/Makefile
-+++ asterisk-1.4.10.1~dfsg/Makefile
+--- a/Makefile
++++ b/Makefile
@@ -364,7 +364,6 @@ dist-clean: distclean
distclean: clean
Modified: asterisk/trunk/debian/patches/pubkey_jnctn
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/pubkey_jnctn?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/pubkey_jnctn (original)
+++ asterisk/trunk/debian/patches/pubkey_jnctn Mon Dec 3 18:42:37 2007
@@ -13,7 +13,7 @@
-- Faidon Liambotis <paravoid at debian.org>
--- /dev/null
-+++ asterisk-1.4.9~dfsg/keys/jnctn.pub
++++ b/keys/jnctn.pub
@@ -0,0 +1,6 @@
+-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDWaDv4190BpeL5K+Yuq5Q7+vPs
@@ -21,8 +21,8 @@
+3Ilu//eX8ph8Wu+Oxs/ymi/hzKm+Cd6aty94zYuqiegc0KdrjvU5TLQAkIQpiB6k
+CvuIm0R0XXQjj3R7LwIDAQAB
+-----END PUBLIC KEY-----
---- asterisk-1.4.9~dfsg.orig/Makefile
-+++ asterisk-1.4.9~dfsg/Makefile
+--- a/Makefile
++++ b/Makefile
@@ -435,8 +435,7 @@ bininstall: _all
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
Modified: asterisk/trunk/debian/patches/safe_asterisk-nobg
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/safe_asterisk-nobg?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/safe_asterisk-nobg (original)
+++ asterisk/trunk/debian/patches/safe_asterisk-nobg Mon Dec 3 18:42:37 2007
@@ -10,8 +10,8 @@
-- Faidon Liambotis <paravoid at debian.org>
---- asterisk-1.4.11~dfsg.orig/contrib/scripts/safe_asterisk
-+++ asterisk-1.4.11~dfsg/contrib/scripts/safe_asterisk
+--- a/contrib/scripts/safe_asterisk
++++ b/contrib/scripts/safe_asterisk
@@ -11,6 +11,7 @@ DUMPDROP=/tmp
SLEEPSECS=4
ASTSBINDIR=__ASTERISK_SBIN_DIR__
Modified: asterisk/trunk/debian/patches/tos-libcap
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/tos-libcap?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/tos-libcap (original)
+++ asterisk/trunk/debian/patches/tos-libcap Mon Dec 3 18:42:37 2007
@@ -7,8 +7,8 @@
-- Faidon Liambotis <paravoid at debian.org>
---- asterisk-1.4.12~dfsg.orig/configure
-+++ asterisk-1.4.12~dfsg/configure
+--- a/configure
++++ b/configure
@@ -724,6 +724,10 @@ CURL_LIB
CURL_INCLUDE
CURL_DIR
@@ -598,8 +598,8 @@
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
---- asterisk-1.4.12~dfsg.orig/configure.ac
-+++ asterisk-1.4.12~dfsg/configure.ac
+--- a/configure.ac
++++ b/configure.ac
@@ -172,6 +172,7 @@ AC_SUBST(AST_DEVMODE)
AST_EXT_LIB_SETUP([ALSA], [Advanced Linux Sound Architecture], [asound])
@@ -619,8 +619,8 @@
GSM_INTERNAL="yes"
AC_SUBST(GSM_INTERNAL)
GSM_SYSTEM="yes"
---- asterisk-1.4.12~dfsg.orig/doc/security.txt
-+++ asterisk-1.4.12~dfsg/doc/security.txt
+--- a/doc/security.txt
++++ b/doc/security.txt
@@ -28,6 +28,13 @@ The IAX2 protocol supports strong RSA ke
AES encryption of voice and signalling. The SIP channel does not
support encryption in this version of Asterisk.
@@ -635,8 +635,8 @@
* DIALPLAN SECURITY
First and foremost remember this:
---- asterisk-1.4.12~dfsg.orig/main/asterisk.c
-+++ asterisk-1.4.12~dfsg/main/asterisk.c
+--- a/main/asterisk.c
++++ b/main/asterisk.c
@@ -82,13 +82,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
#include <sys/stat.h>
#ifdef linux
@@ -697,8 +697,8 @@
}
#endif /* __CYGWIN__ */
---- asterisk-1.4.12~dfsg.orig/main/Makefile
-+++ asterisk-1.4.12~dfsg/main/Makefile
+--- a/main/Makefile
++++ b/main/Makefile
@@ -55,6 +55,9 @@ ifneq ($(findstring $(OSARCH), linux-gnu
ifneq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)
AST_LIBS+=-ldl
@@ -709,8 +709,8 @@
AST_LIBS+=-lpthread $(EDITLINE_LIB) -lm -lresolv
else
AST_LIBS+=$(EDITLINE_LIB) -lm
---- asterisk-1.4.12~dfsg.orig/makeopts.in
-+++ asterisk-1.4.12~dfsg/makeopts.in
+--- a/makeopts.in
++++ b/makeopts.in
@@ -178,6 +178,9 @@ MISDN_LIB=@MISDN_LIB@
SUPPSERV_INCLUDE=@SUPPSERV_INCLUDE@
SUPPSERV_LIB=@SUPPSERV_LIB@
@@ -721,8 +721,8 @@
TERMCAP_INCLUDE=@TERMCAP_INCLUDE@
TERMCAP_LIB=@TERMCAP_LIB@
TERMCAP_DIR=@TERMCAP_DIR@
---- asterisk-1.4.12~dfsg.orig/include/asterisk/autoconfig.h.in
-+++ asterisk-1.4.12~dfsg/include/asterisk/autoconfig.h.in
+--- a/include/asterisk/autoconfig.h.in
++++ b/include/asterisk/autoconfig.h.in
@@ -59,6 +59,12 @@
/* Define to 1 if you have the `bzero' function. */
#undef HAVE_BZERO
Modified: asterisk/trunk/debian/patches/use-libpri-bristuffed
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/use-libpri-bristuffed?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/use-libpri-bristuffed (original)
+++ asterisk/trunk/debian/patches/use-libpri-bristuffed Mon Dec 3 18:42:37 2007
@@ -1,5 +1,5 @@
---- asterisk-1.4.10.1~dfsg.orig/configure
-+++ asterisk-1.4.10.1~dfsg/configure
+--- a/configure
++++ b/configure
@@ -24426,18 +24426,18 @@ fi
@@ -113,8 +113,8 @@
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
---- asterisk-1.4.10.1~dfsg.orig/configure.ac
-+++ asterisk-1.4.10.1~dfsg/configure.ac
+--- a/configure.ac
++++ b/configure.ac
@@ -815,7 +815,7 @@ fi
AST_EXT_LIB_CHECK([POPT], [popt], [poptStrerror], [popt.h])
@@ -124,8 +124,8 @@
if test "${USE_PWLIB}" != "no"; then
if test -n "${PWLIB_DIR}"; then
---- asterisk-1.4.10.1~dfsg.orig/channels/chan_zap.c
-+++ asterisk-1.4.10.1~dfsg/channels/chan_zap.c
+--- a/channels/chan_zap.c
++++ b/channels/chan_zap.c
@@ -74,7 +74,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
#include <zaptel/tonezone.h>
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=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/vpb-driver-4.2.18 (original)
+++ asterisk/trunk/debian/patches/vpb-driver-4.2.18 Mon Dec 3 18:42:37 2007
@@ -3,8 +3,8 @@
-- Ron <ron at debian.org>
---- asterisk-1.4.13~dfsg.orig/channels/chan_vpb.cc
-+++ asterisk-1.4.13~dfsg/channels/chan_vpb.cc
+--- a/channels/chan_vpb.cc
++++ b/channels/chan_vpb.cc
@@ -33,6 +33,8 @@
<depend>vpbapi</depend>
***/
@@ -514,8 +514,8 @@
/**/
-
-
---- asterisk-1.4.13~dfsg.orig/configs/vpb.conf.sample
-+++ asterisk-1.4.13~dfsg/configs/vpb.conf.sample
+--- a/configs/vpb.conf.sample
++++ b/configs/vpb.conf.sample
@@ -1,108 +1,248 @@
;
-; V6PCI/V12PCI config file for VoiceTronix Hardware
@@ -860,8 +860,8 @@
+;channel=1
+;channel=2
+;channel=3
---- asterisk-1.4.14~dfsg.orig/channels/Makefile
-+++ asterisk-1.4.14~dfsg/channels/Makefile
+--- a/channels/Makefile
++++ b/channels/Makefile
@@ -117,5 +117,3 @@ misdn_config.o: ASTCFLAGS+=-Imisdn
misdn/isdn_lib.o: ASTCFLAGS+=-Wno-strict-aliasing
Modified: asterisk/trunk/debian/patches/vpb-handle-nocards
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/vpb-handle-nocards?rev=5010&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/vpb-handle-nocards (original)
+++ asterisk/trunk/debian/patches/vpb-handle-nocards Mon Dec 3 18:42:37 2007
@@ -4,8 +4,8 @@
-- Faidon Liambotis <paravoid at debian.org>
---- asterisk-1.4.15~dfsg.orig/channels/chan_vpb.cc
-+++ asterisk-1.4.15~dfsg/channels/chan_vpb.cc
+--- a/channels/chan_vpb.cc
++++ b/channels/chan_vpb.cc
@@ -2883,7 +2883,13 @@ static enum ast_module_load_result load_
v = ast_variable_browse(cfg, "general");
while (v){
@@ -21,8 +21,8 @@
}
else if (strcasecmp(v->name, "indication") == 0) {
use_ast_ind = 1;
---- asterisk-1.4.15~dfsg.orig/configs/vpb.conf.sample
-+++ asterisk-1.4.15~dfsg/configs/vpb.conf.sample
+--- a/configs/vpb.conf.sample
++++ b/configs/vpb.conf.sample
@@ -8,7 +8,7 @@
;
; Total number of Voicetronix cards in this machine
More information about the Pkg-voip-commits
mailing list