1.1 --- a/asterisk/asterisk.patch Mon Sep 01 21:55:47 2014 +0200
1.2 +++ b/asterisk/asterisk.patch Mon Sep 01 21:57:20 2014 +0200
1.3 @@ -2,9 +2,9 @@
1.4 diff -Nau addons/chan_ooh323.c.orig addons/chan_ooh323.c
1.5 --- addons/chan_ooh323.c.orig 2012-01-26 21:14:50.000000000 +0100
1.6 +++ addons/chan_ooh323.c 2012-03-18 17:47:07.875949857 +0100
1.7 -@@ -24,6 +24,12 @@
1.8 -
1.9 +@@ -25,6 +25,12 @@
1.10 #include "chan_ooh323.h"
1.11 + #include "asterisk/paths.h"
1.12 #include <math.h>
1.13 +#if defined __SVR4 && defined __sun
1.14 +#include <sys/sockio.h>
1.15 @@ -198,15 +198,15 @@
1.16 diff -Nau apps/app_meetme.c.orig apps/app_meetme.c
1.17 --- apps/app_meetme.c.orig 2012-01-09 16:37:12.000000000 +0100
1.18 +++ apps/app_meetme.c 2012-03-18 17:47:07.875949857 +0100
1.19 -@@ -614,6 +614,7 @@
1.20 +@@ -624,6 +624,7 @@
1.21
1.22 /*! Do not write any audio to this channel until the state is up. */
1.23 #define CONFFLAG_NO_AUDIO_UNTIL_UP (1ULL << 31)
1.24 +#define CONFFLAG_USERNAME (1 << 32)
1.25 /*! If set play an intro announcement at start of conference */
1.26 #define CONFFLAG_INTROMSG (1ULL << 32)
1.27 -
1.28 -@@ -625,6 +626,7 @@
1.29 + /*! If set, don't enable a denoiser for the channel */
1.30 +@@ -637,6 +638,7 @@
1.31 OPT_ARG_MOH_CLASS = 4,
1.32 OPT_ARG_INTROMSG = 5,
1.33 OPT_ARG_ARRAY_SIZE = 6,
1.34 @@ -214,7 +214,7 @@
1.35 };
1.36
1.37 AST_APP_OPTIONS(meetme_opts, BEGIN_OPTIONS
1.38 -@@ -658,6 +660,7 @@
1.39 +@@ -671,6 +673,7 @@
1.40 AST_APP_OPTION('1', CONFFLAG_NOONLYPERSON ),
1.41 AST_APP_OPTION_ARG('S', CONFFLAG_DURATION_STOP, OPT_ARG_DURATION_STOP),
1.42 AST_APP_OPTION_ARG('L', CONFFLAG_DURATION_LIMIT, OPT_ARG_DURATION_LIMIT),
1.43 @@ -222,7 +222,7 @@
1.44 END_OPTIONS );
1.45
1.46 static const char * const app = "MeetMe";
1.47 -@@ -2453,6 +2456,12 @@
1.48 +@@ -3014,6 +3017,12 @@
1.49 ast_test_flag64(confflags, CONFFLAG_INTROUSERNOREVIEW))) {
1.50 char destdir[PATH_MAX];
1.51
1.52 @@ -235,7 +235,7 @@
1.53 snprintf(destdir, sizeof(destdir), "%s/meetme", ast_config_AST_SPOOL_DIR);
1.54
1.55 if (ast_mkdir(destdir, 0777) != 0) {
1.56 -@@ -2469,6 +2478,7 @@
1.57 +@@ -3030,6 +3039,7 @@
1.58 res = ast_record_review(chan, "vm-rec-name", user->namerecloc, 10, "sln", &duration, NULL);
1.59 if (res == -1)
1.60 goto outrun;
1.61 @@ -255,7 +255,7 @@
1.62 static char imapparentfolder[64] = "\0";
1.63 static char greetingfolder[64];
1.64 static char authuser[32];
1.65 -@@ -2527,7 +2528,7 @@
1.66 +@@ -2550,7 +2551,7 @@
1.67 }
1.68
1.69 /* Build up server information */
1.70 @@ -264,7 +264,7 @@
1.71
1.72 /* Add authentication user if present */
1.73 if (!ast_strlen_zero(authuser))
1.74 -@@ -6193,6 +6194,7 @@
1.75 +@@ -6220,6 +6221,7 @@
1.76 /* simple. huh? */
1.77 char sequence[10];
1.78 char mailbox[256];
1.79 @@ -272,7 +272,7 @@
1.80 int res;
1.81
1.82 /* get the real IMAP message number for this message */
1.83 -@@ -6208,10 +6210,24 @@
1.84 +@@ -6235,10 +6237,24 @@
1.85 mail_setflag(vms->mailstream, sequence, "\\Unseen");
1.86 mail_clearflag(vms->mailstream, sequence, "\\Seen");
1.87 }
1.88 @@ -299,7 +299,7 @@
1.89 /* Create the folder if it don't exist */
1.90 imap_mailbox_name(mailbox, sizeof(mailbox), vms, box, 1); /* Get the full mailbox name */
1.91 ast_debug(5, "Checking if folder exists: %s\n", mailbox);
1.92 -@@ -7290,7 +7306,11 @@
1.93 +@@ -7317,7 +7333,11 @@
1.94 int oldmsgs;
1.95 int newmsgs;
1.96 int capacity;
1.97 @@ -312,7 +312,7 @@
1.98 ast_log(LOG_ERROR, "Problem in calculating number of voicemail messages available for extension %s\n", s);
1.99 /* Shouldn't happen, but allow trying another extension if it does */
1.100 res = ast_play_and_wait(chan, "pbx-invalid");
1.101 -@@ -10281,7 +10301,7 @@
1.102 +@@ -10308,7 +10328,7 @@
1.103
1.104 case '5': /* Leave VoiceMail */
1.105 if (ast_test_flag(vmu, VM_SVMAIL)) {
1.106 @@ -321,7 +321,7 @@
1.107 if (cmd == ERROR_LOCK_PATH || cmd == OPERATOR_EXIT) {
1.108 res = cmd;
1.109 goto out;
1.110 -@@ -10464,7 +10484,7 @@
1.111 +@@ -10491,7 +10511,7 @@
1.112
1.113 case '8': /* Forward the current message */
1.114 if (vms.lastmsg > -1) {
1.115 @@ -330,7 +330,7 @@
1.116 if (cmd == ERROR_LOCK_PATH) {
1.117 res = cmd;
1.118 goto out;
1.119 -@@ -10517,6 +10537,10 @@
1.120 +@@ -10544,6 +10564,10 @@
1.121 #ifndef IMAP_STORAGE
1.122 } else if (!cmd) {
1.123 vms.deleted[vms.curmsg] = 1;
1.124 @@ -341,7 +341,7 @@
1.125 #endif
1.126 } else {
1.127 vms.deleted[vms.curmsg] = 0;
1.128 -@@ -12046,6 +12070,15 @@
1.129 +@@ -12071,6 +12095,15 @@
1.130 } else {
1.131 ast_copy_string(imapfolder, "INBOX", sizeof(imapfolder));
1.132 }
1.133 @@ -361,7 +361,7 @@
1.134 diff -Nau cdr/cdr_radius.c.orig cdr/cdr_radius.c
1.135 --- cdr/cdr_radius.c.orig 2011-07-14 22:13:06.000000000 +0200
1.136 +++ cdr/cdr_radius.c 2012-03-18 17:47:07.888451260 +0100
1.137 -@@ -106,10 +106,18 @@
1.138 +@@ -114,10 +114,18 @@
1.139 if (!rc_avpair_add(rh, tosend, PW_AST_SRC, &cdr->src, strlen(cdr->src), VENDOR_CODE))
1.140 return -1;
1.141
1.142 @@ -380,7 +380,7 @@
1.143 /* Destination context */
1.144 if (!rc_avpair_add(rh, tosend, PW_AST_DST_CTX, &cdr->dcontext, strlen(cdr->dcontext), VENDOR_CODE))
1.145 return -1;
1.146 -@@ -164,6 +172,10 @@
1.147 +@@ -172,6 +180,10 @@
1.148 if (!rc_avpair_add(rh, tosend, PW_AST_BILL_SEC, &cdr->billsec, 0, VENDOR_CODE))
1.149 return -1;
1.150
1.151 @@ -391,7 +391,7 @@
1.152 /* Disposition */
1.153 tmp = ast_cdr_disp2str(cdr->disposition);
1.154 if (!rc_avpair_add(rh, tosend, PW_AST_DISPOSITION, tmp, strlen(tmp), VENDOR_CODE))
1.155 -@@ -187,10 +199,14 @@
1.156 +@@ -195,10 +207,14 @@
1.157 }
1.158
1.159 /* Setting Acct-Session-Id & User-Name attributes for proper generation
1.160 @@ -785,7 +785,7 @@
1.161 diff -Nau channels/chan_sip.c.orig channels/chan_sip.c
1.162 --- channels/chan_sip.c.orig 2012-02-28 18:53:34.000000000 +0100
1.163 +++ channels/chan_sip.c 2012-03-18 17:47:07.898462166 +0100
1.164 -@@ -12150,7 +12150,16 @@
1.165 +@@ -12483,7 +12483,16 @@
1.166 } else {
1.167 if (sipmethod == SIP_NOTIFY && !ast_strlen_zero(p->theirtag)) {
1.168 /* If this is a NOTIFY, use the From: tag in the subscribe (RFC 3265) */
1.169 @@ -823,7 +823,7 @@
1.170 diff -Nau configure.orig configure
1.171 --- configure.orig 2012-01-14 17:40:17.000000000 +0100
1.172 +++ configure 2012-03-18 17:47:32.518450837 +0100
1.173 -@@ -4711,11 +4711,6 @@
1.174 +@@ -4743,11 +4743,6 @@
1.175 esac
1.176
1.177 case "${host_os}" in
1.178 @@ -835,7 +835,7 @@
1.179 openbsd*)
1.180 ac_default_prefix=/usr/local
1.181 if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then
1.182 -@@ -18994,8 +18989,8 @@
1.183 +@@ -19261,8 +19256,8 @@
1.184 if test -f "${IMAP_TK_DIR}/c-client/LDFLAGS"; then
1.185 imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
1.186 fi
1.187 @@ -846,8 +846,8 @@
1.188 CPPFLAGS="${CPPFLAGS} ${imap_include}"
1.189 LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}`
1.190 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.191 -@@ -26771,7 +26766,7 @@
1.192 - pbxlibdir="-L${SQLITE_DIR}"
1.193 +@@ -27359,7 +27354,7 @@
1.194 + pbxlibdir="-L${SQLITE_DIR}"
1.195 fi
1.196 fi
1.197 - pbxfuncname="sqlite_exec"
1.198 @@ -922,7 +922,7 @@
1.199 diff -Nau main/features.c.orig main/features.c
1.200 --- main/features.c.orig 2012-01-23 21:30:21.000000000 +0100
1.201 +++ main/features.c 2012-03-18 17:47:07.898462166 +0100
1.202 -@@ -2158,6 +2158,10 @@
1.203 +@@ -2163,6 +2163,10 @@
1.204 snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename);
1.205 }
1.206
1.207 @@ -933,7 +933,7 @@
1.208 for(x = 0; x < strlen(args); x++) {
1.209 if (args[x] == '/')
1.210 args[x] = '-';
1.211 -@@ -2270,6 +2274,10 @@
1.212 +@@ -2275,6 +2279,10 @@
1.213 snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav"));
1.214 }
1.215
1.216 @@ -956,7 +956,7 @@
1.217 + ext = "wav";
1.218
1.219 if (filename[0] == '/') {
1.220 - if (asprintf(&fn, "%s.%s", filename, ext) < 0) {
1.221 + if (ast_asprintf(&fn, "%s.%s", filename, ext) < 0) {
1.222 Index: main/Makefile
1.223 diff -Nau main/Makefile.orig main/Makefile
1.224 --- main/Makefile.orig 2011-09-19 22:27:03.000000000 +0200
1.225 @@ -977,7 +977,7 @@
1.226 diff -Nau main/tcptls.c.orig main/tcptls.c
1.227 --- main/tcptls.c.orig 2011-11-30 22:41:31.000000000 +0100
1.228 +++ main/tcptls.c 2012-03-18 17:47:07.898462166 +0100
1.229 -@@ -391,6 +391,7 @@
1.230 +@@ -821,6 +821,7 @@
1.231 if (!ast_strlen_zero(cfg->cafile) || !ast_strlen_zero(cfg->capath)) {
1.232 if (SSL_CTX_load_verify_locations(cfg->ssl_ctx, S_OR(cfg->cafile, NULL), S_OR(cfg->capath,NULL)) == 0)
1.233 ast_verb(0, "SSL CA file(%s)/path(%s) error\n", cfg->cafile, cfg->capath);
1.234 @@ -1012,7 +1012,7 @@
1.235 diff -Nau Makefile.orig Makefile
1.236 --- Makefile.orig 2011-10-05 00:54:15.000000000 +0200
1.237 +++ Makefile 2012-03-18 17:47:07.898462166 +0100
1.238 -@@ -186,12 +186,6 @@
1.239 +@@ -185,12 +185,6 @@
1.240 _ASTCFLAGS+=-isystem /usr/local/include
1.241 endif
1.242
