[Pkg-voip-commits] r1034 - asterisk/trunk/debian
asterisk/trunk/debian/patches zaptel/trunk/debian
zaptel/trunk/debian/patches
Kilian Krause
kilian at costa.debian.org
Sat Nov 26 10:37:56 UTC 2005
Author: kilian
Date: 2005-11-26 10:37:54 +0000 (Sat, 26 Nov 2005)
New Revision: 1034
Added:
zaptel/trunk/debian/patches/bristuff-0.3.0-PRE1.dpatch
Modified:
asterisk/trunk/debian/changelog
asterisk/trunk/debian/control
asterisk/trunk/debian/patches/bristuff.dpatch
zaptel/trunk/debian/changelog
zaptel/trunk/debian/patches/00list
zaptel/trunk/debian/zaptel.postinst
Log:
got bristuff compiling at least. now we need to get it working.
Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog 2005-11-25 18:11:05 UTC (rev 1033)
+++ asterisk/trunk/debian/changelog 2005-11-26 10:37:54 UTC (rev 1034)
@@ -1,6 +1,6 @@
asterisk (1:1.2.0.dfsg-5) unstable; urgency=low
- * bristuff
+ * Added bristuff 0.3.0-PRE1
-- Tzafrir Cohen <tzafrir.cohen at xorcom.com> Wed, 23 Nov 2005 06:57:22 +0200
Modified: asterisk/trunk/debian/control
===================================================================
--- asterisk/trunk/debian/control 2005-11-25 18:11:05 UTC (rev 1033)
+++ asterisk/trunk/debian/control 2005-11-26 10:37:54 UTC (rev 1034)
@@ -4,7 +4,7 @@
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Simon Richter <sjr at debian.org>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 4.0.4), sed (>= 3.95), zlib1g-dev, libgtk1.2-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libzap-dev, libtonezone-dev (>= 1:1.0.6-1), bison, libasound2-dev, postgresql-dev, unixodbc-dev, libpri-dev (>= 1.2.0-beta2), dpatch (>= 2.0.10), zaptel-source (>= 1:1.0.6-1), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev, graphviz
+Build-Depends: debhelper (>= 4.0.4), sed (>= 3.95), zlib1g-dev, libgtk1.2-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libzap-dev, libtonezone-dev (>= 1:1.2.0-2), bison, libasound2-dev, postgresql-dev, unixodbc-dev, libpri-dev (>= 1.2.0-release-2), dpatch (>= 2.0.10), zaptel-source (>= 1:1.2.0-2), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev, graphviz
Package: asterisk
Architecture: any
Modified: asterisk/trunk/debian/patches/bristuff.dpatch
===================================================================
--- asterisk/trunk/debian/patches/bristuff.dpatch 2005-11-25 18:11:05 UTC (rev 1033)
+++ asterisk/trunk/debian/patches/bristuff.dpatch 2005-11-26 10:37:54 UTC (rev 1034)
@@ -5,9 +5,9 @@
## DP: bristuff support in asterisk: asterisk.patch from bristuff-0.3.0-PRE-1
@DPATCH@
-diff -urNad asterisk-1.2.0.dfsg/agi/Makefile /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/agi/Makefile
---- asterisk-1.2.0.dfsg/agi/Makefile 2005-08-30 05:54:01.000000000 +0300
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/agi/Makefile 2005-11-23 05:50:44.272884361 +0200
+diff -urN asterisk-1.2.0.orig/agi/Makefile asterisk-1.2.0/agi/Makefile
+--- asterisk-1.2.0.orig/agi/Makefile 2005-08-30 04:54:01.000000000 +0200
++++ asterisk-1.2.0/agi/Makefile 2005-11-20 12:28:40.000000000 +0100
@@ -11,7 +11,7 @@
# the GNU General Public License
#
@@ -26,9 +26,9 @@
%.so : %.o
$(CC) -shared -Xlinker -x -o $@ $<
-diff -urNad asterisk-1.2.0.dfsg/agi/xagi-test.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/agi/xagi-test.c
---- asterisk-1.2.0.dfsg/agi/xagi-test.c 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/agi/xagi-test.c 2005-11-23 05:50:44.273884223 +0200
+diff -urN asterisk-1.2.0.orig/agi/xagi-test.c asterisk-1.2.0/agi/xagi-test.c
+--- asterisk-1.2.0.orig/agi/xagi-test.c 1970-01-01 01:00:00.000000000 +0100
++++ asterisk-1.2.0/agi/xagi-test.c 2005-11-20 12:28:40.000000000 +0100
@@ -0,0 +1,177 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
@@ -207,9 +207,9 @@
+ return -1;
+ exit(0);
+}
-diff -urNad asterisk-1.2.0.dfsg/apps/app_callingpres.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/apps/app_callingpres.c
---- asterisk-1.2.0.dfsg/apps/app_callingpres.c 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/apps/app_callingpres.c 2005-11-23 05:50:44.275883945 +0200
+diff -urN asterisk-1.2.0.orig/apps/app_callingpres.c asterisk-1.2.0/apps/app_callingpres.c
+--- asterisk-1.2.0.orig/apps/app_callingpres.c 1970-01-01 01:00:00.000000000 +0100
++++ asterisk-1.2.0/apps/app_callingpres.c 2005-11-20 13:35:33.000000000 +0100
@@ -0,0 +1,70 @@
+/*
+ * An application to change the CallingPresentation for an Asterisk channel.
@@ -281,9 +281,9 @@
+{
+ return ASTERISK_GPL_KEY;
+}
-diff -urNad asterisk-1.2.0.dfsg/apps/app_chanisavail.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/apps/app_chanisavail.c
---- asterisk-1.2.0.dfsg/apps/app_chanisavail.c 2005-11-10 23:39:01.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/apps/app_chanisavail.c 2005-11-23 05:50:44.280883253 +0200
+diff -urN asterisk-1.2.0.orig/apps/app_chanisavail.c asterisk-1.2.0/apps/app_chanisavail.c
+--- asterisk-1.2.0.orig/apps/app_chanisavail.c 2005-11-10 22:39:01.000000000 +0100
++++ asterisk-1.2.0/apps/app_chanisavail.c 2005-11-20 12:33:16.000000000 +0100
@@ -118,7 +118,7 @@
snprintf(trychan, sizeof(trychan), "%s/%s",cur,number);
status = inuse = ast_device_state(trychan);
@@ -293,9 +293,9 @@
pbx_builtin_setvar_helper(chan, "AVAILCHAN", tempchan->name);
/* Store the originally used channel too */
snprintf(tmp, sizeof(tmp), "%s/%s", tech, number);
-diff -urNad asterisk-1.2.0.dfsg/apps/app_devstate.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/apps/app_devstate.c
---- asterisk-1.2.0.dfsg/apps/app_devstate.c 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/apps/app_devstate.c 2005-11-23 05:50:44.283882837 +0200
+diff -urN asterisk-1.2.0.orig/apps/app_devstate.c asterisk-1.2.0/apps/app_devstate.c
+--- asterisk-1.2.0.orig/apps/app_devstate.c 1970-01-01 01:00:00.000000000 +0100
++++ asterisk-1.2.0/apps/app_devstate.c 2005-11-20 13:41:13.000000000 +0100
@@ -0,0 +1,215 @@
+/*
+ * Devstate application
@@ -512,9 +512,9 @@
+{
+ return ASTERISK_GPL_KEY;
+}
-diff -urNad asterisk-1.2.0.dfsg/apps/app_dial.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/apps/app_dial.c
---- asterisk-1.2.0.dfsg/apps/app_dial.c 2005-11-14 12:24:59.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/apps/app_dial.c 2005-11-23 05:50:44.286882421 +0200
+diff -urN asterisk-1.2.0.orig/apps/app_dial.c asterisk-1.2.0/apps/app_dial.c
+--- asterisk-1.2.0.orig/apps/app_dial.c 2005-11-14 11:24:59.000000000 +0100
++++ asterisk-1.2.0/apps/app_dial.c 2005-11-20 12:50:07.000000000 +0100
@@ -11,6 +11,10 @@
* the project provides a web site, mailing lists and IRC
* channels for your use.
@@ -616,9 +616,9 @@
time(&start_time);
peer = wait_for_answer(chan, outgoing, &to, peerflags, &sentringing, status, sizeof(status), numbusy, numnochan, numcongestion, ast_test_flag(&opts, OPT_PRIORITY_JUMP), &result);
-diff -urNad asterisk-1.2.0.dfsg/apps/app_directed_pickup.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/apps/app_directed_pickup.c
---- asterisk-1.2.0.dfsg/apps/app_directed_pickup.c 2005-11-11 17:52:55.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/apps/app_directed_pickup.c 2005-11-23 05:50:44.289882006 +0200
+diff -urN asterisk-1.2.0.orig/apps/app_directed_pickup.c asterisk-1.2.0/apps/app_directed_pickup.c
+--- asterisk-1.2.0.orig/apps/app_directed_pickup.c 2005-11-11 16:52:55.000000000 +0100
++++ asterisk-1.2.0/apps/app_directed_pickup.c 2005-11-20 15:41:55.000000000 +0100
@@ -41,7 +41,7 @@
#include "asterisk/app.h"
@@ -628,9 +628,9 @@
static const char *synopsis = "Directed Call Pickup";
static const char *descrip =
" Pickup(extension[@context]): This application can pickup any ringing channel\n"
-diff -urNad asterisk-1.2.0.dfsg/apps/app_meetme.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/apps/app_meetme.c
---- asterisk-1.2.0.dfsg/apps/app_meetme.c 2005-11-11 02:45:02.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/apps/app_meetme.c 2005-11-23 05:50:44.293881452 +0200
+diff -urN asterisk-1.2.0.orig/apps/app_meetme.c asterisk-1.2.0/apps/app_meetme.c
+--- asterisk-1.2.0.orig/apps/app_meetme.c 2005-11-11 01:45:02.000000000 +0100
++++ asterisk-1.2.0/apps/app_meetme.c 2005-11-20 12:28:40.000000000 +0100
@@ -451,7 +451,7 @@
ast_copy_string(cnf->pin, pin, sizeof(cnf->pin));
ast_copy_string(cnf->pinadmin, pinadmin, sizeof(cnf->pinadmin));
@@ -640,9 +640,9 @@
if (cnf->chan) {
cnf->fd = cnf->chan->fds[0]; /* for use by conf_play() */
} else {
-diff -urNad asterisk-1.2.0.dfsg/apps/app_page.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/apps/app_page.c
---- asterisk-1.2.0.dfsg/apps/app_page.c 2005-11-08 00:01:22.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/apps/app_page.c 2005-11-23 05:50:44.296881036 +0200
+diff -urN asterisk-1.2.0.orig/apps/app_page.c asterisk-1.2.0/apps/app_page.c
+--- asterisk-1.2.0.orig/apps/app_page.c 2005-11-07 23:01:22.000000000 +0100
++++ asterisk-1.2.0/apps/app_page.c 2005-11-20 13:44:40.000000000 +0100
@@ -83,7 +83,7 @@
{
struct calloutdata *cd = data;
@@ -652,9 +652,9 @@
free(cd);
return NULL;
}
-diff -urNad asterisk-1.2.0.dfsg/apps/app_parkandannounce.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/apps/app_parkandannounce.c
---- asterisk-1.2.0.dfsg/apps/app_parkandannounce.c 2005-11-08 06:48:00.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/apps/app_parkandannounce.c 2005-11-23 05:50:44.298880759 +0200
+diff -urN asterisk-1.2.0.orig/apps/app_parkandannounce.c asterisk-1.2.0/apps/app_parkandannounce.c
+--- asterisk-1.2.0.orig/apps/app_parkandannounce.c 2005-11-08 05:48:00.000000000 +0100
++++ asterisk-1.2.0/apps/app_parkandannounce.c 2005-11-20 13:18:31.000000000 +0100
@@ -183,7 +183,7 @@
memset(&oh, 0, sizeof(oh));
@@ -664,9 +664,9 @@
if(dchan) {
if(dchan->_state == AST_STATE_UP) {
-diff -urNad asterisk-1.2.0.dfsg/apps/app_pickup.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/apps/app_pickup.c
---- asterisk-1.2.0.dfsg/apps/app_pickup.c 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/apps/app_pickup.c 2005-11-23 05:50:44.301880343 +0200
+diff -urN asterisk-1.2.0.orig/apps/app_pickup.c asterisk-1.2.0/apps/app_pickup.c
+--- asterisk-1.2.0.orig/apps/app_pickup.c 1970-01-01 01:00:00.000000000 +0100
++++ asterisk-1.2.0/apps/app_pickup.c 2005-11-20 13:34:44.000000000 +0100
@@ -0,0 +1,319 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
@@ -987,9 +987,9 @@
+{
+ return ASTERISK_GPL_KEY;
+}
-diff -urNad asterisk-1.2.0.dfsg/apps/app_queue.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/apps/app_queue.c
---- asterisk-1.2.0.dfsg/apps/app_queue.c 2005-11-11 01:22:37.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/apps/app_queue.c 2005-11-23 05:50:44.306879650 +0200
+diff -urN asterisk-1.2.0.orig/apps/app_queue.c asterisk-1.2.0/apps/app_queue.c
+--- asterisk-1.2.0.orig/apps/app_queue.c 2005-11-11 00:22:37.000000000 +0100
++++ asterisk-1.2.0/apps/app_queue.c 2005-11-20 12:28:40.000000000 +0100
@@ -1363,7 +1363,7 @@
location = "";
@@ -1008,9 +1008,9 @@
if (status != o->oldstatus)
update_dial_status(qe->parent, o->member, status);
if (!o->chan) {
-diff -urNad asterisk-1.2.0.dfsg/apps/app_readfile.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/apps/app_readfile.c
---- asterisk-1.2.0.dfsg/apps/app_readfile.c 2005-11-06 17:09:46.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/apps/app_readfile.c 2005-11-23 05:50:44.309879235 +0200
+diff -urN asterisk-1.2.0.orig/apps/app_readfile.c asterisk-1.2.0/apps/app_readfile.c
+--- asterisk-1.2.0.orig/apps/app_readfile.c 2005-11-06 16:09:46.000000000 +0100
++++ asterisk-1.2.0/apps/app_readfile.c 2005-11-20 16:07:15.000000000 +0100
@@ -40,7 +40,7 @@
#include "asterisk/app.h"
#include "asterisk/module.h"
@@ -1020,9 +1020,9 @@
static char *app_readfile = "ReadFile";
-diff -urNad asterisk-1.2.0.dfsg/apps/app_segfault.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/apps/app_segfault.c
---- asterisk-1.2.0.dfsg/apps/app_segfault.c 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/apps/app_segfault.c 2005-11-23 05:50:44.312878819 +0200
+diff -urN asterisk-1.2.0.orig/apps/app_segfault.c asterisk-1.2.0/apps/app_segfault.c
+--- asterisk-1.2.0.orig/apps/app_segfault.c 1970-01-01 01:00:00.000000000 +0100
++++ asterisk-1.2.0/apps/app_segfault.c 2005-11-20 13:35:08.000000000 +0100
@@ -0,0 +1,75 @@
+/*
+ * Segfault application
@@ -1099,9 +1099,9 @@
+{
+ return ASTERISK_GPL_KEY;
+}
-diff -urNad asterisk-1.2.0.dfsg/apps/app_zapras.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/apps/app_zapras.c
---- asterisk-1.2.0.dfsg/apps/app_zapras.c 2005-11-08 00:01:22.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/apps/app_zapras.c 2005-11-23 05:50:44.314878542 +0200
+diff -urN asterisk-1.2.0.orig/apps/app_zapras.c asterisk-1.2.0/apps/app_zapras.c
+--- asterisk-1.2.0.orig/apps/app_zapras.c 2005-11-07 23:01:22.000000000 +0100
++++ asterisk-1.2.0/apps/app_zapras.c 2005-11-20 12:28:40.000000000 +0100
@@ -182,7 +182,7 @@
}
}
@@ -1111,9 +1111,9 @@
ioctl(chan->fds[0], ZT_AUDIOMODE, &x);
/* Restore saved values */
-diff -urNad asterisk-1.2.0.dfsg/apps/Makefile /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/apps/Makefile
---- asterisk-1.2.0.dfsg/apps/Makefile 2005-11-11 02:32:45.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/apps/Makefile 2005-11-23 05:50:44.317878126 +0200
+diff -urN asterisk-1.2.0.orig/apps/Makefile asterisk-1.2.0/apps/Makefile
+--- asterisk-1.2.0.orig/apps/Makefile 2005-11-11 01:32:45.000000000 +0100
++++ asterisk-1.2.0/apps/Makefile 2005-11-20 12:32:17.000000000 +0100
@@ -28,6 +28,7 @@
app_test.so app_forkcdr.so app_math.so app_realtime.so \
app_dumpchan.so app_waitforsilence.so app_while.so app_setrdnis.so \
@@ -1122,9 +1122,9 @@
app_dictate.so app_externalivr.so app_directed_pickup.so \
app_mixmonitor.so app_stack.so
-diff -urNad asterisk-1.2.0.dfsg/asterisk.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/asterisk.c
---- asterisk-1.2.0.dfsg/asterisk.c 2005-11-14 21:00:38.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/asterisk.c 2005-11-23 05:50:44.320877711 +0200
+diff -urN asterisk-1.2.0.orig/asterisk.c asterisk-1.2.0/asterisk.c
+--- asterisk-1.2.0.orig/asterisk.c 2005-11-14 20:00:38.000000000 +0100
++++ asterisk-1.2.0/asterisk.c 2005-11-20 13:30:11.000000000 +0100
@@ -215,6 +215,7 @@
char ast_config_AST_CTL_OWNER[AST_CONFIG_MAX_PATH] = "\0";
char ast_config_AST_CTL_GROUP[AST_CONFIG_MAX_PATH] = "\0";
@@ -1150,9 +1150,9 @@
}
v = v->next;
}
-diff -urNad asterisk-1.2.0.dfsg/build_tools/make_defaults_h /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/build_tools/make_defaults_h
---- asterisk-1.2.0.dfsg/build_tools/make_defaults_h 2005-06-20 20:26:07.000000000 +0300
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/build_tools/make_defaults_h 2005-11-23 05:50:44.323877295 +0200
+diff -urN asterisk-1.2.0.orig/build_tools/make_defaults_h asterisk-1.2.0/build_tools/make_defaults_h
+--- asterisk-1.2.0.orig/build_tools/make_defaults_h 2005-06-20 19:26:07.000000000 +0200
++++ asterisk-1.2.0/build_tools/make_defaults_h 2005-11-20 12:28:40.000000000 +0100
@@ -16,6 +16,7 @@
#define AST_KEY_DIR "${INSTALL_PATH}${ASTVARLIBDIR}/keys"
#define AST_DB "${INSTALL_PATH}${ASTVARLIBDIR}/astdb"
@@ -1161,9 +1161,9 @@
#define AST_CONFIG_FILE "${INSTALL_PATH}${ASTCONFPATH}"
-diff -urNad asterisk-1.2.0.dfsg/channel.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/channel.c
---- asterisk-1.2.0.dfsg/channel.c 2005-11-16 20:11:28.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/channel.c 2005-11-23 05:50:44.328876602 +0200
+diff -urN asterisk-1.2.0.orig/channel.c asterisk-1.2.0/channel.c
+--- asterisk-1.2.0.orig/channel.c 2005-11-16 19:11:28.000000000 +0100
++++ asterisk-1.2.0/channel.c 2005-11-20 13:20:56.000000000 +0100
@@ -95,6 +95,7 @@
static int shutting_down = 0;
@@ -1358,9 +1358,9 @@
/* Stop if we're a zombie or need a soft hangup */
if (ast_test_flag(c0, AST_FLAG_ZOMBIE) || ast_check_hangup_locked(c0) ||
-diff -urNad asterisk-1.2.0.dfsg/channels/chan_agent.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/channels/chan_agent.c
---- asterisk-1.2.0.dfsg/channels/chan_agent.c 2005-11-08 06:02:35.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/channels/chan_agent.c 2005-11-23 05:50:44.332876048 +0200
+diff -urN asterisk-1.2.0.orig/channels/chan_agent.c asterisk-1.2.0/channels/chan_agent.c
+--- asterisk-1.2.0.orig/channels/chan_agent.c 2005-11-08 05:02:35.000000000 +0100
++++ asterisk-1.2.0/channels/chan_agent.c 2005-11-20 12:28:40.000000000 +0100
@@ -1327,7 +1327,7 @@
chan = agent_new(p, AST_STATE_DOWN);
} else if (!p->owner && !ast_strlen_zero(p->loginchan)) {
@@ -1370,9 +1370,9 @@
if (p->chan)
chan = agent_new(p, AST_STATE_DOWN);
}
-diff -urNad asterisk-1.2.0.dfsg/channels/chan_features.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/channels/chan_features.c
---- asterisk-1.2.0.dfsg/channels/chan_features.c 2005-11-06 17:09:46.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/channels/chan_features.c 2005-11-23 05:50:44.335875633 +0200
+diff -urN asterisk-1.2.0.orig/channels/chan_features.c asterisk-1.2.0/channels/chan_features.c
+--- asterisk-1.2.0.orig/channels/chan_features.c 2005-11-06 16:09:46.000000000 +0100
++++ asterisk-1.2.0/channels/chan_features.c 2005-11-20 12:28:40.000000000 +0100
@@ -438,7 +438,7 @@
}
ast_mutex_unlock(&featurelock);
@@ -1382,9 +1382,9 @@
if (!chan) {
ast_log(LOG_NOTICE, "Unable to allocate subchannel '%s/%s'\n", tech, dest);
return NULL;
-diff -urNad asterisk-1.2.0.dfsg/channels/chan_iax2.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/channels/chan_iax2.c
---- asterisk-1.2.0.dfsg/channels/chan_iax2.c 2005-11-12 22:04:57.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/channels/chan_iax2.c 2005-11-23 05:50:44.343874524 +0200
+diff -urN asterisk-1.2.0.orig/channels/chan_iax2.c asterisk-1.2.0/channels/chan_iax2.c
+--- asterisk-1.2.0.orig/channels/chan_iax2.c 2005-11-12 21:04:57.000000000 +0100
++++ asterisk-1.2.0/channels/chan_iax2.c 2005-11-20 12:28:40.000000000 +0100
@@ -11,6 +11,9 @@
* the project provides a web site, mailing lists and IRC
* channels for your use.
@@ -1404,9 +1404,9 @@
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);
-diff -urNad asterisk-1.2.0.dfsg/channels/chan_sip.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/channels/chan_sip.c
---- asterisk-1.2.0.dfsg/channels/chan_sip.c 2005-11-16 19:46:59.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/channels/chan_sip.c 2005-11-23 05:50:44.354873000 +0200
+diff -urN asterisk-1.2.0.orig/channels/chan_sip.c asterisk-1.2.0/channels/chan_sip.c
+--- asterisk-1.2.0.orig/channels/chan_sip.c 2005-11-16 18:46:59.000000000 +0100
++++ asterisk-1.2.0/channels/chan_sip.c 2005-11-20 13:52:50.000000000 +0100
@@ -4810,7 +4810,8 @@
/* If there is a VXML URL append it to the SIP URL */
@@ -1417,9 +1417,9 @@
} else {
snprintf(to, sizeof(to), "<%s>", p->uri);
}
-diff -urNad asterisk-1.2.0.dfsg/channels/chan_zap.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/channels/chan_zap.c
---- asterisk-1.2.0.dfsg/channels/chan_zap.c 2005-11-11 20:00:07.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/channels/chan_zap.c 2005-11-23 05:50:44.369870922 +0200
+diff -urN asterisk-1.2.0.orig/channels/chan_zap.c asterisk-1.2.0/channels/chan_zap.c
+--- asterisk-1.2.0.orig/channels/chan_zap.c 2005-11-11 19:00:07.000000000 +0100
++++ asterisk-1.2.0/channels/chan_zap.c 2005-11-20 16:32:17.000000000 +0100
@@ -11,6 +11,10 @@
* the project provides a web site, mailing lists and IRC
* channels for your use.
@@ -2659,6 +2659,7 @@
ast_verbose(VERBOSE_PREFIX_3 "Going to extension s|1 because of Complete received\n");
pri->pvts[chanpos]->exten[0] = 's';
pri->pvts[chanpos]->exten[1] = '\0';
+- }
+ }
+ } else {
+ /* Get called number */
@@ -2681,7 +2682,7 @@
+ }
+ }
+ }
- }
++ }
+ /* Part 3: create channel, setup audio... */
+ /* Set DNID on all incoming calls -- even immediate */
+ if (!ast_strlen_zero(e->ring.callednum))
@@ -3868,9 +3869,9 @@
index = zt_get_index(c, p, 0);
if (index < 0) {
ast_log(LOG_WARNING, "Huh? I don't exist?\n");
-diff -urNad asterisk-1.2.0.dfsg/codecs/codec_ilbc.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/codecs/codec_ilbc.c
---- asterisk-1.2.0.dfsg/codecs/codec_ilbc.c 2005-11-06 17:09:46.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/codecs/codec_ilbc.c 2005-11-23 05:50:44.372870506 +0200
+diff -urN asterisk-1.2.0.orig/codecs/codec_ilbc.c asterisk-1.2.0/codecs/codec_ilbc.c
+--- asterisk-1.2.0.orig/codecs/codec_ilbc.c 2005-11-06 16:09:46.000000000 +0100
++++ asterisk-1.2.0/codecs/codec_ilbc.c 2005-11-20 12:28:41.000000000 +0100
@@ -49,7 +49,7 @@
#include "slin_ilbc_ex.h"
#include "ilbc_slin_ex.h"
@@ -3880,9 +3881,9 @@
#define ILBC_MS 30
/* #define ILBC_MS 20 */
-diff -urNad asterisk-1.2.0.dfsg/configs/watchdog.conf.sample /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/configs/watchdog.conf.sample
---- asterisk-1.2.0.dfsg/configs/watchdog.conf.sample 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/configs/watchdog.conf.sample 2005-11-23 05:50:44.375870091 +0200
+diff -urN asterisk-1.2.0.orig/configs/watchdog.conf.sample asterisk-1.2.0/configs/watchdog.conf.sample
+--- asterisk-1.2.0.orig/configs/watchdog.conf.sample 1970-01-01 01:00:00.000000000 +0100
++++ asterisk-1.2.0/configs/watchdog.conf.sample 2005-11-20 12:28:41.000000000 +0100
@@ -0,0 +1,22 @@
+;
+; Configuration file for res_watchdog
@@ -3906,9 +3907,9 @@
+;device = /dev/watchdog
+;interval = 100
+
-diff -urNad asterisk-1.2.0.dfsg/db.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/db.c
---- asterisk-1.2.0.dfsg/db.c 2005-11-01 23:53:29.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/db.c 2005-11-23 05:50:44.377869813 +0200
+diff -urN asterisk-1.2.0.orig/db.c asterisk-1.2.0/db.c
+--- asterisk-1.2.0.orig/db.c 2005-11-01 22:53:29.000000000 +0100
++++ asterisk-1.2.0/db.c 2005-11-20 13:30:42.000000000 +0100
@@ -514,11 +514,18 @@
struct ast_cli_entry cli_database_deltree =
{ { "database", "deltree", NULL }, database_deltree, "Removes database keytree/values", database_deltree_usage };
@@ -4002,9 +4003,9 @@
+ ast_manager_register("DBdel", EVENT_FLAG_SYSTEM, manager_dbdel, mandescr_dbdel);
return 0;
}
-diff -urNad asterisk-1.2.0.dfsg/editline/cygdef.h /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/editline/cygdef.h
---- asterisk-1.2.0.dfsg/editline/cygdef.h 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/editline/cygdef.h 2005-11-23 05:50:44.380869398 +0200
+diff -urN asterisk-1.2.0.orig/editline/cygdef.h asterisk-1.2.0/editline/cygdef.h
+--- asterisk-1.2.0.orig/editline/cygdef.h 1970-01-01 01:00:00.000000000 +0100
++++ asterisk-1.2.0/editline/cygdef.h 2005-11-20 12:28:41.000000000 +0100
@@ -0,0 +1,11 @@
+/* cygdef.h. Generated automatically by configure. */
+#ifndef _CYGDEF_H_
@@ -4017,9 +4018,9 @@
+
+
+#endif /* _CYGDEF_H_ */
-diff -urNad asterisk-1.2.0.dfsg/HARDWARE /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/HARDWARE
---- asterisk-1.2.0.dfsg/HARDWARE 2004-08-03 09:31:20.000000000 +0300
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/HARDWARE 2005-11-23 05:50:44.383868982 +0200
+diff -urN asterisk-1.2.0.orig/HARDWARE asterisk-1.2.0/HARDWARE
+--- asterisk-1.2.0.orig/HARDWARE 2004-08-03 08:31:20.000000000 +0200
++++ asterisk-1.2.0/HARDWARE 2005-11-20 12:28:41.000000000 +0100
@@ -37,6 +37,17 @@
* Wildcard TE410P - Quad T1/E1 switchable interface. Supports PRI and
RBS signalling, as well as PPP, FR, and HDLC data modes.
@@ -4038,9 +4039,9 @@
Non-zaptel compatible hardware
==============================
-diff -urNad asterisk-1.2.0.dfsg/include/asterisk/agi.h /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/include/asterisk/agi.h
---- asterisk-1.2.0.dfsg/include/asterisk/agi.h 2005-10-24 22:12:06.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/include/asterisk/agi.h 2005-11-23 05:50:44.385868705 +0200
+diff -urN asterisk-1.2.0.orig/include/asterisk/agi.h asterisk-1.2.0/include/asterisk/agi.h
+--- asterisk-1.2.0.orig/include/asterisk/agi.h 2005-10-24 22:12:06.000000000 +0200
++++ asterisk-1.2.0/include/asterisk/agi.h 2005-11-20 12:28:41.000000000 +0100
@@ -29,7 +29,8 @@
typedef struct agi_state {
@@ -4051,9 +4052,9 @@
int ctrl; /* FD for input control */
} AGI;
-diff -urNad asterisk-1.2.0.dfsg/include/asterisk/channel.h /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/include/asterisk/channel.h
---- asterisk-1.2.0.dfsg/include/asterisk/channel.h 2005-11-11 05:48:28.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/include/asterisk/channel.h 2005-11-23 05:50:44.390868012 +0200
+diff -urN asterisk-1.2.0.orig/include/asterisk/channel.h asterisk-1.2.0/include/asterisk/channel.h
+--- asterisk-1.2.0.orig/include/asterisk/channel.h 2005-11-11 04:48:28.000000000 +0100
++++ asterisk-1.2.0/include/asterisk/channel.h 2005-11-20 12:31:27.000000000 +0100
@@ -86,6 +86,9 @@
#ifndef _ASTERISK_CHANNEL_H
#define _ASTERISK_CHANNEL_H
@@ -4124,9 +4125,9 @@
/*! Gives the string form of a given cause code */
/*!
-diff -urNad asterisk-1.2.0.dfsg/include/asterisk/features.h /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/include/asterisk/features.h
---- asterisk-1.2.0.dfsg/include/asterisk/features.h 2005-10-24 22:12:06.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/include/asterisk/features.h 2005-11-23 05:50:44.393867597 +0200
+diff -urN asterisk-1.2.0.orig/include/asterisk/features.h asterisk-1.2.0/include/asterisk/features.h
+--- asterisk-1.2.0.orig/include/asterisk/features.h 2005-10-24 22:12:06.000000000 +0200
++++ asterisk-1.2.0/include/asterisk/features.h 2005-11-20 13:00:33.000000000 +0100
@@ -45,6 +45,8 @@
};
@@ -4156,9 +4157,9 @@
/*! \brief Determine system call pickup extension */
extern char *ast_pickup_ext(void);
-diff -urNad asterisk-1.2.0.dfsg/include/asterisk/pbx.h /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/include/asterisk/pbx.h
---- asterisk-1.2.0.dfsg/include/asterisk/pbx.h 2005-11-09 01:37:53.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/include/asterisk/pbx.h 2005-11-23 05:50:44.396867181 +0200
+diff -urN asterisk-1.2.0.orig/include/asterisk/pbx.h asterisk-1.2.0/include/asterisk/pbx.h
+--- asterisk-1.2.0.orig/include/asterisk/pbx.h 2005-11-09 00:37:53.000000000 +0100
++++ asterisk-1.2.0/include/asterisk/pbx.h 2005-11-20 13:01:32.000000000 +0100
@@ -57,7 +57,7 @@
AST_EXTENSION_BUSY = 1 << 1,
/*! All devices UNAVAILABLE/UNREGISTERED */
@@ -4191,9 +4192,9 @@
/* Functions for returning values from structures */
const char *ast_get_context_name(struct ast_context *con);
-diff -urNad asterisk-1.2.0.dfsg/include/asterisk.h /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/include/asterisk.h
---- asterisk-1.2.0.dfsg/include/asterisk.h 2005-11-08 03:29:14.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/include/asterisk.h 2005-11-23 05:50:44.399866765 +0200
+diff -urN asterisk-1.2.0.orig/include/asterisk.h asterisk-1.2.0/include/asterisk.h
+--- asterisk-1.2.0.orig/include/asterisk.h 2005-11-08 02:29:14.000000000 +0100
++++ asterisk-1.2.0/include/asterisk.h 2005-11-20 12:28:41.000000000 +0100
@@ -36,6 +36,7 @@
extern char ast_config_AST_PID[AST_CONFIG_MAX_PATH];
extern char ast_config_AST_SOCKET[AST_CONFIG_MAX_PATH];
@@ -4202,9 +4203,9 @@
extern char ast_config_AST_CTL_PERMISSIONS[AST_CONFIG_MAX_PATH];
extern char ast_config_AST_CTL_OWNER[AST_CONFIG_MAX_PATH];
extern char ast_config_AST_CTL_GROUP[AST_CONFIG_MAX_PATH];
-diff -urNad asterisk-1.2.0.dfsg/LICENSE /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/LICENSE
---- asterisk-1.2.0.dfsg/LICENSE 2005-10-15 07:29:13.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/LICENSE 2005-11-23 05:50:44.401866488 +0200
+diff -urN asterisk-1.2.0.orig/LICENSE asterisk-1.2.0/LICENSE
+--- asterisk-1.2.0.orig/LICENSE 2005-10-15 07:29:13.000000000 +0200
++++ asterisk-1.2.0/LICENSE 2005-11-20 13:07:36.000000000 +0100
@@ -1,7 +1,7 @@
-Asterisk is distributed under the GNU General Public License version 2
-and is also available under alternative licenses negotiated directly
@@ -4217,9 +4218,9 @@
except as defined below. The GPL (version 2) is included in this
source tree in the file COPYING.
-diff -urNad asterisk-1.2.0.dfsg/Makefile /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/Makefile
---- asterisk-1.2.0.dfsg/Makefile 2005-11-16 22:23:53.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/Makefile 2005-11-23 05:50:44.404866073 +0200
+diff -urN asterisk-1.2.0.orig/Makefile asterisk-1.2.0/Makefile
+--- asterisk-1.2.0.orig/Makefile 2005-11-16 21:23:53.000000000 +0100
++++ asterisk-1.2.0/Makefile 2005-11-20 13:03:01.000000000 +0100
@@ -766,6 +766,8 @@
echo ";astctlowner = root" ; \
echo ";astctlgroup = apache" ; \
@@ -4229,9 +4230,9 @@
) > $(DESTDIR)$(ASTCONFPATH) ; \
else \
echo "Skipping asterisk.conf creation"; \
-diff -urNad asterisk-1.2.0.dfsg/manager.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/manager.c
---- asterisk-1.2.0.dfsg/manager.c 2005-11-15 20:35:30.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/manager.c 2005-11-23 05:50:44.408865518 +0200
+diff -urN asterisk-1.2.0.orig/manager.c asterisk-1.2.0/manager.c
+--- asterisk-1.2.0.orig/manager.c 2005-11-15 19:35:30.000000000 +0100
++++ asterisk-1.2.0/manager.c 2005-11-20 13:29:08.000000000 +0100
@@ -11,6 +11,9 @@
* the project provides a web site, mailing lists and IRC
* channels for your use.
@@ -4471,9 +4472,9 @@
return 0;
}
-diff -urNad asterisk-1.2.0.dfsg/pbx/pbx_spool.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/pbx/pbx_spool.c
---- asterisk-1.2.0.dfsg/pbx/pbx_spool.c 2005-10-24 22:12:06.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/pbx/pbx_spool.c 2005-11-23 05:50:44.411865103 +0200
+diff -urN asterisk-1.2.0.orig/pbx/pbx_spool.c asterisk-1.2.0/pbx/pbx_spool.c
+--- asterisk-1.2.0.orig/pbx/pbx_spool.c 2005-10-24 22:12:06.000000000 +0200
++++ asterisk-1.2.0/pbx/pbx_spool.c 2005-11-20 12:28:41.000000000 +0100
@@ -256,11 +256,11 @@
if (!ast_strlen_zero(o->app)) {
if (option_verbose > 2)
@@ -4488,9 +4489,9 @@
}
if (res) {
ast_log(LOG_NOTICE, "Call failed to go through, reason %d\n", reason);
-diff -urNad asterisk-1.2.0.dfsg/pbx.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/pbx.c
---- asterisk-1.2.0.dfsg/pbx.c 2005-11-14 21:00:38.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/pbx.c 2005-11-23 05:50:44.417864272 +0200
+diff -urN asterisk-1.2.0.orig/pbx.c asterisk-1.2.0/pbx.c
+--- asterisk-1.2.0.orig/pbx.c 2005-11-14 20:00:38.000000000 +0100
++++ asterisk-1.2.0/pbx.c 2005-11-20 13:13:09.000000000 +0100
@@ -350,7 +350,8 @@
{ "Hangup", pbx_builtin_hangup,
@@ -4627,9 +4628,9 @@
return res;
}
-diff -urNad asterisk-1.2.0.dfsg/README /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/README
---- asterisk-1.2.0.dfsg/README 2005-10-19 01:58:36.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/README 2005-11-23 05:50:44.420863856 +0200
+diff -urN asterisk-1.2.0.orig/README asterisk-1.2.0/README
+--- asterisk-1.2.0.orig/README 2005-10-19 01:58:36.000000000 +0200
++++ asterisk-1.2.0/README 2005-11-20 13:04:00.000000000 +0100
@@ -4,6 +4,8 @@
Copyright (C) 2001-2005 Digium, Inc.
@@ -4639,9 +4640,9 @@
================================================================
* SECURITY
-diff -urNad asterisk-1.2.0.dfsg/res/Makefile /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/res/Makefile
---- asterisk-1.2.0.dfsg/res/Makefile 2005-11-16 22:49:44.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/res/Makefile 2005-11-23 05:50:44.423863440 +0200
+diff -urN asterisk-1.2.0.orig/res/Makefile asterisk-1.2.0/res/Makefile
+--- asterisk-1.2.0.orig/res/Makefile 2005-11-16 21:49:44.000000000 +0100
++++ asterisk-1.2.0/res/Makefile 2005-11-20 13:15:05.000000000 +0100
@@ -11,7 +11,7 @@
# the GNU General Public License
#
@@ -4651,9 +4652,9 @@
ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),)
ifneq (${OSARCH},FreeBSD)
-diff -urNad asterisk-1.2.0.dfsg/res/res_agi.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/res/res_agi.c
---- asterisk-1.2.0.dfsg/res/res_agi.c 2005-11-08 03:55:30.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/res/res_agi.c 2005-11-23 05:50:44.427862886 +0200
+diff -urN asterisk-1.2.0.orig/res/res_agi.c asterisk-1.2.0/res/res_agi.c
+--- asterisk-1.2.0.orig/res/res_agi.c 2005-11-08 02:55:30.000000000 +0100
++++ asterisk-1.2.0/res/res_agi.c 2005-11-20 13:16:27.000000000 +0100
@@ -11,6 +11,9 @@
* the project provides a web site, mailing lists and IRC
* channels for your use.
@@ -5032,9 +5033,9 @@
return ast_register_application(app, agi_exec, synopsis, descrip);
}
-diff -urNad asterisk-1.2.0.dfsg/res/res_features.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/res/res_features.c
---- asterisk-1.2.0.dfsg/res/res_features.c 2005-11-11 01:26:40.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/res/res_features.c 2005-11-23 05:50:44.433862055 +0200
+diff -urN asterisk-1.2.0.orig/res/res_features.c asterisk-1.2.0/res/res_features.c
+--- asterisk-1.2.0.orig/res/res_features.c 2005-11-11 00:26:40.000000000 +0100
++++ asterisk-1.2.0/res/res_features.c 2005-11-20 13:17:03.000000000 +0100
@@ -11,6 +11,10 @@
* the project provides a web site, mailing lists and IRC
* channels for your use.
@@ -5942,9 +5943,9 @@
ast_unregister_application(parkcall);
return ast_unregister_application(parkedcall);
}
-diff -urNad asterisk-1.2.0.dfsg/res/res_watchdog.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/res/res_watchdog.c
---- asterisk-1.2.0.dfsg/res/res_watchdog.c 1970-01-01 02:00:00.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/res/res_watchdog.c 2005-11-23 05:50:44.436861639 +0200
+diff -urN asterisk-1.2.0.orig/res/res_watchdog.c asterisk-1.2.0/res/res_watchdog.c
+--- asterisk-1.2.0.orig/res/res_watchdog.c 1970-01-01 01:00:00.000000000 +0100
++++ asterisk-1.2.0/res/res_watchdog.c 2005-11-20 13:31:22.000000000 +0100
@@ -0,0 +1,148 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
@@ -6094,9 +6095,9 @@
+{
+ return ASTERISK_GPL_KEY;
+}
-diff -urNad asterisk-1.2.0.dfsg/rtp.c /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/rtp.c
---- asterisk-1.2.0.dfsg/rtp.c 2005-11-11 06:07:03.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/rtp.c 2005-11-23 05:50:44.439861223 +0200
+diff -urN asterisk-1.2.0.orig/rtp.c asterisk-1.2.0/rtp.c
+--- asterisk-1.2.0.orig/rtp.c 2005-11-11 05:07:03.000000000 +0100
++++ asterisk-1.2.0/rtp.c 2005-11-20 12:28:41.000000000 +0100
@@ -442,6 +442,11 @@
struct rtpPayloadType rtpPT;
@@ -6109,9 +6110,3 @@
/* Cache where the header will go */
res = recvfrom(rtp->s, rtp->rawdata + AST_FRIENDLY_OFFSET, sizeof(rtp->rawdata) - AST_FRIENDLY_OFFSET,
-diff -urNad asterisk-1.2.0.dfsg/.version /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/.version
---- asterisk-1.2.0.dfsg/.version 2005-11-17 07:37:05.000000000 +0200
-+++ /tmp/dpep.xhUJBp/asterisk-1.2.0.dfsg/.version 2005-11-23 05:50:44.442860808 +0200
-@@ -1 +1 @@
--1.2.0
-+1.2.0-BRIstuffed-0.3.0-PRE-1
Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog 2005-11-25 18:11:05 UTC (rev 1033)
+++ zaptel/trunk/debian/changelog 2005-11-26 10:37:54 UTC (rev 1034)
@@ -1,3 +1,9 @@
+zaptel (1:1.2.0-2) unstable; urgency=low
+
+ * Added bristuff 0.3.0-PRE1 for Asterisk 1.2.0 support.
+
+ -- Kilian Krause <kilian at debian.org> Sat, 26 Nov 2005 10:20:12 +0000
+
zaptel (1:1.2.0-1) unstable; urgency=low
* New upstream release
Modified: zaptel/trunk/debian/patches/00list
===================================================================
--- zaptel/trunk/debian/patches/00list 2005-11-25 18:11:05 UTC (rev 1033)
+++ zaptel/trunk/debian/patches/00list 2005-11-26 10:37:54 UTC (rev 1034)
@@ -8,3 +8,4 @@
# touches the Makefile as well:
echocan_env
xpp
+bristuff-0.3.0-PRE1
Added: zaptel/trunk/debian/patches/bristuff-0.3.0-PRE1.dpatch
===================================================================
--- zaptel/trunk/debian/patches/bristuff-0.3.0-PRE1.dpatch 2005-11-25 18:11:05 UTC (rev 1033)
+++ zaptel/trunk/debian/patches/bristuff-0.3.0-PRE1.dpatch 2005-11-26 10:37:54 UTC (rev 1034)
@@ -0,0 +1,173 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## bristuff.dpatch imported by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Import bristuff 0.3.0-PRE1 for Asterisk 1.2.0 support
+ at DPATCH@
+diff -urN zaptel-1.2.0.orig/zaptel.c zaptel-1.2.0/zaptel.c
+--- zaptel-1.2.0.orig/zaptel.c 2005-11-11 21:48:43.000000000 +0100
++++ zaptel-1.2.0/zaptel.c 2005-11-20 11:57:22.000000000 +0100
+@@ -4901,11 +4901,40 @@
+ *(txb++) = fasthdlc_tx_run_nocheck(&ms->txhdlc);
+ }
+ bytes -= left;
++#ifdef CONFIG_ZAPATA_BRI_DCHANS
++ } else if (ms->flags & ZT_FLAG_BRIDCHAN) {
++ /*
++ * Let's get this right, we want to transmit complete frames only.
++ * The card driver will do the dirty HDLC work for us.
++ * txb (transmit buffer) is supposed to be big enough to store one frame
++ * we will make this as big as the D fifo (1KB or 2KB)
++ */
++
++ /* there are 'left' bytes in the user buffer left to transmit */
++ left = ms->writen[ms->outwritebuf] - ms->writeidx[ms->outwritebuf] - 2;
++ if (left > ms->maxbytes2transmit) {
++ memcpy(txb, buf + ms->writeidx[ms->outwritebuf], ms->maxbytes2transmit);
++ ms->writeidx[ms->outwritebuf] += ms->maxbytes2transmit;
++ txb += ms->maxbytes2transmit;
++ ms->bytes2transmit = ms->maxbytes2transmit;
++ ms->eoftx = 0;
++ } else {
++ memcpy(txb, buf + ms->writeidx[ms->outwritebuf], left);
++ ms->writeidx[ms->outwritebuf] += left + 2;
++ txb += left;
++ ms->bytes2transmit = left;
++ ms->eoftx = 1;
++ }
++ bytes = 0;
++#endif
+ } else {
+ memcpy(txb, buf + ms->writeidx[ms->outwritebuf], left);
+ ms->writeidx[ms->outwritebuf]+=left;
+ txb += left;
+ bytes -= left;
++#if defined(CONFIG_ZAPATA_BRI_DCHANS)
++ ms->bytes2transmit=ZT_CHUNKSIZE;
++#endif
+ }
+ /* Check buffer status */
+ if (ms->writeidx[ms->outwritebuf] >= ms->writen[ms->outwritebuf]) {
+@@ -4950,6 +4979,17 @@
+ /* Transmit a flag if this is an HDLC channel */
+ if (ms->flags & ZT_FLAG_HDLC)
+ fasthdlc_tx_frame_nocheck(&ms->txhdlc);
++#if defined(CONFIG_ZAPATA_BRI_DCHANS)
++ if(ms->flags & ZT_FLAG_BRIDCHAN) {
++ // if (ms->bytes2transmit > 0) {
++ // txb += 2;
++ // ms->bytes2transmit -= 2;
++ bytes=0;
++ ms->eoftx = 1;
++// printk(KERN_CRIT "zaptel EOF(%d) bytes2transmit %d\n",ms->eoftx,ms->bytes2transmit);
++ // }
++ }
++#endif
+ #ifdef CONFIG_ZAPATA_NET
+ if (ms->flags & ZT_FLAG_NETDEV)
+ netif_wake_queue(ztchan_to_dev(ms));
+@@ -4960,7 +5000,7 @@
+ tasklet_schedule(&ms->ppp_calls);
+ }
+ #endif
+- }
++ }
+ } else if (ms->curtone && !(ms->flags & ZT_FLAG_PSEUDO)) {
+ left = ms->curtone->tonesamples - ms->tonep;
+ if (left > bytes)
+@@ -5006,6 +5046,10 @@
+ memset(txb, 0xFF, bytes);
+ }
+ bytes = 0;
++#if defined(CONFIG_ZAPATA_BRI_DCHANS)
++ } else if(ms->flags & ZT_FLAG_BRIDCHAN) {
++ bytes = 0;
++#endif
+ } else {
+ memset(txb, ZT_LIN2X(0, ms), bytes); /* Lastly we use silence on telephony channels */
+ bytes = 0;
+@@ -5731,6 +5775,13 @@
+ int left, x;
+
+ int bytes = ZT_CHUNKSIZE;
++#if defined(CONFIG_ZAPATA_BRI_DCHANS)
++ if (ms->flags & ZT_FLAG_BRIDCHAN) {
++ bytes = ms->bytes2receive;
++ if (bytes < 1) return;
++// printk(KERN_CRIT "bytes2receive %d\n",ms->bytes2receive);
++ }
++#endif
+
+ while(bytes) {
+ #if defined(CONFIG_ZAPATA_NET) || defined(CONFIG_ZAPATA_PPP)
+@@ -5789,6 +5840,19 @@
+ }
+ }
+ }
++#ifdef CONFIG_ZAPATA_BRI_DCHANS
++ } else if (ms->flags & ZT_FLAG_BRIDCHAN) {
++ memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left);
++ rxb += left;
++ ms->readidx[ms->inreadbuf] += left;
++ bytes -= left;
++ if (ms->eofrx == 1) {
++ eof=1;
++ }
++// printk(KERN_CRIT "receiving %d bytes\n",ms->bytes2receive);
++ ms->bytes2receive = 0;
++ ms->eofrx = 0;
++#endif
+ } else {
+ /* Not HDLC */
+ memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left);
+diff -urN zaptel-1.2.0.orig/zaptel.h zaptel-1.2.0/zaptel.h
+--- zaptel-1.2.0.orig/zaptel.h 2005-10-27 18:05:07.000000000 +0200
++++ zaptel-1.2.0/zaptel.h 2005-11-20 11:52:31.000000000 +0100
+@@ -981,6 +981,13 @@
+ int do_ppp_error;
+ struct sk_buff_head ppp_rq;
+ #endif
++#ifdef CONFIG_ZAPATA_BRI_DCHANS
++ int bytes2receive;
++ int maxbytes2transmit; /* size of the tx buffer in the card driver */
++ int bytes2transmit;
++ int eofrx;
++ int eoftx;
++#endif
+ spinlock_t lock;
+ char name[40]; /* Name */
+ /* Specified by zaptel */
+@@ -1055,7 +1062,7 @@
+ int txbufpolicy; /* Buffer policy */
+ int rxbufpolicy; /* Buffer policy */
+ int txdisable; /* Disable transmitter */
+- int rxdisable; /* Disable receiver */
++ int rxdisable; /* Disable receiver */
+
+
+ /* Tone zone stuff */
+@@ -1218,6 +1225,10 @@
+ #define ZT_FLAG_T1PPP (1 << 15)
+ #define ZT_FLAG_SIGFREEZE (1 << 16) /* Freeze signalling */
+
++#if defined(CONFIG_ZAPATA_BRI_DCHANS)
++#define ZT_FLAG_BRIDCHAN (1 << 17)
++#endif
++
+ struct zt_span {
+ spinlock_t lock;
+ void *pvt; /* Private stuff */
+diff -urN zaptel-1.2.0.orig/zconfig.h zaptel-1.2.0/zconfig.h
+--- zaptel-1.2.0.orig/zconfig.h 2005-10-27 18:05:07.000000000 +0200
++++ zaptel-1.2.0/zconfig.h 2005-11-20 11:52:31.000000000 +0100
+@@ -152,4 +152,10 @@
+ */
+ /* #define FXSFLASH */
+
++/*
++ * Uncomment the following for BRI D channels
++ *
++ */
++#define CONFIG_ZAPATA_BRI_DCHANS
++
+ #endif
Property changes on: zaptel/trunk/debian/patches/bristuff-0.3.0-PRE1.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: zaptel/trunk/debian/zaptel.postinst
===================================================================
--- zaptel/trunk/debian/zaptel.postinst 2005-11-25 18:11:05 UTC (rev 1033)
+++ zaptel/trunk/debian/zaptel.postinst 2005-11-26 10:37:54 UTC (rev 1034)
@@ -38,7 +38,7 @@
mknod /dev/zap/$N c 196 $N;
N=`expr $N + 1`
done
- chown 0.dialout /dev/zap/ -R
+ chown 0:dialout /dev/zap/ -R
chmod 0660 /dev/zap/*
else
echo "**** Dynamic filesystem detected -- not creating device nodes"
More information about the Pkg-voip-commits
mailing list