OpenPKG Specs / file comparison

comparison: asterisk/asterisk.patch

asterisk/asterisk.patch

changeset 357
cce1eb91ccfc
parent 316
153998c81c45
child 362
7c568c62ffb3
equal deleted inserted replaced
4:5ae737cd7ef4 5:0473a958bb0a
1 Index: addons/chan_ooh323.c 1 Index: addons/chan_ooh323.c
2 diff -Nau addons/chan_ooh323.c.orig addons/chan_ooh323.c 2 diff -Nau addons/chan_ooh323.c.orig addons/chan_ooh323.c
3 --- addons/chan_ooh323.c.orig 2010-10-09 16:02:26.000000000 +0200 3 --- addons/chan_ooh323.c.orig 2011-02-18 01:07:20.000000000 +0100
4 +++ addons/chan_ooh323.c 2011-03-13 14:03:42.000000000 +0100 4 +++ addons/chan_ooh323.c 2011-05-23 17:35:28.331029567 +0200
5 @@ -23,6 +23,12 @@ 5 @@ -23,6 +23,12 @@
6 6
7 #include "chan_ooh323.h" 7 #include "chan_ooh323.h"
8 #include <math.h> 8 #include <math.h>
9 +#if defined __SVR4 && defined __sun 9 +#if defined __SVR4 && defined __sun
16 #define FORMAT_STRING_SIZE 512 16 #define FORMAT_STRING_SIZE 512
17 17
18 Index: addons/ooh323c/src/ooCmdChannel.c 18 Index: addons/ooh323c/src/ooCmdChannel.c
19 diff -Nau addons/ooh323c/src/ooCmdChannel.c.orig addons/ooh323c/src/ooCmdChannel.c 19 diff -Nau addons/ooh323c/src/ooCmdChannel.c.orig addons/ooh323c/src/ooCmdChannel.c
20 --- addons/ooh323c/src/ooCmdChannel.c.orig 2010-03-26 00:38:58.000000000 +0100 20 --- addons/ooh323c/src/ooCmdChannel.c.orig 2010-03-26 00:38:58.000000000 +0100
21 +++ addons/ooh323c/src/ooCmdChannel.c 2011-03-13 14:03:42.000000000 +0100 21 +++ addons/ooh323c/src/ooCmdChannel.c 2011-05-23 17:35:28.331029567 +0200
22 @@ -25,6 +25,10 @@ 22 @@ -25,6 +25,10 @@
23 #include "ooCalls.h" 23 #include "ooCalls.h"
24 #include "ooCmdChannel.h" 24 #include "ooCmdChannel.h"
25 25
26 +#ifndef AF_LOCAL 26 +#ifndef AF_LOCAL
30 30
31 /** Global endpoint structure */ 31 /** Global endpoint structure */
32 extern OOH323EndPoint gH323ep; 32 extern OOH323EndPoint gH323ep;
33 Index: addons/ooh323c/src/ooSocket.c 33 Index: addons/ooh323c/src/ooSocket.c
34 diff -Nau addons/ooh323c/src/ooSocket.c.orig addons/ooh323c/src/ooSocket.c 34 diff -Nau addons/ooh323c/src/ooSocket.c.orig addons/ooh323c/src/ooSocket.c
35 --- addons/ooh323c/src/ooSocket.c.orig 2010-03-25 22:39:04.000000000 +0100 35 --- addons/ooh323c/src/ooSocket.c.orig 2011-02-16 21:21:17.000000000 +0100
36 +++ addons/ooh323c/src/ooSocket.c 2011-03-13 14:03:42.000000000 +0100 36 +++ addons/ooh323c/src/ooSocket.c 2011-05-23 17:35:28.331029567 +0200
37 @@ -24,6 +24,9 @@ 37 @@ -24,6 +24,9 @@
38 38
39 #include "ooSocket.h" 39 #include "ooSocket.h"
40 #include "ootrace.h" 40 #include "ootrace.h"
41 +#if defined __SVR4 && defined __sun 41 +#if defined __SVR4 && defined __sun
44 #if defined(_WIN32_WCE) 44 #if defined(_WIN32_WCE)
45 static int inited = 0; 45 static int inited = 0;
46 #define SEND_FLAGS 0 46 #define SEND_FLAGS 0
47 Index: addons/ooh323cDriver.c 47 Index: addons/ooh323cDriver.c
48 diff -Nau addons/ooh323cDriver.c.orig addons/ooh323cDriver.c 48 diff -Nau addons/ooh323cDriver.c.orig addons/ooh323cDriver.c
49 --- addons/ooh323cDriver.c.orig 2010-03-26 00:38:58.000000000 +0100 49 --- addons/ooh323cDriver.c.orig 2011-02-18 01:07:20.000000000 +0100
50 +++ addons/ooh323cDriver.c 2011-03-13 14:03:42.000000000 +0100 50 +++ addons/ooh323cDriver.c 2011-05-23 17:35:28.338530899 +0200
51 @@ -27,6 +27,11 @@ 51 @@ -27,6 +27,11 @@
52 52
53 #define SEC_TO_HOLD_THREAD 24 53 #define SEC_TO_HOLD_THREAD 24
54 54
55 +#ifndef AF_LOCAL 55 +#ifndef AF_LOCAL
61 extern OOBOOL gH323Debug; 61 extern OOBOOL gH323Debug;
62 extern OOH323EndPoint gH323ep; 62 extern OOH323EndPoint gH323ep;
63 Index: apps/app_backticks.c 63 Index: apps/app_backticks.c
64 diff -Nau apps/app_backticks.c.orig apps/app_backticks.c 64 diff -Nau apps/app_backticks.c.orig apps/app_backticks.c
65 --- apps/app_backticks.c.orig 1970-01-01 01:00:00.000000000 +0100 65 --- apps/app_backticks.c.orig 1970-01-01 01:00:00.000000000 +0100
66 +++ apps/app_backticks.c 2011-03-13 14:03:42.000000000 +0100 66 +++ apps/app_backticks.c 2011-05-23 17:35:28.338530899 +0200
67 @@ -0,0 +1,129 @@ 67 @@ -0,0 +1,129 @@
68 + 68 +
69 +#include "asterisk.h" 69 +#include "asterisk.h"
70 + 70 +
71 +ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.52 $") 71 +ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.52 $")
194 + 194 +
195 +AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "BACKTICKS() dialplan function"); 195 +AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "BACKTICKS() dialplan function");
196 + 196 +
197 Index: apps/app_meetme.c 197 Index: apps/app_meetme.c
198 diff -Nau apps/app_meetme.c.orig apps/app_meetme.c 198 diff -Nau apps/app_meetme.c.orig apps/app_meetme.c
199 --- apps/app_meetme.c.orig 2011-01-07 21:53:02.000000000 +0100 199 --- apps/app_meetme.c.orig 2011-01-29 19:09:37.000000000 +0100
200 +++ apps/app_meetme.c 2011-03-13 14:03:42.000000000 +0100 200 +++ apps/app_meetme.c 2011-05-23 17:35:28.338530899 +0200
201 @@ -604,6 +604,7 @@ 201 @@ -604,6 +604,7 @@
202 CONFFLAG_DURATION_LIMIT = (1 << 30), 202 CONFFLAG_DURATION_LIMIT = (1 << 30),
203 /*! Do not write any audio to this channel until the state is up. */ 203 /*! Do not write any audio to this channel until the state is up. */
204 CONFFLAG_NO_AUDIO_UNTIL_UP = (1 << 31), 204 CONFFLAG_NO_AUDIO_UNTIL_UP = (1 << 31),
205 + CONFFLAG_USERNAME = (1 << 32), 205 + CONFFLAG_USERNAME = (1 << 32),
220 AST_APP_OPTION_ARG('L', CONFFLAG_DURATION_LIMIT, OPT_ARG_DURATION_LIMIT), 220 AST_APP_OPTION_ARG('L', CONFFLAG_DURATION_LIMIT, OPT_ARG_DURATION_LIMIT),
221 + AST_APP_OPTION_ARG('n', CONFFLAG_USERNAME, OPT_ARG_USERNAME), 221 + AST_APP_OPTION_ARG('n', CONFFLAG_USERNAME, OPT_ARG_USERNAME),
222 END_OPTIONS ); 222 END_OPTIONS );
223 223
224 static const char * const app = "MeetMe"; 224 static const char * const app = "MeetMe";
225 @@ -2429,6 +2432,12 @@ 225 @@ -2437,6 +2440,12 @@
226 ast_test_flag64(confflags, CONFFLAG_INTROUSERNOREVIEW))) { 226 ast_test_flag64(confflags, CONFFLAG_INTROUSERNOREVIEW))) {
227 char destdir[PATH_MAX]; 227 char destdir[PATH_MAX];
228 228
229 + if (!ast_test_flag64(confflags, CONFFLAG_USERNAME) 229 + if (!ast_test_flag64(confflags, CONFFLAG_USERNAME)
230 + && !ast_strlen_zero(optargs[OPT_ARG_USERNAME]) 230 + && !ast_strlen_zero(optargs[OPT_ARG_USERNAME])
233 + else { 233 + else {
234 + 234 +
235 snprintf(destdir, sizeof(destdir), "%s/meetme", ast_config_AST_SPOOL_DIR); 235 snprintf(destdir, sizeof(destdir), "%s/meetme", ast_config_AST_SPOOL_DIR);
236 236
237 if (ast_mkdir(destdir, 0777) != 0) { 237 if (ast_mkdir(destdir, 0777) != 0) {
238 @@ -2445,6 +2454,7 @@ 238 @@ -2453,6 +2462,7 @@
239 res = ast_record_review(chan, "vm-rec-name", user->namerecloc, 10, "sln", &duration, NULL); 239 res = ast_record_review(chan, "vm-rec-name", user->namerecloc, 10, "sln", &duration, NULL);
240 if (res == -1) 240 if (res == -1)
241 goto outrun; 241 goto outrun;
242 + } 242 + }
243 } 243 }
244 244
245 ast_mutex_lock(&conf->playlock); 245 ast_mutex_lock(&conf->playlock);
246 Index: apps/app_voicemail.c 246 Index: apps/app_voicemail.c
247 diff -Nau apps/app_voicemail.c.orig apps/app_voicemail.c 247 diff -Nau apps/app_voicemail.c.orig apps/app_voicemail.c
248 --- apps/app_voicemail.c.orig 2011-01-07 20:58:30.000000000 +0100 248 --- apps/app_voicemail.c.orig 2011-02-08 20:41:42.000000000 +0100
249 +++ apps/app_voicemail.c 2011-03-13 14:03:42.000000000 +0100 249 +++ apps/app_voicemail.c 2011-05-23 17:35:28.348531751 +0200
250 @@ -366,6 +366,7 @@ 250 @@ -366,6 +366,7 @@
251 static char imapport[8]; 251 static char imapport[8];
252 static char imapflags[128]; 252 static char imapflags[128];
253 static char imapfolder[64]; 253 static char imapfolder[64];
254 +static int imapsubfold = 0; 254 +static int imapsubfold = 0;
262 - ast_build_string(&t, &left, "{%s:%s/imap", imapserver, imapport); 262 - ast_build_string(&t, &left, "{%s:%s/imap", imapserver, imapport);
263 + ast_build_string(&t, &left, "{%s:%s", imapserver, imapport); 263 + ast_build_string(&t, &left, "{%s:%s", imapserver, imapport);
264 264
265 /* Add authentication user if present */ 265 /* Add authentication user if present */
266 if (!ast_strlen_zero(authuser)) 266 if (!ast_strlen_zero(authuser))
267 @@ -6035,6 +6036,7 @@ 267 @@ -6073,6 +6074,7 @@
268 /* simple. huh? */ 268 /* simple. huh? */
269 char sequence[10]; 269 char sequence[10];
270 char mailbox[256]; 270 char mailbox[256];
271 + char folder[256]; 271 + char folder[256];
272 int res; 272 int res;
273 273
274 /* get the real IMAP message number for this message */ 274 /* get the real IMAP message number for this message */
275 @@ -6050,10 +6052,24 @@ 275 @@ -6088,10 +6090,24 @@
276 mail_setflag(vms->mailstream, sequence, "\\Unseen"); 276 mail_setflag(vms->mailstream, sequence, "\\Unseen");
277 mail_clearflag(vms->mailstream, sequence, "\\Seen"); 277 mail_clearflag(vms->mailstream, sequence, "\\Seen");
278 } 278 }
279 - if (!strcasecmp(mbox(vmu, NEW_FOLDER), vms->curbox) && (box == NEW_FOLDER || box == OLD_FOLDER)) { 279 - if (!strcasecmp(mbox(vmu, NEW_FOLDER), vms->curbox) && (box == NEW_FOLDER || box == OLD_FOLDER)) {
280 - ast_mutex_unlock(&vms->lock); 280 - ast_mutex_unlock(&vms->lock);
297 } 297 }
298 + 298 +
299 /* Create the folder if it don't exist */ 299 /* Create the folder if it don't exist */
300 imap_mailbox_name(mailbox, sizeof(mailbox), vms, box, 1); /* Get the full mailbox name */ 300 imap_mailbox_name(mailbox, sizeof(mailbox), vms, box, 1); /* Get the full mailbox name */
301 ast_debug(5, "Checking if folder exists: %s\n", mailbox); 301 ast_debug(5, "Checking if folder exists: %s\n", mailbox);
302 @@ -10221,6 +10237,10 @@ 302 @@ -10264,6 +10280,10 @@
303 #ifndef IMAP_STORAGE 303 #ifndef IMAP_STORAGE
304 } else if (!cmd) { 304 } else if (!cmd) {
305 vms.deleted[vms.curmsg] = 1; 305 vms.deleted[vms.curmsg] = 1;
306 +#else 306 +#else
307 + } else if (!cmd && (folder_int(vms.curbox) > 1 || box > 1)) { 307 + } else if (!cmd && (folder_int(vms.curbox) > 1 || box > 1)) {
308 + vms.deleted[vms.curmsg] = 1; /* Enforce deletion after */ 308 + vms.deleted[vms.curmsg] = 1; /* Enforce deletion after */
309 + deleted = 1; /* successful copy op */ 309 + deleted = 1; /* successful copy op */
310 #endif 310 #endif
311 } else { 311 } else {
312 vms.deleted[vms.curmsg] = 0; 312 vms.deleted[vms.curmsg] = 0;
313 @@ -11688,6 +11708,15 @@ 313 @@ -11731,6 +11751,15 @@
314 } else { 314 } else {
315 ast_copy_string(imapfolder, "INBOX", sizeof(imapfolder)); 315 ast_copy_string(imapfolder, "INBOX", sizeof(imapfolder));
316 } 316 }
317 + /* IMAP saved (sub)folder location policy */ 317 + /* IMAP saved (sub)folder location policy */
318 + if ((val = ast_variable_retrieve(cfg, "general", "imapsubfold"))) { 318 + if ((val = ast_variable_retrieve(cfg, "general", "imapsubfold"))) {
326 if ((val = ast_variable_retrieve(cfg, "general", "imapparentfolder"))) { 326 if ((val = ast_variable_retrieve(cfg, "general", "imapparentfolder"))) {
327 ast_copy_string(imapparentfolder, val, sizeof(imapparentfolder)); 327 ast_copy_string(imapparentfolder, val, sizeof(imapparentfolder));
328 } 328 }
329 Index: apps/.moduleinfo 329 Index: apps/.moduleinfo
330 diff -Nau apps/.moduleinfo.orig apps/.moduleinfo 330 diff -Nau apps/.moduleinfo.orig apps/.moduleinfo
331 --- apps/.moduleinfo.orig 2011-02-22 23:50:32.000000000 +0100 331 --- apps/.moduleinfo.orig 2011-05-09 22:22:47.000000000 +0200
332 +++ apps/.moduleinfo 2011-03-13 14:03:42.000000000 +0100 332 +++ apps/.moduleinfo 2011-05-23 17:35:28.348531751 +0200
333 @@ -72,7 +72,7 @@ 333 @@ -72,7 +72,7 @@
334 <member name="app_image" displayname="Image Transmission Application" remove_on_change="apps/app_image.o apps/app_image.so"> 334 <member name="app_image" displayname="Image Transmission Application" remove_on_change="apps/app_image.o apps/app_image.so">
335 </member> 335 </member>
336 <member name="app_ivrdemo" displayname="IVR Demo Application" remove_on_change="apps/app_ivrdemo.o apps/app_ivrdemo.so"> 336 <member name="app_ivrdemo" displayname="IVR Demo Application" remove_on_change="apps/app_ivrdemo.o apps/app_ivrdemo.so">
337 - <defaultenabled>no</defaultenabled> 337 - <defaultenabled>no</defaultenabled>
353 <member name="app_sayunixtime" displayname="Say time" remove_on_change="apps/app_sayunixtime.o apps/app_sayunixtime.so"> 353 <member name="app_sayunixtime" displayname="Say time" remove_on_change="apps/app_sayunixtime.o apps/app_sayunixtime.so">
354 </member> 354 </member>
355 Index: build_tools/cflags.xml 355 Index: build_tools/cflags.xml
356 diff -Nau build_tools/cflags.xml.orig build_tools/cflags.xml 356 diff -Nau build_tools/cflags.xml.orig build_tools/cflags.xml
357 --- build_tools/cflags.xml.orig 2010-02-16 16:36:53.000000000 +0100 357 --- build_tools/cflags.xml.orig 2010-02-16 16:36:53.000000000 +0100
358 +++ build_tools/cflags.xml 2011-03-13 14:03:42.000000000 +0100 358 +++ build_tools/cflags.xml 2011-05-23 17:35:28.348531751 +0200
359 @@ -26,10 +26,11 @@ 359 @@ -26,10 +26,11 @@
360 <member name="RADIO_RELAX" displayname="Relax DTMF for Radio Applications"> 360 <member name="RADIO_RELAX" displayname="Relax DTMF for Radio Applications">
361 </member> 361 </member>
362 <member name="G711_NEW_ALGORITHM" displayname="Use the NEW ulaw/alaw codecs (slower, but cleaner)"> 362 <member name="G711_NEW_ALGORITHM" displayname="Use the NEW ulaw/alaw codecs (slower, but cleaner)">
363 - <defaultenabled>no</defaultenabled> 363 - <defaultenabled>no</defaultenabled>
370 <member name="TEST_CODING_TABLES" displayname="New ulaw/alaw codec, turn on table tests on init"> 370 <member name="TEST_CODING_TABLES" displayname="New ulaw/alaw codec, turn on table tests on init">
371 <depend>G711_NEW_ALGORITHM</depend> 371 <depend>G711_NEW_ALGORITHM</depend>
372 Index: chan_capi-1.1.5.919/chan_capi20.h 372 Index: chan_capi-1.1.5.919/chan_capi20.h
373 diff -Nau chan_capi-1.1.5.919/chan_capi20.h.orig chan_capi-1.1.5.919/chan_capi20.h 373 diff -Nau chan_capi-1.1.5.919/chan_capi20.h.orig chan_capi-1.1.5.919/chan_capi20.h
374 --- chan_capi-1.1.5.919/chan_capi20.h.orig 2011-01-07 02:29:32.000000000 +0100 374 --- chan_capi-1.1.5.919/chan_capi20.h.orig 2011-01-07 02:29:32.000000000 +0100
375 +++ chan_capi-1.1.5.919/chan_capi20.h 2011-03-13 14:03:42.000000000 +0100 375 +++ chan_capi-1.1.5.919/chan_capi20.h 2011-05-23 17:35:28.348531751 +0200
376 @@ -4,10 +4,13 @@ 376 @@ -4,10 +4,13 @@
377 * first. Else the checks below will fail. 377 * first. Else the checks below will fail.
378 */ 378 */
379 379
380 +#include <stddef.h> 380 +#include <stddef.h>
397 #define HEADER_CID(x) ((x)->adr.adrNCCI) 397 #define HEADER_CID(x) ((x)->adr.adrNCCI)
398 #endif 398 #endif
399 Index: chan_capi-1.1.5.919/chan_capi_utils.c 399 Index: chan_capi-1.1.5.919/chan_capi_utils.c
400 diff -Nau chan_capi-1.1.5.919/chan_capi_utils.c.orig chan_capi-1.1.5.919/chan_capi_utils.c 400 diff -Nau chan_capi-1.1.5.919/chan_capi_utils.c.orig chan_capi-1.1.5.919/chan_capi_utils.c
401 --- chan_capi-1.1.5.919/chan_capi_utils.c.orig 2011-01-07 02:29:32.000000000 +0100 401 --- chan_capi-1.1.5.919/chan_capi_utils.c.orig 2011-01-07 02:29:32.000000000 +0100
402 +++ chan_capi-1.1.5.919/chan_capi_utils.c 2011-03-13 14:03:42.000000000 +0100 402 +++ chan_capi-1.1.5.919/chan_capi_utils.c 2011-05-23 17:35:28.348531751 +0200
403 @@ -1155,6 +1155,9 @@ 403 @@ -1155,6 +1155,9 @@
404 { 404 {
405 MESSAGE_EXCHANGE_ERROR error; 405 MESSAGE_EXCHANGE_ERROR error;
406 int waitcount = 50; 406 int waitcount = 50;
407 +#ifndef CAPI_MANUFACTURER_LEN 407 +#ifndef CAPI_MANUFACTURER_LEN
411 _cmsg CMSG; 411 _cmsg CMSG;
412 412
413 Index: chan_capi-1.1.5.919/libcapi20/capi20.c 413 Index: chan_capi-1.1.5.919/libcapi20/capi20.c
414 diff -Nau chan_capi-1.1.5.919/libcapi20/capi20.c.orig chan_capi-1.1.5.919/libcapi20/capi20.c 414 diff -Nau chan_capi-1.1.5.919/libcapi20/capi20.c.orig chan_capi-1.1.5.919/libcapi20/capi20.c
415 --- chan_capi-1.1.5.919/libcapi20/capi20.c.orig 2011-01-07 02:29:31.000000000 +0100 415 --- chan_capi-1.1.5.919/libcapi20/capi20.c.orig 2011-01-07 02:29:31.000000000 +0100
416 +++ chan_capi-1.1.5.919/libcapi20/capi20.c 2011-03-13 14:03:42.000000000 +0100 416 +++ chan_capi-1.1.5.919/libcapi20/capi20.c 2011-05-23 17:35:28.348531751 +0200
417 @@ -19,8 +19,10 @@ 417 @@ -19,8 +19,10 @@
418 #include <stdio.h> 418 #include <stdio.h>
419 #include <ctype.h> 419 #include <ctype.h>
420 #include <assert.h> 420 #include <assert.h>
421 +#ifdef __linux__ 421 +#ifdef __linux__
708 /* 708 /*
709 * functions added to the CAPI2.0 spec 709 * functions added to the CAPI2.0 spec
710 Index: chan_capi-1.1.5.919/libcapi20/convert.c 710 Index: chan_capi-1.1.5.919/libcapi20/convert.c
711 diff -Nau chan_capi-1.1.5.919/libcapi20/convert.c.orig chan_capi-1.1.5.919/libcapi20/convert.c 711 diff -Nau chan_capi-1.1.5.919/libcapi20/convert.c.orig chan_capi-1.1.5.919/libcapi20/convert.c
712 --- chan_capi-1.1.5.919/libcapi20/convert.c.orig 2011-01-07 02:29:31.000000000 +0100 712 --- chan_capi-1.1.5.919/libcapi20/convert.c.orig 2011-01-07 02:29:31.000000000 +0100
713 +++ chan_capi-1.1.5.919/libcapi20/convert.c 2011-03-13 14:03:42.000000000 +0100 713 +++ chan_capi-1.1.5.919/libcapi20/convert.c 2011-05-23 17:35:28.348531751 +0200
714 @@ -11,7 +11,14 @@ 714 @@ -11,7 +11,14 @@
715 #include <stddef.h> 715 #include <stddef.h>
716 #include <time.h> 716 #include <time.h>
717 #include <ctype.h> 717 #include <ctype.h>
718 +#ifdef __FreeBSD__ 718 +#ifdef __FreeBSD__
727 #include "capi20.h" 727 #include "capi20.h"
728 728
729 Index: chan_capi-1.1.5.919/Makefile 729 Index: chan_capi-1.1.5.919/Makefile
730 diff -Nau chan_capi-1.1.5.919/Makefile.orig chan_capi-1.1.5.919/Makefile 730 diff -Nau chan_capi-1.1.5.919/Makefile.orig chan_capi-1.1.5.919/Makefile
731 --- chan_capi-1.1.5.919/Makefile.orig 2011-01-07 02:29:32.000000000 +0100 731 --- chan_capi-1.1.5.919/Makefile.orig 2011-01-07 02:29:32.000000000 +0100
732 +++ chan_capi-1.1.5.919/Makefile 2011-03-13 14:03:42.000000000 +0100 732 +++ chan_capi-1.1.5.919/Makefile 2011-05-23 17:35:28.348531751 +0200
733 @@ -111,6 +111,9 @@ 733 @@ -111,6 +111,9 @@
734 CFLAGS+=-O2 734 CFLAGS+=-O2
735 CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) 735 CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
736 CFLAGS+=$(shell if uname -m | grep -q "ppc\|arm\|s390"; then echo "-fsigned-char"; fi) 736 CFLAGS+=$(shell if uname -m | grep -q "ppc\|arm\|s390"; then echo "-fsigned-char"; fi)
737 +ifeq (${USE_OWN_LIBCAPI},yes) 737 +ifeq (${USE_OWN_LIBCAPI},yes)
740 ifeq (${DIVA_STREAMING},1) 740 ifeq (${DIVA_STREAMING},1)
741 CFLAGS += -DDIVA_STREAMING=1 741 CFLAGS += -DDIVA_STREAMING=1
742 endif 742 endif
743 Index: channels/chan_sip.c 743 Index: channels/chan_sip.c
744 diff -Nau channels/chan_sip.c.orig channels/chan_sip.c 744 diff -Nau channels/chan_sip.c.orig channels/chan_sip.c
745 --- channels/chan_sip.c.orig 2011-01-14 18:32:52.000000000 +0100 745 --- channels/chan_sip.c.orig 2011-04-25 17:11:30.000000000 +0200
746 +++ channels/chan_sip.c 2011-03-13 14:03:42.000000000 +0100 746 +++ channels/chan_sip.c 2011-05-23 17:35:28.358543497 +0200
747 @@ -11210,7 +11210,16 @@ 747 @@ -11458,7 +11458,16 @@
748 } else { 748 } else {
749 if (sipmethod == SIP_NOTIFY && !ast_strlen_zero(p->theirtag)) { 749 if (sipmethod == SIP_NOTIFY && !ast_strlen_zero(p->theirtag)) {
750 /* If this is a NOTIFY, use the From: tag in the subscribe (RFC 3265) */ 750 /* If this is a NOTIFY, use the From: tag in the subscribe (RFC 3265) */
751 - snprintf(to, sizeof(to), "<%s%s>;tag=%s", (strncasecmp(p->uri, "sip:", 4) ? "sip:" : ""), p->uri, p->theirtag); 751 - snprintf(to, sizeof(to), "<%s%s>;tag=%s", (strncasecmp(p->uri, "sip:", 4) ? "sip:" : ""), p->uri, p->theirtag);
752 + if (strncasecmp(p->uri, "sip:", strlen("sip:"))) 752 + if (strncasecmp(p->uri, "sip:", strlen("sip:")))
763 /* If there is a VXML URL append it to the SIP URL */ 763 /* If there is a VXML URL append it to the SIP URL */
764 snprintf(to, sizeof(to), "<%s>;%s", p->uri, p->options->vxml_url); 764 snprintf(to, sizeof(to), "<%s>;%s", p->uri, p->options->vxml_url);
765 Index: channels/console_video.h 765 Index: channels/console_video.h
766 diff -Nau channels/console_video.h.orig channels/console_video.h 766 diff -Nau channels/console_video.h.orig channels/console_video.h
767 --- channels/console_video.h.orig 2008-06-30 17:45:15.000000000 +0200 767 --- channels/console_video.h.orig 2008-06-30 17:45:15.000000000 +0200
768 +++ channels/console_video.h 2011-03-13 14:03:42.000000000 +0100 768 +++ channels/console_video.h 2011-05-23 17:35:28.358543497 +0200
769 @@ -28,10 +28,7 @@ 769 @@ -28,10 +28,7 @@
770 "console {device}" 770 "console {device}"
771 #else 771 #else
772 772
773 -#include <ffmpeg/avcodec.h> 773 -#include <ffmpeg/avcodec.h>
778 778
779 #define CONSOLE_VIDEO_CMDS \ 779 #define CONSOLE_VIDEO_CMDS \
780 "console {videodevice|videocodec" \ 780 "console {videodevice|videocodec" \
781 Index: configure 781 Index: configure
782 diff -Nau configure.orig configure 782 diff -Nau configure.orig configure
783 --- configure.orig 2011-01-09 22:40:34.000000000 +0100 783 --- configure.orig 2011-01-27 18:03:01.000000000 +0100
784 +++ configure 2011-03-13 14:14:50.000000000 +0100 784 +++ configure 2011-05-23 17:41:08.331029717 +0200
785 @@ -4700,11 +4700,6 @@ 785 @@ -4704,11 +4704,6 @@
786 esac 786 esac
787 787
788 case "${host_os}" in 788 case "${host_os}" in
789 - freebsd*) 789 - freebsd*)
790 - 790 - ac_default_prefix=/usr/local
791 - CPPFLAGS=-I/usr/local/include 791 - CPPFLAGS=-I/usr/local/include
792 - LDFLAGS=-L/usr/local/lib 792 - LDFLAGS=-L/usr/local/lib
793 - ;; 793 - ;;
794 openbsd*) 794 openbsd*)
795 795 ac_default_prefix=/usr/local
796 if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then 796 if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then
797 @@ -18227,8 +18222,8 @@ 797 @@ -18203,8 +18198,8 @@
798 if test -f "${IMAP_TK_DIR}/c-client/LDFLAGS"; then 798 if test -f "${IMAP_TK_DIR}/c-client/LDFLAGS"; then
799 imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS` 799 imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
800 fi 800 fi
801 - imap_libs="${IMAP_TK_DIR}/c-client/c-client.a" 801 - imap_libs="${IMAP_TK_DIR}/c-client/c-client.a"
802 - imap_include="-I${IMAP_TK_DIR}/c-client" 802 - imap_include="-I${IMAP_TK_DIR}/c-client"
803 + imap_libs="-limap -lssl -lcrypto -lcrypt" 803 + imap_libs="-limap -lssl -lcrypto -lcrypt"
804 + imap_include="-DUSE_SYSTEM_IMAP -I${IMAP_TK_DIR}/include/imap" 804 + imap_include="-DUSE_SYSTEM_IMAP -I${IMAP_TK_DIR}/include/imap"
805 CPPFLAGS="${CPPFLAGS} ${imap_include}" 805 CPPFLAGS="${CPPFLAGS} ${imap_include}"
806 LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}` 806 LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}`
807 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 807 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
808 @@ -25461,14 +25456,14 @@ 808 @@ -25436,19 +25431,19 @@
809 else
810 ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
811 CFLAGS="${CFLAGS} "
812 - as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1_${pbxfuncname}" | $as_tr_sh`
813 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua5.1" >&5
814 -$as_echo_n "checking for ${pbxfuncname} in -llua5.1... " >&6; }
815 + as_ac_Lib=`$as_echo "ac_cv_lib_lua_${pbxfuncname}" | $as_tr_sh`
816 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua" >&5
817 +$as_echo_n "checking for ${pbxfuncname} in -llua... " >&6; }
818 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
819 $as_echo_n "(cached) " >&6
820 else
821 ac_check_lib_save_LIBS=$LIBS
822 -LIBS="-llua5.1 ${pbxlibdir} -lm $LIBS"
823 +LIBS="-llua ${pbxlibdir} -lm $LIBS"
824 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
825 /* end confdefs.h. */
826
827 @@ -25511,19 +25506,19 @@
828 809
829 # now check for the header. 810 # now check for the header.
830 if test "${AST_LUA_FOUND}" = "yes"; then 811 if test "${AST_LUA_FOUND}" = "yes"; then
831 - LUA_LIB="${pbxlibdir} -llua5.1 -lm" 812 - LUA_LIB="${pbxlibdir} -llua5.1 -lm"
832 + LUA_LIB="${pbxlibdir} -llua -lm" 813 + LUA_LIB="${pbxlibdir} -llua -lm"
846 + ac_fn_c_check_header_mongrel "$LINENO" "lua/lua.h" "ac_cv_header_lua_lua_h" "$ac_includes_default" 827 + ac_fn_c_check_header_mongrel "$LINENO" "lua/lua.h" "ac_cv_header_lua_lua_h" "$ac_includes_default"
847 +if test "x$ac_cv_header_lua_lua_h" = x""yes; then : 828 +if test "x$ac_cv_header_lua_lua_h" = x""yes; then :
848 LUA_HEADER_FOUND=1 829 LUA_HEADER_FOUND=1
849 else 830 else
850 LUA_HEADER_FOUND=0 831 LUA_HEADER_FOUND=0
851 @@ -25551,9 +25546,9 @@ 832 @@ -25476,9 +25471,9 @@
852 833
853 if test "x${PBX_LUA}" = "x1" ; then 834 if test "x${PBX_LUA}" = "x1" ; then
854 if test x"${LUA_DIR}" = x; then 835 if test x"${LUA_DIR}" = x; then
855 - LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua5.1" 836 - LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua5.1"
856 + LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua" 837 + LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua"
858 - LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua5.1" 839 - LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua5.1"
859 + LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua" 840 + LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua"
860 fi 841 fi
861 fi 842 fi
862 843
863 @@ -26238,7 +26233,7 @@ 844 @@ -26157,7 +26152,7 @@
864 pbxlibdir="-L${SQLITE_DIR}" 845 pbxlibdir="-L${SQLITE_DIR}"
865 fi 846 fi
866 fi 847 fi
867 - pbxfuncname="sqlite_exec" 848 - pbxfuncname="sqlite_exec"
868 + pbxfuncname="sqlite3_exec" 849 + pbxfuncname="sqlite3_exec"
869 if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers 850 if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
870 AST_SQLITE_FOUND=yes 851 AST_SQLITE_FOUND=yes
871 else 852 else
872 @@ -26953,16 +26948,16 @@ 853 @@ -26867,16 +26862,16 @@
873 if test "x${PBX_GMIME}" != "x1" -a "${USE_GMIME}" != "no"; then 854 if test "x${PBX_GMIME}" != "x1" -a "${USE_GMIME}" != "no"; then
874 PBX_GMIME=0 855 PBX_GMIME=0
875 if test -n "$ac_tool_prefix"; then 856 if test -n "$ac_tool_prefix"; then
876 - # Extract the first word of "${ac_tool_prefix}gmime-config", so it can be a program name with args. 857 - # Extract the first word of "${ac_tool_prefix}gmime-config", so it can be a program name with args.
877 -set dummy ${ac_tool_prefix}gmime-config; ac_word=$2 858 -set dummy ${ac_tool_prefix}gmime-config; ac_word=$2
889 - ac_cv_path_CONFIG_GMIME="$CONFIG_GMIME" # Let the user override the test with a path. 870 - ac_cv_path_CONFIG_GMIME="$CONFIG_GMIME" # Let the user override the test with a path.
890 + ac_cv_path_PKGCONFIG="$PKGCONFIG" # Let the user override the test with a path. 871 + ac_cv_path_PKGCONFIG="$PKGCONFIG" # Let the user override the test with a path.
891 ;; 872 ;;
892 *) 873 *)
893 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 874 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
894 @@ -26973,7 +26968,7 @@ 875 @@ -26887,7 +26882,7 @@
895 test -z "$as_dir" && as_dir=. 876 test -z "$as_dir" && as_dir=.
896 for ac_exec_ext in '' $ac_executable_extensions; do 877 for ac_exec_ext in '' $ac_executable_extensions; do
897 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 878 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
898 - ac_cv_path_CONFIG_GMIME="$as_dir/$ac_word$ac_exec_ext" 879 - ac_cv_path_CONFIG_GMIME="$as_dir/$ac_word$ac_exec_ext"
899 + ac_cv_path_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext" 880 + ac_cv_path_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext"
900 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 881 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
901 break 2 882 break 2
902 fi 883 fi
903 @@ -26984,10 +26979,10 @@ 884 @@ -26898,10 +26893,10 @@
904 ;; 885 ;;
905 esac 886 esac
906 fi 887 fi
907 -CONFIG_GMIME=$ac_cv_path_CONFIG_GMIME 888 -CONFIG_GMIME=$ac_cv_path_CONFIG_GMIME
908 -if test -n "$CONFIG_GMIME"; then 889 -if test -n "$CONFIG_GMIME"; then
913 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5 894 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5
914 +$as_echo "$PKGCONFIG" >&6; } 895 +$as_echo "$PKGCONFIG" >&6; }
915 else 896 else
916 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 897 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
917 $as_echo "no" >&6; } 898 $as_echo "no" >&6; }
918 @@ -26995,18 +26990,18 @@ 899 @@ -26909,18 +26904,18 @@
919 900
920 901
921 fi 902 fi
922 -if test -z "$ac_cv_path_CONFIG_GMIME"; then 903 -if test -z "$ac_cv_path_CONFIG_GMIME"; then
923 - ac_pt_CONFIG_GMIME=$CONFIG_GMIME 904 - ac_pt_CONFIG_GMIME=$CONFIG_GMIME
939 - ac_cv_path_ac_pt_CONFIG_GMIME="$ac_pt_CONFIG_GMIME" # Let the user override the test with a path. 920 - ac_cv_path_ac_pt_CONFIG_GMIME="$ac_pt_CONFIG_GMIME" # Let the user override the test with a path.
940 + ac_cv_path_ac_pt_PKGCONFIG="$ac_pt_PKGCONFIG" # Let the user override the test with a path. 921 + ac_cv_path_ac_pt_PKGCONFIG="$ac_pt_PKGCONFIG" # Let the user override the test with a path.
941 ;; 922 ;;
942 *) 923 *)
943 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 924 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
944 @@ -27017,7 +27012,7 @@ 925 @@ -26931,7 +26926,7 @@
945 test -z "$as_dir" && as_dir=. 926 test -z "$as_dir" && as_dir=.
946 for ac_exec_ext in '' $ac_executable_extensions; do 927 for ac_exec_ext in '' $ac_executable_extensions; do
947 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 928 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
948 - ac_cv_path_ac_pt_CONFIG_GMIME="$as_dir/$ac_word$ac_exec_ext" 929 - ac_cv_path_ac_pt_CONFIG_GMIME="$as_dir/$ac_word$ac_exec_ext"
949 + ac_cv_path_ac_pt_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext" 930 + ac_cv_path_ac_pt_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext"
950 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 931 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
951 break 2 932 break 2
952 fi 933 fi
953 @@ -27028,17 +27023,17 @@ 934 @@ -26942,17 +26937,17 @@
954 ;; 935 ;;
955 esac 936 esac
956 fi 937 fi
957 -ac_pt_CONFIG_GMIME=$ac_cv_path_ac_pt_CONFIG_GMIME 938 -ac_pt_CONFIG_GMIME=$ac_cv_path_ac_pt_CONFIG_GMIME
958 -if test -n "$ac_pt_CONFIG_GMIME"; then 939 -if test -n "$ac_pt_CONFIG_GMIME"; then
972 + if test "x$ac_pt_PKGCONFIG" = x; then 953 + if test "x$ac_pt_PKGCONFIG" = x; then
973 + PKGCONFIG="No" 954 + PKGCONFIG="No"
974 else 955 else
975 case $cross_compiling:$ac_tool_warned in 956 case $cross_compiling:$ac_tool_warned in
976 yes:) 957 yes:)
977 @@ -27046,17 +27041,15 @@ 958 @@ -26960,17 +26955,15 @@
978 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 959 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
979 ac_tool_warned=yes ;; 960 ac_tool_warned=yes ;;
980 esac 961 esac
981 - CONFIG_GMIME=$ac_pt_CONFIG_GMIME 962 - CONFIG_GMIME=$ac_pt_CONFIG_GMIME
982 + PKGCONFIG=$ac_pt_PKGCONFIG 963 + PKGCONFIG=$ac_pt_PKGCONFIG
998 saved_cppflags="${CPPFLAGS}" 979 saved_cppflags="${CPPFLAGS}"
999 if test "x${GMIME_DIR}" != "x"; then 980 if test "x${GMIME_DIR}" != "x"; then
1000 Index: formats/format_pcm.c 981 Index: formats/format_pcm.c
1001 diff -Nau formats/format_pcm.c.orig formats/format_pcm.c 982 diff -Nau formats/format_pcm.c.orig formats/format_pcm.c
1002 --- formats/format_pcm.c.orig 2010-07-26 05:27:06.000000000 +0200 983 --- formats/format_pcm.c.orig 2010-07-26 05:27:06.000000000 +0200
1003 +++ formats/format_pcm.c 2011-03-13 14:03:42.000000000 +0100 984 +++ formats/format_pcm.c 2011-05-23 17:35:28.368530778 +0200
1004 @@ -350,6 +350,7 @@ 985 @@ -350,6 +350,7 @@
1005 ast_log(LOG_WARNING, "Unable to write header\n"); 986 ast_log(LOG_WARNING, "Unable to write header\n");
1006 return -1; 987 return -1;
1007 } 988 }
1008 + fflush(f); /* issues.asterisk.org bug 0016610 */ 989 + fflush(f); /* issues.asterisk.org bug 0016610 */
1010 } 991 }
1011 992
1012 Index: formats/format_wav.c 993 Index: formats/format_wav.c
1013 diff -Nau formats/format_wav.c.orig formats/format_wav.c 994 diff -Nau formats/format_wav.c.orig formats/format_wav.c
1014 --- formats/format_wav.c.orig 2010-09-02 18:43:09.000000000 +0200 995 --- formats/format_wav.c.orig 2010-09-02 18:43:09.000000000 +0200
1015 +++ formats/format_wav.c 2011-03-13 14:03:42.000000000 +0100 996 +++ formats/format_wav.c 2011-05-23 17:35:28.368530778 +0200
1016 @@ -310,6 +310,7 @@ 997 @@ -310,6 +310,7 @@
1017 ast_log(LOG_WARNING, "Unable to write header\n"); 998 ast_log(LOG_WARNING, "Unable to write header\n");
1018 return -1; 999 return -1;
1019 } 1000 }
1020 + fflush(f); /* issues.asterisk.org bug 0016610 */ 1001 + fflush(f); /* issues.asterisk.org bug 0016610 */
1022 } 1003 }
1023 1004
1024 Index: formats/format_wav_gsm.c 1005 Index: formats/format_wav_gsm.c
1025 diff -Nau formats/format_wav_gsm.c.orig formats/format_wav_gsm.c 1006 diff -Nau formats/format_wav_gsm.c.orig formats/format_wav_gsm.c
1026 --- formats/format_wav_gsm.c.orig 2010-07-26 05:27:06.000000000 +0200 1007 --- formats/format_wav_gsm.c.orig 2010-07-26 05:27:06.000000000 +0200
1027 +++ formats/format_wav_gsm.c 2011-03-13 14:03:42.000000000 +0100 1008 +++ formats/format_wav_gsm.c 2011-05-23 17:35:28.368530778 +0200
1028 @@ -362,6 +362,7 @@ 1009 @@ -362,6 +362,7 @@
1029 ast_log(LOG_WARNING, "Unable to write header\n"); 1010 ast_log(LOG_WARNING, "Unable to write header\n");
1030 return -1; 1011 return -1;
1031 } 1012 }
1032 + fflush(f); /* issues.asterisk.org bug 0016610 */ 1013 + fflush(f); /* issues.asterisk.org bug 0016610 */
1034 } 1015 }
1035 1016
1036 Index: main/db1-ast/hash/hash.h 1017 Index: main/db1-ast/hash/hash.h
1037 diff -Nau main/db1-ast/hash/hash.h.orig main/db1-ast/hash/hash.h 1018 diff -Nau main/db1-ast/hash/hash.h.orig main/db1-ast/hash/hash.h
1038 --- main/db1-ast/hash/hash.h.orig 2006-08-21 04:11:39.000000000 +0200 1019 --- main/db1-ast/hash/hash.h.orig 2006-08-21 04:11:39.000000000 +0200
1039 +++ main/db1-ast/hash/hash.h 2011-03-13 14:03:42.000000000 +0100 1020 +++ main/db1-ast/hash/hash.h 2011-05-23 17:35:28.368530778 +0200
1040 @@ -36,6 +36,8 @@ 1021 @@ -36,6 +36,8 @@
1041 * @(#)hash.h 8.3 (Berkeley) 5/31/94 1022 * @(#)hash.h 8.3 (Berkeley) 5/31/94
1042 */ 1023 */
1043 1024
1044 +#include <stdint.h> 1025 +#include <stdint.h>
1047 typedef enum { 1028 typedef enum {
1048 HASH_GET, HASH_PUT, HASH_PUTNEW, HASH_DELETE, HASH_FIRST, HASH_NEXT 1029 HASH_GET, HASH_PUT, HASH_PUTNEW, HASH_DELETE, HASH_FIRST, HASH_NEXT
1049 Index: main/db1-ast/hash/ndbm.c 1030 Index: main/db1-ast/hash/ndbm.c
1050 diff -Nau main/db1-ast/hash/ndbm.c.orig main/db1-ast/hash/ndbm.c 1031 diff -Nau main/db1-ast/hash/ndbm.c.orig main/db1-ast/hash/ndbm.c
1051 --- main/db1-ast/hash/ndbm.c.orig 2006-08-21 04:11:39.000000000 +0200 1032 --- main/db1-ast/hash/ndbm.c.orig 2006-08-21 04:11:39.000000000 +0200
1052 +++ main/db1-ast/hash/ndbm.c 2011-03-13 14:03:42.000000000 +0100 1033 +++ main/db1-ast/hash/ndbm.c 2011-05-23 17:35:28.368530778 +0200
1053 @@ -49,7 +49,8 @@ 1034 @@ -49,7 +49,8 @@
1054 #include <string.h> 1035 #include <string.h>
1055 #include <stdlib.h> 1036 #include <stdlib.h>
1056 1037
1057 -#include <ndbm.h> 1038 -#include <ndbm.h>
1060 #include "hash.h" 1041 #include "hash.h"
1061 1042
1062 /* 1043 /*
1063 Index: main/features.c 1044 Index: main/features.c
1064 diff -Nau main/features.c.orig main/features.c 1045 diff -Nau main/features.c.orig main/features.c
1065 --- main/features.c.orig 2011-01-20 21:24:36.000000000 +0100 1046 --- main/features.c.orig 2011-02-09 20:52:51.000000000 +0100
1066 +++ main/features.c 2011-03-13 14:03:42.000000000 +0100 1047 +++ main/features.c 2011-05-23 17:35:28.368530778 +0200
1067 @@ -1658,6 +1658,10 @@ 1048 @@ -1658,6 +1658,10 @@
1068 snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename); 1049 snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename);
1069 } 1050 }
1070 1051
1071 + for(x = 0; x < strlen(touch_filename); x++) { 1052 + for(x = 0; x < strlen(touch_filename); x++) {
1086 for( x = 0; x < strlen(args); x++) { 1067 for( x = 0; x < strlen(args); x++) {
1087 if (args[x] == '/') 1068 if (args[x] == '/')
1088 args[x] = '-'; 1069 args[x] = '-';
1089 Index: main/file.c 1070 Index: main/file.c
1090 diff -Nau main/file.c.orig main/file.c 1071 diff -Nau main/file.c.orig main/file.c
1091 --- main/file.c.orig 2011-01-12 17:05:12.000000000 +0100 1072 --- main/file.c.orig 2011-01-26 02:26:26.000000000 +0100
1092 +++ main/file.c 2011-03-13 14:03:42.000000000 +0100 1073 +++ main/file.c 2011-05-23 17:35:28.378531576 +0200
1093 @@ -255,7 +255,7 @@ 1074 @@ -255,7 +255,7 @@
1094 char *fn = NULL; 1075 char *fn = NULL;
1095 1076
1096 if (!strcmp(ext, "wav49")) 1077 if (!strcmp(ext, "wav49"))
1097 - ext = "WAV"; 1078 - ext = "WAV";
1100 if (filename[0] == '/') { 1081 if (filename[0] == '/') {
1101 if (asprintf(&fn, "%s.%s", filename, ext) < 0) { 1082 if (asprintf(&fn, "%s.%s", filename, ext) < 0) {
1102 Index: main/Makefile 1083 Index: main/Makefile
1103 diff -Nau main/Makefile.orig main/Makefile 1084 diff -Nau main/Makefile.orig main/Makefile
1104 --- main/Makefile.orig 2010-12-18 00:52:04.000000000 +0100 1085 --- main/Makefile.orig 2010-12-18 00:52:04.000000000 +0100
1105 +++ main/Makefile 2011-03-13 14:03:42.000000000 +0100 1086 +++ main/Makefile 2011-05-23 17:35:28.378531576 +0200
1106 @@ -69,10 +69,7 @@ 1087 @@ -69,10 +69,7 @@
1107 endif 1088 endif
1108 1089
1109 ifeq ($(OSARCH),FreeBSD) 1090 ifeq ($(OSARCH),FreeBSD)
1110 - # -V is understood by BSD Make, not by GNU make. 1091 - # -V is understood by BSD Make, not by GNU make.
1115 endif 1096 endif
1116 1097
1117 ifneq ($(findstring $(OSARCH), mingw32 cygwin ),) 1098 ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
1118 Index: main/tcptls.c 1099 Index: main/tcptls.c
1119 diff -Nau main/tcptls.c.orig main/tcptls.c 1100 diff -Nau main/tcptls.c.orig main/tcptls.c
1120 --- main/tcptls.c.orig 2010-07-09 00:08:07.000000000 +0200 1101 --- main/tcptls.c.orig 2011-04-25 17:11:30.000000000 +0200
1121 +++ main/tcptls.c 2011-03-13 14:03:42.000000000 +0100 1102 +++ main/tcptls.c 2011-05-23 17:35:28.378531576 +0200
1122 @@ -354,6 +354,7 @@ 1103 @@ -353,6 +353,7 @@
1123 if (!ast_strlen_zero(cfg->cafile) || !ast_strlen_zero(cfg->capath)) { 1104 if (!ast_strlen_zero(cfg->cafile) || !ast_strlen_zero(cfg->capath)) {
1124 if (SSL_CTX_load_verify_locations(cfg->ssl_ctx, S_OR(cfg->cafile, NULL), S_OR(cfg->capath,NULL)) == 0) 1105 if (SSL_CTX_load_verify_locations(cfg->ssl_ctx, S_OR(cfg->cafile, NULL), S_OR(cfg->capath,NULL)) == 0)
1125 ast_verb(0, "SSL CA file(%s)/path(%s) error\n", cfg->cafile, cfg->capath); 1106 ast_verb(0, "SSL CA file(%s)/path(%s) error\n", cfg->cafile, cfg->capath);
1126 + SSL_CTX_set_client_CA_list(cfg->ssl_ctx, S_OR(cfg->cafile, NULL)); 1107 + SSL_CTX_set_client_CA_list(cfg->ssl_ctx, S_OR(cfg->cafile, NULL));
1127 } 1108 }
1128 1109
1129 ast_verb(0, "SSL certificate ok\n"); 1110 ast_verb(0, "SSL certificate ok\n");
1130 Index: main/udptl.c 1111 Index: main/udptl.c
1131 diff -Nau main/udptl.c.orig main/udptl.c 1112 diff -Nau main/udptl.c.orig main/udptl.c
1132 --- main/udptl.c.orig 2011-02-22 23:52:11.000000000 +0100 1113 --- main/udptl.c.orig 2011-02-21 16:02:20.000000000 +0100
1133 +++ main/udptl.c 2011-03-13 14:03:42.000000000 +0100 1114 +++ main/udptl.c 2011-05-23 17:35:28.378531576 +0200
1134 @@ -98,6 +98,18 @@ 1115 @@ -98,6 +98,18 @@
1135 1116
1136 #define UDPTL_BUF_MASK 15 1117 #define UDPTL_BUF_MASK 15
1137 1118
1138 +/*! Copied from chan_oss.c, corrects link errors: 1119 +/*! Copied from chan_oss.c, corrects link errors:
1150 typedef struct { 1131 typedef struct {
1151 int buf_len; 1132 int buf_len;
1152 uint8_t buf[LOCAL_FAX_MAX_DATAGRAM]; 1133 uint8_t buf[LOCAL_FAX_MAX_DATAGRAM];
1153 Index: Makefile 1134 Index: Makefile
1154 diff -Nau Makefile.orig Makefile 1135 diff -Nau Makefile.orig Makefile
1155 --- Makefile.orig 2011-01-12 16:57:43.000000000 +0100 1136 --- Makefile.orig 2011-02-01 19:02:06.000000000 +0100
1156 +++ Makefile 2011-03-13 14:03:42.000000000 +0100 1137 +++ Makefile 2011-05-23 17:35:28.378531576 +0200
1157 @@ -230,15 +230,6 @@ 1138 @@ -230,15 +230,6 @@
1158 _ASTCFLAGS+=-fsigned-char 1139 _ASTCFLAGS+=-fsigned-char
1159 endif 1140 endif
1160 1141
1161 -ifeq ($(OSARCH),FreeBSD) 1142 -ifeq ($(OSARCH),FreeBSD)
1170 ifeq ($(OSARCH),NetBSD) 1151 ifeq ($(OSARCH),NetBSD)
1171 _ASTCFLAGS+=-pthread -I/usr/pkg/include 1152 _ASTCFLAGS+=-pthread -I/usr/pkg/include
1172 endif 1153 endif
1173 Index: menuselect-tree 1154 Index: menuselect-tree
1174 diff -Nau menuselect-tree.orig menuselect-tree 1155 diff -Nau menuselect-tree.orig menuselect-tree
1175 --- menuselect-tree.orig 2011-02-22 23:50:45.000000000 +0100 1156 --- menuselect-tree.orig 2011-05-09 22:22:55.000000000 +0200
1176 +++ menuselect-tree 2011-03-13 14:03:42.000000000 +0100 1157 +++ menuselect-tree 2011-05-23 17:35:28.378531576 +0200
1177 @@ -38,6 +38,8 @@ 1158 @@ -38,6 +38,8 @@
1178 </member> 1159 </member>
1179 <member name="app_authenticate" displayname="Authentication Application" remove_on_change="apps/app_authenticate.o apps/app_authenticate.so"> 1160 <member name="app_authenticate" displayname="Authentication Application" remove_on_change="apps/app_authenticate.o apps/app_authenticate.so">
1180 </member> 1161 </member>
1181 +<member name="app_backticks" displayname="BACKTICKS() dialplan function" remove_on_change="apps/app_backticks.o apps/app_backticks.so"> 1162 +<member name="app_backticks" displayname="BACKTICKS() dialplan function" remove_on_change="apps/app_backticks.o apps/app_backticks.so">
1221 <member name="EXTRA-SOUNDS-EN-SLN16" displayname="English, Signed-linear 16kHz format"> 1202 <member name="EXTRA-SOUNDS-EN-SLN16" displayname="English, Signed-linear 16kHz format">
1222 </member> 1203 </member>
1223 Index: res/res_http_post.c 1204 Index: res/res_http_post.c
1224 diff -Nau res/res_http_post.c.orig res/res_http_post.c 1205 diff -Nau res/res_http_post.c.orig res/res_http_post.c
1225 --- res/res_http_post.c.orig 2009-10-27 17:48:54.000000000 +0100 1206 --- res/res_http_post.c.orig 2009-10-27 17:48:54.000000000 +0100
1226 +++ res/res_http_post.c 2011-03-13 14:03:42.000000000 +0100 1207 +++ res/res_http_post.c 2011-05-23 17:35:28.378531576 +0200
1227 @@ -122,14 +122,8 @@ 1208 @@ -122,14 +122,8 @@
1228 ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MESSAGE_PARTIAL\n"); 1209 ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MESSAGE_PARTIAL\n");
1229 return; 1210 return;
1230 } else if (GMIME_IS_MULTIPART(part)) { 1211 } else if (GMIME_IS_MULTIPART(part)) {
1231 - GList *l; 1212 - GList *l;
1242 const char *filename; 1223 const char *filename;
1243 1224
1244 Index: sounds/sounds.xml 1225 Index: sounds/sounds.xml
1245 diff -Nau sounds/sounds.xml.orig sounds/sounds.xml 1226 diff -Nau sounds/sounds.xml.orig sounds/sounds.xml
1246 --- sounds/sounds.xml.orig 2010-10-18 23:51:23.000000000 +0200 1227 --- sounds/sounds.xml.orig 2010-10-18 23:51:23.000000000 +0200
1247 +++ sounds/sounds.xml 2011-03-13 14:03:42.000000000 +0100 1228 +++ sounds/sounds.xml 2011-05-23 17:35:28.378531576 +0200
1248 @@ -6,11 +6,11 @@ 1229 @@ -6,11 +6,11 @@
1249 <member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law format"> 1230 <member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law format">
1250 </member> 1231 </member>
1251 <member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM format" > 1232 <member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM format" >
1252 - <defaultenabled>yes</defaultenabled> 1233 - <defaultenabled>yes</defaultenabled>
1283 <member name="EXTRA-SOUNDS-EN-SLN16" displayname="English, Signed-linear 16kHz format"> 1264 <member name="EXTRA-SOUNDS-EN-SLN16" displayname="English, Signed-linear 16kHz format">
1284 </member> 1265 </member>
1285 Index: cdr/cdr_radius.c 1266 Index: cdr/cdr_radius.c
1286 diff -Nau cdr/cdr_radius.c.orig cdr/cdr_radius.c 1267 diff -Nau cdr/cdr_radius.c.orig cdr/cdr_radius.c
1287 --- cdr/cdr_radius.c.orig 2010-07-20 21:35:02.000000000 +0200 1268 --- cdr/cdr_radius.c.orig 2010-07-20 21:35:02.000000000 +0200
1288 +++ cdr/cdr_radius.c 2011-03-22 16:12:11.000000000 +0100 1269 +++ cdr/cdr_radius.c 2011-05-23 17:35:28.378531576 +0200
1289 @@ -105,10 +105,18 @@ 1270 @@ -105,10 +105,18 @@
1290 if (!rc_avpair_add(rh, tosend, PW_AST_SRC, &cdr->src, strlen(cdr->src), VENDOR_CODE)) 1271 if (!rc_avpair_add(rh, tosend, PW_AST_SRC, &cdr->src, strlen(cdr->src), VENDOR_CODE))
1291 return -1; 1272 return -1;
1292 1273
1293 + /* RADIUS standard identifier patch */ 1274 + /* RADIUS standard identifier patch */

Mercurial Repository: OpenPKG Specs

Europalab SCM Repository Server

mercurial