OpenPKG Specs / file comparison

comparison: asterisk/asterisk.patch

asterisk/asterisk.patch

changeset 412
577aba7f4106
parent 404
b6420eee9bde
child 414
fd611cde817f
equal deleted inserted replaced
8:fcf5f27b7aea 9:26c7488cbd4f
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 2011-08-09 18:13:09.000000000 +0200 3 --- addons/chan_ooh323.c.orig 2012-01-26 21:14:50.000000000 +0100
4 +++ addons/chan_ooh323.c 2011-09-14 14:29:50.740457577 +0200 4 +++ addons/chan_ooh323.c 2012-03-18 17:47:07.875949857 +0100
5 @@ -24,6 +24,12 @@ 5 @@ -24,6 +24,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 2011-08-04 21:37:16.000000000 +0200 20 --- addons/ooh323c/src/ooCmdChannel.c.orig 2011-08-04 21:37:16.000000000 +0200
21 +++ addons/ooh323c/src/ooCmdChannel.c 2011-09-14 14:29:50.740457577 +0200 21 +++ addons/ooh323c/src/ooCmdChannel.c 2012-03-18 17:47:07.875949857 +0100
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
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 2011-05-04 22:50:18.000000000 +0200 35 --- addons/ooh323c/src/ooSocket.c.orig 2011-05-04 22:50:18.000000000 +0200
36 +++ addons/ooh323c/src/ooSocket.c 2011-09-14 14:29:50.740457577 +0200 36 +++ addons/ooh323c/src/ooSocket.c 2012-03-18 17:47:07.875949857 +0100
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
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 2011-02-18 01:07:20.000000000 +0100 49 --- addons/ooh323cDriver.c.orig 2011-02-18 01:07:20.000000000 +0100
50 +++ addons/ooh323cDriver.c 2011-09-14 14:29:50.740457577 +0200 50 +++ addons/ooh323cDriver.c 2012-03-18 17:47:07.875949857 +0100
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-09-14 14:29:50.740457577 +0200 66 +++ apps/app_backticks.c 2012-03-18 17:47:07.875949857 +0100
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-07-19 17:43:32.000000000 +0200 199 --- apps/app_meetme.c.orig 2012-01-09 16:37:12.000000000 +0100
200 +++ apps/app_meetme.c 2011-09-14 14:29:50.747960016 +0200 200 +++ apps/app_meetme.c 2012-03-18 17:47:07.875949857 +0100
201 @@ -607,6 +607,7 @@ 201 @@ -614,6 +614,7 @@
202 202
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 #define CONFFLAG_NO_AUDIO_UNTIL_UP (1ULL << 31) 204 #define CONFFLAG_NO_AUDIO_UNTIL_UP (1ULL << 31)
205 +#define CONFFLAG_USERNAME (1 << 32) 205 +#define CONFFLAG_USERNAME (1 << 32)
206 /*! If set play an intro announcement at start of conference */ 206 /*! If set play an intro announcement at start of conference */
207 #define CONFFLAG_INTROMSG (1ULL << 32) 207 #define CONFFLAG_INTROMSG (1ULL << 32)
208 208
209 @@ -618,6 +619,7 @@ 209 @@ -625,6 +626,7 @@
210 OPT_ARG_MOH_CLASS = 4, 210 OPT_ARG_MOH_CLASS = 4,
211 OPT_ARG_INTROMSG = 5, 211 OPT_ARG_INTROMSG = 5,
212 OPT_ARG_ARRAY_SIZE = 6, 212 OPT_ARG_ARRAY_SIZE = 6,
213 + OPT_ARG_USERNAME = 7, 213 + OPT_ARG_USERNAME = 7,
214 }; 214 };
215 215
216 AST_APP_OPTIONS(meetme_opts, BEGIN_OPTIONS 216 AST_APP_OPTIONS(meetme_opts, BEGIN_OPTIONS
217 @@ -651,6 +653,7 @@ 217 @@ -658,6 +660,7 @@
218 AST_APP_OPTION('1', CONFFLAG_NOONLYPERSON ), 218 AST_APP_OPTION('1', CONFFLAG_NOONLYPERSON ),
219 AST_APP_OPTION_ARG('S', CONFFLAG_DURATION_STOP, OPT_ARG_DURATION_STOP), 219 AST_APP_OPTION_ARG('S', CONFFLAG_DURATION_STOP, OPT_ARG_DURATION_STOP),
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 @@ -2446,6 +2449,12 @@ 225 @@ -2453,6 +2456,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 @@ -2462,6 +2471,7 @@ 238 @@ -2469,6 +2478,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-07-26 16:04:55.000000000 +0200 248 --- apps/app_voicemail.c.orig 2012-01-25 23:21:30.000000000 +0100
249 +++ apps/app_voicemail.c 2011-09-14 14:29:50.747960016 +0200 249 +++ apps/app_voicemail.c 2012-03-18 17:47:07.888451260 +0100
250 @@ -373,6 +373,7 @@ 250 @@ -376,6 +376,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;
255 static char imapparentfolder[64] = "\0"; 255 static char imapparentfolder[64] = "\0";
256 static char greetingfolder[64]; 256 static char greetingfolder[64];
257 static char authuser[32]; 257 static char authuser[32];
258 @@ -2517,7 +2518,7 @@ 258 @@ -2524,7 +2525,7 @@
259 } 259 }
260 260
261 /* Build up server information */ 261 /* Build up server information */
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 @@ -6176,6 +6177,7 @@ 267 @@ -6186,6 +6187,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 @@ -6191,10 +6193,24 @@ 275 @@ -6201,10 +6203,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 @@ -10469,6 +10485,10 @@ 302 @@ -10478,6 +10494,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 @@ -11965,6 +11985,15 @@ 313 @@ -11996,6 +12016,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"))) {
327 ast_copy_string(imapparentfolder, val, sizeof(imapparentfolder)); 327 ast_copy_string(imapparentfolder, val, sizeof(imapparentfolder));
328 } 328 }
329 Index: cdr/cdr_radius.c 329 Index: cdr/cdr_radius.c
330 diff -Nau cdr/cdr_radius.c.orig cdr/cdr_radius.c 330 diff -Nau cdr/cdr_radius.c.orig cdr/cdr_radius.c
331 --- cdr/cdr_radius.c.orig 2011-07-14 22:13:06.000000000 +0200 331 --- cdr/cdr_radius.c.orig 2011-07-14 22:13:06.000000000 +0200
332 +++ cdr/cdr_radius.c 2011-09-14 14:29:50.777958246 +0200 332 +++ cdr/cdr_radius.c 2012-03-18 17:47:07.888451260 +0100
333 @@ -106,10 +106,18 @@ 333 @@ -106,10 +106,18 @@
334 if (!rc_avpair_add(rh, tosend, PW_AST_SRC, &cdr->src, strlen(cdr->src), VENDOR_CODE)) 334 if (!rc_avpair_add(rh, tosend, PW_AST_SRC, &cdr->src, strlen(cdr->src), VENDOR_CODE))
335 return -1; 335 return -1;
336 336
337 + /* RADIUS standard identifier patch */ 337 + /* RADIUS standard identifier patch */
379 379
380 /* Unique ID */ 380 /* Unique ID */
381 if (!rc_avpair_add(rh, tosend, PW_ACCT_SESSION_ID, &cdr->uniqueid, strlen(cdr->uniqueid), 0)) 381 if (!rc_avpair_add(rh, tosend, PW_ACCT_SESSION_ID, &cdr->uniqueid, strlen(cdr->uniqueid), 0))
382 Index: chan_capi-1.1.5.20110914/chan_capi20.h 382 Index: chan_capi-1.1.5.20110914/chan_capi20.h
383 diff -Nau chan_capi-1.1.5.20110914/chan_capi20.h.orig chan_capi-1.1.5.20110914/chan_capi20.h 383 diff -Nau chan_capi-1.1.5.20110914/chan_capi20.h.orig chan_capi-1.1.5.20110914/chan_capi20.h
384 --- chan_capi-1.1.5.20110914/chan_capi20.h.orig 2011-01-07 02:29:32.000000000 +0100 384 --- chan_capi-1.1.5.20110914/chan_capi20.h.orig 2005-09-20 20:33:40.000000000 +0200
385 +++ chan_capi-1.1.5.20110914/chan_capi20.h 2011-05-23 17:35:28.348531751 +0200 385 +++ chan_capi-1.1.5.20110914/chan_capi20.h 2012-03-18 17:47:07.888451260 +0100
386 @@ -4,10 +4,13 @@ 386 @@ -4,10 +4,13 @@
387 * first. Else the checks below will fail. 387 * first. Else the checks below will fail.
388 */ 388 */
389 389
390 +#include <stddef.h> 390 +#include <stddef.h>
406 #ifndef HEADER_CID 406 #ifndef HEADER_CID
407 #define HEADER_CID(x) ((x)->adr.adrNCCI) 407 #define HEADER_CID(x) ((x)->adr.adrNCCI)
408 #endif 408 #endif
409 Index: chan_capi-1.1.5.20110914/chan_capi_utils.c 409 Index: chan_capi-1.1.5.20110914/chan_capi_utils.c
410 diff -Nau chan_capi-1.1.5.20110914/chan_capi_utils.c.orig chan_capi-1.1.5.20110914/chan_capi_utils.c 410 diff -Nau chan_capi-1.1.5.20110914/chan_capi_utils.c.orig chan_capi-1.1.5.20110914/chan_capi_utils.c
411 --- chan_capi-1.1.5.20110914/chan_capi_utils.c.orig 2011-01-07 02:29:32.000000000 +0100 411 --- chan_capi-1.1.5.20110914/chan_capi_utils.c.orig 2011-08-07 16:31:05.000000000 +0200
412 +++ chan_capi-1.1.5.20110914/chan_capi_utils.c 2011-05-23 17:35:28.348531751 +0200 412 +++ chan_capi-1.1.5.20110914/chan_capi_utils.c 2012-03-18 17:47:07.888451260 +0100
413 @@ -1158,6 +1158,9 @@ 413 @@ -1158,6 +1158,9 @@
414 { 414 {
415 MESSAGE_EXCHANGE_ERROR error; 415 MESSAGE_EXCHANGE_ERROR error;
416 int waitcount = 50; 416 int waitcount = 50;
417 +#ifndef CAPI_MANUFACTURER_LEN 417 +#ifndef CAPI_MANUFACTURER_LEN
420 unsigned char manbuf[CAPI_MANUFACTURER_LEN]; 420 unsigned char manbuf[CAPI_MANUFACTURER_LEN];
421 _cmsg CMSG; 421 _cmsg CMSG;
422 422
423 Index: chan_capi-1.1.5.20110914/libcapi20/capi20.c 423 Index: chan_capi-1.1.5.20110914/libcapi20/capi20.c
424 diff -Nau chan_capi-1.1.5.20110914/libcapi20/capi20.c.orig chan_capi-1.1.5.20110914/libcapi20/capi20.c 424 diff -Nau chan_capi-1.1.5.20110914/libcapi20/capi20.c.orig chan_capi-1.1.5.20110914/libcapi20/capi20.c
425 --- chan_capi-1.1.5.20110914/libcapi20/capi20.c.orig 2011-01-07 02:29:31.000000000 +0100 425 --- chan_capi-1.1.5.20110914/libcapi20/capi20.c.orig 2010-02-17 20:10:53.000000000 +0100
426 +++ chan_capi-1.1.5.20110914/libcapi20/capi20.c 2011-05-23 17:35:28.348531751 +0200 426 +++ chan_capi-1.1.5.20110914/libcapi20/capi20.c 2012-03-18 17:47:07.888451260 +0100
427 @@ -19,8 +19,10 @@ 427 @@ -19,8 +19,10 @@
428 #include <stdio.h> 428 #include <stdio.h>
429 #include <ctype.h> 429 #include <ctype.h>
430 #include <assert.h> 430 #include <assert.h>
431 +#ifdef __linux__ 431 +#ifdef __linux__
717 } 717 }
718 /* 718 /*
719 * functions added to the CAPI2.0 spec 719 * functions added to the CAPI2.0 spec
720 Index: chan_capi-1.1.5.20110914/libcapi20/convert.c 720 Index: chan_capi-1.1.5.20110914/libcapi20/convert.c
721 diff -Nau chan_capi-1.1.5.20110914/libcapi20/convert.c.orig chan_capi-1.1.5.20110914/libcapi20/convert.c 721 diff -Nau chan_capi-1.1.5.20110914/libcapi20/convert.c.orig chan_capi-1.1.5.20110914/libcapi20/convert.c
722 --- chan_capi-1.1.5.20110914/libcapi20/convert.c.orig 2011-01-07 02:29:31.000000000 +0100 722 --- chan_capi-1.1.5.20110914/libcapi20/convert.c.orig 2010-09-14 21:54:25.000000000 +0200
723 +++ chan_capi-1.1.5.20110914/libcapi20/convert.c 2011-05-23 17:35:28.348531751 +0200 723 +++ chan_capi-1.1.5.20110914/libcapi20/convert.c 2012-03-18 17:47:07.888451260 +0100
724 @@ -11,7 +11,14 @@ 724 @@ -11,7 +11,14 @@
725 #include <stddef.h> 725 #include <stddef.h>
726 #include <time.h> 726 #include <time.h>
727 #include <ctype.h> 727 #include <ctype.h>
728 +#ifdef __FreeBSD__ 728 +#ifdef __FreeBSD__
736 736
737 #include "capi20.h" 737 #include "capi20.h"
738 738
739 Index: chan_capi-1.1.5.20110914/Makefile 739 Index: chan_capi-1.1.5.20110914/Makefile
740 diff -Nau chan_capi-1.1.5.20110914/Makefile.orig chan_capi-1.1.5.20110914/Makefile 740 diff -Nau chan_capi-1.1.5.20110914/Makefile.orig chan_capi-1.1.5.20110914/Makefile
741 --- chan_capi-1.1.5.20110914/Makefile.orig 2011-01-07 02:29:32.000000000 +0100 741 --- chan_capi-1.1.5.20110914/Makefile.orig 2011-02-04 18:41:46.000000000 +0100
742 +++ chan_capi-1.1.5.20110914/Makefile 2011-05-23 17:35:28.348531751 +0200 742 +++ chan_capi-1.1.5.20110914/Makefile 2012-03-18 17:47:07.888451260 +0100
743 @@ -114,6 +114,9 @@ 743 @@ -114,6 +114,9 @@
744 CFLAGS+=-O2 744 CFLAGS+=-O2
745 CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) 745 CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
746 CFLAGS+=$(shell if uname -m | grep -q "ppc\|arm\|s390"; then echo "-fsigned-char"; fi) 746 CFLAGS+=$(shell if uname -m | grep -q "ppc\|arm\|s390"; then echo "-fsigned-char"; fi)
747 +ifeq (${USE_OWN_LIBCAPI},yes) 747 +ifeq (${USE_OWN_LIBCAPI},yes)
750 ifeq (${DIVA_STREAMING},1) 750 ifeq (${DIVA_STREAMING},1)
751 CFLAGS += -DDIVA_STREAMING=1 751 CFLAGS += -DDIVA_STREAMING=1
752 endif 752 endif
753 Index: channels/chan_sip.c 753 Index: channels/chan_sip.c
754 diff -Nau channels/chan_sip.c.orig channels/chan_sip.c 754 diff -Nau channels/chan_sip.c.orig channels/chan_sip.c
755 --- channels/chan_sip.c.orig 2011-08-10 00:12:59.000000000 +0200 755 --- channels/chan_sip.c.orig 2012-02-28 18:53:34.000000000 +0100
756 +++ channels/chan_sip.c 2011-09-14 14:29:50.757959000 +0200 756 +++ channels/chan_sip.c 2012-03-18 17:47:07.898462166 +0100
757 @@ -11676,7 +11676,16 @@ 757 @@ -12034,7 +12034,16 @@
758 } else { 758 } else {
759 if (sipmethod == SIP_NOTIFY && !ast_strlen_zero(p->theirtag)) { 759 if (sipmethod == SIP_NOTIFY && !ast_strlen_zero(p->theirtag)) {
760 /* If this is a NOTIFY, use the From: tag in the subscribe (RFC 3265) */ 760 /* If this is a NOTIFY, use the From: tag in the subscribe (RFC 3265) */
761 - snprintf(to, sizeof(to), "<%s%s>;tag=%s", (strncasecmp(p->uri, "sip:", 4) ? "sip:" : ""), p->uri, p->theirtag); 761 - snprintf(to, sizeof(to), "<%s%s>;tag=%s", (strncasecmp(p->uri, "sip:", 4) ? "sip:" : ""), p->uri, p->theirtag);
762 + if (strncasecmp(p->uri, "sip:", strlen("sip:"))) 762 + if (strncasecmp(p->uri, "sip:", strlen("sip:")))
773 /* If there is a VXML URL append it to the SIP URL */ 773 /* If there is a VXML URL append it to the SIP URL */
774 snprintf(to, sizeof(to), "<%s>;%s", p->uri, p->options->vxml_url); 774 snprintf(to, sizeof(to), "<%s>;%s", p->uri, p->options->vxml_url);
775 Index: channels/console_video.h 775 Index: channels/console_video.h
776 diff -Nau channels/console_video.h.orig channels/console_video.h 776 diff -Nau channels/console_video.h.orig channels/console_video.h
777 --- channels/console_video.h.orig 2008-06-30 17:45:15.000000000 +0200 777 --- channels/console_video.h.orig 2008-06-30 17:45:15.000000000 +0200
778 +++ channels/console_video.h 2011-09-14 14:29:50.767970949 +0200 778 +++ channels/console_video.h 2012-03-18 17:47:07.898462166 +0100
779 @@ -28,10 +28,7 @@ 779 @@ -28,10 +28,7 @@
780 "console {device}" 780 "console {device}"
781 #else 781 #else
782 782
783 -#include <ffmpeg/avcodec.h> 783 -#include <ffmpeg/avcodec.h>
788 788
789 #define CONSOLE_VIDEO_CMDS \ 789 #define CONSOLE_VIDEO_CMDS \
790 "console {videodevice|videocodec" \ 790 "console {videodevice|videocodec" \
791 Index: configure 791 Index: configure
792 diff -Nau configure.orig configure 792 diff -Nau configure.orig configure
793 --- configure.orig 2011-08-25 21:08:04.000000000 +0200 793 --- configure.orig 2012-01-14 17:40:17.000000000 +0100
794 +++ configure 2011-09-14 14:29:50.767970949 +0200 794 +++ configure 2012-03-18 17:47:32.518450837 +0100
795 @@ -4447,11 +4447,6 @@ 795 @@ -4716,11 +4716,6 @@
796 esac 796 esac
797 797
798 case "${host_os}" in 798 case "${host_os}" in
799 - freebsd*) 799 - freebsd*)
800 - ac_default_prefix=/usr/local 800 - ac_default_prefix=/usr/local
802 - LDFLAGS=-L/usr/local/lib 802 - LDFLAGS=-L/usr/local/lib
803 - ;; 803 - ;;
804 openbsd*) 804 openbsd*)
805 ac_default_prefix=/usr/local 805 ac_default_prefix=/usr/local
806 if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then 806 if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then
807 @@ -31424,8 +31419,8 @@ 807 @@ -18904,8 +18899,8 @@
808 if test -f "${IMAP_TK_DIR}/c-client/LDFLAGS"; then 808 if test -f "${IMAP_TK_DIR}/c-client/LDFLAGS"; then
809 imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS` 809 imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
810 fi 810 fi
811 - imap_libs="${IMAP_TK_DIR}/c-client/c-client.a" 811 - imap_libs="${IMAP_TK_DIR}/c-client/c-client.a"
812 - imap_include="-I${IMAP_TK_DIR}/c-client" 812 - imap_include="-I${IMAP_TK_DIR}/c-client"
813 + imap_libs="-limap -lssl -lcrypto -lcrypt" 813 + imap_libs="-limap -lssl -lcrypto -lcrypt"
814 + imap_include="-DUSE_SYSTEM_IMAP -I${IMAP_TK_DIR}/include/imap" 814 + imap_include="-DUSE_SYSTEM_IMAP -I${IMAP_TK_DIR}/include/imap"
815 CPPFLAGS="${CPPFLAGS} ${imap_include}" 815 CPPFLAGS="${CPPFLAGS} ${imap_include}"
816 LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}` 816 LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}`
817 cat >conftest.$ac_ext <<_ACEOF 817 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
818 @@ -49375,7 +49370,7 @@ 818 @@ -26681,7 +26676,7 @@
819 pbxlibdir="-L${SQLITE_DIR}" 819 pbxlibdir="-L${SQLITE_DIR}"
820 fi 820 fi
821 fi 821 fi
822 - pbxfuncname="sqlite_exec" 822 - pbxfuncname="sqlite_exec"
823 + pbxfuncname="sqlite3_exec" 823 + pbxfuncname="sqlite3_exec"
824 if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers 824 if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
825 AST_SQLITE_FOUND=yes 825 AST_SQLITE_FOUND=yes
826 else 826 else
827 @@ -51127,16 +51122,16 @@
828 if test "x${PBX_GMIME}" != "x1" -a "${USE_GMIME}" != "no"; then
829 PBX_GMIME=0
830 if test -n "$ac_tool_prefix"; then
831 - # Extract the first word of "${ac_tool_prefix}gmime-config", so it can be a program name with args.
832 -set dummy ${ac_tool_prefix}gmime-config; ac_word=$2
833 + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
834 +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
835 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
836 $as_echo_n "checking for $ac_word... " >&6; }
837 -if test "${ac_cv_path_CONFIG_GMIME+set}" = set; then
838 +if test "${ac_cv_path_PKGCONFIG+set}" = set; then
839 $as_echo_n "(cached) " >&6
840 else
841 - case $CONFIG_GMIME in
842 + case $PKGCONFIG in
843 [\\/]* | ?:[\\/]*)
844 - ac_cv_path_CONFIG_GMIME="$CONFIG_GMIME" # Let the user override the test with a path.
845 + ac_cv_path_PKGCONFIG="$PKGCONFIG" # Let the user override the test with a path.
846 ;;
847 *)
848 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
849 @@ -51147,7 +51142,7 @@
850 test -z "$as_dir" && as_dir=.
851 for ac_exec_ext in '' $ac_executable_extensions; do
852 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
853 - ac_cv_path_CONFIG_GMIME="$as_dir/$ac_word$ac_exec_ext"
854 + ac_cv_path_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext"
855 $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
856 break 2
857 fi
858 @@ -51158,10 +51153,10 @@
859 ;;
860 esac
861 fi
862 -CONFIG_GMIME=$ac_cv_path_CONFIG_GMIME
863 -if test -n "$CONFIG_GMIME"; then
864 - { $as_echo "$as_me:$LINENO: result: $CONFIG_GMIME" >&5
865 -$as_echo "$CONFIG_GMIME" >&6; }
866 +PKGCONFIG=$ac_cv_path_PKGCONFIG
867 +if test -n "$PKGCONFIG"; then
868 + { $as_echo "$as_me:$LINENO: result: $PKGCONFIG" >&5
869 +$as_echo "$PKGCONFIG" >&6; }
870 else
871 { $as_echo "$as_me:$LINENO: result: no" >&5
872 $as_echo "no" >&6; }
873 @@ -51169,18 +51164,18 @@
874
875
876 fi
877 -if test -z "$ac_cv_path_CONFIG_GMIME"; then
878 - ac_pt_CONFIG_GMIME=$CONFIG_GMIME
879 +if test -z "$ac_cv_path_PKGCONFIG"; then
880 + ac_pt_PKGCONFIG=$PKGCONFIG
881 # Extract the first word of "gmime-config", so it can be a program name with args.
882 -set dummy gmime-config; ac_word=$2
883 +set dummy pkg-config; ac_word=$2
884 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
885 $as_echo_n "checking for $ac_word... " >&6; }
886 -if test "${ac_cv_path_ac_pt_CONFIG_GMIME+set}" = set; then
887 +if test "${ac_cv_path_ac_pt_PKGCONFIG+set}" = set; then
888 $as_echo_n "(cached) " >&6
889 else
890 - case $ac_pt_CONFIG_GMIME in
891 + case $ac_pt_PKGCONFIG in
892 [\\/]* | ?:[\\/]*)
893 - ac_cv_path_ac_pt_CONFIG_GMIME="$ac_pt_CONFIG_GMIME" # Let the user override the test with a path.
894 + ac_cv_path_ac_pt_PKGCONFIG="$ac_pt_PKGCONFIG" # Let the user override the test with a path.
895 ;;
896 *)
897 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
898 @@ -51191,7 +51186,7 @@
899 test -z "$as_dir" && as_dir=.
900 for ac_exec_ext in '' $ac_executable_extensions; do
901 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
902 - ac_cv_path_ac_pt_CONFIG_GMIME="$as_dir/$ac_word$ac_exec_ext"
903 + ac_cv_path_ac_pt_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext"
904 $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
905 break 2
906 fi
907 @@ -51202,17 +51197,17 @@
908 ;;
909 esac
910 fi
911 -ac_pt_CONFIG_GMIME=$ac_cv_path_ac_pt_CONFIG_GMIME
912 -if test -n "$ac_pt_CONFIG_GMIME"; then
913 - { $as_echo "$as_me:$LINENO: result: $ac_pt_CONFIG_GMIME" >&5
914 -$as_echo "$ac_pt_CONFIG_GMIME" >&6; }
915 +ac_pt_PKGCONFIG=$ac_cv_path_ac_pt_PKGCONFIG
916 +if test -n "$ac_pt_PKGCONFIG"; then
917 + { $as_echo "$as_me:$LINENO: result: $ac_pt_PKGCONFIG" >&5
918 +$as_echo "$ac_pt_PKGCONFIG" >&6; }
919 else
920 { $as_echo "$as_me:$LINENO: result: no" >&5
921 $as_echo "no" >&6; }
922 fi
923
924 - if test "x$ac_pt_CONFIG_GMIME" = x; then
925 - CONFIG_GMIME="No"
926 + if test "x$ac_pt_PKGCONFIG" = x; then
927 + PKGCONFIG="No"
928 else
929 case $cross_compiling:$ac_tool_warned in
930 yes:)
931 @@ -51220,22 +51215,17 @@
932 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
933 ac_tool_warned=yes ;;
934 esac
935 - CONFIG_GMIME=$ac_pt_CONFIG_GMIME
936 + PKGCONFIG=$ac_pt_PKGCONFIG
937 fi
938 else
939 - CONFIG_GMIME="$ac_cv_path_CONFIG_GMIME"
940 + PKGCONFIG="$ac_cv_path_PKGCONFIG"
941 fi
942
943 - if test ! "x${CONFIG_GMIME}" = xNo; then
944 - if test x"" = x ; then A=--cflags ; else A="" ; fi
945 - GMIME_INCLUDE=$(${CONFIG_GMIME} $A)
946 - if test x"" = x ; then A=--libs ; else A="" ; fi
947 - GMIME_LIB=$(${CONFIG_GMIME} $A)
948 + if test ! "x${PKGCONFIG}" = xNo; then
949 + GMIME_INCLUDE=$(${PKGCONFIG} gmime-2.4 --cflags 2>/dev/null)
950 + GMIME_LIB=$(${PKGCONFIG} gmime-2.4 --libs)
951 if test x"#include <gmime/gmime.h>" != x ; then
952 saved_cppflags="${CPPFLAGS}"
953 - if test "x${GMIME_DIR}" != "x"; then
954 - GMIME_INCLUDE="-I${GMIME_DIR}/include"
955 - fi
956 CPPFLAGS="${CPPFLAGS} ${GMIME_INCLUDE}"
957
958 saved_libs="${LIBS}"
959 Index: formats/format_pcm.c 827 Index: formats/format_pcm.c
960 diff -Nau formats/format_pcm.c.orig formats/format_pcm.c 828 diff -Nau formats/format_pcm.c.orig formats/format_pcm.c
961 --- formats/format_pcm.c.orig 2011-07-14 22:13:06.000000000 +0200 829 --- formats/format_pcm.c.orig 2011-07-14 22:13:06.000000000 +0200
962 +++ formats/format_pcm.c 2011-09-14 14:29:50.767970949 +0200 830 +++ formats/format_pcm.c 2012-03-18 17:47:07.898462166 +0100
963 @@ -354,6 +354,7 @@ 831 @@ -354,6 +354,7 @@
964 ast_log(LOG_WARNING, "Unable to write header\n"); 832 ast_log(LOG_WARNING, "Unable to write header\n");
965 return -1; 833 return -1;
966 } 834 }
967 + fflush(f); /* issues.asterisk.org bug 0016610 */ 835 + fflush(f); /* issues.asterisk.org bug 0016610 */
968 return 0; 836 return 0;
969 } 837 }
970 838
971 Index: formats/format_wav.c 839 Index: formats/format_wav.c
972 diff -Nau formats/format_wav.c.orig formats/format_wav.c 840 diff -Nau formats/format_wav.c.orig formats/format_wav.c
973 --- formats/format_wav.c.orig 2011-07-29 19:18:56.000000000 +0200 841 --- formats/format_wav.c.orig 2011-11-09 16:25:33.000000000 +0100
974 +++ formats/format_wav.c 2011-09-14 14:29:50.767970949 +0200 842 +++ formats/format_wav.c 2012-03-18 17:47:07.898462166 +0100
975 @@ -308,6 +308,7 @@ 843 @@ -308,6 +308,7 @@
976 ast_log(LOG_WARNING, "Unable to write header\n"); 844 ast_log(LOG_WARNING, "Unable to write header\n");
977 return -1; 845 return -1;
978 } 846 }
979 + fflush(f); /* issues.asterisk.org bug 0016610 */ 847 + fflush(f); /* issues.asterisk.org bug 0016610 */
981 } 849 }
982 850
983 Index: formats/format_wav_gsm.c 851 Index: formats/format_wav_gsm.c
984 diff -Nau formats/format_wav_gsm.c.orig formats/format_wav_gsm.c 852 diff -Nau formats/format_wav_gsm.c.orig formats/format_wav_gsm.c
985 --- formats/format_wav_gsm.c.orig 2011-07-14 22:13:06.000000000 +0200 853 --- formats/format_wav_gsm.c.orig 2011-07-14 22:13:06.000000000 +0200
986 +++ formats/format_wav_gsm.c 2011-09-14 14:29:50.767970949 +0200 854 +++ formats/format_wav_gsm.c 2012-03-18 17:47:07.898462166 +0100
987 @@ -366,6 +366,7 @@ 855 @@ -366,6 +366,7 @@
988 ast_log(LOG_WARNING, "Unable to write header\n"); 856 ast_log(LOG_WARNING, "Unable to write header\n");
989 return -1; 857 return -1;
990 } 858 }
991 + fflush(f); /* issues.asterisk.org bug 0016610 */ 859 + fflush(f); /* issues.asterisk.org bug 0016610 */
993 } 861 }
994 862
995 Index: main/db1-ast/hash/hash.h 863 Index: main/db1-ast/hash/hash.h
996 diff -Nau main/db1-ast/hash/hash.h.orig main/db1-ast/hash/hash.h 864 diff -Nau main/db1-ast/hash/hash.h.orig main/db1-ast/hash/hash.h
997 --- main/db1-ast/hash/hash.h.orig 2006-08-21 04:11:39.000000000 +0200 865 --- main/db1-ast/hash/hash.h.orig 2006-08-21 04:11:39.000000000 +0200
998 +++ main/db1-ast/hash/hash.h 2011-09-14 14:29:50.767970949 +0200 866 +++ main/db1-ast/hash/hash.h 2012-03-18 17:47:07.898462166 +0100
999 @@ -36,6 +36,8 @@ 867 @@ -36,6 +36,8 @@
1000 * @(#)hash.h 8.3 (Berkeley) 5/31/94 868 * @(#)hash.h 8.3 (Berkeley) 5/31/94
1001 */ 869 */
1002 870
1003 +#include <stdint.h> 871 +#include <stdint.h>
1006 typedef enum { 874 typedef enum {
1007 HASH_GET, HASH_PUT, HASH_PUTNEW, HASH_DELETE, HASH_FIRST, HASH_NEXT 875 HASH_GET, HASH_PUT, HASH_PUTNEW, HASH_DELETE, HASH_FIRST, HASH_NEXT
1008 Index: main/db1-ast/hash/ndbm.c 876 Index: main/db1-ast/hash/ndbm.c
1009 diff -Nau main/db1-ast/hash/ndbm.c.orig main/db1-ast/hash/ndbm.c 877 diff -Nau main/db1-ast/hash/ndbm.c.orig main/db1-ast/hash/ndbm.c
1010 --- main/db1-ast/hash/ndbm.c.orig 2006-08-21 04:11:39.000000000 +0200 878 --- main/db1-ast/hash/ndbm.c.orig 2006-08-21 04:11:39.000000000 +0200
1011 +++ main/db1-ast/hash/ndbm.c 2011-09-14 14:29:50.767970949 +0200 879 +++ main/db1-ast/hash/ndbm.c 2012-03-18 17:47:07.898462166 +0100
1012 @@ -49,7 +49,8 @@ 880 @@ -49,7 +49,8 @@
1013 #include <string.h> 881 #include <string.h>
1014 #include <stdlib.h> 882 #include <stdlib.h>
1015 883
1016 -#include <ndbm.h> 884 -#include <ndbm.h>
1019 #include "hash.h" 887 #include "hash.h"
1020 888
1021 /* 889 /*
1022 Index: main/features.c 890 Index: main/features.c
1023 diff -Nau main/features.c.orig main/features.c 891 diff -Nau main/features.c.orig main/features.c
1024 --- main/features.c.orig 2011-08-10 00:12:59.000000000 +0200 892 --- main/features.c.orig 2012-01-23 21:30:21.000000000 +0100
1025 +++ main/features.c 2011-09-14 14:29:50.777958246 +0200 893 +++ main/features.c 2012-03-18 17:47:07.898462166 +0100
1026 @@ -1928,6 +1928,10 @@ 894 @@ -2067,6 +2067,10 @@
1027 snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename); 895 snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename);
1028 } 896 }
1029 897
1030 + for(x = 0; x < strlen(touch_filename); x++) { 898 + for(x = 0; x < strlen(touch_filename); x++) {
1031 + if (args[x] == '/') 899 + if (args[x] == '/')
1032 + args[x] = '-'; 900 + args[x] = '-';
1033 + } 901 + }
1034 for(x = 0; x < strlen(args); x++) { 902 for(x = 0; x < strlen(args); x++) {
1035 if (args[x] == '/') 903 if (args[x] == '/')
1036 args[x] = '-'; 904 args[x] = '-';
1037 @@ -2044,6 +2048,10 @@ 905 @@ -2183,6 +2187,10 @@
1038 snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav")); 906 snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav"));
1039 } 907 }
1040 908
1041 + for( x = 0; x < strlen(touch_filename); x++) { 909 + for( x = 0; x < strlen(touch_filename); x++) {
1042 + if (args[x] == '/') 910 + if (args[x] == '/')
1045 for( x = 0; x < strlen(args); x++) { 913 for( x = 0; x < strlen(args); x++) {
1046 if (args[x] == '/') 914 if (args[x] == '/')
1047 args[x] = '-'; 915 args[x] = '-';
1048 Index: main/file.c 916 Index: main/file.c
1049 diff -Nau main/file.c.orig main/file.c 917 diff -Nau main/file.c.orig main/file.c
1050 --- main/file.c.orig 2011-07-05 15:23:57.000000000 +0200 918 --- main/file.c.orig 2012-01-05 23:06:46.000000000 +0100
1051 +++ main/file.c 2011-09-14 14:29:50.777958246 +0200 919 +++ main/file.c 2012-03-18 17:47:07.898462166 +0100
1052 @@ -256,7 +256,7 @@ 920 @@ -256,7 +256,7 @@
1053 char *fn = NULL; 921 char *fn = NULL;
1054 922
1055 if (!strcmp(ext, "wav49")) 923 if (!strcmp(ext, "wav49"))
1056 - ext = "WAV"; 924 - ext = "WAV";
1058 926
1059 if (filename[0] == '/') { 927 if (filename[0] == '/') {
1060 if (asprintf(&fn, "%s.%s", filename, ext) < 0) { 928 if (asprintf(&fn, "%s.%s", filename, ext) < 0) {
1061 Index: main/Makefile 929 Index: main/Makefile
1062 diff -Nau main/Makefile.orig main/Makefile 930 diff -Nau main/Makefile.orig main/Makefile
1063 --- main/Makefile.orig 2011-08-03 17:14:36.000000000 +0200 931 --- main/Makefile.orig 2011-09-19 22:27:03.000000000 +0200
1064 +++ main/Makefile 2011-09-14 14:29:50.777958246 +0200 932 +++ main/Makefile 2012-03-18 17:47:07.898462166 +0100
1065 @@ -69,10 +69,7 @@ 933 @@ -69,10 +69,7 @@
1066 endif 934 endif
1067 935
1068 ifeq ($(OSARCH),FreeBSD) 936 ifeq ($(OSARCH),FreeBSD)
1069 - # -V is understood by BSD Make, not by GNU make. 937 - # -V is understood by BSD Make, not by GNU make.
1074 endif 942 endif
1075 943
1076 ifneq ($(findstring $(OSARCH), mingw32 cygwin ),) 944 ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
1077 Index: main/tcptls.c 945 Index: main/tcptls.c
1078 diff -Nau main/tcptls.c.orig main/tcptls.c 946 diff -Nau main/tcptls.c.orig main/tcptls.c
1079 --- main/tcptls.c.orig 2011-05-23 18:18:33.000000000 +0200 947 --- main/tcptls.c.orig 2011-11-30 22:41:31.000000000 +0100
1080 +++ main/tcptls.c 2011-09-14 14:29:50.777958246 +0200 948 +++ main/tcptls.c 2012-03-18 17:47:07.898462166 +0100
1081 @@ -357,6 +357,7 @@ 949 @@ -372,6 +372,7 @@
1082 if (!ast_strlen_zero(cfg->cafile) || !ast_strlen_zero(cfg->capath)) { 950 if (!ast_strlen_zero(cfg->cafile) || !ast_strlen_zero(cfg->capath)) {
1083 if (SSL_CTX_load_verify_locations(cfg->ssl_ctx, S_OR(cfg->cafile, NULL), S_OR(cfg->capath,NULL)) == 0) 951 if (SSL_CTX_load_verify_locations(cfg->ssl_ctx, S_OR(cfg->cafile, NULL), S_OR(cfg->capath,NULL)) == 0)
1084 ast_verb(0, "SSL CA file(%s)/path(%s) error\n", cfg->cafile, cfg->capath); 952 ast_verb(0, "SSL CA file(%s)/path(%s) error\n", cfg->cafile, cfg->capath);
1085 + SSL_CTX_set_client_CA_list(cfg->ssl_ctx, S_OR(cfg->cafile, NULL)); 953 + SSL_CTX_set_client_CA_list(cfg->ssl_ctx, S_OR(cfg->cafile, NULL));
1086 } 954 }
1087 955
1088 ast_verb(0, "SSL certificate ok\n"); 956 ast_verb(0, "SSL certificate ok\n");
1089 Index: main/udptl.c 957 Index: main/udptl.c
1090 diff -Nau main/udptl.c.orig main/udptl.c 958 diff -Nau main/udptl.c.orig main/udptl.c
1091 --- main/udptl.c.orig 2011-05-03 21:55:49.000000000 +0200 959 --- main/udptl.c.orig 2011-10-06 19:49:38.000000000 +0200
1092 +++ main/udptl.c 2011-09-14 14:29:50.777958246 +0200 960 +++ main/udptl.c 2012-03-18 17:47:07.898462166 +0100
1093 @@ -98,6 +98,18 @@ 961 @@ -98,6 +98,18 @@
1094 962
1095 #define UDPTL_BUF_MASK 15 963 #define UDPTL_BUF_MASK 15
1096 964
1097 +/*! Copied from chan_oss.c, corrects link errors: 965 +/*! Copied from chan_oss.c, corrects link errors:
1109 typedef struct { 977 typedef struct {
1110 int buf_len; 978 int buf_len;
1111 uint8_t buf[LOCAL_FAX_MAX_DATAGRAM]; 979 uint8_t buf[LOCAL_FAX_MAX_DATAGRAM];
1112 Index: Makefile 980 Index: Makefile
1113 diff -Nau Makefile.orig Makefile 981 diff -Nau Makefile.orig Makefile
1114 --- Makefile.orig 2011-08-25 21:08:04.000000000 +0200 982 --- Makefile.orig 2011-10-05 00:54:15.000000000 +0200
1115 +++ Makefile 2011-09-14 14:29:50.777958246 +0200 983 +++ Makefile 2012-03-18 17:47:07.898462166 +0100
1116 @@ -230,15 +230,6 @@ 984 @@ -230,15 +230,6 @@
1117 _ASTCFLAGS+=-fsigned-char 985 _ASTCFLAGS+=-fsigned-char
1118 endif 986 endif
1119 987
1120 -ifeq ($(OSARCH),FreeBSD) 988 -ifeq ($(OSARCH),FreeBSD)

Mercurial Repository: OpenPKG Specs

Europalab SCM Repository Server

mercurial