1.1 --- a/asterisk/asterisk.patch Tue Aug 28 18:32:00 2012 +0200
1.2 +++ b/asterisk/asterisk.patch Tue Aug 28 18:32:05 2012 +0200
1.3 @@ -255,7 +255,7 @@
1.4 static char imapparentfolder[64] = "\0";
1.5 static char greetingfolder[64];
1.6 static char authuser[32];
1.7 -@@ -2524,7 +2525,7 @@
1.8 +@@ -2527,7 +2528,7 @@
1.9 }
1.10
1.11 /* Build up server information */
1.12 @@ -264,7 +264,7 @@
1.13
1.14 /* Add authentication user if present */
1.15 if (!ast_strlen_zero(authuser))
1.16 -@@ -6186,6 +6187,7 @@
1.17 +@@ -6193,6 +6194,7 @@
1.18 /* simple. huh? */
1.19 char sequence[10];
1.20 char mailbox[256];
1.21 @@ -272,7 +272,7 @@
1.22 int res;
1.23
1.24 /* get the real IMAP message number for this message */
1.25 -@@ -6201,10 +6203,24 @@
1.26 +@@ -6208,10 +6210,24 @@
1.27 mail_setflag(vms->mailstream, sequence, "\\Unseen");
1.28 mail_clearflag(vms->mailstream, sequence, "\\Seen");
1.29 }
1.30 @@ -299,7 +299,7 @@
1.31 /* Create the folder if it don't exist */
1.32 imap_mailbox_name(mailbox, sizeof(mailbox), vms, box, 1); /* Get the full mailbox name */
1.33 ast_debug(5, "Checking if folder exists: %s\n", mailbox);
1.34 -@@ -10478,6 +10494,10 @@
1.35 +@@ -10517,6 +10533,10 @@
1.36 #ifndef IMAP_STORAGE
1.37 } else if (!cmd) {
1.38 vms.deleted[vms.curmsg] = 1;
1.39 @@ -310,7 +310,7 @@
1.40 #endif
1.41 } else {
1.42 vms.deleted[vms.curmsg] = 0;
1.43 -@@ -11996,6 +12016,15 @@
1.44 +@@ -12046,6 +12066,15 @@
1.45 } else {
1.46 ast_copy_string(imapfolder, "INBOX", sizeof(imapfolder));
1.47 }
1.48 @@ -379,10 +379,10 @@
1.49
1.50 /* Unique ID */
1.51 if (!rc_avpair_add(rh, tosend, PW_ACCT_SESSION_ID, &cdr->uniqueid, strlen(cdr->uniqueid), 0))
1.52 -Index: chan_capi-1.1.5.20120324/chan_capi20.h
1.53 -diff -Nau chan_capi-1.1.5.20120324/chan_capi20.h.orig chan_capi-1.1.5.20120324/chan_capi20.h
1.54 ---- chan_capi-1.1.5.20120324/chan_capi20.h.orig 2005-09-20 20:33:40.000000000 +0200
1.55 -+++ chan_capi-1.1.5.20120324/chan_capi20.h 2012-03-18 17:47:07.888451260 +0100
1.56 +Index: chan_capi-1.1.5.20120615/chan_capi20.h
1.57 +diff -Nau chan_capi-1.1.5.20120615/chan_capi20.h.orig chan_capi-1.1.5.20120615/chan_capi20.h
1.58 +--- chan_capi-1.1.5.20120615/chan_capi20.h.orig 2005-09-20 20:33:40.000000000 +0200
1.59 ++++ chan_capi-1.1.5.20120615/chan_capi20.h 2012-03-18 17:47:07.888451260 +0100
1.60 @@ -4,10 +4,13 @@
1.61 * first. Else the checks below will fail.
1.62 */
1.63 @@ -406,10 +406,10 @@
1.64 #ifndef HEADER_CID
1.65 #define HEADER_CID(x) ((x)->adr.adrNCCI)
1.66 #endif
1.67 -Index: chan_capi-1.1.5.20120324/chan_capi_utils.c
1.68 -diff -Nau chan_capi-1.1.5.20120324/chan_capi_utils.c.orig chan_capi-1.1.5.20120324/chan_capi_utils.c
1.69 ---- chan_capi-1.1.5.20120324/chan_capi_utils.c.orig 2011-08-07 16:31:05.000000000 +0200
1.70 -+++ chan_capi-1.1.5.20120324/chan_capi_utils.c 2012-03-18 17:47:07.888451260 +0100
1.71 +Index: chan_capi-1.1.5.20120615/chan_capi_utils.c
1.72 +diff -Nau chan_capi-1.1.5.20120615/chan_capi_utils.c.orig chan_capi-1.1.5.20120615/chan_capi_utils.c
1.73 +--- chan_capi-1.1.5.20120615/chan_capi_utils.c.orig 2011-08-07 16:31:05.000000000 +0200
1.74 ++++ chan_capi-1.1.5.20120615/chan_capi_utils.c 2012-03-18 17:47:07.888451260 +0100
1.75 @@ -1160,6 +1160,9 @@
1.76 {
1.77 MESSAGE_EXCHANGE_ERROR error;
1.78 @@ -420,10 +420,10 @@
1.79 unsigned char manbuf[CAPI_MANUFACTURER_LEN];
1.80 _cmsg CMSG;
1.81
1.82 -Index: chan_capi-1.1.5.20120324/libcapi20/capi20.c
1.83 -diff -Nau chan_capi-1.1.5.20120324/libcapi20/capi20.c.orig chan_capi-1.1.5.20120324/libcapi20/capi20.c
1.84 ---- chan_capi-1.1.5.20120324/libcapi20/capi20.c.orig 2010-02-17 20:10:53.000000000 +0100
1.85 -+++ chan_capi-1.1.5.20120324/libcapi20/capi20.c 2012-03-18 17:47:07.888451260 +0100
1.86 +Index: chan_capi-1.1.5.20120615/libcapi20/capi20.c
1.87 +diff -Nau chan_capi-1.1.5.20120615/libcapi20/capi20.c.orig chan_capi-1.1.5.20120615/libcapi20/capi20.c
1.88 +--- chan_capi-1.1.5.20120615/libcapi20/capi20.c.orig 2010-02-17 20:10:53.000000000 +0100
1.89 ++++ chan_capi-1.1.5.20120615/libcapi20/capi20.c 2012-03-18 17:47:07.888451260 +0100
1.90 @@ -19,8 +19,10 @@
1.91 #include <stdio.h>
1.92 #include <ctype.h>
1.93 @@ -717,10 +717,10 @@
1.94 }
1.95 /*
1.96 * functions added to the CAPI2.0 spec
1.97 -Index: chan_capi-1.1.5.20120324/libcapi20/convert.c
1.98 -diff -Nau chan_capi-1.1.5.20120324/libcapi20/convert.c.orig chan_capi-1.1.5.20120324/libcapi20/convert.c
1.99 ---- chan_capi-1.1.5.20120324/libcapi20/convert.c.orig 2010-09-14 21:54:25.000000000 +0200
1.100 -+++ chan_capi-1.1.5.20120324/libcapi20/convert.c 2012-03-18 17:47:07.888451260 +0100
1.101 +Index: chan_capi-1.1.5.20120615/libcapi20/convert.c
1.102 +diff -Nau chan_capi-1.1.5.20120615/libcapi20/convert.c.orig chan_capi-1.1.5.20120615/libcapi20/convert.c
1.103 +--- chan_capi-1.1.5.20120615/libcapi20/convert.c.orig 2010-09-14 21:54:25.000000000 +0200
1.104 ++++ chan_capi-1.1.5.20120615/libcapi20/convert.c 2012-03-18 17:47:07.888451260 +0100
1.105 @@ -11,7 +11,14 @@
1.106 #include <stddef.h>
1.107 #include <time.h>
1.108 @@ -736,11 +736,11 @@
1.109
1.110 #include "capi20.h"
1.111
1.112 -Index: chan_capi-1.1.5.20120324/Makefile
1.113 -diff -Nau chan_capi-1.1.5.20120324/Makefile.orig chan_capi-1.1.5.20120324/Makefile
1.114 ---- chan_capi-1.1.5.20120324/Makefile.orig 2011-02-04 18:41:46.000000000 +0100
1.115 -+++ chan_capi-1.1.5.20120324/Makefile 2012-03-18 17:47:07.888451260 +0100
1.116 -@@ -114,6 +114,9 @@
1.117 +Index: chan_capi-1.1.5.20120615/Makefile
1.118 +diff -Nau chan_capi-1.1.5.20120615/Makefile.orig chan_capi-1.1.5.20120615/Makefile
1.119 +--- chan_capi-1.1.5.20120615/Makefile.orig 2011-02-04 18:41:46.000000000 +0100
1.120 ++++ chan_capi-1.1.5.20120615/Makefile 2012-03-18 17:47:07.888451260 +0100
1.121 +@@ -115,6 +115,9 @@
1.122 CFLAGS+=-O2
1.123 CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
1.124 CFLAGS+=$(shell if uname -m | grep -q "ppc\|arm\|s390"; then echo "-fsigned-char"; fi)
1.125 @@ -754,7 +754,7 @@
1.126 diff -Nau channels/chan_sip.c.orig channels/chan_sip.c
1.127 --- channels/chan_sip.c.orig 2012-02-28 18:53:34.000000000 +0100
1.128 +++ channels/chan_sip.c 2012-03-18 17:47:07.898462166 +0100
1.129 -@@ -12034,7 +12034,16 @@
1.130 +@@ -12104,7 +12104,16 @@
1.131 } else {
1.132 if (sipmethod == SIP_NOTIFY && !ast_strlen_zero(p->theirtag)) {
1.133 /* If this is a NOTIFY, use the From: tag in the subscribe (RFC 3265) */
1.134 @@ -792,7 +792,7 @@
1.135 diff -Nau configure.orig configure
1.136 --- configure.orig 2012-01-14 17:40:17.000000000 +0100
1.137 +++ configure 2012-03-18 17:47:32.518450837 +0100
1.138 -@@ -4716,11 +4716,6 @@
1.139 +@@ -4711,11 +4711,6 @@
1.140 esac
1.141
1.142 case "${host_os}" in
1.143 @@ -804,7 +804,7 @@
1.144 openbsd*)
1.145 ac_default_prefix=/usr/local
1.146 if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then
1.147 -@@ -18904,8 +18899,8 @@
1.148 +@@ -18994,8 +18989,8 @@
1.149 if test -f "${IMAP_TK_DIR}/c-client/LDFLAGS"; then
1.150 imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
1.151 fi
1.152 @@ -815,7 +815,7 @@
1.153 CPPFLAGS="${CPPFLAGS} ${imap_include}"
1.154 LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}`
1.155 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.156 -@@ -26681,7 +26676,7 @@
1.157 +@@ -26771,7 +26766,7 @@
1.158 pbxlibdir="-L${SQLITE_DIR}"
1.159 fi
1.160 fi
1.161 @@ -828,7 +828,7 @@
1.162 diff -Nau formats/format_pcm.c.orig formats/format_pcm.c
1.163 --- formats/format_pcm.c.orig 2011-07-14 22:13:06.000000000 +0200
1.164 +++ formats/format_pcm.c 2012-03-18 17:47:07.898462166 +0100
1.165 -@@ -354,6 +354,7 @@
1.166 +@@ -376,6 +376,7 @@
1.167 ast_log(LOG_WARNING, "Unable to write header\n");
1.168 return -1;
1.169 }
1.170 @@ -840,7 +840,7 @@
1.171 diff -Nau formats/format_wav.c.orig formats/format_wav.c
1.172 --- formats/format_wav.c.orig 2011-11-09 16:25:33.000000000 +0100
1.173 +++ formats/format_wav.c 2012-03-18 17:47:07.898462166 +0100
1.174 -@@ -308,6 +308,7 @@
1.175 +@@ -310,6 +310,7 @@
1.176 ast_log(LOG_WARNING, "Unable to write header\n");
1.177 return -1;
1.178 }
1.179 @@ -891,33 +891,33 @@
1.180 diff -Nau main/features.c.orig main/features.c
1.181 --- main/features.c.orig 2012-01-23 21:30:21.000000000 +0100
1.182 +++ main/features.c 2012-03-18 17:47:07.898462166 +0100
1.183 -@@ -2067,6 +2067,10 @@
1.184 - snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename);
1.185 - }
1.186 +@@ -2127,6 +2127,10 @@
1.187 + snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename);
1.188 + }
1.189
1.190 -+ for(x = 0; x < strlen(touch_filename); x++) {
1.191 -+ if (args[x] == '/')
1.192 -+ args[x] = '-';
1.193 -+ }
1.194 - for(x = 0; x < strlen(args); x++) {
1.195 - if (args[x] == '/')
1.196 - args[x] = '-';
1.197 -@@ -2183,6 +2187,10 @@
1.198 - snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav"));
1.199 - }
1.200 ++ for(x = 0; x < strlen(touch_filename); x++) {
1.201 ++ if (args[x] == '/')
1.202 ++ args[x] = '-';
1.203 ++ }
1.204 + for(x = 0; x < strlen(args); x++) {
1.205 + if (args[x] == '/')
1.206 + args[x] = '-';
1.207 +@@ -2239,6 +2243,10 @@
1.208 + snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav"));
1.209 + }
1.210
1.211 -+ for( x = 0; x < strlen(touch_filename); x++) {
1.212 -+ if (args[x] == '/')
1.213 -+ args[x] = '-';
1.214 -+ }
1.215 - for( x = 0; x < strlen(args); x++) {
1.216 - if (args[x] == '/')
1.217 - args[x] = '-';
1.218 ++ for( x = 0; x < strlen(touch_filename); x++) {
1.219 ++ if (args[x] == '/')
1.220 ++ args[x] = '-';
1.221 ++ }
1.222 + for( x = 0; x < strlen(args); x++) {
1.223 + if (args[x] == '/')
1.224 + args[x] = '-';
1.225 Index: main/file.c
1.226 diff -Nau main/file.c.orig main/file.c
1.227 --- main/file.c.orig 2012-01-05 23:06:46.000000000 +0100
1.228 +++ main/file.c 2012-03-18 17:47:07.898462166 +0100
1.229 -@@ -256,7 +256,7 @@
1.230 +@@ -260,7 +260,7 @@
1.231 char *fn = NULL;
1.232
1.233 if (!strcmp(ext, "wav49"))
1.234 @@ -930,7 +930,7 @@
1.235 diff -Nau main/Makefile.orig main/Makefile
1.236 --- main/Makefile.orig 2011-09-19 22:27:03.000000000 +0200
1.237 +++ main/Makefile 2012-03-18 17:47:07.898462166 +0100
1.238 -@@ -69,10 +69,7 @@
1.239 +@@ -66,10 +66,7 @@
1.240 endif
1.241
1.242 ifeq ($(OSARCH),FreeBSD)
1.243 @@ -946,7 +946,7 @@
1.244 diff -Nau main/tcptls.c.orig main/tcptls.c
1.245 --- main/tcptls.c.orig 2011-11-30 22:41:31.000000000 +0100
1.246 +++ main/tcptls.c 2012-03-18 17:47:07.898462166 +0100
1.247 -@@ -372,6 +372,7 @@
1.248 +@@ -391,6 +391,7 @@
1.249 if (!ast_strlen_zero(cfg->cafile) || !ast_strlen_zero(cfg->capath)) {
1.250 if (SSL_CTX_load_verify_locations(cfg->ssl_ctx, S_OR(cfg->cafile, NULL), S_OR(cfg->capath,NULL)) == 0)
1.251 ast_verb(0, "SSL CA file(%s)/path(%s) error\n", cfg->cafile, cfg->capath);
1.252 @@ -958,7 +958,7 @@
1.253 diff -Nau main/udptl.c.orig main/udptl.c
1.254 --- main/udptl.c.orig 2011-10-06 19:49:38.000000000 +0200
1.255 +++ main/udptl.c 2012-03-18 17:47:07.898462166 +0100
1.256 -@@ -98,6 +98,18 @@
1.257 +@@ -101,6 +101,18 @@
1.258
1.259 #define UDPTL_BUF_MASK 15
1.260
1.261 @@ -981,14 +981,11 @@
1.262 diff -Nau Makefile.orig Makefile
1.263 --- Makefile.orig 2011-10-05 00:54:15.000000000 +0200
1.264 +++ Makefile 2012-03-18 17:47:07.898462166 +0100
1.265 -@@ -230,15 +230,6 @@
1.266 - _ASTCFLAGS+=-fsigned-char
1.267 +@@ -186,12 +186,6 @@
1.268 + _ASTCFLAGS+=-isystem /usr/local/include
1.269 endif
1.270
1.271 -ifeq ($(OSARCH),FreeBSD)
1.272 -- ifeq ($(PROC),i386)
1.273 -- _ASTCFLAGS+=-march=i686
1.274 -- endif
1.275 - # -V is understood by BSD Make, not by GNU make.
1.276 - BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
1.277 - _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
