diff -r d7ae7fd8a214 -r e568963742d6 asterisk/asterisk.patch
--- a/asterisk/asterisk.patch	Tue Aug 28 18:32:00 2012 +0200
+++ b/asterisk/asterisk.patch	Tue Aug 28 18:32:05 2012 +0200
@@ -255,7 +255,7 @@
  static char imapparentfolder[64] = "\0";
  static char greetingfolder[64];
  static char authuser[32];
-@@ -2524,7 +2525,7 @@
+@@ -2527,7 +2528,7 @@
  	}
  
  	/* Build up server information */
@@ -264,7 +264,7 @@
  
  	/* Add authentication user if present */
  	if (!ast_strlen_zero(authuser))
-@@ -6186,6 +6187,7 @@
+@@ -6193,6 +6194,7 @@
  	/* simple. huh? */
  	char sequence[10];
  	char mailbox[256];
@@ -272,7 +272,7 @@
  	int res;
  
  	/* get the real IMAP message number for this message */
-@@ -6201,10 +6203,24 @@
+@@ -6208,10 +6210,24 @@
  		mail_setflag(vms->mailstream, sequence, "\\Unseen");
  		mail_clearflag(vms->mailstream, sequence, "\\Seen");
  	}
@@ -299,7 +299,7 @@
  	/* Create the folder if it don't exist */
  	imap_mailbox_name(mailbox, sizeof(mailbox), vms, box, 1); /* Get the full mailbox name */
  	ast_debug(5, "Checking if folder exists: %s\n", mailbox);
-@@ -10478,6 +10494,10 @@
+@@ -10517,6 +10533,10 @@
  #ifndef IMAP_STORAGE
  				} else if (!cmd) {
  					vms.deleted[vms.curmsg] = 1;
@@ -310,7 +310,7 @@
  #endif
  				} else {
  					vms.deleted[vms.curmsg] = 0;
-@@ -11996,6 +12016,15 @@
+@@ -12046,6 +12066,15 @@
  		} else {
  			ast_copy_string(imapfolder, "INBOX", sizeof(imapfolder));
  		}
@@ -379,10 +379,10 @@
  
  	/* Unique ID */
  	if (!rc_avpair_add(rh, tosend, PW_ACCT_SESSION_ID, &cdr->uniqueid, strlen(cdr->uniqueid), 0))
-Index: chan_capi-1.1.5.20120324/chan_capi20.h
-diff -Nau chan_capi-1.1.5.20120324/chan_capi20.h.orig chan_capi-1.1.5.20120324/chan_capi20.h
---- chan_capi-1.1.5.20120324/chan_capi20.h.orig	2005-09-20 20:33:40.000000000 +0200
-+++ chan_capi-1.1.5.20120324/chan_capi20.h	2012-03-18 17:47:07.888451260 +0100
+Index: chan_capi-1.1.5.20120615/chan_capi20.h
+diff -Nau chan_capi-1.1.5.20120615/chan_capi20.h.orig chan_capi-1.1.5.20120615/chan_capi20.h
+--- chan_capi-1.1.5.20120615/chan_capi20.h.orig	2005-09-20 20:33:40.000000000 +0200
++++ chan_capi-1.1.5.20120615/chan_capi20.h	2012-03-18 17:47:07.888451260 +0100
 @@ -4,10 +4,13 @@
   * first. Else the checks below will fail.
   */
@@ -406,10 +406,10 @@
  #ifndef HEADER_CID
  #define HEADER_CID(x) ((x)->adr.adrNCCI)
  #endif
-Index: chan_capi-1.1.5.20120324/chan_capi_utils.c
-diff -Nau chan_capi-1.1.5.20120324/chan_capi_utils.c.orig chan_capi-1.1.5.20120324/chan_capi_utils.c
---- chan_capi-1.1.5.20120324/chan_capi_utils.c.orig	2011-08-07 16:31:05.000000000 +0200
-+++ chan_capi-1.1.5.20120324/chan_capi_utils.c	2012-03-18 17:47:07.888451260 +0100
+Index: chan_capi-1.1.5.20120615/chan_capi_utils.c
+diff -Nau chan_capi-1.1.5.20120615/chan_capi_utils.c.orig chan_capi-1.1.5.20120615/chan_capi_utils.c
+--- chan_capi-1.1.5.20120615/chan_capi_utils.c.orig	2011-08-07 16:31:05.000000000 +0200
++++ chan_capi-1.1.5.20120615/chan_capi_utils.c	2012-03-18 17:47:07.888451260 +0100
 @@ -1160,6 +1160,9 @@
  {
  	MESSAGE_EXCHANGE_ERROR error;
@@ -420,10 +420,10 @@
  	unsigned char manbuf[CAPI_MANUFACTURER_LEN];
  	_cmsg CMSG;
  
-Index: chan_capi-1.1.5.20120324/libcapi20/capi20.c
-diff -Nau chan_capi-1.1.5.20120324/libcapi20/capi20.c.orig chan_capi-1.1.5.20120324/libcapi20/capi20.c
---- chan_capi-1.1.5.20120324/libcapi20/capi20.c.orig	2010-02-17 20:10:53.000000000 +0100
-+++ chan_capi-1.1.5.20120324/libcapi20/capi20.c	2012-03-18 17:47:07.888451260 +0100
+Index: chan_capi-1.1.5.20120615/libcapi20/capi20.c
+diff -Nau chan_capi-1.1.5.20120615/libcapi20/capi20.c.orig chan_capi-1.1.5.20120615/libcapi20/capi20.c
+--- chan_capi-1.1.5.20120615/libcapi20/capi20.c.orig	2010-02-17 20:10:53.000000000 +0100
++++ chan_capi-1.1.5.20120615/libcapi20/capi20.c	2012-03-18 17:47:07.888451260 +0100
 @@ -19,8 +19,10 @@
  #include <stdio.h>
  #include <ctype.h>
@@ -717,10 +717,10 @@
  }
  /*
   * functions added to the CAPI2.0 spec
-Index: chan_capi-1.1.5.20120324/libcapi20/convert.c
-diff -Nau chan_capi-1.1.5.20120324/libcapi20/convert.c.orig chan_capi-1.1.5.20120324/libcapi20/convert.c
---- chan_capi-1.1.5.20120324/libcapi20/convert.c.orig	2010-09-14 21:54:25.000000000 +0200
-+++ chan_capi-1.1.5.20120324/libcapi20/convert.c	2012-03-18 17:47:07.888451260 +0100
+Index: chan_capi-1.1.5.20120615/libcapi20/convert.c
+diff -Nau chan_capi-1.1.5.20120615/libcapi20/convert.c.orig chan_capi-1.1.5.20120615/libcapi20/convert.c
+--- chan_capi-1.1.5.20120615/libcapi20/convert.c.orig	2010-09-14 21:54:25.000000000 +0200
++++ chan_capi-1.1.5.20120615/libcapi20/convert.c	2012-03-18 17:47:07.888451260 +0100
 @@ -11,7 +11,14 @@
  #include <stddef.h>
  #include <time.h>
@@ -736,11 +736,11 @@
  
  #include "capi20.h"
  
-Index: chan_capi-1.1.5.20120324/Makefile
-diff -Nau chan_capi-1.1.5.20120324/Makefile.orig chan_capi-1.1.5.20120324/Makefile
---- chan_capi-1.1.5.20120324/Makefile.orig	2011-02-04 18:41:46.000000000 +0100
-+++ chan_capi-1.1.5.20120324/Makefile	2012-03-18 17:47:07.888451260 +0100
-@@ -114,6 +114,9 @@
+Index: chan_capi-1.1.5.20120615/Makefile
+diff -Nau chan_capi-1.1.5.20120615/Makefile.orig chan_capi-1.1.5.20120615/Makefile
+--- chan_capi-1.1.5.20120615/Makefile.orig	2011-02-04 18:41:46.000000000 +0100
++++ chan_capi-1.1.5.20120615/Makefile	2012-03-18 17:47:07.888451260 +0100
+@@ -115,6 +115,9 @@
  CFLAGS+=-O2
  CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
  CFLAGS+=$(shell if uname -m | grep -q "ppc\|arm\|s390"; then echo "-fsigned-char"; fi)
@@ -754,7 +754,7 @@
 diff -Nau channels/chan_sip.c.orig channels/chan_sip.c
 --- channels/chan_sip.c.orig	2012-02-28 18:53:34.000000000 +0100
 +++ channels/chan_sip.c	2012-03-18 17:47:07.898462166 +0100
-@@ -12034,7 +12034,16 @@
+@@ -12104,7 +12104,16 @@
   	} else {
   		if (sipmethod == SIP_NOTIFY && !ast_strlen_zero(p->theirtag)) {
   			/* If this is a NOTIFY, use the From: tag in the subscribe (RFC 3265) */
@@ -792,7 +792,7 @@
 diff -Nau configure.orig configure
 --- configure.orig	2012-01-14 17:40:17.000000000 +0100
 +++ configure	2012-03-18 17:47:32.518450837 +0100
-@@ -4716,11 +4716,6 @@
+@@ -4711,11 +4711,6 @@
  esac
  
  case "${host_os}" in
@@ -804,7 +804,7 @@
       openbsd*)
       ac_default_prefix=/usr/local
       if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then
-@@ -18904,8 +18899,8 @@
+@@ -18994,8 +18989,8 @@
  		if test -f "${IMAP_TK_DIR}/c-client/LDFLAGS"; then
        		imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
  		fi
@@ -815,7 +815,7 @@
        	CPPFLAGS="${CPPFLAGS} ${imap_include}"
  	  	LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}`
  	  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -26681,7 +26676,7 @@
+@@ -26771,7 +26766,7 @@
        	 pbxlibdir="-L${SQLITE_DIR}"
        fi
     fi
@@ -828,7 +828,7 @@
 diff -Nau formats/format_pcm.c.orig formats/format_pcm.c
 --- formats/format_pcm.c.orig	2011-07-14 22:13:06.000000000 +0200
 +++ formats/format_pcm.c	2012-03-18 17:47:07.898462166 +0100
-@@ -354,6 +354,7 @@
+@@ -376,6 +376,7 @@
  		ast_log(LOG_WARNING, "Unable to write header\n");
  		return -1;
  	}
@@ -840,7 +840,7 @@
 diff -Nau formats/format_wav.c.orig formats/format_wav.c
 --- formats/format_wav.c.orig	2011-11-09 16:25:33.000000000 +0100
 +++ formats/format_wav.c	2012-03-18 17:47:07.898462166 +0100
-@@ -308,6 +308,7 @@
+@@ -310,6 +310,7 @@
  		ast_log(LOG_WARNING, "Unable to write header\n");
  		return -1;
  	}
@@ -891,33 +891,33 @@
 diff -Nau main/features.c.orig main/features.c
 --- main/features.c.orig	2012-01-23 21:30:21.000000000 +0100
 +++ main/features.c	2012-03-18 17:47:07.898462166 +0100
-@@ -2067,6 +2067,10 @@
- 			snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename);
- 		}
+@@ -2127,6 +2127,10 @@
+ 		snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename);
+ 	}
  
-+		for(x = 0; x < strlen(touch_filename); x++) {
-+			if (args[x] == '/')
-+				args[x] = '-';
-+		}
- 		for(x = 0; x < strlen(args); x++) {
- 			if (args[x] == '/')
- 				args[x] = '-';
-@@ -2183,6 +2187,10 @@
- 			snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav"));
- 		}
++	for(x = 0; x < strlen(touch_filename); x++) {
++		if (args[x] == '/')
++			args[x] = '-';
++	}
+ 	for(x = 0; x < strlen(args); x++) {
+ 		if (args[x] == '/')
+ 			args[x] = '-';
+@@ -2239,6 +2243,10 @@
+ 		snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav"));
+ 	}
  
-+		for( x = 0; x < strlen(touch_filename); x++) {
-+			if (args[x] == '/')
-+				args[x] = '-';
-+		}
- 		for( x = 0; x < strlen(args); x++) {
- 			if (args[x] == '/')
- 				args[x] = '-';
++   	for( x = 0; x < strlen(touch_filename); x++) {
++   		if (args[x] == '/')
++   			args[x] = '-';
++   	}
+ 	for( x = 0; x < strlen(args); x++) {
+ 		if (args[x] == '/')
+ 			args[x] = '-';
 Index: main/file.c
 diff -Nau main/file.c.orig main/file.c
 --- main/file.c.orig	2012-01-05 23:06:46.000000000 +0100
 +++ main/file.c	2012-03-18 17:47:07.898462166 +0100
-@@ -256,7 +256,7 @@
+@@ -260,7 +260,7 @@
  	char *fn = NULL;
  
  	if (!strcmp(ext, "wav49"))
@@ -930,7 +930,7 @@
 diff -Nau main/Makefile.orig main/Makefile
 --- main/Makefile.orig	2011-09-19 22:27:03.000000000 +0200
 +++ main/Makefile	2012-03-18 17:47:07.898462166 +0100
-@@ -69,10 +69,7 @@
+@@ -66,10 +66,7 @@
  endif
  
  ifeq ($(OSARCH),FreeBSD)
@@ -946,7 +946,7 @@
 diff -Nau main/tcptls.c.orig main/tcptls.c
 --- main/tcptls.c.orig	2011-11-30 22:41:31.000000000 +0100
 +++ main/tcptls.c	2012-03-18 17:47:07.898462166 +0100
-@@ -372,6 +372,7 @@
+@@ -391,6 +391,7 @@
  	if (!ast_strlen_zero(cfg->cafile) || !ast_strlen_zero(cfg->capath)) {
  		if (SSL_CTX_load_verify_locations(cfg->ssl_ctx, S_OR(cfg->cafile, NULL), S_OR(cfg->capath,NULL)) == 0)
  			ast_verb(0, "SSL CA file(%s)/path(%s) error\n", cfg->cafile, cfg->capath);
@@ -958,7 +958,7 @@
 diff -Nau main/udptl.c.orig main/udptl.c
 --- main/udptl.c.orig	2011-10-06 19:49:38.000000000 +0200
 +++ main/udptl.c	2012-03-18 17:47:07.898462166 +0100
-@@ -98,6 +98,18 @@
+@@ -101,6 +101,18 @@
  
  #define UDPTL_BUF_MASK              15
  
@@ -981,14 +981,11 @@
 diff -Nau Makefile.orig Makefile
 --- Makefile.orig	2011-10-05 00:54:15.000000000 +0200
 +++ Makefile	2012-03-18 17:47:07.898462166 +0100
-@@ -230,15 +230,6 @@
-   _ASTCFLAGS+=-fsigned-char
+@@ -186,12 +186,6 @@
+   _ASTCFLAGS+=-isystem /usr/local/include
  endif
  
 -ifeq ($(OSARCH),FreeBSD)
--  ifeq ($(PROC),i386)
--    _ASTCFLAGS+=-march=i686
--  endif
 -  # -V is understood by BSD Make, not by GNU make.
 -  BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
 -  _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)