diff -r b6420eee9bde -r 375c04ff28ba asterisk/asterisk.patch
--- a/asterisk/asterisk.patch	Mon Jan 09 22:36:23 2012 +0100
+++ b/asterisk/asterisk.patch	Sun Mar 18 18:45:29 2012 +0100
@@ -1,7 +1,7 @@
 Index: addons/chan_ooh323.c
 diff -Nau addons/chan_ooh323.c.orig addons/chan_ooh323.c
---- addons/chan_ooh323.c.orig	2011-08-09 18:13:09.000000000 +0200
-+++ addons/chan_ooh323.c	2011-09-14 14:29:50.740457577 +0200
+--- addons/chan_ooh323.c.orig	2012-01-26 21:14:50.000000000 +0100
++++ addons/chan_ooh323.c	2012-03-18 17:47:07.875949857 +0100
 @@ -24,6 +24,12 @@
  
  #include "chan_ooh323.h"
@@ -18,7 +18,7 @@
 Index: addons/ooh323c/src/ooCmdChannel.c
 diff -Nau addons/ooh323c/src/ooCmdChannel.c.orig addons/ooh323c/src/ooCmdChannel.c
 --- addons/ooh323c/src/ooCmdChannel.c.orig	2011-08-04 21:37:16.000000000 +0200
-+++ addons/ooh323c/src/ooCmdChannel.c	2011-09-14 14:29:50.740457577 +0200
++++ addons/ooh323c/src/ooCmdChannel.c	2012-03-18 17:47:07.875949857 +0100
 @@ -25,6 +25,10 @@
  #include "ooCalls.h"
  #include "ooCmdChannel.h"
@@ -33,7 +33,7 @@
 Index: addons/ooh323c/src/ooSocket.c
 diff -Nau addons/ooh323c/src/ooSocket.c.orig addons/ooh323c/src/ooSocket.c
 --- addons/ooh323c/src/ooSocket.c.orig	2011-05-04 22:50:18.000000000 +0200
-+++ addons/ooh323c/src/ooSocket.c	2011-09-14 14:29:50.740457577 +0200
++++ addons/ooh323c/src/ooSocket.c	2012-03-18 17:47:07.875949857 +0100
 @@ -24,6 +24,9 @@
  
  #include "ooSocket.h"
@@ -47,7 +47,7 @@
 Index: addons/ooh323cDriver.c
 diff -Nau addons/ooh323cDriver.c.orig addons/ooh323cDriver.c
 --- addons/ooh323cDriver.c.orig	2011-02-18 01:07:20.000000000 +0100
-+++ addons/ooh323cDriver.c	2011-09-14 14:29:50.740457577 +0200
++++ addons/ooh323cDriver.c	2012-03-18 17:47:07.875949857 +0100
 @@ -27,6 +27,11 @@
  
  #define SEC_TO_HOLD_THREAD 24
@@ -63,7 +63,7 @@
 Index: apps/app_backticks.c
 diff -Nau apps/app_backticks.c.orig apps/app_backticks.c
 --- apps/app_backticks.c.orig	1970-01-01 01:00:00.000000000 +0100
-+++ apps/app_backticks.c	2011-09-14 14:29:50.740457577 +0200
++++ apps/app_backticks.c	2012-03-18 17:47:07.875949857 +0100
 @@ -0,0 +1,129 @@
 +
 +#include "asterisk.h"
@@ -196,9 +196,9 @@
 +
 Index: apps/app_meetme.c
 diff -Nau apps/app_meetme.c.orig apps/app_meetme.c
---- apps/app_meetme.c.orig	2011-07-19 17:43:32.000000000 +0200
-+++ apps/app_meetme.c	2011-09-14 14:29:50.747960016 +0200
-@@ -607,6 +607,7 @@
+--- apps/app_meetme.c.orig	2012-01-09 16:37:12.000000000 +0100
++++ apps/app_meetme.c	2012-03-18 17:47:07.875949857 +0100
+@@ -614,6 +614,7 @@
  
  /*! Do not write any audio to this channel until the state is up. */
  #define CONFFLAG_NO_AUDIO_UNTIL_UP  (1ULL << 31)
@@ -206,7 +206,7 @@
  /*! If set play an intro announcement at start of conference */
  #define CONFFLAG_INTROMSG           (1ULL << 32)
  
-@@ -618,6 +619,7 @@
+@@ -625,6 +626,7 @@
  	OPT_ARG_MOH_CLASS = 4,
  	OPT_ARG_INTROMSG = 5,
  	OPT_ARG_ARRAY_SIZE = 6,
@@ -214,7 +214,7 @@
  };
  
  AST_APP_OPTIONS(meetme_opts, BEGIN_OPTIONS
-@@ -651,6 +653,7 @@
+@@ -658,6 +660,7 @@
  	AST_APP_OPTION('1', CONFFLAG_NOONLYPERSON ),
   	AST_APP_OPTION_ARG('S', CONFFLAG_DURATION_STOP, OPT_ARG_DURATION_STOP),
  	AST_APP_OPTION_ARG('L', CONFFLAG_DURATION_LIMIT, OPT_ARG_DURATION_LIMIT),
@@ -222,7 +222,7 @@
  END_OPTIONS );
  
  static const char * const app = "MeetMe";
-@@ -2446,6 +2449,12 @@
+@@ -2453,6 +2456,12 @@
  		ast_test_flag64(confflags, CONFFLAG_INTROUSERNOREVIEW))) {
  		char destdir[PATH_MAX];
  
@@ -235,7 +235,7 @@
  		snprintf(destdir, sizeof(destdir), "%s/meetme", ast_config_AST_SPOOL_DIR);
  
  		if (ast_mkdir(destdir, 0777) != 0) {
-@@ -2462,6 +2471,7 @@
+@@ -2469,6 +2478,7 @@
  			res = ast_record_review(chan, "vm-rec-name", user->namerecloc, 10, "sln", &duration, NULL);
  		if (res == -1)
  			goto outrun;
@@ -245,9 +245,9 @@
  	ast_mutex_lock(&conf->playlock);
 Index: apps/app_voicemail.c
 diff -Nau apps/app_voicemail.c.orig apps/app_voicemail.c
---- apps/app_voicemail.c.orig	2011-07-26 16:04:55.000000000 +0200
-+++ apps/app_voicemail.c	2011-09-14 14:29:50.747960016 +0200
-@@ -373,6 +373,7 @@
+--- apps/app_voicemail.c.orig	2012-01-25 23:21:30.000000000 +0100
++++ apps/app_voicemail.c	2012-03-18 17:47:07.888451260 +0100
+@@ -376,6 +376,7 @@
  static char imapport[8];
  static char imapflags[128];
  static char imapfolder[64];
@@ -255,7 +255,7 @@
  static char imapparentfolder[64] = "\0";
  static char greetingfolder[64];
  static char authuser[32];
-@@ -2517,7 +2518,7 @@
+@@ -2524,7 +2525,7 @@
  	}
  
  	/* Build up server information */
@@ -264,7 +264,7 @@
  
  	/* Add authentication user if present */
  	if (!ast_strlen_zero(authuser))
-@@ -6176,6 +6177,7 @@
+@@ -6186,6 +6187,7 @@
  	/* simple. huh? */
  	char sequence[10];
  	char mailbox[256];
@@ -272,7 +272,7 @@
  	int res;
  
  	/* get the real IMAP message number for this message */
-@@ -6191,10 +6193,24 @@
+@@ -6201,10 +6203,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);
-@@ -10469,6 +10485,10 @@
+@@ -10478,6 +10494,10 @@
  #ifndef IMAP_STORAGE
  				} else if (!cmd) {
  					vms.deleted[vms.curmsg] = 1;
@@ -310,7 +310,7 @@
  #endif
  				} else {
  					vms.deleted[vms.curmsg] = 0;
-@@ -11965,6 +11985,15 @@
+@@ -11996,6 +12016,15 @@
  		} else {
  			ast_copy_string(imapfolder, "INBOX", sizeof(imapfolder));
  		}
@@ -329,7 +329,7 @@
 Index: cdr/cdr_radius.c
 diff -Nau cdr/cdr_radius.c.orig cdr/cdr_radius.c
 --- cdr/cdr_radius.c.orig	2011-07-14 22:13:06.000000000 +0200
-+++ cdr/cdr_radius.c	2011-09-14 14:29:50.777958246 +0200
++++ cdr/cdr_radius.c	2012-03-18 17:47:07.888451260 +0100
 @@ -106,10 +106,18 @@
  	if (!rc_avpair_add(rh, tosend, PW_AST_SRC, &cdr->src, strlen(cdr->src), VENDOR_CODE))
  		return -1;
@@ -381,8 +381,8 @@
  	if (!rc_avpair_add(rh, tosend, PW_ACCT_SESSION_ID, &cdr->uniqueid, strlen(cdr->uniqueid), 0))
 Index: chan_capi-1.1.5.20110914/chan_capi20.h
 diff -Nau chan_capi-1.1.5.20110914/chan_capi20.h.orig chan_capi-1.1.5.20110914/chan_capi20.h
---- chan_capi-1.1.5.20110914/chan_capi20.h.orig	2011-01-07 02:29:32.000000000 +0100
-+++ chan_capi-1.1.5.20110914/chan_capi20.h	2011-05-23 17:35:28.348531751 +0200
+--- chan_capi-1.1.5.20110914/chan_capi20.h.orig	2005-09-20 20:33:40.000000000 +0200
++++ chan_capi-1.1.5.20110914/chan_capi20.h	2012-03-18 17:47:07.888451260 +0100
 @@ -4,10 +4,13 @@
   * first. Else the checks below will fail.
   */
@@ -408,8 +408,8 @@
  #endif
 Index: chan_capi-1.1.5.20110914/chan_capi_utils.c
 diff -Nau chan_capi-1.1.5.20110914/chan_capi_utils.c.orig chan_capi-1.1.5.20110914/chan_capi_utils.c
---- chan_capi-1.1.5.20110914/chan_capi_utils.c.orig	2011-01-07 02:29:32.000000000 +0100
-+++ chan_capi-1.1.5.20110914/chan_capi_utils.c	2011-05-23 17:35:28.348531751 +0200
+--- chan_capi-1.1.5.20110914/chan_capi_utils.c.orig	2011-08-07 16:31:05.000000000 +0200
++++ chan_capi-1.1.5.20110914/chan_capi_utils.c	2012-03-18 17:47:07.888451260 +0100
 @@ -1158,6 +1158,9 @@
  {
  	MESSAGE_EXCHANGE_ERROR error;
@@ -422,8 +422,8 @@
  
 Index: chan_capi-1.1.5.20110914/libcapi20/capi20.c
 diff -Nau chan_capi-1.1.5.20110914/libcapi20/capi20.c.orig chan_capi-1.1.5.20110914/libcapi20/capi20.c
---- chan_capi-1.1.5.20110914/libcapi20/capi20.c.orig	2011-01-07 02:29:31.000000000 +0100
-+++ chan_capi-1.1.5.20110914/libcapi20/capi20.c	2011-05-23 17:35:28.348531751 +0200
+--- chan_capi-1.1.5.20110914/libcapi20/capi20.c.orig	2010-02-17 20:10:53.000000000 +0100
++++ chan_capi-1.1.5.20110914/libcapi20/capi20.c	2012-03-18 17:47:07.888451260 +0100
 @@ -19,8 +19,10 @@
  #include <stdio.h>
  #include <ctype.h>
@@ -719,8 +719,8 @@
   * functions added to the CAPI2.0 spec
 Index: chan_capi-1.1.5.20110914/libcapi20/convert.c
 diff -Nau chan_capi-1.1.5.20110914/libcapi20/convert.c.orig chan_capi-1.1.5.20110914/libcapi20/convert.c
---- chan_capi-1.1.5.20110914/libcapi20/convert.c.orig	2011-01-07 02:29:31.000000000 +0100
-+++ chan_capi-1.1.5.20110914/libcapi20/convert.c	2011-05-23 17:35:28.348531751 +0200
+--- chan_capi-1.1.5.20110914/libcapi20/convert.c.orig	2010-09-14 21:54:25.000000000 +0200
++++ chan_capi-1.1.5.20110914/libcapi20/convert.c	2012-03-18 17:47:07.888451260 +0100
 @@ -11,7 +11,14 @@
  #include <stddef.h>
  #include <time.h>
@@ -738,8 +738,8 @@
  
 Index: chan_capi-1.1.5.20110914/Makefile
 diff -Nau chan_capi-1.1.5.20110914/Makefile.orig chan_capi-1.1.5.20110914/Makefile
---- chan_capi-1.1.5.20110914/Makefile.orig	2011-01-07 02:29:32.000000000 +0100
-+++ chan_capi-1.1.5.20110914/Makefile	2011-05-23 17:35:28.348531751 +0200
+--- chan_capi-1.1.5.20110914/Makefile.orig	2011-02-04 18:41:46.000000000 +0100
++++ chan_capi-1.1.5.20110914/Makefile	2012-03-18 17:47:07.888451260 +0100
 @@ -114,6 +114,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)
@@ -752,9 +752,9 @@
  endif
 Index: channels/chan_sip.c
 diff -Nau channels/chan_sip.c.orig channels/chan_sip.c
---- channels/chan_sip.c.orig	2011-08-10 00:12:59.000000000 +0200
-+++ channels/chan_sip.c	2011-09-14 14:29:50.757959000 +0200
-@@ -11676,7 +11676,16 @@
+--- 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 @@
   	} else {
   		if (sipmethod == SIP_NOTIFY && !ast_strlen_zero(p->theirtag)) {
   			/* If this is a NOTIFY, use the From: tag in the subscribe (RFC 3265) */
@@ -775,7 +775,7 @@
 Index: channels/console_video.h
 diff -Nau channels/console_video.h.orig channels/console_video.h
 --- channels/console_video.h.orig	2008-06-30 17:45:15.000000000 +0200
-+++ channels/console_video.h	2011-09-14 14:29:50.767970949 +0200
++++ channels/console_video.h	2012-03-18 17:47:07.898462166 +0100
 @@ -28,10 +28,7 @@
  		"console {device}"
  #else
@@ -790,9 +790,9 @@
  	"console {videodevice|videocodec"	\
 Index: configure
 diff -Nau configure.orig configure
---- configure.orig	2011-08-25 21:08:04.000000000 +0200
-+++ configure	2011-09-14 14:29:50.767970949 +0200
-@@ -4447,11 +4447,6 @@
+--- configure.orig	2012-01-14 17:40:17.000000000 +0100
++++ configure	2012-03-18 17:47:32.518450837 +0100
+@@ -4716,11 +4716,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
-@@ -31424,8 +31419,8 @@
+@@ -18904,8 +18899,8 @@
  		if test -f "${IMAP_TK_DIR}/c-client/LDFLAGS"; then
        		imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
  		fi
@@ -814,8 +814,8 @@
 +	  	imap_include="-DUSE_SYSTEM_IMAP -I${IMAP_TK_DIR}/include/imap"
        	CPPFLAGS="${CPPFLAGS} ${imap_include}"
  	  	LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}`
- 	  	cat >conftest.$ac_ext <<_ACEOF
-@@ -49375,7 +49370,7 @@
+ 	  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -26681,7 +26676,7 @@
        	 pbxlibdir="-L${SQLITE_DIR}"
        fi
     fi
@@ -824,142 +824,10 @@
     if test "x${pbxfuncname}" = "x" ; then   # empty lib, assume only headers
        AST_SQLITE_FOUND=yes
     else
-@@ -51127,16 +51122,16 @@
-     if test "x${PBX_GMIME}" != "x1" -a "${USE_GMIME}" != "no"; then
- 	PBX_GMIME=0
- 	if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}gmime-config", so it can be a program name with args.
--set dummy ${ac_tool_prefix}gmime-config; ac_word=$2
-+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_CONFIG_GMIME+set}" = set; then
-+if test "${ac_cv_path_PKGCONFIG+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
--  case $CONFIG_GMIME in
-+  case $PKGCONFIG in
-   [\\/]* | ?:[\\/]*)
--  ac_cv_path_CONFIG_GMIME="$CONFIG_GMIME" # Let the user override the test with a path.
-+  ac_cv_path_PKGCONFIG="$PKGCONFIG" # Let the user override the test with a path.
-   ;;
-   *)
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -51147,7 +51142,7 @@
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_path_CONFIG_GMIME="$as_dir/$ac_word$ac_exec_ext"
-+    ac_cv_path_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext"
-     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
-@@ -51158,10 +51153,10 @@
-   ;;
- esac
- fi
--CONFIG_GMIME=$ac_cv_path_CONFIG_GMIME
--if test -n "$CONFIG_GMIME"; then
--  { $as_echo "$as_me:$LINENO: result: $CONFIG_GMIME" >&5
--$as_echo "$CONFIG_GMIME" >&6; }
-+PKGCONFIG=$ac_cv_path_PKGCONFIG
-+if test -n "$PKGCONFIG"; then
-+  { $as_echo "$as_me:$LINENO: result: $PKGCONFIG" >&5
-+$as_echo "$PKGCONFIG" >&6; }
- else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
-@@ -51169,18 +51164,18 @@
- 
- 
- fi
--if test -z "$ac_cv_path_CONFIG_GMIME"; then
--  ac_pt_CONFIG_GMIME=$CONFIG_GMIME
-+if test -z "$ac_cv_path_PKGCONFIG"; then
-+  ac_pt_PKGCONFIG=$PKGCONFIG
-   # Extract the first word of "gmime-config", so it can be a program name with args.
--set dummy gmime-config; ac_word=$2
-+set dummy pkg-config; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_ac_pt_CONFIG_GMIME+set}" = set; then
-+if test "${ac_cv_path_ac_pt_PKGCONFIG+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
--  case $ac_pt_CONFIG_GMIME in
-+  case $ac_pt_PKGCONFIG in
-   [\\/]* | ?:[\\/]*)
--  ac_cv_path_ac_pt_CONFIG_GMIME="$ac_pt_CONFIG_GMIME" # Let the user override the test with a path.
-+  ac_cv_path_ac_pt_PKGCONFIG="$ac_pt_PKGCONFIG" # Let the user override the test with a path.
-   ;;
-   *)
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -51191,7 +51186,7 @@
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_path_ac_pt_CONFIG_GMIME="$as_dir/$ac_word$ac_exec_ext"
-+    ac_cv_path_ac_pt_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext"
-     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
-@@ -51202,17 +51197,17 @@
-   ;;
- esac
- fi
--ac_pt_CONFIG_GMIME=$ac_cv_path_ac_pt_CONFIG_GMIME
--if test -n "$ac_pt_CONFIG_GMIME"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_pt_CONFIG_GMIME" >&5
--$as_echo "$ac_pt_CONFIG_GMIME" >&6; }
-+ac_pt_PKGCONFIG=$ac_cv_path_ac_pt_PKGCONFIG
-+if test -n "$ac_pt_PKGCONFIG"; then
-+  { $as_echo "$as_me:$LINENO: result: $ac_pt_PKGCONFIG" >&5
-+$as_echo "$ac_pt_PKGCONFIG" >&6; }
- else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
--  if test "x$ac_pt_CONFIG_GMIME" = x; then
--    CONFIG_GMIME="No"
-+  if test "x$ac_pt_PKGCONFIG" = x; then
-+    PKGCONFIG="No"
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
-@@ -51220,22 +51215,17 @@
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
--    CONFIG_GMIME=$ac_pt_CONFIG_GMIME
-+    PKGCONFIG=$ac_pt_PKGCONFIG
-   fi
- else
--  CONFIG_GMIME="$ac_cv_path_CONFIG_GMIME"
-+  PKGCONFIG="$ac_cv_path_PKGCONFIG"
- fi
- 
--	if test ! "x${CONFIG_GMIME}" = xNo; then
--	    if test x"" = x ; then A=--cflags ; else A="" ; fi
--	    GMIME_INCLUDE=$(${CONFIG_GMIME} $A)
--	    if test x"" = x ; then A=--libs ; else A="" ; fi
--	    GMIME_LIB=$(${CONFIG_GMIME} $A)
-+	if test ! "x${PKGCONFIG}" = xNo; then
-+	    GMIME_INCLUDE=$(${PKGCONFIG} gmime-2.4 --cflags 2>/dev/null)
-+	    GMIME_LIB=$(${PKGCONFIG} gmime-2.4 --libs)
- 	    if test x"#include <gmime/gmime.h>" != x ; then
- 		saved_cppflags="${CPPFLAGS}"
--		if test "x${GMIME_DIR}" != "x"; then
--		    GMIME_INCLUDE="-I${GMIME_DIR}/include"
--		fi
- 		CPPFLAGS="${CPPFLAGS} ${GMIME_INCLUDE}"
- 
- 		saved_libs="${LIBS}"
 Index: formats/format_pcm.c
 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	2011-09-14 14:29:50.767970949 +0200
++++ formats/format_pcm.c	2012-03-18 17:47:07.898462166 +0100
 @@ -354,6 +354,7 @@
  		ast_log(LOG_WARNING, "Unable to write header\n");
  		return -1;
@@ -970,8 +838,8 @@
  
 Index: formats/format_wav.c
 diff -Nau formats/format_wav.c.orig formats/format_wav.c
---- formats/format_wav.c.orig	2011-07-29 19:18:56.000000000 +0200
-+++ formats/format_wav.c	2011-09-14 14:29:50.767970949 +0200
+--- 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 @@
  		ast_log(LOG_WARNING, "Unable to write header\n");
  		return -1;
@@ -983,7 +851,7 @@
 Index: formats/format_wav_gsm.c
 diff -Nau formats/format_wav_gsm.c.orig formats/format_wav_gsm.c
 --- formats/format_wav_gsm.c.orig	2011-07-14 22:13:06.000000000 +0200
-+++ formats/format_wav_gsm.c	2011-09-14 14:29:50.767970949 +0200
++++ formats/format_wav_gsm.c	2012-03-18 17:47:07.898462166 +0100
 @@ -366,6 +366,7 @@
  		ast_log(LOG_WARNING, "Unable to write header\n");
  		return -1;
@@ -995,7 +863,7 @@
 Index: main/db1-ast/hash/hash.h
 diff -Nau main/db1-ast/hash/hash.h.orig main/db1-ast/hash/hash.h
 --- main/db1-ast/hash/hash.h.orig	2006-08-21 04:11:39.000000000 +0200
-+++ main/db1-ast/hash/hash.h	2011-09-14 14:29:50.767970949 +0200
++++ main/db1-ast/hash/hash.h	2012-03-18 17:47:07.898462166 +0100
 @@ -36,6 +36,8 @@
   *	@(#)hash.h	8.3 (Berkeley) 5/31/94
   */
@@ -1008,7 +876,7 @@
 Index: main/db1-ast/hash/ndbm.c
 diff -Nau main/db1-ast/hash/ndbm.c.orig main/db1-ast/hash/ndbm.c
 --- main/db1-ast/hash/ndbm.c.orig	2006-08-21 04:11:39.000000000 +0200
-+++ main/db1-ast/hash/ndbm.c	2011-09-14 14:29:50.767970949 +0200
++++ main/db1-ast/hash/ndbm.c	2012-03-18 17:47:07.898462166 +0100
 @@ -49,7 +49,8 @@
  #include <string.h>
  #include <stdlib.h>
@@ -1021,9 +889,9 @@
  /*
 Index: main/features.c
 diff -Nau main/features.c.orig main/features.c
---- main/features.c.orig	2011-08-10 00:12:59.000000000 +0200
-+++ main/features.c	2011-09-14 14:29:50.777958246 +0200
-@@ -1928,6 +1928,10 @@
+--- 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);
  		}
  
@@ -1034,7 +902,7 @@
  		for(x = 0; x < strlen(args); x++) {
  			if (args[x] == '/')
  				args[x] = '-';
-@@ -2044,6 +2048,10 @@
+@@ -2183,6 +2187,10 @@
  			snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav"));
  		}
  
@@ -1047,8 +915,8 @@
  				args[x] = '-';
 Index: main/file.c
 diff -Nau main/file.c.orig main/file.c
---- main/file.c.orig	2011-07-05 15:23:57.000000000 +0200
-+++ main/file.c	2011-09-14 14:29:50.777958246 +0200
+--- 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 @@
  	char *fn = NULL;
  
@@ -1060,8 +928,8 @@
  		if (asprintf(&fn, "%s.%s", filename, ext) < 0) {
 Index: main/Makefile
 diff -Nau main/Makefile.orig main/Makefile
---- main/Makefile.orig	2011-08-03 17:14:36.000000000 +0200
-+++ main/Makefile	2011-09-14 14:29:50.777958246 +0200
+--- 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 @@
  endif
  
@@ -1076,9 +944,9 @@
  ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
 Index: main/tcptls.c
 diff -Nau main/tcptls.c.orig main/tcptls.c
---- main/tcptls.c.orig	2011-05-23 18:18:33.000000000 +0200
-+++ main/tcptls.c	2011-09-14 14:29:50.777958246 +0200
-@@ -357,6 +357,7 @@
+--- 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 @@
  	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);
@@ -1088,8 +956,8 @@
  	ast_verb(0, "SSL certificate ok\n");
 Index: main/udptl.c
 diff -Nau main/udptl.c.orig main/udptl.c
---- main/udptl.c.orig	2011-05-03 21:55:49.000000000 +0200
-+++ main/udptl.c	2011-09-14 14:29:50.777958246 +0200
+--- 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 @@
  
  #define UDPTL_BUF_MASK              15
@@ -1111,8 +979,8 @@
  	uint8_t buf[LOCAL_FAX_MAX_DATAGRAM];
 Index: Makefile
 diff -Nau Makefile.orig Makefile
---- Makefile.orig	2011-08-25 21:08:04.000000000 +0200
-+++ Makefile	2011-09-14 14:29:50.777958246 +0200
+--- 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
  endif