OpenPKG Specs / file comparison

comparison: asterisk/asterisk.patch

asterisk/asterisk.patch

changeset 798
4ef5d37e8bb2
parent 755
192d78fefb97
equal deleted inserted replaced
13:461ad96d5404 14:612f742126e1
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 2012-01-26 21:14:50.000000000 +0100 3 --- addons/chan_ooh323.c.orig 2012-01-26 21:14:50.000000000 +0100
4 +++ addons/chan_ooh323.c 2012-03-18 17:47:07.875949857 +0100 4 +++ addons/chan_ooh323.c 2012-03-18 17:47:07.875949857 +0100
5 @@ -24,6 +24,12 @@ 5 @@ -25,6 +25,12 @@
6
7 #include "chan_ooh323.h" 6 #include "chan_ooh323.h"
7 #include "asterisk/paths.h"
8 #include <math.h> 8 #include <math.h>
9 +#if defined __SVR4 && defined __sun 9 +#if defined __SVR4 && defined __sun
10 +#include <sys/sockio.h> 10 +#include <sys/sockio.h>
11 +#ifndef IPTOS_MINCOST 11 +#ifndef IPTOS_MINCOST
12 +#define IPTOS_MINCOST 0x02 12 +#define IPTOS_MINCOST 0x02
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 2012-01-09 16:37:12.000000000 +0100 199 --- apps/app_meetme.c.orig 2012-01-09 16:37:12.000000000 +0100
200 +++ apps/app_meetme.c 2012-03-18 17:47:07.875949857 +0100 200 +++ apps/app_meetme.c 2012-03-18 17:47:07.875949857 +0100
201 @@ -614,6 +614,7 @@ 201 @@ -624,6 +624,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 /*! If set, don't enable a denoiser for the channel */
209 @@ -625,6 +626,7 @@ 209 @@ -637,6 +638,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 @@ -658,6 +660,7 @@ 217 @@ -671,6 +673,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 @@ -2453,6 +2456,12 @@ 225 @@ -3014,6 +3017,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 @@ -2469,6 +2478,7 @@ 238 @@ -3030,6 +3039,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 }
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 @@ -2527,7 +2528,7 @@ 258 @@ -2550,7 +2551,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 @@ -6193,6 +6194,7 @@ 267 @@ -6220,6 +6221,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 @@ -6208,10 +6210,24 @@ 275 @@ -6235,10 +6237,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 @@ -7290,7 +7306,11 @@ 302 @@ -7317,7 +7333,11 @@
303 int oldmsgs; 303 int oldmsgs;
304 int newmsgs; 304 int newmsgs;
305 int capacity; 305 int capacity;
306 - if (inboxcount(s, &newmsgs, &oldmsgs)) { 306 - if (inboxcount(s, &newmsgs, &oldmsgs)) {
307 + char *msgcnt = 0; 307 + char *msgcnt = 0;
310 + strcat(msgcnt, context); /* the context which is not in 's' */ 310 + strcat(msgcnt, context); /* the context which is not in 's' */
311 + if (inboxcount(msgcnt, &newmsgs, &oldmsgs)) { 311 + if (inboxcount(msgcnt, &newmsgs, &oldmsgs)) {
312 ast_log(LOG_ERROR, "Problem in calculating number of voicemail messages available for extension %s\n", s); 312 ast_log(LOG_ERROR, "Problem in calculating number of voicemail messages available for extension %s\n", s);
313 /* Shouldn't happen, but allow trying another extension if it does */ 313 /* Shouldn't happen, but allow trying another extension if it does */
314 res = ast_play_and_wait(chan, "pbx-invalid"); 314 res = ast_play_and_wait(chan, "pbx-invalid");
315 @@ -10281,7 +10301,7 @@ 315 @@ -10308,7 +10328,7 @@
316 316
317 case '5': /* Leave VoiceMail */ 317 case '5': /* Leave VoiceMail */
318 if (ast_test_flag(vmu, VM_SVMAIL)) { 318 if (ast_test_flag(vmu, VM_SVMAIL)) {
319 - cmd = forward_message(chan, context, &vms, vmu, vmfmts, 1, record_gain, 0); 319 - cmd = forward_message(chan, context, &vms, vmu, vmfmts, 1, record_gain, 0);
320 + cmd = forward_message(chan, vmu->context, &vms, vmu, vmfmts, 1, record_gain, 0); 320 + cmd = forward_message(chan, vmu->context, &vms, vmu, vmfmts, 1, record_gain, 0);
321 if (cmd == ERROR_LOCK_PATH || cmd == OPERATOR_EXIT) { 321 if (cmd == ERROR_LOCK_PATH || cmd == OPERATOR_EXIT) {
322 res = cmd; 322 res = cmd;
323 goto out; 323 goto out;
324 @@ -10464,7 +10484,7 @@ 324 @@ -10491,7 +10511,7 @@
325 325
326 case '8': /* Forward the current message */ 326 case '8': /* Forward the current message */
327 if (vms.lastmsg > -1) { 327 if (vms.lastmsg > -1) {
328 - cmd = forward_message(chan, context, &vms, vmu, vmfmts, 0, record_gain, in_urgent); 328 - cmd = forward_message(chan, context, &vms, vmu, vmfmts, 0, record_gain, in_urgent);
329 + cmd = forward_message(chan, vmu->context, &vms, vmu, vmfmts, 0, record_gain, in_urgent); 329 + cmd = forward_message(chan, vmu->context, &vms, vmu, vmfmts, 0, record_gain, in_urgent);
330 if (cmd == ERROR_LOCK_PATH) { 330 if (cmd == ERROR_LOCK_PATH) {
331 res = cmd; 331 res = cmd;
332 goto out; 332 goto out;
333 @@ -10517,6 +10537,10 @@ 333 @@ -10544,6 +10564,10 @@
334 #ifndef IMAP_STORAGE 334 #ifndef IMAP_STORAGE
335 } else if (!cmd) { 335 } else if (!cmd) {
336 vms.deleted[vms.curmsg] = 1; 336 vms.deleted[vms.curmsg] = 1;
337 +#else 337 +#else
338 + } else if (!cmd && (folder_int(vms.curbox) > 1 || box > 1)) { 338 + } else if (!cmd && (folder_int(vms.curbox) > 1 || box > 1)) {
339 + vms.deleted[vms.curmsg] = 1; /* Enforce deletion after */ 339 + vms.deleted[vms.curmsg] = 1; /* Enforce deletion after */
340 + deleted = 1; /* successful copy op */ 340 + deleted = 1; /* successful copy op */
341 #endif 341 #endif
342 } else { 342 } else {
343 vms.deleted[vms.curmsg] = 0; 343 vms.deleted[vms.curmsg] = 0;
344 @@ -12046,6 +12070,15 @@ 344 @@ -12071,6 +12095,15 @@
345 } else { 345 } else {
346 ast_copy_string(imapfolder, "INBOX", sizeof(imapfolder)); 346 ast_copy_string(imapfolder, "INBOX", sizeof(imapfolder));
347 } 347 }
348 + /* IMAP saved (sub)folder location policy */ 348 + /* IMAP saved (sub)folder location policy */
349 + if ((val = ast_variable_retrieve(cfg, "general", "imapsubfold"))) { 349 + if ((val = ast_variable_retrieve(cfg, "general", "imapsubfold"))) {
359 } 359 }
360 Index: cdr/cdr_radius.c 360 Index: cdr/cdr_radius.c
361 diff -Nau cdr/cdr_radius.c.orig cdr/cdr_radius.c 361 diff -Nau cdr/cdr_radius.c.orig cdr/cdr_radius.c
362 --- cdr/cdr_radius.c.orig 2011-07-14 22:13:06.000000000 +0200 362 --- cdr/cdr_radius.c.orig 2011-07-14 22:13:06.000000000 +0200
363 +++ cdr/cdr_radius.c 2012-03-18 17:47:07.888451260 +0100 363 +++ cdr/cdr_radius.c 2012-03-18 17:47:07.888451260 +0100
364 @@ -106,10 +106,18 @@ 364 @@ -114,10 +114,18 @@
365 if (!rc_avpair_add(rh, tosend, PW_AST_SRC, &cdr->src, strlen(cdr->src), VENDOR_CODE)) 365 if (!rc_avpair_add(rh, tosend, PW_AST_SRC, &cdr->src, strlen(cdr->src), VENDOR_CODE))
366 return -1; 366 return -1;
367 367
368 + /* RADIUS standard identifier patch */ 368 + /* RADIUS standard identifier patch */
369 + if (!rc_avpair_add(rh, tosend, PW_CALLING_STATION_ID, &cdr->src, strlen(cdr->src), 0)) 369 + if (!rc_avpair_add(rh, tosend, PW_CALLING_STATION_ID, &cdr->src, strlen(cdr->src), 0))
378 + return -1; 378 + return -1;
379 + 379 +
380 /* Destination context */ 380 /* Destination context */
381 if (!rc_avpair_add(rh, tosend, PW_AST_DST_CTX, &cdr->dcontext, strlen(cdr->dcontext), VENDOR_CODE)) 381 if (!rc_avpair_add(rh, tosend, PW_AST_DST_CTX, &cdr->dcontext, strlen(cdr->dcontext), VENDOR_CODE))
382 return -1; 382 return -1;
383 @@ -164,6 +172,10 @@ 383 @@ -172,6 +180,10 @@
384 if (!rc_avpair_add(rh, tosend, PW_AST_BILL_SEC, &cdr->billsec, 0, VENDOR_CODE)) 384 if (!rc_avpair_add(rh, tosend, PW_AST_BILL_SEC, &cdr->billsec, 0, VENDOR_CODE))
385 return -1; 385 return -1;
386 386
387 + /* RADIUS standard identifier patch */ 387 + /* RADIUS standard identifier patch */
388 + if (!rc_avpair_add(rh, tosend, PW_ACCT_SESSION_TIME, &cdr->billsec, 0, 0)) 388 + if (!rc_avpair_add(rh, tosend, PW_ACCT_SESSION_TIME, &cdr->billsec, 0, 0))
389 + return -1; 389 + return -1;
390 + 390 +
391 /* Disposition */ 391 /* Disposition */
392 tmp = ast_cdr_disp2str(cdr->disposition); 392 tmp = ast_cdr_disp2str(cdr->disposition);
393 if (!rc_avpair_add(rh, tosend, PW_AST_DISPOSITION, tmp, strlen(tmp), VENDOR_CODE)) 393 if (!rc_avpair_add(rh, tosend, PW_AST_DISPOSITION, tmp, strlen(tmp), VENDOR_CODE))
394 @@ -187,10 +199,14 @@ 394 @@ -195,10 +207,14 @@
395 } 395 }
396 396
397 /* Setting Acct-Session-Id & User-Name attributes for proper generation 397 /* Setting Acct-Session-Id & User-Name attributes for proper generation
398 - of Acct-Unique-Session-Id on server side */ 398 - of Acct-Unique-Session-Id on server side */
399 - /* Channel */ 399 - /* Channel */
783 endif 783 endif
784 Index: channels/chan_sip.c 784 Index: channels/chan_sip.c
785 diff -Nau channels/chan_sip.c.orig channels/chan_sip.c 785 diff -Nau channels/chan_sip.c.orig channels/chan_sip.c
786 --- channels/chan_sip.c.orig 2012-02-28 18:53:34.000000000 +0100 786 --- channels/chan_sip.c.orig 2012-02-28 18:53:34.000000000 +0100
787 +++ channels/chan_sip.c 2012-03-18 17:47:07.898462166 +0100 787 +++ channels/chan_sip.c 2012-03-18 17:47:07.898462166 +0100
788 @@ -12150,7 +12150,16 @@ 788 @@ -12483,7 +12483,16 @@
789 } else { 789 } else {
790 if (sipmethod == SIP_NOTIFY && !ast_strlen_zero(p->theirtag)) { 790 if (sipmethod == SIP_NOTIFY && !ast_strlen_zero(p->theirtag)) {
791 /* If this is a NOTIFY, use the From: tag in the subscribe (RFC 3265) */ 791 /* If this is a NOTIFY, use the From: tag in the subscribe (RFC 3265) */
792 - snprintf(to, sizeof(to), "<%s%s>;tag=%s", (strncasecmp(p->uri, "sip:", 4) ? "sip:" : ""), p->uri, p->theirtag); 792 - snprintf(to, sizeof(to), "<%s%s>;tag=%s", (strncasecmp(p->uri, "sip:", 4) ? "sip:" : ""), p->uri, p->theirtag);
793 + if (strncasecmp(p->uri, "sip:", strlen("sip:"))) 793 + if (strncasecmp(p->uri, "sip:", strlen("sip:")))
821 "console {videodevice|videocodec" \ 821 "console {videodevice|videocodec" \
822 Index: configure 822 Index: configure
823 diff -Nau configure.orig configure 823 diff -Nau configure.orig configure
824 --- configure.orig 2012-01-14 17:40:17.000000000 +0100 824 --- configure.orig 2012-01-14 17:40:17.000000000 +0100
825 +++ configure 2012-03-18 17:47:32.518450837 +0100 825 +++ configure 2012-03-18 17:47:32.518450837 +0100
826 @@ -4711,11 +4711,6 @@ 826 @@ -4743,11 +4743,6 @@
827 esac 827 esac
828 828
829 case "${host_os}" in 829 case "${host_os}" in
830 - freebsd*) 830 - freebsd*)
831 - ac_default_prefix=/usr/local 831 - ac_default_prefix=/usr/local
833 - LDFLAGS=-L/usr/local/lib 833 - LDFLAGS=-L/usr/local/lib
834 - ;; 834 - ;;
835 openbsd*) 835 openbsd*)
836 ac_default_prefix=/usr/local 836 ac_default_prefix=/usr/local
837 if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then 837 if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then
838 @@ -18994,8 +18989,8 @@ 838 @@ -19261,8 +19256,8 @@
839 if test -f "${IMAP_TK_DIR}/c-client/LDFLAGS"; then 839 if test -f "${IMAP_TK_DIR}/c-client/LDFLAGS"; then
840 imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS` 840 imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
841 fi 841 fi
842 - imap_libs="${IMAP_TK_DIR}/c-client/c-client.a" 842 - imap_libs="${IMAP_TK_DIR}/c-client/c-client.a"
843 - imap_include="-I${IMAP_TK_DIR}/c-client" 843 - imap_include="-I${IMAP_TK_DIR}/c-client"
844 + imap_libs="-limap -lssl -lcrypto -lcrypt" 844 + imap_libs="-limap -lssl -lcrypto -lcrypt"
845 + imap_include="-DUSE_SYSTEM_IMAP -I${IMAP_TK_DIR}/include/imap" 845 + imap_include="-DUSE_SYSTEM_IMAP -I${IMAP_TK_DIR}/include/imap"
846 CPPFLAGS="${CPPFLAGS} ${imap_include}" 846 CPPFLAGS="${CPPFLAGS} ${imap_include}"
847 LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}` 847 LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}`
848 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 848 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
849 @@ -26771,7 +26766,7 @@ 849 @@ -27359,7 +27354,7 @@
850 pbxlibdir="-L${SQLITE_DIR}" 850 pbxlibdir="-L${SQLITE_DIR}"
851 fi 851 fi
852 fi 852 fi
853 - pbxfuncname="sqlite_exec" 853 - pbxfuncname="sqlite_exec"
854 + pbxfuncname="sqlite3_exec" 854 + pbxfuncname="sqlite3_exec"
855 if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers 855 if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
920 /* 920 /*
921 Index: main/features.c 921 Index: main/features.c
922 diff -Nau main/features.c.orig main/features.c 922 diff -Nau main/features.c.orig main/features.c
923 --- main/features.c.orig 2012-01-23 21:30:21.000000000 +0100 923 --- main/features.c.orig 2012-01-23 21:30:21.000000000 +0100
924 +++ main/features.c 2012-03-18 17:47:07.898462166 +0100 924 +++ main/features.c 2012-03-18 17:47:07.898462166 +0100
925 @@ -2158,6 +2158,10 @@ 925 @@ -2163,6 +2163,10 @@
926 snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename); 926 snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename);
927 } 927 }
928 928
929 + for(x = 0; x < strlen(touch_filename); x++) { 929 + for(x = 0; x < strlen(touch_filename); x++) {
930 + if (args[x] == '/') 930 + if (args[x] == '/')
931 + args[x] = '-'; 931 + args[x] = '-';
932 + } 932 + }
933 for(x = 0; x < strlen(args); x++) { 933 for(x = 0; x < strlen(args); x++) {
934 if (args[x] == '/') 934 if (args[x] == '/')
935 args[x] = '-'; 935 args[x] = '-';
936 @@ -2270,6 +2274,10 @@ 936 @@ -2275,6 +2279,10 @@
937 snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav")); 937 snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav"));
938 } 938 }
939 939
940 + for( x = 0; x < strlen(touch_filename); x++) { 940 + for( x = 0; x < strlen(touch_filename); x++) {
941 + if (args[x] == '/') 941 + if (args[x] == '/')
954 if (!strcmp(ext, "wav49")) 954 if (!strcmp(ext, "wav49"))
955 - ext = "WAV"; 955 - ext = "WAV";
956 + ext = "wav"; 956 + ext = "wav";
957 957
958 if (filename[0] == '/') { 958 if (filename[0] == '/') {
959 if (asprintf(&fn, "%s.%s", filename, ext) < 0) { 959 if (ast_asprintf(&fn, "%s.%s", filename, ext) < 0) {
960 Index: main/Makefile 960 Index: main/Makefile
961 diff -Nau main/Makefile.orig main/Makefile 961 diff -Nau main/Makefile.orig main/Makefile
962 --- main/Makefile.orig 2011-09-19 22:27:03.000000000 +0200 962 --- main/Makefile.orig 2011-09-19 22:27:03.000000000 +0200
963 +++ main/Makefile 2012-03-18 17:47:07.898462166 +0100 963 +++ main/Makefile 2012-03-18 17:47:07.898462166 +0100
964 @@ -66,10 +66,7 @@ 964 @@ -66,10 +66,7 @@
975 ifneq ($(findstring $(OSARCH), mingw32 cygwin ),) 975 ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
976 Index: main/tcptls.c 976 Index: main/tcptls.c
977 diff -Nau main/tcptls.c.orig main/tcptls.c 977 diff -Nau main/tcptls.c.orig main/tcptls.c
978 --- main/tcptls.c.orig 2011-11-30 22:41:31.000000000 +0100 978 --- main/tcptls.c.orig 2011-11-30 22:41:31.000000000 +0100
979 +++ main/tcptls.c 2012-03-18 17:47:07.898462166 +0100 979 +++ main/tcptls.c 2012-03-18 17:47:07.898462166 +0100
980 @@ -391,6 +391,7 @@ 980 @@ -821,6 +821,7 @@
981 if (!ast_strlen_zero(cfg->cafile) || !ast_strlen_zero(cfg->capath)) { 981 if (!ast_strlen_zero(cfg->cafile) || !ast_strlen_zero(cfg->capath)) {
982 if (SSL_CTX_load_verify_locations(cfg->ssl_ctx, S_OR(cfg->cafile, NULL), S_OR(cfg->capath,NULL)) == 0) 982 if (SSL_CTX_load_verify_locations(cfg->ssl_ctx, S_OR(cfg->cafile, NULL), S_OR(cfg->capath,NULL)) == 0)
983 ast_verb(0, "SSL CA file(%s)/path(%s) error\n", cfg->cafile, cfg->capath); 983 ast_verb(0, "SSL CA file(%s)/path(%s) error\n", cfg->cafile, cfg->capath);
984 + SSL_CTX_set_client_CA_list(cfg->ssl_ctx, S_OR(cfg->cafile, NULL)); 984 + SSL_CTX_set_client_CA_list(cfg->ssl_ctx, S_OR(cfg->cafile, NULL));
985 } 985 }
1010 uint8_t buf[LOCAL_FAX_MAX_DATAGRAM]; 1010 uint8_t buf[LOCAL_FAX_MAX_DATAGRAM];
1011 Index: Makefile 1011 Index: Makefile
1012 diff -Nau Makefile.orig Makefile 1012 diff -Nau Makefile.orig Makefile
1013 --- Makefile.orig 2011-10-05 00:54:15.000000000 +0200 1013 --- Makefile.orig 2011-10-05 00:54:15.000000000 +0200
1014 +++ Makefile 2012-03-18 17:47:07.898462166 +0100 1014 +++ Makefile 2012-03-18 17:47:07.898462166 +0100
1015 @@ -186,12 +186,6 @@ 1015 @@ -185,12 +185,6 @@
1016 _ASTCFLAGS+=-isystem /usr/local/include 1016 _ASTCFLAGS+=-isystem /usr/local/include
1017 endif 1017 endif
1018 1018
1019 -ifeq ($(OSARCH),FreeBSD) 1019 -ifeq ($(OSARCH),FreeBSD)
1020 - # -V is understood by BSD Make, not by GNU make. 1020 - # -V is understood by BSD Make, not by GNU make.

Mercurial Repository: OpenPKG Specs

Europalab SCM Repository Server

mercurial