1 diff -ur -x '*.c' -x '*.orig' -x configure asterisk-1.4.21.1.new/build_tools/menuselect-deps.in asterisk-1.4.21.1.old/build_tools/menuselect-deps.in
2 --- asterisk-1.4.21.1.new/build_tools/menuselect-deps.in 2008-05-06 00:10:05.000000000 +0200
3 +++ asterisk-1.4.21.1.old/build_tools/menuselect-deps.in 2008-07-18 08:18:42.813626657 +0200
12 diff -ur asterisk-1.4.21.1.org/channels/chan_zap.c asterisk-1.4.21.1/channels/chan_zap.c
13 --- asterisk-1.4.21.1/channels/chan_zap.c~ 2008-07-18 21:56:54.854339111 +0200
14 +++ asterisk-1.4.21.1/channels/chan_zap.c 2008-07-18 22:02:00.487649563 +0200
16 <depend>zaptel</depend>
17 <depend>tonezone</depend>
18 <depend>res_features</depend>
19 + <depend>gsmat</depend>
23 diff -ur -x '*.c' -x '*.orig' -x configure asterisk-1.4.21.1.new/channels/.chan_zap.moduleinfo asterisk-1.4.21.1.old/channels/.chan_zap.moduleinfo
24 --- asterisk-1.4.21.1.new/channels/.chan_zap.moduleinfo 2008-06-30 18:24:08.000000000 +0200
25 +++ asterisk-1.4.21.1.old/channels/.chan_zap.moduleinfo 2008-07-18 08:18:42.808831904 +0200
27 <depend>zaptel</depend>
28 <depend>tonezone</depend>
29 <depend>res_features</depend>
30 + <depend>gsmat</depend>
33 diff -ur -x '*.c' -x '*.orig' -x configure asterisk-1.4.21.1.new/channels/.moduleinfo asterisk-1.4.21.1.old/channels/.moduleinfo
34 --- asterisk-1.4.21.1.new/channels/.moduleinfo 2008-06-30 18:24:08.000000000 +0200
35 +++ asterisk-1.4.21.1.old/channels/.moduleinfo 2008-07-18 08:18:42.808831904 +0200
37 <depend>zaptel</depend>
38 <depend>tonezone</depend>
39 <depend>res_features</depend>
40 + <depend>gsmat</depend>
43 <member name="chan_vpb" displayname="Voicetronix API driver" remove_on_change="channels/chan_vpb.oo channels/chan_vpb.so">
44 diff -ur -x '*.c' -x '*.orig' -x configure asterisk-1.4.21.1.new/configure.ac asterisk-1.4.21.1.old/configure.ac
45 --- asterisk-1.4.21.1.new/configure.ac 2008-07-18 08:18:57.389246988 +0200
46 +++ asterisk-1.4.21.1.old/configure.ac 2008-07-18 08:18:42.806528869 +0200
51 +AST_EXT_LIB_CHECK([GSMAT], [gsmat], [gsm_new_call], [libgsmat.h])
53 AST_EXT_LIB_CHECK([IKSEMEL], [iksemel], [iks_start_sasl], [iksemel.h])
55 if test "${PBX_IKSEMEL}" = 1; then
56 diff -ur -x '*.c' -x '*.orig' -x configure asterisk-1.4.21.1.new/makeopts.in asterisk-1.4.21.1.old/makeopts.in
57 --- asterisk-1.4.21.1.new/makeopts.in 2008-03-11 15:07:59.000000000 +0100
58 +++ asterisk-1.4.21.1.old/makeopts.in 2008-07-18 08:18:42.813626657 +0200
60 GSM_INCLUDE=@GSM_INCLUDE@
63 +GSMAT_INCLUDE=@GSMAT_INCLUDE@
64 +GSMAT_LIB=@GSMAT_LIB@
66 GTK_INCLUDE=@GTK_INCLUDE@
69 diff -ur -x '*.c' -x '*.orig' -x configure asterisk-1.4.21.1.new/menuselect-tree asterisk-1.4.21.1.old/menuselect-tree
70 --- asterisk-1.4.21.1.new/menuselect-tree 2008-06-30 18:24:08.000000000 +0200
71 +++ asterisk-1.4.21.1.old/menuselect-tree 2008-07-18 08:18:42.813626657 +0200
73 <depend>zaptel</depend>
74 <depend>tonezone</depend>
75 <depend>res_features</depend>
76 + <depend>gsmat</depend>
79 <member name="chan_vpb" displayname="Voicetronix API driver" remove_on_change="channels/chan_vpb.oo channels/chan_vpb.so">
80 --- asterisk-1.4.21.1/configure.ac~ 2008-07-20 18:07:54.188016698 +0200
81 +++ asterisk-1.4.21.1/configure.ac 2008-07-20 18:09:56.831337972 +0200
83 AST_EXT_LIB_SETUP([CURSES], [curses], [curses])
84 AST_EXT_LIB_SETUP([GNUTLS], [GNU TLS support (used for iksemel only)], [gnutls])
85 AST_EXT_LIB_SETUP([GSM], [GSM], [gsm], [, or 'internal'])
86 -AST_EXT_LIB_SETUP([GSMAT], [GSMAT], [GSM AT command signalling], [gsmat])
87 +AST_EXT_LIB_SETUP([GSMAT], [GSM AT command signalling], [gsmat])
88 AST_EXT_LIB_SETUP([IKSEMEL], [Iksemel Jabber Library], [iksemel])
89 AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap])
90 AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
91 --- asterisk/channels/chan_zap.c~ 2008-07-20 18:15:39.464637514 +0200
92 +++ asterisk/channels/chan_zap.c 2008-07-20 21:38:13.280088092 +0200
97 - if (conf->chan.sig == SIG_GSM) {
98 + if (chan_sig == SIG_GSM) {
99 struct zt_bufferinfo bi;
100 ast_mutex_init(&tmp->gsm.lock);
101 strncpy(tmp->gsm.pin, gsm_modem_pin, sizeof(tmp->gsm.pin) - 1);
102 --- asterisk/channels/chan_zap.c~ 2008-07-20 21:39:17.274665128 +0200
103 +++ asterisk/channels/chan_zap.c 2008-07-20 22:18:57.866822681 +0200
105 .send_digit_begin = zt_digit_begin,
106 .send_digit_end = zt_digit_end,
107 .send_text = zt_sendtext,
108 -#if 0 /* we (Debian) disable that addition because of ABI breakage */
109 .send_message = zt_sendmessage,
114 --- asterisk/include/asterisk/channel.h~ 2008-07-20 22:20:30.489834448 +0200
115 +++ asterisk/include/asterisk/channel.h 2008-07-20 22:24:21.859824471 +0200
117 /*! \brief Display or transmit text */
118 int (* const send_text)(struct ast_channel *chan, const char *text);
120 -#if 0 /* we (Debian) disable that addition because of ABI breakage */
121 /*! \brief send a message */
122 int (* const send_message)(struct ast_channel *chan, const char *dest, const char *text, int ispdu);
125 /*! \brief Display or send an image */
126 int (* const send_image)(struct ast_channel *chan, struct ast_frame *frame);
127 --- asterisk/main/channel.c~ 2008-07-20 22:20:30.489834448 +0200
128 +++ asterisk/main/channel.c 2008-07-20 22:25:38.689861614 +0200
129 @@ -2496,10 +2496,8 @@
130 if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan))
132 CHECK_BLOCKING(chan);
133 -#if 0 /* we (Debian) disable that addition because of ABI breakage */
134 if (chan->tech->send_message)
135 res = chan->tech->send_message(chan, dest, text, ispdu);
137 ast_clear_flag(chan, AST_FLAG_BLOCKING);